Update platformio
This commit is contained in:
parent
24b7bdcd78
commit
2b7997e91e
|
@ -1,21 +1,21 @@
|
||||||
|
|
||||||
{ newScope, fetchFromGitHub }:
|
{ newScope, fetchFromGitHub }:
|
||||||
|
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
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
|
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "platformio";
|
owner = "platformio";
|
||||||
repo = "platformio-core";
|
repo = "platformio-core";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-yfUF9+M45ZSjmB275kTs8+/Q8Q5FMmr63e3Om8dPi2k=";
|
sha256 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
self = {
|
self = {
|
||||||
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
|
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
|
||||||
};
|
};
|
||||||
|
|
||||||
in self
|
in
|
||||||
|
self
|
||||||
|
|
|
@ -1,17 +1,23 @@
|
||||||
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
|
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
|
--- a/platformio/package/manifest/schema.py
|
||||||
+++ b/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
|
@staticmethod
|
||||||
@memoized(expire="1h")
|
@memoized(expire="1h")
|
||||||
def load_spdx_licenses():
|
def load_spdx_licenses():
|
||||||
- version = "3.17"
|
- version = "3.18"
|
||||||
- spdx_data_url = (
|
- spdx_data_url = (
|
||||||
- "https://raw.githubusercontent.com/spdx/license-list-data/"
|
- "https://raw.githubusercontent.com/spdx/license-list-data/"
|
||||||
- "v%s/json/licenses.json" % version
|
- "v%s/json/licenses.json" % version
|
||||||
- )
|
- )
|
||||||
- return json.loads(fetch_remote_content(spdx_data_url))
|
- 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:
|
+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f:
|
||||||
+ spdx = json.load(f)
|
+ spdx = json.load(f)
|
||||||
+ return spdx
|
+ return spdx
|
||||||
|
|
Loading…
Reference in a new issue