diff --git a/apps/config/package.json b/apps/config/package.json index 0c12cd6a..923147b1 100644 --- a/apps/config/package.json +++ b/apps/config/package.json @@ -5,12 +5,12 @@ "exports": "./index.ts", "devDependencies": { "@eslint/js": "9.18.0", - "@stylistic/eslint-plugin": "2.12.1", + "@stylistic/eslint-plugin": "2.13.0", "eslint": "9.18.0", "eslint-plugin-jsdoc": "50.6.1", "jiti": "2.4.2", "pkg-types": "1.3.0", "typescript": "5.7.3", - "typescript-eslint": "8.19.1" + "typescript-eslint": "8.20.0" } } diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index c2308d31..e207d75c 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-x4xfn5NiIfNwL0NSHX5j4hj3g1N/Lv5qhgaKMCcu7x0="; + npmDepsHash = "sha256-rDDf8IUW18Pbt0KDZrMoReO0Su1DsQ8eJKAF3NYQXu0="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index 1b7b7bab..0f12df23 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 e3f1fa95..48819e81 100644 --- a/apps/extract-subs/package.json +++ b/apps/extract-subs/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "eslint-conf": "file:../config", - "@types/node": "22.10.5", + "@types/node": "22.10.6", "esbuild": "0.24.2", "eslint": "9.18.0", "jiti": "2.4.2", diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 3791ee10..ef81c02f 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -9,7 +9,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-jriJB5WgUtrXG1X4W0Gp/vF2bH4d1ZkU5LUBWJ1o46Y="; + npmDepsHash = "sha256-VZhn8R8SC4XnWbY8sb6982Q4RY4pBfD+p6/cu9M5xho="; runtimeInputs = [ go diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index d2caae9e..4ec4bd03 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 71dca3a0..09b85b7a 100644 --- a/apps/update-sources/package.json +++ b/apps/update-sources/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "eslint-conf": "file:../config", - "@types/node": "22.10.5", + "@types/node": "22.10.6", "esbuild": "0.24.2", "eslint": "9.18.0", "jiti": "2.4.2", diff --git a/configurations/nos/modules/docker/nextcloud/images/nginx.nix b/configurations/nos/modules/docker/nextcloud/images/nginx.nix index e9ab9407..3215912a 100644 --- a/configurations/nos/modules/docker/nextcloud/images/nginx.nix +++ b/configurations/nos/modules/docker/nextcloud/images/nginx.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "nginx"; - imageDigest = "sha256:42e917aaa1b5bb40dd0f6f7f4f857490ac7747d7ef73b391c774a41a8b994f15"; - hash = "sha256-/cRsGy2N0RDeNigyUqOEDQbuExEKAnLPF+3XzV+We14="; + imageDigest = "sha256:2300fb715ab3a2595a3e6956db7379d25b2815973416e6261dde607ca3a86370"; + hash = "sha256-ffnlb1m2YeAr9Nj4oSYINmGTrvcazCuEMQaws6jCjpA="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 9ce8bf6a..a861c524 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/lib/flake/default.nix b/lib/flake/default.nix index 73abea47..8c546564 100644 --- a/lib/flake/default.nix +++ b/lib/flake/default.nix @@ -20,8 +20,7 @@ inputs: rec { inherit cudaSupport; allowUnfree = true; - # FIXME: Roslyn-ls uses dotnet6 - # https://github.com/NixOS/nixpkgs/blob/d3c42f187194c26d9f0309a8ecc469d6c878ce33/pkgs/by-name/ro/roslyn-ls/package.nix#L21 + # FIXME: Roslyn-ls uses dotnet6 https://pr-tracker.nelim.org/?pr=373293 permittedInsecurePackages = [ "dotnet-core-combined" diff --git a/lib/pkgs/mk-types/default.nix b/lib/pkgs/mk-types/default.nix index 784fd73f..f3df6714 100644 --- a/lib/pkgs/mk-types/default.nix +++ b/lib/pkgs/mk-types/default.nix @@ -21,7 +21,7 @@ in pname = "${pname}-types"; version = "0.0.0"; - npmDepsHash = "sha256-Ory8Ia4BYgHzmftcSQm6k4P14IRgqYDYGmckxTiuGLs="; + npmDepsHash = "sha256-SRk3DD/CyvS2QgOaA2jCExvkDIBMTSorLIA4jtn5Nls="; src = ./.; dontNpmBuild = true; diff --git a/lib/pkgs/mk-types/package-lock.json b/lib/pkgs/mk-types/package-lock.json index b95aac1b..67b85b82 100644 Binary files a/lib/pkgs/mk-types/package-lock.json and b/lib/pkgs/mk-types/package-lock.json differ diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index ca67fa53..80937a94 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-Kv9I+qf1b40FhV1orDFUIhURw1rvA8ggU+eXcZS+KXU="; + npmDepsHash = "sha256-JE84VZUaBSs/Rw3Sk6/N6JY0TcEbq3MTo6uuW7tuU0k="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index e5eda6b2..c9c9470d 100644 Binary files a/modules/ags/config/package-lock.json and b/modules/ags/config/package-lock.json differ diff --git a/modules/ags/config/package.json b/modules/ags/config/package.json index c9a7e6fe..5000e3e5 100644 --- a/modules/ags/config/package.json +++ b/modules/ags/config/package.json @@ -5,11 +5,11 @@ "dependencies": { "astal": "https://gitpkg.vercel.app/Aylur/astal/lang/gjs/src?main", "@eslint/js": "9.18.0", - "@stylistic/eslint-plugin": "2.12.1", + "@stylistic/eslint-plugin": "2.13.0", "eslint": "9.18.0", "eslint-plugin-jsdoc": "50.6.1", "fzf": "0.5.2", "jiti": "2.4.2", - "typescript-eslint": "8.19.1" + "typescript-eslint": "8.20.0" } } diff --git a/overlays/build-failures/bat-extras.nix b/overlays/build-failures/bat-extras.nix deleted file mode 100644 index 9e7607d6..00000000 --- a/overlays/build-failures/bat-extras.nix +++ /dev/null @@ -1,209 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - makeWrapper, - bat, - # batdiff, batgrep, and batwatch - coreutils, - getconf, - less, - # tests - bash, - zsh, - fish, - # batgrep - ripgrep, - # prettybat - withShFmt ? shfmt != null, - shfmt ? null, - withPrettier ? nodePackages ? prettier, - nodePackages ? null, - withClangTools ? clang-tools != null, - clang-tools ? null, - withRustFmt ? rustfmt != null, - rustfmt ? null, - # batwatch - withEntr ? entr != null, - entr ? null, - # batdiff - gitMinimal, - withDelta ? delta != null, - delta ? null, - # batman - util-linux, -}: let - # Core derivation that all the others are based on. - # This includes the complete source so the per-script derivations can run the tests. - core = stdenv.mkDerivation rec { - pname = "bat-extras"; - version = "2024.07.10"; - - src = fetchFromGitHub { - owner = "eth-p"; - repo = "bat-extras"; - rev = "v${version}"; - hash = "sha256-6IRAKSy5f/WcQZBcJKVSweTjHLznzdxhsyx074bXnUQ="; - fetchSubmodules = true; - }; - - # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up - nativeBuildInputs = [bat]; - - dontConfigure = true; - - patches = [ - (fetchpatch { - url = "https://github.com/petrzjunior/nixpkgs/raw/80d08100fa04fdb0187f3a7a8667e12aa3614b5e/pkgs/tools/misc/bat-extras/disable-theme-tests.patch"; - hash = "sha256-vBNMaJFwr9zTobvIRc5VljMPG3kVk07E+mNc1SJVyzg="; - }) - ]; - - postPatch = '' - patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh - ''; - - buildPhase = '' - runHook preBuild - bash ./build.sh --minify=none --no-verify - runHook postBuild - ''; - - # Run the library tests as they don't have external dependencies - doCheck = true; - nativeCheckInputs = - [ - bash - fish - zsh - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [getconf]); - checkPhase = '' - runHook preCheck - # test list repeats suites. Unique them - declare -A test_suites - while read -r action arg _; do - [[ "$action" == "test_suite" && "$arg" == lib_* ]] && - test_suites+=(["$arg"]=1) - done <<<"$(./test.sh --compiled --list --porcelain)" - (( ''${#test_suites[@]} != 0 )) || { - echo "Couldn't find any library test suites" - exit 1 - } - ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - cp -a . $out - runHook postInstall - ''; - - # A few random files have shebangs. Don't patch them, they don't make it into the final output. - # The per-script derivations will go ahead and patch the files they actually install. - dontPatchShebangs = true; - - meta = with lib; { - description = "Bash scripts that integrate bat with various command line tools"; - homepage = "https://github.com/eth-p/bat-extras"; - license = with licenses; [mit]; - maintainers = with maintainers; [bbigras]; - platforms = platforms.all; - }; - }; - script = name: - # the name of the script - dependencies: - # the tools we need to prefix onto PATH - stdenv.mkDerivation { - pname = name; - inherit (core) version; - - src = core; - - nativeBuildInputs = [makeWrapper]; - # Make the dependencies available to the tests. - buildInputs = dependencies; - - # Patch shebangs now because our tests rely on them - postPatch = '' - patchShebangs --host bin/${name} - ''; - - dontConfigure = true; - dontBuild = true; # we've already built - - doCheck = true; - nativeCheckInputs = - [ - bat - bash - fish - zsh - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [getconf]); - checkPhase = '' - runHook preCheck - bash ./test.sh --compiled --suite ${name} - runHook postCheck - ''; - - installPhase = - '' - runHook preInstall - mkdir -p $out/bin - cp -p bin/${name} $out/bin/${name} - '' - + lib.optionalString (dependencies != []) '' - wrapProgram $out/bin/${name} \ - --prefix PATH : ${lib.makeBinPath dependencies} - '' - + '' - runHook postInstall - ''; - - # We already patched - dontPatchShebangs = true; - - meta = - core.meta - // { - mainProgram = name; - }; - }; - optionalDep = cond: dep: - assert cond -> dep != null; - lib.optional cond dep; -in { - batdiff = script "batdiff" ( - [ - less - coreutils - gitMinimal - ] - ++ optionalDep withDelta delta - ); - batgrep = script "batgrep" [ - less - coreutils - ripgrep - ]; - batman = script "batman" (lib.optionals stdenv.hostPlatform.isLinux [util-linux]); - batpipe = script "batpipe" [less]; - batwatch = script "batwatch" ( - [ - less - coreutils - ] - ++ optionalDep withEntr entr - ); - prettybat = script "prettybat" ( - [] - ++ optionalDep withShFmt shfmt - ++ optionalDep withPrettier nodePackages.prettier - ++ optionalDep withClangTools clang-tools - ++ optionalDep withRustFmt rustfmt - ); -} diff --git a/overlays/build-failures/default.nix b/overlays/build-failures/default.nix index 4df84373..732eb07d 100644 --- a/overlays/build-failures/default.nix +++ b/overlays/build-failures/default.nix @@ -1,11 +1,4 @@ -final: prev: let - pkgs = final; - - inherit (pkgs) callPackages recurseIntoAttrs; -in { - # FIXME: https://pr-tracker.nelim.org/?pr=373146 - bat-extras = recurseIntoAttrs (callPackages ./bat-extras.nix {}); - +final: prev: { # FIXME: https://pr-tracker.nelim.org/?pr=357699 nodejs_latest = prev.nodejs_22; }