diff options
author | Alvar Penning <post@0x21.biz> | 2021-03-18 10:47:35 +0100 |
---|---|---|
committer | Raphael Megzari <raphael@megzari.com> | 2021-05-17 18:02:21 +0900 |
commit | 734790006a73879bd15dd4601a85c0c646a75065 (patch) | |
tree | 1fa493aedb8212725b8abe40ea2b21d80c3f49de | |
parent | 9c6daedb29d870d1aee176b717d3769bb3191c06 (diff) | |
download | nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.tar nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.tar.gz nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.tar.bz2 nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.tar.lz nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.tar.xz nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.tar.zst nixpkgs-734790006a73879bd15dd4601a85c0c646a75065.zip |
platformio: 5.0.4 -> 5.1.1
-rw-r--r-- | pkgs/development/arduino/platformio/core.nix | 50 | ||||
-rw-r--r-- | pkgs/development/arduino/platformio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/arduino/platformio/use-local-spdx-license-list.patch | 10 |
3 files changed, 49 insertions, 15 deletions
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 17e87f2cb6c..4f6f762bd74 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,9 +1,25 @@ -{ stdenv, lib, buildPythonApplication, bottle -, click, click-completion, colorama, semantic-version -, lockfile, pyserial, requests -, tabulate, pyelftools, marshmallow -, pytest, tox, jsondiff -, git, spdx-license-list-data +{ stdenv, lib, buildPythonApplication +, ajsonrpc +, bottle +, click +, click-completion +, colorama +, git +, jsondiff +, lockfile +, marshmallow +, pyelftools +, pyserial +, pytest +, requests +, semantic-version +, spdx-license-list-data +, starlette +, tabulate +, tox +, uvicorn +, wsproto +, zeroconf , version, src }: @@ -78,10 +94,24 @@ in buildPythonApplication rec { pname = "platformio"; inherit version src; - propagatedBuildInputs = [ - bottle click click-completion colorama git - lockfile pyserial requests semantic-version - tabulate pyelftools marshmallow + propagatedBuildInputs = [ + ajsonrpc + bottle + click + click-completion + colorama + git + lockfile + marshmallow + pyelftools + pyserial + requests + semantic-version + starlette + tabulate + uvicorn + wsproto + zeroconf ]; HOME = "/tmp"; diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index 194385e7952..312c2d1044b 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.0.4"; + version = "5.1.1"; # 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 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84"; + sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00"; }; self = { diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 511d81c3b01..e0016adcf7d 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,11 +1,15 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index f293ba5a..a818271f 100644 +index addc4c5..514b0ad 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema): +@@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- spdx_data_url = "https://dl.bintray.com/platformio/dl-misc/spdx-licenses-3.json" +- version = "3.12" +- 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)) + return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json")) |