pyrox.dev
lol
Merge pull request #186991 from BattleCh1cken/master
platformio: 6.0.2 -> 6.1.4
authored by
Jonas Heinrich
and committed by
GitHub
0781f109
4d70cdd9
+4
-4
pkgs/development/embedded/platformio/default.nix
+4
-4
pkgs/development/embedded/platformio/default.nix
···
1
-
2
{ newScope, fetchFromGitHub }:
3
4
let
5
callPackage = newScope self;
6
7
-
version = "6.0.2";
8
9
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
10
src = fetchFromGitHub {
11
owner = "platformio";
12
repo = "platformio-core";
13
rev = "v${version}";
14
-
sha256 = "sha256-yfUF9+M45ZSjmB275kTs8+/Q8Q5FMmr63e3Om8dPi2k=";
15
};
16
17
self = {
18
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
19
};
20
21
-
in self
···
1
{ newScope, fetchFromGitHub }:
2
3
let
4
callPackage = newScope self;
5
6
+
version = "6.1.4";
7
8
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
9
src = fetchFromGitHub {
10
owner = "platformio";
11
repo = "platformio-core";
12
rev = "v${version}";
13
+
sha256 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs=";
14
};
15
16
self = {
17
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
18
};
19
20
+
in
21
+
self
+9
-3
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+9
-3
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
···
1
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
2
-
index 416dccfd..896c3649 100644
3
--- a/platformio/package/manifest/schema.py
4
+++ b/platformio/package/manifest/schema.py
5
-
@@ -253,9 +253,6 @@ class ManifestSchema(BaseSchema):
6
@staticmethod
7
@memoized(expire="1h")
8
def load_spdx_licenses():
9
-
- version = "3.17"
10
- spdx_data_url = (
11
- "https://raw.githubusercontent.com/spdx/license-list-data/"
12
- "v%s/json/licenses.json" % version
13
- )
14
- return json.loads(fetch_remote_content(spdx_data_url))
15
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
16
+ spdx = json.load(f)
17
+ return spdx
···
1
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
2
+
index 1e5f935a..26d1ac6a 100644
3
--- a/platformio/package/manifest/schema.py
4
+++ b/platformio/package/manifest/schema.py
5
+
@@ -276,9 +276,12 @@ class ManifestSchema(BaseSchema):
6
@staticmethod
7
@memoized(expire="1h")
8
def load_spdx_licenses():
9
+
- version = "3.18"
10
- spdx_data_url = (
11
- "https://raw.githubusercontent.com/spdx/license-list-data/"
12
- "v%s/json/licenses.json" % version
13
- )
14
- return json.loads(fetch_remote_content(spdx_data_url))
15
+
+ # version = "3.18"
16
+
+ # spdx_data_url = (
17
+
+ # "https://raw.githubusercontent.com/spdx/license-list-data/"
18
+
+ # "v%s/json/licenses.json" % version
19
+
+ # )
20
+
+ # return json.loads(fetch_remote_content(spdx_data_url))
21
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
22
+ spdx = json.load(f)
23
+ return spdx