From 48919134717aa4163a41a4aea9d35560394223e1 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 17 Sep 2024 22:30:10 -0400 Subject: [PATCH] chore: get rid of home-llm --- flake.lock | 17 ------------ flake.nix | 6 ----- inputs.nix | 4 --- legacyPackages/hass-components/default.nix | 1 - legacyPackages/hass-components/home-llm.nix | 29 --------------------- 5 files changed, 57 deletions(-) delete mode 100644 legacyPackages/hass-components/home-llm.nix diff --git a/flake.lock b/flake.lock index 8bdcccb8..b74e5deb 100644 --- a/flake.lock +++ b/flake.lock @@ -527,22 +527,6 @@ "type": "github" } }, - "home-llm-src": { - "flake": false, - "locked": { - "lastModified": 1726328658, - "narHash": "sha256-+eYfywWjSBc/zrAjAU9nGPwS0SO6yRqOwaStgieVSU8=", - "owner": "acon96", - "repo": "home-llm", - "rev": "4f145d29224ab33d151e90cccdba87131c3b7b19", - "type": "github" - }, - "original": { - "owner": "acon96", - "repo": "home-llm", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -1648,7 +1632,6 @@ "gtk-session-lock": "gtk-session-lock", "gtk-theme-src": "gtk-theme-src", "headscale": "headscale", - "home-llm-src": "home-llm-src", "home-manager": "home-manager", "hyprgrass": "hyprgrass", "hyprland": "hyprland", diff --git a/flake.nix b/flake.nix index 1d510cf0..cb36159b 100644 --- a/flake.nix +++ b/flake.nix @@ -123,12 +123,6 @@ rev = "022fb24cd92035470496d50d86bf8c9ee74b1e7e"; type = "github"; }; - home-llm-src = { - flake = false; - owner = "acon96"; - repo = "home-llm"; - type = "github"; - }; home-manager = { inputs.nixpkgs.follows = "nixpkgs"; owner = "nix-community"; diff --git a/inputs.nix b/inputs.nix index 8b438fe3..64f24aa8 100644 --- a/inputs.nix +++ b/inputs.nix @@ -163,10 +163,6 @@ let srcs = [ # Home-assistant - { - owner = "acon96"; - repo = "home-llm"; - } { name = "extended-ollama-conversation-src"; owner = "TheNimaj"; diff --git a/legacyPackages/hass-components/default.nix b/legacyPackages/hass-components/default.nix index 9097f730..bbbd9141 100644 --- a/legacyPackages/hass-components/default.nix +++ b/legacyPackages/hass-components/default.nix @@ -3,6 +3,5 @@ pkgs.lib.makeScope pkgs.newScope (hass: let buildHassComponent = file: hass.callPackage file (inputs // {}); in { - home-llm = buildHassComponent ./home-llm.nix; extended-ollama-conversation = buildHassComponent ./extended-ollama-conversation.nix; }) diff --git a/legacyPackages/hass-components/home-llm.nix b/legacyPackages/hass-components/home-llm.nix deleted file mode 100644 index 8f11db27..00000000 --- a/legacyPackages/hass-components/home-llm.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - buildHomeAssistantComponent, - home-llm-src, - python3Packages, - ... -}: let - inherit (builtins) fromJSON readFile; - - manifest = fromJSON (readFile "${home-llm-src}/custom_components/llama_conversation/manifest.json"); -in - buildHomeAssistantComponent { - owner = "acon96"; - - inherit (manifest) domain version; - - src = home-llm-src; - - # FIXME: remove this on next release 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" - ''; - - propagatedBuildInputs = with python3Packages; [ - huggingface-hub - requests - webcolors - ]; - }