From 991b36dcbe0fde9bf90d3f0623e7a57c4eab6409 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 23 Apr 2024 22:59:15 +0200 Subject: [PATCH 1/3] home-assistant: rename component update script --- pkgs/servers/home-assistant/default.nix | 2 +- .../{parse-requirements.py => update-component-packages.py} | 2 +- pkgs/servers/home-assistant/update.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/servers/home-assistant/{parse-requirements.py => update-component-packages.py} (99%) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e3bec47d25a8..022d2faf51b2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -525,7 +525,7 @@ let # Ensure that we are using a consistent package set extraBuildInputs = extraPackages python.pkgs; - # Don't forget to run parse-requirements.py after updating + # Don't forget to run update-component-packages.py after updating hassVersion = "2024.4.3"; in python.pkgs.buildPythonApplication rec { diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/update-component-packages.py similarity index 99% rename from pkgs/servers/home-assistant/parse-requirements.py rename to pkgs/servers/home-assistant/update-component-packages.py index 404120d062ac..10288f5e6d64 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -268,7 +268,7 @@ def main() -> None: build_inputs[component] = (attr_paths, extra_attrs, missing_reqs) with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f: - f.write("# Generated by parse-requirements.py\n") + f.write("# Generated by update-component-packages.py\n") f.write("# Do not edit!\n\n") f.write("{\n") f.write(f' version = "{version}";\n') diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index c9b9eb183890..70eb77ce9a1c 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -222,7 +222,7 @@ class HomeAssistant: async def update_components(self): await run_async([ - f"{ROOT}/pkgs/servers/home-assistant/parse-requirements.py" + f"{ROOT}/pkgs/servers/home-assistant/update-component-packages.py" ]) From 6146d1ef13572fb7719f5837da051df8e99baa3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 23 Apr 2024 23:02:30 +0200 Subject: [PATCH 2/3] home-assistant: 2024.4.3 -> 2024.4.4 https://github.com/home-assistant/core/releases/tag/2024.4.4 --- pkgs/servers/home-assistant/component-packages.nix | 5 +++-- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d8da6b345eb4..186956baa9ff 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1,8 +1,8 @@ -# Generated by parse-requirements.py +# Generated by update-component-packages.py # Do not edit! { - version = "2024.4.3"; + version = "2024.4.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -5945,6 +5945,7 @@ "airthings" "airthings_ble" "airtouch4" + "airtouch5" "airvisual" "airvisual_pro" "airzone" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 022d2faf51b2..3bd9616da23e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -526,7 +526,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.4.3"; + hassVersion = "2024.4.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -544,13 +544,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-jHt4cWi1JxUs2XKf0N9gqsYj5XZK7TXwgj7WPZ7dmEA="; + hash = "sha256-bZcrFtaO0S22M6Wt2otK8rCg+NhpXr+/yRFxi02QJJI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-sj3usdXUl/wNElO3OgGx6dsBqn9+h9zq/AC3Zdn379M="; + hash = "sha256-NyIBFpDstX1MEoLS9p7GXl/+V6xB2hklNf2LmNLUMQk="; }; nativeBuildInputs = with python.pkgs; [ From 994c15243adb789297899018cc61423a15cc1344 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 24 Apr 2024 10:15:20 +0200 Subject: [PATCH 3/3] python312Packages.homeassistant-stubs: 2024.4.3 -> 2024.4.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.4.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index f8e4e49b13ff..d31cf8104dbe 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.4.3"; + version = "2024.4.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uFQQNcRfo4m3GnfCbAe4yjdphkpqnhpqVr1EZP3bqVM="; + hash = "sha256-BPmHorcyO6a7Ag7FQogkZYh2x3GoMRKiFh+9aSkjE7M="; }; nativeBuildInputs = [