From aa581615691a391d8e2ac7f7788e8317df328a54 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 16 Oct 2024 15:34:08 +0200
Subject: [PATCH] epshome: 2024.9.2 -> 2024.10.0

https://github.com/esphome/esphome/releases/tag/2024.10.0
---
 pkgs/tools/misc/esphome/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index b661d9866e85..f070b028f654 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -21,19 +21,22 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2024.9.2";
+  version = "2024.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-i1lrolOrKwa9muXhoknLYATEfLSrVA63VrM3247hVMw=";
+    hash = "sha256-EdxCq/123OJm63NBfGnt5pfqdUXPti+NmbSVRu/gwqc=";
   };
 
-  nativeBuildInputs = with python.pkgs; [
+  build-systems = with python.pkgs; [
     setuptools
     argcomplete
+  ];
+
+  nativeBuildInputs = [
     installShellFiles
   ];
 
@@ -56,7 +59,7 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   # Remove esptool and platformio from requirements
-  ESPHOME_USE_SUBPROCESS = "";
+  env.ESPHOME_USE_SUBPROCESS = "";
 
   # esphome has optional dependencies it does not declare, they are
   # loaded when certain config blocks are used, like `font`, `image`
@@ -64,7 +67,7 @@ python.pkgs.buildPythonApplication rec {
   # They have validation functions like:
   # - validate_cryptography_installed
   # - validate_pillow_installed
-  propagatedBuildInputs = with python.pkgs; [
+  dependencies = with python.pkgs; [
     aioesphomeapi
     argcomplete
     cairosvg
@@ -79,9 +82,9 @@ python.pkgs.buildPythonApplication rec {
     pillow
     platformio
     protobuf
+    puremagic
     pyparsing
     pyserial
-    python-magic
     pyyaml
     requests
     ruamel-yaml
@@ -97,7 +100,7 @@ python.pkgs.buildPythonApplication rec {
     # git is used in esphome/writer.py
     # inetutils is used in esphome/dashboard/status/ping.py
     "--prefix PATH : ${lib.makeBinPath [ platformio esptool git inetutils ]}"
-    "--prefix PYTHONPATH : ${python.pkgs.makePythonPath propagatedBuildInputs}" # will show better error messages
+    "--prefix PYTHONPATH : ${python.pkgs.makePythonPath dependencies}" # will show better error messages
     "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
     "--set ESPHOME_USE_SUBPROCESS ''"
   ];