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 258b88f4..8f3487ea 100644 Binary files a/apps/update/package-lock.json and b/apps/update/package-lock.json differ diff --git a/apps/update/package.json b/apps/update/package.json index 7243bedd..2484ddd0 100644 --- a/apps/update/package.json +++ b/apps/update/package.json @@ -7,15 +7,15 @@ "build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs" }, "dependencies": { - "@eslint/js": "9.12.0", + "@eslint/js": "9.13.0", "@stylistic/eslint-plugin": "2.9.0", "@types/eslint__js": "8.42.3", - "@types/node": "22.7.5", + "@types/node": "22.7.7", "esbuild": "0.24.0", - "eslint": "9.12.0", - "eslint-plugin-jsdoc": "50.3.2", + "eslint": "9.13.0", + "eslint-plugin-jsdoc": "50.4.3", "jiti": "2.3.3", "typescript": "5.6.3", - "typescript-eslint": "8.8.1" + "typescript-eslint": "8.10.0" } } diff --git a/apps/update/src/app.ts b/apps/update/src/app.ts index 9e258c6c..6d421832 100644 --- a/apps/update/src/app.ts +++ b/apps/update/src/app.ts @@ -3,7 +3,13 @@ import { writeFileSync } from 'node:fs'; import { parseArgs } from './lib.ts'; import { updateFirefoxAddons } from '././firefox.ts'; -import { updateDocker, updateFlakeInputs, updateVuetorrent } from './misc.ts'; + +import { + updateCustomSidebarDeps, + updateDocker, + updateFlakeInputs, + updateVuetorrent, +} from './misc.ts'; /* Constants */ @@ -32,6 +38,10 @@ if (args['v'] || args['vuetorrent']) { console.log(updateVuetorrent()); } +if (args['c'] || args['custom-sidebar']) { + console.log(updateCustomSidebarDeps()); +} + if (args['a'] || args['all']) { // Update this first because of nix run cmd const firefoxOutput = updateFirefoxAddons(); @@ -53,6 +63,9 @@ if (args['a'] || args['all']) { console.log(vuetorrentOutput); + // This doesn't need to be added to commit msgs + console.log(updateCustomSidebarDeps()); + spawnSync('nix-fast-build', ['-f', `${FLAKE}#nixFastChecks`], { shell: true, diff --git a/apps/update/src/misc.ts b/apps/update/src/misc.ts index 91ec0973..5489c70b 100644 --- a/apps/update/src/misc.ts +++ b/apps/update/src/misc.ts @@ -10,7 +10,7 @@ const FLAKE = process.env.FLAKE; export const updateFlakeInputs = () => { 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 12e16c81..b66a09cc 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 7cf04b91..68ad27e3 100644 Binary files a/flake.nix and b/flake.nix differ 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)