Merge staging-next into staging

2025-10-07 12:08:18 +00:00
parent a51905a613 a1a992fa41
commit 993047cee0
137 changed files with 2698 additions and 883 deletions
@@ -1,9 +1,9 @@
 <p align="center">
  <a href="https://nixos.org">
    <picture>
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg">
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.svg">
-      <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg" width="500px" alt="NixOS logo">
+      <source media="(prefers-color-scheme: light)" srcset="https://brand.nixos.org/logos/nixos-logo-default-gradient-black-regular-horizontal-minimal.svg">
+      <source media="(prefers-color-scheme: dark)" srcset="https://brand.nixos.org/logos/nixos-logo-default-gradient-white-regular-horizontal-minimal.svg">
+      <img src="https://brand.nixos.org/logos/nixos-logo-default-gradient-black-regular-horizontal-minimal.svg" width="500px" alt="NixOS logo">
    </picture>
  </a>
 </p>
@@ -239,6 +239,8 @@

 - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update.

+- GIMP now defaults to version 3. Use `gimp2` for the old version.
+
 - `installShellCompletion`: now supports Nushell completion files

 - New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.
@@ -282,6 +284,8 @@
  recommendation](https://clickhouse.com/docs/faq/operations/production). Users
  can continue to use the `clickhouse-lts` package if desired.

+- `emacs` now disables the GC mark trace buffer by default. This improves GC performance by 5%, but can make GC issues harder to debug. This is configurable with `withGcMarkTrace`.
+
 - `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.

 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
@@ -15889,6 +15889,12 @@
    githubId = 33522919;
    name = "Marshall Arruda";
  };
+  mart-mihkel = {
+    email = "mart.mihkel.aun@gmail.com";
+    github = "mart-mihkel";
+    githubId = 73405010;
+    name = "Mart-Mihkel Aun";
+  };
  martijnvermaat = {
    email = "martijn@vermaat.name";
    github = "martijnvermaat";
@@ -467,7 +467,7 @@ in
        PrivateTmp = true;
        ProcSubset = "pid";
        ProtectClock = true;
-        ProtectControlGroups = true;
+        ProtectControlGroups = "strict";
        ProtectHome = true;
        ProtectHostname = true;
        ProtectKernelLogs = true;
@@ -377,7 +377,7 @@ in
        IMMICH_MEDIA_LOCATION = cfg.mediaLocation;
        IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003";
      }
-      // lib.optionalAttrs (cfg.settings != null || cfg.settingsFile != null) {
+      // lib.optionalAttrs (cfg.settings != null) {
        IMMICH_CONFIG_FILE = "/run/immich/config.json";
      };

@@ -14,14 +14,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qpwgraph";
-  version = "0.9.5";
+  version = "0.9.6";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "rncbc";
    repo = "qpwgraph";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-0cFsRMcQtzOM0tApmBRMhTR5J3Ohvm+ykChCvygpOQM=";
+    sha256 = "sha256-zhp6Mkb8iQF8tGXkYu+lgbMUNN/fk/gWBhzeDS4myJ0=";
  };

  nativeBuildInputs = [
@@ -33,7 +33,6 @@ melpaBuild {
        qrcode
      ]
      ++ ps.qrcode.optional-dependencies.pil;
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -36,6 +36,12 @@ melpaBuild (finalAttrs: {
    npmHooks.npmConfigHook
  ];

+  postPatch = ''
+    substituteInPlace buffer.py \
+      --replace-fail "aria2_args = [\"aria2c\"]" \
+                     "aria2_args = [\"${lib.getExe aria2}\"]"
+  '';
+
  files = ''
    ("*.el"
     "*.py"
@@ -55,9 +61,6 @@ melpaBuild (finalAttrs: {
      ps: with ps; [
        pysocks
      ];
-    eafOtherDeps = [
-      aria2
-    ];
  };

  meta = {
@@ -55,7 +55,6 @@ melpaBuild (finalAttrs: {
  passthru = {
    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
    eafPythonDeps = ps: [ ];
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -36,6 +36,14 @@ melpaBuild (finalAttrs: {
    npmHooks.npmConfigHook
  ];

+  postPatch = ''
+    substituteInPlace buffer.py \
+      --replace-fail "shutil.which(\"fd\")" \
+                     "shutil.which(\"${lib.getExe fd}\")" \
+      --replace-fail "return \"fd\"" \
+                     "return \"${lib.getExe fd}\""
+  '';
+
  postBuild = ''
    npm run build
  '';
@@ -62,9 +70,6 @@ melpaBuild (finalAttrs: {
        pygments
        exif
      ];
-    eafOtherDeps = [
-      fd
-    ];
  };

  meta = {
@@ -37,6 +37,16 @@ melpaBuild (finalAttrs: {
    npmHooks.npmConfigHook
  ];

+  postPatch = ''
+    substituteInPlace eaf-git.el \
+      --replace-fail "(defcustom eaf-git-delta-executable \"delta\"" \
+                     "(defcustom eaf-git-delta-executable \"${lib.getExe delta}\""
+
+    substituteInPlace buffer.py \
+      --replace-fail "command = \"rg '{}' {}" \
+                     "command = \"${lib.getExe ripgrep} '{}' {}"
+  '';
+
  postBuild = ''
    npm run build
  '';
@@ -65,10 +75,6 @@ melpaBuild (finalAttrs: {
        pygments
        unidiff
      ];
-    eafOtherDeps = [
-      delta
-      ripgrep
-    ];
  };

  meta = {
@@ -49,7 +49,6 @@ melpaBuild (finalAttrs: {
  passthru = {
    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
    eafPythonDeps = ps: [ ];
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -55,7 +55,6 @@ melpaBuild (finalAttrs: {
  passthru = {
    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
    eafPythonDeps = ps: [ ];
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -60,7 +60,6 @@ melpaBuild (finalAttrs: {
        pycurl
        python-tsp
      ];
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -31,7 +31,6 @@ melpaBuild {
        packaging
        pymupdf
      ];
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -31,7 +31,6 @@ melpaBuild {
        pyte
        psutil
      ];
-    eafOtherDeps = [ ];
  };

  meta = {
@@ -10,7 +10,6 @@
  # Emacs dependencies
  all-the-icons,
  # Other dependencies
-  nodejs,
  wmctrl,
  xdotool,
  # Updater
@@ -22,7 +21,6 @@
 let

  appPythonDeps = map (item: item.eafPythonDeps) enabledApps;
-  appOtherDeps = map (item: item.eafOtherDeps) enabledApps;

  pythonPackageLists = [
    (
@@ -41,26 +39,15 @@ let
  pythonPkgs = ps: builtins.concatLists (map (f: f ps) pythonPackageLists);
  pythonEnv = python3.withPackages pythonPkgs;

-  otherPackageLists = [
-    (
-      [
-        nodejs
-        wmctrl
-      ]
-      ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform xdotool) [ xdotool ]
-    )
-  ]
-  ++ appOtherDeps;
-  otherPkgs = builtins.concatLists otherPackageLists;
+  wmctrlExe = lib.getExe wmctrl;
+  xdotoolExe = lib.optionalString (lib.meta.availableOn stdenv.hostPlatform xdotool) (
+    lib.getExe xdotool
+  );

  appsDrv = symlinkJoin {
    name = "emacs-application-framework-apps";
    paths = enabledApps;
  };
-  depsBin = symlinkJoin {
-    name = "emacs-application-framework-deps-bin";
-    paths = otherPkgs;
-  };

 in

@@ -84,6 +71,20 @@ melpaBuild (finalAttrs: {
    substituteInPlace eaf.el \
      --replace-fail "\"python.exe\" \"python3\"" \
                     "\"python.exe\" \"${pythonEnv.interpreter}\""
+
+    substituteInPlace eaf.el \
+      --replace-fail "(executable-find \"wmctrl\")" \
+                     "(executable-find \"${wmctrlExe}\")" \
+      --replace-fail "(shell-command-to-string \"wmctrl -m\")" \
+                     "(shell-command-to-string \"${wmctrlExe} -m\")" \
+      --replace-fail "\"wmctrl -i -a \$(wmctrl -lp | awk -vpid=\$PID '\$3==%s {print \$1; exit}')\"" \
+                     "\"${wmctrlExe} -i -a \$(${wmctrlExe} -lp | awk -vpid=\$PID '\$3==%s {print \$1; exit}')\""
+
+    substituteInPlace eaf.el \
+      --replace-fail "(executable-find \"xdotool\")" \
+                     "(executable-find \"${xdotoolExe}\")" \
+      --replace-fail "(shell-command-to-string \"xdotool getactivewindow getwindowname\")" \
+                     "(shell-command-to-string \"${xdotoolExe} getactivewindow getwindowname\")"
  '';

  files = ''
@@ -112,13 +113,6 @@ melpaBuild (finalAttrs: {
      cp -r $APPNATDIR/. \
            $NATDIR/
    fi
-
-    mkdir -p $out/bin/
-    for item in ${depsBin}/bin/*; do
-      # Some symbolic links point to another symbolic link
-      ln -s $(readlink -f $item) \
-            $out/bin/$(basename $item)
-    done
  '';

  passthru.updateScript = unstableGitUpdater { };
@@ -74,6 +74,7 @@
  withCairo ? withX,
  withCsrc ? true,
  withDbus ? stdenv.hostPlatform.isLinux,
+  withGcMarkTrace ? false, # increase gc performance for reduced debugability
  withGTK3 ? withPgtk && !noGui,
  withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets),
  withGpm ? stdenv.hostPlatform.isLinux,
@@ -408,6 +409,7 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.withFeature withNS "ns")
  ]
  ++ [
+    (lib.enableFeature withGcMarkTrace "gc-mark-trace")
    (lib.withFeature withCompressInstall "compress-install")
    (lib.withFeature withToolkitScrollBars "toolkit-scroll-bars")
    (lib.withFeature withNativeCompilation "native-compilation")
@@ -2,7 +2,6 @@
  lib,
  vscode-utils,
  gemini-cli,
-  vsce,
 }:
 vscode-utils.buildVscodeExtension (finalAttrs: {
  pname = "gemini-cli-vscode-ide-companion";
@@ -15,8 +14,6 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
  src = gemini-cli.overrideAttrs (oldAttrs: {
    pname = "gemini-cli-vscode-ide-companion-vsix";

-    nativeBuildInputs = gemini-cli.nativeBuildInputs ++ [ vsce ];
-
    installPhase = ''
      runHook preInstall

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "dosbox-pure";
-  version = "0-unstable-2025-09-27";
+  version = "0-unstable-2025-09-28";

  src = fetchFromGitHub {
    owner = "schellingb";
    repo = "dosbox-pure";
-    rev = "92d9fbb8111bbb9e8be491315f0e50075036cf0b";
-    hash = "sha256-9MAche3fVHXiUQzhspHTConwkyJCAuRIRaWfEmo8Fko=";
+    rev = "150a8e02ec53bfd5fc571587dab902c075f9e291";
+    hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M=";
  };

  hardeningDisable = [ "format" ];
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "genesis-plus-gx";
-  version = "0-unstable-2025-09-26";
+  version = "0-unstable-2025-10-06";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "Genesis-Plus-GX";
-    rev = "6a635bd7cac75adb5af85cb3458ecf29f4baeeac";
-    hash = "sha256-loLaqa9tmX3oYd/xXNVLAS1Xq+FDWsQ6gcEl/iP9M9E=";
+    rev = "252a94c0c40047b52d9ecced567846a9dd5b2020";
+    hash = "sha256-Eys3iDJfi3bRuPjWRK34CEAN5o5MC+of1ktT7z2DdAI=";
  };

  meta = {
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "organicmaps";
-  version = "2025.09.25-5";
+  version = "2025.10.05-7";

  src = fetchFromGitHub {
    owner = "organicmaps";
    repo = "organicmaps";
    tag = "${finalAttrs.version}-android";
-    hash = "sha256-WRr4zLlzGiFnTDuqr+gpnE92f/BZY/c0Ij6x40Rr1LM=";
+    hash = "sha256-U7CGXwClKByLVn2LAgEavZ96+AyvUlrZlB3HQLaQYH0=";
    fetchSubmodules = true;
  };

@@ -38,14 +38,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "2.0.1";
+  version = "2.0.2";
  pname = "syncthingtray";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "syncthingtray";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-57Mq6zdSqPIK88E/CQkfwQe+Rf4kFTZ2o2shtPBWgRE=";
+    hash = "sha256-FZruyQ3ckWp9nUmCet4uTeU7TKukmW1D73Rx8EUUsVI=";
  };

  buildInputs = [
@@ -18,16 +18,15 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "soapysdr";
  # Don't forget to change passthru.abiVersion
-  version = "0.8.1-unstable-2025-03-30-03";
+  version = "0.8.1-unstable-2025-10-05-03";

  src = fetchFromGitHub {
    owner = "pothosware";
    repo = "SoapySDR";

-    # Instead of applying several patches for Python 3.12 compat, just take the latest, from:
-    # use old get python lib for v2 (#437)
-    rev = "fbf9f3c328868f46029284716df49095ab7b99a6";
-    hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk=";
+    # update to include latest patch for newer cmake support
+    rev = "1667b4e6301d7ad47b340dcdcd6e9969bf57d843";
+    hash = "sha256-UCpYBUb2k1bHy1z2Mvmv+1ZX1BloSsPrTydFV3Ga3Os=";
  };

  nativeBuildInputs = [
@@ -7,20 +7,20 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "amazon-q-cli";
-  version = "1.14.1";
+  version = "1.17.1";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "amazon-q-developer-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RZUe08hPcfPuovfDqndytjz+OVwd3SGvAhWp5XMm+jU=";
+    hash = "sha256-bRin4JKnBsWLvk+dIwHWAf4KKD1n6FOf2wICYNZpHd4=";
  };

  nativeBuildInputs = [
    rustPlatform.bindgenHook
  ];

-  cargoHash = "sha256-qcuxJf038260hr/1Mi5hgWC4Nwmj2xkt4XFkdfgs4QQ=";
+  cargoHash = "sha256-Isa7kxnov4D+Sd7b4LJW52TIR864CDFkAjAHJoVQRcA=";

  cargoBuildFlags = [
    "-p"
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "ashell";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "MalpenZibo";
    repo = "ashell";
    tag = version;
-    hash = "sha256-4OJHnYy3LcABDaSraqoXdTpdfcjRQd+B4hc2AOM/oi8=";
+    hash = "sha256-1PqK+jq0ZioTluwQtEp8rpB/ZNsrvQhLgJiyIM9PQ0k=";
  };

-  cargoHash = "sha256-6NNWdAUZQY2yPW8OGeQUjOCV+REI+LU2wpJGitqq5hI=";
+  cargoHash = "sha256-L8RxsDxL8oyR3kz+F/NckGikfNLg+Pa1DI2nFgHL5VM=";

  nativeBuildInputs = [
    pkg-config
@@ -0,0 +1,567 @@
+diff --git a/package-lock.json b/package-lock.json
+index 1b4fe5f40e..fe3166797e 100644
+--- a/package-lock.json
+++ b/package-lock.json
+@@ -230,51 +230,6 @@
+         "bw": "build/bw.js"
+       }
+     },
+-    "apps/cli/node_modules/define-lazy-prop": {
+-      "version": "2.0.0",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "apps/cli/node_modules/is-docker": {
+-      "version": "2.2.1",
+-      "license": "MIT",
+-      "bin": {
+-        "is-docker": "cli.js"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
+-      }
+-    },
+-    "apps/cli/node_modules/is-wsl": {
+-      "version": "2.2.0",
+-      "license": "MIT",
+-      "dependencies": {
+-        "is-docker": "^2.0.0"
+-      },
+-      "engines": {
+-        "node": ">=8"
+-      }
+-    },
+-    "apps/cli/node_modules/open": {
+-      "version": "8.4.2",
+-      "license": "MIT",
+-      "dependencies": {
+-        "define-lazy-prop": "^2.0.0",
+-        "is-docker": "^2.1.1",
+-        "is-wsl": "^2.2.0"
+-      },
+-      "engines": {
+-        "node": ">=12"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
+-      }
+-    },
+     "apps/desktop": {
+       "name": "@bitwarden/desktop",
+       "version": "2025.9.0",
+@@ -4913,33 +4868,6 @@
+         }
+       }
+     },
+-    "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": {
+-      "version": "3.6.0",
+-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "anymatch": "~3.1.2",
+-        "braces": "~3.0.2",
+-        "glob-parent": "~5.1.2",
+-        "is-binary-path": "~2.1.0",
+-        "is-glob": "~4.0.1",
+-        "normalize-path": "~3.0.0",
+-        "readdirp": "~3.6.0"
+-      },
+-      "engines": {
+-        "node": ">= 8.10.0"
+-      },
+-      "funding": {
+-        "url": "https://paulmillr.com/funding/"
+-      },
+-      "optionalDependencies": {
+-        "fsevents": "~2.3.2"
+-      }
+-    },
+     "node_modules/@compodoc/compodoc/node_modules/@babel/core": {
+       "version": "7.25.8",
+       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz",
+@@ -5122,21 +5050,6 @@
+       "dev": true,
+       "license": "MIT"
+     },
+-    "node_modules/@compodoc/compodoc/node_modules/glob-parent": {
+-      "version": "5.1.2",
+-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+-      "dev": true,
+-      "license": "ISC",
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "is-glob": "^4.0.1"
+-      },
+-      "engines": {
+-        "node": ">= 6"
+-      }
+-    },
+     "node_modules/@compodoc/compodoc/node_modules/magic-string": {
+       "version": "0.30.11",
+       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+@@ -5147,36 +5060,6 @@
+         "@jridgewell/sourcemap-codec": "^1.5.0"
+       }
+     },
+-    "node_modules/@compodoc/compodoc/node_modules/readdirp": {
+-      "version": "3.6.0",
+-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "picomatch": "^2.2.1"
+-      },
+-      "engines": {
+-        "node": ">=8.10.0"
+-      }
+-    },
+-    "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": {
+-      "version": "2.3.1",
+-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": ">=8.6"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/jonschlinkert"
+-      }
+-    },
+     "node_modules/@compodoc/live-server": {
+       "version": "1.2.3",
+       "resolved": "https://registry.npmjs.org/@compodoc/live-server/-/live-server-1.2.3.tgz",
+@@ -5908,28 +5791,6 @@
+         "node": ">=16.4"
+       }
+     },
+-    "node_modules/@electron/windows-sign": {
+-      "version": "1.2.2",
+-      "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
+-      "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
+-      "dev": true,
+-      "license": "BSD-2-Clause",
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "cross-dirname": "^0.1.0",
+-        "debug": "^4.3.4",
+-        "fs-extra": "^11.1.1",
+-        "minimist": "^1.2.8",
+-        "postject": "^1.0.0-alpha.6"
+-      },
+-      "bin": {
+-        "electron-windows-sign": "bin/electron-windows-sign.js"
+-      },
+-      "engines": {
+-        "node": ">=14.14"
+-      }
+-    },
+     "node_modules/@emnapi/core": {
+       "version": "1.4.3",
+       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
+@@ -8285,21 +8146,6 @@
+         "@msgpack/msgpack": "^2.7.0"
+       }
+     },
+-    "node_modules/@microsoft/signalr/node_modules/utf-8-validate": {
+-      "version": "5.0.10",
+-      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+-      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+-      "hasInstallScript": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "node-gyp-build": "^4.3.0"
+-      },
+-      "engines": {
+-        "node": ">=6.14.2"
+-      }
+-    },
+     "node_modules/@microsoft/signalr/node_modules/ws": {
+       "version": "7.5.10",
+       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+@@ -11310,21 +11156,6 @@
+         "linux"
+       ]
+     },
+-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
+-      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
+-      "cpu": [
+-        "riscv64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+     "node_modules/@rollup/rollup-linux-s390x-gnu": {
+       "version": "4.34.8",
+       "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
+@@ -18997,15 +18828,6 @@
+       "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==",
+       "license": "MIT"
+     },
+-    "node_modules/cross-dirname": {
+-      "version": "0.1.0",
+-      "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
+-      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true
+-    },
+     "node_modules/cross-env": {
+       "version": "10.0.0",
+       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
+@@ -33661,36 +33483,6 @@
+       "dev": true,
+       "license": "MIT"
+     },
+-    "node_modules/postject": {
+-      "version": "1.0.0-alpha.6",
+-      "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
+-      "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true,
+-      "dependencies": {
+-        "commander": "^9.4.0"
+-      },
+-      "bin": {
+-        "postject": "dist/cli.js"
+-      },
+-      "engines": {
+-        "node": ">=14.0.0"
+-      }
+-    },
+-    "node_modules/postject/node_modules/commander": {
+-      "version": "9.5.0",
+-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "peer": true,
+-      "engines": {
+-        "node": "^12.20.0 || >=14"
+-      }
+-    },
+     "node_modules/prebuild-install": {
+       "version": "7.1.3",
+       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+@@ -39330,291 +39122,6 @@
+         }
+       }
+     },
+-    "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
+-      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
+-      "cpu": [
+-        "arm"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "android"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-android-arm64": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
+-      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "android"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
+-      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "darwin"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
+-      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "darwin"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
+-      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "freebsd"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
+-      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "freebsd"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
+-      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
+-      "cpu": [
+-        "arm"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
+-      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
+-      "cpu": [
+-        "arm"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
+-      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
+-      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
+-      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
+-      "cpu": [
+-        "loong64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
+-      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
+-      "cpu": [
+-        "ppc64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
+-      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
+-      "cpu": [
+-        "riscv64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
+-      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
+-      "cpu": [
+-        "s390x"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
+-      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
+-      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "linux"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
+-      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
+-      "cpu": [
+-        "arm64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "win32"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
+-      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
+-      "cpu": [
+-        "ia32"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "win32"
+-      ],
+-      "peer": true
+-    },
+-    "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": {
+-      "version": "4.44.0",
+-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
+-      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
+-      "cpu": [
+-        "x64"
+-      ],
+-      "dev": true,
+-      "license": "MIT",
+-      "optional": true,
+-      "os": [
+-        "win32"
+-      ],
+-      "peer": true
+-    },
+     "node_modules/vite/node_modules/rollup": {
+       "version": "4.44.0",
+       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
@@ -2,37 +2,41 @@
  lib,
  stdenv,
  buildNpmPackage,
-  nodejs_20,
  fetchFromGitHub,
-  cctools,
-  nix-update-script,
-  nixosTests,
+  nodejs_22,
  perl,
  xcbuild,
+  writableTmpDirAsHomeHook,
+  versionCheckHook,
+  nixosTests,
+  nix-update-script,
 }:

-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
  pname = "bitwarden-cli";
-  version = "2025.5.0";
+  version = "2025.9.0";

  src = fetchFromGitHub {
    owner = "bitwarden";
    repo = "clients";
-    tag = "cli-v${version}";
-    hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
+    tag = "cli-v${finalAttrs.version}";
+    hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to=";
  };

+  patches = [
+    ./fix-lockfile.patch
+  ];
+
  postPatch = ''
    # remove code under unfree license
    rm -r bitwarden_license
  '';

-  nodejs = nodejs_20;
+  nodejs = nodejs_22;

-  npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls=";
+  npmDepsHash = "sha256-bn39QlZXNUa/GEZhJsjLiG3PRYdQ/Y36Tvef2fXH8yQ=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
    perl
    xcbuild.xcrun
  ];
@@ -61,9 +65,6 @@ buildNpmPackage rec {
    rm -r node_modules/**/prebuilds
    shopt -u globstar

-    # FIXME one of the esbuild versions fails to download @esbuild/linux-x64
-    rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild
-
    npm rebuild --verbose
  '';

@@ -84,6 +85,14 @@ buildNpmPackage rec {
    installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh)
  '';

+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    writableTmpDirAsHomeHook
+    versionCheckHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckProgramArg = "--version";
+
  passthru = {
    tests = {
      vaultwarden = nixosTests.vaultwarden.sqlite;
@@ -97,13 +106,14 @@ buildNpmPackage rec {
  };

  meta = {
-    # https://github.com/NixOS/nixpkgs/issues/339576
-    broken = stdenv.hostPlatform.isDarwin;
-    changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}";
+    changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}";
    description = "Secure and free password manager for all of your devices";
    homepage = "https://bitwarden.com";
    license = lib.licenses.gpl3Only;
    mainProgram = "bw";
-    maintainers = with lib.maintainers; [ dotlambda ];
+    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
+      dotlambda
+    ];
  };
-}
+})
@@ -13,9 +13,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"

 [[package]]
 name = "autocfg"
@@ -25,9 +25,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"

 [[package]]
 name = "bstr"
@@ -42,25 +42,25 @@ dependencies = [

 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"

 [[package]]
 name = "cargo-config2"
-version = "0.1.34"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82de3b1a1dd72252c6d456247864ffe52110d109da949f579eeb16349e0eb5d"
+checksum = "2bf2da6c8158a7ad35217e3187ac07db64d19719a934ffaf9b7591cda1f31964"
 dependencies = [
 "serde",
 "serde_derive",
- "toml_edit",
- "windows-sys 0.60.2",
+ "toml",
+ "windows-sys 0.61.2",
 ]

 [[package]]
 name = "cargo-llvm-cov"
-version = "0.6.17"
+version = "0.6.20"
 dependencies = [
 "anyhow",
 "camino",
@@ -88,15 +88,15 @@ dependencies = [

 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"

 [[package]]
 name = "duct"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde"
+checksum = "d7478638a31d1f1f3d6c9f5e57c76b906a04ac4879d6fd0fb6245bc88f73fd0b"
 dependencies = [
 "libc",
 "os_pipe",
@@ -104,20 +104,14 @@ dependencies = [
 "shared_thread",
 ]

-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -128,46 +122,30 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
 dependencies = [
 "cfg-if",
 "libc",
 "libredox",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
 name = "fs-err"
-version = "3.1.1"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7be93788013f265201256d58f04936a8079ad5dc898743aa20525f503b683"
+checksum = "6ad492b2cf1d89d568a43508ab24f98501fe03f2f31c01e1d0fe7366a71745d2"
 dependencies = [
 "autocfg",
 ]

 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "indexmap"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"

 [[package]]
 name = "itoa"
@@ -195,15 +173,15 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"

 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"

 [[package]]
 name = "libredox"
-version = "0.1.4"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
 "bitflags",
 "libc",
@@ -212,23 +190,23 @@ dependencies = [

 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"

 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"

 [[package]]
 name = "normpath"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
+checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -239,13 +217,13 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

 [[package]]
 name = "opener"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771b9704f8cd8b424ec747a320b30b47517a6966ba2c7da90047c16f4a962223"
+checksum = "cb9024962ab91e00c89d2a14352a8d0fc1a64346bf96f1839b45c09149564e47"
 dependencies = [
 "bstr",
 "normpath",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -260,9 +238,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
 "unicode-ident",
 ]
@@ -278,27 +256,27 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "redox_syscall"
-version = "0.5.13"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
 "bitflags",
 ]

 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -308,9 +286,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -319,34 +297,34 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"

 [[package]]
 name = "rustc-demangle"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"

 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
 "bitflags",
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"

 [[package]]
 name = "ruzstd"
@@ -371,18 +349,27 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -391,23 +378,24 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
 "itoa",
 "memchr",
 "ryu",
 "serde",
+ "serde_core",
 ]

 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee"
 dependencies = [
- "serde",
+ "serde_core",
 ]

 [[package]]
@@ -417,15 +405,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
 dependencies = [
 "libc",
- "sigchld",
 "windows-sys 0.60.2",
 ]

 [[package]]
 name = "shared_thread"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064"
+checksum = "52b86057fcb5423f5018e331ac04623e32d6b5ce85e33300f92c79a1973928b0"

 [[package]]
 name = "shell-escape"
@@ -433,41 +420,11 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"

-[[package]]
-name = "sigchld"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1"
-dependencies = [
- "libc",
- "os_pipe",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -487,14 +444,14 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
 "fastrand",
 "once_cell",
 "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -515,32 +472,41 @@ dependencies = [
 ]

 [[package]]
-name = "toml_datetime"
-version = "0.6.11"
+name = "toml"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0"
 dependencies = [
- "serde",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
 ]

 [[package]]
-name = "toml_edit"
-version = "0.22.27"
+name = "toml_datetime"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
 dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
 "winnow",
 ]

 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"

 [[package]]
 name = "walkdir"
@@ -554,13 +520,19 @@ dependencies = [

 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -576,7 +548,16 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.2",
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
 ]

 [[package]]
@@ -597,18 +578,19 @@ dependencies = [

 [[package]]
 name = "windows-targets"
-version = "0.53.2"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]

 [[package]]
@@ -619,9 +601,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"

 [[package]]
 name = "windows_aarch64_msvc"
@@ -631,9 +613,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"

 [[package]]
 name = "windows_i686_gnu"
@@ -643,9 +625,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"

 [[package]]
 name = "windows_i686_gnullvm"
@@ -655,9 +637,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"

 [[package]]
 name = "windows_i686_msvc"
@@ -667,9 +649,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"

 [[package]]
 name = "windows_x86_64_gnu"
@@ -679,9 +661,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"

 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -691,9 +673,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"

 [[package]]
 name = "windows_x86_64_msvc"
@@ -703,24 +685,21 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"

 [[package]]
 name = "winnow"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
-dependencies = [
- "memchr",
-]
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"

 [[package]]
 name = "xattr"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 dependencies = [
 "libc",
 "rustix",
@@ -24,7 +24,7 @@

 let
  pname = "cargo-llvm-cov";
-  version = "0.6.17";
+  version = "0.6.20";

  owner = "taiki-e";
  homepage = "https://github.com/${owner}/${pname}";
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    inherit owner;
    repo = "cargo-llvm-cov";
    rev = "v${version}";
-    sha256 = "sha256-0Dgcl1r+j86WVhkyJNJxUnk85vrtD1fBBxfJkV0mcAI=";
+    sha256 = "sha256-LAiN9Opc0XQVepQ9IhK9JFWGoeRR3U6V680jgGiaDGo=";
  };

  # Upstream doesn't include the lockfile so we need to add it back
@@ -6,14 +6,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-rdme";
-  version = "1.4.8";
+  version = "1.4.9";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI=";
+    hash = "sha256-ostDwjj93WhDfBKJY9xpKd74knQi9z9UFb5Q84waHuM=";
  };

-  cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8=";
+  cargoHash = "sha256-pk7tYvN2Drn+Gpk170ITsAF38dVWjk+RBfrnb0YpZc4=";

  meta = {
    description = "Cargo command to create the README.md from your crate's documentation";
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "clapboard";
-  version = "1.1.0";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "bjesus";
    repo = "clapboard";
    rev = "v${version}";
-    hash = "sha256-1y2tG4ajnsstNkPTE3eBr8QJJF6Qq/HCQzJoj1ETuUY=";
+    hash = "sha256-vRIwdbt8f9/K7QAfFtBXrr4ezymlnzarq08W7J3aRiU=";
  };

-  cargoHash = "sha256-DEwipAG/zPPftYwYahRJfpXgHPXerGdn10PkS8DHWCM=";
+  cargoHash = "sha256-w3VR6j1ZcMQsk8r9eDqMtRJrGS6+XRM8t/pf5GpTVFA=";

  meta = with lib; {
    description = "Wayland clipboard manager that will make you clap";
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  cmake,
  fetchpatch,
+  fetchDebianPatch,
 }:

 stdenv.mkDerivation {
@@ -18,10 +19,17 @@ stdenv.mkDerivation {
  };

  patches = [
+    (fetchDebianPatch {
+      pname = "cld2";
+      version = "0.0.0-git20150806";
+      debianRevision = "10";
+      patch = "add-cmake-file.patch";
+      hash = "sha256-iLacWD4jQxid76pzGpDW3ZJ8Dyaksfj1pNTrU7qSBQM=";
+    })
    (fetchpatch {
-      name = "add-cmakelists.txt";
-      url = "https://github.com/CLD2Owners/cld2/pull/65/commits/9cfac02c2ac7802ab7079560b38a474473c45f51.patch";
-      hash = "sha256-uOjmUk8kMFl+wED44ErXoLRyblhgDwFx9K1Wj65Omh8=";
+      name = "fix-narrowing-errors.txt";
+      url = "https://github.com/ripjar/cld2/pull/1/commits/79be1adea78f0d376cb793f4dae8e70b100dadcc.patch";
+      hash = "sha256-i4WWYBx16kYXZ5IQPACWbS/HGsQysXre1SngYlAfNaM=";
    })
  ];

@@ -36,7 +36,7 @@ let
    };
  };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  inherit version;

  pname = "cloudflare-warp" + lib.optionalString headless "-headless";
@@ -130,7 +130,6 @@ stdenv.mkDerivation rec {
  '';

  doInstallCheck = true;
-  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
  versionCheckProgramArg = "--version";

  passthru = {
@@ -156,22 +155,23 @@ stdenv.mkDerivation rec {
            rg '([^/]+)\.0\.yaml\b' --only-matching --replace '$1'
        )"

-        for platform in ${lib.escapeShellArgs meta.platforms}; do
-          update-source-version "${pname}" "$new_version" --ignore-same-version --source-key="sources.$platform"
+        for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
+          update-source-version "${finalAttrs.pname}" "$new_version" --ignore-same-version --source-key="sources.$platform"
        done
      '';
    });
  };

-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/cloudflare/cloudflare-docs/blob/production/src/content/warp-releases/linux/ga/${finalAttrs.version}.0.yaml";
    description =
      "Replaces the connection between your device and the Internet with a modern, optimized, protocol"
      + lib.optionalString headless " (headless version)";
    homepage = "https://pkg.cloudflareclient.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
    mainProgram = "warp-cli";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
      marcusramberg
    ];
    platforms = [
@@ -179,4 +179,4 @@ stdenv.mkDerivation rec {
      "aarch64-linux"
    ];
  };
-}
+})
@@ -45,11 +45,11 @@ python3Packages.buildPythonApplication rec {
  nativeCheckInputs = [
    cmake
    cmake-format
+    versionCheckHook
  ]
  ++ (with python3Packages; [
    pytest-datadir
    pytestCheckHook
-    versionCheckHook
  ]);
  versionCheckProgramArg = "--version";

@@ -59,6 +59,17 @@ python3Packages.buildPythonApplication rec {
    echo "__version__ = \"$PDM_BUILD_SCM_VERSION\"" > cmake_language_server/version.py
  '';

+  disabledTests = [
+    # AssertionError: CTEST_SCP_COMMAND not found
+    "test_parse_variables"
+
+    # AssertionError: AddFileDependencies not found
+    "test_parse_modules"
+
+    # AssertionError: assert 'Boost' in [...
+    "test_completions_triggercharacter"
+  ];
+
  meta = {
    description = "CMake LSP Implementation";
    homepage = "https://github.com/regen100/cmake-language-server";
@@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
    + lib.optionalString isMinimalBuild "-minimal"
    + lib.optionalString cursesUI "-cursesUI"
    + lib.optionalString qt5UI "-qt5UI";
-  version = "4.1.1";
+  version = "4.1.2";

  src = fetchurl {
    url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI=";
+    hash = "sha256-ZD8EGCt7oyOrMfUm94UTT7ecujGIqFIgbvBHP+4oKhU=";
  };

  patches = [
@@ -80,9 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ]
  ++ [
-    # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134
-    ./fix-curl-8.16.patch
-
    # Remove references to non‐Nix search paths.
    ./remove-impure-search-paths.patch
  ];
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  alsa-lib,
+  fontconfig,
+  freetype,
+  libX11,
+  libXcomposite,
+  libXcursor,
+  libXdmcp,
+  libXext,
+  libXinerama,
+  libXrandr,
+  libXtst,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ctagdrc";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "BillyDM";
+    repo = "CTAGDRC";
+    tag = finalAttrs.version;
+    hash = "sha256-szBI8ESJz1B/JuGcZD8D53c1yJeUW1uK4GewQExtD9Q=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+    fontconfig
+    freetype
+    libX11
+    libXcomposite
+    libXcursor
+    libXdmcp
+    libXext
+    libXinerama
+    libXrandr
+    libXtst
+  ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+          --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE'
+    substituteInPlace CMakeLists.txt \
+          --replace-fail 'include(cmake-include/CPM.cmake)' '# No CPM needed'
+    substituteInPlace CMakeLists.txt \
+          --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO'
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/lib/clap $out/lib/vst3
+    install -Dm755 "CTAGDRC_artefacts/Release/Standalone/CTAGDRC" $out/bin/CTAGDRC
+    install -Dm644 "CTAGDRC_artefacts/Release/CLAP/CTAGDRC.clap" -t $out/lib/clap
+    cp -r "CTAGDRC_artefacts/Release/VST3/CTAGDRC.vst3" $out/lib/vst3
+
+    runHook postInstall
+  '';
+
+  # JUCE dlopens these, make sure they are in rpath
+  # Otherwise, segfault will happen
+  env.NIX_LDFLAGS = toString [
+    "-lX11"
+    "-lXext"
+    "-lXcomposite"
+    "-lXcursor"
+    "-lXinerama"
+    "-lXrandr"
+    "-lXrender"
+    "-lXtst"
+    "-lXdmcp"
+  ];
+
+  meta = {
+    description = "Audio compressor plugin created with JUCE";
+    homepage = "https://github.com/BillyDM/CTAGDRC";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    mainProgram = "CTAGDRC";
+    platforms = lib.platforms.all;
+  };
+})
@@ -2,9 +2,12 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch2,
  cmake,
  icu74,
  pkg-config,
+  testers,
+  validatePkgConfig,
  enableUnicodeHelp ? true,
 }:

@@ -19,12 +22,18 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-baM6EX9D0yfrKxuPXyUUV9RqdrVLyygeG6x57xN8lc4=";
  };

-  buildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ];
+  propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ];
  cmakeFlags = [
    "-DCXXOPTS_BUILD_EXAMPLES=OFF"
  ]
  ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE";
-  nativeBuildInputs = [ cmake ] ++ lib.optionals enableUnicodeHelp [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+  ]
+  ++ lib.optionals enableUnicodeHelp [
+    pkg-config
+    validatePkgConfig
+  ];

  doCheck = true;

@@ -34,14 +43,30 @@ stdenv.mkDerivation (finalAttrs: {
  # https://github.com/jarro2783/cxxopts/issues/332
  postPatch = ''
    substituteInPlace packaging/pkgconfig.pc.in \
-      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+      --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
  '';

+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/jarro2783/cxxopts/commit/e98c73d665915b292a0592bf34fcbe8522035bc1.patch?full_index=1";
+      name = "fix-icu-uc-typo-in-pkgconfig.patch";
+      hash = "sha256-bqd3H66Op1/EkN2HLd84Obky4Y2ndPPY8MGZ5fqtdk4=";
+    })
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      versionCheck = true;
+    };
+  };
+
  meta = with lib; {
    homepage = "https://github.com/jarro2783/cxxopts";
    description = "Lightweight C++ GNU-style option parser library";
    license = licenses.mit;
    maintainers = [ maintainers.spease ];
+    pkgConfigModules = [ "cxxopts" ];
    platforms = platforms.all;
  };
 })
@@ -0,0 +1,45 @@
+{
+  buildPythonPackage,
+  meson-python,
+  ninja,
+  setuptools,
+  pkg-config,
+  dftd4,
+  cffi,
+  numpy,
+}:
+
+buildPythonPackage {
+  inherit (dftd4)
+    pname
+    version
+    src
+    meta
+    ;
+
+  pyproject = true;
+
+  buildInputs = [ dftd4 ];
+
+  nativeBuildInputs = [
+    pkg-config
+    ninja
+  ];
+
+  build-system = [
+    meson-python
+    setuptools
+  ];
+
+  dependencies = [
+    cffi
+    numpy
+  ];
+
+  preConfigure = ''
+    cd python
+  '';
+
+  pythonImportsCheck = [ "dftd4" ];
+  doCheck = true;
+}
@@ -37,16 +37,16 @@
   "jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=",
   "pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE="
  },
-  "io/freefair/gradle#lombok-plugin/8.14.2": {
-   "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
-   "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
-   "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
+  "io/freefair/gradle#lombok-plugin/9.0.0": {
+   "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=",
+   "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=",
+   "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk="
  },
  "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
   "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg="
  },
-  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
-   "pom": "sha256-OKIER1//te7+8mJmN+ZtdKjo5reqEZ3SRXpwcZ3oVvU="
+  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
+   "pom": "sha256-s5rb7ywLx0jun0EFww8MhaElzsdorWrNDp+UKogG2w8="
  },
  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
@@ -168,13 +168,13 @@
  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": {
   "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo="
  },
-  "org/gradlex#extra-java-module-info/1.13": {
-   "jar": "sha256-EIqHsSfToameWdHmEEo+kdCx/5aWGM+1s54+J/H+r20=",
-   "module": "sha256-1kT0XN5oN003+pNhhJWZK6ZBHyJFhklk50VlHpffJhE=",
-   "pom": "sha256-sYMue36yP41a32LHkXcuPp/IhIMUnKjd5QIbsQPUQlo="
+  "org/gradlex#extra-java-module-info/1.13.1": {
+   "jar": "sha256-u7wZoNvtKQxcMt17/vhxh+Qn/yGBqKfkcA3XtXrOQbM=",
+   "module": "sha256-lQeTGglcI3ZzTFxnOo/zK7qBerkAQAivjFdihR1/YaY=",
+   "pom": "sha256-i4Q6pFeUxi2dsJOBdGrchkKKphFx++KSAqld7WzYN6A="
  },
-  "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13": {
-   "pom": "sha256-ll4caPhrb0fP4cqP2rYTPRxz0w4eerkuTHirvGnFs4c="
+  "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13.1": {
+   "pom": "sha256-ho1RzTt31f/rmHPol6rnYlphPx2wP60fTiHtBti4vDQ="
  },
  "org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.2.2": {
   "pom": "sha256-OS098xRtN26kokx+XtNhLennIcfT6+T3vzq5oiSVhds="
@@ -365,22 +365,15 @@
   "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
   "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
  },
-  "com/google/errorprone#error_prone_annotations/2.36.0": {
-   "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
-   "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
-  },
-  "com/google/errorprone#error_prone_annotations/2.38.0": {
-   "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
-   "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
  },
  "com/google/errorprone#error_prone_parent/2.27.0": {
   "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
  },
-  "com/google/errorprone#error_prone_parent/2.36.0": {
-   "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
-  },
-  "com/google/errorprone#error_prone_parent/2.38.0": {
-   "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
  },
  "com/google/guava#failureaccess/1.0.3": {
   "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
@@ -392,13 +385,13 @@
  "com/google/guava#guava-parent/33.4.0-android": {
   "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
  },
-  "com/google/guava#guava-parent/33.4.8-jre": {
-   "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
+  "com/google/guava#guava-parent/33.5.0-jre": {
+   "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
  },
-  "com/google/guava#guava/33.4.8-jre": {
-   "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=",
-   "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
-   "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw="
+  "com/google/guava#guava/33.5.0-jre": {
+   "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+   "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+   "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
  },
  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
@@ -474,16 +467,16 @@
   "module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=",
   "pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk="
  },
-  "io/freefair/gradle#lombok-plugin/8.14.2": {
-   "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
-   "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
-   "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
+  "io/freefair/gradle#lombok-plugin/9.0.0": {
+   "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=",
+   "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=",
+   "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk="
  },
  "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
   "pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8="
  },
-  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
-   "pom": "sha256-KVgYYy7l/xiWwKYPuI2ghuPXyFHGxIUcQU/VSETWfYI="
+  "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
+   "pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI="
  },
  "io/github/classgraph#classgraph/4.8.181": {
   "jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
@@ -507,10 +500,10 @@
  "io/projectreactor#reactor-bom/Bismuth-SR7": {
   "pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk="
  },
-  "io/reactivex/rxjava3#rxjava/3.1.11": {
-   "jar": "sha256-bipWqYGdD8L+DXjv7NPXyBpjxjneM8qlY5KTvP/umXo=",
-   "module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=",
-   "pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA="
+  "io/reactivex/rxjava3#rxjava/3.1.12": {
+   "jar": "sha256-GAikM+9V3MKWVSPlEquRSl0NcnIoomg+11WdfMz0Tjc=",
+   "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
+   "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
  },
  "io/sentry#sentry/8.20.0": {
   "jar": "sha256-G5KZBtERVbA9gwY1XrEGlWL2elwljF0R0h0vnT1GMbQ=",
@@ -558,22 +551,16 @@
   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
  },
-  "net/bytebuddy#byte-buddy-agent/1.17.6": {
-   "jar": "sha256-ioCVlGW7CYSM1BqJMBSQxVudlA3G7DDYq6wPY7Of1dA=",
-   "pom": "sha256-Zw0Cz7w5b05+ZhTd3PSghC+vF/l5k3PX4Mt7aq3Njm8="
+  "net/bytebuddy#byte-buddy-agent/1.17.7": {
+   "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
+   "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
  },
-  "net/bytebuddy#byte-buddy-parent/1.15.11": {
-   "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
+  "net/bytebuddy#byte-buddy-parent/1.17.7": {
+   "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
  },
-  "net/bytebuddy#byte-buddy-parent/1.17.6": {
-   "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0="
-  },
-  "net/bytebuddy#byte-buddy/1.15.11": {
-   "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
-  },
-  "net/bytebuddy#byte-buddy/1.17.6": {
-   "jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=",
-   "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4="
+  "net/bytebuddy#byte-buddy/1.17.7": {
+   "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
+   "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
  },
  "net/java#jvnet-parent/1": {
   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
@@ -584,13 +571,13 @@
  "net/java#jvnet-parent/5": {
   "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
  },
-  "net/java/dev/jna#jna-platform/5.17.0": {
-   "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=",
-   "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ="
+  "net/java/dev/jna#jna-platform/5.18.0": {
+   "jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=",
+   "pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58="
  },
-  "net/java/dev/jna#jna/5.17.0": {
-   "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
-   "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
+  "net/java/dev/jna#jna/5.18.0": {
+   "jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=",
+   "pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs="
  },
  "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
   "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
@@ -698,10 +685,10 @@
  "org/apache/logging#logging-parent/11.3.0": {
   "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
  },
-  "org/apache/logging/log4j#log4j-api/2.25.1": {
-   "jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=",
-   "module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=",
-   "pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM="
+  "org/apache/logging/log4j#log4j-api/2.25.2": {
+   "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=",
+   "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=",
+   "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM="
  },
  "org/apache/logging/log4j#log4j-bom/2.10.0": {
   "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY="
@@ -712,11 +699,11 @@
  "org/apache/logging/log4j#log4j-bom/2.24.3": {
   "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
  },
-  "org/apache/logging/log4j#log4j-bom/2.25.1": {
-   "pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4="
+  "org/apache/logging/log4j#log4j-bom/2.25.2": {
+   "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw="
  },
-  "org/apache/logging/log4j#log4j/2.25.1": {
-   "pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10="
+  "org/apache/logging/log4j#log4j/2.25.2": {
+   "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
  },
  "org/apache/pdfbox#fontbox/2.0.26": {
   "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=",
@@ -762,9 +749,9 @@
   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
  },
-  "org/assertj#assertj-core/3.27.4": {
-   "jar": "sha256-zGmqhPeTVstjXD+f8/ht/w+djufve2hKLJqZgE/0UAg=",
-   "pom": "sha256-nLMcgATISEPShMQCqBRTvupFCb+neP9CKmcvfny/Ygw="
+  "org/assertj#assertj-core/3.27.6": {
+   "jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=",
+   "pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw="
  },
  "org/controlsfx#controlsfx/11.2.2": {
   "jar": "sha256-BDwGYtUmljR9r4T8aQJ0xhIuD4CjFXo1St086oPA3qk=",
@@ -913,17 +900,17 @@
  "org/mockito#mockito-bom/4.11.0": {
   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
  },
-  "org/mockito#mockito-core/5.19.0": {
-   "jar": "sha256-2HX/I0pLcuDu3+Fw3YBHl6S4e6THYgfJZZ1vRrUnh3s=",
-   "pom": "sha256-NlnpFp4TwLUT6D7c1R6vqlcdYMYq9YGOzQkhqi0M0Bg="
+  "org/mockito#mockito-core/5.20.0": {
+   "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
+   "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU="
  },
  "org/mockito#mockito-inline/5.2.0": {
   "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
   "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ="
  },
-  "org/mockito#mockito-junit-jupiter/5.19.0": {
-   "jar": "sha256-fPu3qcEZgFPGmcZjR5/Ug2rMIsJlAAPI3uIOf7xVplo=",
-   "pom": "sha256-x+4XLR/ALo/I/I8EPIfHGzXLfXR+kJNGQ9SSCTrXoUs="
+  "org/mockito#mockito-junit-jupiter/5.20.0": {
+   "jar": "sha256-/WxwPCsAuRTzrbwnsYB3pwjz1pkvGSQsRE5zfGzOAk4=",
+   "pom": "sha256-gaVJ/8nISoefwe5k1jAHqwClOk75avtTaQ8oRWker5g="
  },
  "org/objenesis#objenesis-parent/3.3": {
   "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
@@ -1024,9 +1011,9 @@
   "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=",
   "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM="
  },
-  "org/projectlombok#lombok/1.18.38": {
-   "jar": "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k=",
-   "pom": "sha256-gWXuhymafa8GmnyYG3u4YENCE7mvyqurC0abO6v0jm0="
+  "org/projectlombok#lombok/1.18.40": {
+   "jar": "sha256-t2TDobDIZ0jJ4ugNZOA9RUAs4+3rYx+oHjCla/+m2vM=",
+   "pom": "sha256-1nxojbairP4dHNGr2cCKgSec4IFnu6k5gG+CqijxcF8="
  },
  "org/rauschig#jarchivelib/0.6.0": {
   "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=",
@@ -2,8 +2,8 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  gradle,
-  jdk24,
+  gradle_9,
+  jdk25,
  wrapGAppsHook3,
  libXxf86vm,
  libXtst,
@@ -16,15 +16,18 @@
  makeDesktopItem,
  writeScript,
 }:
+let
+  gradle = gradle_9;
+in
 stdenv.mkDerivation rec {
  pname = "ed-odyssey-materials-helper";
-  version = "3.0.1";
+  version = "3.0.6";

  src = fetchFromGitHub {
    owner = "jixxed";
    repo = "ed-odyssey-materials-helper";
    tag = version;
-    hash = "sha256-tdpt0/TO7K1bK6OMCR9s5TbN1/v1ZywCzO/IvdOfsSA=";
+    hash = "sha256-4VxaQF1kmBo/9M0psr7jvshy1XhS02zUSMSuWvyEcoo=";
  };

  nativeBuildInputs = [
@@ -63,7 +66,7 @@ stdenv.mkDerivation rec {
  };

  gradleFlags = [
-    "-Dorg.gradle.java.home=${jdk24}"
+    "-Dorg.gradle.java.home=${jdk25}"
    "--stacktrace"
  ];

@@ -13,13 +13,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "firefly-iii";
-  version = "6.4.0";
+  version = "6.4.2";

  src = fetchFromGitHub {
    owner = "firefly-iii";
    repo = "firefly-iii";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-X/rihS5iOVAFJsqTG2Bq1V/G1ITFxxJIS+YDI0TKfE4=";
+    hash = "sha256-nGXFFGVw0TCXSBwMExk6wn0Es0HwCnY4P+nbJki+R6A=";
  };

  buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    composerNoScripts = true;
    composerStrictValidation = true;
    strictDeps = true;
-    vendorHash = "sha256-ICoOD0cJrsSphJ9Ke86qO9/cOZst30pwAXDjerV+Ds4=";
+    vendorHash = "sha256-siLLtF/B2eNsRaazq5zOXnFeFPlEeoSAIXYKEsrHv28=";
  };

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
    name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-6SMXXc1aJiHpWloRuY6Rd6NhuS5xQ0QuInlu5fLUHvk=";
+    hash = "sha256-WV1MsCbYxEHUEw0yYqD8b9jracyLVbpndWuHY0ZbaEM=";
  };

  preInstall = ''
@@ -5,19 +5,19 @@
  cmake,
  ninja,
  useFloat ? false,
+  unstableGitUpdater,
 }:

 stdenv.mkDerivation rec {
  pname = "fuzzylite";
-  version = "6.0";
+  version = "6.0-unstable-2025-08-30";

  src = fetchFromGitHub {
    owner = "fuzzylite";
    repo = "fuzzylite";
-    rev = "v${version}";
-    hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk=";
+    rev = "fe62b61ad0e301fbd8868d5fc3d76d7590c59636";
+    hash = "sha256-p3ikdY3kfC8N7XsHHa3HzWI0blciWoxCHiEOOUt2yLY=";
  };
-  sourceRoot = "${src.name}/fuzzylite";

  outputs = [
    "out"
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
    "-DFL_USE_FLOAT:BOOL=${if useFloat then "ON" else "OFF"}"
  ];

+  # use unstable as latest release does not yet support cmake-4
+  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+
  meta = with lib; {
    description = "Fuzzy logic control library in C++";
    mainProgram = "fuzzylite";
@@ -1,12 +1,14 @@
 {
  lib,
+  stdenv,
  buildNpmPackage,
  fetchFromGitHub,
-  nix-update-script,
-  ripgrep,
  jq,
  pkg-config,
+  clang_20,
  libsecret,
+  ripgrep,
+  nix-update-script,
 }:

 buildNpmPackage (finalAttrs: {
@@ -25,7 +27,8 @@ buildNpmPackage (finalAttrs: {
  nativeBuildInputs = [
    jq
    pkg-config
-  ];
+  ]
+  ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar

  buildInputs = [
    ripgrep
@@ -24,8 +24,8 @@ let
 in

 stdenv.mkDerivation rec {
-  srcVersion = "sep25a";
-  version = "20250901_a";
+  srcVersion = "oct25a";
+  version = "20251001_a";
  pname = "gildas";

  src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
      "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
      "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
    ];
-    hash = "sha256-W2l2n6W8L5Gr7taw9ZUvVVp9sZvjne56sjtUU91U0oE=";
+    hash = "sha256-n1IQajRXIHWkaFpLOtctlm4P+2vrxTWdyQiD3caQd3A=";
  };

  nativeBuildInputs = [
@@ -50,14 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU=";
  };

-  patches = [
-    (fetchpatch {
-      name = "CVE-2025-11230.patch";
-      url = "https://github.com/haproxy/haproxy/commit/06675db4bf234ed17e14305f1d59259d2fe78b06.patch";
-      hash = "sha256-ULHN2gj4TZHUEDIJ6FAaRoyth/wz4VhXOf6maFfkhJA=";
-    })
-  ];
-
  buildInputs = [
    sslPkg
    zlib
@@ -98,8 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "USE_SYSTEM_LLVM" true)
    (lib.cmakeBool "USE_SYSTEM_NLOHMANN_JSON" true)
    (lib.cmakeBool "USE_SYSTEM_YARA" true)
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
  ];

+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
  # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
    substituteInPlace cmake/modules/PostprocessBundle.cmake \
@@ -139,6 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
      kashw2
      cafkafk
      govanify
+      ryand56
    ];
    platforms = with lib.platforms; linux ++ darwin;
  };
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b725e9a..f5ffa5f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)
+ include(CMakeDependentOption)
+ 
+ set(TARGET_PLATFORM "default" CACHE STRING "Platform to cross-compile for. Options: vita switch android ios emscripten. Leave blank for no cross compilation")
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
  };

  patches = [
+    # This fixes the build with cmake 4
+    ./cmake4.patch
    # This fixes the darwin bundle generation, sets min. deployment version
    # and patches SDL2_mixer include
    ./darwin-fixes.patch
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "kubectl-ai";
-  version = "0.0.25";
+  version = "0.0.26";

  src = fetchFromGitHub {
    owner = "GoogleCloudPlatform";
    repo = "kubectl-ai";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ORCOZ0U8BEpLfKa7s8Z/7spmdKebf+F2IpP252s/vQk=";
+    hash = "sha256-xWZcBTYPsVlv8pywQ12YDx2S3TQ0qXnRvoG5MAV4bdA=";
  };

-  vendorHash = "sha256-l+KHc5RJKqoXTbCIM8mAbuSWBMofgqLsYltgr0ZgfWM=";
+  vendorHash = "sha256-LWOJhncRZ1f9I5BtPl4LPcEMWYhl8rZDk5pWDuO+2Nk=";

  # Build the main command
  subPackages = [ "cmd" ];
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {

  cmakeFlags = [
    "-DBUILD_DIVSUFSORT64=YES"
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
  ];

  nativeBuildInputs = [ cmake ];
@@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "libmediainfo";
-  version = "25.07.1";
+  version = "25.09";

  src = fetchurl {
    url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    hash = "sha256-jm6S8gzyynzoq6U60LWJqJovp9/T55cdOFAQms1JvtU=";
+    hash = "sha256-hWLo6gPir4veJ/ZteaD1c4WbjxMZPsEVq/EPc1sxOhI=";
  };

  nativeBuildInputs = [
@@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "libversion";
-  version = "3.0.3";
+  version = "3.0.4";

  src = fetchFromGitHub {
    owner = "repology";
    repo = "libversion";
    rev = version;
-    hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA=";
+    hash = "sha256-USgSwAdRHEepq9ZTDHVWkPsZjljfh9sEWOZRfu0H7Go=";
  };

  nativeBuildInputs = [ cmake ];
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
  '';

  cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
    "-DENABLE_FORTRAN=ON"
    "-DBUILD_SHARED_LIBS=ON"
    "-DENABLE_XHOST=OFF"
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "luau";
-  version = "0.693";
+  version = "0.694";

  src = fetchFromGitHub {
    owner = "luau-lang";
    repo = "luau";
    tag = finalAttrs.version;
-    hash = "sha256-9D6nIuRP/MyzTYDp7Uo5RcK4QrF+YMV6tTVMX/mAKY8=";
+    hash = "sha256-PA7wcrbGRfrMYgT9vWcpPEgZot+HNkQrptPuEArVM3Q=";
  };

  nativeBuildInputs = [ cmake ];
@@ -31,7 +31,8 @@ python3Packages.buildPythonApplication rec {

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3"
+      --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3" \
+      --replace-fail "poetry-core>=1.1.0,<=2.1.3" "poetry-core>=1.1.0,<=2.3.0"
  '';

  build-system = with python3Packages; [
@@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  pname = "mediainfo";
-  version = "25.07";
+  version = "25.09";

  src = fetchurl {
    url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    hash = "sha256-UI6sHKCX9Byz/DliWs6wZS/KsArNDy68vR3GgAk26X0=";
+    hash = "sha256-jUug2L19QJf9CjiNQTHeQMNaxdvlKkdgt52PHSnvLmM=";
  };

  nativeBuildInputs = [
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
  ];

  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
    "-DUSE_MKL_IF_AVAILABLE=OFF"
    "-DUSE_CUDA=OFF"
    "-DUSE_CUDNN=OFF"
@@ -13,17 +13,17 @@

 buildGoModule (finalAttrs: {
  pname = "omnom";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "asciimoo";
    repo = "omnom";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wFUKoM8xiuAfmBCQJ4BgX7gQ1FmU2yHSs/RkQI0WxI4=";
+    hash = "sha256-auujlRG3RKJYYTi/iptx0Y3Yzqmt6i9AlfjVcqn5YPc=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-Ie486oAsgsOM5hDURD+1bfnGIUqkeW2bOaIDiwWWq+0=";
+  vendorHash = "sha256-0usbfvGz+9chLGyHHUUStUh7x91ZGfr/+gAXXVA5iNc=";

  passthru.updateScript = nix-update-script { };

@@ -36,14 +36,12 @@
  jdk17_headless,
  jdk21_headless,
  jdk23_headless,
-  jdk24_headless,
  jdk25_headless,
  jdk-bootstrap ?
    {
      "17" = jdk17_headless;
      "21" = jdk21_headless;
      "23" = jdk23_headless;
-      "24" = jdk24_headless;
      "25" = jdk25_headless;
    }
    .${featureVersion},
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    ant
-    jdk
+    jdk'
    makeWrapper
    wrapGAppsHook3
    copyDesktopItems
@@ -45,7 +45,10 @@ stdenv.mkDerivation rec {
  # Required for build with gcc-14
  env.NIX_CFLAGS_COMPILE = "-std=c++14";

-  cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
+  cmakeFlags = [
+    "-DENABLE_OPENMP=ON"
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+  ];

  hardeningDisable = [ "format" ];

@@ -12,13 +12,13 @@

 buildDotnetModule rec {
  pname = "Pinta";
-  version = "3.0.3";
+  version = "3.0.4";

  src = fetchFromGitHub {
    owner = "PintaProject";
    repo = "Pinta";
    rev = version;
-    hash = "sha256-oqhRRfZXBbxQ3ojvam4Q/iuHqGQeqd27hYF9SFKc774=";
+    hash = "sha256-enCVn52wy42a1cXM2YYCg7RHpkzZoDHc52L6xlxQOo0=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  alsa-lib,
+  fontconfig,
+  freetype,
+  libX11,
+  libXcomposite,
+  libXcursor,
+  libXdmcp,
+  libXext,
+  libXinerama,
+  libXrandr,
+  libXtst,
+  ladspaH,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pluginval";
+  version = "1.0.4";
+  src = fetchFromGitHub {
+    owner = "Tracktion";
+    repo = "pluginval";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-j4Lb3pcw0931o63OvTTaIm2UzvYDIjmnaCXGvKB4gwM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+    fontconfig
+    freetype
+    libX11
+    libXcomposite
+    libXcursor
+    libXdmcp
+    libXext
+    libXinerama
+    libXrandr
+    libXtst
+    ladspaH
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Debug")
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 pluginval_artefacts/Debug/pluginval $out/bin/pluginval
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Cross-platform plugin validator and tester for AU/VST2/VST3 plugins";
+    homepage = "https://github.com/Tracktion/pluginval";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+    mainProgram = "pluginval";
+  };
+})
@@ -4,17 +4,18 @@
  fetchFromGitHub,
  buildGoModule,
  testers,
+  nix-update-script,
 }:

 buildGoModule (finalAttrs: {
  pname = "podman-tui";
-  version = "1.8.1";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "podman-tui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-lvqitz4H10ILg2b6Mlw1DoWoByFKJaDiCo5zTlzTBQ4=";
+    hash = "sha256-vE2GG7lDGORTuziNSoKJWNKGhskcGuEh6U2KHrGu0JQ=";
  };

  vendorHash = null;
@@ -48,11 +49,16 @@ buildGoModule (finalAttrs: {
    version = "v${finalAttrs.version}";
  };

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    homepage = "https://github.com/containers/podman-tui";
    description = "Podman Terminal UI";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ aaronjheng ];
+    maintainers = with lib.maintainers; [
+      aaronjheng
+      iedame
+    ];
    mainProgram = "podman-tui";
  };
 })
@@ -0,0 +1,58 @@
+diff --git a/powerdnsadmin/__init__.py b/powerdnsadmin/__init__.py
+index 660f96b..4d45c36 100755
+--- a/powerdnsadmin/__init__.py
+++ b/powerdnsadmin/__init__.py
+@@ -72,10 +72,16 @@ def create_app(config=None):
+     # SMTP
+     app.mail = Mail(app)
+ 
+    from powerdnsadmin.routes.index import register_modules
+
+     # Load app's components
+     assets.init_app(app)
+     models.init_app(app)
+-    routes.init_app(app)
+
+    with app.app_context():
+        register_modules()
+        routes.init_app(app)
+
+     services.init_app(app)
+ 
+     # Register filters
+diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py
+index 0918261..870d824 100644
+--- a/powerdnsadmin/routes/index.py
+++ b/powerdnsadmin/routes/index.py
+@@ -52,11 +52,16 @@ def register_modules():
+     global azure
+     global oidc
+     global saml
+-    google = google_oauth()
+-    github = github_oauth()
+-    azure = azure_oauth()
+-    oidc = oidc_oauth()
+-    saml = SAML()
+
+    try:
+        google = google_oauth()
+        github = github_oauth()
+        azure = azure_oauth()
+        oidc = oidc_oauth()
+        saml = SAML()
+    except Exception:
+        # Database not ready yet, will initialize on first request
+        pass
+ 
+ 
+ @index_bp.before_request
+@@ -65,6 +70,9 @@ def before_request():
+     g.user = current_user
+     login_manager.anonymous_user = Anonymous
+ 
+    if google is None:
+        register_modules()
+
+     # Check site is in maintenance mode
+     maintenance = Setting().get('maintenance')
+     if maintenance and current_user.is_authenticated and current_user.role.name not in [
@@ -1,27 +0,0 @@
-From 3eb1a408758b68543c73d5214b467c2905fbea2a Mon Sep 17 00:00:00 2001
-From: Flakebi <flakebi@t-online.de>
-Date: Sat, 2 Dec 2023 16:32:36 +0100
-Subject: [PATCH 5/6] Use app context to create routes
-
-Routes creates session database tables, so it needs a context.
---
- powerdnsadmin/__init__.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/powerdnsadmin/__init__.py b/powerdnsadmin/__init__.py
-index 653af33..bc6f7df 100755
--- a/powerdnsadmin/__init__.py
-+++ b/powerdnsadmin/__init__.py
-@@ -73,7 +73,8 @@ def create_app(config=None):
-     # Load app's components
-     assets.init_app(app)
-     models.init_app(app)
-    routes.init_app(app)
-+    with app.app_context():
-+        routes.init_app(app)
-     services.init_app(app)
- 
-     # Register filters
-- 
-2.42.0
-
@@ -0,0 +1,46 @@
+diff --git a/powerdnsadmin/lib/utils.py b/powerdnsadmin/lib/utils.py
+index f8cc997..0de4c5c 100644
+--- a/powerdnsadmin/lib/utils.py
+++ b/powerdnsadmin/lib/utils.py
+@@ -121,7 +121,7 @@ def display_record_name(data):
+     if record_name == domain_name:
+         return '@'
+     else:
+-        return re.sub('\.{}$'.format(domain_name), '', record_name)
+        return re.sub(r'\.{}$'.format(domain_name), '', record_name)
+ 
+ 
+ def display_master_name(data):
+diff --git a/powerdnsadmin/models/domain.py b/powerdnsadmin/models/domain.py
+index f0b9a30..84c6d1b 100644
+--- a/powerdnsadmin/models/domain.py
+++ b/powerdnsadmin/models/domain.py
+@@ -482,24 +482,24 @@ class Domain(db.Model):
+         if re.search('ip6.arpa', reverse_host_address):
+             for i in range(1, 32, 1):
+                 address = re.search(
+-                    '((([a-f0-9]\.){' + str(i) + '})(?P<ipname>.+6.arpa)\.?)',
+                    r'((([a-f0-9]\.){' + str(i) + r'})(?P<ipname>.+6\.arpa)\.?)',
+                     reverse_host_address)
+                 if None != self.get_id_by_name(address.group('ipname')):
+                     c = i
+                     break
+             return re.search(
+-                '((([a-f0-9]\.){' + str(c) + '})(?P<ipname>.+6.arpa)\.?)',
+                r'((([a-f0-9]\.){' + str(c) + r'})(?P<ipname>.+6\.arpa)\.?)',
+                 reverse_host_address).group('ipname')
+         else:
+             for i in range(1, 4, 1):
+                 address = re.search(
+-                    '((([0-9]+\.){' + str(i) + '})(?P<ipname>.+r.arpa)\.?)',
+                    r'((([0-9]+\.){' + str(i) + r'})(?P<ipname>.+r\.arpa)\.?)',
+                     reverse_host_address)
+                 if None != self.get_id_by_name(address.group('ipname')):
+                     c = i
+                     break
+             return re.search(
+-                '((([0-9]+\.){' + str(c) + '})(?P<ipname>.+r.arpa)\.?)',
+                r'((([0-9]+\.){' + str(c) + r'})(?P<ipname>.+r\.arpa)\.?)',
+                 reverse_host_address).group('ipname')
+ 
+     def delete(self, domain_name):
@@ -1,27 +0,0 @@
-From 86dcc9f308d2ca65704953f1ff9fe043d743e536 Mon Sep 17 00:00:00 2001
-From: Flakebi <flakebi@t-online.de>
-Date: Sat, 2 Dec 2023 16:33:45 +0100
-Subject: [PATCH 6/6] Register modules before starting
-
-Fixes flask 2.3: 'Blueprint' object has no attribute 'before_app_first_request'
---
- run.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/run.py b/run.py
-index 5ffcde3..52e719d 100755
--- a/run.py
-+++ b/run.py
-@@ -1,6 +1,9 @@
- #!/usr/bin/env python3
- from powerdnsadmin import create_app
-+from .powerdnsadmin.routes.index import register_modules
- 
- if __name__ == '__main__':
-     app = create_app()
-+    with app.app_context():
-+        register_modules()
-     app.run(debug=True, host=app.config.get('BIND_ADDRESS', '127.0.0.1'), port=app.config.get('PORT', '9191'))
-- 
-2.42.0
-
@@ -15,7 +15,7 @@ let
  src = fetchFromGitHub {
    owner = "PowerDNS-Admin";
    repo = "PowerDNS-Admin";
-    rev = "v${version}";
+    tag = "v${version}";
    hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk=";
  };

@@ -67,7 +67,6 @@ let
    zipp
    zxcvbn
    standard-imghdr
-
  ];

  all_patches = [
@@ -132,8 +131,8 @@ stdenv.mkDerivation {
  patches = all_patches ++ [
    ./0003-Fix-flask-migrate-4.0-compatibility.patch
    ./0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
-    ./0005-Use-app-context-to-create-routes.patch
-    ./0006-Register-modules-before-starting.patch
+    ./0005-Fix-app-context-and-register-modules.patch
+    ./0006-Fix-regex.patch
  ];

  postPatch = ''
@@ -167,12 +166,12 @@ stdenv.mkDerivation {
    tests = nixosTests.powerdns-admin;
  };

-  meta = with lib; {
+  meta = {
    description = "PowerDNS web interface with advanced features";
    mainProgram = "powerdns-admin";
    homepage = "https://github.com/PowerDNS-Admin/PowerDNS-Admin";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
      Flakebi
      zhaofengli
    ];
@@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rattler-build";
-  version = "0.47.1";
+  version = "0.48.0";

  src = fetchFromGitHub {
    owner = "prefix-dev";
    repo = "rattler-build";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-c7g+Y2owuoWqwvhNfsW18ppw8eLG0nAeFIFuoRqvPJY=";
+    hash = "sha256-Z3FRPk7FGqOraATtrdrrhwMr1mVC4lStDp3seCrKPGw=";
  };

-  cargoHash = "sha256-h4LSFfL+qzkuZ8MToI0MNxSGPCzJUmYgVoGwoYnXboE=";
+  cargoHash = "sha256-tzW3za0cn8qMsqEs+U10ud/tvU+eFxtolmyJDpf6WoY=";

  doCheck = false; # test requires network access

@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "reth";
-  version = "1.7.0";
+  version = "1.8.2";

  src = fetchFromGitHub {
    owner = "paradigmxyz";
    repo = "reth";
    rev = "v${version}";
-    hash = "sha256-Th2ibG4fVQPPxRSS4ChOQ176xUq3eU1/zNQbQlJUFNw=";
+    hash = "sha256-Z84zCt/v6e++Et6a2hBcHfrzQvtzBEn+Zx1bBRJfiqM=";
  };

-  cargoHash = "sha256-2zdilVIHCW0N2yZNfLNoVpTASjXU1ABcZzQLzpAGEsY=";
+  cargoHash = "sha256-KxUiiOTlMNlPw4pHjEcqXsMF3RCA0KVO66WKpz1YoT0=";

  nativeBuildInputs = [
    rustPlatform.bindgenHook
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "rqlite";
-  version = "9.1.0";
+  version = "9.1.2";

  src = fetchFromGitHub {
    owner = "rqlite";
    repo = "rqlite";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-q2T5Ze+rR2KfBvrtIiVa9W8DICxErdeRLA3aNKbyMCo=";
+    hash = "sha256-7QAJofhssL2N5szD4j9rcv830sEnMyrS2Mg4s4G33HI=";
  };

-  vendorHash = "sha256-Mq469sUYgS19SVJ7noTUl7hml9xUAGDsr64MJM8Xq9g=";
+  vendorHash = "sha256-zGAC7yDccfhZ+2WeiN9DAsOFTa3j4ymPxeFNwam7+Ts=";

  subPackages = [
    "cmd/rqlite"
@@ -12,11 +12,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rundeck";
-  version = "5.15.0-20250902";
+  version = "5.16.0-20251006";

  src = fetchurl {
    url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-3Nlpd0Sl6NCH+TNPNnh7NJxzOZUNQvKupyFOQOdJsto=";
+    hash = "sha256-ws84HDqowYz2ouvN7E3SlouGZdZUDVDK4LUmzKXOyec=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -4,15 +4,15 @@
  fetchFromGitHub,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rusty-bash";
-  version = "0.8.5";
+  version = "1.2.2";

  src = fetchFromGitHub {
    owner = "shellgei";
    repo = "rusty_bash";
-    tag = "v${version}";
-    hash = "sha256-hUMkgsWlGSqOnYdFhDGBWbc13oAssklbuJAg8NkY398=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WBV0wF7SKhOKAo+F1IImpPIgLvo9GYkqWrb2GluUtdA=";
  };

  postPatch = ''
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
    mainProgram = "sush";
    maintainers = with lib.maintainers; [ aleksana ];
  };
-}
+})
@@ -34,11 +34,11 @@

 stdenv.mkDerivation rec {
  pname = "saga";
-  version = "9.9.2";
+  version = "9.9.3";

  src = fetchurl {
    url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-fBnHootXNwdnB+TnBMS7U7oPWhs3p7cFvPVbAIwQCBE=";
+    hash = "sha256-6wyAUf4Dy41OEHqlY1T8wh/RCmPeCboDccX7ieqXPdo=";
  };

  sourceRoot = "saga-${version}/saga-gis";
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "System for Automated Geoscientific Analyses";
    homepage = "https://saga-gis.sourceforge.io";
-    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/";
+    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${version}/";
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [
      michelk
@@ -14,13 +14,13 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "snx-rs";
-  version = "4.8.1";
+  version = "4.8.2";

  src = fetchFromGitHub {
    owner = "ancwrd1";
    repo = "snx-rs";
    tag = "v${version}";
-    hash = "sha256-/ntw1AuOqTy9s1jY+6UIDqZWtmjr1DVRQur/h0LkkXI=";
+    hash = "sha256-wVc3iddqXTpsBZqEY+WWR1Taig4crhlQqw7jypm3ZMc=";
  };

  passthru.updateScript = nix-update-script { };
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
    versionCheckHook
  ];

-  cargoHash = "sha256-lLYQ+N5P8p4jiJCo6UyXvXeDT9JRlzIk8VH6UKlqvX0=";
+  cargoHash = "sha256-HRew3ldsgUbCh4eW1MSvoxLZobSJRjj7Eg0+XRbjFes=";

  doInstallCheck = true;
  versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch2,
  cmake,
  pkg-config,
  rtl-sdr,
@@ -28,6 +29,20 @@ stdenv.mkDerivation (finalAttrs: {
    soapysdr
  ];

+  patches = [
+    (fetchpatch2 {
+      name = "cmake-update.patch";
+      url = "https://github.com/pothosware/SoapyRTLSDR/commit/448c9d0d326c2600905b7ce84222ff9d72ba2189.patch?full_index=1";
+      hash = "sha256-hWlNowkf9yZM6p+EGh+IiUm2JfG5mLe8Qq8gTVIdIak=";
+    })
+
+    (fetchpatch2 {
+      name = "fix-cmake4-build.patch";
+      url = "https://github.com/pothosware/SoapyRTLSDR/commit/bb2d1511b957138051764c9193a3d6971e912b85.patch?full_index=1";
+      hash = "sha256-C90B5WMjx1lJKiX0F/cAfGmz2WRc2BA84FTmVmnC+DI=";
+    })
+  ];
+
  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];

  meta = with lib; {
@@ -11,13 +11,14 @@

 stdenv.mkDerivation {
  pname = "soapyuhd";
-  version = "0.4.1-unstable-2025-02-13";
+  version = "0.4.1-unstable-2025-10-05";

  src = fetchFromGitHub {
    owner = "pothosware";
    repo = "SoapyUHD";
-    rev = "6b521393cc45c66770f3d4bc69eac7dda982174c";
-    sha256 = "qg0mbw3S973cnok6tVx7Y38ijOQcJdHtPLi889uo7tI=";
+    # version that supports cmake 4
+    rev = "cf78b9ca3bddfc9263d2acb7e8afcb0036938163";
+    hash = "sha256-/hJ78dUL477gX3c2kV8kUknIk01PUf+ie1Gl7Ujq1Ac=";
  };

  nativeBuildInputs = [
@@ -4,6 +4,7 @@
  applyPatches,
  writeTextFile,
  fetchurl,
+  fetchpatch,
  stdenv,
  replaceVars,
  yaml-cpp,
@@ -100,6 +101,19 @@ let
    hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
  };

+  # Include cmake4 patch
+  # Remove when yaml-cpp.src is updated to include it
+  yaml-patched = applyPatches {
+    src = yaml-cpp.src;
+    patches = [
+      (fetchpatch {
+        name = "yaml-cpp-fix-cmake-4.patch";
+        url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
+        hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
+      })
+    ];
+  };
+
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "spaghettikart";
@@ -183,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-patched}")
  ];

  strictDeps = true;
@@ -7,12 +7,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "steam-unwrapped";
-  version = "1.0.0.84";
+  version = "1.0.0.85";

  src = fetchurl {
    # use archive url so the tarball doesn't 404 on a new release
    url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz";
-    hash = "sha256-Mfp2LVh5Pxqo6p3wEiw0acJT/IrLbapxQPt0M/4He0Q=";
+    hash = "sha256-fy03Si+0E87VuBJRUUViGdkYolWHK0u3cBbLzPOLt/E=";
  };

  patches = [
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "stevenblack-blocklist";
-  version = "3.16.20";
+  version = "3.16.23";

  src = fetchFromGitHub {
    owner = "StevenBlack";
    repo = "hosts";
    tag = finalAttrs.version;
-    hash = "sha256-z3VWoF5/evd0n97AmrWgSskaNqVaad0Ex2pn53JHkSk=";
+    hash = "sha256-xwfozRzPrq8PybpRYVkQ/RXF4AbroLk3FMA32XCnFrk=";
  };

  outputs = [
@@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "sudo-rs";
-  version = "0.2.8";
+  version = "0.2.9";

  src = fetchFromGitHub {
    owner = "trifectatechfoundation";
    repo = "sudo-rs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-82qd9lVwxI9Md7NWpfauGWKtvR1MvX9VNZ9e1RvzmP4=";
+    hash = "sha256-gHvTOwMzpkfyjLiJlL+CYswiccDBFIR8Xm3r86IFv+w=";
  };

-  cargoHash = "sha256-hvXVdPs2K1FPi06NZSockNXA9QOnXOsrONiMCTiIs2I=";
+  cargoHash = "sha256-Z8ml1pKqL2zpz7QanM1skVqr0vJaJ4uegjiYSxMOkr0=";

  nativeBuildInputs = [ installShellFiles ];

@@ -97,6 +97,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      mit
    ];
    maintainers = with lib.maintainers; [
+      adamcstephens
      nicoo
      rvdp
    ];
@@ -32,6 +32,29 @@ stdenv.mkDerivation rec {

  postPatch = ''
    sed '1i#include <memory>' -i external/partio_zip/zip_manager.hpp # gcc12
+    # Fix build with cmake 4. Remove for version >= 0.6.4.
+    # See <https://github.com/SuperTux/supertux/pull/3093>
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace external/physfs/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8.12)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace external/sexp-cpp/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.0)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace external/squirrel/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace external/tinygettext/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.4)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace external/SDL_ttf/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.0)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace external/discord-sdk/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required (VERSION 3.2.0)' \
+      'cmake_minimum_required (VERSION 4.0)'
  '';

  nativeBuildInputs = [
@@ -3,40 +3,42 @@
  stdenv,
  fetchFromGitHub,
  cmake,
+  lm_sensors,
  yaml-cpp,
  pkg-config,
  procps,
-  coreutils,
  smartSupport ? false,
  libatasmart,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "thinkfan";
-  version = "1.3.1";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "vmatare";
    repo = "thinkfan";
-    rev = version;
-    sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4=";
+    tag = finalAttrs.version;
+    hash = "sha256-QqDWPOXy8E+TY5t0fFRAS8BGA7ZH90xecv5UsFfDssk=";
  };

-  postPatch = ''
-    # fix hardcoded install path
-    substituteInPlace CMakeLists.txt --replace /etc $out/etc
-
-    # fix command paths in unit files
-    for unit in rcscripts/systemd/*; do
-      substituteInPlace "$unit" \
-        --replace /bin/kill ${procps}/bin/kill \
-        --replace /usr/bin/pkill ${procps}/bin/pkill \
-        --replace /usr/bin/sleep ${coreutils}/bin/sleep
-    done
+  postPatch = # fix hardcoded install path
+  ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "/etc" "$out/etc"
+  ''
+  # fix command paths in unit files
+  + ''
+    substituteInPlace rcscripts/systemd/thinkfan-sleep.service \
+      --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}"
+    substituteInPlace rcscripts/systemd/thinkfan-wakeup.service \
+      --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}"
+    substituteInPlace rcscripts/systemd/thinkfan.service.cmake \
+      --replace-fail "/bin/kill" "${lib.getExe' procps "kill"}"
  '';

  cmakeFlags = [
-    "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}"
+    "-DCMAKE_INSTALL_DOCDIR=share/doc/thinkfan"
    "-DUSE_NVML=OFF"
    # force install unit files
    "-DSYSTEMD_FOUND=ON"
@@ -48,7 +50,11 @@ stdenv.mkDerivation rec {
    pkg-config
  ];

-  buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart;
+  buildInputs = [
+    lm_sensors
+    yaml-cpp
+  ]
+  ++ lib.optional smartSupport libatasmart;

  meta = {
    description = "Simple, lightweight fan control program";
@@ -65,4 +71,4 @@ stdenv.mkDerivation rec {
    platforms = lib.platforms.linux;
    mainProgram = "thinkfan";
  };
-}
+})
@@ -10,7 +10,7 @@
  gettext,
  povray,
  imagemagick,
-  gimp,
+  gimp2,

  sdl2-compat,
  SDL2_mixer,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
    gettext
    povray
    imagemagick
-    gimp
+    gimp2
    # GIMP needs a writable home
    writableTmpDirAsHomeHook
  ];
@@ -7,29 +7,41 @@
  boost,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "usbtop";
  version = "1.0";

  src = fetchFromGitHub {
    owner = "aguinet";
    repo = "usbtop";
-    rev = "release-${version}";
-    sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss";
+    tag = "release-${finalAttrs.version}";
+    hash = "sha256-Ws90l5C+KzQC5QgbX7+Hv/Fw5lRAGQoSzJJIgxVoamE=";
  };

+  postPatch =
+    # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/command/cmake_minimum_required.html)
+    # TODO: drop when https://github.com/aguinet/usbtop/pull/45 is merged
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail \
+          'cmake_minimum_required(VERSION 2.8)' \
+          'cmake_minimum_required(VERSION 2.8...4.0)'
+    '';
+
  nativeBuildInputs = [ cmake ];
+
  buildInputs = [
    libpcap
    boost
  ];

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/aguinet/usbtop";
+    changelog = "https://github.com/aguinet/usbtop/raw/${finalAttrs.src.rev}/CHANGELOG";
    description = "Top utility that shows an estimated instantaneous bandwidth on USB buses and devices";
    mainProgram = "usbtop";
    maintainers = [ ];
-    license = licenses.bsd3;
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
  };
-}
+})
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "vfox";
-  version = "0.6.10";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "version-fox";
    repo = "vfox";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bH7rHhjmfXCOAv+K0HDyPAi+ZBfLllsGyhLSo8rpcl4=";
+    hash = "sha256-d6rxk2gdS5oo/71Z53o2eJw/NhApqyqzgMa/sMKLY7s=";
  };

  vendorHash = "sha256-TmWhzjjv+DkFHV4kEKpVYgQpI0Vl4aYvKR9QVpawrYA=";
@@ -1,11 +1,13 @@
 {
  lib,
+  stdenv,
  buildNpmPackage,
  fetchFromGitHub,
  pkg-config,
  libsecret,
-  python3,
-  testers,
+  nodejs,
+  clang_20,
+  versionCheckHook,
  nix-update-script,
 }:

@@ -28,18 +30,19 @@ buildNpmPackage (finalAttrs: {

  nativeBuildInputs = [
    pkg-config
-    python3
-  ];
+    nodejs.python
+  ]
+  ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar

  buildInputs = [ libsecret ];

  makeCacheWritable = true;
-  npmFlags = [ "--legacy-peer-deps" ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";

  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-    };
    updateScript = nix-update-script {
      extraArgs = [
        "--version-regex"
@@ -51,7 +54,10 @@ buildNpmPackage (finalAttrs: {
  meta = {
    homepage = "https://github.com/microsoft/vscode-vsce";
    description = "Visual Studio Code Extension Manager";
-    maintainers = with lib.maintainers; [ aaronjheng ];
+    maintainers = with lib.maintainers; [
+      aaronjheng
+      xiaoxiangmoe
+    ];
    license = lib.licenses.mit;
    mainProgram = "vsce";
  };
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchzip,
-  jdk24,
+  jdk25,
  unzip,
  copyDesktopItems,
  makeDesktopItem,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildPhase = ''
    runHook preBuild

-    ./build/script/package-weasis.sh --no-installer --jdk ${jdk24}
+    ./build/script/package-weasis.sh --no-installer --jdk ${jdk25}

    runHook postBuild
  '';
@@ -70,12 +70,12 @@ stdenv.mkDerivation (finalAttrs: {
  ''
  + lib.optionalString stdenv.isLinux ''
    mkdir -p $out/share/{applications,pixmaps}
-    mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/
+    mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/
    mv $out/lib/*.png $out/share/pixmaps/
  ''
  + lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/Applications
-    mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis.app $out/Applications/
+    mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis.app $out/Applications/
  ''
  + ''
    runHook postInstall
@@ -32,13 +32,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xemu";
-  version = "0.8.105";
+  version = "0.8.106";

  src = fetchFromGitHub {
    owner = "xemu-project";
    repo = "xemu";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-1Gp/XGPCIT8qeW1YPI+mh6P0avHHFXtOGcXEEkGT12w=";
+    hash = "sha256-QlhK86yj0ZvhbXfZyoHkpgxC9rZx/XRZ1LdFNFH1LMk=";

    nativeBuildInputs = [
      git
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
  pname = "xenia-canary";
-  version = "0-unstable-2025-09-27";
+  version = "0-unstable-2025-10-06";

  src = fetchFromGitHub {
    owner = "xenia-canary";
    repo = "xenia-canary";
    fetchSubmodules = true;
-    rev = "41b412fa76f2fc4d913af0b74a68208616f205ce";
-    hash = "sha256-Q6Y1aV45wKeutvuiovEtb2Csqzx38gQelHky3EKx2BM=";
+    rev = "703531d541fb9391afed4fbb951db198c9193c28";
+    hash = "sha256-xLZBEnSxDhGWGscvE4Ht4wSAnSxY+0wBLAA2MVVobHg=";
  };

  dontConfigure = true;
@@ -1,6 +0,0 @@
-{
-  "hash": "sha256-YgkTSh7U/tJxiJIi8fxCkVgcogMQbcN4PgjmlcHcOBE=",
-  "owner": "openjdk",
-  "repo": "jdk24u",
-  "rev": "refs/tags/jdk-24.0.2+12"
-}
@@ -59,14 +59,12 @@
  openjfx17,
  openjfx21,
  openjfx23,
-  openjfx24,
  openjfx25,
  openjfx_jdk ?
    {
      "17" = openjfx17;
      "21" = openjfx21;
      "23" = openjfx23;
-      "24" = openjfx24;
      "25" = openjfx25;
    }
    .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
@@ -81,7 +79,6 @@
  temurin-bin-17,
  temurin-bin-21,
  temurin-bin-23,
-  temurin-bin-24,
  temurin-bin-25,
  jdk-bootstrap ?
    {
@@ -90,7 +87,6 @@
      "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;
      "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
      "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
-      "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24;
      "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25;
    }
    .${featureVersion},
@@ -107,7 +103,6 @@ let
  atLeast17 = lib.versionAtLeast featureVersion "17";
  atLeast21 = lib.versionAtLeast featureVersion "21";
  atLeast23 = lib.versionAtLeast featureVersion "23";
-  atLeast24 = lib.versionAtLeast featureVersion "24";
  atLeast25 = lib.versionAtLeast featureVersion "25";

  tagPrefix = if atLeast11 then "jdk-" else "jdk";
@@ -152,8 +147,8 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    (
-      if atLeast24 then
-        ./24/patches/fix-java-home-jdk24.patch
+      if atLeast25 then
+        ./25/patches/fix-java-home-jdk25.patch
      else if atLeast21 then
        ./21/patches/fix-java-home-jdk21.patch
      else if atLeast11 then
@@ -162,8 +157,8 @@ stdenv.mkDerivation (finalAttrs: {
        ./8/patches/fix-java-home-jdk8.patch
    )
    (
-      if atLeast24 then
-        ./24/patches/read-truststore-from-env-jdk24.patch
+      if atLeast25 then
+        ./25/patches/read-truststore-from-env-jdk25.patch
      else if atLeast11 then
        ./11/patches/read-truststore-from-env-jdk10.patch
      else
@@ -271,7 +266,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optionals atLeast21 [
    ensureNewerSourcesForZipFilesHook
  ]
-  ++ lib.optionals atLeast24 [
+  ++ lib.optionals atLeast25 [
    pandoc
  ];

@@ -477,7 +472,7 @@ stdenv.mkDerivation (finalAttrs: {
    chmod +x configure
    patchShebangs --build configure
  ''
-  + lib.optionalString atLeast24 ''
+  + lib.optionalString atLeast25 ''
    chmod +x make/scripts/*.{template,sh,pl}
    patchShebangs --build make/scripts
  '';
@@ -6,7 +6,7 @@ import re
 import requests
 import sys

-feature_versions = (8, 11, 17, 21, 23, 24, 25)
+feature_versions = (8, 11, 17, 21, 23, 25)
 oses = ("mac", "linux", "alpine-linux")
 types = ("jre", "jdk")
 impls = ("hotspot",)
@@ -22,9 +22,6 @@ in
  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };

-  jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; };
-  jre-24 = common { sourcePerArch = sources.jre.openjdk24; };
-
  jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
  jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
 }
@@ -27,9 +27,6 @@ in
  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };

-  jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; };
-  jre-24 = common { sourcePerArch = sources.jre.openjdk24; };
-
  jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
  jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
 }
--- a/Show More
+++ b/Show More