Merge pull request #145092 from oxzi/platformio-5.2.3

platformio: 5.2.1 -> 5.2.3

Changed files
+28 -5
pkgs
development
+21
pkgs/development/embedded/platformio/core.nix
···
};
});
+
click = super.click.overridePythonAttrs (oldAttrs: rec {
+
version = "8.0.3";
+
src = fetchFromGitHub {
+
owner = "pallets";
+
repo = "click";
+
rev = version;
+
sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g";
+
};
+
});
+
+
starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
+
version = "0.17.0";
+
src = fetchFromGitHub {
+
owner = "encode";
+
repo = "starlette";
+
rev = version;
+
sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw";
+
};
+
disabledTestPaths = [];
+
});
+
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
version = "0.15.0";
src = fetchFromGitHub {
+2 -2
pkgs/development/embedded/platformio/default.nix
···
let
callPackage = newScope self;
-
version = "5.2.1";
+
version = "5.2.3";
# 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 = "1kmwr21djcz1qnpbsk0za244rp6rkh0vp6wss1vjks4waambiqnl";
+
sha256 = "0wbmwawn25srkyrd6hwrgli1himzsj08vbm76fgnpqdc84n78ckl";
};
self = {
+5 -3
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
···
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
-
index addc4c5..514b0ad 100644
+
index 416dccfd..896c3649 100644
--- a/platformio/package/manifest/schema.py
+++ b/platformio/package/manifest/schema.py
-
@@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema):
+
@@ -253,9 +253,6 @@ class ManifestSchema(BaseSchema):
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
···
- "v%s/json/licenses.json" % version
- )
- return json.loads(fetch_remote_content(spdx_data_url))
-
+ return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json"))
+
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
+
+ spdx = json.load(f)
+
+ return spdx