platformio: 5.0.4 -> 5.1.1
This commit is contained in:
parent
9c6daedb29
commit
734790006a
|
@ -1,9 +1,25 @@
|
||||||
{ stdenv, lib, buildPythonApplication, bottle
|
{ stdenv, lib, buildPythonApplication
|
||||||
, click, click-completion, colorama, semantic-version
|
, ajsonrpc
|
||||||
, lockfile, pyserial, requests
|
, bottle
|
||||||
, tabulate, pyelftools, marshmallow
|
, click
|
||||||
, pytest, tox, jsondiff
|
, click-completion
|
||||||
, git, spdx-license-list-data
|
, colorama
|
||||||
|
, git
|
||||||
|
, jsondiff
|
||||||
|
, lockfile
|
||||||
|
, marshmallow
|
||||||
|
, pyelftools
|
||||||
|
, pyserial
|
||||||
|
, pytest
|
||||||
|
, requests
|
||||||
|
, semantic-version
|
||||||
|
, spdx-license-list-data
|
||||||
|
, starlette
|
||||||
|
, tabulate
|
||||||
|
, tox
|
||||||
|
, uvicorn
|
||||||
|
, wsproto
|
||||||
|
, zeroconf
|
||||||
, version, src
|
, version, src
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -78,10 +94,24 @@ in buildPythonApplication rec {
|
||||||
pname = "platformio";
|
pname = "platformio";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
bottle click click-completion colorama git
|
ajsonrpc
|
||||||
lockfile pyserial requests semantic-version
|
bottle
|
||||||
tabulate pyelftools marshmallow
|
click
|
||||||
|
click-completion
|
||||||
|
colorama
|
||||||
|
git
|
||||||
|
lockfile
|
||||||
|
marshmallow
|
||||||
|
pyelftools
|
||||||
|
pyserial
|
||||||
|
requests
|
||||||
|
semantic-version
|
||||||
|
starlette
|
||||||
|
tabulate
|
||||||
|
uvicorn
|
||||||
|
wsproto
|
||||||
|
zeroconf
|
||||||
];
|
];
|
||||||
|
|
||||||
HOME = "/tmp";
|
HOME = "/tmp";
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
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
|
# 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 = "15jnhlhkk9z6cyzxw065r3080dqan951klwf65p152vfzg79wf84";
|
sha256 = "1m9vq5r4g04n3ckmb3hrrc4ar5v31k6isc76bw4glrn2xb7r8c00";
|
||||||
};
|
};
|
||||||
|
|
||||||
self = {
|
self = {
|
||||||
|
|
|
@ -1,11 +1,15 @@
|
||||||
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 f293ba5a..a818271f 100644
|
index addc4c5..514b0ad 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
|
||||||
@@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema):
|
@@ -253,9 +253,4 @@ class ManifestSchema(BaseSchema):
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@memoized(expire="1h")
|
@memoized(expire="1h")
|
||||||
def load_spdx_licenses():
|
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.loads(fetch_remote_content(spdx_data_url))
|
||||||
+ return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json"))
|
+ return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json"))
|
||||||
|
|
Loading…
Reference in New Issue