From 6a68717d1a3b4c161e0dd9dd0518920d5bd3edeb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 19 Dec 2024 03:27:14 +0100 Subject: [PATCH] esphome: 2024.11.3 -> 2024.12.0 https://github.com/esphome/esphome/releases/tag/2024.12.0 --- pkgs/tools/misc/esphome/dashboard.nix | 6 +++--- pkgs/tools/misc/esphome/default.nix | 13 ++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 23747aed3787..8cc6f8faa9f4 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20241120.0"; + version = "20241217.1"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-insoDWHqMFAGgmsY2ZgNuo1cl0WGJXRy398bt3ADORs="; + hash = "sha256-Mirihvts8G2D4e5Jn7S0dWEJ+sOHZ+fvzsNaLpAOyMA="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-UKrF7yzyj09WBrmrJ6uzcRjIYrKwCqLQ5paiqnt/Xuc="; + hash = "sha256-fWQvDMeuRjyToHhhZH1KtLWuhgAvq900cCja2dvLQyU="; }; build-system = [ setuptools ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 7d5876fa4666..74c69313a4b7 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.11.3"; + version = "2024.12.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZGqYvbNBQSoU6F20Bdzif8zmzLPr4XusVVrOR0iWl7k="; + hash = "sha256-Ftq01cfKs9FVL6cexgnTf9KANtM+UgCHOloTgnvRENs="; }; build-systems = with python.pkgs; [ @@ -55,20 +55,15 @@ python.pkgs.buildPythonApplication rec { # ensure component dependencies are available cat requirements_optional.txt >> requirements.txt - # relax strict runtime version check - substituteInPlace esphome/components/font/__init__.py \ - --replace-fail "10.4.0" "${python.pkgs.pillow.version}" ''; # Remove esptool and platformio from requirements env.ESPHOME_USE_SUBPROCESS = ""; # esphome has optional dependencies it does not declare, they are - # loaded when certain config blocks are used, like `font`, `image` - # or `animation`. + # loaded when certain config blocks are used. # They have validation functions like: - # - validate_cryptography_installed - # - validate_pillow_installed + # - validate_cryptography_installed for the wifi component dependencies = with python.pkgs; [ aioesphomeapi argcomplete