From 2e3612b7fb769093ec534c1cf1b9171fd527a519 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 20 Oct 2024 21:42:54 -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 'agsV2': 'github:Aylur/ags/a93f0ac' (2024-10-16) → 'github:Aylur/ags/b7f3896' (2024-10-19) • Updated input 'astal': 'github:Aylur/astal/f763c44' (2024-10-18) → 'github:Aylur/astal/bfb7e27' (2024-10-20) • Updated input 'custom-sidebar-src': 'github:elchininet/custom-sidebar/fcada91' (2024-10-15) → 'github:elchininet/custom-sidebar/80942f5' (2024-10-21) • Updated input 'home-manager': 'github:nix-community/home-manager/09a0c0c' (2024-10-18) → 'github:nix-community/home-manager/1e27f21' (2024-10-20) • Updated input 'hyprland': 'github:hyprwm/Hyprland/0e630e9' (2024-10-17) → 'github:hyprwm/Hyprland/62ee5cc' (2024-10-19) • Updated input 'nix-gaming': 'github:fufexan/nix-gaming/79f0e31' (2024-10-18) → 'github:fufexan/nix-gaming/177e270' (2024-10-20) • Updated input 'nix-index-db': 'github:Mic92/nix-index-database/5c54c33' (2024-10-13) → 'github:Mic92/nix-index-database/04f8a11' (2024-10-20) • Updated input 'nixd': 'github:nix-community/nixd/c38702b' (2024-10-01) → 'github:nix-community/nixd/d3c7e56' (2024-10-20) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5785b6b' (2024-10-16) → 'github:NixOS/nixpkgs/4c2fcb0' (2024-10-18) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/2535bdd' (2024-10-18) → 'github:nix-community/nixpkgs-wayland/7c64c3c' (2024-10-20) • Updated input 'pokemon-colorscripts-src': 'gitlab:phoneybadger/pokemon-colorscripts/0483c85' (2022-10-28) → 'gitlab:phoneybadger/pokemon-colorscripts/5802ff6' (2024-10-19) • Updated input 'sops-nix': 'github:Mic92/sops-nix/06535d0' (2024-10-08) → 'github:Mic92/sops-nix/c504fd7' (2024-10-20) • Updated input 'spotifywebapi-src': 'github:thlucas1/SpotifyWebApiPython/4bb0658' (2024-10-14) → 'github:thlucas1/SpotifyWebApiPython/8c6aff1' (2024-10-19) • Updated input 'tuya-local-src': 'github:make-all/tuya-local/587d622' (2024-10-18) → 'github:make-all/tuya-local/38744c0' (2024-10-21) Docker Images: • rssbridge/rss-bridge latest: sha256:da785b43f43e4f718c525d71453d6b7011db98c68434f02315cb7ee1ecc88889 → sha256:42b4d1d1e3fb2c361a3a2fe2921a847bbdcd0d6d14a4d411482665fc4560a58d --- apps/update/default.nix | 7 +++---- apps/update/package-lock.json | Bin 89953 -> 89993 bytes apps/update/package.json | 10 +++++----- apps/update/src/app.ts | 15 ++++++++++++++- apps/update/src/misc.ts | 15 ++++++++++++--- .../docker/freshrss/images/rss-bridge.nix | 4 ++-- flake.lock | Bin 57131 -> 57190 bytes flake.nix | Bin 11114 -> 11170 bytes inputs.nix | 3 +++ .../custom-sidebar/default.nix | 10 +++++++++- .../custom-sidebar/update.sh | 13 +++++++++++++ outputs.nix | 2 +- 12 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 legacyPackages/lovelace-components/custom-sidebar/update.sh diff --git a/apps/update/default.nix b/apps/update/default.nix index 75610c37..33b0871f 100644 --- a/apps/update/default.nix +++ b/apps/update/default.nix @@ -7,16 +7,15 @@ ... }: let inherit (lib) concatMapStringsSep getBin; - inherit (builtins) readFile fromJSON; - packageJSON = fromJSON (readFile ./package.json); + packageJSON = builtins.fromJSON (builtins.readFile ./package.json); in buildNpmPackage rec { pname = packageJSON.name; inherit (packageJSON) version; src = ./.; - npmDepsHash = "sha256-cg+U7MSeeSDrzSWfXAd69FBLN3R8n4+aCSggrdThZHw="; + npmDepsHash = "sha256-hNXuZi3kgst0wBzoOwNAthEXW5MrafDD6D3Zwzp0S78="; runtimeInputs = [ (callPackage ../../nixosModules/docker/updateImage.nix {}) @@ -25,7 +24,7 @@ in postInstall = '' wrapProgram $out/bin/${pname} \ - --prefix PATH : ${concatMapStringsSep ":" (p: getBin p) runtimeInputs} + --prefix PATH : ${concatMapStringsSep ":" (p: getBin p) runtimeInputs} ''; nodejs = nodejs_latest; diff --git a/apps/update/package-lock.json b/apps/update/package-lock.json index 258b88f4f47ebf097b76c6dedc75a8474ceac370..8f3487eaa9da5cd8189704bdb3e0f84c17344302 100644 GIT binary patch delta 2296 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 { const output = spawnSync( `git restore flake.lock &> /dev/null; nix flake update --flake ${FLAKE}` + - ' |& grep -v "warning: updating lock file"', + ' |& grep -v "warning: updating lock file" |& grep -v "unpacking"', [], { shell: true }, ).stdout @@ -56,8 +56,11 @@ export const updateDocker = () => { return updates; }; -const genVueText = (version: string, hash: string, url: string) => - `# This file was autogenerated. DO NOT EDIT! +const genVueText = ( + version: string, + hash: string, + url: string, +) => `# This file was autogenerated. DO NOT EDIT! { version = "${version}"; url = "${url}"; @@ -85,3 +88,9 @@ export const updateVuetorrent = () => { return OLD_VERSION !== VERSION ? `Vuetorrent: ${OLD_VERSION} -> ${VERSION}` : ''; }; + +export const updateCustomSidebarDeps = () => spawnSync( + `nix run ${FLAKE}#legacyPackages.x86_64-linux.lovelace-components.custom-sidebar.update`, + [], + { shell: true }, +).stderr.toString(); diff --git a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix index 8a7bee65..1d51a228 100644 --- a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:da785b43f43e4f718c525d71453d6b7011db98c68434f02315cb7ee1ecc88889"; - sha256 = "0zd27m1gwiw2n2dslv1mxvi54p5gbgfilib99i7f8vh3sf0z7dcd"; + imageDigest = "sha256:42b4d1d1e3fb2c361a3a2fe2921a847bbdcd0d6d14a4d411482665fc4560a58d"; + sha256 = "0f0d0710k99gq4dvayjl4n0aby8gly04jp9bn6qab0j3zy0wdb0y"; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 12e16c81a584078c35606a999e9502b733be295c..b66a09cc8035939a8615a852ebfa275c368c0d62 100644 GIT binary patch delta 2106 zcmb7FOKeB#Y3P8)dpyQ?8>RE8+gH9Pj5e|{hjxfK} zL&a`$qvG*pi2LbIkMM&;F;T0Oio3O3s!NPXY=^7)UEQ)L{&3ztJ}2xoJRTFkC&*AF zLro2c1Ryw)lrbp@6z<;h+WHj}x*<8yzzGD@hAguVRww70QPsATrNCd>E4*5dxb z8dph{5ng+}u?f4qz12#)z^lFeO4p&iT8Tl2&mf2+&W#cTF@PBoQW+E(#srLb1cc#s z{^pFm^z!%YleaDnKD+wS*che|gJWe|{q?jTlq=gMidrnI(L+(|VW zt!A#5!xiZ5+Am_~?b+1{JC}TMmLaXFQix+e;(&4xNeu~BzKl4H00=3Jq+`O-tN*`& zzht<5`N0`WuFcrbug}=mvM<^1KX`6%FLnRixceg`5Df*YEXuuP++bQIxlT1_ddTZ) z(O*w4A7oc{!YC6)^^!=!xW02$*gyW@QjBA!oE+LclVS*nh71BIa73B*ffLAA3={HI z!ra`1UAj3l`0$mFCP%Ok!p?u^q8D$6Bv;;8sYd06mFyOj`(iuW#m!W_(AY^-gZc2F z8g_KNQEv~8`DstgLVjdOKoAy=H0|i&2ujBpr#z%a5MM&=8!>d`r#)ytz7re#ufH=kNW5`nWZcJsLE^&s*1ecguA-bkEHVHR&3*R+9vVf3;sEQ231=h7 zzG4>c6!Yx8cg6>wz5UMAq_=H5hqL{g+o^%ieu?xg^ugO3lwARs-}Sy*bKUIOdv4OJ`pezBftsqIj(_4*Fa1#GF*S#G(?c3Qpq#<=aj_JaNL z-BU5H7*SY7lDl;wihLMq6k_EAuRH>OTw)^`=8qv?4w)W;9qzC{*C82^05<^ z!r|4}$W|JALAJw-XsuT4Q19OH;Vhak;{hKL!?RVdu70PA8KxN=j&1%DxBr23h zBIt6$!y}tIH-lkNkB6r1kEUh@^!ML9<8GJ>89r73^+|50w6_O}i|ITl)M|(2PQBHn z*+xCLu+>Yf?%h}p`-fB=8}Eas{wx-p5Ct#~wV}YZ5}^t@2N3S00U{zwVn>Y{F8|;u M8ZQ3jpMG-YznF2OD*ylh delta 1974 zcmXX{*=ti>uR! z6O3HcS_s%dMVak#ImNS&RVYOw*VG%XB1(q81qUo0p3o{r2Sj>+{#A0S1t`@L(Y@TWgJU zsS(!>&%v@d^5T_$y)lItK<@2>I}e)SDA%bb;5ac(4QnTdC|=71JvJ;H z9E#N@I&OrI`USF)lmmD6J>kAsy5-7Cvx`7RK>H6#iZK)_mi}nUvCtea7{^8vts+j{ z#>4%|7fXMdnTC>5>cZ`Xpd4lEdb3%pZFkH#OZ($oMeIZa%hH?0B+m6R;ZeS70~`h= zcUA;0k)B)h)Y=-X25_cax zeAO*2UVB3#C@9mI3x)_1oOnw~9UG#h&_qbABLcXC!+Y+7C;7=o53kNmdr$_>b$u`* zaT2z3L3bsrbO&s;muR0>s4B7@~j_L~*MGg9b_g0g%d_ z{i1X}HR(LgPt9;HF@x^isfA!v4+fw)D%ADKZZawBVUwpeU_UvM^ls`s?YRFuY0Ur*JPoe*`oe?t zN~Ic?Tf;_f3`vA#{N*i_>Tccsv4PbJ2V1}%^GhA2ATyIMyJA2)6 zxLI4-={52YZS^nKg*>ueZpx%mkWvXKk#S78P?2Ip5@Rfhq&J?gv&q7OY8?%!X(#u$^{ zvX@nU*aW@8ZZ0*HTjRBU6PD|3*x=D&Q|E^Hm2B>4sOpWxcy+*i?0l6kfB3fhOE7yM z5P`K>Mo7QeMbA7a6sz)3w@ji`SY400&FvUxvM{W1 ztX4-&pL$rTt!C>*9J=05ZaVPC@3^-p&=qLkl2aB4V+kn!!tk)hrNL~ssbU-4cU zg)g2EKQ?*m)5=TJ$UE%v;!RoFi~U8ljczhXmq)8{v#^eP1^;}dYTKodpfTWLc+}2Z zGX43PT=Zy$Aryhw5-a`dMS0|(tr%nL^Qf6GT0{)f7oqt447nf7-<$mNuRnU}{{-A< Ang9R* diff --git a/flake.nix b/flake.nix index 7cf04b91cc8bf569b50a9805b69069133470e85a..68ad27e3ed6ac471789d93416b8b801e584a5e06 100644 GIT binary patch delta 68 zcmaDAwkUjq2fuz%YMFwqf|8k0YN}~+vXQy5Ws13hskuQ)QmUbeak6Dnin(cufkC3F YVM>yviP7YbBC3-Y@NsO;;r}NM0Ov^+lK=n! delta 20 ccmZ1!{wi#P2mj;^+%l6F@NsNj!v9Yi0A0NZa{vGU diff --git a/inputs.nix b/inputs.nix index 52892bed..e57447bc 100644 --- a/inputs.nix +++ b/inputs.nix @@ -113,6 +113,9 @@ 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 9aa1d631..78454e12 100644 --- a/legacyPackages/lovelace-components/custom-sidebar/default.nix +++ b/legacyPackages/lovelace-components/custom-sidebar/default.nix @@ -1,4 +1,5 @@ { + concatTextFile, custom-sidebar-src, nodejs, pnpm, @@ -29,6 +30,13 @@ in pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-oERAaN/0uyImDRlxJIdKutFh3jYFJQh2KAeM1LXBpjU="; + hash = "sha256-Lk2zRcF4ysAeo0fYKDfCoORyOrViKaK1TLUo0atZdr4="; + }; + + passthru.update = concatTextFile { + name = "update"; + files = [./update.sh]; + executable = true; + destination = "/bin/update"; }; }) diff --git a/legacyPackages/lovelace-components/custom-sidebar/update.sh b/legacyPackages/lovelace-components/custom-sidebar/update.sh new file mode 100644 index 00000000..e7105f2e --- /dev/null +++ b/legacyPackages/lovelace-components/custom-sidebar/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +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')" + +if [[ "$npm_hash" != "$old_hash" ]]; then + sed -i "s/hash = .*/hash = \"$npm_hash\";/" "$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix" +else + sed -i "s/hash = .*/hash = \"$old_hash\";/" "$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix" +fi diff --git a/outputs.nix b/outputs.nix index 0c011e72..cb59b001 100644 --- a/outputs.nix +++ b/outputs.nix @@ -174,7 +174,7 @@ }) ++ [ (pkgs.writeShellApplication { - name = "updateNpmDeps"; + name = "bumpNpmDeps"; runtimeInputs = builtins.attrValues { inherit (pkgs)