diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 7dd6ee371525..f77baa00c6ed 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.4.3"; + version = "2026.4.4"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-+esSczOBIT4dJEyzqmEv6YMU4wGkN4lFGmuZKRp5/bo="; + hash = "sha256-7ZhVi4R/wmBX1HI60eMpWGY2zZNft9H3duJ2dwkqP24="; }; patches = [ @@ -186,6 +186,9 @@ python.pkgs.buildPythonApplication (finalAttrs: { # Expects a full git clone "test_clang_tidy_mode_full_scan" "test_clang_tidy_mode_targeted_scan" + # Patched to run platformio without the esphome wrapper + "test_run_platformio_cli_strips_win_long_path_prefix" + "test_run_platformio_cli_does_not_set_pythonexepath_without_strip" ]; passthru = { diff --git a/pkgs/by-name/es/esphome/platformio-binary-reference.patch b/pkgs/by-name/es/esphome/platformio-binary-reference.patch index 7022c0fc0c72..42c3a16fa3b8 100644 --- a/pkgs/by-name/es/esphome/platformio-binary-reference.patch +++ b/pkgs/by-name/es/esphome/platformio-binary-reference.patch @@ -1,13 +1,13 @@ diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py -index fc21977f..e5059f1d 100644 +index 81ff01306..2dfa523dd 100644 --- a/esphome/platformio_api.py +++ b/esphome/platformio_api.py -@@ -63,7 +63,7 @@ def run_platformio_cli(*args, **kwargs) -> str | int: - os.environ.setdefault("PYTHONWARNINGS", "ignore::SyntaxWarning") - # Increase uv retry count to handle transient network errors (default is 3) - os.environ.setdefault("UV_HTTP_RETRIES", "10") -- cmd = [sys.executable, "-m", "esphome.platformio_runner"] + list(args) +@@ -64,7 +64,7 @@ def run_platformio_cli(*args, **kwargs) -> str | int: + # a user-provided value (or the unmodified path on platforms that + # don't need the strip). + os.environ["PYTHONEXEPATH"] = python_exe +- cmd = [python_exe, "-m", "esphome.platformio_runner"] + list(args) + cmd = ["platformio"] + list(args) - + return run_external_process(*cmd, **kwargs) - +