From fe499b85a05f81c4dbcd52a959b9dd738f355302 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Dec 2024 15:50:42 +0100 Subject: [PATCH] platformio: 6.1.15 -> 6.1.16 https://github.com/platformio/platformio-core/releases/tag/v6.1.16 --- pkgs/development/embedded/platformio/core.nix | 6 +++--- .../embedded/platformio/use-local-spdx-license-list.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index eb20e0f6a3e7..038efbb65bbf 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -11,15 +11,15 @@ with python3Packages; buildPythonApplication rec { pname = "platformio"; - version = "6.1.15"; + version = "6.1.16"; pyproject = true; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; - rev = "v${version}"; - hash = "sha256-w5JUAqQRNxq8ZrX8ffny2K7xWBkGr2H3+apYqCPXw9c="; + tag = "v${version}"; + hash = "sha256-hZgbLUk2Krynut5uD6GMxWA+95y8ONNUmv4kaAltumk="; }; outputs = [ "out" "udev" ]; 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 f2b9f5015adc..6bdc800f1ba1 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -1,12 +1,12 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index c1d22ab5..6c2cfaed 100644 +index 47efae59..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.23" +- version = "3.24.0" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - f"v{version}/json/licenses.json"