pyrox.dev
Merge pull request #145092 from oxzi/platformio-5.2.3
platformio: 5.2.1 -> 5.2.3
authored by
Jörg Thalheim
and committed by
GitHub
c2268175
0f109217
+21
pkgs/development/embedded/platformio/core.nix
+21
pkgs/development/embedded/platformio/core.nix
···
19
19
};
20
20
});
21
21
22
+
click = super.click.overridePythonAttrs (oldAttrs: rec {
23
+
version = "8.0.3";
24
+
src = fetchFromGitHub {
25
+
owner = "pallets";
26
+
repo = "click";
27
+
rev = version;
28
+
sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g";
29
+
};
30
+
});
31
+
32
+
starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
33
+
version = "0.17.0";
34
+
src = fetchFromGitHub {
35
+
owner = "encode";
36
+
repo = "starlette";
37
+
rev = version;
38
+
sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw";
39
+
};
40
+
disabledTestPaths = [];
41
+
});
42
+
22
43
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
23
44
version = "0.15.0";
24
45
src = fetchFromGitHub {
+2
-2
pkgs/development/embedded/platformio/default.nix
+2
-2
pkgs/development/embedded/platformio/default.nix
···
4
4
let
5
5
callPackage = newScope self;
6
6
7
-
version = "5.2.1";
7
+
version = "5.2.3";
8
8
9
9
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
10
10
src = fetchFromGitHub {
11
11
owner = "platformio";
12
12
repo = "platformio-core";
13
13
rev = "v${version}";
14
-
sha256 = "1kmwr21djcz1qnpbsk0za244rp6rkh0vp6wss1vjks4waambiqnl";
14
+
sha256 = "0wbmwawn25srkyrd6hwrgli1himzsj08vbm76fgnpqdc84n78ckl";
15
15
};
16
16
17
17
self = {
+5
-3
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+5
-3
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
···
1
1
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
2
-
index addc4c5..514b0ad 100644
2
+
index 416dccfd..896c3649 100644
3
3
--- a/platformio/package/manifest/schema.py
4
4
+++ b/platformio/package/manifest/schema.py
5
-
@@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema):
5
+
@@ -253,9 +253,6 @@ class ManifestSchema(BaseSchema):
6
6
@staticmethod
7
7
@memoized(expire="1h")
8
8
def load_spdx_licenses():
···
12
12
- "v%s/json/licenses.json" % version
13
13
- )
14
14
- return json.loads(fetch_remote_content(spdx_data_url))
15
-
+ return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json"))
15
+
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
16
+
+ spdx = json.load(f)
17
+
+ return spdx