From d9d37eea316a06f1b7b6451a33eb7aa51e7a7253 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Feb 2022 23:02:01 +0100 Subject: [PATCH 1/2] esphome: 2022.2.3 -> 2022.2.4 https://github.com/esphome/esphome/releases/tag/2022.2.4 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 444e0e122ef1..69adff94d325 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.2.3"; + version = "2022.2.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Pt57wI1cYTqT65zGOk1/GyvK0BqITxCzWIyXSNZ9D/0="; + sha256 = "sha256-RG5wTWEpBEC4zTGJ7XTmnjnhSVAllqXjcr3qYbmhqP4="; }; postPatch = '' From 4ffd1c3aa242171a3314b92559cc4e4a05c8f4f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Feb 2022 01:52:05 +0100 Subject: [PATCH 2/2] esphome: fix esp32 build Closes: #161114 --- pkgs/tools/misc/esphome/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 69adff94d325..4d93a592d501 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -26,6 +26,15 @@ with python.pkgs; buildPythonApplication rec { sha256 = "sha256-RG5wTWEpBEC4zTGJ7XTmnjnhSVAllqXjcr3qYbmhqP4="; }; + patches = [ + (fetchpatch { + # Fix ESPHOME_USE_SUBPROCESS usage in the ESP32 post build script + # https://github.com/esphome/esphome/pull/3246 + url = "https://github.com/esphome/esphome/commit/dcd3f42eda5828c42feadbaa04b703c63899be54.patch"; + hash = "sha256-rF1YHRRHVHfoRs492zmIOmRGPUzxx3s673UVx5UJ3+M="; + }) + ]; + postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt