Merge pull request #186991 from BattleCh1cken/master

platformio: 6.0.2 -> 6.1.4
This commit is contained in:
Jonas Heinrich 2022-08-20 16:57:44 +02:00 committed by GitHub
commit 0781f10923
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions

View file

@ -1,21 +1,21 @@
{ newScope, fetchFromGitHub }:
let
callPackage = newScope self;
version = "6.0.2";
version = "6.1.4";
# 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 = "sha256-yfUF9+M45ZSjmB275kTs8+/Q8Q5FMmr63e3Om8dPi2k=";
sha256 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs=";
};
self = {
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
};
in self
in
self

View file

@ -1,17 +1,23 @@
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
index 416dccfd..896c3649 100644
index 1e5f935a..26d1ac6a 100644
--- a/platformio/package/manifest/schema.py
+++ b/platformio/package/manifest/schema.py
@@ -253,9 +253,6 @@ class ManifestSchema(BaseSchema):
@@ -276,9 +276,12 @@ class ManifestSchema(BaseSchema):
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
- version = "3.17"
- version = "3.18"
- spdx_data_url = (
- "https://raw.githubusercontent.com/spdx/license-list-data/"
- "v%s/json/licenses.json" % version
- )
- return json.loads(fetch_remote_content(spdx_data_url))
+ # version = "3.18"
+ # spdx_data_url = (
+ # "https://raw.githubusercontent.com/spdx/license-list-data/"
+ # "v%s/json/licenses.json" % version
+ # )
+ # return json.loads(fetch_remote_content(spdx_data_url))
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
+ spdx = json.load(f)
+ return spdx