diff --git a/apps/update/src/misc.ts b/apps/update/src/misc.ts index 5489c70b..67d55be0 100644 --- a/apps/update/src/misc.ts +++ b/apps/update/src/misc.ts @@ -90,7 +90,7 @@ export const updateVuetorrent = () => { }; export const updateCustomSidebarDeps = () => spawnSync( - `nix run ${FLAKE}#legacyPackages.x86_64-linux.lovelace-components.custom-sidebar.update`, + `nix run ${FLAKE}#lovelace-components.custom-sidebar.update`, [], { shell: true }, ).stderr.toString(); diff --git a/common/modules/locale.nix b/common/modules/locale.nix index 3f3d9ae2..50ebc38c 100644 --- a/common/modules/locale.nix +++ b/common/modules/locale.nix @@ -28,7 +28,7 @@ inherit (pkgs) noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf font-awesome diff --git a/common/packages.nix b/common/packages.nix index 3db989c3..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 { @@ -62,7 +48,7 @@ inputs @ { (pkgs) findutils diffutils - utillinux + util-linux which imagemagick ; diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix index 6d175bc4..10f51bbb 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:74c7cddafcf4c8cadad1317f043cd7ed9f675617197051d38812b262a7afd82b"; - sha256 = "1ify93xr6vcphbflrh654vy8z8937v0qmhfnfn1fidzjg4774zar"; + imageDigest = "sha256:456898884eb289ef4590e654804e05b84866279495768bf12bc91451ca160329"; + sha256 = "1pgcd1lk9x93q16l732yfd7dz3ywc0yjrdyfxj5p5y5x9ni30dpz"; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix index 1d714430..202b0a8f 100644 --- a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:5baf571c177eda579fbaa080ade2135bce9097bc3c165f92d30e399df64d0bc4"; - sha256 = "1sgdlrkm3wmcbncv4488365vjhfg00vn4jghnrpd402cypvkrqch"; + imageDigest = "sha256:5e915ab0bdf0aed036f2bce05abcfa85e4fb748df982cdbca1e600a77e02ab24"; + sha256 = "1snyqdwyg51icbryrzbd0xaq40j4qmdzikxyw2s64lq9q5vmf6xy"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix index fb7936a7..22976fa6 100644 --- a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix +++ b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/prowlarr"; - imageDigest = "sha256:806916104582ff18024b1234a0c82e113c160037f0bf0e6c076e14528bbab331"; - sha256 = "11wwcxn7m8nq7khl9vi97blxr0fwq0d3il53jq9bl09wncbg4in9"; + imageDigest = "sha256:1e2fffd859ecd260e4aae4798cf5be75938cd602161d21b1d58122afb397c864"; + sha256 = "02al6d5jl4avj3jyrvpp3d8g5vq81n76aspfv9s91fbmjgv9g60p"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix index 97e79172..6a6e8967 100644 --- a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:ab4fc46cb5e2702f640b28bdc9b460c98b73a9898dd61f7068229f140c26409a"; - sha256 = "0zx1glxr3adwcd6migh8lal30aih9rzmlzkqzlz2vrad7j3i5h1y"; + imageDigest = "sha256:293517b90ef929178387f07c074c1f88d96d94eac3c1d95944ba2891527c1396"; + sha256 = "142ngzxx3vp59srmxs8ba0xpim2aaxk5scgf0xg3p6ki4rg2zx12"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/devices/nos/modules/llm.nix b/devices/nos/modules/llm.nix index a484b4cc..466bbd66 100644 --- a/devices/nos/modules/llm.nix +++ b/devices/nos/modules/llm.nix @@ -13,28 +13,38 @@ in { services = { # Speech-to-Text wyoming.faster-whisper = { - # FIXME: wyoming-faster-whisper requires av < 13.0.0. make issue in nixpkgs? - package = pkgs.wyoming-faster-whisper.override { - python3Packages = - (pkgs.python3.override { - packageOverrides = pyfinal: pyprev: { - av = - (pyprev.av.override { - ffmpeg-headless = pkgs.ffmpeg_6-headless; - }) - .overridePythonAttrs (o: rec { - version = "12.3.0"; + # 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 = "PyAV-Org"; - repo = "PyAV"; - rev = "refs/tags/v${version}"; - hash = "sha256-ezeYv55UzNnnYDjrMz5YS5g2pV6U/Fxx3e2bCoPP3eI="; + owner = "SYSTRAN"; + repo = "faster-whisper"; + rev = "d57c5b40b06e59ec44240d93485a95799548af50"; + hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; }; - }); - }; - }) - .pkgs; - }; + 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="; + }; + }; servers."en" = { enable = true; diff --git a/devices/nos/modules/qbittorrent/vuetorrent.nix b/devices/nos/modules/qbittorrent/vuetorrent.nix index c848627f..82698a0a 100644 --- a/devices/nos/modules/qbittorrent/vuetorrent.nix +++ b/devices/nos/modules/qbittorrent/vuetorrent.nix @@ -1,6 +1,6 @@ # This file was autogenerated. DO NOT EDIT! { - version = "2.14.1"; - url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.14.1/vuetorrent.zip"; - hash = "sha256-WCLsswPtAveGEI75jdTDhSfY/QLR4FmV81qjL+QLAis="; + version = "2.15.0"; + url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.15.0/vuetorrent.zip"; + hash = "sha256-V/yro4Z00zd6mmXyRsoQwPW23BRbvQ4h6h5mVq1X2d0="; } diff --git a/flake.lock b/flake.lock index ae085258..adc2c5a9 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 3e9b48c0..045d2955 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs.nix b/inputs.nix index ee7df55c..5b716026 100644 --- a/inputs.nix +++ b/inputs.nix @@ -113,9 +113,6 @@ let hyprland = mkDep { owner = "hyprwm"; repo = "Hyprland"; - - # FIXME: wait for hyprgrass and hyprland-plugins to chase hyprland - rev = "62ee5cc2739d70570dbe143c9bd75d00a51db942"; }; hyprland-plugins = mkHyprDep { diff --git a/legacyPackages/lovelace-components/custom-sidebar/default.nix b/legacyPackages/lovelace-components/custom-sidebar/default.nix index 78454e12..cbf44ac8 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-Lk2zRcF4ysAeo0fYKDfCoORyOrViKaK1TLUo0atZdr4="; + hash = "sha256-S2sibsq4lwoS1IMy46CTEQ/gyA5rX3zmUSiIx7owMMg="; }; passthru.update = concatTextFile { diff --git a/legacyPackages/lovelace-components/custom-sidebar/update.sh b/legacyPackages/lovelace-components/custom-sidebar/update.sh index e7105f2e..1e0c966e 100644 --- a/legacyPackages/lovelace-components/custom-sidebar/update.sh +++ b/legacyPackages/lovelace-components/custom-sidebar/update.sh @@ -4,10 +4,10 @@ file="$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix" old_hash="$(sed -n 's/.*hash = "\(.*\)";/\1/p' "$file")" sed -i "s/hash = .*/hash = \"\";/" "$file" -npm_hash="$(nix build "$FLAKE#legacyPackages.x86_64-linux.lovelace-components.custom-sidebar" |& sed -n 's/.*got: *//p')" +npm_hash="$(nix build "$FLAKE#lovelace-components.custom-sidebar" |& sed -n 's/.*got: *//p')" if [[ "$npm_hash" != "$old_hash" ]]; then - sed -i "s/hash = .*/hash = \"$npm_hash\";/" "$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix" + sed -i "s#hash = .*#hash = \"$npm_hash\";#" "$file" else - sed -i "s/hash = .*/hash = \"$old_hash\";/" "$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix" + sed -i "s#hash = .*#hash = \"$old_hash\";#" "$file" fi diff --git a/nixosModules/ags/config/services/clipboard.ts b/nixosModules/ags/config/services/clipboard.ts index 4936086a..f4e866fc 100644 --- a/nixosModules/ags/config/services/clipboard.ts +++ b/nixosModules/ags/config/services/clipboard.ts @@ -40,7 +40,7 @@ class Clipboard extends Service { private _decrementClipsLeft() { if (--this._clips_left === 0) { this.emit('history-searched'); - // FIXME: this is necessary when not putting a cap on clip amount + // this is necessary when not putting a cap on clip amount // exec(`prlimit --pid ${exec('pgrep ags')} --nofile=1024:`); } } @@ -85,7 +85,7 @@ class Clipboard extends Service { } private _getHistory(n = Clipboard._MAX_CLIPS) { - // FIXME: this is necessary when not putting a cap on clip amount + // this is necessary when not putting a cap on clip amount // exec(`prlimit --pid ${exec('pgrep ags')} --nofile=10024:`); // This command comes from '../../clipboard/script.sh' diff --git a/overlays/build-failures/default.nix b/overlays/build-failures/default.nix index 7e51b64f..853d14a5 100644 --- a/overlays/build-failures/default.nix +++ b/overlays/build-failures/default.nix @@ -7,4 +7,8 @@ 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; }