From 0276873930473a3db383c0a666703097596d387a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Dec 2024 00:47:37 +0100 Subject: [PATCH 1/3] home-assistant: autoformat component-packages.nix --- pkgs/servers/home-assistant/update-component-packages.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 088a04283de8..68301faf35ec 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ packaging rich ])" -p pyright ruff isort +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ packaging rich ])" -p pyright ruff isort nixfmt-rfc-style # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each integration has an associated manifest.json, @@ -279,7 +279,8 @@ def main() -> None: else: build_inputs[component] = (attr_paths, extra_attrs, missing_reqs) - with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f: + outpath = os.path.dirname(sys.argv[0]) + "/component-packages.nix" + with open(outpath, "w") as f: f.write("# Generated by update-component-packages.py\n") f.write("# Do not edit!\n\n") f.write("{\n") @@ -307,6 +308,8 @@ def main() -> None: f.write(" ];\n") f.write("}\n") + run_sync(["nixfmt", outpath]) + supported_components = reduce(lambda n, c: n + (build_inputs[c][2] == []), components.keys(), 0) total_components = len(components) From 5bd03fcebd41e54c433e2afade95aed0935f0e85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Dec 2024 00:47:54 +0100 Subject: [PATCH 2/3] home-assistant: 2024.12.3 -> 2024.12.4 https://github.com/home-assistant/core/releases/tag/2024.12.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 32a27e73c3b6..1b4c2b851e33 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.12.3"; + version = "2024.12.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3aba836667ff..a99cb5cb50fb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -451,7 +451,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.12.3"; + hassVersion = "2024.12.4"; in python.pkgs.buildPythonApplication rec { @@ -472,13 +472,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-vsN5FR/XCMGLxOrKS4Zx35fSucDG7WzG27HCj6mAAIQ="; + hash = "sha256-1zvJCxPM6G4uTjSBesKu21Wde2xu1mEnWa2jYiw5ypo="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-VgobmCK4RITzUuIWbOc5mzzIJh4vLnmRMEzfR8k0uy4="; + hash = "sha256-XoII6cDT0aNoGJ8iXDanFOlzOwrSxQAcSHfL2n3QmQg="; }; build-system = with python.pkgs; [ From 648849fd3bb0563f3b70a33056afbda975933aa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Dec 2024 12:11:38 +0100 Subject: [PATCH 3/3] python312Packages.homeassistant-stubs: 2024.12.3 -> 2024.12.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.12.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 15a33aba4367..14bf031a6c05 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.12.3"; + version = "2024.12.4"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-fLJJi6X8x+yhTObF8tutMVArsbgdu5MAzO5eJvlnAtg="; + hash = "sha256-BHcL7t/LcSWthb902yYRC8w8hN34vuSsDcANSZXmYdk="; }; build-system = [