From 2bbd19720343c0a6ec00c388d88053c936a06f6a Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Tue, 23 Dec 2025 09:45:14 +0000 Subject: [PATCH 1/4] buildHomeAssistantComponent: reintroduce nativeCheckInputs This fixes a bug introduced in commit 9dcea72b22ffcb9dac2f17b18b6c9cb96c66ce39 where they moved setup hooks from `nativeCheckInputs` to `nativeBuildInputs` without modifying the `removeAttrs` logic accordingly. This meant that: 1. callee's `nativeCheckInputs` parameter would be erroneously ignored, and 2. callee's `nativeBuildInputs` parameter would erroneously clobber the setup hooks previously defined in the `buildHomeAssistantComponent` function. Changing the `removeAttrs` logic so that it filters out callee's `nativeBuildInputs` parameter rather than `nativeCheckInputs` fixes the bug. --- pkgs/servers/home-assistant/build-custom-component/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 8d249bfa199c..9e58ee95ee31 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -62,7 +62,7 @@ home-assistant.python.pkgs.buildPythonPackage ( } // removeAttrs args [ "meta" - "nativeCheckInputs" + "nativeBuildInputs" "passthru" ] ) From 1c012617074c5eac315d3cfc2a2c5d387a061a37 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Thu, 25 Dec 2025 10:11:20 +0000 Subject: [PATCH 2/4] home-assistant-custom-components.mypyllant: fix tests --- ...ytest-homeassistant-custom-component.patch | 21 +++++++++++++++++++ .../custom-components/mypyllant/package.nix | 6 ++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch b/pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch new file mode 100644 index 000000000000..34bf35a26129 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch @@ -0,0 +1,21 @@ +diff --git a/tests/test_services.py b/tests/test_services.py +index 1fb07b3..f7a552c 100644 +--- a/tests/test_services.py ++++ b/tests/test_services.py +@@ -3,6 +3,7 @@ from dataclasses import asdict + + import pytest + from homeassistant.helpers.entity_registry import DATA_REGISTRY, EntityRegistry ++from homeassistant.helpers.trigger import TRIGGERS, TRIGGER_PLATFORM_SUBSCRIPTIONS + from homeassistant.loader import ( + DATA_COMPONENTS, + DATA_INTEGRATIONS, +@@ -31,6 +32,8 @@ def setup_hass_for_service_test(hass): + hass.data[DATA_PRELOAD_PLATFORMS] = {} + hass.data[DATA_MISSING_PLATFORMS] = {} + hass.data[DATA_REGISTRY] = EntityRegistry(hass) ++ hass.data[TRIGGER_PLATFORM_SUBSCRIPTIONS] = [] ++ hass.data[TRIGGERS] = {} + return hass + + diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix index e16c0fb998c8..4d2d6a607474 100644 --- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix @@ -1,6 +1,7 @@ { buildHomeAssistantComponent, fetchFromGitHub, + fetchpatch2, lib, # dependencies @@ -28,6 +29,11 @@ buildHomeAssistantComponent rec { hash = "sha256-6T8SGAP2535VqZmvSeITpMIa0SBJhnWsOKM1Y66WhHE="; }; + patches = [ + # Migrates tests to the new version of `pytest-homeassistant-custom-component` (see https://github.com/signalkraft/mypyllant-component/pull/394). + ./migrate-to-new-pytest-homeassistant-custom-component.patch + ]; + dependencies = [ mypyllant voluptuous From 6fd9dded2e8e0f729c096428cb298a2cbabe691a Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Thu, 25 Dec 2025 10:37:02 +0000 Subject: [PATCH 3/4] home-assistant-custom-components.moonraker: 1.11.1 -> 1.12.0 --- .../home-assistant/custom-components/moonraker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 87e5b2804008..736df6d7eec8 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -14,13 +14,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; tag = version; - hash = "sha256-3qxTigKBZ7maUylx0NCf70tURNUWFpo2TzgxnxqjUpA="; + hash = "sha256-T/7A5LmDmqaThTa1TnDbXwA0qeipIk750+k1Kt7tFeY="; }; dependencies = [ From cd55c6a8fcd97902fb1c6e97557672a127a21961 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Thu, 25 Dec 2025 16:13:39 +0000 Subject: [PATCH 4/4] Revert "home-assistant-custom-components.oref_alert: 4.1.1 -> 4.2.1" This reverts commit 22101ac61308fa55f31ff94349f43a72857d0afc. --- .../home-assistant/custom-components/oref_alert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix index f70df37c19b1..909e5c4e1129 100644 --- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix +++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "amitfin"; domain = "oref_alert"; - version = "4.2.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "amitfin"; repo = "oref_alert"; tag = "v${version}"; - hash = "sha256-mE39/f/2SmEJ5rTHhwmgGdQga4PQPGxoj/iKA1+Ou5k="; + hash = "sha256-nWp8cG0lFYUEO11lcZGkqx5QvOSfSVnqIqpHA8YAN30="; }; dependencies = [