From 20d2fc6b76106d5537639bbd357f0c9b0cc70574 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 4 Sep 2024 11:53:51 -0400 Subject: [PATCH] chore(hass): use proper terms for components --- devices/homie/modules/home-assistant.nix | 2 +- legacyPackages/default.nix | 2 +- legacyPackages/{hass-addons => hass-components}/default.nix | 4 ++-- legacyPackages/{hass-addons => hass-components}/home-llm.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename legacyPackages/{hass-addons => hass-components}/default.nix (60%) rename legacyPackages/{hass-addons => hass-components}/home-llm.nix (88%) diff --git a/devices/homie/modules/home-assistant.nix b/devices/homie/modules/home-assistant.nix index 5a3bce41..42c74375 100644 --- a/devices/homie/modules/home-assistant.nix +++ b/devices/homie/modules/home-assistant.nix @@ -26,7 +26,7 @@ ]; customComponents = builtins.attrValues { - inherit (self.legacyPackages.${pkgs.system}.hass-addons) home-llm; + inherit (self.legacyPackages.${pkgs.system}.hass-components) home-llm; }; config = { diff --git a/legacyPackages/default.nix b/legacyPackages/default.nix index 515d7fa0..f4099ea3 100644 --- a/legacyPackages/default.nix +++ b/legacyPackages/default.nix @@ -11,7 +11,7 @@ (pkgs.callPackage file ({inherit mkVersion;} // inputs)); in { dracula = mkScope ./dracula; - hass-addons = mkScope ./hass-addons; + hass-components = mkScope ./hass-components; firefoxAddons = mkScope ./firefox-addons; mpvScripts = mkScope ./mpv-scripts; } diff --git a/legacyPackages/hass-addons/default.nix b/legacyPackages/hass-components/default.nix similarity index 60% rename from legacyPackages/hass-addons/default.nix rename to legacyPackages/hass-components/default.nix index 7077bcfa..6a1e5f53 100644 --- a/legacyPackages/hass-addons/default.nix +++ b/legacyPackages/hass-components/default.nix @@ -1,7 +1,7 @@ {pkgs, ...} @ inputs: pkgs.lib.makeScope pkgs.newScope (hass: let - buildHassAddon = file: + buildHassComponent = file: hass.callPackage file (inputs // {}); in { - home-llm = buildHassAddon ./home-llm.nix; + home-llm = buildHassComponent ./home-llm.nix; }) diff --git a/legacyPackages/hass-addons/home-llm.nix b/legacyPackages/hass-components/home-llm.nix similarity index 88% rename from legacyPackages/hass-addons/home-llm.nix rename to legacyPackages/hass-components/home-llm.nix index 66121d3f..90c864f5 100644 --- a/legacyPackages/hass-addons/home-llm.nix +++ b/legacyPackages/hass-components/home-llm.nix @@ -13,10 +13,10 @@ in src = home-llm-src; + # FIXME: https://github.com/acon96/home-llm/issues/214 postPatch = '' substituteInPlace ./custom_components/llama_conversation/manifest.json \ - --replace-warn "huggingface-hub==0.23.0" "huggingface-hub>=0.23.0" \ - --replace-warn "webcolors<=1.13" "webcolors>=1.13" + --replace-warn "huggingface-hub==0.23.0" "huggingface-hub>=0.23.0" ''; propagatedBuildInputs = with python3Packages; [