🏡 Home Assistant Refresh

nixos/tests/all-tests.nix

@@ -445,7 +445,7 @@ in {
   hledger-web = handleTest ./hledger-web.nix {};
   hocker-fetchdocker = handleTest ./hocker-fetchdocker {};
   hockeypuck = handleTest ./hockeypuck.nix { };
-  home-assistant = handleTest ./home-assistant.nix {};
+  home-assistant = runTest ./home-assistant.nix;
   hostname = handleTest ./hostname.nix {};
   hound = handleTest ./hound.nix {};
   hub = handleTest ./git/hub.nix {};

nixos/tests/home-assistant.nix

@@ -1,4 +1,7 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+{
+  lib,
+  ...
+}:
 
 let
   configDir = "/var/lib/foobar";
@@ -32,24 +35,24 @@ in {
       });
 
       # provide component dependencies explicitly from the module
-      extraComponents = [
+      integrations = [
         "mqtt"
       ];
 
       # provide package for postgresql support
-      extraPackages = python3Packages: with python3Packages; [
+      extraPythonPackages = python3Packages: with python3Packages; [
         psycopg2
       ];
 
-      # test loading custom components
-      customComponents = with pkgs.home-assistant-custom-components; [
+      # test loading community maintained integration packages
+      integrationPackages = with pkgs.home-assistant-custom-components; [
         prometheus_sensor
         # tests loading multiple components from a single package
         spook
       ];
 
-      # test loading lovelace modules
-      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
+      # test loading lovelace resource modules
+      lovelaceResourcePackages = with pkgs.home-assistant-custom-lovelace-modules; [
         mini-graph-card
       ];
 
@@ -122,14 +125,14 @@ in {
     # Cause a configuration change that requires a service restart as we added a new runtime dependency
     specialisation.newFeature = {
       inheritParentConfig = true;
-      configuration.services.home-assistant.config.backup = {};
+      configuration.services.home-assistant.config.prometheus = {};
     };
 
     specialisation.removeCustomThings = {
       inheritParentConfig = true;
       configuration.services.home-assistant = {
-        customComponents = lib.mkForce [];
-        customLovelaceModules = lib.mkForce [];
+        integrationPackages = lib.mkForce [];
+        lovelaceResourcePackages = lib.mkForce [];
       };
     };
   };
@@ -206,25 +209,25 @@ in {
     with subtest("Check extra components are considered in systemd unit hardening"):
         hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB")
 
-    with subtest("Check service reloads when configuration changes"):
+    with subtest("Check service restart from SIGHUP"):
         pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
         cursor = get_journal_cursor()
         hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test")
-        new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
-        assert pid == new_pid, "The PID of the process should not change between process reloads"
         wait_for_homeassistant(cursor)
+        new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
+        assert pid != new_pid, "The PID of the process must change after sending SIGHUP"
 
     with subtest("Check service restarts when dependencies change"):
         pid = new_pid
         cursor = get_journal_cursor()
         hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test")
-        new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
-        assert pid != new_pid, "The PID of the process should change when its PYTHONPATH changess"
         wait_for_homeassistant(cursor)
+        new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service")
+        assert pid != new_pid, "The PID of the process must change when its PYTHONPATH changess"
 
     with subtest("Check that new components get setup after restart"):
         journal = get_journal_since(cursor)
-        for domain in ["backup"]:
+        for domain in ["prometheus"]:
             assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing"
 
     with subtest("Check custom components and custom lovelace modules get removed"):
@@ -242,4 +245,4 @@ in {
         hass.log(hass.succeed("systemctl cat home-assistant.service"))
         hass.log(hass.succeed("systemd-analyze security home-assistant.service"))
   '';
-})
+}

pkgs/servers/home-assistant/autocalling-package-set.nix

@@ -0,0 +1,21 @@
+{
+  lib,
+  callPackage,
+  baseDirectory,
+}:
+
+let
+  inherit (lib)
+    filterAttrs
+    mapAttrs'
+    nameValuePair
+    ;
+
+  inherit (builtins)
+    readDir
+    ;
+
+  toPackageAttribute =
+    dir: type: nameValuePair dir (callPackage (baseDirectory + "/${dir}/default.nix") { });
+in
+mapAttrs' toPackageAttribute (filterAttrs (_: type: type == "directory") (readDir baseDirectory))

pkgs/servers/home-assistant/custom-components/README.md

@@ -31,7 +31,7 @@ buildHomeAssistantComponent {
     # owner, repo, rev, hash
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     # python requirements, as specified in manifest.json
   ];
 

pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-k5pCgPM5xjVfWjOcr0UDFzYl/8z7yUwgYdBmC3+2F5k=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     ulid-transform
   ];
 

pkgs/servers/home-assistant/custom-components/awtrix/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-ucSaQWMS6ZwXHnw5Ct/STxpl1JjBRua3edrLvBAsdyw=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
   ];
 

pkgs/servers/home-assistant/custom-components/default.nix

