diff --git a/common/packages.nix b/common/packages.nix index 3d1076ba..1600c22f 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -14,21 +14,7 @@ inputs @ { (self.overlays) xdg-desktop-portal-kde ; - }) - ++ [ - # FIXME: https://pr-tracker.nelim.org/?pr=349200 - (final: prev: { - tailscale = prev.tailscale.overrideAttrs rec { - version = "1.76.1"; - src = final.fetchFromGitHub { - owner = "tailscale"; - repo = "tailscale"; - rev = "v${version}"; - hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw="; - }; - }; - }) - ]; + }); environment.systemPackages = (builtins.attrValues { diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix index 10f51bbb..bad9150a 100644 --- a/devices/nos/modules/docker/forgejo/images/act_runner.nix +++ b/devices/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:456898884eb289ef4590e654804e05b84866279495768bf12bc91451ca160329"; - sha256 = "1pgcd1lk9x93q16l732yfd7dz3ywc0yjrdyfxj5p5y5x9ni30dpz"; + imageDigest = "sha256:fe6f44905830a17f404e9912e2c4fe2f4a2c47bb3ee35409da6476618cf9dab5"; + sha256 = "0jci209g7qqsqa1qi87fjj00q1yz8d4wj7gqsy4la8jjrkb23arg"; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/llm.nix b/devices/nos/modules/llm.nix index 466bbd66..2b5684fa 100644 --- a/devices/nos/modules/llm.nix +++ b/devices/nos/modules/llm.nix @@ -1,8 +1,4 @@ -{ - pkgs, - self, - ... -}: let +{self, ...}: let tailscaleIP = "100.64.0.4"; in { imports = [self.nixosModules.wyoming-plus]; @@ -12,49 +8,14 @@ in { services = { # Speech-to-Text - wyoming.faster-whisper = { - # FIXME: https://pr-tracker.nelim.org/?pr=350083 - package = - (pkgs.wyoming-faster-whisper.override { - python3Packages = - (pkgs.python3.override { - packageOverrides = pyfinal: pyprev: { - faster-whisper = pyprev.faster-whisper.overridePythonAttrs { - version = "unstable-2024-07-26"; - src = pkgs.fetchFromGitHub { - owner = "SYSTRAN"; - repo = "faster-whisper"; - rev = "d57c5b40b06e59ec44240d93485a95799548af50"; - hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; - }; - pythonRelaxDeps = [ - "tokenizers" - "av" - ]; - }; - }; - }) - .pkgs; - }) - .overridePythonAttrs rec { - version = "2.2.0"; - src = pkgs.fetchFromGitHub { - owner = "rhasspy"; - repo = "wyoming-faster-whisper"; - rev = "refs/tags/v${version}"; - hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48="; - }; - }; + wyoming.faster-whisper.servers."en" = { + enable = true; + uri = "tcp://${tailscaleIP}:10300"; - servers."en" = { - enable = true; - uri = "tcp://${tailscaleIP}:10300"; - - # see https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0 - model = "medium"; - language = "en"; - device = "cuda"; - }; + # see https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0 + model = "medium"; + language = "en"; + device = "cuda"; }; # Text-to-Intent diff --git a/flake.lock b/flake.lock index adc2c5a9..099d3da9 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/legacyPackages/lovelace-components/custom-sidebar/default.nix b/legacyPackages/lovelace-components/custom-sidebar/default.nix index cbf44ac8..510199ab 100644 --- a/legacyPackages/lovelace-components/custom-sidebar/default.nix +++ b/legacyPackages/lovelace-components/custom-sidebar/default.nix @@ -30,7 +30,7 @@ in pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-S2sibsq4lwoS1IMy46CTEQ/gyA5rX3zmUSiIx7owMMg="; + hash = "sha256-C7H8DPTAcHLE5dZr5cUdHnO2u/wkwrKi/TZi1M8SDDI="; }; passthru.update = concatTextFile { diff --git a/overlays/build-failures/default.nix b/overlays/build-failures/default.nix index 853d14a5..7e51b64f 100644 --- a/overlays/build-failures/default.nix +++ b/overlays/build-failures/default.nix @@ -7,8 +7,4 @@ final: prev: { rm dmd/compiler/test/fail_compilation/needspkgmod.d ''; }); - - # FIXME: get rid of these once inputs don't need them - utillinux = prev.util-linux; - noto-fonts-cjk = prev.noto-fonts-cjk-sans; }