diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 7beb2cba9c50e..a52b299a47e0f 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -34,6 +34,8 @@ let "commands/test_test.py::test_local_env" "test_builder.py::test_build_flags" "test_builder.py::test_build_unflags" + "test_builder.py::test_debug_default_build_flags" + "test_builder.py::test_debug_custom_build_flags" "test_misc.py::test_api_cache" "test_misc.py::test_ping_internet_ips" "test_misc.py::test_platformio_cli" @@ -49,14 +51,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.1.0"; + version = "4.3.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 = "10v9jw1zjfqr3wl6kills3cfp0ky7xbm1gc3z0n57wrqbc6cmz95"; + sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw"; }; propagatedBuildInputs = [ @@ -79,11 +81,6 @@ in buildPythonApplication rec { patches = [ ./fix-searchpath.patch - (fetchpatch { - url = "https://github.com/platformio/platformio-core/commit/442a7e357636522e844d95375c246644b21a7802.patch"; - sha256 = "0a3kj3k02237gr2yk30gpwc6vm04dsd1wxldj4dsbzs4a9yyi70m"; - excludes = ["HISTORY.rst"]; - }) ./use-local-spdx-license-list.patch ]; 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 90251d668bc74..16294a4d6cd68 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,14 +1,14 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index f1d68e08..9b7b1da8 100644 +index be49b3ee..d1390a88 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -174,9 +174,5 @@ class ManifestSchema(Schema): +@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): - r = requests.get( - "https://raw.githubusercontent.com/spdx/license-list-data" -- "/v3.7/json/licenses.json" +- "/v3.8/json/licenses.json" - ) - r.raise_for_status() - return r.json()