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"
   ]
 )
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 = [
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
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 = [