@@ -1,82 +1,10 @@
-{ callPackage
-}:
-
 {
-  adaptive_lighting = callPackage ./adaptive_lighting {};
-
-  alarmo = callPackage ./alarmo {};
-
-  auth-header = callPackage ./auth-header {};
-
-  awtrix = callPackage ./awtrix {};
-
-  better_thermostat = callPackage ./better_thermostat {};
-
-  dwd = callPackage ./dwd { };
-
-  elevenlabs_tts = callPackage ./elevenlabs_tts {};
-
-  emporia_vue = callPackage ./emporia_vue {};
-
-  epex_spot = callPackage ./epex_spot {};
-
-  frigate = callPackage ./frigate {};
-
-  garmin_connect = callPackage ./garmin_connect {};
-
-  govee-lan = callPackage ./govee-lan {};
-
-  gpio = callPackage ./gpio {};
-
-  homematicip_local = callPackage ./homematicip_local { };
-
-  indego = callPackage ./indego { };
-
-  local_luftdaten = callPackage ./local_luftdaten { };
-
-  localtuya = callPackage ./localtuya {};
-
-  mass = callPackage ./mass { };
-
-  midea_ac_lan = callPackage ./midea_ac_lan {};
-
-  midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {};
-
-  miele = callPackage ./miele {};
-
-  moonraker = callPackage ./moonraker {};
-
-  ntfy = callPackage ./ntfy {};
-
-  omnik_inverter = callPackage ./omnik_inverter {};
-
-  prometheus_sensor = callPackage ./prometheus_sensor {};
-
-  samsungtv-smart = callPackage ./samsungtv-smart {};
-
-  sensi = callPackage ./sensi {};
-
-  smartir = callPackage ./smartir {};
-
-  smartthinq-sensors = callPackage ./smartthinq-sensors {};
-
-  solis-sensor = callPackage ./solis-sensor {};
-
-  somweb = callPackage ./somweb {};
-
-  spook = callPackage ./spook {};
-
-  tuya_local = callPackage ./tuya_local {};
-
-  volkswagen_we_connect_id = callPackage ./volkswagen_we_connect_id { };
-
-  volkswagencarnet = callPackage ./volkswagencarnet { };
-
-  waste_collection_schedule = callPackage ./waste_collection_schedule {};
-
-  xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {};
-
-  xiaomi_miot = callPackage ./xiaomi_miot {};
+  callPackage,
+  lib,
+  ...
+}:
 
-  yassi = callPackage ./yassi {};
+import ../autocalling-package-set.nix {
+  inherit callPackage lib;
+  baseDirectory = ./.;
 }

pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-6NrRuBjpulT66pVUfW9ujULL5HSzfgyic1pKEBRupNA=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     pyemvue
   ];
 

pkgs/servers/home-assistant/custom-components/epex_spot/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-BwNDI2OMF6bXqFcdr0AJgj9Gb6Uz8BWOfE7M4jqzQJc=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
   ];
 

pkgs/servers/home-assistant/custom-components/govee-lan/default.nix

@@ -29,7 +29,7 @@ buildHomeAssistantComponent {
 
   dontBuild = true;
 
-  propagatedBuildInputs = [
+  dependencies = [
     govee-led-wez
   ];
 

pkgs/servers/home-assistant/custom-components/gpio/default.nix

@@ -17,7 +17,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk=";
   };
 
-  propagatedBuildInputs = [ libgpiod ];
+  dependencies = [ libgpiod ];
 
   meta = with lib; {
     description = "Home Assistant GPIO custom integration";

pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-Fl8qwsW9NdjnYdu7IGQDelXTLqNx5ioUoxkhv+p5L0I=";
   };
 
-  propagatedBuildInputs = [ midea-beautiful-air ];
+  dependencies = [ midea-beautiful-air ];
 
   meta = with lib; {
     description = "Home Assistant custom component adding support for controlling Midea air conditioners and dehumidifiers on local network";

pkgs/servers/home-assistant/custom-components/miele/default.nix

@@ -17,7 +17,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-J9n4PFcd87L301B2YktrLcxp5Vu1HwDeCYnrMEJ0+TA=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     flatdict
     pymiele
   ];

pkgs/servers/home-assistant/custom-components/moonraker/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-J44JLV9w3ibVoPMEkDdti07fU2hxe46KK4WKQQ/Gn7c=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     moonraker-api
   ];
 

pkgs/servers/home-assistant/custom-components/ntfy/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-OGCAJsAsnUjwaLR8lCBdU+ghVOGFF0mT73t5JtcngUA=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
   ];
 

pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-O1NxT7u27xLydPqEqH72laU0tlYVrMPo0TwWIVNJ+0Q=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     omnikinverter
   ];
 

pkgs/servers/home-assistant/custom-components/sensi/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-NbK9h0nvcWNSwsc04YgjqKl+InijxftPJ3SLCQF/Hns=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     websockets
   ];
 

pkgs/servers/home-assistant/custom-components/smartir/default.nix

@@ -29,7 +29,7 @@ buildHomeAssistantComponent rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiofiles
     broadlink
   ];

pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix

@@ -18,7 +18,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-tLq4sqeKmjEDDaowA8ouH/mI7jQfq49kkt/a8+40rhQ=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     charset-normalizer
     pycountry
     xmltodict

pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix

@@ -18,7 +18,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-C8aY23e6iWANbhCRQYNHx+3fomVO+7qdxj+qfv+K3JM=";
   };
 
-  propagatedBuildInputs = [ zigpy ];
+  dependencies = [ zigpy ];
 
   dontBuild = true;
 

pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix

@@ -21,7 +21,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-wR5N6a+g4TE9cRv1k4zExCWiui7ZHwK54j0oUxnhcR0=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     hap-python
     micloud
     pyqrcode

pkgs/servers/home-assistant/custom-components/yassi/default.nix

@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
     hash = "sha256-pkwkXI05zDMEXPoE90YJBxoPYlzmSHH/BLExq0J1JrQ=";
   };
 
-  propagatedBuildInputs = [ pysmartthings ];
+  dependencies = [ pysmartthings ];
 
   meta = with lib; {
     description = "HomeAssistant integration for Samsung Soundbars";