diff --git a/apps/config/package.json b/apps/config/package.json index d7d293d0..907e6863 100644 --- a/apps/config/package.json +++ b/apps/config/package.json @@ -10,7 +10,7 @@ "eslint-plugin-jsdoc": "50.6.1", "jiti": "2.4.2", "pkg-types": "1.3.0", - "typescript": "5.7.2", + "typescript": "5.7.3", "typescript-eslint": "8.19.1" } } diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index bdf4b1f2..88f68f5c 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-j9nFdIPnN1nlBkWK0yYyShRTaAo2z0hiE+5nSMnWWYM="; + npmDepsHash = "sha256-VPvEbpLIuPx7Oax5UNEIf8/Gd34UMZkuQGt4bCnUwQQ="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index e815dd8f..3a94e884 100644 Binary files a/apps/extract-subs/package-lock.json and b/apps/extract-subs/package-lock.json differ diff --git a/apps/extract-subs/package.json b/apps/extract-subs/package.json index 32a55f1a..4aef5749 100644 --- a/apps/extract-subs/package.json +++ b/apps/extract-subs/package.json @@ -16,6 +16,6 @@ "esbuild": "0.24.2", "eslint": "9.17.0", "jiti": "2.4.2", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 91dd63b7..88aa02de 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -9,7 +9,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-Y4qFOepOdKihQPyEx/E5+ySCbsFeDOLM9h+angwJR4Y="; + npmDepsHash = "sha256-nAMu7riJm/6w+ixjzHm4W4YlqOkAwCapM3PHPW2BnnA="; runtimeInputs = [ go diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index 4ca8f404..95ef40e2 100644 Binary files a/apps/update-sources/package-lock.json and b/apps/update-sources/package-lock.json differ diff --git a/apps/update-sources/package.json b/apps/update-sources/package.json index 37623e34..c04599bc 100644 --- a/apps/update-sources/package.json +++ b/apps/update-sources/package.json @@ -13,6 +13,6 @@ "eslint": "9.17.0", "jiti": "2.4.2", "pkg-types": "1.3.0", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/configurations/nos/modules/docker/forgejo/images/act_runner.nix b/configurations/nos/modules/docker/forgejo/images/act_runner.nix index 9c2825b7..046671c4 100644 --- a/configurations/nos/modules/docker/forgejo/images/act_runner.nix +++ b/configurations/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:b918e08b14472ed8d0727e6a14948f252b99f4b5d2c0a68e283f816db4f28aa0"; - hash = "sha256-zkb7Yus1p9yv7HO1+byDepPzhRHjLlrjKLvqM5ZTXIs="; + imageDigest = "sha256:23678d1201b7b2a9b3960b20ff0fb658b5441774afe04ff615e572257c86fcf8"; + hash = "sha256-LK9diQGdecLQyTexPXyZEVv/NWyz789jrfkCh8gCR/Q="; finalImageName = imageName; finalImageTag = "dind-latest"; } diff --git a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix index ac783f99..16d8bd65 100644 --- a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:dc9aecdbbc73f2e78628a04d4e6973f8947b38f648a7d97927b80c6da340f22f"; - hash = "sha256-ZUznzJjc9z9LObMdLxzTrH5XaKJjrtX+fEKY7PffpFQ="; + imageDigest = "sha256:10c4e470397dffb67322e7c66b679c9ebf618858b0f435f1095ff035a2881fe6"; + hash = "sha256-FwchGPgbyHbvxFbA6+edhRLclWLwxcR/xhFnURklXro="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/immich/images/machine-learning.nix b/configurations/nos/modules/docker/immich/images/machine-learning.nix index a62069d1..6c07d0c2 100644 --- a/configurations/nos/modules/docker/immich/images/machine-learning.nix +++ b/configurations/nos/modules/docker/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-machine-learning"; - imageDigest = "sha256:fca90362ff3081fc7762d731eb24de262181eaec28afc51eff1d3ca5348663cd"; - hash = "sha256-AwbmheuzkSVBRl070NDkEOSt0VN0kwyEyywdVT6b8gw="; + imageDigest = "sha256:db61408634e608dde65ecda5b9d9cc8c20948d0e7b78b660bf33b3c526b6c1fd"; + hash = "sha256-c+yZWyrCcdQNc8tjEQZrgCVUulvgrg+4al8qPhBYqNs="; finalImageName = imageName; finalImageTag = "release"; } diff --git a/configurations/nos/modules/docker/immich/images/server.nix b/configurations/nos/modules/docker/immich/images/server.nix index 46a2c6d6..ae7df27c 100644 --- a/configurations/nos/modules/docker/immich/images/server.nix +++ b/configurations/nos/modules/docker/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/immich-app/immich-server"; - imageDigest = "sha256:666ce77995230ff7327da5d285c861895576977237de08564e3c3ddf842877eb"; - hash = "sha256-whUt1aZuvJv5HewqJ6WFWnnHdKy7pstyXzZsspJgg2A="; + imageDigest = "sha256:f86bb84d16bfa3364cad05529b903844c3c4da6f558a8fe4fe97ef6f152ca422"; + hash = "sha256-rnoBOzFTsXcjhHFe0rsQ5rOfZurBtTm4llngpR1fWTg="; finalImageName = imageName; finalImageTag = "release"; } diff --git a/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix b/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix index 3d3c5acd..92436585 100644 --- a/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:ac9fe56bee9133bcb9e27fe48faaf83c57b83d75bacc277d9b2619136632b1fe"; - hash = "sha256-TlsfPNOyZP5NF3Pv9rm7gZd3D7Fj2pznI9itYbhzdgU="; + imageDigest = "sha256:972715e7a7f18e14c39f2d10e833c5a823d11528e4531d3a496351f170e135d1"; + hash = "sha256-lqna5pNdexmsl51CnFCkQYlPXM2ZASOZ3v4aqWJezS8="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/resume/images/postgres.nix b/configurations/nos/modules/docker/resume/images/postgres.nix index 20ed27a6..9b3e99aa 100644 --- a/configurations/nos/modules/docker/resume/images/postgres.nix +++ b/configurations/nos/modules/docker/resume/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "postgres"; - imageDigest = "sha256:fd3abc9557df27613bd5c5e6608fc62fb04dc90c8e79c3322348d600e4b75478"; - sha256 = "1y5y3bvswpbacqmcrilw8c51ksw4vl5q2ldb05yx8947p7sgd238"; + imageDigest = "sha256:f85dd74a714c67792c72fc609becff10e0b0eaffca7b40aa1c6251d09c02b5d4"; + hash = "sha256-UOvKUq2TqVLk/KUgugUWWl568ikgj0ck9WV7YWlUqWI="; finalImageName = imageName; finalImageTag = "15-alpine"; } diff --git a/flake.lock b/flake.lock index 9edacf45..61d48b56 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 699654f9..cd571896 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs/default.nix b/inputs/default.nix index c4075453..9e9eb6ac 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -124,7 +124,9 @@ let }; hyprgrass = mkHyprDep { - owner = "horriblename"; + # FIXME: wait for https://github.com/horriblename/hyprgrass/pull/198 + # owner = "horriblename"; + owner = "matt1432"; repo = "hyprgrass"; }; diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index a770ddd5..4febee66 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-zOr430F6vkj9r8Cf1UcSRu5lWkOG101SC2iuWCu4LDA="; + npmDepsHash = "sha256-LP69kqHyQE/JLg8qZyQRyOQUSw5XgCIXeNbn3aKaAME="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index 71411add..93ae9891 100644 Binary files a/modules/ags/config/package-lock.json and b/modules/ags/config/package-lock.json differ diff --git a/scopedPackages/lovelace-components/material-rounded-theme/default.nix b/scopedPackages/lovelace-components/material-rounded-theme/default.nix index ea3dbf1b..1ae17fa6 100644 --- a/scopedPackages/lovelace-components/material-rounded-theme/default.nix +++ b/scopedPackages/lovelace-components/material-rounded-theme/default.nix @@ -15,7 +15,7 @@ in substituteInPlace ./webpack.config.js --replace-fail "git branch --show-current" "echo main" ''; - npmDepsHash = "sha256-INI/9N4IutwVc56w5iMzLgPtW6KQMBWwVBGN0fTxNz8="; + npmDepsHash = "sha256-l/g6gXCOyOe4N2ZawXsep1QpmvI31DTFgTQPp+LCDfk="; installPhase = '' mkdir $out diff --git a/scopedPackages/lovelace-components/material-rounded-theme/update.sh b/scopedPackages/lovelace-components/material-rounded-theme/update.sh index 29a9b49d..b7c98df0 100644 --- a/scopedPackages/lovelace-components/material-rounded-theme/update.sh +++ b/scopedPackages/lovelace-components/material-rounded-theme/update.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash file="$FLAKE/scopedPackages/lovelace-components/material-rounded-theme/default.nix" -old_hash="$(sed -n 's/.*hash = "\(.*\)";/\1/p' "$file")" +old_hash="$(sed -n 's/.*npmDepsHash = "\(.*\)";/\1/p' "$file")" -sed -i "s/hash = .*/hash = \"\";/" "$file" +sed -i "s/npmDepsHash = .*/npmDepsHash = \"\";/" "$file" npm_hash="$(nix build "$FLAKE#scopedPackages.x86_64-linux.lovelace-components.material-rounded-theme" |& sed -n 's/.*got: *//p')" if [[ "$npm_hash" != "$old_hash" ]]; then - sed -i "s#hash = .*#hash = \"$npm_hash\";#" "$file" + sed -i "s#npmDepsHash = .*#npmDepsHash = \"$npm_hash\";#" "$file" else - sed -i "s#hash = .*#hash = \"$old_hash\";#" "$file" + sed -i "s#npmDepsHash = .*#npmDepsHash = \"$old_hash\";#" "$file" fi