From 101df500efd46e6168e377cbbf3d29d766105936 Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Thu, 23 Jul 2026 13:16:49 +0200
Subject: [PATCH 1/4] esphome: add maintainer tmarkus

---
 pkgs/by-name/es/esphome/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 936f0caabe46..30c043b0c5b0 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -207,6 +207,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       picnoir
       thanegill
       karlbeecken
+      tmarkus
     ];
     mainProgram = "esphome";
   };

From 0f8bcd1f4ea7b8ef7a1e2ae896a35a7eeb4343ac Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Thu, 23 Jul 2026 13:17:07 +0200
Subject: [PATCH 2/4] esphome: remove platformio from dependencies

---
 pkgs/by-name/es/esphome/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 30c043b0c5b0..7311e4034bdb 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -85,7 +85,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     jinja2
     paho-mqtt
     pillow
-    platformio
     puremagic
     py7zr
     pyparsing

From 0dffc884876e5478b7e7cdd819be6adce3bdcb8f Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Thu, 23 Jul 2026 13:17:22 +0200
Subject: [PATCH 3/4] esphome: 2026.6.2 -> 2026.6.5

---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 7311e4034bdb..e153ac83c9b6 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -24,14 +24,14 @@ let
 in
 python.pkgs.buildPythonApplication (finalAttrs: {
   pname = "esphome";
-  version = "2026.6.2";
+  version = "2026.6.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = finalAttrs.version;
-    hash = "sha256-h7aMPSXmIUutCGMoZlE3Z1wX2xNxdmZsHfBllcFHBHc=";
+    hash = "sha256-4sbc/X86OWN/Bx2sPk3H2lgzGxdQNS6bIspNLAVqHz8=";
   };
 
   patches = [

From 7151bf112711a340ad303b2557b7d31b1df4d023 Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Thu, 23 Jul 2026 13:27:34 +0200
Subject: [PATCH 4/4] esphome: use addBinToPathHook

---
 pkgs/by-name/es/esphome/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index e153ac83c9b6..69f1b4480ae4 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -9,6 +9,7 @@
   esptool,
   git,
   versionCheckHook,
+  addBinToPathHook,
   nixosTests,
 }:
 
@@ -137,6 +138,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     ++ [
       git
       versionCheckHook
+      addBinToPathHook
     ];
 
   disabledTestPaths = [
@@ -148,10 +150,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     "tests/unit_tests/test_espidf_component.py"
   ];
 
-  preCheck = ''
-    export PATH=$PATH:$out/bin
-  '';
-
   postInstall =
     let
       argcomplete = lib.getExe' python.pkgs.argcomplete "register-python-argcomplete";
@@ -163,8 +161,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
         --fish <(${argcomplete} --shell fish esphome)
     '';
 
-  doInstallCheck = true;
-
   disabledTests = [
     # tries to import platformio, which is wrapped in an fhsenv
     "test_clean_build"