diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-10 00:02:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 00:02:09 +0000 |
| commit | d5964b8c81a1fb893d17912576892bc35ae6e04c (patch) | |
| tree | 2ec13e3f2ca68c90766271ade6d82d5fccb579fa /pkgs/development/embedded | |
| parent | 92a74926fa9983ef0ddeed020f5ac68be5ac0515 (diff) | |
| parent | 6e4d2d1f105c0092031c9aa490f14f6ade51e74b (diff) | |
| download | nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.tar nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.tar.gz nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.tar.bz2 nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.tar.lz nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.tar.xz nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.tar.zst nixpkgs-d5964b8c81a1fb893d17912576892bc35ae6e04c.zip | |
Merge staging-next into staging
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 |