esphome: 2026.4.5 -> 2026.5.0 (#522945)
This commit is contained in:
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "esphome-dashboard";
|
||||
version = "20260408.1";
|
||||
version = "20260425.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "dashboard";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OY7s/b0rWmjI9QfmEwj3VxbTFrj99fyf9x1tPl24RbI=";
|
||||
hash = "sha256-OhvRPIvytLmWkIvO45arikC3+7WCTdsEOwswuSAx0XA=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "esphome";
|
||||
version = "2026.4.5";
|
||||
version = "2026.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uMlkrHg4cZYsdSv8D8U57mEZnjwcRkJe2zKI8VFsTRk=";
|
||||
hash = "sha256-oWlzpBzDOSrXv+gOnFSL7TQqDZJc3oN2RoAW2ywFCGo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -73,7 +73,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==82.0.1" "setuptools" \
|
||||
--replace-fail "wheel>=0.43,<0.47" "wheel"
|
||||
--replace-fail "wheel>=0.43,<0.48" "wheel"
|
||||
'';
|
||||
|
||||
# Remove esptool and platformio from requirements
|
||||
@@ -189,6 +189,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
# 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"
|
||||
"test_patch_file_downloader_recovers_against_real_server"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
|
||||
index 81ff01306..2dfa523dd 100644
|
||||
--- a/esphome/platformio_api.py
|
||||
+++ b/esphome/platformio_api.py
|
||||
diff --git a/esphome/platformio/toolchain.py b/esphome/platformio/toolchain.py
|
||||
index 073e134ac4..2dfa523ddc 100644
|
||||
--- a/esphome/platformio/toolchain.py
|
||||
+++ b/esphome/platformio/toolchain.py
|
||||
@@ -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 = [python_exe, "-m", "esphome.platformio.runner"] + list(args)
|
||||
+ cmd = ["platformio"] + list(args)
|
||||
|
||||
return run_external_process(*cmd, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user