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" diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index b0e67470f570..5b6044681ed8 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.11.2"; + version = "2024.11.3"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zxFP7QXZbX/kj17po3tMNHoc7OfCdFSQ73e1umf+QA8="; + hash = "sha256-ZGqYvbNBQSoU6F20Bdzif8zmzLPr4XusVVrOR0iWl7k="; }; build-systems = with python.pkgs; [ @@ -106,6 +106,8 @@ python.pkgs.buildPythonApplication rec { "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}" "--set ESPHOME_USE_SUBPROCESS ''" + # https://github.com/NixOS/nixpkgs/issues/362193 + "--set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION 'python'" ]; # Needed for tests