From 838727c4bee724d083d269cb4343ff09c6a307fe Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 23 Oct 2024 23:41:16 -0400 Subject: [PATCH] chore: update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'astal': 'github:Aylur/astal/004b123' (2024-10-22) → 'github:Aylur/astal/306e649' (2024-10-23) • Updated input 'custom-sidebar-src': 'github:elchininet/custom-sidebar/80942f5' (2024-10-21) → 'github:elchininet/custom-sidebar/5962ac7' (2024-10-24) • Updated input 'discord-overlay': 'github:matt1432/discord-nightly-overlay/256588e' (2024-10-06) → 'github:matt1432/discord-nightly-overlay/e4547ee' (2024-10-23) • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=1016597' (2024-10-18) → 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=422f214' (2024-10-22) • Updated input 'gtk-theme-src': 'github:dracula/gtk/e5c95d7' (2024-10-12) → 'github:dracula/gtk/a698492' (2024-10-21) • Updated input 'home-manager': 'github:nix-community/home-manager/1e27f21' (2024-10-20) → 'github:nix-community/home-manager/5ec753a' (2024-10-21) • Updated input 'hyprgrass': 'github:horriblename/hyprgrass/1535962' (2024-10-09) → 'github:horriblename/hyprgrass/76063c5' (2024-10-24) • Updated input 'hyprland': 'github:hyprwm/Hyprland/62ee5cc' (2024-10-19) → 'github:hyprwm/Hyprland/cdac649' (2024-10-23) • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS/bb69165' (2024-10-17) → 'github:Jovian-Experiments/Jovian-NixOS/82bdda1' (2024-10-21) • Updated input 'material-rounded-theme-src': 'github:Nerwyn/material-rounded-theme/40f93bd' (2024-10-10) → 'github:Nerwyn/material-rounded-theme/c722d1e' (2024-10-23) • Updated input 'material-symbols-src': 'github:beecho01/material-symbols/12c2a76' (2024-10-22) → 'github:beecho01/material-symbols/26224d6' (2024-10-23) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/177e270' (2024-10-20) → 'github:fufexan/nix-gaming/af2e2e0' (2024-10-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4c2fcb0' (2024-10-18) → 'github:NixOS/nixpkgs/1997e4a' (2024-10-20) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/7c64c3c' (2024-10-20) → 'github:nix-community/nixpkgs-wayland/7832830' (2024-10-23) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c504fd7' (2024-10-20) → 'github:Mic92/sops-nix/d089e74' (2024-10-23) • Updated input 'spotifyplus-src': 'github:thlucas1/homeassistantcomponent_spotifyplus/2cd0654' (2024-10-05) → 'github:thlucas1/homeassistantcomponent_spotifyplus/188f1ec' (2024-10-22) • Updated input 'tuya-local-src': 'github:make-all/tuya-local/38744c0' (2024-10-21) → 'github:make-all/tuya-local/6ebc191' (2024-10-22) Docker Images: • vegardit/gitea-act-runner dind-latest: sha256:74c7cddafcf4c8cadad1317f043cd7ed9f675617197051d38812b262a7afd82b → sha256:456898884eb289ef4590e654804e05b84866279495768bf12bc91451ca160329 • ghcr.io/linuxserver/bazarr latest: sha256:5baf571c177eda579fbaa080ade2135bce9097bc3c165f92d30e399df64d0bc4 → sha256:5e915ab0bdf0aed036f2bce05abcfa85e4fb748df982cdbca1e600a77e02ab24 • ghcr.io/linuxserver/prowlarr latest: sha256:806916104582ff18024b1234a0c82e113c160037f0bf0e6c076e14528bbab331 → sha256:1e2fffd859ecd260e4aae4798cf5be75938cd602161d21b1d58122afb397c864 • ghcr.io/linuxserver/sabnzbd latest: sha256:ab4fc46cb5e2702f640b28bdc9b460c98b73a9898dd61f7068229f140c26409a → sha256:293517b90ef929178387f07c074c1f88d96d94eac3c1d95944ba2891527c1396 Misc Sources: Vuetorrent: 2.14.1 -> 2.15.0 --- apps/update/src/misc.ts | 2 +- common/modules/locale.nix | 2 +- common/packages.nix | 18 +------ .../docker/forgejo/images/act_runner.nix | 4 +- .../docker/media/bazarr/images/bazarr.nix | 4 +- .../docker/media/prowlarr/images/prowlarr.nix | 4 +- .../docker/media/sabnzbd/images/sabnzbd.nix | 4 +- devices/nos/modules/llm.nix | 50 +++++++++++------- .../nos/modules/qbittorrent/vuetorrent.nix | 6 +-- flake.lock | Bin 57672 -> 57613 bytes flake.nix | Bin 11282 -> 11226 bytes inputs.nix | 3 -- .../custom-sidebar/default.nix | 2 +- .../custom-sidebar/update.sh | 6 +-- nixosModules/ags/config/services/clipboard.ts | 4 +- overlays/build-failures/default.nix | 4 ++ 16 files changed, 55 insertions(+), 58 deletions(-) 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 ae08525807a5a783afdfc8869ba4ba734873326e..adc2c5a94f283ffa164f6b5bdfcef2bfa989a69e 100644 GIT binary patch delta 2695 zcmXw5+i&AX8P#5rtd@mRE#0Ku?q*j_H`xS~x&LNXz2L-ld`oO6j$>PGwey>c<2a5T zUy|4oLht|&2-@vP&{je!FQqT2E#?JUcGdO)q!w68pHQU=@eH)@MPlNVKj71u@0|0U zGk<*V%#YtY^Fnn(FbWwFF8|Ken}ZM?(QYAHVExUt&Gj(StW%TUswCu5ZgG9H$qOJA zTTUlZ?oNI3&WC)?Fa!vO2!g;O21Bk42Am@)0*okvf-r+Ml`elSedj~yp89lV_~EH{ z$0h_t0TjZ0K7D0AN*BxZj$N-x9;s_UD&1tgSKdfwcS^-}WROqhmo`jmw^<*!??tBE z{mjGe!nrH6Tzd>FxwMvt5E+X?XpjZKDh??&1p0@CfjbqSac`!U{LCeH_t_cu*|{H# z1(0&;_Mf@B&@hX!wNB|UUrJjU403p>zS6YWoy>l*wN_|s)mOrf1$wntQSQ{km)vJ( zA8{|8|GN9vhMf#A{zq?ysySPYdOJ>dR>bH}5@m(E`~e>Ok@ zxz;n&H=B`78tLwo;=Oh+6&wv#HVf6A#l76XbdS_pDy{N|i6TSgw9Ef}%6;$rhDMy>+TYsoFfQX1c`?UB?X>!sgxwzLwXVd z?$^fF02;c+$CGC`d2mEc7X=_bnMgCc9`{*r28 z(;NV|Uz~LJpSkX?Jvlu`jS481&?@2u&{iN$H4m}zIs^YEqK&s+Ku5Hn3{AOvxw+xR zr>>ou5CP&0jd-6=rlmUS71<(A_uET_I#~hft$x10gf<%4?X}JNYG>`hbG+3UJ>aFt z6La2W3@fS_qnvw0O-uj+3IYNR4+Frg4*<%s2hX^dBgB36*5mGeVq*CE(&wkf{gqKV zy77f*ty#ts2=q%;h zEQ=yqKxP**L0F6IG*ZPQQpiM;g=MnSOjk{|K!PIo;KcoNWqOY2z=H6YX&+Voj%}ck zK|)%DWC$dsN>b$mZUp}A)cN7diQhah=1l^zyL0yHLci2luE;}>GbABO2Y4yE(ah_O z-mW=FttK!jwY&K!J_uy9JhEA>{FM7oX=0Y6P-_Vh2!stoLx9pg)tJUA3@rr$8wn^< zZvW?*VXgeL@o}$kfZ#FaeCa@Mua`xun~CF6PNb}8Mq@V9+1uU2(aq}m-l6Phd)V37 z8VP(^K5^&26LTs+$Ybb$VM4Iq*cgr|p-f4vkk2tM0>kuJ>WQ_gNh zW&ME02o;G&zPq%S+kp+Z15%{csrV#b4)&|H?mF&9xZiTheHJqJTxwz#F@%U_6kF+c z4MU$_mRl7fg-L+$vAr=d#KBKbGVI^s?;aWtu+JEBf*VhQ*a|H)_Yo`dHe~8bIc_ttk zDI26~tyFCl=o4a56an$&J@~9=~`wlmN2{7Wl~9jZMWZ;dhy9?Zu-T?ZgA}L z5(FSLniB-M?_9|k_jG&3m0#Qni{$@FcCGJwvfbI?CojHzaZGrPvHQoR>6@*}dZn{Z zo69=Y#l2P~xk+SacSDp84dMvZLz z$=z=a-@Mm5?SDTIVt%4+b0OK6sh!kHC%x9$Ny5E@;HY0)>o+3ZY6?e|li6H#w^R+g z_;94{8}B^o6Z)*%dw>4e)N|19>;VwfkVD3m@;@9+Rj35t8P|klCQ6}%hGaq@k3veOam1YWBZ445$ItP2Job#IqT-%&&$Y*|8IRu< z2(f`mRe^98g;hbSO1H?WijZ2`u!%|pO{*>|(RDYl=(0_ZJ^crI@8T}(?|kR?eZSxD z`+j!kp}Th;dZ)T5Ad!IE$L?MVHN!bQNKZ0}gVZ2Q3X^ENmiGO=h-XnTPWCG6gGR@6 zlasCzcHxP0x9^D+0I?Q6V9tBCde;wINJ#`@xx<{l(@57jn-2IK6B)zW0dz=HwfT z3?hlxJbSw{8dP>0WR%qw+zO@8mZ0Zk_1C*sIJ?+i#9vu2gdAJ%lS?-;EKwhBi_%uJ>{T<>Jr=4Su648VPO(&l-JM}SBCA=G+8p5F z3--@%pS6GZBuYYG280Iz#gYa(0GKna0ipi97B9-{(?@Q;b!?GP ziG-MQt{Tag(}Pflh8AoV1IP5S?=cf_GnP<7wm^W<@U-8m#;yC zcz_`GT?w=xhym^kKG{vl zWT{-5^zv2FM?PuQHuv`T(px)g#df0AI_zXeSzLyp{khUVi$883++MoIka0EFh-2w< zKsoT0fdp%*To-%*JnH%{iT${ooy-0IkGndzh7Teqrw`)KE-VS`)GX$;3au7R{xH|y zi0A9=YATeAG$)-=VYQncHPVSxW#0s$VS06=wS!!-oIRc1JZ^uzc6r4I)F>DP%0ouE z4^_^c6ahSdn0Un3POZ?JF(TWX{wVp|M;9UIjG%dgVt&SJhIVTaS%|In+VNqcO7t$N zlS=!rF(@|ckx_fR7Q!ZO3vVpj=PI{m#-J3FP9;HrIr4qwV}yhUX7!iOleEtT1_YS7 zNT<(Le!jRgql6IioFNmg_qsZqiGa=BwQxE-?$m~d(OPx;K*CC9vK6oIG*qU)gF3^x z6Mp^j^RuJ`1QNSkltUSK%6I2;&jWygz%!ool&6{d9I4^!mw$JhVZ!bG4=;y$)rePv zwS3A{Y7@D?w;D9o8uhhyVH=L);R9XXj_fD0vF_Ta;1ZshVA`8(&7 z1=z#b)0|<&iFUTyd1!TG;kWkwT^p)j%{d zecVYz^R0GlI~n$d+g{H^TTT0Vc-g)(hBJh&FHU@bIIDLAG>&QZX#q-Gw@&lcn^~etdt~ zo__0$eS2Zi-g^7OvqYmnD$Wp+~&E6Rxno%`AQkLFz1rRj|~v70QE zI**<^OfpGEx))jRpivB)OhwmrR_U6*`>vvx{O&*{|u2-|n=Ev*Cr z6M>r-lqlo6OAt52Ilj*&k%l=BaAUy9f6k|A`=hVUEn@czKhjMQjx{Iwi7t9;-NSrn zD_PnV#j0-Pa+<4LA?QtdnM5>O)(Lz6*s^`_+7tHE-#@vcDIkH*JuMwb?m^{703kld z3NffX-~l((nMdc2eiZb$1z%mAzW-U_*pdK3a&olHR7&l{s20eJPw`+>SNR zp1+fJ)_QgN`sb}vClEnyuH8O<>4&VoU33!z>BH1ct5S?BoQ;>eiAJ_-&ZCvU#4?8r|YGxz#QEc;|vf)j}RFgTyviP2<3F4fKc{M|ADfTj|@ 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; }