Unverified Commit 73b1df0e authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #331395 from mweinelt/platformio-6.1.15 

platformio: 6.1.11 -> 6.1.15
parents 047daefc 5927a45d

pkgs/development/embedded/platformio/core.nix

+3 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


with python3Packages; buildPythonApplication rec {

  pname = "platformio";

  version = "6.1.11";

  version = "6.1.15";

  pyproject = true;



  # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
@@ -19,7 +19,7 @@ with python3Packages; buildPythonApplication rec { 
    owner = "platformio";

    repo = "platformio-core";

    rev = "v${version}";

    hash = "sha256-NR4UyAt8q5sUGtz1Sy6E8Of7y9WrH9xpcAWzLBeDQmo=";

    hash = "sha256-w5JUAqQRNxq8ZrX8ffny2K7xWBkGr2H3+apYqCPXw9c=";

  };



  outputs = [ "out" "udev" ];
@@ -132,6 +132,7 @@ with python3Packages; buildPythonApplication rec { 
    # requires internet connection

    "test_api_cache"

    "test_ping_internet_ips"

    "test_metadata_dump"

  ];



  pytestFlagsArray = [

pkgs/development/embedded/platformio/use-local-spdx-license-list.patch

+2 −2
Original line number Diff line number Diff line 
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py

index 95e08108..6c2cfaed 100644

index c1d22ab5..6c2cfaed 100644

--- a/platformio/package/manifest/schema.py

+++ b/platformio/package/manifest/schema.py

@@ -276,9 +276,6 @@ class ManifestSchema(BaseSchema):

     @staticmethod

     @memoized(expire="1h")

     def load_spdx_licenses():

-        version = "3.21"

-        version = "3.23"

-        spdx_data_url = (

-            "https://raw.githubusercontent.com/spdx/license-list-data/"

-            f"v{version}/json/licenses.json"