diff options
author | Alvar Penning <post@0x21.biz> | 2021-11-08 18:29:16 +0100 |
---|---|---|
committer | Alvar Penning <post@0x21.biz> | 2021-11-08 18:29:16 +0100 |
commit | 848860d2414b7df1b83609c597a144caf8140b45 (patch) | |
tree | f8545a55441bd434adb9cc46a5fa652144772978 /pkgs/development/embedded | |
parent | c910eaa8272fecd69359a9319c3477730694b592 (diff) | |
download | nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.tar nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.tar.gz nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.tar.bz2 nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.tar.lz nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.tar.xz nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.tar.zst nixpkgs-848860d2414b7df1b83609c597a144caf8140b45.zip |
platformio: 5.2.1 -> 5.2.3
Next to bumping the patch version, two changed dependencies were pinned. Furthermore, the SPDX patch was altered to correctly close the JSON file as non-closed files are now also covered by the tests.
Diffstat (limited to 'pkgs/development/embedded')
-rw-r--r-- | pkgs/development/embedded/platformio/core.nix | 21 | ||||
-rw-r--r-- | pkgs/development/embedded/platformio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/embedded/platformio/use-local-spdx-license-list.patch | 8 |
3 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index aa495abda55..fdd9580ed1d 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -19,6 +19,27 @@ let }; }); + 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 { diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 35615a4de1f..ab2b989696c 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -4,14 +4,14 @@ 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 = { diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index 156600595f9..e8239150f38 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -1,8 +1,8 @@ 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(): @@ -12,4 +12,6 @@ index addc4c5..514b0ad 100644 - "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 |