Merge pull request #142090 from oxzi/platformio-5.2.1

platformio: 5.1.2 -> 5.2.1
conduit-nginx
Fabian Affolter 2021-10-21 08:49:19 +02:00 committed by GitHub
commit e769d55f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 41 deletions

View File

@ -9,54 +9,23 @@
let
python = python3.override {
packageOverrides = self: super: {
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
pname = "aiofiles";
version = "0.6.0";
asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec {
version = "3.4.1";
src = fetchFromGitHub {
owner = "Tinche";
repo = pname;
rev = "v${version}";
sha256 = "0w23d88q65m06884pfcps661clr11w9wm701ihx6kfxjwga6fkzf";
};
doCheck = false;
});
ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec {
pname = "ajsonrpc";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw=";
};
});
click = super.click.overridePythonAttrs (oldAttrs: rec {
version = "7.1.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
};
});
starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
pname = "starlette";
version = "0.14.2";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
owner = "django";
repo = "asgiref";
rev = version;
sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js=";
sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39";
};
doCheck = false;
});
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
version = "0.13.2";
version = "0.15.0";
src = fetchFromGitHub {
owner = "encode";
repo = "uvicorn";
rev = version;
sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r";
};
});
};
@ -67,6 +36,7 @@ with python.pkgs; buildPythonApplication rec {
inherit version src;
propagatedBuildInputs = [
aiofiles
ajsonrpc
bottle
click

View File

@ -4,14 +4,14 @@
let
callPackage = newScope self;
version = "5.1.1";
version = "5.2.1";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00";
sha256 = "1kmwr21djcz1qnpbsk0za244rp6rkh0vp6wss1vjks4waambiqnl";
};
self = {

View File

@ -6,7 +6,7 @@ index addc4c5..514b0ad 100644
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
- version = "3.12"
- version = "3.14"
- spdx_data_url = (
- "https://raw.githubusercontent.com/spdx/license-list-data/"
- "v%s/json/licenses.json" % version