diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md
index 229aebc538a5..f2fa14bb07a5 100644
--- a/doc/hooks/versionCheckHook.section.md
+++ b/doc/hooks/versionCheckHook.section.md
@@ -30,7 +30,7 @@ The variables that this phase control are:
 
 - `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently.
 - `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults to using the first non-empty value `$binary` out of `${NIX_MAIN_PROGRAM}` and `${pname}`, in that order, to build roughly `${placeholder "out"}/bin/$binary`. `${NIX_MAIN_PROGRAM}`'s value comes from `meta.mainProgram`, and does not normally need to be set explicitly. When setting `versionCheckProgram`, using `$out` directly won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder "out"` is unavoidable.
-- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`.
+- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--version` and then `--help`. Examples: `version`, `-V`, `-v`.
 - `versionCheckKeepEnvironment`: A list of environment variables to keep and pass to the command. Only those variables should be added to this list that are actually required for the version command to work. If it is not feasible to explicitly list all these environment variables you can set this parameter to the special value `"*"` to disable the `--ignore-environment` flag and thus keep all environment variables.
 - `preVersionCheck`: A hook to run before the check is done.
 - `postVersionCheck`: A hook to run after the check is done.
diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md
index 50fc4945ff76..dd95f3740837 100644
--- a/doc/languages-frameworks/perl.section.md
+++ b/doc/languages-frameworks/perl.section.md
@@ -71,7 +71,7 @@ To install it with `nix-env` instead: `nix-env -f. -iA perlPackages.ClassC3`.
 So what does `buildPerlPackage` do? It does the following:
 
 1. In the configure phase, it calls `perl Makefile.PL` to generate a Makefile. You can set the variable `makeMakerFlags` to pass flags to `Makefile.PL`
-2. It adds the contents of the `PERL5LIB` environment variable to `#! .../bin/perl` line of Perl scripts as `-Idir` flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.)
+2. It adds the contents of the `PERL5LIB` environment variable to a use lib statement at the start of Perl scripts. This ensures that a script can find its dependencies.
 3. In the fixup phase, it writes the propagated build inputs (`propagatedBuildInputs`) to the file `$out/nix-support/propagated-user-env-packages`. `nix-env` recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies.
 
 `buildPerlPackage` is built on top of `stdenv`, so everything can be customised in the usual way. For instance, the `BerkeleyDB` module has a `preConfigure` hook to generate a configuration file used by `Makefile.PL`:
@@ -120,37 +120,6 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p
 }
 ```
 
-On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase:
-
-```nix
-{
-  lib,
-  stdenv,
-  buildPerlPackage,
-  fetchurl,
-  shortenPerlShebang,
-}:
-
-{
-  ImageExifTool = buildPerlPackage {
-    pname = "Image-ExifTool";
-    version = "12.50";
-
-    src = fetchurl {
-      url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
-      hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg=";
-    };
-
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/exiftool
-    '';
-  };
-}
-```
-
-This will remove the `-I` flags from the shebang line, rewrite them in the `use lib` form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place.
-
 ### Generation from CPAN {#ssec-generation-from-CPAN}
 
 Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program `nix-generate-from-cpan`, which can be installed as follows:
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md
index dbd08fb58718..bd1652d9effb 100644
--- a/doc/languages-frameworks/qt.section.md
+++ b/doc/languages-frameworks/qt.section.md
@@ -25,15 +25,7 @@ stdenv.mkDerivation {
 
 The same goes for Qt 5 where libraries and tools are under `libsForQt5`.
 
-Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers.
-
-::: {.note}
-
-`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications.
-
-`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications.
-
-:::
+Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers.
 
 ## Packages supporting multiple Qt versions {#qt-versions}
 
diff --git a/doc/languages-frameworks/typst.section.md b/doc/languages-frameworks/typst.section.md
index 5d95f44ae7ad..711b6ce193bd 100644
--- a/doc/languages-frameworks/typst.section.md
+++ b/doc/languages-frameworks/typst.section.md
@@ -22,7 +22,7 @@ Since **Typst Universe** does not provide a way to fetch a package with a specif
 ```nix
 typst.withPackages.override
   (old: {
-    typstPackages = old.typstPackages.extend (
+    typstPackages = old.typstPackages.overrideScope (
       _: previous: {
         polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: {
           src = oldPolylux.src.overrideAttrs { outputHash = YourUpToDatePolyluxHash; };
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index a984da6d2989..2bf04db951ec 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -3,7 +3,11 @@
 ## Highlights {#sec-nixpkgs-release-26.05-highlights}
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- GCC has been updated from GCC 14 to GCC 15.
+  This introduces some backwards incompatible changes; Refer to the [upstream porting guide](https://gcc.gnu.org/gcc-15/porting_to.html) for details.
+
+- Node.js default version has been updated from 22 LTS to 24 LTS.
+  This introduces some breaking changes; Refer to the [upstream migration article](https://nodejs.org/en/blog/migrations/v22-to-v24) for details.
 
 ## Backward Incompatibilities {#sec-nixpkgs-release-26.05-incompatibilities}
 
@@ -64,6 +68,8 @@
 
 - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.
 
+- `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/lib/licenses.nix b/lib/licenses.nix
index b67421054e8b..ce2e15951fc1 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -64,6 +64,11 @@ lib.mapAttrs mkLicense (
       free = false;
     };
 
+    adobeDisplayPostScript = {
+      spdxId = "Adobe-Display-PostScript";
+      fullName = "Adobe Display PostScript License";
+    };
+
     adobeUtopia = {
       fullName = "Adobe Utopia Font License";
       spdxId = "Adobe-Utopia";
@@ -501,6 +506,11 @@ lib.mapAttrs mkLicense (
       fullName = "curl License";
     };
 
+    dec3Clause = {
+      spdxId = "DEC-3-Clause";
+      fullName = "DEC 3-Clause License";
+    };
+
     doc = {
       spdxId = "DOC";
       fullName = "DOC License";
@@ -727,6 +737,11 @@ lib.mapAttrs mkLicense (
       spdxId = "HPND-sell-variant";
     };
 
+    hpndSellVariantMitDisclaimerXserver = {
+      spdxId = "HPND-sell-MIT-disclaimer-xserver";
+      fullName = "Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer";
+    };
+
     hpndDec = {
       fullName = "Historical Permission Notice and Disclaimer - DEC variant";
       spdxId = "HPND-DEC";
@@ -1113,6 +1128,13 @@ lib.mapAttrs mkLicense (
       fullName = "Non-Profit Open Software License 3.0";
     };
 
+    # NTP is basically HPND, but spdx and the OSI recognize it
+    # hpnd says "and without fee", ntp "with or without fee"
+    ntp = {
+      spdxId = "NTP";
+      fullName = "NTP License";
+    };
+
     nvidiaCuda = {
       shortName = "CUDA EULA";
       fullName = "CUDA Toolkit End User License Agreement (EULA)";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 472d56cd68dd..27ec72e63093 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22281,6 +22281,11 @@
     githubId = 395821;
     name = "rht";
   };
+  rhydianjenkins = {
+    name = "Rhydian Jenkins";
+    github = "RhydianJenkins";
+    githubId = 9198690;
+  };
   rhysmdnz = {
     email = "rhys@memes.nz";
     matrix = "@rhys:memes.nz";
@@ -29461,6 +29466,12 @@
     email = "rasmus@liaskar.net";
     githubId = 152716976;
   };
+  zivarah = {
+    name = "Brian Lyles";
+    github = "zivarah";
+    email = "brianmlyles@gmail.com";
+    githubId = 1123282;
+  };
   zlepper = {
     name = "Rasmus Hansen";
     github = "zlepper";
diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix
index 58eef6e0ccef..a03ada67cdac 100644
--- a/nixos/tests/lvm2/default.nix
+++ b/nixos/tests/lvm2/default.nix
@@ -4,11 +4,11 @@
   pkgs ? import ../../.. { inherit system config; },
   lib ? pkgs.lib,
   kernelVersionsToTest ? [
-    "5.4"
     "5.10"
     "5.15"
     "6.1"
     "6.6"
+    "6.12"
     "latest"
   ],
 }:
diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix
index 921c111cfc1f..1adda72186f4 100644
--- a/nixos/tests/wpa_supplicant.nix
+++ b/nixos/tests/wpa_supplicant.nix
@@ -96,16 +96,27 @@ let
 
         # Note: secrets are stored outside /etc/ and /nix/store to
         # test for accessibility of these paths
-        system.activationScripts.wpa-secrets = {
-          deps = [
-            "users"
-            "specialfs"
+        systemd.services.wpa-secrets = {
+          wantedBy = [
+            "network.target"
+            "multi-user.target"
           ];
-          text = ''
-            install -Dm600 -o wpa_supplicant ${pkgs.writeText "wpa" ''
-              psk_nixos_test=${naughtyPassphrase}
-            ''} /var/lib/secrets/wpa
-          '';
+          before = [
+            "network.target"
+            "multi-user.target"
+          ];
+          serviceConfig = {
+            Type = "oneshot";
+          };
+          script =
+            let
+              secretFile = pkgs.writeText "wpa" ''
+                psk_nixos_test=${naughtyPassphrase}
+              '';
+            in
+            ''
+              install -Dm600 -o wpa_supplicant ${secretFile} /var/lib/secrets/wpa
+            '';
         };
 
         # wireless client
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index b83c55e12662..2f7bb835c4f2 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -187,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 01ff36eae23a..6ce894f595b5 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -187,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.tests = {
diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index 45b855093bf3..f5998c0c1457 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -9,38 +9,38 @@
     },
     "clion": {
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "91474a3c35a9b3d50f43f0549098317b65aa881f2f80c3345f8dee7587d31f9e",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5.tar.gz",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "44ae3da5358ba010a62d55ab412b72f364c5dcd2c2dcd2004ae34b7463807bbd",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1.tar.gz",
+      "build_number": "253.29346.141"
     },
     "datagrip": {
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2025.3",
-      "sha256": "010ad3a676cfe984e7498d1eb4f84686d7a110acbde4f9d288f53967255340e6",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.tar.gz",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "cb6ed6475d21eb8d30754131bd24003c114096bfa84ffccf334dc11cf8ac60cc",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.tar.gz",
+      "build_number": "253.29346.170"
     },
     "dataspell": {
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "1e4bc499da1ce8c63e8a4526159c20ef8a797315dc6d3ab4c8eb109f323faba6",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3.tar.gz",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "37f13426ce4f5d859d7db246f2328ccbad61adf361d43c784cb6932af6644c28",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1.tar.gz",
+      "build_number": "253.29346.157"
     },
     "gateway": {
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "5a84a4dbc5fc1aa03fa1bf142e1eae51e265f6d17ec38c50932b83e629a4366c",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5.tar.gz",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "90c8a54f619245a5435c343f94f39595ab59cd3cbada569e2b1e28bcacdbcb4a",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.tar.gz",
+      "build_number": "253.28294.342"
     },
     "goland": {
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "7b748b7f5af267e8bd4d90d44bbeea8cb58b262115d884d2cd567af8d9d753c1",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5.tar.gz",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "6151856286ea546eb8af9aeb025772cee6bd57134f45494a818e8da20a8691c6",
+      "url": "https://download.jetbrains.com/go/goland-2025.3.tar.gz",
+      "build_number": "253.28294.337"
     },
     "idea-community": {
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
@@ -51,24 +51,24 @@
     },
     "idea": {
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "dc92cd3850ba256d2cb1c9d884f9579f613f6fa747f628361458d21f66687393",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5.tar.gz",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "21e1b90b5ec684767a03498ba424ef3f9acc5dbf759cceefd5edd474f043ad6c",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1.tar.gz",
+      "build_number": "253.29346.138"
     },
     "mps": {
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "sha256": "c4023e52b4e17824d61d2768238619be14e5ae5735db533e3951647f377b6b79",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz",
+      "build_number": "253.28294.432"
     },
     "phpstorm": {
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "4f102bb85add2527e46695f3b866c0e315423e19bc45e0adb0de0fe577a1efe6",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5.tar.gz",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "fd8937ab6b79605cefc9917ffe6a08e05a6b7cc0256fa2178623d24ec322fa29",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.tar.gz",
+      "build_number": "253.29346.151",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -80,38 +80,38 @@
     },
     "pycharm": {
       "url-template": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "b1e47419e5844c38e7a7a9be9e5260c75cea6aa8423f2584dc1727f792d5feb4",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5.tar.gz",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "933fd42d7cc2a76ad4ba23f9112294e4df013fa4c3362435a1e3368051c07391",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1.tar.gz",
+      "build_number": "253.29346.142"
     },
     "rider": {
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2025.3.0.3",
-      "sha256": "f09d5e060df110316e8abdedc397e6475e5d46d3f99b422d06de69f6e7025dbc",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3.tar.gz",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "ba840f7c48da7f118cf57aa8c22df30120d16f175fbce3bec6a65590ed87f2e8",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.tar.gz",
+      "build_number": "253.29346.144"
     },
     "ruby-mine": {
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "9d42262fa938e072a83828bd643c6d702b07e4a45c095315500a2a60d7bb805c",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5.tar.gz",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "e9eb2011ca2d5694c58c011690bf544d026e3a7c1c0c8de9bb37a18fa0cf8118",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.tar.gz",
+      "build_number": "253.29346.140"
     },
     "rust-rover": {
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "01ec30397ec61ac6dcb66cb037ea69b2be8a7e079020e50513f2e1e102ccfc84",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5.tar.gz",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "5a1b34e10a1c59eee30694236baa8233c7787580769381be01b4ccb09618ec89",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.tar.gz",
+      "build_number": "253.29346.139"
     },
     "webstorm": {
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "535167a94350f355e8d4b63624df25c9eca58e5f570df596c7ca8ab630f3c485",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5.tar.gz",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "08a851d216b741c49ebb6846e178fb823d329fe7b9824a2134b68c8fd25ba2ae",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.tar.gz",
+      "build_number": "253.29346.143"
     },
     "writerside": {
       "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz",
@@ -131,38 +131,38 @@
     },
     "clion": {
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "bff9d778fdfa41dc69019f05b01a9f242caa4406432f63b9d599799790f62655",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "b96c38c3d2f7ff7b988d75c970fd0e90363e09b8273106defc9ae3defa868ed7",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.141"
     },
     "datagrip": {
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "version": "2025.3",
-      "sha256": "52a2e70f8903ee70ceb7fd45216f5d3ac35718ba066b30cb084c6bcacf9a5098",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3-aarch64.tar.gz",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "1a6feb3aa255dace332cc18b868593181b6ea62c3d9f0d36f90032ca0517d068",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.tar.gz",
+      "build_number": "253.29346.170"
     },
     "dataspell": {
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "4bebb406617b4179791d4b6560dc50355760773ef37f6ce9f27bd0d1fd638750",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "40afd38cc704cdff2be89b9f0d67bdbcb1699d7b37b25d34d44d2d52ef6a46d3",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.157"
     },
     "gateway": {
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "62cb3723786e66aec656561cc37f31bf232346be303184e3e73018e85b252430",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "204ed3f7262877d0a46aaf30c5bafb7216b4e9736bebee71425c993c18486af8",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.tar.gz",
+      "build_number": "253.28294.342"
     },
     "goland": {
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "c9bdfe1a106c470ee335d779ab59f61898098d4769dac8c2975113dba6d8dcf5",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "c530dd4bcc7a075a040b64859ecb34142c8fc0399625c5a13ae2d7a8f5974340",
+      "url": "https://download.jetbrains.com/go/goland-2025.3-aarch64.tar.gz",
+      "build_number": "253.28294.337"
     },
     "idea-community": {
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
@@ -173,24 +173,24 @@
     },
     "idea": {
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "6203b9dbc2461abc59604a7fb319d8e06948b2886489ae03499e98f4c1a0a57c",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "095711329d1e9c14641ba426e652d4dbd3885b27c9a046e44725ae677491e8c3",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.138"
     },
     "mps": {
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "sha256": "c4023e52b4e17824d61d2768238619be14e5ae5735db533e3951647f377b6b79",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz",
+      "build_number": "253.28294.432"
     },
     "phpstorm": {
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "9dbf2ef4f69039f82ed1c4f279a22d5e1cb88051bcf5670e7c4d5bf0263295e9",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "7648667f85b4c45928b04d4c26f22882a8aa65a787a64fa2f7affe51a1bc2a61",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.151",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -202,38 +202,38 @@
     },
     "pycharm": {
       "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "7037672c6913f643ec4979ca5f16791588e001ffd39f830d874587f79e358be2",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "2b6f5a430132773ea7caf3046f7763ea7a031dbfab6e1be72bdc86f3cc7a758b",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.142"
     },
     "rider": {
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "version": "2025.3.0.3",
-      "sha256": "eb3727a2c4159e185b839b0ee0c2ee7383d4bc5a8ef3c1f41dbd59ae7cb705d6",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3-aarch64.tar.gz",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "19080fcdc48fa0f743ed60927b71975a3c478b805296161cfd8a0aa2c04c8f52",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.144"
     },
     "ruby-mine": {
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "1dd8720dbb32a9ae6ed9856834baf5242aa8296ed179fee3e5b7be432f993155",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "bf603c6a1ba1e618afdb70589648447cfce53b4daa7a0cc68073c1b77e727d55",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.140"
     },
     "rust-rover": {
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "8e424e01a38faebbfd7fa36cdae51e233551f921a666e36a0a0a6a04e686fa0a",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "fb0f81c9d2a2a604718484954b261a642be9ed6f51de98fcdc6cedb32b0a4c9e",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.139"
     },
     "webstorm": {
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "d4a474c7434878906ed9d3c92572ac61c6fe8eb7dc48653677e2ead1785f4551",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "fd8bb3ee70c549165d9102437bca03e857fc147281c1d7382249d4690c31dd87",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.143"
     },
     "writerside": {
       "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz",
@@ -253,38 +253,38 @@
     },
     "clion": {
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "234b93f26fbb411393dbfd7d1084ff8e8d35b745778d4b9ed1ecba670dafe0fb",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5.dmg",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "9a8174c9229f9c86f86da1a8e2bdab52ffb369ea0781b57eb245703ebc8307e2",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1.dmg",
+      "build_number": "253.29346.141"
     },
     "datagrip": {
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2025.3",
-      "sha256": "4a92e083ddc6edb7ff1639705d6bd3cf8d47d960659a9aa71e19b95fafad8d07",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.dmg",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "0383a0a4f2fde583b62ea7d342e5718b0fa306fc8349541c75bec5ae841fb4fc",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.dmg",
+      "build_number": "253.29346.170"
     },
     "dataspell": {
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "7d1a60c4367a1e1bd43aec494177c4c30744cb5bf904a3c71d2a3d13439a7b12",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3.dmg",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "388d956dd6243697a162c062c76b2fee4098f4f3405badb07a69ce6df7de6017",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1.dmg",
+      "build_number": "253.29346.157"
     },
     "gateway": {
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "a0a4314c5f08331a82420580bf3e26df19b52573cda3ecac354d8ac49caf191d",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5.dmg",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "282fd7f302d95adeed022f8d6c679d3292778f96205394af52dd090f6201f338",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.dmg",
+      "build_number": "253.28294.342"
     },
     "goland": {
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "b900b868b748b78c01c5da949e8bcc0df277caa2e3efcc50898641aadaf485f2",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5.dmg",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "e1df4f10b158c7788736559666244e994500a40db5b08661e2691357d269dbf4",
+      "url": "https://download.jetbrains.com/go/goland-2025.3.dmg",
+      "build_number": "253.28294.337"
     },
     "idea-community": {
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
@@ -295,24 +295,24 @@
     },
     "idea": {
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "c0d6731d60bdcdaaea5c0474c296e39cc336f424da872c6ed022e8f139d779ee",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5.dmg",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "adf5af3839e07ba6387bf0eca94df2f44c829023a1898170eacbc5cbafce0393",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1.dmg",
+      "build_number": "253.29346.138"
     },
     "mps": {
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
-      "version": "2025.2.1",
-      "sha256": "e0b2644918ffe76b10001fc7904a58b2ec88cda2d317b10508d3bac784a490b2",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos.dmg",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "sha256": "c216008ca905efd9ab9271df9599ef38ecb66cba2c61482e7a56434ae3eddee6",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg",
+      "build_number": "253.28294.432"
     },
     "phpstorm": {
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "2a765be05bd2176899297ba0599735c2a13d1065e9d65895a6ead7ed850f0254",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5.dmg",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "11988bcee5d94b271ea67aeacd3e836029595a6cfebfec2659565fc18a4ad2d1",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.dmg",
+      "build_number": "253.29346.151",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -324,38 +324,38 @@
     },
     "pycharm": {
       "url-template": "https://download.jetbrains.com/python/pycharm-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "00eccdeb39bd8eeaed1b98ad99f542fbc3851389f9e7d19355d05dfd979eb669",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5.dmg",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "586c9eed67da609fc1e565a8bfc36eb155b23e5483d5dc6e9dcf8b5540f47fa5",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1.dmg",
+      "build_number": "253.29346.142"
     },
     "rider": {
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2025.3.0.3",
-      "sha256": "e8261d30d549f1809228c84e4b31d2cae337cb7bc35cd6da4e0f801e4d2f52db",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3.dmg",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "addd816dbdf130e2ef5e7dc184d7a8087f8bfbf6eba4e32ead2452069a49607d",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.dmg",
+      "build_number": "253.29346.144"
     },
     "ruby-mine": {
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "7dedc215b849194f8814380a4e622e117346fb52fc3f102bfa53332d33c9433b",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5.dmg",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "4fce84983a6ace16d8479150b765280250a260b3d24fb37258d114000c6c1115",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.dmg",
+      "build_number": "253.29346.140"
     },
     "rust-rover": {
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "1f149d98d41b3929e3e920d5465eaa9963312d93f106d8821d0c51721ae2609c",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5.dmg",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "3899875452a5182db93b132c00dbc84394ffb637430b97f2390be8abb0412537",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.dmg",
+      "build_number": "253.29346.139"
     },
     "webstorm": {
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "1f3779bf695758e830126a95734360bd640794ec278c250fad9a71969de4ee39",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5.dmg",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "a6cb906562f95b37e9c1e34c9bd9561dea653a726c95d02bfa957acbe909b88d",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.dmg",
+      "build_number": "253.29346.143"
     },
     "writerside": {
       "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg",
@@ -375,38 +375,38 @@
     },
     "clion": {
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "b0496540a133c82c64ac959f1d4542fe331bd63403fd230e23adf4bc957c84af",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "11cae8aeb43d1870d96980f1d927ff545fabed989f3bf4e7327911b441e149f1",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.141"
     },
     "datagrip": {
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2025.3",
-      "sha256": "16a5df01852648a82082fb667bbed6fcb43e15ef9a91e35a0be422dd37d07180",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3-aarch64.dmg",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "a7224548dc9da3863727b0c11cef9d613fd951d16baa016ca1407c56a9ec6964",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.dmg",
+      "build_number": "253.29346.170"
     },
     "dataspell": {
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "ad8a2d8403c7d44f66d0905ab6d28a3e888e78b9cc140725e7ca744257c6ce58",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3-aarch64.dmg",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "fe0d8ef15e6e36af0ea4361bd474f204ee5c307ef90af8ec833976a1dae5a5a3",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.157"
     },
     "gateway": {
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "af0a82a46ecad837ee6c86d97623e58d377eed7d5ee56c7af5765071e0b0c12e",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "b10cabda93c88d27bcc135a44a1fd98fe60fe8305606d6e75a0d5b736f0df274",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.dmg",
+      "build_number": "253.28294.342"
     },
     "goland": {
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "91faea3e0aff80e16a27cacaec1c39ef13eac2b3da1b0f0aa1af667be96f4c78",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "d4ee20b5c3df6151d366d6cc9b06b915499ff0c1eb1184aab53a01078908ec89",
+      "url": "https://download.jetbrains.com/go/goland-2025.3-aarch64.dmg",
+      "build_number": "253.28294.337"
     },
     "idea-community": {
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
@@ -417,24 +417,24 @@
     },
     "idea": {
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "6ec8cf520556c75e91a3cae1c54f464dee3609c4d7efef3bb307b129c7d9cb63",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "2137863cc3a5f4acd25ba38a82e004e935d3a94fa566f8e3851d6b8a8ac12777",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.138"
     },
     "mps": {
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
-      "version": "2025.2.1",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos-aarch64.dmg",
-      "sha256": "d409c82b06cab622dc469d6929e291e40b81b21e1e4b784833d07eb7697f5f61",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg",
+      "sha256": "dc79c41ce851448f4862306173914eee1e63e230410ed65356498efd2d5f0444",
+      "build_number": "253.28294.432"
     },
     "phpstorm": {
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "8320ce229c03277f53a836bc19b796e9241bb00e3e40d4f048290baa27aa9a90",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "0453e0a6ee86c3cbf97b8c48f2826751d8085bf8211b541a04752621c5af16bc",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.151",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -446,38 +446,38 @@
     },
     "pycharm": {
       "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "71da1283259bc59897e5bb43c6c3771a72d026419ed4d79192889ea3885ac0de",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "ec8e97856f00da902020c72b0f079cc10983de6bb4438292ea5faa1e5b0cb935",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.142"
     },
     "rider": {
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2025.3.0.3",
-      "sha256": "ff03408013ce86ffd437204d635401a4ca673ee15596e3d93cd9c69e63e7e7c3",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3-aarch64.dmg",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "d7080323412900f5d37270233e5a4c773011c6853d6031ce1f5e635c77511426",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.144"
     },
     "ruby-mine": {
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "8527cb286ea5d9cd612538cb55354dc689b7f7fe5ec0b81a8f1a4a2279e94351",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "67f1aa674b90ec54ba21f3523ad940218f979befd7429e38ad822bc8146d16a4",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.140"
     },
     "rust-rover": {
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "7927f48c24ff1e9b235f3f6bbcd74fb1fad907035146a04c55ef62ccdf90c087",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "103a12ed1c37b6b38cff5d637e7dc7b8dcc78f5c576ba38b8f862c6ba3647d52",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.139"
     },
     "webstorm": {
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "729d519244a4be15add4b0963ebf84fb9c3f3f2f7d1eab3ad925ef79fe359773",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "1c21990cee2bbbffdd8f6c90e8071bc03ec7fe5a3662e51931c15222d4b7ccb2",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.143"
     },
     "writerside": {
       "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg",
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 4897134ef811..675aae8a9c57 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -215,66 +215,74 @@ let
 
   grammarToPlugin =
     grammar:
-    let
-      name = lib.pipe grammar [
-        lib.getName
+    # If the grammar has already been processed by this function, return it as-is.
+    # This makes the function idempotent and prevents double-wrapping which mangles
+    # the names of the generated parser files.
+    if grammar ? origGrammar then
+      grammar
+    else
+      let
+        name = lib.pipe grammar [
+          lib.getName
 
-        # added in buildGrammar
-        (lib.removeSuffix "-grammar")
+          # added in buildGrammar
+          (lib.removeSuffix "-grammar")
 
-        # grammars from tree-sitter.builtGrammars
-        (lib.removePrefix "tree-sitter-")
-        (lib.replaceStrings [ "-" ] [ "_" ])
-      ];
+          # grammars from tree-sitter.builtGrammars
+          (lib.removePrefix "tree-sitter-")
+          (lib.replaceStrings [ "-" ] [ "_" ])
+        ];
 
-      nvimGrammars = lib.mapAttrsToList (
-        name: value:
-        value.origGrammar
-          or (throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
-      ) vimPlugins.nvim-treesitter.grammarPlugins;
-      isNvimGrammar = x: builtins.elem x nvimGrammars;
+        nvimGrammars = lib.mapAttrsToList (
+          name: value:
+          value.origGrammar
+            or (throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
+        ) vimPlugins.nvim-treesitter.grammarPlugins;
+        isNvimGrammar = x: builtins.elem x nvimGrammars;
 
-      toNvimTreesitterGrammar = makeSetupHook {
-        name = "to-nvim-treesitter-grammar";
-      } ./to-nvim-treesitter-grammar.sh;
-    in
+        toNvimTreesitterGrammar = makeSetupHook {
+          name = "to-nvim-treesitter-grammar";
+        } ./to-nvim-treesitter-grammar.sh;
+      in
 
-    (toVimPlugin (
-      stdenv.mkDerivation {
-        name = "treesitter-grammar-${name}";
+      (toVimPlugin (
+        stdenv.mkDerivation {
+          name = "nvim-treesitter-grammar-${name}";
 
-        origGrammar = grammar;
-        grammarName = name;
+          origGrammar = grammar;
+          grammarName = name;
 
-        # Queries for nvim-treesitter's (not just tree-sitter's) officially
-        # supported languages are bundled with nvim-treesitter
-        # Queries from repositories for such languages are incompatible
-        # with nvim's implementation of treesitter.
-        #
-        # We try our best effort to only include queries for niche languages
-        # (there are grammars for them in nixpkgs, but they're in
-        # `tree-sitter-grammars.tree-sitter-*`; `vimPlugins.nvim-treesitter-parsers.*`
-        # only includes officially supported languages)
-        #
-        # To use grammar for a niche language, users usually do:
-        #   packages.all.start = with final.vimPlugins; [
-        #     (pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.tree-sitter-LANG)
-        #   ]
-        #
-        # See also https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
-        installQueries = !isNvimGrammar grammar;
+          # Queries for nvim-treesitter's (not just tree-sitter's) officially
+          # supported languages are bundled with nvim-treesitter
+          # Queries from repositories for such languages are incompatible
+          # with nvim's implementation of treesitter.
+          #
+          # We try our best effort to only include queries for niche languages
+          # (there are grammars for them in nixpkgs, but they're in
+          # `tree-sitter-grammars.tree-sitter-*`; `vimPlugins.nvim-treesitter-parsers.*`
+          # only includes officially supported languages)
+          #
+          # To use grammar for a niche language, users usually do:
+          #   packages.all.start = with final.vimPlugins; [
+          #     (pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.tree-sitter-LANG)
+          #   ]
+          #
+          # See also https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
+          installQueries = !isNvimGrammar grammar;
 
-        dontUnpack = true;
-        __structuredAttrs = true;
+          dontUnpack = true;
+          __structuredAttrs = true;
 
-        nativeBuildInputs = [ toNvimTreesitterGrammar ];
+          nativeBuildInputs = [ toNvimTreesitterGrammar ];
 
-        meta = {
-          platforms = lib.platforms.all;
+          passthru = grammar.passthru or { };
+
+          meta = {
+            platforms = lib.platforms.all;
+          }
+          // grammar.meta;
         }
-        // grammar.meta;
-      }
-    ));
+      ));
 
   /*
     Fork of vimUtils.packDir that additionally generates a propagated-build-inputs-file that
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 48b8c7324cb3..2d46569084bc 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.1869";
+  version = "9.1.1918";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-AHx4AHsJAsEE5LRzKgBeV3LoCaoHUB+0/gq7kOHObMk=";
+    hash = "sha256-NU/A7yWcLaC+wqsfiHYVhnSZHGDao6+Oib/bSFNSVyQ=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 265712cd3940..14e50e224dc1 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12000,12 +12000,12 @@ final: prev: {
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "0.10.0-unstable-2025-05-24";
+    version = "0.10.0-unstable-2025-12-29";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "42fc28ba918343ebfd5565147a42a26580579482";
-      hash = "sha256-CVs9FTdg3oKtRjz2YqwkMr0W5qYLGfVyxyhE3qnGYbI=";
+      rev = "7efc1b58a8061d29786860006c7257c90a5196dc";
+      hash = "sha256-AMEzUaVVPzHT7vpPJUFt5UbBiN9tygH5UMio/lU/baw=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
index 9b458b7e3bfc..fb3bd413c594 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
@@ -32,7 +32,6 @@ let
     nativeInstallCheckInputs = [
       versionCheckHook
     ];
-    versionCheckProgramArg = "--version";
     doInstallCheck = false;
 
     meta.mainProgram = "cord";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-treesitter-parsers/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-treesitter-parsers/default.nix
index a1e9b0bc587d..f50c379ec2fe 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-treesitter-parsers/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-treesitter-parsers/default.nix
@@ -2,4 +2,4 @@
   lib,
   vimPlugins,
 }:
-lib.recurseIntoAttrs vimPlugins.nvim-treesitter.grammarPlugins
+lib.recurseIntoAttrs vimPlugins.nvim-treesitter.parsers
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index e8ce9b52e722..ae72ba377b59 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -3,6 +3,7 @@
 
 {
   buildGrammar,
+  buildQueries,
   fetchCrate,
   fetchFromBitbucket,
   fetchFromGitHub,
@@ -19,3625 +20,4575 @@
 }:
 
 {
-  ada = buildGrammar {
-    language = "ada";
-    version = "0.0.0+rev=6c26c44";
-    src = fetchFromGitHub {
-      owner = "briot";
-      repo = "tree-sitter-ada";
-      rev = "6c26c4413965dc7bacbccfa66503bf6b8228e254";
-      hash = "sha256-kxm6MVUktOzH6WVKZxgGO9kFFEUXk7NFk+twidsDNM0=";
-    };
-    meta.homepage = "https://github.com/briot/tree-sitter-ada";
-  };
-  agda = buildGrammar {
-    language = "agda";
-    version = "0.0.0+rev=e8d47a6";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-agda";
-      rev = "e8d47a6987effe34d5595baf321d82d3519a8527";
-      hash = "sha256-5h56+A7ZypckJ9mwht7XP/66oiehwAEQ4Z6WeVhQBvQ=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda";
-  };
-  angular = buildGrammar {
-    language = "angular";
-    version = "0.0.0+rev=d1f24a8";
-    src = fetchFromGitHub {
-      owner = "dlvandenberg";
-      repo = "tree-sitter-angular";
-      rev = "d1f24a8890462cb740909ff62a3a079cded288bc";
-      hash = "sha256-vC4v3uuUdHVUcm33egg3pWIqWSCwCkw5LTyD3ouMdiQ=";
-    };
-    meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
-  };
-  apex = buildGrammar {
-    language = "apex";
-    version = "0.0.0+rev=3597575";
-    src = fetchFromGitHub {
-      owner = "aheber";
-      repo = "tree-sitter-sfapex";
-      rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
-      hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
-    };
-    location = "apex";
-    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
-  };
-  arduino = buildGrammar {
-    language = "arduino";
-    version = "0.0.0+rev=53eb391";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-arduino";
-      rev = "53eb391da4c6c5857f8defa2c583c46c2594f565";
-      hash = "sha256-qQVUWCOZ4y9FTsIf0FI3vmYBhLYz4hcqRTo+5C2MYvc=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
-  };
-  asm = buildGrammar {
-    language = "asm";
-    version = "0.0.0+rev=839741f";
-    src = fetchFromGitHub {
-      owner = "RubixDev";
-      repo = "tree-sitter-asm";
-      rev = "839741fef4dab5128952334624905c82b40c7133";
-      hash = "sha256-AbMSSt3tTjyPe7ksNjBxxsqvdoKmIKymqzisUWrSTT0=";
-    };
-    meta.homepage = "https://github.com/RubixDev/tree-sitter-asm";
-  };
-  astro = buildGrammar {
-    language = "astro";
-    version = "0.0.0+rev=213f6e6";
-    src = fetchFromGitHub {
-      owner = "virchau13";
-      repo = "tree-sitter-astro";
-      rev = "213f6e6973d9b456c6e50e86f19f66877e7ef0ee";
-      hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE=";
-    };
-    meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
-  };
-  authzed = buildGrammar {
-    language = "authzed";
-    version = "0.0.0+rev=83e5c26";
-    src = fetchFromGitHub {
-      owner = "mleonidas";
-      repo = "tree-sitter-authzed";
-      rev = "83e5c26a8687eb4688fe91d690c735cc3d21ad81";
-      hash = "sha256-xJDueA0qydB2dsmnIKPBU6P+4mSDO3vAQehHuyZpq/I=";
-    };
-    meta.homepage = "https://github.com/mleonidas/tree-sitter-authzed";
-  };
-  awk = buildGrammar {
-    language = "awk";
-    version = "0.0.0+rev=34bbdc7";
-    src = fetchFromGitHub {
-      owner = "Beaglefoot";
-      repo = "tree-sitter-awk";
-      rev = "34bbdc7cce8e803096f47b625979e34c1be38127";
-      hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0=";
-    };
-    meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
-  };
-  bash = buildGrammar {
-    language = "bash";
-    version = "0.0.0+rev=a06c2e4";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-bash";
-      rev = "a06c2e4415e9bc0346c6b86d401879ffb44058f7";
-      hash = "sha256-ONQ1Ljk3aRWjElSWD2crCFZraZoRj3b3/VELz1789GE=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
-  };
-  bass = buildGrammar {
-    language = "bass";
-    version = "0.0.0+rev=28dc705";
-    src = fetchFromGitHub {
-      owner = "vito";
-      repo = "tree-sitter-bass";
-      rev = "28dc7059722be090d04cd751aed915b2fee2f89a";
-      hash = "sha256-NKu60BbTKLsYQRtfEoqGQUKERJFnmZNVJE6HBz/BRIM=";
-    };
-    meta.homepage = "https://github.com/vito/tree-sitter-bass";
-  };
-  beancount = buildGrammar {
-    language = "beancount";
-    version = "0.0.0+rev=b7a2557";
-    src = fetchFromGitHub {
-      owner = "polarmutex";
-      repo = "tree-sitter-beancount";
-      rev = "b7a2557e6c8cf1dc70a52cece1861522ad3903fc";
-      hash = "sha256-E8FPmskJr1OQ55w52FUi9zub7BTZ6neX3VHypjEyRek=";
-    };
-    meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
-  };
-  bibtex = buildGrammar {
-    language = "bibtex";
-    version = "0.0.0+rev=8d04ed2";
-    src = fetchFromGitHub {
-      owner = "latex-lsp";
-      repo = "tree-sitter-bibtex";
-      rev = "8d04ed27b3bc7929f14b7df9236797dab9f3fa66";
-      hash = "sha256-UOXGWm8k9YP0GUwvNEuIxeiXqJo4Jf9uBt+/oYaYUl4=";
-    };
-    meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex";
-  };
-  bicep = buildGrammar {
-    language = "bicep";
-    version = "0.0.0+rev=bff5988";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-bicep";
-      rev = "bff59884307c0ab009bd5e81afd9324b46a6c0f9";
-      hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-bicep";
-  };
-  bitbake = buildGrammar {
-    language = "bitbake";
-    version = "0.0.0+rev=a5d04fd";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-bitbake";
-      rev = "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b";
-      hash = "sha256-SzHFNIeR6ukWXKkLd2Trg9zuKLMwNAolXGPIDBDaFRg=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-bitbake";
-  };
-  blade = buildGrammar {
-    language = "blade";
-    version = "0.0.0+rev=fbe5f81";
-    src = fetchFromGitHub {
-      owner = "EmranMR";
-      repo = "tree-sitter-blade";
-      rev = "fbe5f81b54f0f6153961824ce306ffc805134980";
-      hash = "sha256-zBdE6yP4DATApkf7UDGFBiQbIAuvQo0EMVf/jiXoCOQ=";
-    };
-    meta.homepage = "https://github.com/EmranMR/tree-sitter-blade";
-  };
-  blueprint = buildGrammar {
-    language = "blueprint";
-    version = "0.0.0+rev=355ef84";
-    src = fetchFromGitLab {
-      owner = "gabmus";
-      repo = "tree-sitter-blueprint";
-      rev = "355ef84ef8a958ac822117b652cf4d49bac16c79";
-      hash = "sha256-+lkDfAL3zKt+NpvHIb1nyHvHkmZ2Ydh78N22ZOeiErs=";
-    };
-    meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint";
-  };
-  bp = buildGrammar {
-    language = "bp";
-    version = "0.0.0+rev=ee641d1";
-    src = fetchFromGitHub {
-      owner = "ambroisie";
-      repo = "tree-sitter-bp";
-      rev = "ee641d15390183d7535777947ce0f2f1fbcee69f";
-      hash = "sha256-sCvz8Bf0nffSyis9rhppD/iCrlTyTLPAeH6WXg0N6+Y=";
-    };
-    meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
-  };
-  brightscript = buildGrammar {
-    language = "brightscript";
-    version = "0.0.0+rev=253fdfa";
-    src = fetchFromGitHub {
-      owner = "ajdelcimmuto";
-      repo = "tree-sitter-brightscript";
-      rev = "253fdfaa23814cb46c2d5fc19049fa0f2f62c6da";
-      hash = "sha256-aE8Of2shLliebuY9A/Sr4bjCm6At9fgDFyPaqMqpg/4=";
-    };
-    meta.homepage = "https://github.com/ajdelcimmuto/tree-sitter-brightscript";
-  };
-  c = buildGrammar {
-    language = "c";
-    version = "0.0.0+rev=ae19b67";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-c";
-      rev = "ae19b676b13bdcc13b7665397e6d9b14975473dd";
-      hash = "sha256-i40dlg12UNR3dUWtdlYLZKsusYUWzu+QgC2iedRk968=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
-  };
-  c3 = buildGrammar {
-    language = "c3";
-    version = "0.0.0+rev=3bcb189";
-    src = fetchFromGitHub {
-      owner = "c3lang";
-      repo = "tree-sitter-c3";
-      rev = "3bcb189c85a15d5e47a12947fbb25cd6604025f5";
-      hash = "sha256-aOvlLAXe7h2RC6oUSuLk6g9XvcrUsSVHV6M0dKkf+MU=";
-    };
-    meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
-  };
-  c_sharp = buildGrammar {
-    language = "c_sharp";
-    version = "0.0.0+rev=485f0ba";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-c-sharp";
-      rev = "485f0bae0274ac9114797fc10db6f7034e4086e3";
-      hash = "sha256-BRn23iueDJ+YwuPJ+ebOAhjoELQX1VOBFR/YbQDYhfQ=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
-  };
-  caddy = buildGrammar {
-    language = "caddy";
-    version = "0.0.0+rev=2686186";
-    src = fetchFromGitHub {
-      owner = "opa-oz";
-      repo = "tree-sitter-caddy";
-      rev = "2686186edb61be47960431c93a204fb249681360";
-      hash = "sha256-pKKx2qCqP/8JLhNebTogM24qzxh6bdX5i4mqGzTJKkw=";
-    };
-    meta.homepage = "https://github.com/opa-oz/tree-sitter-caddy";
-  };
-  cairo = buildGrammar {
-    language = "cairo";
-    version = "0.0.0+rev=6238f60";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-cairo";
-      rev = "6238f609bea233040fe927858156dee5515a0745";
-      hash = "sha256-QjCt3sRINrNbaxtNwj43+g7D3xYmuh0BIAo6wWQ/54g=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cairo";
-  };
-  capnp = buildGrammar {
-    language = "capnp";
-    version = "0.0.0+rev=7b0883c";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-capnp";
-      rev = "7b0883c03e5edd34ef7bcf703194204299d7099f";
-      hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-capnp";
-  };
-  chatito = buildGrammar {
-    language = "chatito";
-    version = "0.0.0+rev=b4cbe9a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-chatito";
-      rev = "b4cbe9ab7672d5106e9550d8413835395a1be362";
-      hash = "sha256-te2Eg8J4Zf5H6FKLnCAyyKSjTABESUKzqQWwW/k/Y1c=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-chatito";
-  };
-  circom = buildGrammar {
-    language = "circom";
-    version = "0.0.0+rev=0215052";
-    src = fetchFromGitHub {
-      owner = "Decurity";
-      repo = "tree-sitter-circom";
-      rev = "02150524228b1e6afef96949f2d6b7cc0aaf999e";
-      hash = "sha256-wosqwiDkK1rytGWMJApz1M42Sme9OaWXC0rmj7vM4g8=";
-    };
-    meta.homepage = "https://github.com/Decurity/tree-sitter-circom";
-  };
-  clojure = buildGrammar {
-    language = "clojure";
-    version = "0.0.0+rev=e43eff8";
-    src = fetchFromGitHub {
-      owner = "sogaiu";
-      repo = "tree-sitter-clojure";
-      rev = "e43eff80d17cf34852dcd92ca5e6986d23a7040f";
-      hash = "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=";
-    };
-    meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
-  };
-  cmake = buildGrammar {
-    language = "cmake";
-    version = "0.0.0+rev=c7b2a71";
-    src = fetchFromGitHub {
-      owner = "uyha";
-      repo = "tree-sitter-cmake";
-      rev = "c7b2a71e7f8ecb167fad4c97227c838439280175";
-      hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU=";
-    };
-    meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
-  };
-  comment = buildGrammar {
-    language = "comment";
-    version = "0.0.0+rev=db922d7";
-    src = fetchFromGitHub {
-      owner = "stsewd";
-      repo = "tree-sitter-comment";
-      rev = "db922d7809637900089709e07e31b88c42354ec2";
-      hash = "sha256-gpxR7x/RMXk/XObKp8CX9HmJs0VPMRKTGLFxZtaoc0A=";
-    };
-    meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
-  };
-  commonlisp = buildGrammar {
-    language = "commonlisp";
-    version = "0.0.0+rev=3232350";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-commonlisp";
-      rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f";
-      hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-commonlisp";
-  };
-  cooklang = buildGrammar {
-    language = "cooklang";
-    version = "0.0.0+rev=4ebe237";
-    src = fetchFromGitHub {
-      owner = "addcninblue";
-      repo = "tree-sitter-cooklang";
-      rev = "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e";
-      hash = "sha256-VB3BxSrhIbD8TytfOJx7IhTwl/aWasB8t3xnrO34rQE=";
-    };
-    meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
-  };
-  corn = buildGrammar {
-    language = "corn";
-    version = "0.0.0+rev=4646547";
-    src = fetchFromGitHub {
-      owner = "jakestanger";
-      repo = "tree-sitter-corn";
-      rev = "464654742cbfd3a3de560aba120998f1d5dfa844";
-      hash = "sha256-fI7S+TkI2ofQ/Hal4CJ2HAaeQrjOju1rgJvyc6P3t9k=";
-    };
-    meta.homepage = "https://github.com/jakestanger/tree-sitter-corn";
-  };
-  cpon = buildGrammar {
-    language = "cpon";
-    version = "0.0.0+rev=594289e";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-cpon";
-      rev = "594289eadfec719198e560f9d7fd243c4db678d5";
-      hash = "sha256-Nr+98yrDkOS5Yh/EFmBWV9Yhv2tPfHGb4pPlLUwc+k8=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cpon";
-  };
-  cpp = buildGrammar {
-    language = "cpp";
-    version = "0.0.0+rev=12bd6f7";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-cpp";
-      rev = "12bd6f7e96080d2e70ec51d4068f2f66120dde35";
-      hash = "sha256-vmXTv6Idf0Le5ZVa8Rc1DVefqzUxkGeLGsYcSDNBpQU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
-  };
-  css = buildGrammar {
-    language = "css";
-    version = "0.0.0+rev=dda5cfc";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-css";
-      rev = "dda5cfc5722c429eaba1c910ca32c2c0c5bb1a3f";
-      hash = "sha256-jFsnEyS+FThk7L48FzAdSp5fNPSLvM8hTL/VC5FMlOE=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-css";
-  };
-  csv = buildGrammar {
-    language = "csv";
-    version = "0.0.0+rev=f6bf6e3";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-csv";
-      rev = "f6bf6e35eb0b95fbadea4bb39cb9709507fcb181";
-      hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o=";
-    };
-    location = "csv";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv";
-  };
-  cuda = buildGrammar {
-    language = "cuda";
-    version = "0.0.0+rev=48b066f";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-cuda";
-      rev = "48b066f334f4cf2174e05a50218ce2ed98b6fd01";
-      hash = "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cuda";
-  };
-  cue = buildGrammar {
-    language = "cue";
-    version = "0.0.0+rev=770737b";
-    src = fetchFromGitHub {
-      owner = "eonpatapon";
-      repo = "tree-sitter-cue";
-      rev = "770737bcff2c4aa3f624d439e32b07dbb07102d3";
-      hash = "sha256-ujSBOwOnjsKuFhHtt4zvj90VcQsak8mEcWYJ0e5/mKc=";
-    };
-    meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
-  };
-  cylc = buildGrammar {
-    language = "cylc";
-    version = "0.0.0+rev=6d1d811";
-    src = fetchFromGitHub {
-      owner = "elliotfontaine";
-      repo = "tree-sitter-cylc";
-      rev = "6d1d81137112299324b526477ce1db989ab58fb8";
-      hash = "sha256-jgQCTM36S8UwSyT4LAfcX4DUIl2OYVMeQdDg3zRrw00=";
-    };
-    meta.homepage = "https://github.com/elliotfontaine/tree-sitter-cylc";
-  };
-  d = buildGrammar {
-    language = "d";
-    version = "0.0.0+rev=fb028c8";
-    src = fetchFromGitHub {
-      owner = "gdamore";
-      repo = "tree-sitter-d";
-      rev = "fb028c8f14f4188286c2eef143f105def6fbf24f";
-      hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo=";
-    };
-    meta.homepage = "https://github.com/gdamore/tree-sitter-d";
-  };
-  dart = buildGrammar {
-    language = "dart";
-    version = "0.0.0+rev=d4d8f3e";
-    src = fetchFromGitHub {
-      owner = "UserNobody14";
-      repo = "tree-sitter-dart";
-      rev = "d4d8f3e337d8be23be27ffc35a0aef972343cd54";
-      hash = "sha256-1ftYqCor1A0PsQ0AJLVqtxVRZxaXqE/NZ5yy7SizZCY=";
-    };
-    meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
-  };
-  desktop = buildGrammar {
-    language = "desktop";
-    version = "0.0.0+rev=afec309";
-    src = fetchFromGitHub {
-      owner = "ValdezFOmar";
-      repo = "tree-sitter-desktop";
-      rev = "afec3093f6102b83a72aece728c53d17d3fcb2d4";
-      hash = "sha256-71ovOHHxER2R8d8Vkgk+PlOO9GbtlRJApcet0FSfJKg=";
-    };
-    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
-  };
-  devicetree = buildGrammar {
-    language = "devicetree";
-    version = "0.0.0+rev=e685f1f";
-    src = fetchFromGitHub {
-      owner = "joelspadin";
-      repo = "tree-sitter-devicetree";
-      rev = "e685f1f6ac1702b046415efb476444167d63e41a";
-      hash = "sha256-iMmr4zSm6B7goevHE03DMj9scW4ldXS7CV74sKeqGD4=";
-    };
-    meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
-  };
-  dhall = buildGrammar {
-    language = "dhall";
-    version = "0.0.0+rev=6201325";
-    src = fetchFromGitHub {
-      owner = "jbellerb";
-      repo = "tree-sitter-dhall";
-      rev = "62013259b26ac210d5de1abf64cf1b047ef88000";
-      hash = "sha256-4xbz7DDUlLGgLW5V6Yyvo7dkE9MOk3mCQEBTYyRbNuM=";
-    };
-    meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall";
-  };
-  diff = buildGrammar {
-    language = "diff";
-    version = "0.0.0+rev=2520c3f";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-diff";
-      rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed";
-      hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff";
-  };
-  disassembly = buildGrammar {
-    language = "disassembly";
-    version = "0.0.0+rev=0229c02";
-    src = fetchFromGitHub {
-      owner = "ColinKennedy";
-      repo = "tree-sitter-disassembly";
-      rev = "0229c0211dba909c5d45129ac784a3f4d49c243a";
-      hash = "sha256-IM3HzOhJmbb334PZ8q+r2EMi5Bv/rLoy+llPN0aghr8=";
-    };
-    meta.homepage = "https://github.com/ColinKennedy/tree-sitter-disassembly";
-  };
-  djot = buildGrammar {
-    language = "djot";
-    version = "0.0.0+rev=74fac1f";
-    src = fetchFromGitHub {
-      owner = "treeman";
-      repo = "tree-sitter-djot";
-      rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6";
-      hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8=";
-    };
-    meta.homepage = "https://github.com/treeman/tree-sitter-djot";
-  };
-  dockerfile = buildGrammar {
-    language = "dockerfile";
-    version = "0.0.0+rev=971acdd";
-    src = fetchFromGitHub {
-      owner = "camdencheek";
-      repo = "tree-sitter-dockerfile";
-      rev = "971acdd908568b4531b0ba28a445bf0bb720aba5";
-      hash = "sha256-WJJ/rjFea1sudGIyjKGupwm39TJ1zbyWlLgoRf1KCBI=";
-    };
-    meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile";
-  };
-  dot = buildGrammar {
-    language = "dot";
-    version = "0.0.0+rev=80327ab";
-    src = fetchFromGitHub {
-      owner = "rydesun";
-      repo = "tree-sitter-dot";
-      rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d";
-      hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y=";
-    };
-    meta.homepage = "https://github.com/rydesun/tree-sitter-dot";
-  };
-  doxygen = buildGrammar {
-    language = "doxygen";
-    version = "0.0.0+rev=ccd998f";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-doxygen";
-      rev = "ccd998f378c3f9345ea4eeb223f56d7b84d16687";
-      hash = "sha256-Yh6FaRvWmeqnSnBgOojWbs1wJaeEoNJlvSEqgzjGh7o=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-doxygen";
-  };
-  dtd = buildGrammar {
-    language = "dtd";
-    version = "0.0.0+rev=863dbc3";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-xml";
-      rev = "863dbc381f44f6c136a399e684383b977bb2beaa";
-      hash = "sha256-0ztP30xWqVWy5upWPp0JwhpQphOJufzlcYn+KvLejVs=";
-    };
-    location = "dtd";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
-  };
-  earthfile = buildGrammar {
-    language = "earthfile";
-    version = "0.0.0+rev=5baef88";
-    src = fetchFromGitHub {
-      owner = "glehmann";
-      repo = "tree-sitter-earthfile";
-      rev = "5baef88717ad0156fd29a8b12d0d8245bb1096a8";
-      hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k=";
-    };
-    meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
-  };
-  ebnf = buildGrammar {
-    language = "ebnf";
-    version = "0.0.0+rev=8e635b0";
-    src = fetchFromGitHub {
-      owner = "RubixDev";
-      repo = "ebnf";
-      rev = "8e635b0b723c620774dfb8abf382a7f531894b40";
-      hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
-    };
-    location = "crates/tree-sitter-ebnf";
-    meta.homepage = "https://github.com/RubixDev/ebnf";
-  };
-  editorconfig = buildGrammar {
-    language = "editorconfig";
-    version = "0.0.0+rev=f08fb1f";
-    src = fetchFromGitHub {
-      owner = "ValdezFOmar";
-      repo = "tree-sitter-editorconfig";
-      rev = "f08fb1f53130d2c765e45181eae26535e1a7a7f1";
-      hash = "sha256-t9isRX12hvjBPPIcArdahksXYCuvbNFwSzwzqJYi104=";
-    };
-    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
-  };
-  eds = buildGrammar {
-    language = "eds";
-    version = "0.0.0+rev=26d529e";
-    src = fetchFromGitHub {
-      owner = "uyha";
-      repo = "tree-sitter-eds";
-      rev = "26d529e6cfecde391a03c21d1474eb51e0285805";
-      hash = "sha256-+3BO4JxUrSc8OWHVZvd1lxjrNYkhN35q2YhcrUrFgMk=";
-    };
-    meta.homepage = "https://github.com/uyha/tree-sitter-eds";
-  };
-  eex = buildGrammar {
-    language = "eex";
-    version = "0.0.0+rev=f742f2f";
-    src = fetchFromGitHub {
-      owner = "connorlay";
-      repo = "tree-sitter-eex";
-      rev = "f742f2fe327463335e8671a87c0b9b396905d1d1";
-      hash = "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY=";
-    };
-    meta.homepage = "https://github.com/connorlay/tree-sitter-eex";
-  };
-  elixir = buildGrammar {
-    language = "elixir";
-    version = "0.0.0+rev=d24cece";
-    src = fetchFromGitHub {
-      owner = "elixir-lang";
-      repo = "tree-sitter-elixir";
-      rev = "d24cecee673c4c770f797bac6f87ae4b6d7ddec5";
-      hash = "sha256-nSXXMPneL/sTdkpcsxUz73DiXVuNxVHnf8b2LTbAUs8=";
-    };
-    meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
-  };
-  elm = buildGrammar {
-    language = "elm";
-    version = "0.0.0+rev=3d000d3";
-    src = fetchFromGitHub {
-      owner = "elm-tooling";
-      repo = "tree-sitter-elm";
-      rev = "3d000d37b99ac2640bf24c1a7a5c9a58485778df";
-      hash = "sha256-17HyH70Odvi4nT8Lox/EpTBSYipBkas0TKcX3stLcvQ=";
-    };
-    meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
-  };
-  elsa = buildGrammar {
-    language = "elsa";
-    version = "0.0.0+rev=0a66b2b";
-    src = fetchFromGitHub {
-      owner = "glapa-grossklag";
-      repo = "tree-sitter-elsa";
-      rev = "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7";
-      hash = "sha256-zahi5hOXzad6R1+mqmYBFfn2X+SejQUIQzbabgCIJ8w=";
-    };
-    meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa";
-  };
-  elvish = buildGrammar {
-    language = "elvish";
-    version = "0.0.0+rev=5e7210d";
-    src = fetchFromGitHub {
-      owner = "elves";
-      repo = "tree-sitter-elvish";
-      rev = "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5";
-      hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg=";
-    };
-    meta.homepage = "https://github.com/elves/tree-sitter-elvish";
-  };
-  embedded_template = buildGrammar {
-    language = "embedded_template";
-    version = "0.0.0+rev=3499d85";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-embedded-template";
-      rev = "3499d85f0a0d937c507a4a65368f2f63772786e1";
-      hash = "sha256-H+kcKwVjIvRBRj+pjSjp8NX0kH63SDWiAS5iovT9e/c=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
-  };
-  enforce = buildGrammar {
-    language = "enforce";
-    version = "0.0.0+rev=eb27968";
-    src = fetchFromGitHub {
-      owner = "simonvic";
-      repo = "tree-sitter-enforce";
-      rev = "eb2796871d966264cdb041b797416ef1757c8b4f";
-      hash = "sha256-50yK0MIMFFjUlcE99MEESKdcLnyIurAl16uGXGQyjkI=";
-    };
-    meta.homepage = "https://github.com/simonvic/tree-sitter-enforce";
-  };
-  erlang = buildGrammar {
-    language = "erlang";
-    version = "0.0.0+rev=a260cb6";
-    src = fetchFromGitHub {
-      owner = "WhatsApp";
-      repo = "tree-sitter-erlang";
-      rev = "a260cb65eaa6e055289a34434f98c3aae6137ed5";
-      hash = "sha256-EatEvMEI83yax2LCCrtJMFWDOuTzp4/rUPdARiRze6E=";
-    };
-    meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
-  };
-  facility = buildGrammar {
-    language = "facility";
-    version = "0.0.0+rev=e4bfd3e";
-    src = fetchFromGitHub {
-      owner = "FacilityApi";
-      repo = "tree-sitter-facility";
-      rev = "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb";
-      hash = "sha256-EwTkus2m0lwDwx5XO3Ee4ngretLPShx84JZytaHkZ4I=";
-    };
-    meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility";
-  };
-  faust = buildGrammar {
-    language = "faust";
-    version = "0.0.0+rev=122dd10";
-    src = fetchFromGitHub {
-      owner = "khiner";
-      repo = "tree-sitter-faust";
-      rev = "122dd101919289ea809bad643712fcb483a1bed0";
-      hash = "sha256-5T+Om1qdSIal1pMIoaM44FexSqZyhZCZb/Pa0/udzZI=";
-    };
-    meta.homepage = "https://github.com/khiner/tree-sitter-faust";
-  };
-  fennel = buildGrammar {
-    language = "fennel";
-    version = "0.0.0+rev=fd4a24e";
-    src = fetchFromGitHub {
-      owner = "alexmozaidze";
-      repo = "tree-sitter-fennel";
-      rev = "fd4a24e349bcbac8a03a5a00d0dfa207baf53ca5";
-      hash = "sha256-/+WJDDduMAEQvcTwplzNO8hfTiNbOyT2px4jRDxVQw0=";
-    };
-    meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel";
-  };
-  fidl = buildGrammar {
-    language = "fidl";
-    version = "0.0.0+rev=0a8910f";
-    src = fetchFromGitHub {
-      owner = "google";
-      repo = "tree-sitter-fidl";
-      rev = "0a8910f293268e27ff554357c229ba172b0eaed2";
-      hash = "sha256-QFAkxQo2w/+OR7nZn9ldBk2yHOd23kzciAcQvIZ5hrY=";
-    };
-    meta.homepage = "https://github.com/google/tree-sitter-fidl";
-  };
-  firrtl = buildGrammar {
-    language = "firrtl";
-    version = "0.0.0+rev=8503d3a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-firrtl";
-      rev = "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5";
-      hash = "sha256-I2EMcm6bTMRODmxOOOiv+U0fhm6yoNhjCyuINfTUtlY=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-firrtl";
-  };
-  fish = buildGrammar {
-    language = "fish";
-    version = "0.0.0+rev=aa074a0";
-    src = fetchFromGitHub {
-      owner = "ram02z";
-      repo = "tree-sitter-fish";
-      rev = "aa074a0bacde8b5823c592574d7138f156a95776";
-      hash = "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=";
-    };
-    meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
-  };
-  foam = buildGrammar {
-    language = "foam";
-    version = "0.0.0+rev=472c24f";
-    src = fetchFromGitHub {
-      owner = "FoamScience";
-      repo = "tree-sitter-foam";
-      rev = "472c24f11a547820327fb1be565bcfff98ea96a4";
-      hash = "sha256-CjCnMnsD3uZS0qEcnlLa6JrFyH88KbDITwBAdRTvVMY=";
-    };
-    meta.homepage = "https://github.com/FoamScience/tree-sitter-foam";
-  };
-  forth = buildGrammar {
-    language = "forth";
-    version = "0.0.0+rev=360ef13";
-    src = fetchFromGitHub {
-      owner = "AlexanderBrevig";
-      repo = "tree-sitter-forth";
-      rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0";
-      hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8=";
-    };
-    meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth";
-  };
-  fortran = buildGrammar {
-    language = "fortran";
-    version = "0.0.0+rev=8334abc";
-    src = fetchFromGitHub {
-      owner = "stadelmanma";
-      repo = "tree-sitter-fortran";
-      rev = "8334abca785db3a041292e3b3b818a82a55b238f";
-      hash = "sha256-MQ0Mq1kpP69oz8pAjLR/kKP491zSmKSseVktoOf5kkc=";
-    };
-    meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
-  };
-  fsh = buildGrammar {
-    language = "fsh";
-    version = "0.0.0+rev=fad2e17";
-    src = fetchFromGitHub {
-      owner = "mgramigna";
-      repo = "tree-sitter-fsh";
-      rev = "fad2e175099a45efbc98f000cc196d3674cc45e0";
-      hash = "sha256-91r1FCQTocDkhS5Tx0vnFliitMStVzNTpf6BwPyaqVM=";
-    };
-    meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh";
-  };
-  fsharp = buildGrammar {
-    language = "fsharp";
-    version = "0.0.0+rev=5141851";
-    src = fetchFromGitHub {
-      owner = "ionide";
-      repo = "tree-sitter-fsharp";
-      rev = "5141851c278a99958469eb1736c7afc4ec738e47";
-      hash = "sha256-cJpbO9PjGtJu4RCDsmQ0qjys765/z397y/wbfGxTY9Y=";
-    };
-    location = "fsharp";
-    meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
-  };
-  func = buildGrammar {
-    language = "func";
-    version = "0.0.0+rev=f780ca5";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-func";
-      rev = "f780ca55e65e7d7360d0229331763e16c452fc98";
-      hash = "sha256-jM0VJZlfhenAZbhabpgsoRIGny3WSDoimZtwogcvaSI=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-func";
-  };
-  fusion = buildGrammar {
-    language = "fusion";
-    version = "0.0.0+rev=19db2f4";
-    src = fetchFromGitLab {
-      owner = "jirgn";
-      repo = "tree-sitter-fusion";
-      rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6";
-      hash = "sha256-195q39pZYipT0G08kQlwnDE28ODjAz2/Sq1tzpEGFmU=";
-    };
-    meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion";
-  };
-  gap = buildGrammar {
-    language = "gap";
-    version = "0.0.0+rev=2bac148";
-    src = fetchFromGitHub {
-      owner = "gap-system";
-      repo = "tree-sitter-gap";
-      rev = "2bac14863b76ad0ff6fd7204c50574732acd66df";
-      hash = "sha256-3hMpEV12wE2HoJ4qX1a/lOx0JOve4pPF4n9WKcupSLo=";
-    };
-    meta.homepage = "https://github.com/gap-system/tree-sitter-gap";
-  };
-  gaptst = buildGrammar {
-    language = "gaptst";
-    version = "0.0.0+rev=69086d7";
-    src = fetchFromGitHub {
-      owner = "gap-system";
-      repo = "tree-sitter-gaptst";
-      rev = "69086d7627c03e1f4baf766bcef14c60d9e92331";
-      hash = "sha256-U0P9QoOZST1h6XI83CI0/6/CDTvqkv1Yiq62h6YdHpI=";
-    };
-    meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst";
-  };
-  gdscript = buildGrammar {
-    language = "gdscript";
-    version = "0.0.0+rev=48b4933";
-    src = fetchFromGitHub {
-      owner = "PrestonKnopp";
-      repo = "tree-sitter-gdscript";
-      rev = "48b49330888a4669b48619b211cc8da573827725";
-      hash = "sha256-mGmrCK3nGSzi/66mOxvpRyTA9b74aTMSoIISqzj+l90=";
-    };
-    meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
-  };
-  gdshader = buildGrammar {
-    language = "gdshader";
-    version = "0.0.0+rev=14e8340";
-    src = fetchFromGitHub {
-      owner = "GodOfAvacyn";
-      repo = "tree-sitter-gdshader";
-      rev = "14e834063e136fa69b6d91f711f4f1981acf424b";
-      hash = "sha256-Zs3egdOi4/1TF86cjlR5UZVEaUpXsUh4xL0tR39RSpE=";
-    };
-    meta.homepage = "https://github.com/GodOfAvacyn/tree-sitter-gdshader";
-  };
-  git_config = buildGrammar {
-    language = "git_config";
-    version = "0.0.0+rev=0fbc9f9";
-    src = fetchFromGitHub {
-      owner = "the-mikedavis";
-      repo = "tree-sitter-git-config";
-      rev = "0fbc9f99d5a28865f9de8427fb0672d66f9d83a5";
-      hash = "sha256-u1NrtCap+CvhSW4q7xrwiUPGuCspjk9sHKkXQcEXc2E=";
-    };
-    meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config";
-  };
-  git_rebase = buildGrammar {
-    language = "git_rebase";
-    version = "0.0.0+rev=bff4b66";
-    src = fetchFromGitHub {
-      owner = "the-mikedavis";
-      repo = "tree-sitter-git-rebase";
-      rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
-      hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
-    };
-    meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase";
-  };
-  gitattributes = buildGrammar {
-    language = "gitattributes";
-    version = "0.0.0+rev=1b7af09";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-gitattributes";
-      rev = "1b7af09d45b579f9f288453b95ad555f1f431645";
-      hash = "sha256-eHDcJgHpWemOYtKACVhl5Muri1W1Igrjm/p0rAbvrNY=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gitattributes";
-  };
-  gitcommit = buildGrammar {
-    language = "gitcommit";
-    version = "0.0.0+rev=a716678";
-    src = fetchFromGitHub {
-      owner = "gbprod";
-      repo = "tree-sitter-gitcommit";
-      rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d";
-      hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws=";
-    };
-    meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
-  };
-  gitignore = buildGrammar {
-    language = "gitignore";
-    version = "0.0.0+rev=f4685bf";
-    src = fetchFromGitHub {
-      owner = "shunsambongi";
-      repo = "tree-sitter-gitignore";
-      rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
-      hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=";
-    };
-    meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore";
-  };
-  gleam = buildGrammar {
-    language = "gleam";
-    version = "0.0.0+rev=f4d55f3";
-    src = fetchFromGitHub {
-      owner = "gleam-lang";
-      repo = "tree-sitter-gleam";
-      rev = "f4d55f3c5b690d4afe8853da892bc290d96deb34";
-      hash = "sha256-Nb7UoIZxWW1vQv2ZFl6TYHFPNih0sGCCf92rgfoDFEw=";
-    };
-    meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
-  };
-  glimmer = buildGrammar {
-    language = "glimmer";
-    version = "0.0.0+rev=da605af";
-    src = fetchFromGitHub {
-      owner = "ember-tooling";
-      repo = "tree-sitter-glimmer";
-      rev = "da605af8c5999b43e6839b575eae5e6cafabb06f";
-      hash = "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4=";
-    };
-    meta.homepage = "https://github.com/ember-tooling/tree-sitter-glimmer";
-  };
-  glimmer_javascript = buildGrammar {
-    language = "glimmer_javascript";
-    version = "0.0.0+rev=5cc865a";
-    src = fetchFromGitHub {
-      owner = "NullVoxPopuli";
-      repo = "tree-sitter-glimmer-javascript";
-      rev = "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87";
-      hash = "sha256-4MSBaGdX5lvhvz2LyQb+NuQY9Vc5CFL0C6S3sO3Tz2U=";
-    };
-    meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
-  };
-  glimmer_typescript = buildGrammar {
-    language = "glimmer_typescript";
-    version = "0.0.0+rev=12d9894";
-    src = fetchFromGitHub {
-      owner = "NullVoxPopuli";
-      repo = "tree-sitter-glimmer-typescript";
-      rev = "12d98944c1d5077b957cbdb90d663a7c4d50118c";
-      hash = "sha256-3cJI6vcbU62kUIhphprNeAl9RyY9TThrzVeArdLfxnI=";
-    };
-    meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
-  };
-  glsl = buildGrammar {
-    language = "glsl";
-    version = "0.0.0+rev=24a6c8e";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-glsl";
-      rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4";
-      hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-glsl";
-  };
-  gn = buildGrammar {
-    language = "gn";
-    version = "0.0.0+rev=bc06955";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-gn";
-      rev = "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05";
-      hash = "sha256-Sn6He4YRrKJe4QvGiaauquYBVQol0lWeIuOwkdUEzkQ=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gn";
-  };
-  gnuplot = buildGrammar {
-    language = "gnuplot";
-    version = "0.0.0+rev=8923c1e";
-    src = fetchFromGitHub {
-      owner = "dpezto";
-      repo = "tree-sitter-gnuplot";
-      rev = "8923c1e38b9634a688a6c0dce7c18c8ffb823e79";
-      hash = "sha256-fR3lIscfrBqpBH1jZ4RB1Qa8r+hxy6I0OzzoQqAe2aw=";
-    };
-    meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot";
-  };
-  go = buildGrammar {
-    language = "go";
-    version = "0.0.0+rev=2346a3a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-go";
-      rev = "2346a3ab1bb3857b48b29d779a1ef9799a248cd7";
-      hash = "sha256-fifTM/m2Mxd7kpJBlzwWGheAKGq6QbbzyxpBSyplYa0=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
-  };
-  goctl = buildGrammar {
-    language = "goctl";
-    version = "0.0.0+rev=49c4353";
-    src = fetchFromGitHub {
-      owner = "chaozwn";
-      repo = "tree-sitter-goctl";
-      rev = "49c43532689fe1f53e8b9e009d0521cab02c432b";
-      hash = "sha256-HYPj95Kg+C5Ax++Z83yUnhrf2iIVTuwOBhVVLlYQaGs=";
-    };
-    meta.homepage = "https://github.com/chaozwn/tree-sitter-goctl";
-  };
-  godot_resource = buildGrammar {
-    language = "godot_resource";
-    version = "0.0.0+rev=302c189";
-    src = fetchFromGitHub {
-      owner = "PrestonKnopp";
-      repo = "tree-sitter-godot-resource";
-      rev = "302c1895f54bf74d53a08572f7b26a6614209adc";
-      hash = "sha256-u3vIxbgm8zFKI/1MNYtal3ORkE/8D5iNVTFqrIIIHKM=";
-    };
-    meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource";
-  };
-  gomod = buildGrammar {
-    language = "gomod";
-    version = "0.0.0+rev=2e88687";
-    src = fetchFromGitHub {
-      owner = "camdencheek";
-      repo = "tree-sitter-go-mod";
-      rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a";
-      hash = "sha256-OfhV3lxdyIhA3XZYbafEtdOsQsTCSSCBrN3WbzSVg0g=";
-    };
-    meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
-  };
-  gosum = buildGrammar {
-    language = "gosum";
-    version = "0.0.0+rev=27816eb";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-go-sum";
-      rev = "27816eb6b7315746ae9fcf711e4e1396dc1cf237";
-      hash = "sha256-9tPFT0ad68YVmz/R6ia1bQE5AQRBX9ZoPW4inCZIBo4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-go-sum";
-  };
-  gotmpl = buildGrammar {
-    language = "gotmpl";
-    version = "0.0.0+rev=5f19a36";
-    src = fetchFromGitHub {
-      owner = "ngalaiko";
-      repo = "tree-sitter-go-template";
-      rev = "5f19a36bb1eebb30454e277b222b278ceafed0dd";
-      hash = "sha256-apZ5yhWzLxaJFxMcuugNTuCxdDUxhKTZecZFsvjyqdo=";
-    };
-    meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
-  };
-  gowork = buildGrammar {
-    language = "gowork";
-    version = "0.0.0+rev=949a8a4";
-    src = fetchFromGitHub {
-      owner = "omertuc";
-      repo = "tree-sitter-go-work";
-      rev = "949a8a470559543857a62102c84700d291fc984c";
-      hash = "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto=";
-    };
-    meta.homepage = "https://github.com/omertuc/tree-sitter-go-work";
-  };
-  gpg = buildGrammar {
-    language = "gpg";
-    version = "0.0.0+rev=4024eb2";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-gpg-config";
-      rev = "4024eb268c59204280f8ac71ef146b8ff5e737f6";
-      hash = "sha256-aV0CUthayxs9O8Bpdoj9UyvUffLFYurOtkegJVH73Do=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gpg-config";
-  };
-  graphql = buildGrammar {
-    language = "graphql";
-    version = "0.0.0+rev=5e66e96";
-    src = fetchFromGitHub {
-      owner = "bkegley";
-      repo = "tree-sitter-graphql";
-      rev = "5e66e961eee421786bdda8495ed1db045e06b5fe";
-      hash = "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=";
-    };
-    meta.homepage = "https://github.com/bkegley/tree-sitter-graphql";
-  };
-  gren = buildGrammar {
-    language = "gren";
-    version = "0.0.0+rev=c36aac5";
-    src = fetchFromGitHub {
-      owner = "MaeBrooks";
-      repo = "tree-sitter-gren";
-      rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930";
-      hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k=";
-    };
-    meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren";
-  };
-  groovy = buildGrammar {
-    language = "groovy";
-    version = "0.0.0+rev=8691159";
-    src = fetchFromGitHub {
-      owner = "murtaza64";
-      repo = "tree-sitter-groovy";
-      rev = "86911590a8e46d71301c66468e5620d9faa5b6af";
-      hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0=";
-    };
-    meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
-  };
-  groq = buildGrammar {
-    language = "groq";
-    version = "0.0.0+rev=1fa1ab0";
-    src = fetchFromGitHub {
-      owner = "ajrussellaudio";
-      repo = "tree-sitter-groq";
-      rev = "1fa1ab0eb391a270957e8ad8c731b492e3645649";
-      hash = "sha256-pKwDiViRuFB+BPfWfOOc/VDPN3qFt9HqMCuLGGSMiOU=";
-    };
-    meta.homepage = "https://github.com/ajrussellaudio/tree-sitter-groq";
-  };
-  gstlaunch = buildGrammar {
-    language = "gstlaunch";
-    version = "0.0.0+rev=549aef2";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-gstlaunch";
-      rev = "549aef253fd38a53995cda1bf55c501174372bf7";
-      hash = "sha256-zNUx/9dxEqyqTXCxEiNnYPzplnR7l9b2L4frYpPOA9M=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch";
-  };
-  hack = buildGrammar {
-    language = "hack";
-    version = "0.0.0+rev=1a7ded9";
-    src = fetchFromGitHub {
-      owner = "slackhq";
-      repo = "tree-sitter-hack";
-      rev = "1a7ded90288189746c54861ac144ede97df95081";
-      hash = "sha256-CaP4AgWHfUilze6HREQR3ah3AiOpphpFsxEkjp/Gs38=";
-    };
-    meta.homepage = "https://github.com/slackhq/tree-sitter-hack";
-  };
-  hare = buildGrammar {
-    language = "hare";
-    version = "0.0.0+rev=eed7ddf";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-hare";
-      rev = "eed7ddf6a66b596906aa8ca3d40521b8278adc6f";
-      hash = "sha256-qXLRb+5SgfBrOXta10P04ErV5z8eSM/J0Od5pk06OCc=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hare";
-  };
-  haskell = buildGrammar {
-    language = "haskell";
-    version = "0.0.0+rev=7fa19f1";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-haskell";
-      rev = "7fa19f195803a77855f036ee7f49e4b22856e338";
-      hash = "sha256-/cruCFNEyZf5d3TCw+vkJOgJqWvS1Re5F4dMVuXXJBg=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-haskell";
-  };
-  haskell_persistent = buildGrammar {
-    language = "haskell_persistent";
-    version = "0.0.0+rev=577259b";
-    src = fetchFromGitHub {
-      owner = "MercuryTechnologies";
-      repo = "tree-sitter-haskell-persistent";
-      rev = "577259b4068b2c281c9ebf94c109bd50a74d5857";
-      hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ=";
-    };
-    meta.homepage = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent";
-  };
-  hcl = buildGrammar {
-    language = "hcl";
-    version = "0.0.0+rev=fad9918";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-hcl";
-      rev = "fad991865fee927dd1de5e172fb3f08ac674d914";
-      hash = "sha256-Kq0KtkF6xtZcN2s8KzYGyguJH2iOTlA2WRytZ+KGTUE=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hcl";
-  };
-  heex = buildGrammar {
-    language = "heex";
-    version = "0.0.0+rev=b5a7cb5";
-    src = fetchFromGitHub {
-      owner = "connorlay";
-      repo = "tree-sitter-heex";
-      rev = "b5a7cb5f74dc695a9ff5f04919f872ebc7a895e9";
-      hash = "sha256-hSe3h05IFEKMosB2r/85JnT2kv/krU2Ebaszd+m3j8g=";
-    };
-    meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
-  };
-  helm = buildGrammar {
-    language = "helm";
-    version = "0.0.0+rev=5f19a36";
-    src = fetchFromGitHub {
-      owner = "ngalaiko";
-      repo = "tree-sitter-go-template";
-      rev = "5f19a36bb1eebb30454e277b222b278ceafed0dd";
-      hash = "sha256-apZ5yhWzLxaJFxMcuugNTuCxdDUxhKTZecZFsvjyqdo=";
-    };
-    location = "dialects/helm";
-    meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
-  };
-  hjson = buildGrammar {
-    language = "hjson";
-    version = "0.0.0+rev=02fa3b7";
-    src = fetchFromGitHub {
-      owner = "winston0410";
-      repo = "tree-sitter-hjson";
-      rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0";
-      hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8=";
-    };
-    meta.homepage = "https://github.com/winston0410/tree-sitter-hjson";
-  };
-  hlsl = buildGrammar {
-    language = "hlsl";
-    version = "0.0.0+rev=bab9111";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-hlsl";
-      rev = "bab9111922d53d43668fabb61869bec51bbcb915";
-      hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl";
-  };
-  hlsplaylist = buildGrammar {
-    language = "hlsplaylist";
-    version = "0.0.0+rev=3bfda92";
-    src = fetchFromGitHub {
-      owner = "Freed-Wu";
-      repo = "tree-sitter-hlsplaylist";
-      rev = "3bfda9271e3adb08d35f47a2102fe957009e1c55";
-      hash = "sha256-BvLT+BbnJgM14a896p39dywYy/4S45xOBtBukYTbW6E=";
-    };
-    meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist";
-  };
-  hocon = buildGrammar {
-    language = "hocon";
-    version = "0.0.0+rev=c390f10";
-    src = fetchFromGitHub {
-      owner = "antosha417";
-      repo = "tree-sitter-hocon";
-      rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc";
-      hash = "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw=";
-    };
-    meta.homepage = "https://github.com/antosha417/tree-sitter-hocon";
-  };
-  hoon = buildGrammar {
-    language = "hoon";
-    version = "0.0.0+rev=1545137";
-    src = fetchFromGitHub {
-      owner = "urbit-pilled";
-      repo = "tree-sitter-hoon";
-      rev = "1545137aadcc63660c47db9ad98d02fa602655d0";
-      hash = "sha256-RkSPoscrinmuSTWHzXkRNaiqECDXpKAbQ4z7a6Tpvek=";
-    };
-    meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
-  };
-  html = buildGrammar {
-    language = "html";
-    version = "0.0.0+rev=73a3947";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-html";
-      rev = "73a3947324f6efddf9e17c0ea58d454843590cc0";
-      hash = "sha256-WT8ZHU4wDNovIAWbHNSvjx6zmaTn8XH3IobsckIVXxg=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
-  };
-  htmldjango = buildGrammar {
-    language = "htmldjango";
-    version = "0.0.0+rev=3a64316";
-    src = fetchFromGitHub {
-      owner = "interdependence";
-      repo = "tree-sitter-htmldjango";
-      rev = "3a643167ad9afac5d61e092f08ff5b054576fadf";
-      hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE=";
-    };
-    meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango";
-  };
-  http = buildGrammar {
-    language = "http";
-    version = "0.0.0+rev=db8b439";
-    src = fetchFromGitHub {
-      owner = "rest-nvim";
-      repo = "tree-sitter-http";
-      rev = "db8b4398de90b6d0b6c780aba96aaa2cd8e9202c";
-      hash = "sha256-T/O4oxPEIg3nLi3CxCwGW+iXC18fWW2xgsY5nrptk/M=";
-    };
-    meta.homepage = "https://github.com/rest-nvim/tree-sitter-http";
-  };
-  hurl = buildGrammar {
-    language = "hurl";
-    version = "0.0.0+rev=597efbd";
-    src = fetchFromGitHub {
-      owner = "pfeiferj";
-      repo = "tree-sitter-hurl";
-      rev = "597efbd7ce9a814bb058f48eabd055b1d1e12145";
-      hash = "sha256-sQjjx3DGfi0l8/XNOIoyFYAcDpaQOkD4Ics3g6vkgjM=";
-    };
-    meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl";
-  };
-  hyprlang = buildGrammar {
-    language = "hyprlang";
-    version = "0.0.0+rev=22723f2";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-hyprlang";
-      rev = "22723f25f3faf329863d952c9601b492afd971c9";
-      hash = "sha256-KU+vrokH8/E5Wg3BLuG3IZyw/9rJr0TJQxXB2IDULsE=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang";
-  };
-  idl = buildGrammar {
-    language = "idl";
-    version = "0.0.0+rev=0c9aa15";
-    src = fetchFromGitHub {
-      owner = "cathaysia";
-      repo = "tree-sitter-idl";
-      rev = "0c9aa1588cec4c64235ec3ed014ca72aa79e72ca";
-      hash = "sha256-hhUXA7L/0G03T5ZL/fibWKc1KrIZ8TmBysAlXraDCLk=";
-    };
-    meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
-  };
-  idris = buildGrammar {
-    language = "idris";
-    version = "0.0.0+rev=c56a25c";
-    src = fetchFromGitHub {
-      owner = "kayhide";
-      repo = "tree-sitter-idris";
-      rev = "c56a25cf57c68ff929356db25505c1cc4c7820f6";
-      hash = "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk=";
-    };
-    meta.homepage = "https://github.com/kayhide/tree-sitter-idris";
-  };
-  ini = buildGrammar {
-    language = "ini";
-    version = "0.0.0+rev=e4018b5";
-    src = fetchFromGitHub {
-      owner = "justinmk";
-      repo = "tree-sitter-ini";
-      rev = "e4018b5176132b4f3c5d6e61cea383f42288d0f5";
-      hash = "sha256-8WCyIaApsLPOybe+cntF4ISyQKN41L2IRAATd9KmzL0=";
-    };
-    meta.homepage = "https://github.com/justinmk/tree-sitter-ini";
-  };
-  inko = buildGrammar {
-    language = "inko";
-    version = "0.0.0+rev=1fcbf8c";
-    src = fetchFromGitHub {
-      owner = "inko-lang";
-      repo = "tree-sitter-inko";
-      rev = "1fcbf8ca64b1a088525235662ad80aa803d97413";
-      hash = "sha256-xbQZoamGDhXly/TmZuVEhS5aaOBPIQb6fzDUETY3ygY=";
-    };
-    meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
-  };
-  ispc = buildGrammar {
-    language = "ispc";
-    version = "0.0.0+rev=9b2f9ae";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-ispc";
-      rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04";
-      hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ispc";
-  };
-  janet_simple = buildGrammar {
-    language = "janet_simple";
-    version = "0.0.0+rev=7e28cbf";
-    src = fetchFromGitHub {
-      owner = "sogaiu";
-      repo = "tree-sitter-janet-simple";
-      rev = "7e28cbf1ca061887ea43591a2898001f4245fddf";
-      hash = "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=";
-    };
-    meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
-  };
-  java = buildGrammar {
-    language = "java";
-    version = "0.0.0+rev=e10607b";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-java";
-      rev = "e10607b45ff745f5f876bfa3e94fbcc6b44bdc11";
-      hash = "sha256-XoaHRQ0esrV9e5JFSZkVR7QkGfky9NMnXaLQl8lohAM=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
-  };
-  javadoc = buildGrammar {
-    language = "javadoc";
-    version = "0.0.0+rev=5c6157f";
-    src = fetchFromGitHub {
-      owner = "rmuir";
-      repo = "tree-sitter-javadoc";
-      rev = "5c6157fe1c44e843f739e11b41c48c5918ec8709";
-      hash = "sha256-mbTqYzTr78UIyx7Z/x4M4CU841BafvXVMzq678LtqGU=";
-    };
-    meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
-  };
-  javascript = buildGrammar {
-    language = "javascript";
-    version = "0.0.0+rev=58404d8";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-javascript";
-      rev = "58404d8cf191d69f2674a8fd507bd5776f46cb11";
-      hash = "sha256-+fbTNX7qz6Ew1NrXF49wQh3RVl2ZQ3R7YXMkclUoNT8=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
-  };
-  jinja = buildGrammar {
-    language = "jinja";
-    version = "0.0.0+rev=e589222";
-    src = fetchFromGitHub {
-      owner = "cathaysia";
-      repo = "tree-sitter-jinja";
-      rev = "e589222a1ad44361bc376d5abdccd08e1fecfee5";
-      hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk=";
-    };
-    location = "tree-sitter-jinja";
-    meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
-  };
-  jinja_inline = buildGrammar {
-    language = "jinja_inline";
-    version = "0.0.0+rev=e589222";
-    src = fetchFromGitHub {
-      owner = "cathaysia";
-      repo = "tree-sitter-jinja";
-      rev = "e589222a1ad44361bc376d5abdccd08e1fecfee5";
-      hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk=";
-    };
-    location = "tree-sitter-jinja_inline";
-    meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
-  };
-  jq = buildGrammar {
-    language = "jq";
-    version = "0.0.0+rev=c204e36";
-    src = fetchFromGitHub {
-      owner = "flurie";
-      repo = "tree-sitter-jq";
-      rev = "c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9";
-      hash = "sha256-WEsiDsZEFTGC3s0awYE8rN/fsRML7CePKOXUbL+Fujc=";
-    };
-    meta.homepage = "https://github.com/flurie/tree-sitter-jq";
-  };
-  jsdoc = buildGrammar {
-    language = "jsdoc";
-    version = "0.0.0+rev=658d18d";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-jsdoc";
-      rev = "658d18dcdddb75c760363faa4963427a7c6b52db";
-      hash = "sha256-xjLC56NiOwwb5BJ2DLiG3rknMR3rrcYrPuHI24NVL+M=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc";
-  };
-  json = buildGrammar {
-    language = "json";
-    version = "0.0.0+rev=001c28d";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-json";
-      rev = "001c28d7a29832b06b0e831ec77845553c89b56d";
-      hash = "sha256-cUjbN+e8UtoLRm8ZnxG7iRGD5YIc032RbHBIlmV8aLc=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
-  };
-  json5 = buildGrammar {
-    language = "json5";
-    version = "0.0.0+rev=aa630ef";
-    src = fetchFromGitHub {
-      owner = "Joakker";
-      repo = "tree-sitter-json5";
-      rev = "aa630ef48903ab99e406a8acd2e2933077cc34e1";
-      hash = "sha256-WMGZxt1F2Ca7xoBSCld04LpQr37MhZpARK9mPF8RMUI=";
-    };
-    meta.homepage = "https://github.com/Joakker/tree-sitter-json5";
-  };
-  jsonc = buildGrammar {
-    language = "jsonc";
-    version = "0.0.0+rev=02b0165";
-    src = fetchFromGitLab {
-      owner = "WhyNotHugo";
-      repo = "tree-sitter-jsonc";
-      rev = "02b01653c8a1c198ae7287d566efa86a135b30d5";
-      hash = "sha256-iWc2ePRiQnZ0FEdMAaAwa3iYt/SY0bEjQrZyqE9EhlU=";
-    };
-    meta.homepage = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc";
-  };
-  jsonnet = buildGrammar {
-    language = "jsonnet";
-    version = "0.0.0+rev=ddd075f";
-    src = fetchFromGitHub {
-      owner = "sourcegraph";
-      repo = "tree-sitter-jsonnet";
-      rev = "ddd075f1939aed8147b7aa67f042eda3fce22790";
-      hash = "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=";
-    };
-    meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
-  };
-  julia = buildGrammar {
-    language = "julia";
-    version = "0.0.0+rev=12a3aed";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-julia";
-      rev = "12a3aede757bc7fbdfb1909507c7a6fddd31df37";
-      hash = "sha256-527US8LI8ZItb/O0em47+v4HnYnhJd48KBAWpasD62E=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
-  };
-  just = buildGrammar {
-    language = "just";
-    version = "0.0.0+rev=bb0c898";
-    src = fetchFromGitHub {
-      owner = "IndianBoy42";
-      repo = "tree-sitter-just";
-      rev = "bb0c898a80644de438e6efe5d88d30bf092935cd";
-      hash = "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=";
-    };
-    meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
-  };
-  kcl = buildGrammar {
-    language = "kcl";
-    version = "0.0.0+rev=b0b2eb3";
-    src = fetchFromGitHub {
-      owner = "kcl-lang";
-      repo = "tree-sitter-kcl";
-      rev = "b0b2eb38009e04035a6e266c7e11e541f3caab7c";
-      hash = "sha256-Aeu1j77GdsNpo9PU+FcqN3ttT0eLaDKY4n8buftMiDc=";
-    };
-    meta.homepage = "https://github.com/kcl-lang/tree-sitter-kcl";
-  };
-  kconfig = buildGrammar {
-    language = "kconfig";
-    version = "0.0.0+rev=9ac99fe";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-kconfig";
-      rev = "9ac99fe4c0c27a35dc6f757cef534c646e944881";
-      hash = "sha256-8gZZLGL7giVHQIirjUIfsx3scP1L1VTFIZX7QOyjWvk=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-kconfig";
-  };
-  kdl = buildGrammar {
-    language = "kdl";
-    version = "0.0.0+rev=b37e3d5";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-kdl";
-      rev = "b37e3d58e5c5cf8d739b315d6114e02d42e66664";
-      hash = "sha256-irx8aMEdZG2WcQVE2c7ahwLjqEoUAOOjvhDDk69a6lE=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-kdl";
-  };
-  kitty = buildGrammar {
-    language = "kitty";
-    version = "0.0.0+rev=2e9b602";
-    src = fetchFromGitHub {
-      owner = "OXY2DEV";
-      repo = "tree-sitter-kitty";
-      rev = "2e9b602ca676cac63887cca5a4535106f3475c82";
-      hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0=";
-    };
-    meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
-  };
-  kotlin = buildGrammar {
-    language = "kotlin";
-    version = "0.0.0+rev=57fb456";
-    src = fetchFromGitHub {
-      owner = "fwcd";
-      repo = "tree-sitter-kotlin";
-      rev = "57fb4560ba8641865bc0baa6b3f413b236112c4c";
-      hash = "sha256-CA4bfWE3YkvC4v21EXdjJ2SD7mIWJbuGpnyvRwFgm8M=";
-    };
-    meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
-  };
-  koto = buildGrammar {
-    language = "koto";
-    version = "0.0.0+rev=2ffc77c";
-    src = fetchFromGitHub {
-      owner = "koto-lang";
-      repo = "tree-sitter-koto";
-      rev = "2ffc77c14f0ac1674384ff629bfc207b9c57ed89";
-      hash = "sha256-uummfcFCsLP73h1ioxNDXQYTVZfZt0RjYCRUJF4cuuI=";
-    };
-    meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
-  };
-  kusto = buildGrammar {
-    language = "kusto";
-    version = "0.0.0+rev=8353a12";
-    src = fetchFromGitHub {
-      owner = "Willem-J-an";
-      repo = "tree-sitter-kusto";
-      rev = "8353a1296607d6ba33db7c7e312226e5fc83e8ce";
-      hash = "sha256-CZCvgOtHjCgyzKFdys+ZvSWCj1I1/b2MnaJcdAtm2aY=";
-    };
-    meta.homepage = "https://github.com/Willem-J-an/tree-sitter-kusto";
-  };
-  lalrpop = buildGrammar {
-    language = "lalrpop";
-    version = "0.0.0+rev=8d38e97";
-    src = fetchFromGitHub {
-      owner = "traxys";
-      repo = "tree-sitter-lalrpop";
-      rev = "8d38e9755c05d37df8a24dadb0fc64f6588ac188";
-      hash = "sha256-rqJ0Zr9zxPkqux+DCSaUszqijFpc35fUB6sAPdGdt/0=";
-    };
-    meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop";
-  };
-  latex = buildGrammar {
-    language = "latex";
-    version = "0.0.0+rev=73c9b89";
-    src = fetchFromGitHub {
-      owner = "latex-lsp";
-      repo = "tree-sitter-latex";
-      rev = "73c9b8992f72203386092ffd2a05f2dcba02d2cb";
-      hash = "sha256-Z0zyXP86eRcKYjw4lVMPXXwQAusuEhFgMUFuE3GmIrM=";
-    };
-    generate = true;
-    meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
-  };
-  ledger = buildGrammar {
-    language = "ledger";
-    version = "0.0.0+rev=96c92d4";
-    src = fetchFromGitHub {
-      owner = "cbarrete";
-      repo = "tree-sitter-ledger";
-      rev = "96c92d4908a836bf8f661166721c98439f8afb80";
-      hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=";
-    };
-    meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
-  };
-  leo = buildGrammar {
-    language = "leo";
-    version = "0.0.0+rev=6bc5564";
-    src = fetchFromGitHub {
-      owner = "r001";
-      repo = "tree-sitter-leo";
-      rev = "6bc5564917edacd070afc4d33cf5e2e677831ea9";
-      hash = "sha256-FbV95Jm2w/9Xrqdl4bRnUyCYxFMXIuDXO4Hl4w2AUaM=";
-    };
-    meta.homepage = "https://github.com/r001/tree-sitter-leo";
-  };
-  linkerscript = buildGrammar {
-    language = "linkerscript";
-    version = "0.0.0+rev=f99011a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-linkerscript";
-      rev = "f99011a3554213b654985a4b0a65b3b032ec4621";
-      hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-linkerscript";
-  };
-  liquid = buildGrammar {
-    language = "liquid";
-    version = "0.0.0+rev=d6ebde3";
-    src = fetchFromGitHub {
-      owner = "hankthetank27";
-      repo = "tree-sitter-liquid";
-      rev = "d6ebde3974742cd1b61b55d1d94aab1dacb41056";
-      hash = "sha256-rcRbo6iyO2uC2OS0dR20xJlDlBdCoyIUc9nEv0KPWxI=";
-    };
-    meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
-  };
-  liquidsoap = buildGrammar {
-    language = "liquidsoap";
-    version = "0.0.0+rev=4de01f4";
-    src = fetchFromGitHub {
-      owner = "savonet";
-      repo = "tree-sitter-liquidsoap";
-      rev = "4de01f44de2c051c33832ce523cf44690561320d";
-      hash = "sha256-ibDpFPqdz0WnRaKN0dP1uAPi9W9EWew+kDybuPz1Bow=";
-    };
-    meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
-  };
-  llvm = buildGrammar {
-    language = "llvm";
-    version = "0.0.0+rev=2914786";
-    src = fetchFromGitHub {
-      owner = "benwilliamgraham";
-      repo = "tree-sitter-llvm";
-      rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
-      hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
-    };
-    meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
-  };
-  lua = buildGrammar {
-    language = "lua";
-    version = "0.0.0+rev=d760230";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-lua";
-      rev = "d76023017f7485eae629cb60d406c7a1ca0f40c9";
-      hash = "sha256-tf71uJ4RpEfUdhdaHhp1MTT96kzN4O1wJ7SzpUfT3+Y=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-lua";
-  };
-  luadoc = buildGrammar {
-    language = "luadoc";
-    version = "0.0.0+rev=873612a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-luadoc";
-      rev = "873612aadd3f684dd4e631bdf42ea8990c57634e";
-      hash = "sha256-ttGBB9sn+xd9jWzjNAzpo/lwYVYZGSUGEip4K3PfBP0=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luadoc";
-  };
-  luap = buildGrammar {
-    language = "luap";
-    version = "0.0.0+rev=c134aae";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-luap";
-      rev = "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a";
-      hash = "sha256-4mMUHBsdK4U4uhh8GpKlG3p/s3ZCcLX1qATPyTD4Xhg=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luap";
-  };
-  luau = buildGrammar {
-    language = "luau";
-    version = "0.0.0+rev=a8914d6";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-luau";
-      rev = "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f";
-      hash = "sha256-5qbZA2mxTvrsfUrpgD+4y3oeJsifA91c/hfcVwQBRgI=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luau";
-  };
-  m68k = buildGrammar {
-    language = "m68k";
-    version = "0.0.0+rev=e128454";
-    src = fetchFromGitHub {
-      owner = "grahambates";
-      repo = "tree-sitter-m68k";
-      rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3";
-      hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4=";
-    };
-    meta.homepage = "https://github.com/grahambates/tree-sitter-m68k";
-  };
-  make = buildGrammar {
-    language = "make";
-    version = "0.0.0+rev=a4b9187";
-    src = fetchFromGitHub {
-      owner = "alemuller";
-      repo = "tree-sitter-make";
-      rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd";
-      hash = "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=";
-    };
-    meta.homepage = "https://github.com/alemuller/tree-sitter-make";
-  };
-  markdown = buildGrammar {
-    language = "markdown";
-    version = "0.0.0+rev=2dfd57f";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-markdown";
-      rev = "2dfd57f547f06ca5631a80f601e129d73fc8e9f0";
-      hash = "sha256-IYqh6JT74deu1UU4Nyls9Eg88BvQeYEta2UXZAbuZek=";
-    };
-    location = "tree-sitter-markdown";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
-  };
-  markdown_inline = buildGrammar {
-    language = "markdown_inline";
-    version = "0.0.0+rev=2dfd57f";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-markdown";
-      rev = "2dfd57f547f06ca5631a80f601e129d73fc8e9f0";
-      hash = "sha256-IYqh6JT74deu1UU4Nyls9Eg88BvQeYEta2UXZAbuZek=";
-    };
-    location = "tree-sitter-markdown-inline";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
-  };
-  matlab = buildGrammar {
-    language = "matlab";
-    version = "0.0.0+rev=37941b2";
-    src = fetchFromGitHub {
-      owner = "acristoffers";
-      repo = "tree-sitter-matlab";
-      rev = "37941b272862ba52983f44cb6ec7b0eec6972c95";
-      hash = "sha256-6rFMn0fSXI5I1okm1ECJj+vj2qe+riiiOVPu7Jy8ZVc=";
-    };
-    meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
-  };
-  menhir = buildGrammar {
-    language = "menhir";
-    version = "0.0.0+rev=be8866a";
-    src = fetchFromGitHub {
-      owner = "Kerl13";
-      repo = "tree-sitter-menhir";
-      rev = "be8866a6bcc2b563ab0de895af69daeffa88fe70";
-      hash = "sha256-CQVEQurf8Ur5xnz+g7e1nck0a32o4oeMOT78thjx8MQ=";
-    };
-    meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir";
-  };
-  mermaid = buildGrammar {
-    language = "mermaid";
-    version = "0.0.0+rev=90ae195";
-    src = fetchFromGitHub {
-      owner = "monaqa";
-      repo = "tree-sitter-mermaid";
-      rev = "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc";
-      hash = "sha256-Tt1bPqpL59FQzuI8CPljBmQoAfJPUkVC9Xe1GcfXzfE=";
-    };
-    meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid";
-  };
-  meson = buildGrammar {
-    language = "meson";
-    version = "0.0.0+rev=280b6e5";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-meson";
-      rev = "280b6e59186f18528bab1567f5cc43b78b9cd881";
-      hash = "sha256-zqsSx5sfX28RrywHLKhAqtVZs9cI6rjU/3pt22b3/Ec=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-meson";
-  };
-  mlir = buildGrammar {
-    language = "mlir";
-    version = "0.0.0+rev=1f76a88";
-    src = fetchFromGitHub {
-      owner = "artagnon";
-      repo = "tree-sitter-mlir";
-      rev = "1f76a88b79e70222968a9f8185992c9bb5ddacf0";
-      hash = "sha256-QAdDUge9hqL1kWTDInnQS0wsqZLjWWTU3JYWYIdaMg4=";
-    };
-    generate = true;
-    meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
-  };
-  muttrc = buildGrammar {
-    language = "muttrc";
-    version = "0.0.0+rev=173b0ab";
-    src = fetchFromGitHub {
-      owner = "neomutt";
-      repo = "tree-sitter-muttrc";
-      rev = "173b0ab53a9c07962c9777189c4c70e90f1c1837";
-      hash = "sha256-zma/oyMFI+r+/616yXV9b4ptC1FNYpHlpqY/Fez++n0=";
-    };
-    meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc";
-  };
-  nasm = buildGrammar {
-    language = "nasm";
-    version = "0.0.0+rev=d1b3638";
-    src = fetchFromGitHub {
-      owner = "naclsn";
-      repo = "tree-sitter-nasm";
-      rev = "d1b3638d017f2a8585e26dcfc66fe1df94185e30";
-      hash = "sha256-38yRvaSkHZ7iRmHlXdCssJtd/RQRfBB437HzBwWv2mg=";
-    };
-    meta.homepage = "https://github.com/naclsn/tree-sitter-nasm";
-  };
-  nginx = buildGrammar {
-    language = "nginx";
-    version = "0.0.0+rev=989da76";
-    src = fetchFromGitHub {
-      owner = "opa-oz";
-      repo = "tree-sitter-nginx";
-      rev = "989da760be05a3334af3ec88705cbf57e6a9c41d";
-      hash = "sha256-tIbwsh7cnpm1jkIKaXQ7NI/LXWzEOsZyNLfe/qTNkkM=";
-    };
-    meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx";
-  };
-  nickel = buildGrammar {
-    language = "nickel";
-    version = "0.0.0+rev=f77c02d";
-    src = fetchFromGitHub {
-      owner = "nickel-lang";
-      repo = "tree-sitter-nickel";
-      rev = "f77c02df6dd0845594846beeeedf3715d4b68758";
-      hash = "sha256-6Rgxfd1ZVyYvAcgGhiV7/m+aWBGuZf9FzHKsi+2rxn8=";
-    };
-    meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
-  };
-  nim = buildGrammar {
-    language = "nim";
-    version = "0.0.0+rev=4ad3527";
-    src = fetchFromGitHub {
-      owner = "alaviss";
-      repo = "tree-sitter-nim";
-      rev = "4ad352773688deb84a95eeaa9872acda5b466439";
-      hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58=";
-    };
-    meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
-  };
-  nim_format_string = buildGrammar {
-    language = "nim_format_string";
-    version = "0.0.0+rev=d45f750";
-    src = fetchFromGitHub {
-      owner = "aMOPel";
-      repo = "tree-sitter-nim-format-string";
-      rev = "d45f75022d147cda056e98bfba68222c9c8eca3a";
-      hash = "sha256-hbM0JIxtZ3e2JUV4jXYO4RIO6r63nf2csvsLeIxkMn0=";
-    };
-    meta.homepage = "https://github.com/aMOPel/tree-sitter-nim-format-string";
-  };
-  ninja = buildGrammar {
-    language = "ninja";
-    version = "0.0.0+rev=0a95cfd";
-    src = fetchFromGitHub {
-      owner = "alemuller";
-      repo = "tree-sitter-ninja";
-      rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267";
-      hash = "sha256-e/LpQUL3UHHko4QvMeT40LCvPZRT7xTGZ9z1Zaboru4=";
-    };
-    meta.homepage = "https://github.com/alemuller/tree-sitter-ninja";
-  };
-  nix = buildGrammar {
-    language = "nix";
-    version = "0.0.0+rev=eabf968";
-    src = fetchFromGitHub {
-      owner = "nix-community";
-      repo = "tree-sitter-nix";
-      rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840";
-      hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY=";
-    };
-    meta.homepage = "https://github.com/nix-community/tree-sitter-nix";
-  };
-  nqc = buildGrammar {
-    language = "nqc";
-    version = "0.0.0+rev=14e6da1";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-nqc";
-      rev = "14e6da1627aaef21d2b2aa0c37d04269766dcc1d";
-      hash = "sha256-Gf6410cWLENCgI1uIBVBl4RnRuVCHkWkn6sxusmI6j4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-nqc";
-  };
-  nu = buildGrammar {
-    language = "nu";
-    version = "0.0.0+rev=6544c43";
-    src = fetchFromGitHub {
-      owner = "nushell";
-      repo = "tree-sitter-nu";
-      rev = "6544c4383643cf8608d50def2247a7af8314e148";
-      hash = "sha256-+KsRkfx0WmcfYBP7zxXqL8kPm/HsBjuI56/v910kMFU=";
-    };
-    meta.homepage = "https://github.com/nushell/tree-sitter-nu";
-  };
-  objc = buildGrammar {
-    language = "objc";
-    version = "0.0.0+rev=181a81b";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-objc";
-      rev = "181a81b8f23a2d593e7ab4259981f50122909fda";
-      hash = "sha256-7W8ozhQJL+f+tQYz61EZexk9NkMu1pCAP5IIy1m3qak=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-objc";
-  };
-  objdump = buildGrammar {
-    language = "objdump";
-    version = "0.0.0+rev=28d3b2e";
-    src = fetchFromGitHub {
-      owner = "ColinKennedy";
-      repo = "tree-sitter-objdump";
-      rev = "28d3b2e25a0b1881d1b47ed1924ca276c7003d45";
-      hash = "sha256-OPqIhgItghXplQ78Vlwd0G6KtDWTVkaG17RPqx1b5JY=";
-    };
-    meta.homepage = "https://github.com/ColinKennedy/tree-sitter-objdump";
-  };
-  ocaml = buildGrammar {
-    language = "ocaml";
-    version = "0.0.0+rev=3ef7c00";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-ocaml";
-      rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
-      hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
-    };
-    location = "grammars/ocaml";
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
-  };
-  ocaml_interface = buildGrammar {
-    language = "ocaml_interface";
-    version = "0.0.0+rev=3ef7c00";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-ocaml";
-      rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
-      hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
-    };
-    location = "grammars/interface";
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
-  };
-  ocamllex = buildGrammar {
-    language = "ocamllex";
-    version = "0.0.0+rev=33722b8";
-    src = fetchFromGitHub {
-      owner = "atom-ocaml";
-      repo = "tree-sitter-ocamllex";
-      rev = "33722b8be73079946a7c6dd9598e3f57956ed36d";
-      hash = "sha256-mqp/qHr1zWMJinlMJ0HNAKuFUQ4NqQiLzKx0DoN4wGI=";
-    };
-    generate = true;
-    meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
-  };
-  odin = buildGrammar {
-    language = "odin";
-    version = "0.0.0+rev=d2ca8ef";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-odin";
-      rev = "d2ca8efb4487e156a60d5bd6db2598b872629403";
-      hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-odin";
-  };
-  pascal = buildGrammar {
-    language = "pascal";
-    version = "0.0.0+rev=5054931";
-    src = fetchFromGitHub {
-      owner = "Isopod";
-      repo = "tree-sitter-pascal";
-      rev = "5054931bcd022860dd5936864f981e359fb63aef";
-      hash = "sha256-+5HzlNL54/Wdr7b1vRwZzIU3Z8vqFP9FzmEO1qwxJrk=";
-    };
-    meta.homepage = "https://github.com/Isopod/tree-sitter-pascal";
-  };
-  passwd = buildGrammar {
-    language = "passwd";
-    version = "0.0.0+rev=2023939";
-    src = fetchFromGitHub {
-      owner = "ath3";
-      repo = "tree-sitter-passwd";
-      rev = "20239395eacdc2e0923a7e5683ad3605aee7b716";
-      hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4=";
-    };
-    meta.homepage = "https://github.com/ath3/tree-sitter-passwd";
-  };
-  pem = buildGrammar {
-    language = "pem";
-    version = "0.0.0+rev=e525b17";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-pem";
-      rev = "e525b177a229b1154fd81bc0691f943028d9e685";
-      hash = "sha256-2fhqFGLdQ5eugv405osviYUcAPMdm1N0VfGoVuI84Qk=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pem";
-  };
-  perl = buildGrammar {
-    language = "perl";
-    version = "0.0.0+rev=0c24d00";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-perl";
-      repo = "tree-sitter-perl";
-      rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a";
-      hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
-  };
-  php = buildGrammar {
-    language = "php";
-    version = "0.0.0+rev=b2278db";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-php";
-      rev = "b2278dbac9d58b02653fe6a8530ccebc492e4ed4";
-      hash = "sha256-xvUUw+532j49MhEgAeEDfLo+bqN0U65s/uV9BPbsVt4=";
-    };
-    location = "php";
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
-  };
-  php_only = buildGrammar {
-    language = "php_only";
-    version = "0.0.0+rev=b2278db";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-php";
-      rev = "b2278dbac9d58b02653fe6a8530ccebc492e4ed4";
-      hash = "sha256-xvUUw+532j49MhEgAeEDfLo+bqN0U65s/uV9BPbsVt4=";
-    };
-    location = "php_only";
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
-  };
-  phpdoc = buildGrammar {
-    language = "phpdoc";
-    version = "0.0.0+rev=03bb103";
-    src = fetchFromGitHub {
-      owner = "claytonrcarter";
-      repo = "tree-sitter-phpdoc";
-      rev = "03bb10330704b0b371b044e937d5cc7cd40b4999";
-      hash = "sha256-EwDrC12hMwlyCff867bmVt7RVZNa8jkDMKkytB7qNLc=";
-    };
-    meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc";
-  };
-  pioasm = buildGrammar {
-    language = "pioasm";
-    version = "0.0.0+rev=afece58";
-    src = fetchFromGitHub {
-      owner = "leo60228";
-      repo = "tree-sitter-pioasm";
-      rev = "afece58efdb30440bddd151ef1347fa8d6f744a9";
-      hash = "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=";
-    };
-    meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
-  };
-  pkl = buildGrammar {
-    language = "pkl";
-    version = "0.0.0+rev=d50709f";
-    src = fetchFromGitHub {
-      owner = "apple";
-      repo = "tree-sitter-pkl";
-      rev = "d50709f1b71e77844c4551c655792d100a5ca559";
-      hash = "sha256-Q5feMUI0w1NinR9o3pE3bH7qAFMcF0xOwWlZjughTqM=";
-    };
-    meta.homepage = "https://github.com/apple/tree-sitter-pkl";
-  };
-  po = buildGrammar {
-    language = "po";
-    version = "0.0.0+rev=bd860a0";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-po";
-      rev = "bd860a0f57f697162bf28e576674be9c1500db5e";
-      hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-po";
-  };
-  pod = buildGrammar {
-    language = "pod";
-    version = "0.0.0+rev=0bf8387";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-perl";
-      repo = "tree-sitter-pod";
-      rev = "0bf8387987c21bf2f8ed41d2575a8f22b139687f";
-      hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod";
-  };
-  poe_filter = buildGrammar {
-    language = "poe_filter";
-    version = "0.0.0+rev=205a7d5";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-poe-filter";
-      rev = "205a7d576984feb38a9fc2d8cfe729617f9e0548";
-      hash = "sha256-oFe/U3G5Fi73YtctonfUqZe5/UScM09c98R8C3aR7yU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-poe-filter";
-  };
-  pony = buildGrammar {
-    language = "pony";
-    version = "0.0.0+rev=73ff874";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-pony";
-      rev = "73ff874ae4c9e9b45462673cbc0a1e350e2522a7";
-      hash = "sha256-/9bTbep2AXLoiijeft9amMeFQ6fHXzItjH+bD/w6pDo=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pony";
-  };
-  powershell = buildGrammar {
-    language = "powershell";
-    version = "0.0.0+rev=66d5e61";
-    src = fetchFromGitHub {
-      owner = "airbus-cert";
-      repo = "tree-sitter-powershell";
-      rev = "66d5e61126989c0aca57ff77d19b2064919b51e1";
-      hash = "sha256-M2vOS2UleHpZC8PbUf+PHxjWz4BMBhyVxcuUsuMx34Q=";
-    };
-    meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
-  };
-  printf = buildGrammar {
-    language = "printf";
-    version = "0.0.0+rev=ec4e567";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-printf";
-      rev = "ec4e5674573d5554fccb87a887c97d4aec489da7";
-      hash = "sha256-JddrO4H7b3f/jrYag1lTAqeCzspf18SiIsVV2EJ25ZY=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-printf";
-  };
-  prisma = buildGrammar {
-    language = "prisma";
-    version = "0.0.0+rev=3556b2c";
-    src = fetchFromGitHub {
-      owner = "victorhqc";
-      repo = "tree-sitter-prisma";
-      rev = "3556b2c1f20ec9ac91e92d32c43d9d2a0ca3cc49";
-      hash = "sha256-VE9HUG0z6oPVlA8no011vwYI2HxufJEuXXnCGbCgI4Q=";
-    };
-    meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma";
-  };
-  problog = buildGrammar {
-    language = "problog";
-    version = "0.0.0+rev=d8d415f";
-    src = fetchFromGitHub {
-      owner = "foxyseta";
-      repo = "tree-sitter-prolog";
-      rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
-      hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
-    };
-    location = "grammars/problog";
-    meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
-  };
-  prolog = buildGrammar {
-    language = "prolog";
-    version = "0.0.0+rev=d8d415f";
-    src = fetchFromGitHub {
-      owner = "foxyseta";
-      repo = "tree-sitter-prolog";
-      rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
-      hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
-    };
-    location = "grammars/prolog";
-    meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
-  };
-  promql = buildGrammar {
-    language = "promql";
-    version = "0.0.0+rev=77625d7";
-    src = fetchFromGitHub {
-      owner = "MichaHoffmann";
-      repo = "tree-sitter-promql";
-      rev = "77625d78eebc3ffc44d114a07b2f348dff3061b0";
-      hash = "sha256-IJbnC03pDfcSAF//Ux+LqqfjtagGSD5Nu46yUo0vT5Q=";
-    };
-    meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql";
-  };
-  properties = buildGrammar {
-    language = "properties";
-    version = "0.0.0+rev=6310671";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-properties";
-      rev = "6310671b24d4e04b803577b1c675d765cbd5773b";
-      hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
-  };
-  proto = buildGrammar {
-    language = "proto";
-    version = "0.0.0+rev=e9f6b43";
-    src = fetchFromGitHub {
-      owner = "treywood";
-      repo = "tree-sitter-proto";
-      rev = "e9f6b43f6844bd2189b50a422d4e2094313f6aa3";
-      hash = "sha256-Ue6w6HWy+NTJt+AKTFfJIUf3HXHTwkUkDk4UdDMSD+U=";
-    };
-    meta.homepage = "https://github.com/treywood/tree-sitter-proto";
-  };
-  prql = buildGrammar {
-    language = "prql";
-    version = "0.0.0+rev=09e158c";
-    src = fetchFromGitHub {
-      owner = "PRQL";
-      repo = "tree-sitter-prql";
-      rev = "09e158cd3650581c0af4c49c2e5b10c4834c8646";
-      hash = "sha256-bdT7LZ2x7BdUqLJRq4ENJTaIFnciac7l2dCxOSB09CI=";
-    };
-    meta.homepage = "https://github.com/PRQL/tree-sitter-prql";
-  };
-  psv = buildGrammar {
-    language = "psv";
-    version = "0.0.0+rev=f6bf6e3";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-csv";
-      rev = "f6bf6e35eb0b95fbadea4bb39cb9709507fcb181";
-      hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o=";
-    };
-    location = "psv";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv";
-  };
-  pug = buildGrammar {
-    language = "pug";
-    version = "0.0.0+rev=13e9195";
-    src = fetchFromGitHub {
-      owner = "zealot128";
-      repo = "tree-sitter-pug";
-      rev = "13e9195370172c86a8b88184cc358b23b677cc46";
-      hash = "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=";
-    };
-    meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
-  };
-  puppet = buildGrammar {
-    language = "puppet";
-    version = "0.0.0+rev=15f1929";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-puppet";
-      rev = "15f192929b7d317f5914de2b4accd37b349182a6";
-      hash = "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-puppet";
-  };
-  purescript = buildGrammar {
-    language = "purescript";
-    version = "0.0.0+rev=603daa9";
-    src = fetchFromGitHub {
-      owner = "postsolar";
-      repo = "tree-sitter-purescript";
-      rev = "603daa9178bcef3386b3040d86435794965fc6f2";
-      hash = "sha256-hOY2TfG+rAZyjm3PxXvF/Z3kEpIC2yZctk9YvWfG8wg=";
-    };
-    meta.homepage = "https://github.com/postsolar/tree-sitter-purescript";
-  };
-  pymanifest = buildGrammar {
-    language = "pymanifest";
-    version = "0.0.0+rev=debbdb8";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-pymanifest";
-      rev = "debbdb83fe6356adc7261c41c69b45ba49c97294";
-      hash = "sha256-jaWi0F9ApUSwniN3O7x05VrCceL+0x2+98iJx9+PaZo=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pymanifest";
-  };
-  python = buildGrammar {
-    language = "python";
-    version = "0.0.0+rev=710796b";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-python";
-      rev = "710796b8b877a970297106e5bbc8e2afa47f86ec";
-      hash = "sha256-t9etfZcrliF7f9hfiomh2U9P+3ufAm8iSK1y9rOhP7s=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
-  };
-  ql = buildGrammar {
-    language = "ql";
-    version = "0.0.0+rev=1fd627a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-ql";
-      rev = "1fd627a4e8bff8c24c11987474bd33112bead857";
-      hash = "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql";
-  };
-  qmldir = buildGrammar {
-    language = "qmldir";
-    version = "0.0.0+rev=6b2b5e4";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-qmldir";
-      rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841";
-      hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-qmldir";
-  };
-  qmljs = buildGrammar {
-    language = "qmljs";
-    version = "0.0.0+rev=0bec435";
-    src = fetchFromGitHub {
-      owner = "yuja";
-      repo = "tree-sitter-qmljs";
-      rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59";
-      hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g=";
-    };
-    meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";
-  };
-  query = buildGrammar {
-    language = "query";
-    version = "0.0.0+rev=a225e21";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-query";
-      rev = "a225e21d81201be77da58de614e2b7851735677a";
-      hash = "sha256-0y8TbbZKMstjIVFEtq+9Fz44ueRup0ngNcJPJEQB/NQ=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query";
-  };
-  r = buildGrammar {
-    language = "r";
-    version = "0.0.0+rev=0e6ef77";
-    src = fetchFromGitHub {
-      owner = "r-lib";
-      repo = "tree-sitter-r";
-      rev = "0e6ef7741712c09dc3ee6e81c42e919820cc65ef";
-      hash = "sha256-9T0wjo8i34rvR1g4WBpDFQXQodyv4kNomayGBZK9hfg=";
-    };
-    meta.homepage = "https://github.com/r-lib/tree-sitter-r";
-  };
-  racket = buildGrammar {
-    language = "racket";
-    version = "0.0.0+rev=130e765";
-    src = fetchFromGitHub {
-      owner = "6cdh";
-      repo = "tree-sitter-racket";
-      rev = "130e76536bd3a45df7b7fd71cfa3d0df25fcfe8e";
-      hash = "sha256-PbBNNIGUapdZH8rWNzfN+LZDJAMUn4n5ZsuyF9PVCnE=";
-    };
-    meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
-  };
-  ralph = buildGrammar {
-    language = "ralph";
-    version = "0.0.0+rev=f6d81bf";
-    src = fetchFromGitHub {
-      owner = "alephium";
-      repo = "tree-sitter-ralph";
-      rev = "f6d81bf7a4599c77388035439cf5801cd461ff77";
-      hash = "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA=";
-    };
-    meta.homepage = "https://github.com/alephium/tree-sitter-ralph";
-  };
-  rasi = buildGrammar {
-    language = "rasi";
-    version = "0.0.0+rev=e735c68";
-    src = fetchFromGitHub {
-      owner = "Fymyte";
-      repo = "tree-sitter-rasi";
-      rev = "e735c6881d8b475aaa4ef8f0a2bdfd825b438143";
-      hash = "sha256-MERNUroM1ndV6TtXYGg0AmXRtNlNWphVx32TzgMUnac=";
-    };
-    meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi";
-  };
-  razor = buildGrammar {
-    language = "razor";
-    version = "0.0.0+rev=fe46ce5";
-    src = fetchFromGitHub {
-      owner = "tris203";
-      repo = "tree-sitter-razor";
-      rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
-      hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
-    };
-    meta.homepage = "https://github.com/tris203/tree-sitter-razor";
-  };
-  rbs = buildGrammar {
-    language = "rbs";
-    version = "0.0.0+rev=5282e2f";
-    src = fetchFromGitHub {
-      owner = "joker1007";
-      repo = "tree-sitter-rbs";
-      rev = "5282e2f36d4109f5315c1d9486b5b0c2044622bb";
-      hash = "sha256-GE5cW1Nf7S8u5vAGcBZBzfM7mC7yXVR/Tp7hlhmkelA=";
-    };
-    meta.homepage = "https://github.com/joker1007/tree-sitter-rbs";
-  };
-  re2c = buildGrammar {
-    language = "re2c";
-    version = "0.0.0+rev=c18a3c2";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-re2c";
-      rev = "c18a3c2f4b6665e35b7e50d6048ea3cff770c572";
-      hash = "sha256-2htX4730fNAO2NKEurDOXH1OIXFd0OfuIbH1ou3a20A=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-re2c";
-  };
-  readline = buildGrammar {
-    language = "readline";
-    version = "0.0.0+rev=6b744c5";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-readline";
-      rev = "6b744c527aebd12e46a5ecb3aebdb8d621a8e83e";
-      hash = "sha256-j4rqW1H32KfEPRByHQqtL5j5GSklTDFgOQ9ST+hmv1w=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-readline";
-  };
-  regex = buildGrammar {
-    language = "regex";
-    version = "0.0.0+rev=b2ac15e";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-regex";
-      rev = "b2ac15e27fce703d2f37a79ccd94a5c0cbe9720b";
-      hash = "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
-  };
-  rego = buildGrammar {
-    language = "rego";
-    version = "0.0.0+rev=20b5a59";
-    src = fetchFromGitHub {
-      owner = "FallenAngel97";
-      repo = "tree-sitter-rego";
-      rev = "20b5a5958c837bc9f74b231022a68a594a313f6d";
-      hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=";
-    };
-    meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego";
-  };
-  requirements = buildGrammar {
-    language = "requirements";
-    version = "0.0.0+rev=caeb2ba";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-requirements";
-      rev = "caeb2ba854dea55931f76034978de1fd79362939";
-      hash = "sha256-YszXgZZSMiWBf2vIij8+5GA1FY3Ipeoow8dkrzkLl78=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-requirements";
-  };
-  rescript = buildGrammar {
-    language = "rescript";
-    version = "0.0.0+rev=d2df8a2";
-    src = fetchFromGitHub {
-      owner = "rescript-lang";
-      repo = "tree-sitter-rescript";
-      rev = "d2df8a285fff95de56a91d2f8152aeceb66f40ef";
-      hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0=";
-    };
-    meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
-  };
-  rifleconf = buildGrammar {
-    language = "rifleconf";
-    version = "0.0.0+rev=fe10eab";
-    src = fetchFromGitHub {
-      owner = "purarue";
-      repo = "tree-sitter-rifleconf";
-      rev = "fe10eab6cacff239ec61f4456e793bed15703aaf";
-      hash = "sha256-FeKu9HfGeAaQ+wfMPfic9qA870M+Cg592RY4G5HP//M=";
-    };
-    meta.homepage = "https://github.com/purarue/tree-sitter-rifleconf";
-  };
-  rnoweb = buildGrammar {
-    language = "rnoweb";
-    version = "0.0.0+rev=1a74dc0";
-    src = fetchFromGitHub {
-      owner = "bamonroe";
-      repo = "tree-sitter-rnoweb";
-      rev = "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f";
-      hash = "sha256-sCjSS6iunij2SXHNzQcTq0HKawH9i5h/vQ6yl77opXw=";
-    };
-    meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
-  };
-  robot = buildGrammar {
-    language = "robot";
-    version = "0.0.0+rev=e34def7";
-    src = fetchFromGitHub {
-      owner = "Hubro";
-      repo = "tree-sitter-robot";
-      rev = "e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a";
-      hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0=";
-    };
-    meta.homepage = "https://github.com/Hubro/tree-sitter-robot";
-  };
-  robots = buildGrammar {
-    language = "robots";
-    version = "0.0.0+rev=8e3a420";
-    src = fetchFromGitHub {
-      owner = "opa-oz";
-      repo = "tree-sitter-robots-txt";
-      rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62";
-      hash = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME=";
-    };
-    meta.homepage = "https://github.com/opa-oz/tree-sitter-robots-txt";
-  };
-  roc = buildGrammar {
-    language = "roc";
-    version = "0.0.0+rev=40e52f3";
-    src = fetchFromGitHub {
-      owner = "faldor20";
-      repo = "tree-sitter-roc";
-      rev = "40e52f343f1b1f270d6ecb2ca898ca9b8cba6936";
-      hash = "sha256-TugDNG21Y4VutMvqQJ6iEyozqcFIdFPDbpV87hqymdM=";
-    };
-    meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
-  };
-  ron = buildGrammar {
-    language = "ron";
-    version = "0.0.0+rev=7893855";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-ron";
-      rev = "78938553b93075e638035f624973083451b29055";
-      hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ron";
-  };
-  rst = buildGrammar {
-    language = "rst";
-    version = "0.0.0+rev=4e562e1";
-    src = fetchFromGitHub {
-      owner = "stsewd";
-      repo = "tree-sitter-rst";
-      rev = "4e562e1598b95b93db4f3f64fe40ddefbc677a15";
-      hash = "sha256-C65FmrEUyMQN+rF3RTN1oNVJtGiTHMZvdRyy/tMjVqY=";
-    };
-    meta.homepage = "https://github.com/stsewd/tree-sitter-rst";
-  };
-  ruby = buildGrammar {
-    language = "ruby";
-    version = "0.0.0+rev=89bd7a8";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-ruby";
-      rev = "89bd7a8e5450cb6a942418a619d30469f259e5d6";
-      hash = "sha256-84Nqw6QyGqwKAT+7Cdrzl1SikfJ3doX3tngGZWaXkVc=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
-  };
-  runescript = buildGrammar {
-    language = "runescript";
-    version = "0.0.0+rev=cf85bbd";
-    src = fetchFromGitHub {
-      owner = "2004Scape";
-      repo = "tree-sitter-runescript";
-      rev = "cf85bbd5da0c5ad243301d889c7f84d790a4cae4";
-      hash = "sha256-LRHTy5XMU2FOru7YrFlwuDU7brtnI/8RhAdQnY7Fkpk=";
-    };
-    meta.homepage = "https://github.com/2004Scape/tree-sitter-runescript";
-  };
-  rust = buildGrammar {
-    language = "rust";
-    version = "0.0.0+rev=261b202";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-rust";
-      rev = "261b20226c04ef601adbdf185a800512a5f66291";
-      hash = "sha256-i6OrbcHNkrsAW5cpYOI7r0F6xn94KZWB9ZJMUH+k2ds=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
-  };
-  scala = buildGrammar {
-    language = "scala";
-    version = "0.0.0+rev=97aead1";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-scala";
-      rev = "97aead18d97708190a51d4f551ea9b05b60641c9";
-      hash = "sha256-INJKij5XzeIkmdemTbrkucdUo9PJOrHKf4rcf6s9OSw=";
-    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
-  };
-  scfg = buildGrammar {
-    language = "scfg";
-    version = "0.0.0+rev=d850fd4";
-    src = fetchFromGitHub {
-      owner = "rockorager";
-      repo = "tree-sitter-scfg";
-      rev = "d850fd470445d73de318a21d734d1e09e29b773c";
-      hash = "sha256-AnyOcQFA3N6AFZiG7eLS1xCm1qX6hko9lFV4oV9p/E8=";
-    };
-    meta.homepage = "https://github.com/rockorager/tree-sitter-scfg";
-  };
-  scheme = buildGrammar {
-    language = "scheme";
-    version = "0.0.0+rev=591893b";
-    src = fetchFromGitHub {
-      owner = "6cdh";
-      repo = "tree-sitter-scheme";
-      rev = "591893b9a8b9ec85f5cef86e0cc1028012ad9f0e";
-      hash = "sha256-kmrLTryeUzs4nePGR13DQjRmQTmHHglsugYlvLZP/4k=";
-    };
-    meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
-  };
-  scss = buildGrammar {
-    language = "scss";
-    version = "0.0.0+rev=c478c68";
-    src = fetchFromGitHub {
-      owner = "serenadeai";
-      repo = "tree-sitter-scss";
-      rev = "c478c6868648eff49eb04a4df90d703dc45b312a";
-      hash = "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=";
-    };
-    meta.homepage = "https://github.com/serenadeai/tree-sitter-scss";
-  };
-  sflog = buildGrammar {
-    language = "sflog";
-    version = "0.0.0+rev=3597575";
-    src = fetchFromGitHub {
-      owner = "aheber";
-      repo = "tree-sitter-sfapex";
-      rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
-      hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
-    };
-    location = "sflog";
-    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
-  };
-  slang = buildGrammar {
-    language = "slang";
-    version = "0.0.0+rev=1dbcc4a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-slang";
-      rev = "1dbcc4abc7b3cdd663eb03d93031167d6ed19f56";
-      hash = "sha256-UsZpXEJwbKn5M9dqbAv5eJgsCdNbsllbFWtNnDPvtoE=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-slang";
-  };
-  slim = buildGrammar {
-    language = "slim";
-    version = "0.0.0+rev=a06113f";
-    src = fetchFromGitHub {
-      owner = "theoo";
-      repo = "tree-sitter-slim";
-      rev = "a06113f5175b805a37d20df0a6f9d722e0ab6cfe";
-      hash = "sha256-Uk0AltQNhVd3VHQYRN+gJWd7tnVYr7qzBce6yEdtVaw=";
-    };
-    meta.homepage = "https://github.com/theoo/tree-sitter-slim";
-  };
-  slint = buildGrammar {
-    language = "slint";
-    version = "0.0.0+rev=f2e4e5a";
-    src = fetchFromGitHub {
-      owner = "slint-ui";
-      repo = "tree-sitter-slint";
-      rev = "f2e4e5a7bccb177562de8f5b4fe49a5531c9f7ca";
-      hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
-    };
-    meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
-  };
-  smali = buildGrammar {
-    language = "smali";
-    version = "0.0.0+rev=fdfa6a1";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-smali";
-      rev = "fdfa6a1febc43c7467aa7e937b87b607956f2346";
-      hash = "sha256-S0U6Xuntz16DrpYwSqMQu8Cu7UuD/JufHUxIHv826yw=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-smali";
-  };
-  smithy = buildGrammar {
-    language = "smithy";
-    version = "0.0.0+rev=ec4fe14";
-    src = fetchFromGitHub {
-      owner = "indoorvivants";
-      repo = "tree-sitter-smithy";
-      rev = "ec4fe14586f2b0a1bc65d6db17f8d8acd8a90433";
-      hash = "sha256-wEm4HSfeZOpn1OKw7ipLhoeNko8aPKDl2abupdQq+ok=";
-    };
-    meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy";
-  };
-  snakemake = buildGrammar {
-    language = "snakemake";
-    version = "0.0.0+rev=7731408";
-    src = fetchFromGitHub {
-      owner = "osthomas";
-      repo = "tree-sitter-snakemake";
-      rev = "7731408e5e8095fe242fdd423c3d3ae886fbf9fd";
-      hash = "sha256-/XeO9/4rTLLicDRWWlUoAhCr+2AyjlQLszBmeQ/8wZY=";
-    };
-    meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake";
-  };
-  snl = buildGrammar {
-    language = "snl";
-    version = "0.0.0+rev=846e2d6";
-    src = fetchFromGitHub {
-      owner = "minijackson";
-      repo = "tree-sitter-snl";
-      rev = "846e2d6809ac5863a15b5494f20fd267c21221c8";
-      hash = "sha256-QJG4+fJieOivjwsJuswzzigeUiFNIOu51ILgx0/o6Vo=";
-    };
-    meta.homepage = "https://github.com/minijackson/tree-sitter-snl";
-  };
-  solidity = buildGrammar {
-    language = "solidity";
-    version = "0.0.0+rev=4e938a4";
-    src = fetchFromGitHub {
-      owner = "JoranHonig";
-      repo = "tree-sitter-solidity";
-      rev = "4e938a46c7030dd001bc99e1ac0f0c750ac98254";
-      hash = "sha256-b+DHy7BkkMg88kLhirtCzjF3dHlCFkXea65aGC18fW0=";
-    };
-    meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
-  };
-  soql = buildGrammar {
-    language = "soql";
-    version = "0.0.0+rev=3597575";
-    src = fetchFromGitHub {
-      owner = "aheber";
-      repo = "tree-sitter-sfapex";
-      rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
-      hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
-    };
-    location = "soql";
-    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
-  };
-  sosl = buildGrammar {
-    language = "sosl";
-    version = "0.0.0+rev=3597575";
-    src = fetchFromGitHub {
-      owner = "aheber";
-      repo = "tree-sitter-sfapex";
-      rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
-      hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
-    };
-    location = "sosl";
-    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
-  };
-  sourcepawn = buildGrammar {
-    language = "sourcepawn";
-    version = "0.0.0+rev=5a8fdd4";
-    src = fetchFromGitHub {
-      owner = "nilshelmig";
-      repo = "tree-sitter-sourcepawn";
-      rev = "5a8fdd446b516c81e218245c12129c6ad4bccfa2";
-      hash = "sha256-TfLCG2Ro3QnGStyCNqHwO54HQMR2fEOV6FjBv+0LjJ0=";
-    };
-    meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn";
-  };
-  sparql = buildGrammar {
-    language = "sparql";
-    version = "0.0.0+rev=1ef52d3";
-    src = fetchFromGitHub {
-      owner = "GordianDziwis";
-      repo = "tree-sitter-sparql";
-      rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
-      hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";
-    };
-    meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql";
-  };
-  sproto = buildGrammar {
-    language = "sproto";
-    version = "0.0.0+rev=d554c14";
-    src = fetchFromGitHub {
-      owner = "hanxi";
-      repo = "tree-sitter-sproto";
-      rev = "d554c1456e35e7b2690552d52921c987d0cf6799";
-      hash = "sha256-acc5Si2l9WGBlM1piSiqY/JEj+LSJ0QoZf9cfbrjhq4=";
-    };
-    meta.homepage = "https://github.com/hanxi/tree-sitter-sproto";
-  };
-  sql = buildGrammar {
-    language = "sql";
-    version = "0.0.0+rev=0a3d963";
-    src = fetchFromGitHub {
-      owner = "derekstride";
-      repo = "tree-sitter-sql";
-      rev = "0a3d963f48bf34d2765301f92ea525b4c5103696";
-      hash = "sha256-dzLpjJgMM+3Y38sOhXSI44SnU2+4j0R3S36DlRwqQfA=";
-    };
-    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
-  };
-  squirrel = buildGrammar {
-    language = "squirrel";
-    version = "0.0.0+rev=072c969";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-squirrel";
-      rev = "072c969749e66f000dba35a33c387650e203e96e";
-      hash = "sha256-tJBmxTD4hi9zxXMEuAX+uslo45zEawh09+tgv56s/AU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-squirrel";
-  };
-  ssh_config = buildGrammar {
-    language = "ssh_config";
-    version = "0.0.0+rev=71d2693";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-ssh-config";
-      rev = "71d2693deadaca8cdc09e38ba41d2f6042da1616";
-      hash = "sha256-LvdvnzpqjuVAf5DZmxYfELV3C+U1iJuG9B+UCQD47qo=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ssh-config";
-  };
-  starlark = buildGrammar {
-    language = "starlark";
-    version = "0.0.0+rev=a453dbf";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-starlark";
-      rev = "a453dbf3ba433db0e5ec621a38a7e59d72e4dc69";
-      hash = "sha256-iBchBq9NE4QqHc8MbWs4YgzUH6EB0W7RCIk07I6Zm+I=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-starlark";
-  };
-  strace = buildGrammar {
-    language = "strace";
-    version = "0.0.0+rev=d819cdd";
-    src = fetchFromGitHub {
-      owner = "sigmaSd";
-      repo = "tree-sitter-strace";
-      rev = "d819cdd5dbe455bd3c859193633c8d91c0df7c36";
-      hash = "sha256-u2LznohljEq7WEoVbwr1ZyV+qbchDuoktJFCeh4iePg=";
-    };
-    meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace";
-  };
-  styled = buildGrammar {
-    language = "styled";
-    version = "0.0.0+rev=319cdca";
-    src = fetchFromGitHub {
-      owner = "mskelton";
-      repo = "tree-sitter-styled";
-      rev = "319cdcaa0346ba6db668a222d938e5c3569e2a51";
-      hash = "sha256-sKRSgN5mSF+uolWD6iKrCR83Ssroytr8ZGduTTyyxGQ=";
-    };
-    meta.homepage = "https://github.com/mskelton/tree-sitter-styled";
-  };
-  supercollider = buildGrammar {
-    language = "supercollider";
-    version = "0.0.0+rev=76b3cab";
-    src = fetchFromGitHub {
-      owner = "madskjeldgaard";
-      repo = "tree-sitter-supercollider";
-      rev = "76b3cab1773f08bb7d3a185420b0a44c6da8c294";
-      hash = "sha256-drn1S4gNm6fOSUTCa/CrAqCWoUn16y1hpaZBCPpyaNE=";
-    };
-    meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider";
-  };
-  superhtml = buildGrammar {
-    language = "superhtml";
-    version = "0.0.0+rev=8b5bb27";
-    src = fetchFromGitHub {
-      owner = "kristoff-it";
-      repo = "superhtml";
-      rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902";
-      hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A=";
-    };
-    location = "tree-sitter-superhtml";
-    meta.homepage = "https://github.com/kristoff-it/superhtml";
-  };
-  surface = buildGrammar {
-    language = "surface";
-    version = "0.0.0+rev=f4586b3";
-    src = fetchFromGitHub {
-      owner = "connorlay";
-      repo = "tree-sitter-surface";
-      rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032";
-      hash = "sha256-Fn/pF8yvU+Ll7WmoMHnEcNxb3dsfNhuKhXA1UgXeviA=";
-    };
-    meta.homepage = "https://github.com/connorlay/tree-sitter-surface";
-  };
-  svelte = buildGrammar {
-    language = "svelte";
-    version = "0.0.0+rev=ae5199d";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-svelte";
-      rev = "ae5199db47757f785e43a14b332118a5474de1a2";
-      hash = "sha256-cH9h7i6MImw7KlcuVQ6XVKNjd9dFjo93J1JdTWmEpV4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte";
-  };
-  sway = buildGrammar {
-    language = "sway";
-    version = "0.0.0+rev=9b7845c";
-    src = fetchFromGitHub {
-      owner = "FuelLabs";
-      repo = "tree-sitter-sway";
-      rev = "9b7845ce06ecb38b040c3940970b4fd0adc331d1";
-      hash = "sha256-+BRw4OFQb7FljdKCj5mruK0L9wsZ+1UDTykVLS9wjoY=";
-    };
-    meta.homepage = "https://github.com/FuelLabs/tree-sitter-sway.git";
-  };
-  swift = buildGrammar {
-    language = "swift";
-    version = "0.0.0+rev=99a5241";
-    src = fetchFromGitHub {
-      owner = "alex-pinkus";
-      repo = "tree-sitter-swift";
-      rev = "99a5241ceac351a4af57bcc3571cef5064bde0a3";
-      hash = "sha256-JmOIzQ1xRTvttscPXjzDDWjFV0+4R1MusGlQCz11Ydo=";
-    };
-    generate = true;
-    meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
-  };
-  sxhkdrc = buildGrammar {
-    language = "sxhkdrc";
-    version = "0.0.0+rev=440d5f9";
-    src = fetchFromGitHub {
-      owner = "RaafatTurki";
-      repo = "tree-sitter-sxhkdrc";
-      rev = "440d5f913d9465c9c776a1bd92334d32febcf065";
-      hash = "sha256-AGhGYomrMe6Wj+EHLQT4v0BiU4jxhxXpVQkU2xU/1ZI=";
-    };
-    meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc";
-  };
-  systemtap = buildGrammar {
-    language = "systemtap";
-    version = "0.0.0+rev=f2b378a";
-    src = fetchFromGitHub {
-      owner = "ok-ryoko";
-      repo = "tree-sitter-systemtap";
-      rev = "f2b378a9af0b7e1192cff67a5fb45508c927205d";
-      hash = "sha256-HzV6RZMTSa41Q5hMiM1FwiHLbho62fuywtKzqrwjNDQ=";
-    };
-    meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap";
-  };
-  systemverilog = buildGrammar {
-    language = "systemverilog";
-    version = "0.0.0+rev=7c4b01b";
-    src = fetchFromGitHub {
-      owner = "gmlarumbe";
-      repo = "tree-sitter-systemverilog";
-      rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2";
-      hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc=";
-    };
-    meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
-  };
-  t32 = buildGrammar {
-    language = "t32";
-    version = "0.0.0+rev=2f604ad";
-    src = fetchFromGitHub {
-      owner = "xasc";
-      repo = "tree-sitter-t32";
-      rev = "2f604ad17a15c09d99648199da7f173eed8250dc";
-      hash = "sha256-9J8wy/7qW4vWsIzpDI+lVWr/6158jrod0nSk3ihXUPI=";
-    };
-    meta.homepage = "https://github.com/xasc/tree-sitter-t32";
-  };
-  tablegen = buildGrammar {
-    language = "tablegen";
-    version = "0.0.0+rev=b117088";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-tablegen";
-      rev = "b1170880c61355aaf38fc06f4af7d3c55abdabc4";
-      hash = "sha256-uJCn2RdTnOf/guBUhfodgQ8pMshNh+xUJZunoLwNgrM=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tablegen";
-  };
-  tact = buildGrammar {
-    language = "tact";
-    version = "0.0.0+rev=a6267c2";
-    src = fetchFromGitHub {
-      owner = "tact-lang";
-      repo = "tree-sitter-tact";
-      rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad";
-      hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM=";
-    };
-    meta.homepage = "https://github.com/tact-lang/tree-sitter-tact";
-  };
-  tcl = buildGrammar {
-    language = "tcl";
-    version = "0.0.0+rev=f15e711";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-tcl";
-      rev = "f15e711167661d1ba541d4f62b9dbfc4ce61ec56";
-      hash = "sha256-173xUAc2/LMDQSTEM3l3R4UuF/R5fdUyhEpXv6Eh02s=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl";
-  };
-  teal = buildGrammar {
-    language = "teal";
-    version = "0.0.0+rev=05d276e";
-    src = fetchFromGitHub {
-      owner = "euclidianAce";
-      repo = "tree-sitter-teal";
-      rev = "05d276e737055e6f77a21335b7573c9d3c091e2f";
-      hash = "sha256-JDqWr895Ob1Jn3Kf44xbkMJqyna0AiMBU5xJpA6ZP7w=";
-    };
-    generate = true;
-    meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
-  };
-  templ = buildGrammar {
-    language = "templ";
-    version = "0.0.0+rev=3057cd4";
-    src = fetchFromGitHub {
-      owner = "vrischmann";
-      repo = "tree-sitter-templ";
-      rev = "3057cd485f7f23a8ad24107c6adc604f8c5ce3db";
-      hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0=";
-    };
-    meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
-  };
-  tera = buildGrammar {
-    language = "tera";
-    version = "0.0.0+rev=692937d";
-    src = fetchFromGitHub {
-      owner = "uncenter";
-      repo = "tree-sitter-tera";
-      rev = "692937d52c8dfd91ce0dde722b9b4febbc9bc712";
-      hash = "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=";
-    };
-    meta.homepage = "https://github.com/uncenter/tree-sitter-tera";
-  };
-  terraform = buildGrammar {
-    language = "terraform";
-    version = "0.0.0+rev=fad9918";
-    src = fetchFromGitHub {
-      owner = "MichaHoffmann";
-      repo = "tree-sitter-hcl";
-      rev = "fad991865fee927dd1de5e172fb3f08ac674d914";
-      hash = "sha256-Kq0KtkF6xtZcN2s8KzYGyguJH2iOTlA2WRytZ+KGTUE=";
-    };
-    location = "dialects/terraform";
-    meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
-  };
-  textproto = buildGrammar {
-    language = "textproto";
-    version = "0.0.0+rev=568471b";
-    src = fetchFromGitHub {
-      owner = "PorterAtGoogle";
-      repo = "tree-sitter-textproto";
-      rev = "568471b80fd8793d37ed01865d8c2208a9fefd1b";
-      hash = "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ=";
-    };
-    meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto";
-  };
-  thrift = buildGrammar {
-    language = "thrift";
-    version = "0.0.0+rev=68fd0d8";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-thrift";
-      rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf";
-      hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-thrift";
-  };
-  tiger = buildGrammar {
-    language = "tiger";
-    version = "0.0.0+rev=4a77b2d";
-    src = fetchFromGitHub {
-      owner = "ambroisie";
-      repo = "tree-sitter-tiger";
-      rev = "4a77b2d7a004587646bddc4e854779044b6db459";
-      hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=";
-    };
-    meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger";
-  };
-  tlaplus = buildGrammar {
-    language = "tlaplus";
-    version = "0.0.0+rev=2d83194";
-    src = fetchFromGitHub {
-      owner = "tlaplus-community";
-      repo = "tree-sitter-tlaplus";
-      rev = "2d831940c782850f64dabf5b7b17e9e51f7f0ebb";
-      hash = "sha256-AW22SNBF6Y2jD6ROwE3vANWGX08HqR0XjVkthAL+QJs=";
-    };
-    meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
-  };
-  tmux = buildGrammar {
-    language = "tmux";
-    version = "0.0.0+rev=0252ecd";
-    src = fetchFromGitHub {
-      owner = "Freed-Wu";
-      repo = "tree-sitter-tmux";
-      rev = "0252ecd080016e45e6305ef1a943388f5ae2f4b4";
-      hash = "sha256-8f78qYxqoiOAnl3HzEbF4Rci3rFy0SnELoU+QP7pUlk=";
-    };
-    meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux";
-  };
-  todotxt = buildGrammar {
-    language = "todotxt";
-    version = "0.0.0+rev=3937c5c";
-    src = fetchFromGitHub {
-      owner = "arnarg";
-      repo = "tree-sitter-todotxt";
-      rev = "3937c5cd105ec4127448651a21aef45f52d19609";
-      hash = "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=";
-    };
-    meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt";
-  };
-  toml = buildGrammar {
-    language = "toml";
-    version = "0.0.0+rev=64b5683";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-toml";
-      rev = "64b56832c2cffe41758f28e05c756a3a98d16f41";
-      hash = "sha256-m9RlGkHiOL/PNENrdEPqtPlahSqGymsx7gZrCoN/Lsk=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-toml";
-  };
-  tsv = buildGrammar {
-    language = "tsv";
-    version = "0.0.0+rev=f6bf6e3";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-csv";
-      rev = "f6bf6e35eb0b95fbadea4bb39cb9709507fcb181";
-      hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o=";
-    };
-    location = "tsv";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv";
-  };
-  tsx = buildGrammar {
-    language = "tsx";
-    version = "0.0.0+rev=75b3874";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-typescript";
-      rev = "75b3874edb2dc714fb1fd77a32013d0f8699989f";
-      hash = "sha256-A0M6IBoY87ekSV4DfGHDU5zzFWdLjGqSyVr6VENgA+s=";
-    };
-    location = "tsx";
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
-  };
-  turtle = buildGrammar {
-    language = "turtle";
-    version = "0.0.0+rev=7f789ea";
-    src = fetchFromGitHub {
-      owner = "GordianDziwis";
-      repo = "tree-sitter-turtle";
-      rev = "7f789ea7ef765080f71a298fc96b7c957fa24422";
-      hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=";
-    };
-    meta.homepage = "https://github.com/GordianDziwis/tree-sitter-turtle";
-  };
-  twig = buildGrammar {
-    language = "twig";
-    version = "0.0.0+rev=7195ee5";
-    src = fetchFromGitHub {
-      owner = "gbprod";
-      repo = "tree-sitter-twig";
-      rev = "7195ee573ab5c3b3bb0e91b042e6f83ac1b11104";
-      hash = "sha256-wQ5pHFU35wqT3UxHIZ/cP8RPPX+mpGQCoBr9ilRfc4w=";
-    };
-    meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
-  };
-  typescript = buildGrammar {
-    language = "typescript";
-    version = "0.0.0+rev=75b3874";
-    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-typescript";
-      rev = "75b3874edb2dc714fb1fd77a32013d0f8699989f";
-      hash = "sha256-A0M6IBoY87ekSV4DfGHDU5zzFWdLjGqSyVr6VENgA+s=";
-    };
-    location = "typescript";
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
-  };
-  typespec = buildGrammar {
-    language = "typespec";
-    version = "0.0.0+rev=814c982";
-    src = fetchFromGitHub {
-      owner = "happenslol";
-      repo = "tree-sitter-typespec";
-      rev = "814c98283fd92a248ba9d49ebfe61bc672a35875";
-      hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c=";
-    };
-    meta.homepage = "https://github.com/happenslol/tree-sitter-typespec";
-  };
-  typoscript = buildGrammar {
-    language = "typoscript";
-    version = "0.0.0+rev=5d8fde8";
-    src = fetchFromGitHub {
-      owner = "Teddytrombone";
-      repo = "tree-sitter-typoscript";
-      rev = "5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f";
-      hash = "sha256-GysGb879dk5e1U6OO26q1gVAhkWxc/GRpkNN785ZoQw=";
-    };
-    meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
-  };
-  typst = buildGrammar {
-    language = "typst";
-    version = "0.0.0+rev=46cf4de";
-    src = fetchFromGitHub {
-      owner = "uben0";
-      repo = "tree-sitter-typst";
-      rev = "46cf4ded12ee974a70bf8457263b67ad7ee0379d";
-      hash = "sha256-s/9R3DKA6dix6BkU4mGXaVggE4bnzOyu20T1wuqHQxk=";
-    };
-    meta.homepage = "https://github.com/uben0/tree-sitter-typst";
-  };
-  udev = buildGrammar {
-    language = "udev";
-    version = "0.0.0+rev=2fcb563";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-udev";
-      rev = "2fcb563a4d56a6b8e8c129252325fc6335e4acbf";
-      hash = "sha256-EZwYyhMOPlQoeIRCbHOIfMaO5WEK6eKIVeC1NQgm+is=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-udev";
-  };
-  ungrammar = buildGrammar {
-    language = "ungrammar";
-    version = "0.0.0+rev=debd26f";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-ungrammar";
-      rev = "debd26fed283d80456ebafa33a06957b0c52e451";
-      hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ungrammar";
-  };
-  unison = buildGrammar {
-    language = "unison";
-    version = "0.0.0+rev=169e7f7";
-    src = fetchFromGitHub {
-      owner = "kylegoetz";
-      repo = "tree-sitter-unison";
-      rev = "169e7f748a540ec360c0cb086b448faad012caa4";
-      hash = "sha256-0HOLtLh1zRdaGQqchT5zFegWKJHkQe9r7DGKL6sSkPo=";
-    };
-    generate = true;
-    meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
-  };
-  usd = buildGrammar {
-    language = "usd";
-    version = "0.0.0+rev=4e0875f";
-    src = fetchFromGitHub {
-      owner = "ColinKennedy";
-      repo = "tree-sitter-usd";
-      rev = "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216";
-      hash = "sha256-r6Sm8FiTgxdYc5cAG5JXVtA5/2jID5H/xmKbjSYn/zI=";
-    };
-    meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd";
-  };
-  uxntal = buildGrammar {
-    language = "uxntal";
-    version = "0.0.0+rev=ad9b638";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-uxntal";
-      rev = "ad9b638b914095320de85d59c49ab271603af048";
-      hash = "sha256-hR0EaYv1++MJ0pdBl3ZtyEljitnp5hgFWQa9F6b1KE4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-uxntal";
-  };
-  v = buildGrammar {
-    language = "v";
-    version = "0.0.0+rev=236d51b";
-    src = fetchFromGitHub {
-      owner = "vlang";
-      repo = "v-analyzer";
-      rev = "236d51bba1bccd57fd2950956fbffe5fe0248735";
-      hash = "sha256-rw/8sPQPB4yfe+EPgMoyyRjuf8JjdNJGpo17/9w8JCs=";
-    };
-    location = "tree_sitter_v";
-    meta.homepage = "https://github.com/vlang/v-analyzer";
-  };
-  vala = buildGrammar {
-    language = "vala";
-    version = "0.0.0+rev=97e6db3";
-    src = fetchFromGitHub {
-      owner = "vala-lang";
-      repo = "tree-sitter-vala";
-      rev = "97e6db3c8c73b15a9541a458d8e797a07f588ef4";
-      hash = "sha256-hAekweZGDHVrWVd04RrN+9Jz0D2kode+DpceTlUXii0=";
-    };
-    meta.homepage = "https://github.com/vala-lang/tree-sitter-vala";
-  };
-  vento = buildGrammar {
-    language = "vento";
-    version = "0.0.0+rev=3b32474";
-    src = fetchFromGitHub {
-      owner = "ventojs";
-      repo = "tree-sitter-vento";
-      rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
-      hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
-    };
-    meta.homepage = "https://github.com/ventojs/tree-sitter-vento";
-  };
-  vhdl = buildGrammar {
-    language = "vhdl";
-    version = "0.0.0+rev=0c25aa0";
-    src = fetchFromGitHub {
-      owner = "jpt13653903";
-      repo = "tree-sitter-vhdl";
-      rev = "0c25aa064dc489ec5291e4879fa7ed41cf5fe680";
-      hash = "sha256-YE9qZsTFAW60MUeIG+d84IEtIMf5eFDp32Nd0/Hb7Kw=";
-    };
-    meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
-  };
-  vhs = buildGrammar {
-    language = "vhs";
-    version = "0.0.0+rev=0c6fae9";
-    src = fetchFromGitHub {
-      owner = "charmbracelet";
-      repo = "tree-sitter-vhs";
-      rev = "0c6fae9d2cfc5b217bfd1fe84a7678f5917116db";
-      hash = "sha256-o7Q/3wwiCjxO6hBfj1Wxoz2y6+wxLH+oCLiapox7+Hk=";
-    };
-    meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs";
-  };
-  vim = buildGrammar {
-    language = "vim";
-    version = "0.0.0+rev=3dd4747";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-vim";
-      rev = "3dd4747082d1b717b8978211c06ef7b6cd16125b";
-      hash = "sha256-HOf35dd+zcpXHxFuWjJ6ju/5UZzALe0fUPPuAWXUIHM=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim";
-  };
-  vimdoc = buildGrammar {
-    language = "vimdoc";
-    version = "0.0.0+rev=570dc10";
-    src = fetchFromGitHub {
-      owner = "neovim";
-      repo = "tree-sitter-vimdoc";
-      rev = "570dc10aed5963546322e6c935e1125b9fd747bf";
-      hash = "sha256-G5QkX4ZRjQ882tNsSBVEp64Ox3KmZq9C8Vsn0OLtdXg=";
-    };
-    meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
-  };
-  vrl = buildGrammar {
-    language = "vrl";
-    version = "0.0.0+rev=274b3ce";
-    src = fetchFromGitHub {
-      owner = "belltoy";
-      repo = "tree-sitter-vrl";
-      rev = "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba";
-      hash = "sha256-R+wuG8UkvGA11uTiiUAdzzgjRv1ik4W+qh3YwIREUd4=";
-    };
-    meta.homepage = "https://github.com/belltoy/tree-sitter-vrl";
-  };
-  vue = buildGrammar {
-    language = "vue";
-    version = "0.0.0+rev=22bdfa6";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-vue";
-      rev = "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff";
-      hash = "sha256-LnmUtJJpBIZPTJqrQQ7WI8V44hPw3yxR+j2jR0pHIdY=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vue";
-  };
-  wgsl = buildGrammar {
-    language = "wgsl";
-    version = "0.0.0+rev=40259f3";
-    src = fetchFromGitHub {
-      owner = "szebniok";
-      repo = "tree-sitter-wgsl";
-      rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65";
-      hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=";
-    };
-    meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl";
-  };
-  wgsl_bevy = buildGrammar {
-    language = "wgsl_bevy";
-    version = "0.0.0+rev=d9306a7";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-wgsl-bevy";
-      rev = "d9306a798ede627001a8e5752f775858c8edd7e4";
-      hash = "sha256-G92wC2BJXGl+eogbuiaSOLKss+5QTm9RFFRSc2Rgqzw=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy";
-  };
-  wing = buildGrammar {
-    language = "wing";
-    version = "0.0.0+rev=76e0c25";
-    src = fetchFromGitHub {
-      owner = "winglang";
-      repo = "tree-sitter-wing";
-      rev = "76e0c25844a66ebc6e866d690fcc5f4e90698947";
-      hash = "sha256-N16cZK1dERqFd1FR35AfrsBy5EeeOPSp0FaZ83pMt7I=";
-    };
-    meta.homepage = "https://github.com/winglang/tree-sitter-wing";
-  };
-  wit = buildGrammar {
-    language = "wit";
-    version = "0.0.0+rev=37bf43c";
-    src = fetchFromGitHub {
-      owner = "liamwh";
-      repo = "tree-sitter-wit";
-      rev = "37bf43c7f11d2b4af7a78d98a19e6d5c2cf04ad2";
-      hash = "sha256-8RRffYuw1wmtRgGGMIfzKnZPM4dKGd0h7A5oOVfEk1Y=";
-    };
-    meta.homepage = "https://github.com/liamwh/tree-sitter-wit";
-  };
-  wxml = buildGrammar {
-    language = "wxml";
-    version = "0.0.0+rev=7b821c7";
-    src = fetchFromGitHub {
-      owner = "BlockLune";
-      repo = "tree-sitter-wxml";
-      rev = "7b821c748dc410332f59496c0dea2632168c4e5a";
-      hash = "sha256-ZJeBKccEreak/Fs/Zi5E3m2S//s2R54KwFK3atoCvf0=";
-    };
-    meta.homepage = "https://github.com/BlockLune/tree-sitter-wxml";
-  };
-  xcompose = buildGrammar {
-    language = "xcompose";
-    version = "0.0.0+rev=a51d636";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-xcompose";
-      rev = "a51d6366f041dbefec4da39a7eb3168a9b1cbc0e";
-      hash = "sha256-3V+elXkVBk2aZnDy5Q/MDpBWEWb/mvjh2t2pnjnzgA0=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xcompose";
-  };
-  xml = buildGrammar {
-    language = "xml";
-    version = "0.0.0+rev=863dbc3";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-xml";
-      rev = "863dbc381f44f6c136a399e684383b977bb2beaa";
-      hash = "sha256-0ztP30xWqVWy5upWPp0JwhpQphOJufzlcYn+KvLejVs=";
-    };
-    location = "xml";
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
-  };
-  xresources = buildGrammar {
-    language = "xresources";
-    version = "0.0.0+rev=68240ae";
-    src = fetchFromGitHub {
-      owner = "ValdezFOmar";
-      repo = "tree-sitter-xresources";
-      rev = "68240ae1beef503cfe0d1bc40f25b0fab71df8f5";
-      hash = "sha256-lbgeR8Xc/Hsu6zimS9NIndeayMc4f3xZyhTgKdK2jVE=";
-    };
-    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
-  };
-  yaml = buildGrammar {
-    language = "yaml";
-    version = "0.0.0+rev=7708026";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-yaml";
-      rev = "7708026449bed86239b1cd5bce6e3c34dbca6415";
-      hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml";
-  };
-  yang = buildGrammar {
-    language = "yang";
-    version = "0.0.0+rev=2c0e6be";
-    src = fetchFromGitHub {
-      owner = "Hubro";
-      repo = "tree-sitter-yang";
-      rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502";
-      hash = "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8=";
-    };
-    meta.homepage = "https://github.com/Hubro/tree-sitter-yang";
-  };
-  yuck = buildGrammar {
-    language = "yuck";
-    version = "0.0.0+rev=e877f6a";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-yuck";
-      rev = "e877f6ade4b77d5ef8787075141053631ba12318";
-      hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck";
-  };
-  zathurarc = buildGrammar {
-    language = "zathurarc";
-    version = "0.0.0+rev=0554b4a";
-    src = fetchFromGitHub {
-      owner = "Freed-Wu";
-      repo = "tree-sitter-zathurarc";
-      rev = "0554b4a5d313244b7fc000cbb41c04afae4f4e31";
-      hash = "sha256-edwLcz1WlcRJOoV2Unpho8wmi7TmcpwysBOAdRKprNw=";
-    };
-    meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc";
-  };
-  zig = buildGrammar {
-    language = "zig";
-    version = "0.0.0+rev=6479aa1";
-    src = fetchFromGitHub {
-      owner = "tree-sitter-grammars";
-      repo = "tree-sitter-zig";
-      rev = "6479aa13f32f701c383083d8b28360ebd682fb7d";
-      hash = "sha256-T9Q6EhJ20tH5v1fUlnNA3UcdX52DMZE/PQjPWQtcHw0=";
-    };
-    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-zig";
-  };
-  ziggy = buildGrammar {
-    language = "ziggy";
-    version = "0.0.0+rev=4353b20";
-    src = fetchFromGitHub {
-      owner = "kristoff-it";
-      repo = "ziggy";
-      rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901";
-      hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4=";
-    };
-    location = "tree-sitter-ziggy";
-    meta.homepage = "https://github.com/kristoff-it/ziggy";
-  };
-  ziggy_schema = buildGrammar {
-    language = "ziggy_schema";
-    version = "0.0.0+rev=fe3bf93";
-    src = fetchFromGitHub {
-      owner = "kristoff-it";
-      repo = "ziggy";
-      rev = "fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647";
-      hash = "sha256-w2WO2N3+XJWhWnt9swOux2ynKxmePbB4VojXM8K5GAo=";
-    };
-    location = "tree-sitter-ziggy-schema";
-    meta.homepage = "https://github.com/kristoff-it/ziggy";
-  };
-  zsh = buildGrammar {
-    language = "zsh";
-    version = "0.0.0+rev=v0.48.0";
-    src = fetchFromGitHub {
-      owner = "georgeharker";
-      repo = "tree-sitter-zsh";
-      rev = "v0.48.0";
-      hash = "sha256-gBbT2xt32fKt54nh4Dp6EK6uUd63rsIEmmK4nr9Pg1Y=";
-    };
-    meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh";
+  parsers = {
+    ada = buildGrammar {
+      language = "ada";
+      version = "0.0.0+rev=6b58259";
+      src = fetchFromGitHub {
+        owner = "briot";
+        repo = "tree-sitter-ada";
+        rev = "6b58259a08b1a22ba0247a7ce30be384db618da6";
+        hash = "sha256-FAlSBpaHmKaz8qoJV/MZmD5yPkWFDE9RovpCMA9OWpI=";
+      };
+      meta.homepage = "https://github.com/briot/tree-sitter-ada";
+    };
+    agda = buildGrammar {
+      language = "agda";
+      version = "0.0.0+rev=e8d47a6";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-agda";
+        rev = "e8d47a6987effe34d5595baf321d82d3519a8527";
+        hash = "sha256-5h56+A7ZypckJ9mwht7XP/66oiehwAEQ4Z6WeVhQBvQ=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda";
+    };
+    angular = buildGrammar {
+      language = "angular";
+      version = "0.0.0+rev=3bd2036";
+      src = fetchFromGitHub {
+        owner = "dlvandenberg";
+        repo = "tree-sitter-angular";
+        rev = "3bd2036e710f609ea08fcfca5a1eb1169ecc114f";
+        hash = "sha256-VdfPZ39AEjvl+9r/LZNRGNIQsiTB9S065AnUc4MeohU=";
+      };
+      meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
+    };
+    apex = buildGrammar {
+      language = "apex";
+      version = "0.0.0+rev=3597575";
+      src = fetchFromGitHub {
+        owner = "aheber";
+        repo = "tree-sitter-sfapex";
+        rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
+        hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
+      };
+      location = "apex";
+      meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
+    };
+    arduino = buildGrammar {
+      language = "arduino";
+      version = "0.0.0+rev=53eb391";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-arduino";
+        rev = "53eb391da4c6c5857f8defa2c583c46c2594f565";
+        hash = "sha256-qQVUWCOZ4y9FTsIf0FI3vmYBhLYz4hcqRTo+5C2MYvc=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
+    };
+    asm = buildGrammar {
+      language = "asm";
+      version = "0.0.0+rev=839741f";
+      src = fetchFromGitHub {
+        owner = "RubixDev";
+        repo = "tree-sitter-asm";
+        rev = "839741fef4dab5128952334624905c82b40c7133";
+        hash = "sha256-AbMSSt3tTjyPe7ksNjBxxsqvdoKmIKymqzisUWrSTT0=";
+      };
+      meta.homepage = "https://github.com/RubixDev/tree-sitter-asm";
+    };
+    astro = buildGrammar {
+      language = "astro";
+      version = "0.0.0+rev=213f6e6";
+      src = fetchFromGitHub {
+        owner = "virchau13";
+        repo = "tree-sitter-astro";
+        rev = "213f6e6973d9b456c6e50e86f19f66877e7ef0ee";
+        hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE=";
+      };
+      meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
+    };
+    authzed = buildGrammar {
+      language = "authzed";
+      version = "0.0.0+rev=83e5c26";
+      src = fetchFromGitHub {
+        owner = "mleonidas";
+        repo = "tree-sitter-authzed";
+        rev = "83e5c26a8687eb4688fe91d690c735cc3d21ad81";
+        hash = "sha256-xJDueA0qydB2dsmnIKPBU6P+4mSDO3vAQehHuyZpq/I=";
+      };
+      meta.homepage = "https://github.com/mleonidas/tree-sitter-authzed";
+    };
+    awk = buildGrammar {
+      language = "awk";
+      version = "0.0.0+rev=34bbdc7";
+      src = fetchFromGitHub {
+        owner = "Beaglefoot";
+        repo = "tree-sitter-awk";
+        rev = "34bbdc7cce8e803096f47b625979e34c1be38127";
+        hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0=";
+      };
+      meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
+    };
+    bash = buildGrammar {
+      language = "bash";
+      version = "0.0.0+rev=a06c2e4";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-bash";
+        rev = "a06c2e4415e9bc0346c6b86d401879ffb44058f7";
+        hash = "sha256-ONQ1Ljk3aRWjElSWD2crCFZraZoRj3b3/VELz1789GE=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
+    };
+    bass = buildGrammar {
+      language = "bass";
+      version = "0.0.0+rev=28dc705";
+      src = fetchFromGitHub {
+        owner = "vito";
+        repo = "tree-sitter-bass";
+        rev = "28dc7059722be090d04cd751aed915b2fee2f89a";
+        hash = "sha256-NKu60BbTKLsYQRtfEoqGQUKERJFnmZNVJE6HBz/BRIM=";
+      };
+      meta.homepage = "https://github.com/vito/tree-sitter-bass";
+    };
+    beancount = buildGrammar {
+      language = "beancount";
+      version = "0.0.0+rev=b7a2557";
+      src = fetchFromGitHub {
+        owner = "polarmutex";
+        repo = "tree-sitter-beancount";
+        rev = "b7a2557e6c8cf1dc70a52cece1861522ad3903fc";
+        hash = "sha256-E8FPmskJr1OQ55w52FUi9zub7BTZ6neX3VHypjEyRek=";
+      };
+      meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
+    };
+    bibtex = buildGrammar {
+      language = "bibtex";
+      version = "0.0.0+rev=8d04ed2";
+      src = fetchFromGitHub {
+        owner = "latex-lsp";
+        repo = "tree-sitter-bibtex";
+        rev = "8d04ed27b3bc7929f14b7df9236797dab9f3fa66";
+        hash = "sha256-UOXGWm8k9YP0GUwvNEuIxeiXqJo4Jf9uBt+/oYaYUl4=";
+      };
+      meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex";
+    };
+    bicep = buildGrammar {
+      language = "bicep";
+      version = "0.0.0+rev=bff5988";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-bicep";
+        rev = "bff59884307c0ab009bd5e81afd9324b46a6c0f9";
+        hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-bicep";
+    };
+    bitbake = buildGrammar {
+      language = "bitbake";
+      version = "0.0.0+rev=a5d04fd";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-bitbake";
+        rev = "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b";
+        hash = "sha256-SzHFNIeR6ukWXKkLd2Trg9zuKLMwNAolXGPIDBDaFRg=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-bitbake";
+    };
+    blade = buildGrammar {
+      language = "blade";
+      version = "0.0.0+rev=cc764da";
+      src = fetchFromGitHub {
+        owner = "EmranMR";
+        repo = "tree-sitter-blade";
+        rev = "cc764dadcbbceb3f259396fef66f970c72e94f96";
+        hash = "sha256-3/gY68F+xOF5Fv6rK9cEIJCVDzg/3ap1/gzkEacGuy4=";
+      };
+      meta.homepage = "https://github.com/EmranMR/tree-sitter-blade";
+    };
+    bp = buildGrammar {
+      language = "bp";
+      version = "0.0.0+rev=ee641d1";
+      src = fetchFromGitHub {
+        owner = "ambroisie";
+        repo = "tree-sitter-bp";
+        rev = "ee641d15390183d7535777947ce0f2f1fbcee69f";
+        hash = "sha256-sCvz8Bf0nffSyis9rhppD/iCrlTyTLPAeH6WXg0N6+Y=";
+      };
+      meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
+    };
+    brightscript = buildGrammar {
+      language = "brightscript";
+      version = "0.0.0+rev=253fdfa";
+      src = fetchFromGitHub {
+        owner = "ajdelcimmuto";
+        repo = "tree-sitter-brightscript";
+        rev = "253fdfaa23814cb46c2d5fc19049fa0f2f62c6da";
+        hash = "sha256-aE8Of2shLliebuY9A/Sr4bjCm6At9fgDFyPaqMqpg/4=";
+      };
+      meta.homepage = "https://github.com/ajdelcimmuto/tree-sitter-brightscript";
+    };
+    c = buildGrammar {
+      language = "c";
+      version = "0.0.0+rev=ae19b67";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-c";
+        rev = "ae19b676b13bdcc13b7665397e6d9b14975473dd";
+        hash = "sha256-i40dlg12UNR3dUWtdlYLZKsusYUWzu+QgC2iedRk968=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
+    };
+    c3 = buildGrammar {
+      language = "c3";
+      version = "0.0.0+rev=6b4e912";
+      src = fetchFromGitHub {
+        owner = "c3lang";
+        repo = "tree-sitter-c3";
+        rev = "6b4e9127f90fa35d39f5314211bc5f7e304304bb";
+        hash = "sha256-fkCW4RNyWaXuIy7SDGxqeUU2SLbJ+b5Jv/CY1RYiAsY=";
+      };
+      meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
+    };
+    c_sharp = buildGrammar {
+      language = "c_sharp";
+      version = "0.0.0+rev=485f0ba";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-c-sharp";
+        rev = "485f0bae0274ac9114797fc10db6f7034e4086e3";
+        hash = "sha256-BRn23iueDJ+YwuPJ+ebOAhjoELQX1VOBFR/YbQDYhfQ=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
+    };
+    caddy = buildGrammar {
+      language = "caddy";
+      version = "0.0.0+rev=2686186";
+      src = fetchFromGitHub {
+        owner = "opa-oz";
+        repo = "tree-sitter-caddy";
+        rev = "2686186edb61be47960431c93a204fb249681360";
+        hash = "sha256-pKKx2qCqP/8JLhNebTogM24qzxh6bdX5i4mqGzTJKkw=";
+      };
+      meta.homepage = "https://github.com/opa-oz/tree-sitter-caddy";
+    };
+    cairo = buildGrammar {
+      language = "cairo";
+      version = "0.0.0+rev=6238f60";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-cairo";
+        rev = "6238f609bea233040fe927858156dee5515a0745";
+        hash = "sha256-QjCt3sRINrNbaxtNwj43+g7D3xYmuh0BIAo6wWQ/54g=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cairo";
+    };
+    capnp = buildGrammar {
+      language = "capnp";
+      version = "0.0.0+rev=7b0883c";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-capnp";
+        rev = "7b0883c03e5edd34ef7bcf703194204299d7099f";
+        hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-capnp";
+    };
+    chatito = buildGrammar {
+      language = "chatito";
+      version = "0.0.0+rev=c0ed82c";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-chatito";
+        rev = "c0ed82c665b732395073f635c74c300f09530a7f";
+        hash = "sha256-a4M4AH6lDNX5h95i831vQzsviV8efPHn7zpZXT3CAT8=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-chatito";
+    };
+    circom = buildGrammar {
+      language = "circom";
+      version = "0.0.0+rev=0215052";
+      src = fetchFromGitHub {
+        owner = "Decurity";
+        repo = "tree-sitter-circom";
+        rev = "02150524228b1e6afef96949f2d6b7cc0aaf999e";
+        hash = "sha256-wosqwiDkK1rytGWMJApz1M42Sme9OaWXC0rmj7vM4g8=";
+      };
+      meta.homepage = "https://github.com/Decurity/tree-sitter-circom";
+    };
+    clojure = buildGrammar {
+      language = "clojure";
+      version = "0.0.0+rev=e43eff8";
+      src = fetchFromGitHub {
+        owner = "sogaiu";
+        repo = "tree-sitter-clojure";
+        rev = "e43eff80d17cf34852dcd92ca5e6986d23a7040f";
+        hash = "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=";
+      };
+      meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
+    };
+    cmake = buildGrammar {
+      language = "cmake";
+      version = "0.0.0+rev=c7b2a71";
+      src = fetchFromGitHub {
+        owner = "uyha";
+        repo = "tree-sitter-cmake";
+        rev = "c7b2a71e7f8ecb167fad4c97227c838439280175";
+        hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU=";
+      };
+      meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
+    };
+    comment = buildGrammar {
+      language = "comment";
+      version = "0.0.0+rev=66272d2";
+      src = fetchFromGitHub {
+        owner = "stsewd";
+        repo = "tree-sitter-comment";
+        rev = "66272d2b6c73fb61157541b69dd0a7ce7b42a5ad";
+        hash = "sha256-ky+P22s2/fuhriTF4GVQquWaiMs6ZktxDibzKs/I+ao=";
+      };
+      meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
+    };
+    commonlisp = buildGrammar {
+      language = "commonlisp";
+      version = "0.0.0+rev=3232350";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-commonlisp";
+        rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f";
+        hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-commonlisp";
+    };
+    cooklang = buildGrammar {
+      language = "cooklang";
+      version = "0.0.0+rev=4ebe237";
+      src = fetchFromGitHub {
+        owner = "addcninblue";
+        repo = "tree-sitter-cooklang";
+        rev = "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e";
+        hash = "sha256-VB3BxSrhIbD8TytfOJx7IhTwl/aWasB8t3xnrO34rQE=";
+      };
+      meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
+    };
+    corn = buildGrammar {
+      language = "corn";
+      version = "0.0.0+rev=4646547";
+      src = fetchFromGitHub {
+        owner = "jakestanger";
+        repo = "tree-sitter-corn";
+        rev = "464654742cbfd3a3de560aba120998f1d5dfa844";
+        hash = "sha256-fI7S+TkI2ofQ/Hal4CJ2HAaeQrjOju1rgJvyc6P3t9k=";
+      };
+      meta.homepage = "https://github.com/jakestanger/tree-sitter-corn";
+    };
+    cpon = buildGrammar {
+      language = "cpon";
+      version = "0.0.0+rev=594289e";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-cpon";
+        rev = "594289eadfec719198e560f9d7fd243c4db678d5";
+        hash = "sha256-Nr+98yrDkOS5Yh/EFmBWV9Yhv2tPfHGb4pPlLUwc+k8=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cpon";
+    };
+    cpp = buildGrammar {
+      language = "cpp";
+      version = "0.0.0+rev=12bd6f7";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-cpp";
+        rev = "12bd6f7e96080d2e70ec51d4068f2f66120dde35";
+        hash = "sha256-vmXTv6Idf0Le5ZVa8Rc1DVefqzUxkGeLGsYcSDNBpQU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
+    };
+    css = buildGrammar {
+      language = "css";
+      version = "0.0.0+rev=dda5cfc";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-css";
+        rev = "dda5cfc5722c429eaba1c910ca32c2c0c5bb1a3f";
+        hash = "sha256-jFsnEyS+FThk7L48FzAdSp5fNPSLvM8hTL/VC5FMlOE=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-css";
+    };
+    csv = buildGrammar {
+      language = "csv";
+      version = "0.0.0+rev=f6bf6e3";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-csv";
+        rev = "f6bf6e35eb0b95fbadea4bb39cb9709507fcb181";
+        hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o=";
+      };
+      location = "csv";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv";
+    };
+    cuda = buildGrammar {
+      language = "cuda";
+      version = "0.0.0+rev=48b066f";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-cuda";
+        rev = "48b066f334f4cf2174e05a50218ce2ed98b6fd01";
+        hash = "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cuda";
+    };
+    cue = buildGrammar {
+      language = "cue";
+      version = "0.0.0+rev=770737b";
+      src = fetchFromGitHub {
+        owner = "eonpatapon";
+        repo = "tree-sitter-cue";
+        rev = "770737bcff2c4aa3f624d439e32b07dbb07102d3";
+        hash = "sha256-ujSBOwOnjsKuFhHtt4zvj90VcQsak8mEcWYJ0e5/mKc=";
+      };
+      meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
+    };
+    cylc = buildGrammar {
+      language = "cylc";
+      version = "0.0.0+rev=6d1d811";
+      src = fetchFromGitHub {
+        owner = "elliotfontaine";
+        repo = "tree-sitter-cylc";
+        rev = "6d1d81137112299324b526477ce1db989ab58fb8";
+        hash = "sha256-jgQCTM36S8UwSyT4LAfcX4DUIl2OYVMeQdDg3zRrw00=";
+      };
+      meta.homepage = "https://github.com/elliotfontaine/tree-sitter-cylc";
+    };
+    d = buildGrammar {
+      language = "d";
+      version = "0.0.0+rev=fb028c8";
+      src = fetchFromGitHub {
+        owner = "gdamore";
+        repo = "tree-sitter-d";
+        rev = "fb028c8f14f4188286c2eef143f105def6fbf24f";
+        hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo=";
+      };
+      meta.homepage = "https://github.com/gdamore/tree-sitter-d";
+    };
+    dart = buildGrammar {
+      language = "dart";
+      version = "0.0.0+rev=d4d8f3e";
+      src = fetchFromGitHub {
+        owner = "UserNobody14";
+        repo = "tree-sitter-dart";
+        rev = "d4d8f3e337d8be23be27ffc35a0aef972343cd54";
+        hash = "sha256-1ftYqCor1A0PsQ0AJLVqtxVRZxaXqE/NZ5yy7SizZCY=";
+      };
+      meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
+    };
+    desktop = buildGrammar {
+      language = "desktop";
+      version = "0.0.0+rev=317de59";
+      src = fetchFromGitHub {
+        owner = "ValdezFOmar";
+        repo = "tree-sitter-desktop";
+        rev = "317de59070dd4f8bd0af03dd3dea5dda0e7a0449";
+        hash = "sha256-FX0uPZfefRLuFvBR3uVGAmBvukSjaN0/pN580edqxxs=";
+      };
+      meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
+    };
+    devicetree = buildGrammar {
+      language = "devicetree";
+      version = "0.0.0+rev=e685f1f";
+      src = fetchFromGitHub {
+        owner = "joelspadin";
+        repo = "tree-sitter-devicetree";
+        rev = "e685f1f6ac1702b046415efb476444167d63e41a";
+        hash = "sha256-iMmr4zSm6B7goevHE03DMj9scW4ldXS7CV74sKeqGD4=";
+      };
+      meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
+    };
+    dhall = buildGrammar {
+      language = "dhall";
+      version = "0.0.0+rev=6201325";
+      src = fetchFromGitHub {
+        owner = "jbellerb";
+        repo = "tree-sitter-dhall";
+        rev = "62013259b26ac210d5de1abf64cf1b047ef88000";
+        hash = "sha256-4xbz7DDUlLGgLW5V6Yyvo7dkE9MOk3mCQEBTYyRbNuM=";
+      };
+      meta.homepage = "https://github.com/jbellerb/tree-sitter-dhall";
+    };
+    diff = buildGrammar {
+      language = "diff";
+      version = "0.0.0+rev=2520c3f";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-diff";
+        rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed";
+        hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff";
+    };
+    disassembly = buildGrammar {
+      language = "disassembly";
+      version = "0.0.0+rev=0229c02";
+      src = fetchFromGitHub {
+        owner = "ColinKennedy";
+        repo = "tree-sitter-disassembly";
+        rev = "0229c0211dba909c5d45129ac784a3f4d49c243a";
+        hash = "sha256-IM3HzOhJmbb334PZ8q+r2EMi5Bv/rLoy+llPN0aghr8=";
+      };
+      meta.homepage = "https://github.com/ColinKennedy/tree-sitter-disassembly";
+    };
+    djot = buildGrammar {
+      language = "djot";
+      version = "0.0.0+rev=74fac1f";
+      src = fetchFromGitHub {
+        owner = "treeman";
+        repo = "tree-sitter-djot";
+        rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6";
+        hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8=";
+      };
+      meta.homepage = "https://github.com/treeman/tree-sitter-djot";
+    };
+    dockerfile = buildGrammar {
+      language = "dockerfile";
+      version = "0.0.0+rev=971acdd";
+      src = fetchFromGitHub {
+        owner = "camdencheek";
+        repo = "tree-sitter-dockerfile";
+        rev = "971acdd908568b4531b0ba28a445bf0bb720aba5";
+        hash = "sha256-WJJ/rjFea1sudGIyjKGupwm39TJ1zbyWlLgoRf1KCBI=";
+      };
+      meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile";
+    };
+    dot = buildGrammar {
+      language = "dot";
+      version = "0.0.0+rev=80327ab";
+      src = fetchFromGitHub {
+        owner = "rydesun";
+        repo = "tree-sitter-dot";
+        rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d";
+        hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y=";
+      };
+      meta.homepage = "https://github.com/rydesun/tree-sitter-dot";
+    };
+    doxygen = buildGrammar {
+      language = "doxygen";
+      version = "0.0.0+rev=ccd998f";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-doxygen";
+        rev = "ccd998f378c3f9345ea4eeb223f56d7b84d16687";
+        hash = "sha256-Yh6FaRvWmeqnSnBgOojWbs1wJaeEoNJlvSEqgzjGh7o=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-doxygen";
+    };
+    dtd = buildGrammar {
+      language = "dtd";
+      version = "0.0.0+rev=863dbc3";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-xml";
+        rev = "863dbc381f44f6c136a399e684383b977bb2beaa";
+        hash = "sha256-0ztP30xWqVWy5upWPp0JwhpQphOJufzlcYn+KvLejVs=";
+      };
+      location = "dtd";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
+    };
+    earthfile = buildGrammar {
+      language = "earthfile";
+      version = "0.0.0+rev=5baef88";
+      src = fetchFromGitHub {
+        owner = "glehmann";
+        repo = "tree-sitter-earthfile";
+        rev = "5baef88717ad0156fd29a8b12d0d8245bb1096a8";
+        hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k=";
+      };
+      meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
+    };
+    ebnf = buildGrammar {
+      language = "ebnf";
+      version = "0.0.0+rev=8e635b0";
+      src = fetchFromGitHub {
+        owner = "RubixDev";
+        repo = "ebnf";
+        rev = "8e635b0b723c620774dfb8abf382a7f531894b40";
+        hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
+      };
+      location = "crates/tree-sitter-ebnf";
+      meta.homepage = "https://github.com/RubixDev/ebnf";
+    };
+    editorconfig = buildGrammar {
+      language = "editorconfig";
+      version = "0.0.0+rev=3d49942";
+      src = fetchFromGitHub {
+        owner = "ValdezFOmar";
+        repo = "tree-sitter-editorconfig";
+        rev = "3d4994215125087ffea228ccec3654d313968579";
+        hash = "sha256-F1T5VzjtXNeV7fgX47xMXY1M4f6yh6oUOnZzaxuIGBs=";
+      };
+      meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
+    };
+    eds = buildGrammar {
+      language = "eds";
+      version = "0.0.0+rev=26d529e";
+      src = fetchFromGitHub {
+        owner = "uyha";
+        repo = "tree-sitter-eds";
+        rev = "26d529e6cfecde391a03c21d1474eb51e0285805";
+        hash = "sha256-+3BO4JxUrSc8OWHVZvd1lxjrNYkhN35q2YhcrUrFgMk=";
+      };
+      meta.homepage = "https://github.com/uyha/tree-sitter-eds";
+    };
+    eex = buildGrammar {
+      language = "eex";
+      version = "0.0.0+rev=f742f2f";
+      src = fetchFromGitHub {
+        owner = "connorlay";
+        repo = "tree-sitter-eex";
+        rev = "f742f2fe327463335e8671a87c0b9b396905d1d1";
+        hash = "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY=";
+      };
+      meta.homepage = "https://github.com/connorlay/tree-sitter-eex";
+    };
+    elixir = buildGrammar {
+      language = "elixir";
+      version = "0.0.0+rev=d24cece";
+      src = fetchFromGitHub {
+        owner = "elixir-lang";
+        repo = "tree-sitter-elixir";
+        rev = "d24cecee673c4c770f797bac6f87ae4b6d7ddec5";
+        hash = "sha256-nSXXMPneL/sTdkpcsxUz73DiXVuNxVHnf8b2LTbAUs8=";
+      };
+      meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
+    };
+    elm = buildGrammar {
+      language = "elm";
+      version = "0.0.0+rev=6d9511c";
+      src = fetchFromGitHub {
+        owner = "elm-tooling";
+        repo = "tree-sitter-elm";
+        rev = "6d9511c28181db66daee4e883f811f6251220943";
+        hash = "sha256-jhI0CRi8rgiwBfwEwNBBZ7QrKXYRQ9gUCO7c37Y/ibc=";
+      };
+      meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
+    };
+    elsa = buildGrammar {
+      language = "elsa";
+      version = "0.0.0+rev=0a66b2b";
+      src = fetchFromGitHub {
+        owner = "glapa-grossklag";
+        repo = "tree-sitter-elsa";
+        rev = "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7";
+        hash = "sha256-zahi5hOXzad6R1+mqmYBFfn2X+SejQUIQzbabgCIJ8w=";
+      };
+      meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa";
+    };
+    elvish = buildGrammar {
+      language = "elvish";
+      version = "0.0.0+rev=5e7210d";
+      src = fetchFromGitHub {
+        owner = "elves";
+        repo = "tree-sitter-elvish";
+        rev = "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5";
+        hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg=";
+      };
+      meta.homepage = "https://github.com/elves/tree-sitter-elvish";
+    };
+    embedded_template = buildGrammar {
+      language = "embedded_template";
+      version = "0.0.0+rev=3499d85";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-embedded-template";
+        rev = "3499d85f0a0d937c507a4a65368f2f63772786e1";
+        hash = "sha256-H+kcKwVjIvRBRj+pjSjp8NX0kH63SDWiAS5iovT9e/c=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
+    };
+    enforce = buildGrammar {
+      language = "enforce";
+      version = "0.0.0+rev=eb27968";
+      src = fetchFromGitHub {
+        owner = "simonvic";
+        repo = "tree-sitter-enforce";
+        rev = "eb2796871d966264cdb041b797416ef1757c8b4f";
+        hash = "sha256-50yK0MIMFFjUlcE99MEESKdcLnyIurAl16uGXGQyjkI=";
+      };
+      meta.homepage = "https://github.com/simonvic/tree-sitter-enforce";
+    };
+    erlang = buildGrammar {
+      language = "erlang";
+      version = "0.0.0+rev=f21023b";
+      src = fetchFromGitHub {
+        owner = "WhatsApp";
+        repo = "tree-sitter-erlang";
+        rev = "f21023bbd6cd30cadbc793d80ae4d990d9be86fc";
+        hash = "sha256-tDWLmveL+7s9vFVKtmSzGbx4A3X6rkaW1MR/9VOKLCg=";
+      };
+      meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
+    };
+    facility = buildGrammar {
+      language = "facility";
+      version = "0.0.0+rev=e4bfd3e";
+      src = fetchFromGitHub {
+        owner = "FacilityApi";
+        repo = "tree-sitter-facility";
+        rev = "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb";
+        hash = "sha256-EwTkus2m0lwDwx5XO3Ee4ngretLPShx84JZytaHkZ4I=";
+      };
+      meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility";
+    };
+    faust = buildGrammar {
+      language = "faust";
+      version = "0.0.0+rev=122dd10";
+      src = fetchFromGitHub {
+        owner = "khiner";
+        repo = "tree-sitter-faust";
+        rev = "122dd101919289ea809bad643712fcb483a1bed0";
+        hash = "sha256-5T+Om1qdSIal1pMIoaM44FexSqZyhZCZb/Pa0/udzZI=";
+      };
+      meta.homepage = "https://github.com/khiner/tree-sitter-faust";
+    };
+    fennel = buildGrammar {
+      language = "fennel";
+      version = "0.0.0+rev=fd4a24e";
+      src = fetchFromGitHub {
+        owner = "alexmozaidze";
+        repo = "tree-sitter-fennel";
+        rev = "fd4a24e349bcbac8a03a5a00d0dfa207baf53ca5";
+        hash = "sha256-/+WJDDduMAEQvcTwplzNO8hfTiNbOyT2px4jRDxVQw0=";
+      };
+      meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel";
+    };
+    fidl = buildGrammar {
+      language = "fidl";
+      version = "0.0.0+rev=0a8910f";
+      src = fetchFromGitHub {
+        owner = "google";
+        repo = "tree-sitter-fidl";
+        rev = "0a8910f293268e27ff554357c229ba172b0eaed2";
+        hash = "sha256-QFAkxQo2w/+OR7nZn9ldBk2yHOd23kzciAcQvIZ5hrY=";
+      };
+      meta.homepage = "https://github.com/google/tree-sitter-fidl";
+    };
+    firrtl = buildGrammar {
+      language = "firrtl";
+      version = "0.0.0+rev=8503d3a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-firrtl";
+        rev = "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5";
+        hash = "sha256-I2EMcm6bTMRODmxOOOiv+U0fhm6yoNhjCyuINfTUtlY=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-firrtl";
+    };
+    fish = buildGrammar {
+      language = "fish";
+      version = "0.0.0+rev=aa074a0";
+      src = fetchFromGitHub {
+        owner = "ram02z";
+        repo = "tree-sitter-fish";
+        rev = "aa074a0bacde8b5823c592574d7138f156a95776";
+        hash = "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=";
+      };
+      meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
+    };
+    foam = buildGrammar {
+      language = "foam";
+      version = "0.0.0+rev=472c24f";
+      src = fetchFromGitHub {
+        owner = "FoamScience";
+        repo = "tree-sitter-foam";
+        rev = "472c24f11a547820327fb1be565bcfff98ea96a4";
+        hash = "sha256-CjCnMnsD3uZS0qEcnlLa6JrFyH88KbDITwBAdRTvVMY=";
+      };
+      meta.homepage = "https://github.com/FoamScience/tree-sitter-foam";
+    };
+    forth = buildGrammar {
+      language = "forth";
+      version = "0.0.0+rev=360ef13";
+      src = fetchFromGitHub {
+        owner = "AlexanderBrevig";
+        repo = "tree-sitter-forth";
+        rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0";
+        hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8=";
+      };
+      meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth";
+    };
+    fortran = buildGrammar {
+      language = "fortran";
+      version = "0.0.0+rev=e013289";
+      src = fetchFromGitHub {
+        owner = "stadelmanma";
+        repo = "tree-sitter-fortran";
+        rev = "e0132896b8959c09dc20b56e4a1c5d25bc341697";
+        hash = "sha256-pqbU0abjoonI+04Y2OZeGLWeoYt/PspiOC0rAJlu2Qg=";
+      };
+      meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
+    };
+    fsh = buildGrammar {
+      language = "fsh";
+      version = "0.0.0+rev=fad2e17";
+      src = fetchFromGitHub {
+        owner = "mgramigna";
+        repo = "tree-sitter-fsh";
+        rev = "fad2e175099a45efbc98f000cc196d3674cc45e0";
+        hash = "sha256-91r1FCQTocDkhS5Tx0vnFliitMStVzNTpf6BwPyaqVM=";
+      };
+      meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh";
+    };
+    fsharp = buildGrammar {
+      language = "fsharp";
+      version = "0.0.0+rev=5141851";
+      src = fetchFromGitHub {
+        owner = "ionide";
+        repo = "tree-sitter-fsharp";
+        rev = "5141851c278a99958469eb1736c7afc4ec738e47";
+        hash = "sha256-cJpbO9PjGtJu4RCDsmQ0qjys765/z397y/wbfGxTY9Y=";
+      };
+      location = "fsharp";
+      meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
+    };
+    func = buildGrammar {
+      language = "func";
+      version = "0.0.0+rev=f780ca5";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-func";
+        rev = "f780ca55e65e7d7360d0229331763e16c452fc98";
+        hash = "sha256-jM0VJZlfhenAZbhabpgsoRIGny3WSDoimZtwogcvaSI=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-func";
+    };
+    gap = buildGrammar {
+      language = "gap";
+      version = "0.0.0+rev=2bac148";
+      src = fetchFromGitHub {
+        owner = "gap-system";
+        repo = "tree-sitter-gap";
+        rev = "2bac14863b76ad0ff6fd7204c50574732acd66df";
+        hash = "sha256-3hMpEV12wE2HoJ4qX1a/lOx0JOve4pPF4n9WKcupSLo=";
+      };
+      meta.homepage = "https://github.com/gap-system/tree-sitter-gap";
+    };
+    gaptst = buildGrammar {
+      language = "gaptst";
+      version = "0.0.0+rev=69086d7";
+      src = fetchFromGitHub {
+        owner = "gap-system";
+        repo = "tree-sitter-gaptst";
+        rev = "69086d7627c03e1f4baf766bcef14c60d9e92331";
+        hash = "sha256-U0P9QoOZST1h6XI83CI0/6/CDTvqkv1Yiq62h6YdHpI=";
+      };
+      meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst";
+    };
+    gdscript = buildGrammar {
+      language = "gdscript";
+      version = "0.0.0+rev=9686853";
+      src = fetchFromGitHub {
+        owner = "PrestonKnopp";
+        repo = "tree-sitter-gdscript";
+        rev = "9686853b696db07118ad110e440d6de0ca6498b4";
+        hash = "sha256-kNOiMDn0yWs4Homht/uSPjYr7w4nyHDadrFhSi5M9aA=";
+      };
+      meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
+    };
+    gdshader = buildGrammar {
+      language = "gdshader";
+      version = "0.0.0+rev=6826863";
+      src = fetchFromGitHub {
+        owner = "airblast-dev";
+        repo = "tree-sitter-gdshader";
+        rev = "68268631c8b6dc093985f1246b099f81b30ea7d1";
+        hash = "sha256-HdRxDusCIxRtlQoo2+gzWmzqG9+8LmmlpShlBTVVK0I=";
+      };
+      meta.homepage = "https://github.com/airblast-dev/tree-sitter-gdshader";
+    };
+    git_config = buildGrammar {
+      language = "git_config";
+      version = "0.0.0+rev=0fbc9f9";
+      src = fetchFromGitHub {
+        owner = "the-mikedavis";
+        repo = "tree-sitter-git-config";
+        rev = "0fbc9f99d5a28865f9de8427fb0672d66f9d83a5";
+        hash = "sha256-u1NrtCap+CvhSW4q7xrwiUPGuCspjk9sHKkXQcEXc2E=";
+      };
+      meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config";
+    };
+    git_rebase = buildGrammar {
+      language = "git_rebase";
+      version = "0.0.0+rev=bff4b66";
+      src = fetchFromGitHub {
+        owner = "the-mikedavis";
+        repo = "tree-sitter-git-rebase";
+        rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
+        hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
+      };
+      meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase";
+    };
+    gitattributes = buildGrammar {
+      language = "gitattributes";
+      version = "0.0.0+rev=1b7af09";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-gitattributes";
+        rev = "1b7af09d45b579f9f288453b95ad555f1f431645";
+        hash = "sha256-eHDcJgHpWemOYtKACVhl5Muri1W1Igrjm/p0rAbvrNY=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gitattributes";
+    };
+    gitcommit = buildGrammar {
+      language = "gitcommit";
+      version = "0.0.0+rev=a716678";
+      src = fetchFromGitHub {
+        owner = "gbprod";
+        repo = "tree-sitter-gitcommit";
+        rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d";
+        hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws=";
+      };
+      meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
+    };
+    gitignore = buildGrammar {
+      language = "gitignore";
+      version = "0.0.0+rev=f4685bf";
+      src = fetchFromGitHub {
+        owner = "shunsambongi";
+        repo = "tree-sitter-gitignore";
+        rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
+        hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=";
+      };
+      meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore";
+    };
+    gleam = buildGrammar {
+      language = "gleam";
+      version = "0.0.0+rev=0c0c63a";
+      src = fetchFromGitHub {
+        owner = "gleam-lang";
+        repo = "tree-sitter-gleam";
+        rev = "0c0c63a07998767b22f0d2655f903611eca6acd0";
+        hash = "sha256-vL2MyZ3dly5nZqfxlfC9brE8P1tUxdRtJLxlkN7XKi4=";
+      };
+      meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
+    };
+    glimmer = buildGrammar {
+      language = "glimmer";
+      version = "0.0.0+rev=da605af";
+      src = fetchFromGitHub {
+        owner = "ember-tooling";
+        repo = "tree-sitter-glimmer";
+        rev = "da605af8c5999b43e6839b575eae5e6cafabb06f";
+        hash = "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4=";
+      };
+      meta.homepage = "https://github.com/ember-tooling/tree-sitter-glimmer";
+    };
+    glimmer_javascript = buildGrammar {
+      language = "glimmer_javascript";
+      version = "0.0.0+rev=5cc865a";
+      src = fetchFromGitHub {
+        owner = "NullVoxPopuli";
+        repo = "tree-sitter-glimmer-javascript";
+        rev = "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87";
+        hash = "sha256-4MSBaGdX5lvhvz2LyQb+NuQY9Vc5CFL0C6S3sO3Tz2U=";
+      };
+      meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
+    };
+    glimmer_typescript = buildGrammar {
+      language = "glimmer_typescript";
+      version = "0.0.0+rev=12d9894";
+      src = fetchFromGitHub {
+        owner = "NullVoxPopuli";
+        repo = "tree-sitter-glimmer-typescript";
+        rev = "12d98944c1d5077b957cbdb90d663a7c4d50118c";
+        hash = "sha256-3cJI6vcbU62kUIhphprNeAl9RyY9TThrzVeArdLfxnI=";
+      };
+      meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
+    };
+    glsl = buildGrammar {
+      language = "glsl";
+      version = "0.0.0+rev=24a6c8e";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-glsl";
+        rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4";
+        hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-glsl";
+    };
+    gn = buildGrammar {
+      language = "gn";
+      version = "0.0.0+rev=bc06955";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-gn";
+        rev = "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05";
+        hash = "sha256-Sn6He4YRrKJe4QvGiaauquYBVQol0lWeIuOwkdUEzkQ=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gn";
+    };
+    gnuplot = buildGrammar {
+      language = "gnuplot";
+      version = "0.0.0+rev=8923c1e";
+      src = fetchFromGitHub {
+        owner = "dpezto";
+        repo = "tree-sitter-gnuplot";
+        rev = "8923c1e38b9634a688a6c0dce7c18c8ffb823e79";
+        hash = "sha256-fR3lIscfrBqpBH1jZ4RB1Qa8r+hxy6I0OzzoQqAe2aw=";
+      };
+      meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot";
+    };
+    go = buildGrammar {
+      language = "go";
+      version = "0.0.0+rev=2346a3a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-go";
+        rev = "2346a3ab1bb3857b48b29d779a1ef9799a248cd7";
+        hash = "sha256-fifTM/m2Mxd7kpJBlzwWGheAKGq6QbbzyxpBSyplYa0=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
+    };
+    goctl = buildGrammar {
+      language = "goctl";
+      version = "0.0.0+rev=49c4353";
+      src = fetchFromGitHub {
+        owner = "chaozwn";
+        repo = "tree-sitter-goctl";
+        rev = "49c43532689fe1f53e8b9e009d0521cab02c432b";
+        hash = "sha256-HYPj95Kg+C5Ax++Z83yUnhrf2iIVTuwOBhVVLlYQaGs=";
+      };
+      meta.homepage = "https://github.com/chaozwn/tree-sitter-goctl";
+    };
+    godot_resource = buildGrammar {
+      language = "godot_resource";
+      version = "0.0.0+rev=302c189";
+      src = fetchFromGitHub {
+        owner = "PrestonKnopp";
+        repo = "tree-sitter-godot-resource";
+        rev = "302c1895f54bf74d53a08572f7b26a6614209adc";
+        hash = "sha256-u3vIxbgm8zFKI/1MNYtal3ORkE/8D5iNVTFqrIIIHKM=";
+      };
+      meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource";
+    };
+    gomod = buildGrammar {
+      language = "gomod";
+      version = "0.0.0+rev=2e88687";
+      src = fetchFromGitHub {
+        owner = "camdencheek";
+        repo = "tree-sitter-go-mod";
+        rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a";
+        hash = "sha256-OfhV3lxdyIhA3XZYbafEtdOsQsTCSSCBrN3WbzSVg0g=";
+      };
+      meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
+    };
+    gosum = buildGrammar {
+      language = "gosum";
+      version = "0.0.0+rev=27816eb";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-go-sum";
+        rev = "27816eb6b7315746ae9fcf711e4e1396dc1cf237";
+        hash = "sha256-9tPFT0ad68YVmz/R6ia1bQE5AQRBX9ZoPW4inCZIBo4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-go-sum";
+    };
+    gotmpl = buildGrammar {
+      language = "gotmpl";
+      version = "0.0.0+rev=04270cd";
+      src = fetchFromGitHub {
+        owner = "ngalaiko";
+        repo = "tree-sitter-go-template";
+        rev = "04270cd3512e2c7de0c5f2823725d7b0c4c01fda";
+        hash = "sha256-DE5obq7mhDPSfXLImCL7ti1C0FQMU0uDslhaRBWhbPo=";
+      };
+      meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
+    };
+    gowork = buildGrammar {
+      language = "gowork";
+      version = "0.0.0+rev=949a8a4";
+      src = fetchFromGitHub {
+        owner = "omertuc";
+        repo = "tree-sitter-go-work";
+        rev = "949a8a470559543857a62102c84700d291fc984c";
+        hash = "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto=";
+      };
+      meta.homepage = "https://github.com/omertuc/tree-sitter-go-work";
+    };
+    gpg = buildGrammar {
+      language = "gpg";
+      version = "0.0.0+rev=4024eb2";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-gpg-config";
+        rev = "4024eb268c59204280f8ac71ef146b8ff5e737f6";
+        hash = "sha256-aV0CUthayxs9O8Bpdoj9UyvUffLFYurOtkegJVH73Do=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gpg-config";
+    };
+    graphql = buildGrammar {
+      language = "graphql";
+      version = "0.0.0+rev=5e66e96";
+      src = fetchFromGitHub {
+        owner = "bkegley";
+        repo = "tree-sitter-graphql";
+        rev = "5e66e961eee421786bdda8495ed1db045e06b5fe";
+        hash = "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=";
+      };
+      meta.homepage = "https://github.com/bkegley/tree-sitter-graphql";
+    };
+    gren = buildGrammar {
+      language = "gren";
+      version = "0.0.0+rev=c36aac5";
+      src = fetchFromGitHub {
+        owner = "MaeBrooks";
+        repo = "tree-sitter-gren";
+        rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930";
+        hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k=";
+      };
+      meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren";
+    };
+    groovy = buildGrammar {
+      language = "groovy";
+      version = "0.0.0+rev=8691159";
+      src = fetchFromGitHub {
+        owner = "murtaza64";
+        repo = "tree-sitter-groovy";
+        rev = "86911590a8e46d71301c66468e5620d9faa5b6af";
+        hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0=";
+      };
+      meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
+    };
+    groq = buildGrammar {
+      language = "groq";
+      version = "0.0.0+rev=1fa1ab0";
+      src = fetchFromGitHub {
+        owner = "ajrussellaudio";
+        repo = "tree-sitter-groq";
+        rev = "1fa1ab0eb391a270957e8ad8c731b492e3645649";
+        hash = "sha256-pKwDiViRuFB+BPfWfOOc/VDPN3qFt9HqMCuLGGSMiOU=";
+      };
+      meta.homepage = "https://github.com/ajrussellaudio/tree-sitter-groq";
+    };
+    gstlaunch = buildGrammar {
+      language = "gstlaunch";
+      version = "0.0.0+rev=549aef2";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-gstlaunch";
+        rev = "549aef253fd38a53995cda1bf55c501174372bf7";
+        hash = "sha256-zNUx/9dxEqyqTXCxEiNnYPzplnR7l9b2L4frYpPOA9M=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch";
+    };
+    hack = buildGrammar {
+      language = "hack";
+      version = "0.0.0+rev=1a7ded9";
+      src = fetchFromGitHub {
+        owner = "slackhq";
+        repo = "tree-sitter-hack";
+        rev = "1a7ded90288189746c54861ac144ede97df95081";
+        hash = "sha256-CaP4AgWHfUilze6HREQR3ah3AiOpphpFsxEkjp/Gs38=";
+      };
+      meta.homepage = "https://github.com/slackhq/tree-sitter-hack";
+    };
+    hare = buildGrammar {
+      language = "hare";
+      version = "0.0.0+rev=eed7ddf";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-hare";
+        rev = "eed7ddf6a66b596906aa8ca3d40521b8278adc6f";
+        hash = "sha256-qXLRb+5SgfBrOXta10P04ErV5z8eSM/J0Od5pk06OCc=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hare";
+    };
+    haskell = buildGrammar {
+      language = "haskell";
+      version = "0.0.0+rev=7fa19f1";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-haskell";
+        rev = "7fa19f195803a77855f036ee7f49e4b22856e338";
+        hash = "sha256-/cruCFNEyZf5d3TCw+vkJOgJqWvS1Re5F4dMVuXXJBg=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-haskell";
+    };
+    haskell_persistent = buildGrammar {
+      language = "haskell_persistent";
+      version = "0.0.0+rev=577259b";
+      src = fetchFromGitHub {
+        owner = "MercuryTechnologies";
+        repo = "tree-sitter-haskell-persistent";
+        rev = "577259b4068b2c281c9ebf94c109bd50a74d5857";
+        hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ=";
+      };
+      meta.homepage = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent";
+    };
+    hcl = buildGrammar {
+      language = "hcl";
+      version = "0.0.0+rev=fad9918";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-hcl";
+        rev = "fad991865fee927dd1de5e172fb3f08ac674d914";
+        hash = "sha256-Kq0KtkF6xtZcN2s8KzYGyguJH2iOTlA2WRytZ+KGTUE=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hcl";
+    };
+    heex = buildGrammar {
+      language = "heex";
+      version = "0.0.0+rev=b5a7cb5";
+      src = fetchFromGitHub {
+        owner = "connorlay";
+        repo = "tree-sitter-heex";
+        rev = "b5a7cb5f74dc695a9ff5f04919f872ebc7a895e9";
+        hash = "sha256-hSe3h05IFEKMosB2r/85JnT2kv/krU2Ebaszd+m3j8g=";
+      };
+      meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
+    };
+    helm = buildGrammar {
+      language = "helm";
+      version = "0.0.0+rev=04270cd";
+      src = fetchFromGitHub {
+        owner = "ngalaiko";
+        repo = "tree-sitter-go-template";
+        rev = "04270cd3512e2c7de0c5f2823725d7b0c4c01fda";
+        hash = "sha256-DE5obq7mhDPSfXLImCL7ti1C0FQMU0uDslhaRBWhbPo=";
+      };
+      location = "dialects/helm";
+      meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
+    };
+    hjson = buildGrammar {
+      language = "hjson";
+      version = "0.0.0+rev=02fa3b7";
+      src = fetchFromGitHub {
+        owner = "winston0410";
+        repo = "tree-sitter-hjson";
+        rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0";
+        hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8=";
+      };
+      meta.homepage = "https://github.com/winston0410/tree-sitter-hjson";
+    };
+    hlsl = buildGrammar {
+      language = "hlsl";
+      version = "0.0.0+rev=bab9111";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-hlsl";
+        rev = "bab9111922d53d43668fabb61869bec51bbcb915";
+        hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl";
+    };
+    hlsplaylist = buildGrammar {
+      language = "hlsplaylist";
+      version = "0.0.0+rev=3bfda92";
+      src = fetchFromGitHub {
+        owner = "Freed-Wu";
+        repo = "tree-sitter-hlsplaylist";
+        rev = "3bfda9271e3adb08d35f47a2102fe957009e1c55";
+        hash = "sha256-BvLT+BbnJgM14a896p39dywYy/4S45xOBtBukYTbW6E=";
+      };
+      meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist";
+    };
+    hocon = buildGrammar {
+      language = "hocon";
+      version = "0.0.0+rev=c390f10";
+      src = fetchFromGitHub {
+        owner = "antosha417";
+        repo = "tree-sitter-hocon";
+        rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc";
+        hash = "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw=";
+      };
+      meta.homepage = "https://github.com/antosha417/tree-sitter-hocon";
+    };
+    hoon = buildGrammar {
+      language = "hoon";
+      version = "0.0.0+rev=1545137";
+      src = fetchFromGitHub {
+        owner = "urbit-pilled";
+        repo = "tree-sitter-hoon";
+        rev = "1545137aadcc63660c47db9ad98d02fa602655d0";
+        hash = "sha256-RkSPoscrinmuSTWHzXkRNaiqECDXpKAbQ4z7a6Tpvek=";
+      };
+      meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
+    };
+    html = buildGrammar {
+      language = "html";
+      version = "0.0.0+rev=73a3947";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-html";
+        rev = "73a3947324f6efddf9e17c0ea58d454843590cc0";
+        hash = "sha256-WT8ZHU4wDNovIAWbHNSvjx6zmaTn8XH3IobsckIVXxg=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
+    };
+    htmldjango = buildGrammar {
+      language = "htmldjango";
+      version = "0.0.0+rev=3a64316";
+      src = fetchFromGitHub {
+        owner = "interdependence";
+        repo = "tree-sitter-htmldjango";
+        rev = "3a643167ad9afac5d61e092f08ff5b054576fadf";
+        hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE=";
+      };
+      meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango";
+    };
+    http = buildGrammar {
+      language = "http";
+      version = "0.0.0+rev=db8b439";
+      src = fetchFromGitHub {
+        owner = "rest-nvim";
+        repo = "tree-sitter-http";
+        rev = "db8b4398de90b6d0b6c780aba96aaa2cd8e9202c";
+        hash = "sha256-T/O4oxPEIg3nLi3CxCwGW+iXC18fWW2xgsY5nrptk/M=";
+      };
+      meta.homepage = "https://github.com/rest-nvim/tree-sitter-http";
+    };
+    hurl = buildGrammar {
+      language = "hurl";
+      version = "0.0.0+rev=597efbd";
+      src = fetchFromGitHub {
+        owner = "pfeiferj";
+        repo = "tree-sitter-hurl";
+        rev = "597efbd7ce9a814bb058f48eabd055b1d1e12145";
+        hash = "sha256-sQjjx3DGfi0l8/XNOIoyFYAcDpaQOkD4Ics3g6vkgjM=";
+      };
+      meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl";
+    };
+    hyprlang = buildGrammar {
+      language = "hyprlang";
+      version = "0.0.0+rev=22723f2";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-hyprlang";
+        rev = "22723f25f3faf329863d952c9601b492afd971c9";
+        hash = "sha256-KU+vrokH8/E5Wg3BLuG3IZyw/9rJr0TJQxXB2IDULsE=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang";
+    };
+    idl = buildGrammar {
+      language = "idl";
+      version = "0.0.0+rev=e6b8b4d";
+      src = fetchFromGitHub {
+        owner = "cathaysia";
+        repo = "tree-sitter-idl";
+        rev = "e6b8b4d2ba285caacf6f9e931f1f637f5bc02b03";
+        hash = "sha256-p1dDO1FryUNWwmIYRZBD19dIbEIFxihifnwJrVFuhpk=";
+      };
+      meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
+    };
+    idris = buildGrammar {
+      language = "idris";
+      version = "0.0.0+rev=c56a25c";
+      src = fetchFromGitHub {
+        owner = "kayhide";
+        repo = "tree-sitter-idris";
+        rev = "c56a25cf57c68ff929356db25505c1cc4c7820f6";
+        hash = "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk=";
+      };
+      meta.homepage = "https://github.com/kayhide/tree-sitter-idris";
+    };
+    ini = buildGrammar {
+      language = "ini";
+      version = "0.0.0+rev=e4018b5";
+      src = fetchFromGitHub {
+        owner = "justinmk";
+        repo = "tree-sitter-ini";
+        rev = "e4018b5176132b4f3c5d6e61cea383f42288d0f5";
+        hash = "sha256-8WCyIaApsLPOybe+cntF4ISyQKN41L2IRAATd9KmzL0=";
+      };
+      meta.homepage = "https://github.com/justinmk/tree-sitter-ini";
+    };
+    inko = buildGrammar {
+      language = "inko";
+      version = "0.0.0+rev=v0.4.0";
+      src = fetchFromGitHub {
+        owner = "inko-lang";
+        repo = "tree-sitter-inko";
+        rev = "v0.4.0";
+        hash = "sha256-qgB2s/ghmOGjJ+MH7p3ZQKa+RMxx58642Z9lYC1wlq4=";
+      };
+      meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
+    };
+    ispc = buildGrammar {
+      language = "ispc";
+      version = "0.0.0+rev=9b2f9ae";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-ispc";
+        rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04";
+        hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ispc";
+    };
+    janet_simple = buildGrammar {
+      language = "janet_simple";
+      version = "0.0.0+rev=7e28cbf";
+      src = fetchFromGitHub {
+        owner = "sogaiu";
+        repo = "tree-sitter-janet-simple";
+        rev = "7e28cbf1ca061887ea43591a2898001f4245fddf";
+        hash = "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=";
+      };
+      meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
+    };
+    java = buildGrammar {
+      language = "java";
+      version = "0.0.0+rev=e10607b";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-java";
+        rev = "e10607b45ff745f5f876bfa3e94fbcc6b44bdc11";
+        hash = "sha256-XoaHRQ0esrV9e5JFSZkVR7QkGfky9NMnXaLQl8lohAM=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
+    };
+    javadoc = buildGrammar {
+      language = "javadoc";
+      version = "0.0.0+rev=5c6157f";
+      src = fetchFromGitHub {
+        owner = "rmuir";
+        repo = "tree-sitter-javadoc";
+        rev = "5c6157fe1c44e843f739e11b41c48c5918ec8709";
+        hash = "sha256-mbTqYzTr78UIyx7Z/x4M4CU841BafvXVMzq678LtqGU=";
+      };
+      meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
+    };
+    javascript = buildGrammar {
+      language = "javascript";
+      version = "0.0.0+rev=58404d8";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-javascript";
+        rev = "58404d8cf191d69f2674a8fd507bd5776f46cb11";
+        hash = "sha256-+fbTNX7qz6Ew1NrXF49wQh3RVl2ZQ3R7YXMkclUoNT8=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
+    };
+    jinja = buildGrammar {
+      language = "jinja";
+      version = "0.0.0+rev=e589222";
+      src = fetchFromGitHub {
+        owner = "cathaysia";
+        repo = "tree-sitter-jinja";
+        rev = "e589222a1ad44361bc376d5abdccd08e1fecfee5";
+        hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk=";
+      };
+      location = "tree-sitter-jinja";
+      meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
+    };
+    jinja_inline = buildGrammar {
+      language = "jinja_inline";
+      version = "0.0.0+rev=e589222";
+      src = fetchFromGitHub {
+        owner = "cathaysia";
+        repo = "tree-sitter-jinja";
+        rev = "e589222a1ad44361bc376d5abdccd08e1fecfee5";
+        hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk=";
+      };
+      location = "tree-sitter-jinja_inline";
+      meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
+    };
+    jq = buildGrammar {
+      language = "jq";
+      version = "0.0.0+rev=c204e36";
+      src = fetchFromGitHub {
+        owner = "flurie";
+        repo = "tree-sitter-jq";
+        rev = "c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9";
+        hash = "sha256-WEsiDsZEFTGC3s0awYE8rN/fsRML7CePKOXUbL+Fujc=";
+      };
+      meta.homepage = "https://github.com/flurie/tree-sitter-jq";
+    };
+    jsdoc = buildGrammar {
+      language = "jsdoc";
+      version = "0.0.0+rev=658d18d";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-jsdoc";
+        rev = "658d18dcdddb75c760363faa4963427a7c6b52db";
+        hash = "sha256-xjLC56NiOwwb5BJ2DLiG3rknMR3rrcYrPuHI24NVL+M=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc";
+    };
+    json = buildGrammar {
+      language = "json";
+      version = "0.0.0+rev=001c28d";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-json";
+        rev = "001c28d7a29832b06b0e831ec77845553c89b56d";
+        hash = "sha256-cUjbN+e8UtoLRm8ZnxG7iRGD5YIc032RbHBIlmV8aLc=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
+    };
+    json5 = buildGrammar {
+      language = "json5";
+      version = "0.0.0+rev=aa630ef";
+      src = fetchFromGitHub {
+        owner = "Joakker";
+        repo = "tree-sitter-json5";
+        rev = "aa630ef48903ab99e406a8acd2e2933077cc34e1";
+        hash = "sha256-WMGZxt1F2Ca7xoBSCld04LpQr37MhZpARK9mPF8RMUI=";
+      };
+      meta.homepage = "https://github.com/Joakker/tree-sitter-json5";
+    };
+    jsonnet = buildGrammar {
+      language = "jsonnet";
+      version = "0.0.0+rev=ddd075f";
+      src = fetchFromGitHub {
+        owner = "sourcegraph";
+        repo = "tree-sitter-jsonnet";
+        rev = "ddd075f1939aed8147b7aa67f042eda3fce22790";
+        hash = "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=";
+      };
+      meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
+    };
+    julia = buildGrammar {
+      language = "julia";
+      version = "0.0.0+rev=dd7f707";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-julia";
+        rev = "dd7f707577585ade7a488d32dbfb366246ea3837";
+        hash = "sha256-GFR48voa5DDMq5QKKjhYepipao2lTu5VIUze20pW+FM=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-julia";
+    };
+    just = buildGrammar {
+      language = "just";
+      version = "0.0.0+rev=bb0c898";
+      src = fetchFromGitHub {
+        owner = "IndianBoy42";
+        repo = "tree-sitter-just";
+        rev = "bb0c898a80644de438e6efe5d88d30bf092935cd";
+        hash = "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=";
+      };
+      meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
+    };
+    kcl = buildGrammar {
+      language = "kcl";
+      version = "0.0.0+rev=b0b2eb3";
+      src = fetchFromGitHub {
+        owner = "kcl-lang";
+        repo = "tree-sitter-kcl";
+        rev = "b0b2eb38009e04035a6e266c7e11e541f3caab7c";
+        hash = "sha256-Aeu1j77GdsNpo9PU+FcqN3ttT0eLaDKY4n8buftMiDc=";
+      };
+      meta.homepage = "https://github.com/kcl-lang/tree-sitter-kcl";
+    };
+    kconfig = buildGrammar {
+      language = "kconfig";
+      version = "0.0.0+rev=9ac99fe";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-kconfig";
+        rev = "9ac99fe4c0c27a35dc6f757cef534c646e944881";
+        hash = "sha256-8gZZLGL7giVHQIirjUIfsx3scP1L1VTFIZX7QOyjWvk=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-kconfig";
+    };
+    kdl = buildGrammar {
+      language = "kdl";
+      version = "0.0.0+rev=b37e3d5";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-kdl";
+        rev = "b37e3d58e5c5cf8d739b315d6114e02d42e66664";
+        hash = "sha256-irx8aMEdZG2WcQVE2c7ahwLjqEoUAOOjvhDDk69a6lE=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-kdl";
+    };
+    kitty = buildGrammar {
+      language = "kitty";
+      version = "0.0.0+rev=2e9b602";
+      src = fetchFromGitHub {
+        owner = "OXY2DEV";
+        repo = "tree-sitter-kitty";
+        rev = "2e9b602ca676cac63887cca5a4535106f3475c82";
+        hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0=";
+      };
+      meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
+    };
+    kotlin = buildGrammar {
+      language = "kotlin";
+      version = "0.0.0+rev=57fb456";
+      src = fetchFromGitHub {
+        owner = "fwcd";
+        repo = "tree-sitter-kotlin";
+        rev = "57fb4560ba8641865bc0baa6b3f413b236112c4c";
+        hash = "sha256-CA4bfWE3YkvC4v21EXdjJ2SD7mIWJbuGpnyvRwFgm8M=";
+      };
+      meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
+    };
+    koto = buildGrammar {
+      language = "koto";
+      version = "0.0.0+rev=f8b3f62";
+      src = fetchFromGitHub {
+        owner = "koto-lang";
+        repo = "tree-sitter-koto";
+        rev = "f8b3f62c0eed185dca1559789e78759d4bee60e5";
+        hash = "sha256-vv5HMDXMcSi91loIppsx/5Hu6jJ7/cedtTyahOBP780=";
+      };
+      meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
+    };
+    kusto = buildGrammar {
+      language = "kusto";
+      version = "0.0.0+rev=8353a12";
+      src = fetchFromGitHub {
+        owner = "Willem-J-an";
+        repo = "tree-sitter-kusto";
+        rev = "8353a1296607d6ba33db7c7e312226e5fc83e8ce";
+        hash = "sha256-CZCvgOtHjCgyzKFdys+ZvSWCj1I1/b2MnaJcdAtm2aY=";
+      };
+      meta.homepage = "https://github.com/Willem-J-an/tree-sitter-kusto";
+    };
+    lalrpop = buildGrammar {
+      language = "lalrpop";
+      version = "0.0.0+rev=8d38e97";
+      src = fetchFromGitHub {
+        owner = "traxys";
+        repo = "tree-sitter-lalrpop";
+        rev = "8d38e9755c05d37df8a24dadb0fc64f6588ac188";
+        hash = "sha256-rqJ0Zr9zxPkqux+DCSaUszqijFpc35fUB6sAPdGdt/0=";
+      };
+      meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop";
+    };
+    latex = buildGrammar {
+      language = "latex";
+      version = "0.0.0+rev=7e0ecdc";
+      src = fetchFromGitHub {
+        owner = "latex-lsp";
+        repo = "tree-sitter-latex";
+        rev = "7e0ecdc02926c7b9b2e0c76003d4fe7b0944f957";
+        hash = "sha256-nb1pOSHawLIw7/gaepuq2EN0a/F7/un4Xt5VCnDzvWs=";
+      };
+      generate = true;
+      meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
+    };
+    ledger = buildGrammar {
+      language = "ledger";
+      version = "0.0.0+rev=96c92d4";
+      src = fetchFromGitHub {
+        owner = "cbarrete";
+        repo = "tree-sitter-ledger";
+        rev = "96c92d4908a836bf8f661166721c98439f8afb80";
+        hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=";
+      };
+      meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
+    };
+    leo = buildGrammar {
+      language = "leo";
+      version = "0.0.0+rev=6bc5564";
+      src = fetchFromGitHub {
+        owner = "r001";
+        repo = "tree-sitter-leo";
+        rev = "6bc5564917edacd070afc4d33cf5e2e677831ea9";
+        hash = "sha256-FbV95Jm2w/9Xrqdl4bRnUyCYxFMXIuDXO4Hl4w2AUaM=";
+      };
+      meta.homepage = "https://github.com/r001/tree-sitter-leo";
+    };
+    linkerscript = buildGrammar {
+      language = "linkerscript";
+      version = "0.0.0+rev=f99011a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-linkerscript";
+        rev = "f99011a3554213b654985a4b0a65b3b032ec4621";
+        hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-linkerscript";
+    };
+    liquid = buildGrammar {
+      language = "liquid";
+      version = "0.0.0+rev=d6ebde3";
+      src = fetchFromGitHub {
+        owner = "hankthetank27";
+        repo = "tree-sitter-liquid";
+        rev = "d6ebde3974742cd1b61b55d1d94aab1dacb41056";
+        hash = "sha256-rcRbo6iyO2uC2OS0dR20xJlDlBdCoyIUc9nEv0KPWxI=";
+      };
+      meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
+    };
+    liquidsoap = buildGrammar {
+      language = "liquidsoap";
+      version = "0.0.0+rev=4de01f4";
+      src = fetchFromGitHub {
+        owner = "savonet";
+        repo = "tree-sitter-liquidsoap";
+        rev = "4de01f44de2c051c33832ce523cf44690561320d";
+        hash = "sha256-ibDpFPqdz0WnRaKN0dP1uAPi9W9EWew+kDybuPz1Bow=";
+      };
+      meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
+    };
+    llvm = buildGrammar {
+      language = "llvm";
+      version = "0.0.0+rev=2914786";
+      src = fetchFromGitHub {
+        owner = "benwilliamgraham";
+        repo = "tree-sitter-llvm";
+        rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
+        hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
+      };
+      meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
+    };
+    lua = buildGrammar {
+      language = "lua";
+      version = "0.0.0+rev=97db867";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-lua";
+        rev = "97db86785105b198a760c82f146e4b52d889f386";
+        hash = "sha256-hfCpTx4P+EcvHQrXPoEuP9J0VbhtI0ZIG9hz4tvsno4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-lua";
+    };
+    luadoc = buildGrammar {
+      language = "luadoc";
+      version = "0.0.0+rev=873612a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-luadoc";
+        rev = "873612aadd3f684dd4e631bdf42ea8990c57634e";
+        hash = "sha256-ttGBB9sn+xd9jWzjNAzpo/lwYVYZGSUGEip4K3PfBP0=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luadoc";
+    };
+    luap = buildGrammar {
+      language = "luap";
+      version = "0.0.0+rev=c134aae";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-luap";
+        rev = "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a";
+        hash = "sha256-4mMUHBsdK4U4uhh8GpKlG3p/s3ZCcLX1qATPyTD4Xhg=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luap";
+    };
+    luau = buildGrammar {
+      language = "luau";
+      version = "0.0.0+rev=a8914d6";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-luau";
+        rev = "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f";
+        hash = "sha256-5qbZA2mxTvrsfUrpgD+4y3oeJsifA91c/hfcVwQBRgI=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luau";
+    };
+    m68k = buildGrammar {
+      language = "m68k";
+      version = "0.0.0+rev=e128454";
+      src = fetchFromGitHub {
+        owner = "grahambates";
+        repo = "tree-sitter-m68k";
+        rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3";
+        hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4=";
+      };
+      meta.homepage = "https://github.com/grahambates/tree-sitter-m68k";
+    };
+    make = buildGrammar {
+      language = "make";
+      version = "0.0.0+rev=a4b9187";
+      src = fetchFromGitHub {
+        owner = "alemuller";
+        repo = "tree-sitter-make";
+        rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd";
+        hash = "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=";
+      };
+      meta.homepage = "https://github.com/alemuller/tree-sitter-make";
+    };
+    markdown = buildGrammar {
+      language = "markdown";
+      version = "0.0.0+rev=2dfd57f";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-markdown";
+        rev = "2dfd57f547f06ca5631a80f601e129d73fc8e9f0";
+        hash = "sha256-IYqh6JT74deu1UU4Nyls9Eg88BvQeYEta2UXZAbuZek=";
+      };
+      location = "tree-sitter-markdown";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
+    };
+    markdown_inline = buildGrammar {
+      language = "markdown_inline";
+      version = "0.0.0+rev=2dfd57f";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-markdown";
+        rev = "2dfd57f547f06ca5631a80f601e129d73fc8e9f0";
+        hash = "sha256-IYqh6JT74deu1UU4Nyls9Eg88BvQeYEta2UXZAbuZek=";
+      };
+      location = "tree-sitter-markdown-inline";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
+    };
+    matlab = buildGrammar {
+      language = "matlab";
+      version = "0.0.0+rev=1bccabd";
+      src = fetchFromGitHub {
+        owner = "acristoffers";
+        repo = "tree-sitter-matlab";
+        rev = "1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef";
+        hash = "sha256-V7GOXiR//JgxjTOxRi+PpfRGvunX4r3C0Bu1CrN+/K4=";
+      };
+      meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
+    };
+    menhir = buildGrammar {
+      language = "menhir";
+      version = "0.0.0+rev=be8866a";
+      src = fetchFromGitHub {
+        owner = "Kerl13";
+        repo = "tree-sitter-menhir";
+        rev = "be8866a6bcc2b563ab0de895af69daeffa88fe70";
+        hash = "sha256-CQVEQurf8Ur5xnz+g7e1nck0a32o4oeMOT78thjx8MQ=";
+      };
+      meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir";
+    };
+    mermaid = buildGrammar {
+      language = "mermaid";
+      version = "0.0.0+rev=90ae195";
+      src = fetchFromGitHub {
+        owner = "monaqa";
+        repo = "tree-sitter-mermaid";
+        rev = "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc";
+        hash = "sha256-Tt1bPqpL59FQzuI8CPljBmQoAfJPUkVC9Xe1GcfXzfE=";
+      };
+      meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid";
+    };
+    meson = buildGrammar {
+      language = "meson";
+      version = "0.0.0+rev=d4fa3c7";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-meson";
+        rev = "d4fa3c7260d1537ac5183740b9338373a673d5c0";
+        hash = "sha256-YSOmEVqS0v6Js/L3k0L4iezFVHRTNePMhJyTc3te74c=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-meson";
+    };
+    mlir = buildGrammar {
+      language = "mlir";
+      version = "0.0.0+rev=c7eec06";
+      src = fetchFromGitHub {
+        owner = "artagnon";
+        repo = "tree-sitter-mlir";
+        rev = "c7eec06be8a9ddae688e1b03fca2eed79e9801c4";
+        hash = "sha256-5OueN8krwGnMtXF1HCbA4eDINIneLzEA7DkxnMkxUhQ=";
+      };
+      generate = true;
+      meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
+    };
+    muttrc = buildGrammar {
+      language = "muttrc";
+      version = "0.0.0+rev=173b0ab";
+      src = fetchFromGitHub {
+        owner = "neomutt";
+        repo = "tree-sitter-muttrc";
+        rev = "173b0ab53a9c07962c9777189c4c70e90f1c1837";
+        hash = "sha256-zma/oyMFI+r+/616yXV9b4ptC1FNYpHlpqY/Fez++n0=";
+      };
+      meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc";
+    };
+    nasm = buildGrammar {
+      language = "nasm";
+      version = "0.0.0+rev=d1b3638";
+      src = fetchFromGitHub {
+        owner = "naclsn";
+        repo = "tree-sitter-nasm";
+        rev = "d1b3638d017f2a8585e26dcfc66fe1df94185e30";
+        hash = "sha256-38yRvaSkHZ7iRmHlXdCssJtd/RQRfBB437HzBwWv2mg=";
+      };
+      meta.homepage = "https://github.com/naclsn/tree-sitter-nasm";
+    };
+    nginx = buildGrammar {
+      language = "nginx";
+      version = "0.0.0+rev=989da76";
+      src = fetchFromGitHub {
+        owner = "opa-oz";
+        repo = "tree-sitter-nginx";
+        rev = "989da760be05a3334af3ec88705cbf57e6a9c41d";
+        hash = "sha256-tIbwsh7cnpm1jkIKaXQ7NI/LXWzEOsZyNLfe/qTNkkM=";
+      };
+      meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx";
+    };
+    nickel = buildGrammar {
+      language = "nickel";
+      version = "0.0.0+rev=a0a5d98";
+      src = fetchFromGitHub {
+        owner = "nickel-lang";
+        repo = "tree-sitter-nickel";
+        rev = "a0a5d98a6f0edb5d00a18e62e7d1d02a5607c391";
+        hash = "sha256-2la/9XxL2dN+rzTotgDXQFz9ktDXQ3Og9svX5Din2zo=";
+      };
+      meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
+    };
+    nim = buildGrammar {
+      language = "nim";
+      version = "0.0.0+rev=4ad3527";
+      src = fetchFromGitHub {
+        owner = "alaviss";
+        repo = "tree-sitter-nim";
+        rev = "4ad352773688deb84a95eeaa9872acda5b466439";
+        hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58=";
+      };
+      meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
+    };
+    nim_format_string = buildGrammar {
+      language = "nim_format_string";
+      version = "0.0.0+rev=d45f750";
+      src = fetchFromGitHub {
+        owner = "aMOPel";
+        repo = "tree-sitter-nim-format-string";
+        rev = "d45f75022d147cda056e98bfba68222c9c8eca3a";
+        hash = "sha256-hbM0JIxtZ3e2JUV4jXYO4RIO6r63nf2csvsLeIxkMn0=";
+      };
+      meta.homepage = "https://github.com/aMOPel/tree-sitter-nim-format-string";
+    };
+    ninja = buildGrammar {
+      language = "ninja";
+      version = "0.0.0+rev=0a95cfd";
+      src = fetchFromGitHub {
+        owner = "alemuller";
+        repo = "tree-sitter-ninja";
+        rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267";
+        hash = "sha256-e/LpQUL3UHHko4QvMeT40LCvPZRT7xTGZ9z1Zaboru4=";
+      };
+      meta.homepage = "https://github.com/alemuller/tree-sitter-ninja";
+    };
+    nix = buildGrammar {
+      language = "nix";
+      version = "0.0.0+rev=eabf968";
+      src = fetchFromGitHub {
+        owner = "nix-community";
+        repo = "tree-sitter-nix";
+        rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840";
+        hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY=";
+      };
+      meta.homepage = "https://github.com/nix-community/tree-sitter-nix";
+    };
+    nqc = buildGrammar {
+      language = "nqc";
+      version = "0.0.0+rev=14e6da1";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-nqc";
+        rev = "14e6da1627aaef21d2b2aa0c37d04269766dcc1d";
+        hash = "sha256-Gf6410cWLENCgI1uIBVBl4RnRuVCHkWkn6sxusmI6j4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-nqc";
+    };
+    nu = buildGrammar {
+      language = "nu";
+      version = "0.0.0+rev=4c14962";
+      src = fetchFromGitHub {
+        owner = "nushell";
+        repo = "tree-sitter-nu";
+        rev = "4c149627cc592560f77ead1c384e27ec85926407";
+        hash = "sha256-h02kb3VxSK/fxQENtj2yaRmAQ5I8rt5s5R8VrWOQWeo=";
+      };
+      meta.homepage = "https://github.com/nushell/tree-sitter-nu";
+    };
+    objc = buildGrammar {
+      language = "objc";
+      version = "0.0.0+rev=181a81b";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-objc";
+        rev = "181a81b8f23a2d593e7ab4259981f50122909fda";
+        hash = "sha256-7W8ozhQJL+f+tQYz61EZexk9NkMu1pCAP5IIy1m3qak=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-objc";
+    };
+    objdump = buildGrammar {
+      language = "objdump";
+      version = "0.0.0+rev=28d3b2e";
+      src = fetchFromGitHub {
+        owner = "ColinKennedy";
+        repo = "tree-sitter-objdump";
+        rev = "28d3b2e25a0b1881d1b47ed1924ca276c7003d45";
+        hash = "sha256-OPqIhgItghXplQ78Vlwd0G6KtDWTVkaG17RPqx1b5JY=";
+      };
+      meta.homepage = "https://github.com/ColinKennedy/tree-sitter-objdump";
+    };
+    ocaml = buildGrammar {
+      language = "ocaml";
+      version = "0.0.0+rev=3ef7c00";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-ocaml";
+        rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
+        hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
+      };
+      location = "grammars/ocaml";
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
+    };
+    ocaml_interface = buildGrammar {
+      language = "ocaml_interface";
+      version = "0.0.0+rev=3ef7c00";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-ocaml";
+        rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
+        hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
+      };
+      location = "grammars/interface";
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
+    };
+    ocamllex = buildGrammar {
+      language = "ocamllex";
+      version = "0.0.0+rev=33722b8";
+      src = fetchFromGitHub {
+        owner = "atom-ocaml";
+        repo = "tree-sitter-ocamllex";
+        rev = "33722b8be73079946a7c6dd9598e3f57956ed36d";
+        hash = "sha256-mqp/qHr1zWMJinlMJ0HNAKuFUQ4NqQiLzKx0DoN4wGI=";
+      };
+      generate = true;
+      meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
+    };
+    odin = buildGrammar {
+      language = "odin";
+      version = "0.0.0+rev=d2ca8ef";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-odin";
+        rev = "d2ca8efb4487e156a60d5bd6db2598b872629403";
+        hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-odin";
+    };
+    pascal = buildGrammar {
+      language = "pascal";
+      version = "0.0.0+rev=042119e";
+      src = fetchFromGitHub {
+        owner = "Isopod";
+        repo = "tree-sitter-pascal";
+        rev = "042119eca2e18a60e56317fb06ee3ba5c32cb447";
+        hash = "sha256-jqpY3g19YzX5T2rD4EFUAs594XrUdmk5DjkgGO6MC2g=";
+      };
+      meta.homepage = "https://github.com/Isopod/tree-sitter-pascal";
+    };
+    passwd = buildGrammar {
+      language = "passwd";
+      version = "0.0.0+rev=2023939";
+      src = fetchFromGitHub {
+        owner = "ath3";
+        repo = "tree-sitter-passwd";
+        rev = "20239395eacdc2e0923a7e5683ad3605aee7b716";
+        hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4=";
+      };
+      meta.homepage = "https://github.com/ath3/tree-sitter-passwd";
+    };
+    pem = buildGrammar {
+      language = "pem";
+      version = "0.0.0+rev=e525b17";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-pem";
+        rev = "e525b177a229b1154fd81bc0691f943028d9e685";
+        hash = "sha256-2fhqFGLdQ5eugv405osviYUcAPMdm1N0VfGoVuI84Qk=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pem";
+    };
+    perl = buildGrammar {
+      language = "perl";
+      version = "0.0.0+rev=0c24d00";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-perl";
+        repo = "tree-sitter-perl";
+        rev = "0c24d001dd1921e418fb933d208a7bd7dd3f923a";
+        hash = "sha256-rKu3CGHckXlQnI/bvrQDq40jRO4PAueWKNZJADjmv5A=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
+    };
+    php = buildGrammar {
+      language = "php";
+      version = "0.0.0+rev=7d07b41";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-php";
+        rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
+        hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo=";
+      };
+      location = "php";
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
+    };
+    php_only = buildGrammar {
+      language = "php_only";
+      version = "0.0.0+rev=7d07b41";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-php";
+        rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
+        hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo=";
+      };
+      location = "php_only";
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
+    };
+    phpdoc = buildGrammar {
+      language = "phpdoc";
+      version = "0.0.0+rev=12d5030";
+      src = fetchFromGitHub {
+        owner = "claytonrcarter";
+        repo = "tree-sitter-phpdoc";
+        rev = "12d50307e6c02e5f4f876fa6cf2edea1f7808c0d";
+        hash = "sha256-X+ElKI0ZMLCmxEanKsDRL/1KzGZfBrG7zITsT+jSrtQ=";
+      };
+      meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc";
+    };
+    pioasm = buildGrammar {
+      language = "pioasm";
+      version = "0.0.0+rev=afece58";
+      src = fetchFromGitHub {
+        owner = "leo60228";
+        repo = "tree-sitter-pioasm";
+        rev = "afece58efdb30440bddd151ef1347fa8d6f744a9";
+        hash = "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=";
+      };
+      meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
+    };
+    pkl = buildGrammar {
+      language = "pkl";
+      version = "0.0.0+rev=ac58931";
+      src = fetchFromGitHub {
+        owner = "apple";
+        repo = "tree-sitter-pkl";
+        rev = "ac58931956c000d3aeefbb55a81fc3c5bd6aecf0";
+        hash = "sha256-R0p9ceNjd9xnikxaCjDFwN4HkfRr+4ezVSlXqLP/YuQ=";
+      };
+      meta.homepage = "https://github.com/apple/tree-sitter-pkl";
+    };
+    po = buildGrammar {
+      language = "po";
+      version = "0.0.0+rev=bd860a0";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-po";
+        rev = "bd860a0f57f697162bf28e576674be9c1500db5e";
+        hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-po";
+    };
+    pod = buildGrammar {
+      language = "pod";
+      version = "0.0.0+rev=0bf8387";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-perl";
+        repo = "tree-sitter-pod";
+        rev = "0bf8387987c21bf2f8ed41d2575a8f22b139687f";
+        hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod";
+    };
+    poe_filter = buildGrammar {
+      language = "poe_filter";
+      version = "0.0.0+rev=205a7d5";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-poe-filter";
+        rev = "205a7d576984feb38a9fc2d8cfe729617f9e0548";
+        hash = "sha256-oFe/U3G5Fi73YtctonfUqZe5/UScM09c98R8C3aR7yU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-poe-filter";
+    };
+    pony = buildGrammar {
+      language = "pony";
+      version = "0.0.0+rev=73ff874";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-pony";
+        rev = "73ff874ae4c9e9b45462673cbc0a1e350e2522a7";
+        hash = "sha256-/9bTbep2AXLoiijeft9amMeFQ6fHXzItjH+bD/w6pDo=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pony";
+    };
+    powershell = buildGrammar {
+      language = "powershell";
+      version = "0.0.0+rev=7212f47";
+      src = fetchFromGitHub {
+        owner = "airbus-cert";
+        repo = "tree-sitter-powershell";
+        rev = "7212f47716ced384ac012b2cc428fd9f52f7c5d4";
+        hash = "sha256-xzDM1CdBY95XgLsEjqKWrwuIf/s6/2Q0XbxJRvOuL2o=";
+      };
+      meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
+    };
+    printf = buildGrammar {
+      language = "printf";
+      version = "0.0.0+rev=ec4e567";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-printf";
+        rev = "ec4e5674573d5554fccb87a887c97d4aec489da7";
+        hash = "sha256-JddrO4H7b3f/jrYag1lTAqeCzspf18SiIsVV2EJ25ZY=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-printf";
+    };
+    prisma = buildGrammar {
+      language = "prisma";
+      version = "0.0.0+rev=3556b2c";
+      src = fetchFromGitHub {
+        owner = "victorhqc";
+        repo = "tree-sitter-prisma";
+        rev = "3556b2c1f20ec9ac91e92d32c43d9d2a0ca3cc49";
+        hash = "sha256-VE9HUG0z6oPVlA8no011vwYI2HxufJEuXXnCGbCgI4Q=";
+      };
+      meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma";
+    };
+    problog = buildGrammar {
+      language = "problog";
+      version = "0.0.0+rev=d8d415f";
+      src = fetchFromGitHub {
+        owner = "foxyseta";
+        repo = "tree-sitter-prolog";
+        rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
+        hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
+      };
+      location = "grammars/problog";
+      meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
+    };
+    prolog = buildGrammar {
+      language = "prolog";
+      version = "0.0.0+rev=d8d415f";
+      src = fetchFromGitHub {
+        owner = "foxyseta";
+        repo = "tree-sitter-prolog";
+        rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
+        hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
+      };
+      location = "grammars/prolog";
+      meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
+    };
+    promql = buildGrammar {
+      language = "promql";
+      version = "0.0.0+rev=77625d7";
+      src = fetchFromGitHub {
+        owner = "MichaHoffmann";
+        repo = "tree-sitter-promql";
+        rev = "77625d78eebc3ffc44d114a07b2f348dff3061b0";
+        hash = "sha256-IJbnC03pDfcSAF//Ux+LqqfjtagGSD5Nu46yUo0vT5Q=";
+      };
+      meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql";
+    };
+    properties = buildGrammar {
+      language = "properties";
+      version = "0.0.0+rev=6310671";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-properties";
+        rev = "6310671b24d4e04b803577b1c675d765cbd5773b";
+        hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
+    };
+    proto = buildGrammar {
+      language = "proto";
+      version = "0.0.0+rev=e9f6b43";
+      src = fetchFromGitHub {
+        owner = "treywood";
+        repo = "tree-sitter-proto";
+        rev = "e9f6b43f6844bd2189b50a422d4e2094313f6aa3";
+        hash = "sha256-Ue6w6HWy+NTJt+AKTFfJIUf3HXHTwkUkDk4UdDMSD+U=";
+      };
+      meta.homepage = "https://github.com/treywood/tree-sitter-proto";
+    };
+    prql = buildGrammar {
+      language = "prql";
+      version = "0.0.0+rev=09e158c";
+      src = fetchFromGitHub {
+        owner = "PRQL";
+        repo = "tree-sitter-prql";
+        rev = "09e158cd3650581c0af4c49c2e5b10c4834c8646";
+        hash = "sha256-bdT7LZ2x7BdUqLJRq4ENJTaIFnciac7l2dCxOSB09CI=";
+      };
+      meta.homepage = "https://github.com/PRQL/tree-sitter-prql";
+    };
+    psv = buildGrammar {
+      language = "psv";
+      version = "0.0.0+rev=f6bf6e3";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-csv";
+        rev = "f6bf6e35eb0b95fbadea4bb39cb9709507fcb181";
+        hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o=";
+      };
+      location = "psv";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv";
+    };
+    pug = buildGrammar {
+      language = "pug";
+      version = "0.0.0+rev=13e9195";
+      src = fetchFromGitHub {
+        owner = "zealot128";
+        repo = "tree-sitter-pug";
+        rev = "13e9195370172c86a8b88184cc358b23b677cc46";
+        hash = "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=";
+      };
+      meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
+    };
+    puppet = buildGrammar {
+      language = "puppet";
+      version = "0.0.0+rev=15f1929";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-puppet";
+        rev = "15f192929b7d317f5914de2b4accd37b349182a6";
+        hash = "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-puppet";
+    };
+    purescript = buildGrammar {
+      language = "purescript";
+      version = "0.0.0+rev=f541f95";
+      src = fetchFromGitHub {
+        owner = "postsolar";
+        repo = "tree-sitter-purescript";
+        rev = "f541f95ffd6852fbbe88636317c613285bc105af";
+        hash = "sha256-tONS2Eai/eVDecn6ow4nN9F7++UjY6OAKezeCco8hYU=";
+      };
+      meta.homepage = "https://github.com/postsolar/tree-sitter-purescript";
+    };
+    pymanifest = buildGrammar {
+      language = "pymanifest";
+      version = "0.0.0+rev=debbdb8";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-pymanifest";
+        rev = "debbdb83fe6356adc7261c41c69b45ba49c97294";
+        hash = "sha256-jaWi0F9ApUSwniN3O7x05VrCceL+0x2+98iJx9+PaZo=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pymanifest";
+    };
+    python = buildGrammar {
+      language = "python";
+      version = "0.0.0+rev=v0.25.0";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-python";
+        rev = "v0.25.0";
+        hash = "sha256-F5XH21PjPpbwYylgKdwD3MZ5o0amDt4xf/e5UikPcxY=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
+    };
+    ql = buildGrammar {
+      language = "ql";
+      version = "0.0.0+rev=1fd627a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-ql";
+        rev = "1fd627a4e8bff8c24c11987474bd33112bead857";
+        hash = "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql";
+    };
+    qmldir = buildGrammar {
+      language = "qmldir";
+      version = "0.0.0+rev=6b2b5e4";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-qmldir";
+        rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841";
+        hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-qmldir";
+    };
+    qmljs = buildGrammar {
+      language = "qmljs";
+      version = "0.0.0+rev=0bec435";
+      src = fetchFromGitHub {
+        owner = "yuja";
+        repo = "tree-sitter-qmljs";
+        rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59";
+        hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g=";
+      };
+      meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";
+    };
+    query = buildGrammar {
+      language = "query";
+      version = "0.0.0+rev=a4e379d";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-query";
+        rev = "a4e379d4a4b77a09e91c1c9e12d4b898214f990e";
+        hash = "sha256-fChdW/PAE9wfUAliGr8HXBNRvKqNExAr9aD8WYUWHVo=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query";
+    };
+    r = buildGrammar {
+      language = "r";
+      version = "0.0.0+rev=0e6ef77";
+      src = fetchFromGitHub {
+        owner = "r-lib";
+        repo = "tree-sitter-r";
+        rev = "0e6ef7741712c09dc3ee6e81c42e919820cc65ef";
+        hash = "sha256-9T0wjo8i34rvR1g4WBpDFQXQodyv4kNomayGBZK9hfg=";
+      };
+      meta.homepage = "https://github.com/r-lib/tree-sitter-r";
+    };
+    racket = buildGrammar {
+      language = "racket";
+      version = "0.0.0+rev=56b5780";
+      src = fetchFromGitHub {
+        owner = "6cdh";
+        repo = "tree-sitter-racket";
+        rev = "56b57807f86aa4ddb14892572b318edd4bc90ebe";
+        hash = "sha256-YZvDzz4xcFFE/bLwT+rZb7trufNMQaCZ3o0uLrgv/E0=";
+      };
+      meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
+    };
+    ralph = buildGrammar {
+      language = "ralph";
+      version = "0.0.0+rev=f6d81bf";
+      src = fetchFromGitHub {
+        owner = "alephium";
+        repo = "tree-sitter-ralph";
+        rev = "f6d81bf7a4599c77388035439cf5801cd461ff77";
+        hash = "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA=";
+      };
+      meta.homepage = "https://github.com/alephium/tree-sitter-ralph";
+    };
+    rasi = buildGrammar {
+      language = "rasi";
+      version = "0.0.0+rev=e735c68";
+      src = fetchFromGitHub {
+        owner = "Fymyte";
+        repo = "tree-sitter-rasi";
+        rev = "e735c6881d8b475aaa4ef8f0a2bdfd825b438143";
+        hash = "sha256-MERNUroM1ndV6TtXYGg0AmXRtNlNWphVx32TzgMUnac=";
+      };
+      meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi";
+    };
+    razor = buildGrammar {
+      language = "razor";
+      version = "0.0.0+rev=fe46ce5";
+      src = fetchFromGitHub {
+        owner = "tris203";
+        repo = "tree-sitter-razor";
+        rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
+        hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
+      };
+      meta.homepage = "https://github.com/tris203/tree-sitter-razor";
+    };
+    rbs = buildGrammar {
+      language = "rbs";
+      version = "0.0.0+rev=5282e2f";
+      src = fetchFromGitHub {
+        owner = "joker1007";
+        repo = "tree-sitter-rbs";
+        rev = "5282e2f36d4109f5315c1d9486b5b0c2044622bb";
+        hash = "sha256-GE5cW1Nf7S8u5vAGcBZBzfM7mC7yXVR/Tp7hlhmkelA=";
+      };
+      meta.homepage = "https://github.com/joker1007/tree-sitter-rbs";
+    };
+    re2c = buildGrammar {
+      language = "re2c";
+      version = "0.0.0+rev=c18a3c2";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-re2c";
+        rev = "c18a3c2f4b6665e35b7e50d6048ea3cff770c572";
+        hash = "sha256-2htX4730fNAO2NKEurDOXH1OIXFd0OfuIbH1ou3a20A=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-re2c";
+    };
+    readline = buildGrammar {
+      language = "readline";
+      version = "0.0.0+rev=6b744c5";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-readline";
+        rev = "6b744c527aebd12e46a5ecb3aebdb8d621a8e83e";
+        hash = "sha256-j4rqW1H32KfEPRByHQqtL5j5GSklTDFgOQ9ST+hmv1w=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-readline";
+    };
+    regex = buildGrammar {
+      language = "regex";
+      version = "0.0.0+rev=b2ac15e";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-regex";
+        rev = "b2ac15e27fce703d2f37a79ccd94a5c0cbe9720b";
+        hash = "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
+    };
+    rego = buildGrammar {
+      language = "rego";
+      version = "0.0.0+rev=20b5a59";
+      src = fetchFromGitHub {
+        owner = "FallenAngel97";
+        repo = "tree-sitter-rego";
+        rev = "20b5a5958c837bc9f74b231022a68a594a313f6d";
+        hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=";
+      };
+      meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego";
+    };
+    requirements = buildGrammar {
+      language = "requirements";
+      version = "0.0.0+rev=caeb2ba";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-requirements";
+        rev = "caeb2ba854dea55931f76034978de1fd79362939";
+        hash = "sha256-YszXgZZSMiWBf2vIij8+5GA1FY3Ipeoow8dkrzkLl78=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-requirements";
+    };
+    rescript = buildGrammar {
+      language = "rescript";
+      version = "0.0.0+rev=d2df8a2";
+      src = fetchFromGitHub {
+        owner = "rescript-lang";
+        repo = "tree-sitter-rescript";
+        rev = "d2df8a285fff95de56a91d2f8152aeceb66f40ef";
+        hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0=";
+      };
+      meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
+    };
+    rifleconf = buildGrammar {
+      language = "rifleconf";
+      version = "0.0.0+rev=fe10eab";
+      src = fetchFromGitHub {
+        owner = "purarue";
+        repo = "tree-sitter-rifleconf";
+        rev = "fe10eab6cacff239ec61f4456e793bed15703aaf";
+        hash = "sha256-FeKu9HfGeAaQ+wfMPfic9qA870M+Cg592RY4G5HP//M=";
+      };
+      meta.homepage = "https://github.com/purarue/tree-sitter-rifleconf";
+    };
+    rnoweb = buildGrammar {
+      language = "rnoweb";
+      version = "0.0.0+rev=1a74dc0";
+      src = fetchFromGitHub {
+        owner = "bamonroe";
+        repo = "tree-sitter-rnoweb";
+        rev = "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f";
+        hash = "sha256-sCjSS6iunij2SXHNzQcTq0HKawH9i5h/vQ6yl77opXw=";
+      };
+      meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
+    };
+    robot = buildGrammar {
+      language = "robot";
+      version = "0.0.0+rev=e34def7";
+      src = fetchFromGitHub {
+        owner = "Hubro";
+        repo = "tree-sitter-robot";
+        rev = "e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a";
+        hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0=";
+      };
+      meta.homepage = "https://github.com/Hubro/tree-sitter-robot";
+    };
+    robots = buildGrammar {
+      language = "robots";
+      version = "0.0.0+rev=8e3a420";
+      src = fetchFromGitHub {
+        owner = "opa-oz";
+        repo = "tree-sitter-robots-txt";
+        rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62";
+        hash = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME=";
+      };
+      meta.homepage = "https://github.com/opa-oz/tree-sitter-robots-txt";
+    };
+    roc = buildGrammar {
+      language = "roc";
+      version = "0.0.0+rev=40e52f3";
+      src = fetchFromGitHub {
+        owner = "faldor20";
+        repo = "tree-sitter-roc";
+        rev = "40e52f343f1b1f270d6ecb2ca898ca9b8cba6936";
+        hash = "sha256-TugDNG21Y4VutMvqQJ6iEyozqcFIdFPDbpV87hqymdM=";
+      };
+      meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
+    };
+    ron = buildGrammar {
+      language = "ron";
+      version = "0.0.0+rev=7893855";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-ron";
+        rev = "78938553b93075e638035f624973083451b29055";
+        hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ron";
+    };
+    rst = buildGrammar {
+      language = "rst";
+      version = "0.0.0+rev=4e562e1";
+      src = fetchFromGitHub {
+        owner = "stsewd";
+        repo = "tree-sitter-rst";
+        rev = "4e562e1598b95b93db4f3f64fe40ddefbc677a15";
+        hash = "sha256-C65FmrEUyMQN+rF3RTN1oNVJtGiTHMZvdRyy/tMjVqY=";
+      };
+      meta.homepage = "https://github.com/stsewd/tree-sitter-rst";
+    };
+    ruby = buildGrammar {
+      language = "ruby";
+      version = "0.0.0+rev=89bd7a8";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-ruby";
+        rev = "89bd7a8e5450cb6a942418a619d30469f259e5d6";
+        hash = "sha256-84Nqw6QyGqwKAT+7Cdrzl1SikfJ3doX3tngGZWaXkVc=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
+    };
+    runescript = buildGrammar {
+      language = "runescript";
+      version = "0.0.0+rev=cf85bbd";
+      src = fetchFromGitHub {
+        owner = "2004Scape";
+        repo = "tree-sitter-runescript";
+        rev = "cf85bbd5da0c5ad243301d889c7f84d790a4cae4";
+        hash = "sha256-LRHTy5XMU2FOru7YrFlwuDU7brtnI/8RhAdQnY7Fkpk=";
+      };
+      meta.homepage = "https://github.com/2004Scape/tree-sitter-runescript";
+    };
+    rust = buildGrammar {
+      language = "rust";
+      version = "0.0.0+rev=261b202";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-rust";
+        rev = "261b20226c04ef601adbdf185a800512a5f66291";
+        hash = "sha256-i6OrbcHNkrsAW5cpYOI7r0F6xn94KZWB9ZJMUH+k2ds=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
+    };
+    scala = buildGrammar {
+      language = "scala";
+      version = "0.0.0+rev=97aead1";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-scala";
+        rev = "97aead18d97708190a51d4f551ea9b05b60641c9";
+        hash = "sha256-INJKij5XzeIkmdemTbrkucdUo9PJOrHKf4rcf6s9OSw=";
+      };
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
+    };
+    scfg = buildGrammar {
+      language = "scfg";
+      version = "0.0.0+rev=d850fd4";
+      src = fetchFromGitHub {
+        owner = "rockorager";
+        repo = "tree-sitter-scfg";
+        rev = "d850fd470445d73de318a21d734d1e09e29b773c";
+        hash = "sha256-AnyOcQFA3N6AFZiG7eLS1xCm1qX6hko9lFV4oV9p/E8=";
+      };
+      meta.homepage = "https://github.com/rockorager/tree-sitter-scfg";
+    };
+    scheme = buildGrammar {
+      language = "scheme";
+      version = "0.0.0+rev=b5c7011";
+      src = fetchFromGitHub {
+        owner = "6cdh";
+        repo = "tree-sitter-scheme";
+        rev = "b5c701148501fa056302827442b5b4956f1edc03";
+        hash = "sha256-SLuK8S03pKVVhxJTkE3ZJvNaNnmXD323YwE7ah2VxyQ=";
+      };
+      meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
+    };
+    scss = buildGrammar {
+      language = "scss";
+      version = "0.0.0+rev=c478c68";
+      src = fetchFromGitHub {
+        owner = "serenadeai";
+        repo = "tree-sitter-scss";
+        rev = "c478c6868648eff49eb04a4df90d703dc45b312a";
+        hash = "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=";
+      };
+      meta.homepage = "https://github.com/serenadeai/tree-sitter-scss";
+    };
+    sflog = buildGrammar {
+      language = "sflog";
+      version = "0.0.0+rev=3597575";
+      src = fetchFromGitHub {
+        owner = "aheber";
+        repo = "tree-sitter-sfapex";
+        rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
+        hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
+      };
+      location = "sflog";
+      meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
+    };
+    slang = buildGrammar {
+      language = "slang";
+      version = "0.0.0+rev=1dbcc4a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-slang";
+        rev = "1dbcc4abc7b3cdd663eb03d93031167d6ed19f56";
+        hash = "sha256-UsZpXEJwbKn5M9dqbAv5eJgsCdNbsllbFWtNnDPvtoE=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-slang";
+    };
+    slim = buildGrammar {
+      language = "slim";
+      version = "0.0.0+rev=a06113f";
+      src = fetchFromGitHub {
+        owner = "theoo";
+        repo = "tree-sitter-slim";
+        rev = "a06113f5175b805a37d20df0a6f9d722e0ab6cfe";
+        hash = "sha256-Uk0AltQNhVd3VHQYRN+gJWd7tnVYr7qzBce6yEdtVaw=";
+      };
+      meta.homepage = "https://github.com/theoo/tree-sitter-slim";
+    };
+    slint = buildGrammar {
+      language = "slint";
+      version = "0.0.0+rev=10fb0f1";
+      src = fetchFromGitHub {
+        owner = "slint-ui";
+        repo = "tree-sitter-slint";
+        rev = "10fb0f188d7950400773c06ba6c31075866e14bf";
+        hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
+      };
+      meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
+    };
+    smali = buildGrammar {
+      language = "smali";
+      version = "0.0.0+rev=fdfa6a1";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-smali";
+        rev = "fdfa6a1febc43c7467aa7e937b87b607956f2346";
+        hash = "sha256-S0U6Xuntz16DrpYwSqMQu8Cu7UuD/JufHUxIHv826yw=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-smali";
+    };
+    smithy = buildGrammar {
+      language = "smithy";
+      version = "0.0.0+rev=ec4fe14";
+      src = fetchFromGitHub {
+        owner = "indoorvivants";
+        repo = "tree-sitter-smithy";
+        rev = "ec4fe14586f2b0a1bc65d6db17f8d8acd8a90433";
+        hash = "sha256-wEm4HSfeZOpn1OKw7ipLhoeNko8aPKDl2abupdQq+ok=";
+      };
+      meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy";
+    };
+    snakemake = buildGrammar {
+      language = "snakemake";
+      version = "0.0.0+rev=6801043";
+      src = fetchFromGitHub {
+        owner = "osthomas";
+        repo = "tree-sitter-snakemake";
+        rev = "68010430c3e51c0e84c1ce21c6551df0e2469f51";
+        hash = "sha256-jcMNh+pHjYEvTdShp3o6UlgXRM2AuZMp4KE0uXfNMqY=";
+      };
+      meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake";
+    };
+    snl = buildGrammar {
+      language = "snl";
+      version = "0.0.0+rev=846e2d6";
+      src = fetchFromGitHub {
+        owner = "minijackson";
+        repo = "tree-sitter-snl";
+        rev = "846e2d6809ac5863a15b5494f20fd267c21221c8";
+        hash = "sha256-QJG4+fJieOivjwsJuswzzigeUiFNIOu51ILgx0/o6Vo=";
+      };
+      meta.homepage = "https://github.com/minijackson/tree-sitter-snl";
+    };
+    solidity = buildGrammar {
+      language = "solidity";
+      version = "0.0.0+rev=4e938a4";
+      src = fetchFromGitHub {
+        owner = "JoranHonig";
+        repo = "tree-sitter-solidity";
+        rev = "4e938a46c7030dd001bc99e1ac0f0c750ac98254";
+        hash = "sha256-b+DHy7BkkMg88kLhirtCzjF3dHlCFkXea65aGC18fW0=";
+      };
+      meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
+    };
+    soql = buildGrammar {
+      language = "soql";
+      version = "0.0.0+rev=3597575";
+      src = fetchFromGitHub {
+        owner = "aheber";
+        repo = "tree-sitter-sfapex";
+        rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
+        hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
+      };
+      location = "soql";
+      meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
+    };
+    sosl = buildGrammar {
+      language = "sosl";
+      version = "0.0.0+rev=3597575";
+      src = fetchFromGitHub {
+        owner = "aheber";
+        repo = "tree-sitter-sfapex";
+        rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d";
+        hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80=";
+      };
+      location = "sosl";
+      meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
+    };
+    sourcepawn = buildGrammar {
+      language = "sourcepawn";
+      version = "0.0.0+rev=5a8fdd4";
+      src = fetchFromGitHub {
+        owner = "nilshelmig";
+        repo = "tree-sitter-sourcepawn";
+        rev = "5a8fdd446b516c81e218245c12129c6ad4bccfa2";
+        hash = "sha256-TfLCG2Ro3QnGStyCNqHwO54HQMR2fEOV6FjBv+0LjJ0=";
+      };
+      meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn";
+    };
+    sparql = buildGrammar {
+      language = "sparql";
+      version = "0.0.0+rev=1ef52d3";
+      src = fetchFromGitHub {
+        owner = "GordianDziwis";
+        repo = "tree-sitter-sparql";
+        rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
+        hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";
+      };
+      meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql";
+    };
+    sproto = buildGrammar {
+      language = "sproto";
+      version = "0.0.0+rev=d554c14";
+      src = fetchFromGitHub {
+        owner = "hanxi";
+        repo = "tree-sitter-sproto";
+        rev = "d554c1456e35e7b2690552d52921c987d0cf6799";
+        hash = "sha256-acc5Si2l9WGBlM1piSiqY/JEj+LSJ0QoZf9cfbrjhq4=";
+      };
+      meta.homepage = "https://github.com/hanxi/tree-sitter-sproto";
+    };
+    sql = buildGrammar {
+      language = "sql";
+      version = "0.0.0+rev=2d5dcd1";
+      src = fetchFromGitHub {
+        owner = "derekstride";
+        repo = "tree-sitter-sql";
+        rev = "2d5dcd16f9ee49cb5a6d99eabb00fd4ea298587f";
+        hash = "sha256-TaM4JWAEvvAEsH2pI+disiWdrBYaMKzq4JtgsfSZqBE=";
+      };
+      meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
+    };
+    squirrel = buildGrammar {
+      language = "squirrel";
+      version = "0.0.0+rev=072c969";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-squirrel";
+        rev = "072c969749e66f000dba35a33c387650e203e96e";
+        hash = "sha256-tJBmxTD4hi9zxXMEuAX+uslo45zEawh09+tgv56s/AU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-squirrel";
+    };
+    ssh_config = buildGrammar {
+      language = "ssh_config";
+      version = "0.0.0+rev=71d2693";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-ssh-config";
+        rev = "71d2693deadaca8cdc09e38ba41d2f6042da1616";
+        hash = "sha256-LvdvnzpqjuVAf5DZmxYfELV3C+U1iJuG9B+UCQD47qo=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ssh-config";
+    };
+    starlark = buildGrammar {
+      language = "starlark";
+      version = "0.0.0+rev=a453dbf";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-starlark";
+        rev = "a453dbf3ba433db0e5ec621a38a7e59d72e4dc69";
+        hash = "sha256-iBchBq9NE4QqHc8MbWs4YgzUH6EB0W7RCIk07I6Zm+I=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-starlark";
+    };
+    strace = buildGrammar {
+      language = "strace";
+      version = "0.0.0+rev=ac874dd";
+      src = fetchFromGitHub {
+        owner = "sigmaSd";
+        repo = "tree-sitter-strace";
+        rev = "ac874ddfcc08d689fee1f4533789e06d88388f29";
+        hash = "sha256-BGCbpw85+NNQMF+emS2hllbIeTmiFvveFzlK5lKaD5U=";
+      };
+      meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace";
+    };
+    styled = buildGrammar {
+      language = "styled";
+      version = "0.0.0+rev=319cdca";
+      src = fetchFromGitHub {
+        owner = "mskelton";
+        repo = "tree-sitter-styled";
+        rev = "319cdcaa0346ba6db668a222d938e5c3569e2a51";
+        hash = "sha256-sKRSgN5mSF+uolWD6iKrCR83Ssroytr8ZGduTTyyxGQ=";
+      };
+      meta.homepage = "https://github.com/mskelton/tree-sitter-styled";
+    };
+    supercollider = buildGrammar {
+      language = "supercollider";
+      version = "0.0.0+rev=76b3cab";
+      src = fetchFromGitHub {
+        owner = "madskjeldgaard";
+        repo = "tree-sitter-supercollider";
+        rev = "76b3cab1773f08bb7d3a185420b0a44c6da8c294";
+        hash = "sha256-drn1S4gNm6fOSUTCa/CrAqCWoUn16y1hpaZBCPpyaNE=";
+      };
+      meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider";
+    };
+    superhtml = buildGrammar {
+      language = "superhtml";
+      version = "0.0.0+rev=8b5bb27";
+      src = fetchFromGitHub {
+        owner = "kristoff-it";
+        repo = "superhtml";
+        rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902";
+        hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A=";
+      };
+      location = "tree-sitter-superhtml";
+      meta.homepage = "https://github.com/kristoff-it/superhtml";
+    };
+    surface = buildGrammar {
+      language = "surface";
+      version = "0.0.0+rev=f4586b3";
+      src = fetchFromGitHub {
+        owner = "connorlay";
+        repo = "tree-sitter-surface";
+        rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032";
+        hash = "sha256-Fn/pF8yvU+Ll7WmoMHnEcNxb3dsfNhuKhXA1UgXeviA=";
+      };
+      meta.homepage = "https://github.com/connorlay/tree-sitter-surface";
+    };
+    svelte = buildGrammar {
+      language = "svelte";
+      version = "0.0.0+rev=ae5199d";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-svelte";
+        rev = "ae5199db47757f785e43a14b332118a5474de1a2";
+        hash = "sha256-cH9h7i6MImw7KlcuVQ6XVKNjd9dFjo93J1JdTWmEpV4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte";
+    };
+    sway = buildGrammar {
+      language = "sway";
+      version = "0.0.0+rev=9b7845c";
+      src = fetchFromGitHub {
+        owner = "FuelLabs";
+        repo = "tree-sitter-sway";
+        rev = "9b7845ce06ecb38b040c3940970b4fd0adc331d1";
+        hash = "sha256-+BRw4OFQb7FljdKCj5mruK0L9wsZ+1UDTykVLS9wjoY=";
+      };
+      meta.homepage = "https://github.com/FuelLabs/tree-sitter-sway.git";
+    };
+    swift = buildGrammar {
+      language = "swift";
+      version = "0.0.0+rev=78d84ef";
+      src = fetchFromGitHub {
+        owner = "alex-pinkus";
+        repo = "tree-sitter-swift";
+        rev = "78d84ef82c387fceeb6094038da28717ea052e39";
+        hash = "sha256-ApR65kRt1j1K5yngBEH1SxDDXzZaUF4gqVieducvkHU=";
+      };
+      generate = true;
+      meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
+    };
+    sxhkdrc = buildGrammar {
+      language = "sxhkdrc";
+      version = "0.0.0+rev=440d5f9";
+      src = fetchFromGitHub {
+        owner = "RaafatTurki";
+        repo = "tree-sitter-sxhkdrc";
+        rev = "440d5f913d9465c9c776a1bd92334d32febcf065";
+        hash = "sha256-AGhGYomrMe6Wj+EHLQT4v0BiU4jxhxXpVQkU2xU/1ZI=";
+      };
+      meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc";
+    };
+    systemtap = buildGrammar {
+      language = "systemtap";
+      version = "0.0.0+rev=f2b378a";
+      src = fetchFromGitHub {
+        owner = "ok-ryoko";
+        repo = "tree-sitter-systemtap";
+        rev = "f2b378a9af0b7e1192cff67a5fb45508c927205d";
+        hash = "sha256-HzV6RZMTSa41Q5hMiM1FwiHLbho62fuywtKzqrwjNDQ=";
+      };
+      meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap";
+    };
+    systemverilog = buildGrammar {
+      language = "systemverilog";
+      version = "0.0.0+rev=7c4b01b";
+      src = fetchFromGitHub {
+        owner = "gmlarumbe";
+        repo = "tree-sitter-systemverilog";
+        rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2";
+        hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc=";
+      };
+      meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
+    };
+    t32 = buildGrammar {
+      language = "t32";
+      version = "0.0.0+rev=5b5e433";
+      src = fetchFromGitHub {
+        owner = "xasc";
+        repo = "tree-sitter-t32";
+        rev = "5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75";
+        hash = "sha256-dAbjM+wlKtJ3cY3zdRgsdsjJ0ZYDZxTL0mcunqqNbvw=";
+      };
+      meta.homepage = "https://github.com/xasc/tree-sitter-t32";
+    };
+    tablegen = buildGrammar {
+      language = "tablegen";
+      version = "0.0.0+rev=b117088";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-tablegen";
+        rev = "b1170880c61355aaf38fc06f4af7d3c55abdabc4";
+        hash = "sha256-uJCn2RdTnOf/guBUhfodgQ8pMshNh+xUJZunoLwNgrM=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tablegen";
+    };
+    tact = buildGrammar {
+      language = "tact";
+      version = "0.0.0+rev=a6267c2";
+      src = fetchFromGitHub {
+        owner = "tact-lang";
+        repo = "tree-sitter-tact";
+        rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad";
+        hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM=";
+      };
+      meta.homepage = "https://github.com/tact-lang/tree-sitter-tact";
+    };
+    tcl = buildGrammar {
+      language = "tcl";
+      version = "0.0.0+rev=8f11ac7";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-tcl";
+        rev = "8f11ac7206a54ed11210491cee1e0657e2962c47";
+        hash = "sha256-JrGSHGolf7OhInxotXslw1QXxJscl+bXCxZPYJeBfTY=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl";
+    };
+    teal = buildGrammar {
+      language = "teal";
+      version = "0.0.0+rev=05d276e";
+      src = fetchFromGitHub {
+        owner = "euclidianAce";
+        repo = "tree-sitter-teal";
+        rev = "05d276e737055e6f77a21335b7573c9d3c091e2f";
+        hash = "sha256-JDqWr895Ob1Jn3Kf44xbkMJqyna0AiMBU5xJpA6ZP7w=";
+      };
+      generate = true;
+      meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
+    };
+    templ = buildGrammar {
+      language = "templ";
+      version = "0.0.0+rev=3057cd4";
+      src = fetchFromGitHub {
+        owner = "vrischmann";
+        repo = "tree-sitter-templ";
+        rev = "3057cd485f7f23a8ad24107c6adc604f8c5ce3db";
+        hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0=";
+      };
+      meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
+    };
+    tera = buildGrammar {
+      language = "tera";
+      version = "0.0.0+rev=3a38c36";
+      src = fetchFromGitHub {
+        owner = "uncenter";
+        repo = "tree-sitter-tera";
+        rev = "3a38c368e806268daac9923a27e72bcafbbc16bb";
+        hash = "sha256-JyH5iBaqW+qylqkZEN+JmG3NkMc5NKGwHp/xJ3NRR2Y=";
+      };
+      meta.homepage = "https://github.com/uncenter/tree-sitter-tera";
+    };
+    terraform = buildGrammar {
+      language = "terraform";
+      version = "0.0.0+rev=fad9918";
+      src = fetchFromGitHub {
+        owner = "MichaHoffmann";
+        repo = "tree-sitter-hcl";
+        rev = "fad991865fee927dd1de5e172fb3f08ac674d914";
+        hash = "sha256-Kq0KtkF6xtZcN2s8KzYGyguJH2iOTlA2WRytZ+KGTUE=";
+      };
+      location = "dialects/terraform";
+      meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
+    };
+    textproto = buildGrammar {
+      language = "textproto";
+      version = "0.0.0+rev=568471b";
+      src = fetchFromGitHub {
+        owner = "PorterAtGoogle";
+        repo = "tree-sitter-textproto";
+        rev = "568471b80fd8793d37ed01865d8c2208a9fefd1b";
+        hash = "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ=";
+      };
+      meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto";
+    };
+    thrift = buildGrammar {
+      language = "thrift";
+      version = "0.0.0+rev=68fd0d8";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-thrift";
+        rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf";
+        hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-thrift";
+    };
+    tiger = buildGrammar {
+      language = "tiger";
+      version = "0.0.0+rev=4a77b2d";
+      src = fetchFromGitHub {
+        owner = "ambroisie";
+        repo = "tree-sitter-tiger";
+        rev = "4a77b2d7a004587646bddc4e854779044b6db459";
+        hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=";
+      };
+      meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger";
+    };
+    tlaplus = buildGrammar {
+      language = "tlaplus";
+      version = "0.0.0+rev=2d83194";
+      src = fetchFromGitHub {
+        owner = "tlaplus-community";
+        repo = "tree-sitter-tlaplus";
+        rev = "2d831940c782850f64dabf5b7b17e9e51f7f0ebb";
+        hash = "sha256-AW22SNBF6Y2jD6ROwE3vANWGX08HqR0XjVkthAL+QJs=";
+      };
+      meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
+    };
+    tmux = buildGrammar {
+      language = "tmux";
+      version = "0.0.0+rev=75d1b99";
+      src = fetchFromGitHub {
+        owner = "Freed-Wu";
+        repo = "tree-sitter-tmux";
+        rev = "75d1b995b0c23400ac8e49db757a2e0386f9fa8f";
+        hash = "sha256-LdXPdijcsfPYIrbTMDIy46wqOaJfxwVBVpOVVfXrJIg=";
+      };
+      meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux";
+    };
+    todotxt = buildGrammar {
+      language = "todotxt";
+      version = "0.0.0+rev=3937c5c";
+      src = fetchFromGitHub {
+        owner = "arnarg";
+        repo = "tree-sitter-todotxt";
+        rev = "3937c5cd105ec4127448651a21aef45f52d19609";
+        hash = "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=";
+      };
+      meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt";
+    };
+    toml = buildGrammar {
+      language = "toml";
+      version = "0.0.0+rev=64b5683";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-toml";
+        rev = "64b56832c2cffe41758f28e05c756a3a98d16f41";
+        hash = "sha256-m9RlGkHiOL/PNENrdEPqtPlahSqGymsx7gZrCoN/Lsk=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-toml";
+    };
+    tsv = buildGrammar {
+      language = "tsv";
+      version = "0.0.0+rev=f6bf6e3";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-csv";
+        rev = "f6bf6e35eb0b95fbadea4bb39cb9709507fcb181";
+        hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o=";
+      };
+      location = "tsv";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv";
+    };
+    tsx = buildGrammar {
+      language = "tsx";
+      version = "0.0.0+rev=75b3874";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-typescript";
+        rev = "75b3874edb2dc714fb1fd77a32013d0f8699989f";
+        hash = "sha256-A0M6IBoY87ekSV4DfGHDU5zzFWdLjGqSyVr6VENgA+s=";
+      };
+      location = "tsx";
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
+    };
+    turtle = buildGrammar {
+      language = "turtle";
+      version = "0.0.0+rev=7f789ea";
+      src = fetchFromGitHub {
+        owner = "GordianDziwis";
+        repo = "tree-sitter-turtle";
+        rev = "7f789ea7ef765080f71a298fc96b7c957fa24422";
+        hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=";
+      };
+      meta.homepage = "https://github.com/GordianDziwis/tree-sitter-turtle";
+    };
+    twig = buildGrammar {
+      language = "twig";
+      version = "0.0.0+rev=7195ee5";
+      src = fetchFromGitHub {
+        owner = "gbprod";
+        repo = "tree-sitter-twig";
+        rev = "7195ee573ab5c3b3bb0e91b042e6f83ac1b11104";
+        hash = "sha256-wQ5pHFU35wqT3UxHIZ/cP8RPPX+mpGQCoBr9ilRfc4w=";
+      };
+      meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
+    };
+    typescript = buildGrammar {
+      language = "typescript";
+      version = "0.0.0+rev=75b3874";
+      src = fetchFromGitHub {
+        owner = "tree-sitter";
+        repo = "tree-sitter-typescript";
+        rev = "75b3874edb2dc714fb1fd77a32013d0f8699989f";
+        hash = "sha256-A0M6IBoY87ekSV4DfGHDU5zzFWdLjGqSyVr6VENgA+s=";
+      };
+      location = "typescript";
+      meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
+    };
+    typespec = buildGrammar {
+      language = "typespec";
+      version = "0.0.0+rev=814c982";
+      src = fetchFromGitHub {
+        owner = "happenslol";
+        repo = "tree-sitter-typespec";
+        rev = "814c98283fd92a248ba9d49ebfe61bc672a35875";
+        hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c=";
+      };
+      meta.homepage = "https://github.com/happenslol/tree-sitter-typespec";
+    };
+    typoscript = buildGrammar {
+      language = "typoscript";
+      version = "0.0.0+rev=1811c76";
+      src = fetchFromGitHub {
+        owner = "Teddytrombone";
+        repo = "tree-sitter-typoscript";
+        rev = "1811c767f3f72be669891b524a07c58b1eb0db87";
+        hash = "sha256-Eu7YMaMH1Xz2H3lmpYOqG42MA29Decaw27bpIwP5I/0=";
+      };
+      meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
+    };
+    typst = buildGrammar {
+      language = "typst";
+      version = "0.0.0+rev=46cf4de";
+      src = fetchFromGitHub {
+        owner = "uben0";
+        repo = "tree-sitter-typst";
+        rev = "46cf4ded12ee974a70bf8457263b67ad7ee0379d";
+        hash = "sha256-s/9R3DKA6dix6BkU4mGXaVggE4bnzOyu20T1wuqHQxk=";
+      };
+      meta.homepage = "https://github.com/uben0/tree-sitter-typst";
+    };
+    udev = buildGrammar {
+      language = "udev";
+      version = "0.0.0+rev=2fcb563";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-udev";
+        rev = "2fcb563a4d56a6b8e8c129252325fc6335e4acbf";
+        hash = "sha256-EZwYyhMOPlQoeIRCbHOIfMaO5WEK6eKIVeC1NQgm+is=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-udev";
+    };
+    ungrammar = buildGrammar {
+      language = "ungrammar";
+      version = "0.0.0+rev=debd26f";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-ungrammar";
+        rev = "debd26fed283d80456ebafa33a06957b0c52e451";
+        hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ungrammar";
+    };
+    unison = buildGrammar {
+      language = "unison";
+      version = "0.0.0+rev=169e7f7";
+      src = fetchFromGitHub {
+        owner = "kylegoetz";
+        repo = "tree-sitter-unison";
+        rev = "169e7f748a540ec360c0cb086b448faad012caa4";
+        hash = "sha256-0HOLtLh1zRdaGQqchT5zFegWKJHkQe9r7DGKL6sSkPo=";
+      };
+      generate = true;
+      meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
+    };
+    usd = buildGrammar {
+      language = "usd";
+      version = "0.0.0+rev=4e0875f";
+      src = fetchFromGitHub {
+        owner = "ColinKennedy";
+        repo = "tree-sitter-usd";
+        rev = "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216";
+        hash = "sha256-r6Sm8FiTgxdYc5cAG5JXVtA5/2jID5H/xmKbjSYn/zI=";
+      };
+      meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd";
+    };
+    uxntal = buildGrammar {
+      language = "uxntal";
+      version = "0.0.0+rev=ad9b638";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-uxntal";
+        rev = "ad9b638b914095320de85d59c49ab271603af048";
+        hash = "sha256-hR0EaYv1++MJ0pdBl3ZtyEljitnp5hgFWQa9F6b1KE4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-uxntal";
+    };
+    v = buildGrammar {
+      language = "v";
+      version = "0.0.0+rev=5f6c9c4";
+      src = fetchFromGitHub {
+        owner = "vlang";
+        repo = "v-analyzer";
+        rev = "5f6c9c414f6e1ca3b991830c2d32b4cb83bef383";
+        hash = "sha256-dyiAqfc6I1FG+C0pLzUaKqEWesLqvdYZ9gL5rgkikAU=";
+      };
+      location = "tree_sitter_v";
+      meta.homepage = "https://github.com/vlang/v-analyzer";
+    };
+    vala = buildGrammar {
+      language = "vala";
+      version = "0.0.0+rev=97e6db3";
+      src = fetchFromGitHub {
+        owner = "vala-lang";
+        repo = "tree-sitter-vala";
+        rev = "97e6db3c8c73b15a9541a458d8e797a07f588ef4";
+        hash = "sha256-hAekweZGDHVrWVd04RrN+9Jz0D2kode+DpceTlUXii0=";
+      };
+      meta.homepage = "https://github.com/vala-lang/tree-sitter-vala";
+    };
+    vento = buildGrammar {
+      language = "vento";
+      version = "0.0.0+rev=3b32474";
+      src = fetchFromGitHub {
+        owner = "ventojs";
+        repo = "tree-sitter-vento";
+        rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
+        hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
+      };
+      meta.homepage = "https://github.com/ventojs/tree-sitter-vento";
+    };
+    vhdl = buildGrammar {
+      language = "vhdl";
+      version = "0.0.0+rev=7ae08de";
+      src = fetchFromGitHub {
+        owner = "jpt13653903";
+        repo = "tree-sitter-vhdl";
+        rev = "7ae08deb5d1641aa57111342218ca1e1b3a5d539";
+        hash = "sha256-IJ6Gqq+3YJlL4n4cjtCLUCZKpLVJQa81nQrLsJBCccs=";
+      };
+      meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
+    };
+    vhs = buildGrammar {
+      language = "vhs";
+      version = "0.0.0+rev=0c6fae9";
+      src = fetchFromGitHub {
+        owner = "charmbracelet";
+        repo = "tree-sitter-vhs";
+        rev = "0c6fae9d2cfc5b217bfd1fe84a7678f5917116db";
+        hash = "sha256-o7Q/3wwiCjxO6hBfj1Wxoz2y6+wxLH+oCLiapox7+Hk=";
+      };
+      meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs";
+    };
+    vim = buildGrammar {
+      language = "vim";
+      version = "0.0.0+rev=8b8db7d";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-vim";
+        rev = "8b8db7d8e4db799ab6b0db25a7990c2890133c1e";
+        hash = "sha256-fMeDDK0pdpZ37mSGvvcw9PjxqyOMF6TVDib71GaWqO4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim";
+    };
+    vimdoc = buildGrammar {
+      language = "vimdoc";
+      version = "0.0.0+rev=f061895";
+      src = fetchFromGitHub {
+        owner = "neovim";
+        repo = "tree-sitter-vimdoc";
+        rev = "f061895a0eff1d5b90e4fb60d21d87be3267031a";
+        hash = "sha256-K3nzoLlzbgIJc7EnqgYgNDLCBXOg7oy9eV2lI0duwaE=";
+      };
+      meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
+    };
+    vrl = buildGrammar {
+      language = "vrl";
+      version = "0.0.0+rev=274b3ce";
+      src = fetchFromGitHub {
+        owner = "belltoy";
+        repo = "tree-sitter-vrl";
+        rev = "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba";
+        hash = "sha256-R+wuG8UkvGA11uTiiUAdzzgjRv1ik4W+qh3YwIREUd4=";
+      };
+      meta.homepage = "https://github.com/belltoy/tree-sitter-vrl";
+    };
+    vue = buildGrammar {
+      language = "vue";
+      version = "0.0.0+rev=22bdfa6";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-vue";
+        rev = "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff";
+        hash = "sha256-LnmUtJJpBIZPTJqrQQ7WI8V44hPw3yxR+j2jR0pHIdY=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vue";
+    };
+    wgsl = buildGrammar {
+      language = "wgsl";
+      version = "0.0.0+rev=40259f3";
+      src = fetchFromGitHub {
+        owner = "szebniok";
+        repo = "tree-sitter-wgsl";
+        rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65";
+        hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=";
+      };
+      meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl";
+    };
+    wgsl_bevy = buildGrammar {
+      language = "wgsl_bevy";
+      version = "0.0.0+rev=d9306a7";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-wgsl-bevy";
+        rev = "d9306a798ede627001a8e5752f775858c8edd7e4";
+        hash = "sha256-G92wC2BJXGl+eogbuiaSOLKss+5QTm9RFFRSc2Rgqzw=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy";
+    };
+    wing = buildGrammar {
+      language = "wing";
+      version = "0.0.0+rev=76e0c25";
+      src = fetchFromGitHub {
+        owner = "winglang";
+        repo = "tree-sitter-wing";
+        rev = "76e0c25844a66ebc6e866d690fcc5f4e90698947";
+        hash = "sha256-N16cZK1dERqFd1FR35AfrsBy5EeeOPSp0FaZ83pMt7I=";
+      };
+      meta.homepage = "https://github.com/winglang/tree-sitter-wing";
+    };
+    wit = buildGrammar {
+      language = "wit";
+      version = "0.0.0+rev=v1.2.0";
+      src = fetchFromGitHub {
+        owner = "bytecodealliance";
+        repo = "tree-sitter-wit";
+        rev = "v1.2.0";
+        hash = "sha256-scye60ETUak1mXJXC+UY5sqbuqAcjxCsm4+AVJHhGws=";
+      };
+      meta.homepage = "https://github.com/bytecodealliance/tree-sitter-wit";
+    };
+    wxml = buildGrammar {
+      language = "wxml";
+      version = "0.0.0+rev=7b821c7";
+      src = fetchFromGitHub {
+        owner = "BlockLune";
+        repo = "tree-sitter-wxml";
+        rev = "7b821c748dc410332f59496c0dea2632168c4e5a";
+        hash = "sha256-ZJeBKccEreak/Fs/Zi5E3m2S//s2R54KwFK3atoCvf0=";
+      };
+      meta.homepage = "https://github.com/BlockLune/tree-sitter-wxml";
+    };
+    xcompose = buildGrammar {
+      language = "xcompose";
+      version = "0.0.0+rev=a51d636";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-xcompose";
+        rev = "a51d6366f041dbefec4da39a7eb3168a9b1cbc0e";
+        hash = "sha256-3V+elXkVBk2aZnDy5Q/MDpBWEWb/mvjh2t2pnjnzgA0=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xcompose";
+    };
+    xml = buildGrammar {
+      language = "xml";
+      version = "0.0.0+rev=863dbc3";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-xml";
+        rev = "863dbc381f44f6c136a399e684383b977bb2beaa";
+        hash = "sha256-0ztP30xWqVWy5upWPp0JwhpQphOJufzlcYn+KvLejVs=";
+      };
+      location = "xml";
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
+    };
+    xresources = buildGrammar {
+      language = "xresources";
+      version = "0.0.0+rev=ff2b89e";
+      src = fetchFromGitHub {
+        owner = "ValdezFOmar";
+        repo = "tree-sitter-xresources";
+        rev = "ff2b89e99d7760e77544b662125df84d7be1641d";
+        hash = "sha256-7vAW7ak7F21dkkKB58In4j8h0GGmNZBj3hoyTpNlSt8=";
+      };
+      meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
+    };
+    yaml = buildGrammar {
+      language = "yaml";
+      version = "0.0.0+rev=7708026";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-yaml";
+        rev = "7708026449bed86239b1cd5bce6e3c34dbca6415";
+        hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml";
+    };
+    yang = buildGrammar {
+      language = "yang";
+      version = "0.0.0+rev=2c0e6be";
+      src = fetchFromGitHub {
+        owner = "Hubro";
+        repo = "tree-sitter-yang";
+        rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502";
+        hash = "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8=";
+      };
+      meta.homepage = "https://github.com/Hubro/tree-sitter-yang";
+    };
+    yuck = buildGrammar {
+      language = "yuck";
+      version = "0.0.0+rev=e877f6a";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-yuck";
+        rev = "e877f6ade4b77d5ef8787075141053631ba12318";
+        hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck";
+    };
+    zathurarc = buildGrammar {
+      language = "zathurarc";
+      version = "0.0.0+rev=0554b4a";
+      src = fetchFromGitHub {
+        owner = "Freed-Wu";
+        repo = "tree-sitter-zathurarc";
+        rev = "0554b4a5d313244b7fc000cbb41c04afae4f4e31";
+        hash = "sha256-edwLcz1WlcRJOoV2Unpho8wmi7TmcpwysBOAdRKprNw=";
+      };
+      meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc";
+    };
+    zig = buildGrammar {
+      language = "zig";
+      version = "0.0.0+rev=6479aa1";
+      src = fetchFromGitHub {
+        owner = "tree-sitter-grammars";
+        repo = "tree-sitter-zig";
+        rev = "6479aa13f32f701c383083d8b28360ebd682fb7d";
+        hash = "sha256-T9Q6EhJ20tH5v1fUlnNA3UcdX52DMZE/PQjPWQtcHw0=";
+      };
+      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-zig";
+    };
+    ziggy = buildGrammar {
+      language = "ziggy";
+      version = "0.0.0+rev=4353b20";
+      src = fetchFromGitHub {
+        owner = "kristoff-it";
+        repo = "ziggy";
+        rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901";
+        hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4=";
+      };
+      location = "tree-sitter-ziggy";
+      meta.homepage = "https://github.com/kristoff-it/ziggy";
+    };
+    ziggy_schema = buildGrammar {
+      language = "ziggy_schema";
+      version = "0.0.0+rev=4353b20";
+      src = fetchFromGitHub {
+        owner = "kristoff-it";
+        repo = "ziggy";
+        rev = "4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901";
+        hash = "sha256-7XZNKUrOkpPMge6nDSiEBlUAf7dZLDcVcJ7fHT8fPh4=";
+      };
+      location = "tree-sitter-ziggy-schema";
+      meta.homepage = "https://github.com/kristoff-it/ziggy";
+    };
+    zsh = buildGrammar {
+      language = "zsh";
+      version = "0.0.0+rev=v0.52.1";
+      src = fetchFromGitHub {
+        owner = "georgeharker";
+        repo = "tree-sitter-zsh";
+        rev = "v0.52.1";
+        hash = "sha256-PDu7Pw7AcuFa5lUfTpO4TRMuOxs9tB6Xl+Ps8dP5OUk=";
+      };
+      meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh";
+    };
+  };
+
+  queries = {
+    ada = buildQueries {
+      language = "ada";
+    };
+    agda = buildQueries {
+      language = "agda";
+    };
+    angular = buildQueries {
+      language = "angular";
+    };
+    apex = buildQueries {
+      language = "apex";
+    };
+    arduino = buildQueries {
+      language = "arduino";
+    };
+    asm = buildQueries {
+      language = "asm";
+    };
+    astro = buildQueries {
+      language = "astro";
+    };
+    authzed = buildQueries {
+      language = "authzed";
+    };
+    awk = buildQueries {
+      language = "awk";
+    };
+    bash = buildQueries {
+      language = "bash";
+    };
+    bass = buildQueries {
+      language = "bass";
+    };
+    beancount = buildQueries {
+      language = "beancount";
+    };
+    bibtex = buildQueries {
+      language = "bibtex";
+    };
+    bicep = buildQueries {
+      language = "bicep";
+    };
+    bitbake = buildQueries {
+      language = "bitbake";
+    };
+    blade = buildQueries {
+      language = "blade";
+    };
+    bp = buildQueries {
+      language = "bp";
+    };
+    brightscript = buildQueries {
+      language = "brightscript";
+    };
+    c = buildQueries {
+      language = "c";
+    };
+    c3 = buildQueries {
+      language = "c3";
+    };
+    c_sharp = buildQueries {
+      language = "c_sharp";
+    };
+    caddy = buildQueries {
+      language = "caddy";
+    };
+    cairo = buildQueries {
+      language = "cairo";
+    };
+    capnp = buildQueries {
+      language = "capnp";
+    };
+    chatito = buildQueries {
+      language = "chatito";
+    };
+    circom = buildQueries {
+      language = "circom";
+    };
+    clojure = buildQueries {
+      language = "clojure";
+    };
+    cmake = buildQueries {
+      language = "cmake";
+    };
+    comment = buildQueries {
+      language = "comment";
+    };
+    commonlisp = buildQueries {
+      language = "commonlisp";
+    };
+    cooklang = buildQueries {
+      language = "cooklang";
+    };
+    corn = buildQueries {
+      language = "corn";
+    };
+    cpon = buildQueries {
+      language = "cpon";
+    };
+    cpp = buildQueries {
+      language = "cpp";
+    };
+    css = buildQueries {
+      language = "css";
+    };
+    csv = buildQueries {
+      language = "csv";
+    };
+    cuda = buildQueries {
+      language = "cuda";
+    };
+    cue = buildQueries {
+      language = "cue";
+    };
+    cylc = buildQueries {
+      language = "cylc";
+    };
+    d = buildQueries {
+      language = "d";
+    };
+    dart = buildQueries {
+      language = "dart";
+    };
+    desktop = buildQueries {
+      language = "desktop";
+    };
+    devicetree = buildQueries {
+      language = "devicetree";
+    };
+    dhall = buildQueries {
+      language = "dhall";
+    };
+    diff = buildQueries {
+      language = "diff";
+    };
+    disassembly = buildQueries {
+      language = "disassembly";
+    };
+    djot = buildQueries {
+      language = "djot";
+    };
+    dockerfile = buildQueries {
+      language = "dockerfile";
+    };
+    dot = buildQueries {
+      language = "dot";
+    };
+    doxygen = buildQueries {
+      language = "doxygen";
+    };
+    dtd = buildQueries {
+      language = "dtd";
+    };
+    earthfile = buildQueries {
+      language = "earthfile";
+    };
+    ebnf = buildQueries {
+      language = "ebnf";
+    };
+    ecma = buildQueries {
+      language = "ecma";
+    };
+    editorconfig = buildQueries {
+      language = "editorconfig";
+    };
+    eds = buildQueries {
+      language = "eds";
+    };
+    eex = buildQueries {
+      language = "eex";
+    };
+    elixir = buildQueries {
+      language = "elixir";
+    };
+    elm = buildQueries {
+      language = "elm";
+    };
+    elsa = buildQueries {
+      language = "elsa";
+    };
+    elvish = buildQueries {
+      language = "elvish";
+    };
+    embedded_template = buildQueries {
+      language = "embedded_template";
+    };
+    enforce = buildQueries {
+      language = "enforce";
+    };
+    erlang = buildQueries {
+      language = "erlang";
+    };
+    facility = buildQueries {
+      language = "facility";
+    };
+    faust = buildQueries {
+      language = "faust";
+    };
+    fennel = buildQueries {
+      language = "fennel";
+    };
+    fidl = buildQueries {
+      language = "fidl";
+    };
+    firrtl = buildQueries {
+      language = "firrtl";
+    };
+    fish = buildQueries {
+      language = "fish";
+    };
+    foam = buildQueries {
+      language = "foam";
+    };
+    forth = buildQueries {
+      language = "forth";
+    };
+    fortran = buildQueries {
+      language = "fortran";
+    };
+    fsh = buildQueries {
+      language = "fsh";
+    };
+    fsharp = buildQueries {
+      language = "fsharp";
+    };
+    func = buildQueries {
+      language = "func";
+    };
+    gap = buildQueries {
+      language = "gap";
+    };
+    gaptst = buildQueries {
+      language = "gaptst";
+    };
+    gdscript = buildQueries {
+      language = "gdscript";
+    };
+    gdshader = buildQueries {
+      language = "gdshader";
+    };
+    git_config = buildQueries {
+      language = "git_config";
+    };
+    git_rebase = buildQueries {
+      language = "git_rebase";
+    };
+    gitattributes = buildQueries {
+      language = "gitattributes";
+    };
+    gitcommit = buildQueries {
+      language = "gitcommit";
+    };
+    gitignore = buildQueries {
+      language = "gitignore";
+    };
+    gleam = buildQueries {
+      language = "gleam";
+    };
+    glimmer = buildQueries {
+      language = "glimmer";
+    };
+    glimmer_javascript = buildQueries {
+      language = "glimmer_javascript";
+    };
+    glimmer_typescript = buildQueries {
+      language = "glimmer_typescript";
+    };
+    glsl = buildQueries {
+      language = "glsl";
+    };
+    gn = buildQueries {
+      language = "gn";
+    };
+    gnuplot = buildQueries {
+      language = "gnuplot";
+    };
+    go = buildQueries {
+      language = "go";
+    };
+    goctl = buildQueries {
+      language = "goctl";
+    };
+    godot_resource = buildQueries {
+      language = "godot_resource";
+    };
+    gomod = buildQueries {
+      language = "gomod";
+    };
+    gosum = buildQueries {
+      language = "gosum";
+    };
+    gotmpl = buildQueries {
+      language = "gotmpl";
+    };
+    gowork = buildQueries {
+      language = "gowork";
+    };
+    gpg = buildQueries {
+      language = "gpg";
+    };
+    graphql = buildQueries {
+      language = "graphql";
+    };
+    gren = buildQueries {
+      language = "gren";
+    };
+    groovy = buildQueries {
+      language = "groovy";
+    };
+    groq = buildQueries {
+      language = "groq";
+    };
+    gstlaunch = buildQueries {
+      language = "gstlaunch";
+    };
+    hack = buildQueries {
+      language = "hack";
+    };
+    hare = buildQueries {
+      language = "hare";
+    };
+    haskell = buildQueries {
+      language = "haskell";
+    };
+    haskell_persistent = buildQueries {
+      language = "haskell_persistent";
+    };
+    hcl = buildQueries {
+      language = "hcl";
+    };
+    heex = buildQueries {
+      language = "heex";
+    };
+    helm = buildQueries {
+      language = "helm";
+    };
+    hjson = buildQueries {
+      language = "hjson";
+    };
+    hlsl = buildQueries {
+      language = "hlsl";
+    };
+    hlsplaylist = buildQueries {
+      language = "hlsplaylist";
+    };
+    hocon = buildQueries {
+      language = "hocon";
+    };
+    hoon = buildQueries {
+      language = "hoon";
+    };
+    html = buildQueries {
+      language = "html";
+    };
+    html_tags = buildQueries {
+      language = "html_tags";
+    };
+    htmldjango = buildQueries {
+      language = "htmldjango";
+    };
+    http = buildQueries {
+      language = "http";
+    };
+    hurl = buildQueries {
+      language = "hurl";
+    };
+    hyprlang = buildQueries {
+      language = "hyprlang";
+    };
+    idl = buildQueries {
+      language = "idl";
+    };
+    idris = buildQueries {
+      language = "idris";
+    };
+    ini = buildQueries {
+      language = "ini";
+    };
+    inko = buildQueries {
+      language = "inko";
+    };
+    ispc = buildQueries {
+      language = "ispc";
+    };
+    janet_simple = buildQueries {
+      language = "janet_simple";
+    };
+    java = buildQueries {
+      language = "java";
+    };
+    javadoc = buildQueries {
+      language = "javadoc";
+    };
+    javascript = buildQueries {
+      language = "javascript";
+    };
+    jinja = buildQueries {
+      language = "jinja";
+    };
+    jinja_inline = buildQueries {
+      language = "jinja_inline";
+    };
+    jq = buildQueries {
+      language = "jq";
+    };
+    jsdoc = buildQueries {
+      language = "jsdoc";
+    };
+    json = buildQueries {
+      language = "json";
+    };
+    json5 = buildQueries {
+      language = "json5";
+    };
+    jsonnet = buildQueries {
+      language = "jsonnet";
+    };
+    jsx = buildQueries {
+      language = "jsx";
+    };
+    julia = buildQueries {
+      language = "julia";
+    };
+    just = buildQueries {
+      language = "just";
+    };
+    kcl = buildQueries {
+      language = "kcl";
+    };
+    kconfig = buildQueries {
+      language = "kconfig";
+    };
+    kdl = buildQueries {
+      language = "kdl";
+    };
+    kitty = buildQueries {
+      language = "kitty";
+    };
+    kotlin = buildQueries {
+      language = "kotlin";
+    };
+    koto = buildQueries {
+      language = "koto";
+    };
+    kusto = buildQueries {
+      language = "kusto";
+    };
+    lalrpop = buildQueries {
+      language = "lalrpop";
+    };
+    latex = buildQueries {
+      language = "latex";
+    };
+    ledger = buildQueries {
+      language = "ledger";
+    };
+    leo = buildQueries {
+      language = "leo";
+    };
+    linkerscript = buildQueries {
+      language = "linkerscript";
+    };
+    liquid = buildQueries {
+      language = "liquid";
+    };
+    liquidsoap = buildQueries {
+      language = "liquidsoap";
+    };
+    llvm = buildQueries {
+      language = "llvm";
+    };
+    lua = buildQueries {
+      language = "lua";
+    };
+    luadoc = buildQueries {
+      language = "luadoc";
+    };
+    luap = buildQueries {
+      language = "luap";
+    };
+    luau = buildQueries {
+      language = "luau";
+    };
+    m68k = buildQueries {
+      language = "m68k";
+    };
+    make = buildQueries {
+      language = "make";
+    };
+    markdown = buildQueries {
+      language = "markdown";
+    };
+    markdown_inline = buildQueries {
+      language = "markdown_inline";
+    };
+    matlab = buildQueries {
+      language = "matlab";
+    };
+    menhir = buildQueries {
+      language = "menhir";
+    };
+    mermaid = buildQueries {
+      language = "mermaid";
+    };
+    meson = buildQueries {
+      language = "meson";
+    };
+    mlir = buildQueries {
+      language = "mlir";
+    };
+    muttrc = buildQueries {
+      language = "muttrc";
+    };
+    nasm = buildQueries {
+      language = "nasm";
+    };
+    nginx = buildQueries {
+      language = "nginx";
+    };
+    nickel = buildQueries {
+      language = "nickel";
+    };
+    nim = buildQueries {
+      language = "nim";
+    };
+    nim_format_string = buildQueries {
+      language = "nim_format_string";
+    };
+    ninja = buildQueries {
+      language = "ninja";
+    };
+    nix = buildQueries {
+      language = "nix";
+    };
+    nqc = buildQueries {
+      language = "nqc";
+    };
+    nu = buildQueries {
+      language = "nu";
+    };
+    objc = buildQueries {
+      language = "objc";
+    };
+    objdump = buildQueries {
+      language = "objdump";
+    };
+    ocaml = buildQueries {
+      language = "ocaml";
+    };
+    ocaml_interface = buildQueries {
+      language = "ocaml_interface";
+    };
+    ocamllex = buildQueries {
+      language = "ocamllex";
+    };
+    odin = buildQueries {
+      language = "odin";
+    };
+    pascal = buildQueries {
+      language = "pascal";
+    };
+    passwd = buildQueries {
+      language = "passwd";
+    };
+    pem = buildQueries {
+      language = "pem";
+    };
+    perl = buildQueries {
+      language = "perl";
+    };
+    php = buildQueries {
+      language = "php";
+    };
+    php_only = buildQueries {
+      language = "php_only";
+    };
+    phpdoc = buildQueries {
+      language = "phpdoc";
+    };
+    pioasm = buildQueries {
+      language = "pioasm";
+    };
+    pkl = buildQueries {
+      language = "pkl";
+    };
+    po = buildQueries {
+      language = "po";
+    };
+    pod = buildQueries {
+      language = "pod";
+    };
+    poe_filter = buildQueries {
+      language = "poe_filter";
+    };
+    pony = buildQueries {
+      language = "pony";
+    };
+    powershell = buildQueries {
+      language = "powershell";
+    };
+    printf = buildQueries {
+      language = "printf";
+    };
+    prisma = buildQueries {
+      language = "prisma";
+    };
+    problog = buildQueries {
+      language = "problog";
+    };
+    prolog = buildQueries {
+      language = "prolog";
+    };
+    promql = buildQueries {
+      language = "promql";
+    };
+    properties = buildQueries {
+      language = "properties";
+    };
+    proto = buildQueries {
+      language = "proto";
+    };
+    prql = buildQueries {
+      language = "prql";
+    };
+    psv = buildQueries {
+      language = "psv";
+    };
+    pug = buildQueries {
+      language = "pug";
+    };
+    puppet = buildQueries {
+      language = "puppet";
+    };
+    purescript = buildQueries {
+      language = "purescript";
+    };
+    pymanifest = buildQueries {
+      language = "pymanifest";
+    };
+    python = buildQueries {
+      language = "python";
+    };
+    ql = buildQueries {
+      language = "ql";
+    };
+    qmldir = buildQueries {
+      language = "qmldir";
+    };
+    qmljs = buildQueries {
+      language = "qmljs";
+    };
+    query = buildQueries {
+      language = "query";
+    };
+    r = buildQueries {
+      language = "r";
+    };
+    racket = buildQueries {
+      language = "racket";
+    };
+    ralph = buildQueries {
+      language = "ralph";
+    };
+    rasi = buildQueries {
+      language = "rasi";
+    };
+    razor = buildQueries {
+      language = "razor";
+    };
+    rbs = buildQueries {
+      language = "rbs";
+    };
+    re2c = buildQueries {
+      language = "re2c";
+    };
+    readline = buildQueries {
+      language = "readline";
+    };
+    regex = buildQueries {
+      language = "regex";
+    };
+    rego = buildQueries {
+      language = "rego";
+    };
+    requirements = buildQueries {
+      language = "requirements";
+    };
+    rescript = buildQueries {
+      language = "rescript";
+    };
+    rifleconf = buildQueries {
+      language = "rifleconf";
+    };
+    rnoweb = buildQueries {
+      language = "rnoweb";
+    };
+    robot = buildQueries {
+      language = "robot";
+    };
+    robots = buildQueries {
+      language = "robots";
+    };
+    roc = buildQueries {
+      language = "roc";
+    };
+    ron = buildQueries {
+      language = "ron";
+    };
+    rst = buildQueries {
+      language = "rst";
+    };
+    ruby = buildQueries {
+      language = "ruby";
+    };
+    runescript = buildQueries {
+      language = "runescript";
+    };
+    rust = buildQueries {
+      language = "rust";
+    };
+    scala = buildQueries {
+      language = "scala";
+    };
+    scfg = buildQueries {
+      language = "scfg";
+    };
+    scheme = buildQueries {
+      language = "scheme";
+    };
+    scss = buildQueries {
+      language = "scss";
+    };
+    sflog = buildQueries {
+      language = "sflog";
+    };
+    slang = buildQueries {
+      language = "slang";
+    };
+    slim = buildQueries {
+      language = "slim";
+    };
+    slint = buildQueries {
+      language = "slint";
+    };
+    smali = buildQueries {
+      language = "smali";
+    };
+    smithy = buildQueries {
+      language = "smithy";
+    };
+    snakemake = buildQueries {
+      language = "snakemake";
+    };
+    snl = buildQueries {
+      language = "snl";
+    };
+    solidity = buildQueries {
+      language = "solidity";
+    };
+    soql = buildQueries {
+      language = "soql";
+    };
+    sosl = buildQueries {
+      language = "sosl";
+    };
+    sourcepawn = buildQueries {
+      language = "sourcepawn";
+    };
+    sparql = buildQueries {
+      language = "sparql";
+    };
+    sproto = buildQueries {
+      language = "sproto";
+    };
+    sql = buildQueries {
+      language = "sql";
+    };
+    squirrel = buildQueries {
+      language = "squirrel";
+    };
+    ssh_config = buildQueries {
+      language = "ssh_config";
+    };
+    starlark = buildQueries {
+      language = "starlark";
+    };
+    strace = buildQueries {
+      language = "strace";
+    };
+    styled = buildQueries {
+      language = "styled";
+    };
+    supercollider = buildQueries {
+      language = "supercollider";
+    };
+    superhtml = buildQueries {
+      language = "superhtml";
+    };
+    surface = buildQueries {
+      language = "surface";
+    };
+    svelte = buildQueries {
+      language = "svelte";
+    };
+    sway = buildQueries {
+      language = "sway";
+    };
+    swift = buildQueries {
+      language = "swift";
+    };
+    sxhkdrc = buildQueries {
+      language = "sxhkdrc";
+    };
+    systemtap = buildQueries {
+      language = "systemtap";
+    };
+    systemverilog = buildQueries {
+      language = "systemverilog";
+    };
+    t32 = buildQueries {
+      language = "t32";
+    };
+    tablegen = buildQueries {
+      language = "tablegen";
+    };
+    tact = buildQueries {
+      language = "tact";
+    };
+    tcl = buildQueries {
+      language = "tcl";
+    };
+    teal = buildQueries {
+      language = "teal";
+    };
+    templ = buildQueries {
+      language = "templ";
+    };
+    tera = buildQueries {
+      language = "tera";
+    };
+    terraform = buildQueries {
+      language = "terraform";
+    };
+    textproto = buildQueries {
+      language = "textproto";
+    };
+    thrift = buildQueries {
+      language = "thrift";
+    };
+    tiger = buildQueries {
+      language = "tiger";
+    };
+    tlaplus = buildQueries {
+      language = "tlaplus";
+    };
+    tmux = buildQueries {
+      language = "tmux";
+    };
+    todotxt = buildQueries {
+      language = "todotxt";
+    };
+    toml = buildQueries {
+      language = "toml";
+    };
+    tsv = buildQueries {
+      language = "tsv";
+    };
+    tsx = buildQueries {
+      language = "tsx";
+    };
+    turtle = buildQueries {
+      language = "turtle";
+    };
+    twig = buildQueries {
+      language = "twig";
+    };
+    typescript = buildQueries {
+      language = "typescript";
+    };
+    typespec = buildQueries {
+      language = "typespec";
+    };
+    typoscript = buildQueries {
+      language = "typoscript";
+    };
+    typst = buildQueries {
+      language = "typst";
+    };
+    udev = buildQueries {
+      language = "udev";
+    };
+    ungrammar = buildQueries {
+      language = "ungrammar";
+    };
+    unison = buildQueries {
+      language = "unison";
+    };
+    usd = buildQueries {
+      language = "usd";
+    };
+    uxntal = buildQueries {
+      language = "uxntal";
+    };
+    v = buildQueries {
+      language = "v";
+    };
+    vala = buildQueries {
+      language = "vala";
+    };
+    vento = buildQueries {
+      language = "vento";
+    };
+    vhdl = buildQueries {
+      language = "vhdl";
+    };
+    vhs = buildQueries {
+      language = "vhs";
+    };
+    vim = buildQueries {
+      language = "vim";
+    };
+    vimdoc = buildQueries {
+      language = "vimdoc";
+    };
+    vrl = buildQueries {
+      language = "vrl";
+    };
+    vue = buildQueries {
+      language = "vue";
+    };
+    wgsl = buildQueries {
+      language = "wgsl";
+    };
+    wgsl_bevy = buildQueries {
+      language = "wgsl_bevy";
+    };
+    wing = buildQueries {
+      language = "wing";
+    };
+    wit = buildQueries {
+      language = "wit";
+    };
+    wxml = buildQueries {
+      language = "wxml";
+    };
+    xcompose = buildQueries {
+      language = "xcompose";
+    };
+    xml = buildQueries {
+      language = "xml";
+    };
+    xresources = buildQueries {
+      language = "xresources";
+    };
+    yaml = buildQueries {
+      language = "yaml";
+    };
+    yang = buildQueries {
+      language = "yang";
+    };
+    yuck = buildQueries {
+      language = "yuck";
+    };
+    zathurarc = buildQueries {
+      language = "zathurarc";
+    };
+    zig = buildQueries {
+      language = "zig";
+    };
+    ziggy = buildQueries {
+      language = "ziggy";
+    };
+    ziggy_schema = buildQueries {
+      language = "ziggy_schema";
+    };
+    zsh = buildQueries {
+      language = "zsh";
+    };
   };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index 880ca3be7efb..bc2fdb75a2fd 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -1,12 +1,13 @@
 {
   lib,
   callPackage,
+  symlinkJoin,
+  vimUtils,
   tree-sitter,
   neovim,
   neovimUtils,
   runCommand,
   vimPlugins,
-  tree-sitter-grammars,
   writableTmpDirAsHomeHook,
 }:
 
@@ -15,18 +16,43 @@ self: super:
 let
   inherit (neovimUtils) grammarToPlugin;
 
-  overrides = prev: {
+  buildQueries =
+    { language }:
+    vimUtils.toVimPlugin (
+      runCommand "nvim-treesitter-queries-${language}"
+        {
+          passthru = { inherit language; };
+          meta.description = "Queries for ${language} from nvim-treesitter";
+        }
+        ''
+          mkdir -p "$out/queries"
+          if [ -d "${super.nvim-treesitter.src}/runtime/queries/${language}" ]; then
+            ln -s "${super.nvim-treesitter.src}/runtime/queries/${language}" "$out/queries/${language}"
+          else
+            echo "Error: there are no queries for ${language}."
+            exit 1
+          fi
+        ''
+    );
+
+  generated = callPackage ./generated.nix {
+    inherit (tree-sitter) buildGrammar;
+    inherit buildQueries;
   };
 
-  generatedGrammars =
-    let
-      generated = callPackage ./generated.nix {
-        inherit (tree-sitter) buildGrammar;
-      };
-    in
-    lib.overrideExisting generated (overrides generated);
+  inherit (generated) parsers queries;
 
-  generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
+  parsersWithMeta = lib.mapAttrs (
+    lang: parser:
+    if lib.hasAttr lang queries then
+      parser.overrideAttrs (old: {
+        passthru = (old.passthru or { }) // {
+          associatedQuery = queries.${lang};
+        };
+      })
+    else
+      parser
+  ) parsers;
 
   # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins`
   # for example, for ocaml_interface, the following aliases will be added
@@ -34,7 +60,7 @@ let
   #   tree-sitter-ocaml-interface
   #   tree-sitter-ocaml_interface
   builtGrammars =
-    generatedGrammars
+    parsersWithMeta
     // lib.concatMapAttrs (
       k: v:
       let
@@ -47,9 +73,9 @@ let
         ${replaced} = v;
         "tree-sitter-${replaced}" = v;
       }
-    ) generatedDerivations;
+    ) parsersWithMeta;
 
-  allGrammars = lib.attrValues generatedDerivations;
+  allGrammars = lib.attrValues parsersWithMeta;
 
   # Usage:
   # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
@@ -57,28 +83,44 @@ let
   # pkgs.vimPlugins.nvim-treesitter.withAllGrammars
   withPlugins =
     f:
+    let
+      selectedGrammars = f (tree-sitter.builtGrammars // builtGrammars);
+
+      grammarPlugins = map grammarToPlugin selectedGrammars;
+
+      queryPlugins = lib.pipe selectedGrammars [
+        (map (g: g.passthru.associatedQuery or null))
+        (lib.filter (q: q != null))
+      ];
+    in
     self.nvim-treesitter.overrideAttrs {
-      passthru.dependencies = map grammarToPlugin (f (tree-sitter.builtGrammars // builtGrammars));
+      passthru.dependencies = [
+        (symlinkJoin {
+          name = "nvim-treesitter-grammars";
+          paths = grammarPlugins ++ queryPlugins;
+        })
+      ];
     };
 
   withAllGrammars = withPlugins (_: allGrammars);
+  grammarPlugins = lib.mapAttrs (_: grammarToPlugin) parsersWithMeta;
 in
-
 {
-  postPatch = ''
-    rm -r parser
-  '';
+  nvimSkipModules = [ "nvim-treesitter._meta.parsers" ];
 
-  passthru = (super.nvim-treesitter.passthru or { }) // {
+  passthru = super.nvim-treesitter.passthru or { } // {
     inherit
+      buildQueries
       builtGrammars
       allGrammars
+      grammarPlugins
       grammarToPlugin
       withPlugins
       withAllGrammars
+      queries
       ;
 
-    grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;
+    parsers = grammarPlugins;
 
     tests = {
       check-queries =
@@ -100,7 +142,7 @@ in
             ln -s ${withAllGrammars}/CONTRIBUTING.md .
             export ALLOWED_INSTALLATION_FAILURES=ipkg,norg,verilog
 
-            nvim --headless "+luafile ${withAllGrammars}/scripts/check-queries.lua" | tee log
+            nvim --headless -l "${withAllGrammars}/scripts/check-queries.lua" | tee log
 
             if grep -q Warning log; then
               echo "WARNING: warnings were emitted by the check"
@@ -108,45 +150,9 @@ in
             fi
           '';
 
-      tree-sitter-queries-are-present-for-custom-grammars =
-        let
-          pluginsToCheck =
-            map (grammar: grammarToPlugin grammar)
-              # non-derivations are here because there is a `recurseForDerivations = true`
-              (lib.filter lib.isDerivation (lib.attrValues tree-sitter-grammars));
-        in
-        runCommand "nvim-treesitter-test-queries-are-present-for-custom-grammars" { CI = true; } ''
-          touch "$out"
-
-          function check_grammar {
-            local grammar_name="$1"
-            local grammar_path="$2"
-
-            local grammar_queries=$(find -L "$grammar_path/queries/$grammar_name" -name '*.scm')
-            local EXPECTED_FILES="$grammar_path/parser/$grammar_name.so $grammar_queries"
-
-            echo ""
-            echo "expected files for $grammar_name:"
-            echo "$EXPECTED_FILES"
-
-            # the derivation has only symlinks, and `find` doesn't count them as files
-            # so we cannot use `-type f`, thus we use `-not -type d`
-            for file in $(find -L $2 -not -type d); do
-              echo "checking $file"
-              # see https://stackoverflow.com/a/8063284
-              if ! echo "$EXPECTED_FILES" | grep -wqF "$file"; then
-                echo "$file is unexpected, exiting"
-                exit 1
-              fi
-            done
-          }
-
-          ${lib.concatLines (lib.forEach pluginsToCheck (g: "check_grammar \"${g.grammarName}\" \"${g}\""))}
-        '';
-
       no-queries-for-official-grammars =
         let
-          pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter-parsers);
+          pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter.parsers);
         in
         runCommand "nvim-treesitter-test-no-queries-for-official-grammars" { CI = true; } ''
           touch "$out"
@@ -168,10 +174,8 @@ in
     };
   };
 
-  meta =
-
-    (super.nvim-treesitter.meta or { }) // {
-      license = lib.licenses.asl20;
-      maintainers = [ ];
-    };
+  meta = super.nvim-treesitter.meta or { } // {
+    license = lib.licenses.asl20;
+    maintainers = [ ];
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
index debdedac3b48..cc71c9495dc4 100755
--- a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
+++ b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
@@ -13,7 +13,10 @@ import requests
 log = logging.getLogger("vim-updater")
 
 NURR_JSON_URL = (
-    "https://raw.githubusercontent.com/nvim-neorocks/nurr/main/tree-sitter-parsers.json"
+    "https://raw.githubusercontent.com/lumen-oss/nurr/main/tree-sitter-parsers.json"
+)
+NVIM_TREESITTER_QUERIES_URL = (
+    "https://api.github.com/repos/nvim-treesitter/nvim-treesitter/contents/runtime/queries"
 )
 
 
@@ -28,33 +31,41 @@ def generate_grammar(lang, parser_info):
     url = install_info["url"]
     rev = install_info["revision"]
 
-    generated = f"""  {lang} = buildGrammar {{
-    language = "{lang}";
-    version = "0.0.0+rev={rev[:7]}";
-    src = """
+    generated = f"""    {lang} = buildGrammar {{
+      language = "{lang}";
+      version = "0.0.0+rev={rev[:7]}";
+      src = """
 
     generated += subprocess.check_output(
-        ["nurl", url, rev, "--indent=4"], text=True
+        ["nurl", url, rev, "--indent=6"], text=True
     )
     generated += ";"
 
     location = install_info.get("location", "")
     if location:
         generated += f"""
-    location = "{location}";"""
+      location = "{location}";"""
 
     if install_info.get("generate", False):
         generated += """
-    generate = true;"""
+      generate = true;"""
 
     generated += f"""
-    meta.homepage = "{url}";
-  }};
+      meta.homepage = "{url}";
+    }};
 """
 
     return generated
 
 
+def generate_query(lang):
+    """Generate query derivation for a language"""
+    return f"""    {lang} = buildQueries {{
+      language = "{lang}";
+    }};
+"""
+
+
 def fetch_nurr_parsers():
     """Fetch the parser information from nurr repository"""
     log.info("Fetching parser data from %s", NURR_JSON_URL)
@@ -81,6 +92,25 @@ def fetch_nurr_parsers():
     return parsers
 
 
+def fetch_available_queries():
+    """Fetch list of languages that have queries in nvim-treesitter repo"""
+    log.info("Fetching available queries from %s", NVIM_TREESITTER_QUERIES_URL)
+
+    headers = {}
+    github_token = os.environ.get("GITHUB_TOKEN")
+    if github_token:
+        headers["Authorization"] = f"token {github_token}"
+
+    response = requests.get(NVIM_TREESITTER_QUERIES_URL, headers=headers, timeout=30)
+    response.raise_for_status()
+    data = response.json()
+
+    # We assume items with type="dir" in the queries/ folder are language names
+    languages = sorted([item["name"] for item in data if item["type"] == "dir"])
+    log.info(f"Found {len(languages)} languages with queries")
+    return languages
+
+
 def process_parser_info(parser_info):
     """Process a single parser info entry and generate grammar for it"""
     return generate_grammar(parser_info["lang"], parser_info)
@@ -89,12 +119,14 @@ def process_parser_info(parser_info):
 def update_grammars():
     """Update grammar definitions using nurr's parser information"""
     parsers_info = fetch_nurr_parsers()
+    queries_list = fetch_available_queries()
 
     generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
 # Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json
 
 {
   buildGrammar,
+  buildQueries,
   """
 
     nurl_output = subprocess.check_output(["nurl", "-Ls", ","], text=True).strip()
@@ -104,6 +136,7 @@ def update_grammars():
 }:
 
 {
+  parsers = {
 """
 
     # Process parsers in parallel for better performance
@@ -111,7 +144,16 @@ def update_grammars():
         for generated in executor.map(process_parser_info, parsers_info):
             generated_file += generated
 
-    generated_file += "}\n"
+    generated_file += """  };
+
+  queries = {
+"""
+
+    # Process queries
+    for lang in queries_list:
+        generated_file += generate_query(lang)
+
+    generated_file += "  };\n}\n"
     return generated_file
 
 
diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 2676741e3e54..659b9c0c1dda 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-12-22";
+  version = "0-unstable-2025-12-30";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "036013ef87d2ac6b9fea36dbb513617c72e11254";
-    hash = "sha256-T2fUq6Iah/vQ/NaGPE/wa2sJL888VKRpdiNq7hbFsWI=";
+    rev = "34fde065b76805c851d7c4b5bc4c67a3d347aab9";
+    hash = "sha256-se8WptzipVwAE6Qwq2hTv7xBsY22HoACdVrPv+ssBDc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 034130c88b6c..4343843d42a8 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -207,7 +207,7 @@ stdenv.mkDerivation (
     # Wine locates a lot of libraries dynamically through dlopen().  Add
     # them to the RPATH so that the user doesn't have to set them in
     # LD_LIBRARY_PATH.
-    NIX_LDFLAGS = toString (
+    env.NIX_LDFLAGS = toString (
       map (path: "-rpath " + path) (
         map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ finalAttrs.buildInputs)
         # libpulsecommon.so is linked but not found otherwise
diff --git a/pkgs/applications/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh
index faf4f2c30748..d5325a9a9889 100644
--- a/pkgs/applications/emulators/wine/builder-wow.sh
+++ b/pkgs/applications/emulators/wine/builder-wow.sh
@@ -1,5 +1,5 @@
 ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64
-preFlags="${configureFlags}"
+preFlags="${configureFlags[@]}"
 
 unpackPhase
 cd $TMP/$sourceRoot
@@ -10,7 +10,7 @@ mkdir -p $TMP/wine-wow $TMP/wine64
 
 cd $TMP/wine64
 sourceRoot=`pwd`
-configureFlags="${preFlags} --enable-win64"
+configureFlags=($preFlags --enable-win64)
 configurePhase
 buildPhase
 # checkPhase
@@ -37,7 +37,7 @@ PKG_CONFIG_PATH=$(IFS=":"; echo "${NEW_LIST_ARRAY[*]}")
 
 cd $TMP/wine-wow
 sourceRoot=`pwd`
-configureFlags="${preFlags} --with-wine64=../wine64"
+configureFlags=($preFlags --with-wine64=../wine64)
 configurePhase
 buildPhase
 # checkPhase
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 44eaf9aed9b5..ef5747902b28 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -82,6 +82,16 @@ let
     })
   ];
 
+  # Fix build with GCC 15
+  # https://bugs.winehq.org/show_bug.cgi?id=58191
+  patches-add-truncf-to-the-import-library = [
+    (pkgs.fetchpatch {
+      name = "add-truncf-to-the-import-library.patch";
+      url = "https://gitlab.winehq.org/wine/wine/-/commit/ed66bd5c97ecc17c42a4942dafac7d406c1e5120.patch";
+      hash = "sha256-mn0fRZ840MYk1WZsBLcachUzyNmBUSlvf50t9jFGXp0=";
+    })
+  ];
+
   inherit (pkgs) writeShellScript;
 in
 rec {
@@ -114,7 +124,8 @@ rec {
       # Also look for root certificates at $NIX_SSL_CERT_FILE
       ./cert-path.patch
     ]
-    ++ patches-binutils-2_44-fix-wine-older-than-10_2;
+    ++ patches-binutils-2_44-fix-wine-older-than-10_2
+    ++ patches-add-truncf-to-the-import-library;
 
     updateScript = writeShellScript "update-wine-stable" ''
       ${updateScriptPreamble}
@@ -133,9 +144,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.18";
+    version = "10.19";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-Uftyc9ZdCd6gMsSl4hl7EnJLJ8o2DhpiKyNz0e5QrXs=";
+    hash = "sha256-fOxYMjxvKq7nrKk1Fzecu/75biwsWAxo/4XdAAy73UY=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +156,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-vhIjeEbWLpcKtkBd/KeAeaLKOUZt7LAkH6GTebs3ROM=";
+      hash = "sha256-GmHeqHZPnFZkntMOJJzRDUN9H+G1qXdacy/Al6T5eZU=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";
@@ -204,7 +215,8 @@ rec {
       # Also look for root certificates at $NIX_SSL_CERT_FILE
       ./cert-path.patch
     ]
-    ++ patches-binutils-2_44-fix-wine-older-than-10_2;
+    ++ patches-binutils-2_44-fix-wine-older-than-10_2
+    ++ patches-add-truncf-to-the-import-library;
 
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 74d5d6f732ce..fffd5ddd398d 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -14,14 +14,12 @@
 }:
 let
   qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix {
-    withGrass = withGrass;
-    withServer = withServer;
-    withWebKit = withWebKit;
+    inherit withGrass withServer withWebKit;
   };
 in
 
 symlinkJoin {
-  inherit (qgis-unwrapped) version src;
+  inherit (qgis-unwrapped) version outputs src;
   pname = "qgis";
 
   paths = [ qgis-unwrapped ];
@@ -42,6 +40,8 @@ symlinkJoin {
         --prefix PATH : $program_PATH \
         --set PYTHONPATH $program_PYTHONPATH
     done
+
+    ln -s ${qgis-unwrapped.man} $man
   '';
 
   passthru = {
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 09bec63225ce..7478f5845b13 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -83,6 +83,10 @@ in
 mkDerivation rec {
   version = "3.44.5";
   pname = "qgis-unwrapped";
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchFromGitHub {
     owner = "qgis";
@@ -181,7 +185,7 @@ mkDerivation rec {
   dontWrapGApps = true; # wrapper params passed below
 
   postFixup = lib.optionalString withGrass ''
-    # GRASS has to be availble on the command line even though we baked in
+    # GRASS has to be available on the command line even though we baked in
     # the path at build time using GRASS_PREFIX.
     # Using wrapGAppsHook also prevents file dialogs from crashing the program
     # on non-NixOS.
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8a33b6e6099c..774b76f89fe0 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -85,13 +85,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.2-8";
+  version = "7.1.2-11";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-2jSQ59Wi6/1dbS/AgM1DfW6WlwoYuJlnTLoM8Mc6Ji8=";
+    hash = "sha256-RFiE23VW8AbVb7iglxjQMT6njDw+P7vLW6+nSKqN0p8=";
   };
 
   outputs = [
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
index 34b1775a428f..07da05cc59c0 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
@@ -46,7 +46,6 @@ buildGoModule (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/helm-schema/bin/schema";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 731e1e5955f8..f766104463f8 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -456,7 +456,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     inherit
diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
index e1cd0441551c..ee97df25bd4e 100644
--- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)";
diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix
index ad08bf4996b5..9172f6a0519c 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
 
   cmake,
   ninja,
@@ -27,6 +28,17 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://www.github.com/Mbed-TLS/mbedtls/pull/10215
+    (fetchpatch {
+      name = "linphone-mbedtls-fix-unterminated-string-initialization.patch";
+      url = "https://github.com/Mbed-TLS/mbedtls/commit/d593c54b3cbfc3c806476a725e7d82763da0da9e.patch";
+      hash = "sha256-hh2cGzL75fEqlFNhEyL2fI9qsBW2Eq43DdWFD9qLsKE=";
+      excludes = [ "ChangeLog.d/unterminated-string-initialization.txt" ];
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a90c06d92890..06ecaa84591e 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -174,7 +174,6 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = writeScript "update-weechat" ''
     #!/usr/bin/env nix-shell
diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index 2df2a5ab3d8a..bb8bc8e45659 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -110,7 +110,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 47e7b25747e9..b6207c808046 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -93,6 +93,7 @@
   ncurses,
   libepoxy,
   gpgme,
+  gpgmepp,
   libwebp,
   abseil-cpp,
   libepubgen,
@@ -358,7 +359,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix this path to point to where the headers can actually be found instead.
     substituteInPlace configure.ac --replace-fail \
       'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
-      'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
+      'GPGMEPP_CFLAGS=-I${lib.getDev gpgmepp}/include/gpgme++'
 
     # Fix for Python 3.12
     substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig
@@ -422,6 +423,7 @@ stdenv.mkDerivation (finalAttrs: {
       glm
       adwaita-icon-theme
       gpgme
+      gpgmepp
       graphite2
       gtk3
       (harfbuzz.override { withIcu = true; })
diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index 3eac7df05476..a5722c9058ee 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -27,6 +27,10 @@ let
   cross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 {
+  outputs = [
+    "out"
+    "man"
+  ];
   src =
     if overrideSrc != { } then
       overrideSrc
diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix
index 59e7dd7fa5d5..f7b96b1c1b95 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/pkgs/applications/radio/gnuradio/wrapper.nix
@@ -79,7 +79,7 @@ let
   pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs);
 
   pname = unwrapped.pname + "-wrapped";
-  inherit (unwrapped) version;
+  inherit (unwrapped) outputs version;
   makeWrapperArgs = builtins.concatStringsSep " " (
     [
     ]
@@ -214,15 +214,21 @@ let
   self =
     if doWrap then
       stdenv.mkDerivation {
-        inherit pname version passthru;
-        nativeBuildInputs = [ makeWrapper ];
-        buildInputs = [
+        inherit
+          pname
+          outputs
+          version
+          passthru
+          ;
+        nativeBuildInputs = [
+          makeWrapper
           xorg.lndir
         ];
         buildCommand = ''
           mkdir $out
           cd $out
-          lndir -silent ${unwrapped}
+          lndir -silent ${unwrapped.out}
+          lndir -silent ${unwrapped.man}
           ${lib.optionalString (extraPackages != [ ]) (
             builtins.concatStringsSep "\n" (
               map (pkg: ''
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 2b7492d8fbf2..b9cbc8d0210b 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/myriadrf/LimeSuite/commit/4e5ad459d50c922267a008e5cecb3efdbff31f09.patch";
       hash = "sha256-OASki3bISJvV7wjMz0pBT3kO5RvJ5BnymiF6ruHkCJ8=";
     })
+    # Fixes for C23 (GCC 15). Remove upon next version bump
+    (fetchpatch {
+      url = "https://github.com/myriadrf/LimeSuite/commit/524cd2e548b11084e6f739b2dfe0f958c2e30354.patch";
+      hash = "sha256-wxwhFjXcIgBMTJoJ6efdtyttxMFZviCTXtEb2qFX9yU=";
+    })
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index e3f5f7619fd6..590c2d6a2d12 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -264,7 +264,8 @@ let
     ]
     ++ lib.optional buildIde "coqide"
     ++ lib.optional (!coqAtLeast "8.14") "bin/votour";
-    enableParallelBuilding = true;
+    # workaround for irreproducible build error in https://github.com/NixOS/nixpkgs/pull/474970
+    enableParallelBuilding = coqAtLeast "8.14";
 
     createFindlibDestdir = true;
 
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index d122f58af4f1..0af9390e8c3b 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+    "man"
     "tex"
   ];
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 91dda130ccce..7abb812c99ef 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -361,7 +361,6 @@ let
 
         doInstallCheck = true;
         nativeInstallCheckInputs = [ versionCheckHook ];
-        versionCheckProgramArg = "--version";
 
         passthru = {
           # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
index 33c4ffff6fe5..9ece10973758 100644
--- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
+++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
@@ -9,7 +9,7 @@ index 45e9a1f9b0..494ee00c66 100644
 +static int is_in_store_path(const char *path)
 +{
 +    static char *store_path = NULL;
-+    int store_path_len = -1;
++    static ssize_t store_path_len = -1;
 +
 +    if (store_path_len == -1) {
 +        if ((store_path = getenv("NIX_STORE")) != NULL)
@@ -19,7 +19,7 @@ index 45e9a1f9b0..494ee00c66 100644
 +    }
 +
 +    if (store_path_len > 0)
-+        return strncmp(path, store_path, strlen(store_path)) == 0;
++        return strncmp(path, store_path, store_path_len) == 0;
 +    return 0;
 +}
 +
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
index 9b8be3879b2a..2f32733c46d8 100644
--- a/pkgs/applications/virtualization/singularity/generic.nix
+++ b/pkgs/applications/virtualization/singularity/generic.nix
@@ -277,7 +277,6 @@ in
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/${projectName}";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 3f20759e952e..aefd57fbe0b4 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -59,7 +59,9 @@ in
   pkgsCross, # wasm32 rlbox
   python3,
   runCommand,
+  rustc,
   rust-cbindgen,
+  rustPlatform,
   unzip,
   which,
   wrapGAppsHook3,
@@ -201,25 +203,9 @@ assert elfhackSupport -> isElfhackPlatform stdenv;
 let
   inherit (lib) enableFeature;
 
-  rustPackages =
-    pkgs:
-    (pkgs.rust.override (
-      # aarch64-darwin firefox crashes on loading favicons due to a llvm 21 bug:
-      # https://github.com/NixOS/nixpkgs/issues/453372
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1995582#c16
-      lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) {
-        llvmPackages = pkgs.llvmPackages_20;
-      }
-    )).packages.stable;
-
-  toRustC = pkgs: (rustPackages pkgs).rustc;
-
-  rustc = toRustC pkgs;
-  inherit (rustPackages pkgs) rustPlatform;
-
   # Target the LLVM version that rustc is built with for LTO.
   llvmPackages0 = rustc.llvmPackages;
-  llvmPackagesBuildBuild0 = (toRustC pkgsBuildBuild).llvmPackages;
+  llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages;
 
   # Force the use of lld and other llvm tools for LTO
   llvmPackages = llvmPackages0.override {
@@ -234,7 +220,7 @@ let
   # LTO requires LLVM bintools including ld.lld and llvm-ar.
   buildStdenv = overrideCC llvmPackages.stdenv (
     llvmPackages.stdenv.cc.override {
-      bintools = if ltoSupport then (toRustC buildPackages).llvmPackages.bintools else stdenv.cc.bintools;
+      bintools = if ltoSupport then buildPackages.rustc.llvmPackages.bintools else stdenv.cc.bintools;
     }
   );
 
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index f66acf3d5e75..cf4fc875b585 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -74,7 +74,7 @@ sub findFiles;
 
 sub findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs) {
     opendir DIR, "$target" or die "cannot open `$target': $!";
-    my @names = readdir DIR or die;
+    my @names = readdir DIR;
     closedir DIR;
 
     foreach my $name (@names) {
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 7ad39a58935c..06f96b75ce05 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -89,17 +89,20 @@ lib.extendMkDerivation {
       "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"
       true;
     {
-      env = {
-        PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
-        RUST_LOG = logLevel;
-        RUSTFLAGS =
-          lib.optionalString (
-            stdenv.hostPlatform.isDarwin && buildType == "debug"
-          ) "-C split-debuginfo=packed "
-          # Workaround the existing RUSTFLAGS specified as a list.
-          + interpolateString (args.RUSTFLAGS or "");
-      }
-      // args.env or { };
+      env =
+        let
+          isDarwinDebug = stdenv.hostPlatform.isDarwin && buildType == "debug";
+        in
+        {
+          PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
+          RUST_LOG = logLevel;
+          # Prevent shadowing *_RUSTFLAGS environment variables
+          ${if args ? RUSTFLAGS || isDarwinDebug then "RUSTFLAGS" else null} =
+            lib.optionalString isDarwinDebug "-C split-debuginfo=packed "
+            # Workaround the existing RUSTFLAGS specified as a list.
+            + interpolateString (args.RUSTFLAGS or "");
+        }
+        // args.env or { };
 
       cargoDeps =
         if cargoVendorDir != null then
diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh
index 57e4e12b4f1e..3f4625a4bc32 100644
--- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh
@@ -23,11 +23,16 @@ maturinBuildHook() {
         "--target" "@rustcTargetSpec@"
         "--manylinux" "off"
         "--strip"
-        "--release"
         "--out" "$dist"
         "--interpreter" "$interpreter_name"
     )
 
+    if [ -n "${maturinBuildProfile}" ]; then
+      flagsArray+=("--profile" "${maturinBuildProfile}")
+    else
+      flagsArray+=("--release")
+    fi
+
     concatTo flagsArray maturinBuildFlags
 
     echoCmd 'maturinBuildHook flags' "${flagsArray[@]}"
diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
index b07b0c5ae804..478543afed11 100644
--- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
+++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
@@ -1,37 +1,35 @@
 # symlinks are often created in postFixup
 # don't use fixupOutputHooks, it is before postFixup
-postFixupHooks+=(_makeSymlinksRelativeInAllOutputs)
+if [[ -z "${dontRewriteSymlinks-}" ]]; then
+  postFixupHooks+=(_makeSymlinksRelative)
+fi
+
 
 # For every symlink in $output that refers to another file in $output
-# ensure that the symlink is relative. This removes references to the output
-# has from the resulting store paths and thus the NAR files.
+# ensure that the symlink is relative.
+# This increases the chance that NAR files can be deduplicated.
 _makeSymlinksRelative() {
-    local symlinkTarget
-
-    if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then
-       return
-    fi
-
-    while IFS= read -r -d $'\0' f; do
-        symlinkTarget=$(readlink "$f")
-        if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then
-            # skip this symlink as it doesn't point to $prefix
-            continue
-        fi
-
-        if [ ! -e "$symlinkTarget" ]; then
-            echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)"
-        fi
-
-        echo "rewriting symlink $f to be relative to $prefix"
-        ln -snrf "$symlinkTarget" "$f"
-
-    done < <(find $prefix -type l -print0)
-}
-
-_makeSymlinksRelativeInAllOutputs() {
-  local output
+  local prefixes
+  prefixes=()
   for output in $(getAllOutputNames); do
-    prefix="${!output}" _makeSymlinksRelative
+    [ ! -e "${!output}" ] && continue
+    prefixes+=( "${!output}" )
   done
+  find "${prefixes[@]}" -type l -printf '%H\0%p\0' \
+    | xargs -0 -n2 -r -P "$NIX_BUILD_CORES" sh -c '
+      output="$1"
+      link="$2"
+
+      linkTarget=$(readlink "$link")
+
+      # only touch links that point inside the same output tree
+      [[ $linkTarget == "$output"/* ]] || exit 0
+
+      if [ ! -e "$linkTarget" ]; then
+        echo "the symlink $link is broken, it points to $linkTarget (which is missing)"
+      fi
+
+      echo "making symlink relative: $link"
+      ln -snrf "$linkTarget" "$link"
+    ' _
 }
diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
index 825da1bde962..e573ba0b13db 100644
--- a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
+++ b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
@@ -1,88 +1,4 @@
-# This setup hook modifies a Perl script so that any "-I" flags in its shebang
-# line are rewritten into a "use lib ..." statement on the next line. This gets
-# around a limitation in Darwin, which will not properly handle a script whose
-# shebang line exceeds 511 characters.
-#
-# Each occurrence of "-I /path/to/lib1" or "-I/path/to/lib2" is removed from
-# the shebang line, along with the single space that preceded it. These library
-# paths are placed into a new line of the form
-#
-#     use lib "/path/to/lib1", "/path/to/lib2";
-#
-# immediately following the shebang line. If a library appeared in the original
-# list more than once, only its first occurrence will appear in the output
-# list. In other words, the libraries are deduplicated, but the ordering of the
-# first appearance of each one is preserved.
-#
-# Any flags other than "-I" in the shebang line are left as-is, and the
-# interpreter is also left alone (although the script will abort if the
-# interpreter does not seem to be either "perl" or else "env" with "perl" as
-# its argument). Each line after the shebang line is left unchanged. Each file
-# is modified in place.
-#
-# Usage:
-#     shortenPerlShebang SCRIPT...
-
+# Deprecated. Invocation in derivations can be safely removed.
 shortenPerlShebang() {
-    while [ $# -gt 0 ]; do
-        _shortenPerlShebang "$1"
-        shift
-    done
-}
-
-_shortenPerlShebang() {
-    local program="$1"
-
-    echo "shortenPerlShebang: rewriting shebang line in $program"
-
-    if ! isScript "$program"; then
-        die "shortenPerlShebang: refusing to modify $program because it is not a script"
-    fi
-
-    local temp="$(mktemp)"
-
-    gawk '
-        (NR == 1) {
-            if (!($0 ~ /\/(perl|env +perl)\>/)) {
-                print "shortenPerlShebang: script does not seem to be a Perl script" > "/dev/stderr"
-                exit 1
-            }
-            idx = 0
-            while (match($0, / -I ?([^ ]+)/, pieces)) {
-                matches[idx] = pieces[1]
-                idx++
-                $0 = gensub(/ -I ?[^ ]+/, "", 1, $0)
-            }
-            print $0
-            if (idx > 0) {
-                prefix = "use lib "
-                for (idx in matches) {
-                    path = matches[idx]
-                    if (!(path in seen)) {
-                        printf "%s\"%s\"", prefix, path
-                        seen[path] = 1
-                        prefix = ", "
-                    }
-                }
-                print ";"
-            }
-        }
-        (NR > 1 ) {
-            print
-        }
-    ' "$program" > "$temp" || die
-    # Preserve the mode of the original file
-    cp --preserve=mode --attributes-only "$program" "$temp"
-    mv "$temp" "$program"
-
-    # Measure the new shebang line length and make sure it's okay. We subtract
-    # one to account for the trailing newline that "head" included in its
-    # output.
-    local new_length=$(( $(head -n 1 "$program" | wc -c) - 1 ))
-
-    # Darwin is okay when the shebang line contains 511 characters, but not
-    # when it contains 512 characters.
-    if [ $new_length -ge 512 ]; then
-        die "shortenPerlShebang: shebang line is $new_length characters--still too long for Darwin!"
-    fi
+  :
 }
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index 203aac1dbe54..59bccd4b84f4 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation {
   doInstallCheck = true;
 
   versionCheckProgram = "${placeholder "out"}/bin/op";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = ./update.sh;
diff --git a/pkgs/by-name/_9/_9base/fix-build-with-c23.patch b/pkgs/by-name/_9/_9base/fix-build-with-c23.patch
new file mode 100644
index 000000000000..f8f58d6c5f9b
--- /dev/null
+++ b/pkgs/by-name/_9/_9base/fix-build-with-c23.patch
@@ -0,0 +1,101 @@
+From ba9e372f3165e0cfd73fcc8a1352fbb790ea2439 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Sat, 27 Dec 2025 23:22:47 +0800
+Subject: [PATCH] fix build with c23
+
+---
+ dd/dd.c    |  4 ++--
+ troff/n5.c | 24 ++++++++++++------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/dd/dd.c b/dd/dd.c
+index 9e69b6b..1e7d4c5 100644
+--- a/dd/dd.c
++++ b/dd/dd.c
+@@ -312,11 +312,11 @@ match(char *s)
+ 	cs = string;
+ 	while(*cs++ == *s)
+ 		if(*s++ == '\0')
+-			goto true;
++			goto match_true;
+ 	if(*s != '\0')
+ 		return 0;
+ 
+-true:
++match_true:
+ 	cs--;
+ 	string = cs;
+ 	return 1;
+diff --git a/troff/n5.c b/troff/n5.c
+index 7266432..7566068 100644
+--- a/troff/n5.c
++++ b/troff/n5.c
+@@ -642,15 +642,15 @@ void caseif(void)
+ void caseif1(int x)
+ {
+ 	extern int falsef;
+-	int notflag, true;
++	int notflag, truev;
+ 	Tchar i;
+ 
+ 	if (x == 2) {
+ 		notflag = 0;
+-		true = iflist[ifx];
++		truev = iflist[ifx];
+ 		goto i1;
+ 	}
+-	true = 0;
++	truev = 0;
+ 	skip();
+ 	if ((cbits(i = getch())) == '!') {
+ 		notflag = 1;
+@@ -663,37 +663,37 @@ void caseif1(int x)
+ 	ifnum = 0;
+ 	if (!nonumb) {
+ 		if (i > 0)
+-			true++;
++			truev++;
+ 		goto i1;
+ 	}
+ 	i = getch();
+ 	switch (cbits(i)) {
+ 	case 'e':
+ 		if (!(numtabp[PN].val & 01))
+-			true++;
++			truev++;
+ 		break;
+ 	case 'o':
+ 		if (numtabp[PN].val & 01)
+-			true++;
++			truev++;
+ 		break;
+ 	case 'n':
+ 		if (NROFF)
+-			true++;
++			truev++;
+ 		break;
+ 	case 't':
+ 		if (TROFF)
+-			true++;
++			truev++;
+ 		break;
+ 	case ' ':
+ 		break;
+ 	default:
+-		true = cmpstr(i);
++		truev = cmpstr(i);
+ 	}
+ i1:
+-	true ^= notflag;
++	truev ^= notflag;
+ 	if (x == 1)
+-		iflist[ifx] = !true;
+-	if (true) {
++		iflist[ifx] = !truev;
++	if (truev) {
+ i2:
+ 		while ((cbits(i = getch())) == ' ')
+ 			;
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix
index e4cd519d3aaa..2b4f76e55f42 100644
--- a/pkgs/by-name/_9/_9base/package.nix
+++ b/pkgs/by-name/_9/_9base/package.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation {
     # https://github.com/9fans/plan9port/commit/540caa5873bcc3bc2a0e1896119f5b53a0e8e630
     # https://github.com/9fans/plan9port/commit/323e1a8fac276f008e6d5146a83cbc88edeabc87
     ./getcallerpc-use-macro-or-stub.patch
+    # fix build with c23
+    #   dd.c:315:30: error: expected identifier or '*' before 'true'
+    #   n5.c:690:22: error: lvalue required as left operand of assignment
+    ./fix-build-with-c23.patch
   ]
   ++ patches;
 
diff --git a/pkgs/by-name/ab/abcm2ps/package.nix b/pkgs/by-name/ab/abcm2ps/package.nix
index 8eb66b52e9e5..04e1bc40be09 100644
--- a/pkgs/by-name/ab/abcm2ps/package.nix
+++ b/pkgs/by-name/ab/abcm2ps/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchfossil,
+  fetchpatch2,
   docutils,
   pkg-config,
   freetype,
@@ -19,6 +20,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-YA36wfj7owKu/KyWgCj6U8EJEh831cFtQj4/JtH6kVg=";
   };
 
+  patches = [
+    # fix build with C23
+    #   'bool' is a keyword with '-std=c23' onwards
+    #   error: 'bool' cannot be used here
+    (fetchpatch2 {
+      url = "https://salsa.debian.org/debian/abcm2ps/-/raw/f741931567bb8cac8c9ed8e73b7ba838e4c17eb3/debian/patches/c23.diff";
+      hash = "sha256-+2LuHqY5+nWykCYGEOazDeJAf9sggPNp2yiqMQRepfM=";
+    })
+  ];
+
   configureFlags = [
     "--INSTALL=install"
   ];
diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix
index c3c21c93e4c6..94562d1bb5da 100644
--- a/pkgs/by-name/ab/abcmidi/package.nix
+++ b/pkgs/by-name/ab/abcmidi/package.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OBlkk5Fq3ep+wZqFfSXNqrXtznisNFjn9uDVj/Q4Odk=";
   };
 
+  # TODO: remove once https://github.com/sshlien/abcmidi/pull/15 merged
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   meta = {
     homepage = "https://abc.sourceforge.net/abcMIDI/";
     downloadPage = "https://ifdo.ca/~seymour/runabc/top.html";
diff --git a/pkgs/by-name/ab/abook/0001-Fix-wcwidth-declaration.patch b/pkgs/by-name/ab/abook/0001-Fix-wcwidth-declaration.patch
new file mode 100644
index 000000000000..d95904f19da0
--- /dev/null
+++ b/pkgs/by-name/ab/abook/0001-Fix-wcwidth-declaration.patch
@@ -0,0 +1,48 @@
+From 2e3ea5ab32ed356c45e0a7a8db37924a77a1c949 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Sat, 20 Dec 2025 12:51:13 +0100
+Subject: [PATCH] Fix wcwidth declaration
+
+The wcwidth function is declared in `wchar.h` on POSIX systems which
+is not included in the default Autoconf includes. Because of this
+HAVE_DECL_WCWIDTH would be configured to 0.
+
+Since C23 functions with no arguments in prototypes are treated as
+taking no arguments. This results in mismatched declaration since in
+wchar.h the functions is declared as taking wchar_t.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ configure.ac | 2 +-
+ mbswidth.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7d756ee..a1ecbe2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ AC_CHECK_HEADER(wchar.h,[
+ 	AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
+ 	[ac_have_wchar_h=no])
+ AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
+-AC_CHECK_DECLS(wcwidth)
++AC_CHECK_DECLS(wcwidth, [], [], [#include <wchar.h>])
+ AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
+ 
+ if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then
+diff --git a/mbswidth.c b/mbswidth.c
+index 031e6b7..54a2cb5 100644
+--- a/mbswidth.c
++++ b/mbswidth.c
+@@ -63,7 +63,7 @@
+ #	warn "this configure-time declaration test was not run"
+ #endif
+ #if !HAVE_DECL_WCWIDTH
+-int wcwidth ();
++int wcwidth (wchar_t);
+ #endif
+ 
+ #ifndef wcwidth
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/ab/abook/package.nix b/pkgs/by-name/ab/abook/package.nix
index 9f91e82a44d8..ff2c1e3522c9 100644
--- a/pkgs/by-name/ab/abook/package.nix
+++ b/pkgs/by-name/ab/abook/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchgit,
-  fetchpatch,
   autoreconfHook,
   pkg-config,
   ncurses,
@@ -20,10 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/abook-gcc15.patch?h=abook";
-      hash = "sha256-+73+USELoby8JvuVOWZe6E+xtdhajnLnDkzD/77QoTo=";
-    })
+    ./0001-Fix-wcwidth-declaration.patch
   ];
 
   # error: implicit declaration of function 'isalnum' [-Wimplicit-function-declaration]
diff --git a/pkgs/by-name/ac/acct/package.nix b/pkgs/by-name/ac/acct/package.nix
index 8fb0cb755837..6457cb539a98 100644
--- a/pkgs/by-name/ac/acct/package.nix
+++ b/pkgs/by-name/ac/acct/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/rpms/psacct/raw/rawhide/f/psacct-6.6.4-sprintf-buffer-overflow.patch";
       hash = "sha256-l74tLIuhpXj+dIA7uAY9L0qMjQ2SbDdc+vjHMyVouFc=";
     })
+    # fix build with C23
+    #    error: passing argument 4 of 'qsort' from incompatible pointer type
+    (fetchpatch2 {
+      url = "https://salsa.debian.org/abower/acct/-/raw/7aeb2192d729bcd4583a75765add28c65a7fcf47/debian/patches/Fix-FTBFS-with-C23.patch";
+      hash = "sha256-q1LtmhYopgSWIzIoONbKjgigIBU+LPvSvtUM3iL36c0=";
+    })
   ];
 
   meta = {
diff --git a/pkgs/by-name/ac/ace-of-penguins/fix-gcc-15.patch b/pkgs/by-name/ac/ace-of-penguins/fix-gcc-15.patch
new file mode 100644
index 000000000000..503d1bf44f39
--- /dev/null
+++ b/pkgs/by-name/ac/ace-of-penguins/fix-gcc-15.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/table.c b/lib/table.c
+index befe696..cc08415 100644
+--- a/lib/table.c
++++ b/lib/table.c
+@@ -297,10 +297,11 @@ check_dclick(int x, int y, int t)
+ }
+ 
+ int help_is_showing = 0;
+-static void help_nothing() { help_is_showing = 0; }
++static void help_nothing(void) { help_is_showing = 0; }
++static void help_nothing_args(int a, int b, int c) { help_is_showing = 0; }
+ void (*help_redraw)(void) = help_nothing;
+-void (*help_click)(int x, int y, int b) = help_nothing;
+-void (*help_key)(int c, int x, int y) = help_nothing;
++void (*help_click)(int x, int y, int b) = help_nothing_args;
++void (*help_key)(int c, int x, int y) = help_nothing_args;
+ 
+ static int no_resize = 0;
+ void
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix
index 86dc3fa99891..28ec3c649014 100644
--- a/pkgs/by-name/ac/ace-of-penguins/package.nix
+++ b/pkgs/by-name/ac/ace-of-penguins/package.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     # make-imglib.c:205:5: error: 'return' with no value, in function returning non-void [-Wreturn-mismatch]
     # imagelib.c:109:17: error: implicit declaration of function 'malloc' [-Wimplicit-function-declaration]
     ./fix-gcc-14.patch
+    # error: initialization of 'void (*)(int,  int,  int)' from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
+    ./fix-gcc-15.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix
index 56026b1fc908..29832b303ad6 100644
--- a/pkgs/by-name/ad/addDriverRunpath/package.nix
+++ b/pkgs/by-name/ad/addDriverRunpath/package.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv }:
+{
+  lib,
+  stdenv,
+  makeSetupHook,
+}:
+makeSetupHook {
+  name = "add-driver-runpath-hook";
 
-stdenv.mkDerivation {
-  name = "add-driver-runpath";
-
-  # Named "opengl-driver" for legacy reasons, but it is the path to
-  # hardware drivers installed by NixOS
-  driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32";
-
-  buildCommand = ''
-    mkdir -p $out/nix-support
-    substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
-  '';
-}
+  substitutions = {
+    # Named "opengl-driver" for legacy reasons, but it is the path to
+    # hardware drivers installed by NixOS
+    driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32";
+  };
+} ./setup-hook.sh
diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix
index 97df479bd0bb..5119f16e97a8 100644
--- a/pkgs/by-name/ad/adms/package.nix
+++ b/pkgs/by-name/ad/adms/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   autoreconfHook,
   flex,
   bison,
@@ -23,6 +24,15 @@ stdenv.mkDerivation rec {
     sha256 = "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c";
   };
 
+  patches = [
+    # fix build with c23
+    #   admsXml.c:645:8: error: too many arguments to function 'verilogaparse'; expected 0, have 1
+    (fetchpatch2 {
+      url = "https://salsa.debian.org/science-team/adms/-/raw/01ef4a94a48736c49c67d90da506b34f6114f0b0/debian/patches/0002-fix-ftbfs-gcc-15.patch";
+      hash = "sha256-rSNBqdpuXA9ViyygRGn4KVknLCu0Q+UoOGLfoNAgccc=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [
     flex
diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix
index 521d3b40e557..9577c178a2b9 100644
--- a/pkgs/by-name/ad/adriconf/package.nix
+++ b/pkgs/by-name/ad/adriconf/package.nix
@@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-0XTsYeS4tNAnGhuJ81fmjHhFS6fVq1lirui5b+ojxTQ=";
   };
 
+  # fix build with c23
+  #    error: 'uint16_t' does not name a type
+  postPatch = ''
+    sed -i '1i #include <cstdint>' adriconf/ValueObject/GPUInfo.h
+  '';
+
   nativeBuildInputs = [
     cmake
     gettext # msgfmt
diff --git a/pkgs/by-name/ae/aefs/fix-build-with-c23.patch b/pkgs/by-name/ae/aefs/fix-build-with-c23.patch
new file mode 100644
index 000000000000..e14ed714a5d3
--- /dev/null
+++ b/pkgs/by-name/ae/aefs/fix-build-with-c23.patch
@@ -0,0 +1,75 @@
+From 5fbcd63a4fb8baca13184a2cc718ebf3ebbef245 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Sun, 28 Dec 2025 00:24:11 +0800
+Subject: [PATCH] fix build with c23
+
+---
+ emxdoc/input.c | 10 +++++-----
+ system/types.h |  5 +----
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/emxdoc/input.c b/emxdoc/input.c
+index 50fd7a0..7d9ad4a 100644
+--- a/emxdoc/input.c
++++ b/emxdoc/input.c
+@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
+ struct cond
+ {
+   int start_line;
+-  int true;
++  int is_true;
+   int else_seen;
+ };
+ 
+@@ -225,7 +225,7 @@ redo:
+           if (cond_sp + 1 >= COND_STACK_SIZE)
+             fatal ("%s:%d: Conditional stack overflow", input_fname, line_no);
+           ++cond_sp;
+-          cond_stack[cond_sp].true = c1;
++          cond_stack[cond_sp].is_true = c1;
+           cond_stack[cond_sp].start_line = line_no;
+           cond_stack[cond_sp].else_seen = FALSE;
+           goto redo;
+@@ -240,7 +240,7 @@ redo:
+                    input_fname, line_no, escape, escape,
+                    cond_stack[cond_sp].start_line);
+           cond_stack[cond_sp].else_seen = TRUE;
+-          cond_stack[cond_sp].true = !cond_stack[cond_sp].true;
++          cond_stack[cond_sp].is_true = !cond_stack[cond_sp].is_true;
+           goto redo;
+         }
+       else if (strcmp (p, "endif") == 0)
+@@ -254,12 +254,12 @@ redo:
+       else if (p[0] == 'h' && p[1] >= '1' && p[1] <= '0' + SECTION_LEVELS)
+         {
+           /* Support h1 inside if */
+-          if (cond_sp >= 0 && !cond_stack[cond_sp].true)
++          if (cond_sp >= 0 && !cond_stack[cond_sp].is_true)
+             ++ref_no;
+         }
+     }
+ 
+-  if (cond_sp >= 0 && !cond_stack[cond_sp].true)
++  if (cond_sp >= 0 && !cond_stack[cond_sp].is_true)
+     goto redo;
+ 
+   p = input;
+diff --git a/system/types.h b/system/types.h
+index 48b8013..327833f 100644
+--- a/system/types.h
++++ b/system/types.h
+@@ -21,10 +21,7 @@
+ #define _TYPES_H
+ 
+ #include "config.h"
+-
+-
+-/* Booleans (C++/C99) style. */
+-typedef int bool;
++#include <stdbool.h>
+ 
+ #ifndef true
+ #define true 1
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/ae/aefs/package.nix b/pkgs/by-name/ae/aefs/package.nix
index d6f7e54175d3..962a1e817a1a 100644
--- a/pkgs/by-name/ae/aefs/package.nix
+++ b/pkgs/by-name/ae/aefs/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation {
     hash = "sha256-a3YQWxJ7+bYhf1W1kdIykV8U1R4dcDZJ7K3NvNxbF0s=";
   };
 
+  # fix build with c23
+  #   ../system/types.h:27:13: error: 'bool' cannot be defined via 'typedef'
+  #   input.c:228:31: error: expected identifier before 'true'
+  patches = [ ./fix-build-with-c23.patch ];
+
   # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on
   # Darwin if FUSE_USE_VERSION isn't set at configure time.
   #
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index 2c0e7597bbd1..401830d85a39 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -78,7 +78,6 @@ buildGoModule (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/af/afterstep/fix-build-with-c23.patch b/pkgs/by-name/af/afterstep/fix-build-with-c23.patch
new file mode 100644
index 000000000000..f68a636af50c
--- /dev/null
+++ b/pkgs/by-name/af/afterstep/fix-build-with-c23.patch
@@ -0,0 +1,81 @@
+From 081d9c3284075c65b70837079bd67621c3b64da7 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Sun, 28 Dec 2025 00:39:49 +0800
+Subject: [PATCH] fix build with c23
+
+---
+ libAfterBase/fs.c       | 2 +-
+ src/ASDocGen/ASDocGen.c | 2 +-
+ src/Ident/Ident.c       | 2 +-
+ src/afterstep/dirtree.c | 2 +-
+ src/afterstep/menus.h   | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libAfterBase/fs.c b/libAfterBase/fs.c
+index 731bfd3..954bfd6 100644
+--- a/libAfterBase/fs.c
++++ b/libAfterBase/fs.c
+@@ -818,7 +818,7 @@ my_scandir (char *dirname, struct direntry *(*namelist[]),
+ 	}
+ 	/* Optionally sort the list */
+ 	if (dcomp)
+-		qsort (*namelist, n, sizeof (struct direntry *), (int (*)())dcomp);
++		qsort (*namelist, n, sizeof (struct direntry *), (int (*)(const void *, const void *))dcomp);
+ 
+ 	/* Return the count of the entries */
+ 	return n;
+diff --git a/src/ASDocGen/ASDocGen.c b/src/ASDocGen/ASDocGen.c
+index 31d7a70..9a86219 100644
+--- a/src/ASDocGen/ASDocGen.c
++++ b/src/ASDocGen/ASDocGen.c
+@@ -667,7 +667,7 @@ write_options_keywords(const char *source_dir, const char *syntax_dir, SyntaxDef
+ 	sorted_list = safecalloc( max_i, sizeof(TermDef*));
+ 	for (i = 0; i < max_i; i++)
+ 		sorted_list[i] = &(syntax->terms[i]) ; 
+-	qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)())sort_terms_by_alpha );
++	qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)(const void *, const void *))sort_terms_by_alpha );
+ 	for (i = 0; i < max_i; i++)
+ 	{	
+ 		SyntaxDef *sub_syntax = sorted_list[i]->sub_syntax ; 
+diff --git a/src/Ident/Ident.c b/src/Ident/Ident.c
+index 1497d06..d6ddad6 100644
+--- a/src/Ident/Ident.c
++++ b/src/Ident/Ident.c
+@@ -89,7 +89,7 @@ void HandleEvents();
+ void DispatchEvent (ASEvent * event);
+ void process_message (send_data_type type, send_data_type *body);
+ 
+-Window make_ident_window();
++Window make_ident_window(int width, int height);
+ void fill_window_data();
+ void display_window_data();
+ void add_property( const char *name, const char *value, unsigned long value_encoding, Bool span_cols );
+diff --git a/src/afterstep/dirtree.c b/src/afterstep/dirtree.c
+index 46ce782..48f7e30 100644
+--- a/src/afterstep/dirtree.c
++++ b/src/afterstep/dirtree.c
+@@ -675,7 +675,7 @@ void dirtree_sort (dirtree_t * tree)
+ 	list = (dirtree_t **) safemalloc (n * sizeof (dirtree_t *));
+ 	for (n = 0, t = tree->child; t != NULL; t = t->next, n++)
+ 		list[n] = t;
+-	qsort (list, n, sizeof (dirtree_t *), (int (*)())dirtree_compar);
++	qsort (list, n, sizeof (dirtree_t *), (int (*)(const void *, const void *))dirtree_compar);
+ 	tree->child = list[0];
+ 	for (i = 1; i < n; i++)
+ 		list[i - 1]->next = list[i];
+diff --git a/src/afterstep/menus.h b/src/afterstep/menus.h
+index 98b2ad3..bb2a5b1 100644
+--- a/src/afterstep/menus.h
++++ b/src/afterstep/menus.h
+@@ -95,7 +95,7 @@ MenuData* FindPopup( const char* name, int quiet );
+ 
+ void DeleteMenuItem( MenuDataItem* item );
+ 
+-MenuData *CreateMenuData();
++MenuData *CreateMenuData(char *name);
+ MenuData *NewMenuData (char *name);
+ void DeleteMenuData (MenuData * menu);
+ 
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index 8cf78b248fa2..f7b4e1634e4e 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -36,6 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch";
       hash = "sha256-aGMTyojzXEHGjO9lMT6dwLl01Fd333BUuCIX0FU9ac4=";
     })
+
+    # fix build with c23
+    #   fs.c:821:66: error: passing argument 4 of 'qsort' from incompatible pointer type [-Wincompatible-pointer-types]
+    #   Ident.c:326:1: error: conflicting types for 'make_ident_window'; have 'Window(int,  int)' {aka 'long unsigned int(int,  int)'}
+    #   menuitem.c:85:11: error: conflicting types for 'CreateMenuData'; have 'MenuData *(char *)'
+    ./fix-build-with-c23.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ah/ahoy/package.nix b/pkgs/by-name/ah/ahoy/package.nix
index 58dee8bc3fd1..b51c95a77f5d 100644
--- a/pkgs/by-name/ah/ahoy/package.nix
+++ b/pkgs/by-name/ah/ahoy/package.nix
@@ -28,8 +28,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix
index 9fd4ceeb20a4..128474f18c23 100644
--- a/pkgs/by-name/ai/aichat/package.nix
+++ b/pkgs/by-name/ai/aichat/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index e36ffb8c68c4..2f081926e983 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/air";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   cargoBuildFlags = [ "-p air" ];
diff --git a/pkgs/by-name/ai/airspy/package.nix b/pkgs/by-name/ai/airspy/package.nix
index 696bb8aeff67..798d2f97c8cd 100644
--- a/pkgs/by-name/ai/airspy/package.nix
+++ b/pkgs/by-name/ai/airspy/package.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/airspy/airspyone_host/commit/f467acd587617640741ecbfade819d10ecd032c2.patch";
       hash = "sha256-qfJrxM1hq7NScxN++d9IH+fwFfXf/YwZZUDDOVbwIJk=";
     })
+
+    (fetchpatch {
+      url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/9abb6b5fd1a02a7310226d03337f288be71f1d43/community/airspyone-host/gcc-15.patch";
+      hash = "sha256-TFtDLT94kXZswnm8K9+U1YV+T+0fbj6oB6rbRdEpSOQ=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix
index 09e19960b121..940f361fa7e3 100644
--- a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix
+++ b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/alertmanager_gotify_bridge";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index d28dedfaf328..1b6ed5a99fed 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/amazon-q";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Amazon Q Developer AI coding agent CLI";
diff --git a/pkgs/by-name/am/amd-blis/package.nix b/pkgs/by-name/am/amd-blis/package.nix
index 0e59a24ed3f6..fae23b5f4b8d 100644
--- a/pkgs/by-name/am/amd-blis/package.nix
+++ b/pkgs/by-name/am/amd-blis/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   perl,
   python3,
 
@@ -36,6 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Set the date stamp to $SOURCE_DATE_EPOCH
     ./build-date.patch
+    # backporting a fix for a GCC15 build error
+    # ./frame/include/bli_x86_asm_macros.h:102:21: error: 'asm' operand has impossible constraints or there are not enough registers
+    (fetchpatch {
+      name = "amd-blis-gcc-15-fix-1.patch";
+      url = "https://github.com/amd/blis/commit/14e46ad83bac5fd82569a43c7cbd3e791a1eacc8.patch";
+      hash = "sha256-3vk9NSnhT64J6PUabeP58Gn7p1zheGbPxSRjVEX7WNg=";
+    })
+    (fetchpatch {
+      name = "amd-blis-gcc-15-fix-2.patch";
+      url = "https://github.com/amd/blis/commit/30c42202d78fd5ee5e54d50ad57348e5e541a7d5.patch";
+      hash = "sha256-FCMWQzfzQxCQqngULoXfh35BFGaNTu732iu3HctNcFM=";
+    })
   ];
 
   inherit blas64;
diff --git a/pkgs/by-name/am/ameba-ls/package.nix b/pkgs/by-name/am/ameba-ls/package.nix
index 3c6fbcbce3a1..80abfec72dfe 100644
--- a/pkgs/by-name/am/ameba-ls/package.nix
+++ b/pkgs/by-name/am/ameba-ls/package.nix
@@ -44,7 +44,6 @@ crystal.buildCrystalPackage rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/ameba-ls";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Crystal language server powered by Ameba linter";
diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix
index dd9d12d1b6ff..ad97765c01db 100644
--- a/pkgs/by-name/am/amp/package.nix
+++ b/pkgs/by-name/am/amp/package.nix
@@ -3,8 +3,10 @@
   fetchFromGitHub,
   rustPlatform,
   pkgsBuildBuild,
+  oniguruma,
   stdenv,
   zlib,
+  pkg-config,
   writableTmpDirAsHomeHook,
 }:
 
@@ -26,14 +28,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     (pkgsBuildBuild.writeShellScriptBin "git" "echo 0000000")
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+  buildInputs = [
+    oniguruma
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
     zlib
-  ];
+  ]);
 
   # Needing libgit2 <=1.8.0
   #env.LIBGIT2_NO_VENDOR = 1;
 
+  # bundled oniguruma failed on gcc15
+  env.RUSTONIG_SYSTEM_LIBONIG = 1;
+
   nativeCheckInputs = [
+    pkg-config
     writableTmpDirAsHomeHook
   ];
 
diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix
index fa1c0a07e107..8cffa71c0ef6 100644
--- a/pkgs/by-name/an/andcli/package.nix
+++ b/pkgs/by-name/an/andcli/package.nix
@@ -32,7 +32,6 @@ buildGoModule (finalAttrs: {
     writableTmpDirAsHomeHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 35a4d225876c..1d6e98bc0c2f 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   gradle,
   autoPatchelfHook,
   jetbrains, # Requird by upstream due to JCEF dependency
@@ -97,6 +98,16 @@ let
     cmakeFlags = (old.cmakeFlags or [ ]) ++ [
       "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
     ];
+
+    patches = (old.patches or [ ]) ++ [
+      # Fix build with gcc15
+      # https://github.com/apache/thrift/pull/3078
+      (fetchpatch {
+        name = "thrift-add-missing-cstdint-include-gcc15.patch";
+        url = "https://github.com/apache/thrift/commit/947ad66940cfbadd9b24ba31d892dfc1142dd330.patch";
+        hash = "sha256-pWcG6/BepUwc/K6cBs+6d74AWIhZ2/wXvCunb/KyB0s=";
+      })
+    ];
   });
 
 in
diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix
index 2700be69aa7e..61012fa0f2ed 100644
--- a/pkgs/by-name/an/ansible-doctor/package.nix
+++ b/pkgs/by-name/an/ansible-doctor/package.nix
@@ -48,8 +48,6 @@ python3Packages.buildPythonApplication rec {
   # ansible.errors.AnsibleError: Unable to create local directories(/private/var/empty/.ansible/tmp)
   nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Annotation based documentation for your Ansible roles";
     mainProgram = "ansible-doctor";
diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix
index c22580231973..577eb5013e7e 100644
--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -3,32 +3,37 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  fetchpatch,
   cmake,
   gtest,
   lz4,
-  protobuf_30,
+  protobuf,
   snappy,
   zlib,
   zstd,
 }:
 
 let
-  orc-format = fetchurl {
-    name = "orc-format-1.1.0.tar.gz";
-    url = "https://www.apache.org/dyn/closer.lua/orc/orc-format-1.1.0/orc-format-1.1.0.tar.gz?action=download";
-    hash = "sha256-1KesdsVEKr9xGeLLhOcbZ34HWv9TUYqoZgVeLq0EUNc=";
-  };
+  orc-format =
+    let
+      version = "1.1.1";
+      name = "orc-format-${version}";
+      archiveName = "${name}.tar.gz";
+    in
+    fetchurl {
+      name = archiveName;
+      url = "https://www.apache.org/dyn/closer.lua/orc/${name}/${archiveName}?action=download";
+      hash = "sha256-WE3+KkIClGF4/Y/H0SOb54BbntRZarIELe5znniAmSs=";
+    };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "apache-orc";
-  version = "2.1.2";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "orc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hNKzqNOagBJOWQRebkVHIuvqfpk9Mi30bu4z7dGbsxk=";
+    hash = "sha256-H7nowl2pq31RIAmTUz15x48Wc99MljFJboc4F7Ln/zk=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtest
     lz4
-    protobuf_30
+    protobuf
     snappy
     zlib
     zstd
@@ -62,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     GTEST_HOME = gtest.dev;
     LZ4_ROOT = lz4;
     ORC_FORMAT_URL = orc-format;
-    PROTOBUF_HOME = protobuf_30;
+    PROTOBUF_HOME = protobuf;
     SNAPPY_ROOT = snappy.dev;
     ZLIB_ROOT = zlib.dev;
     ZSTD_ROOT = zstd.dev;
diff --git a/pkgs/by-name/ap/apfs-fuse/add_cstdint_fix_gcc15.patch b/pkgs/by-name/ap/apfs-fuse/add_cstdint_fix_gcc15.patch
new file mode 100644
index 000000000000..42402ec3ce1e
--- /dev/null
+++ b/pkgs/by-name/ap/apfs-fuse/add_cstdint_fix_gcc15.patch
@@ -0,0 +1,20 @@
+From 53cae3b21af9dca65cbe244ab72ec310a2e02164 Mon Sep 17 00:00:00 2001
+From: dkarpo <dkarpo@gmail.com>
+Date: Tue, 30 Sep 2025 10:18:03 -0600
+Subject: [PATCH] Add "<cstdint>" include to fix compilation.
+
+---
+ ApfsLib/PList.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ApfsLib/PList.h b/ApfsLib/PList.h
+index 645df2d..a752059 100644
+--- a/ApfsLib/PList.h
++++ b/ApfsLib/PList.h
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
++#include <cstdint>
+ #include <vector>
+ #include <map>
+ #include <memory>
diff --git a/pkgs/by-name/ap/apfs-fuse/package.nix b/pkgs/by-name/ap/apfs-fuse/package.nix
index 87d9b78f61d2..abb952c9e6fe 100644
--- a/pkgs/by-name/ap/apfs-fuse/package.nix
+++ b/pkgs/by-name/ap/apfs-fuse/package.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation {
     # fix for CMake v4
     # https://github.com/sgan81/apfs-fuse/pull/211
     ./cmake-v4.patch
+
+    # fix for GCC 15
+    # https://github.com/sgan81/apfs-fuse/pull/209
+    ./add_cstdint_fix_gcc15.patch
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/ap/apl2741-unicode/package.nix b/pkgs/by-name/ap/apl2741-unicode/package.nix
new file mode 100644
index 000000000000..de232f9fd2fe
--- /dev/null
+++ b/pkgs/by-name/ap/apl2741-unicode/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "apl2741-unicode";
+  version = "0-unstable-2022-11-10";
+
+  src = fetchFromGitHub {
+    owner = "abrudz";
+    repo = "APL2741";
+    rev = "1e11efae38e5095bfe49a786b111d563e83dad03";
+    hash = "sha256-/sAO+HL3zGMJZ+5SFHnkHxxevG0nJ7wo1yLTlHqYPkQ=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/share/fonts/truetype *.ttf
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "APL font based on Adrian Smith's IBM Selectric APL2741 golf-ball font";
+    license = lib.licenses.unlicense;
+    homepage = "https://abrudz.github.io/APL2741/";
+    maintainers = [ lib.maintainers.sternenseemann ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix
index 57e987790c8f..2eca53aff726 100644
--- a/pkgs/by-name/ar/arp-scan-rs/package.nix
+++ b/pkgs/by-name/ar/arp-scan-rs/package.nix
@@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec {
 
   versionCheckProgram = [ "${placeholder "out"}/bin/arp-scan" ];
 
-  versionCheckProgramArg = "--version";
-
   doInstallCheck = true;
 
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 50e138504ab1..64ac4b96483d 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -17,6 +17,8 @@
       "transfer"
     ];
   },
+  azure-sdk-for-cpp,
+  azurite,
   boost,
   brotli,
   bzip2,
@@ -37,7 +39,7 @@
   openssl,
   perl,
   pkg-config,
-  protobuf_31,
+  protobuf,
   python3,
   rapidjson,
   re2,
@@ -58,7 +60,8 @@
     !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isRiscV64,
   enableS3 ? true,
   # google-cloud-cpp fails to build on RiscV
-  enableGcs ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isRiscV64,
+  enableGcs ? !stdenv.hostPlatform.isRiscV64,
+  enableAzure ? true,
 }:
 
 let
@@ -66,19 +69,19 @@ let
     name = "arrow-testing";
     owner = "apache";
     repo = "arrow-testing";
-    rev = "d2a13712303498963395318a4eb42872e66aead7";
-    hash = "sha256-c8FL37kG0uo7o0Zp71WjCl7FD5BnVgqUCCXXX9gI0lg=";
+    rev = "9a02925d1ba80bd493b6d4da6e8a777588d57ac4";
+    hash = "sha256-dEFCkeQpQrU61uCwJp/XB2umbQHjXtzado36BGChoc0=";
   };
 
   parquet-testing = fetchFromGitHub {
     name = "parquet-testing";
     owner = "apache";
     repo = "parquet-testing";
-    rev = "18d17540097fca7c40be3d42c167e6bfad90763c";
-    hash = "sha256-gKEQc2RKpVp39RmuZbIeIXAwiAXDHGnLXF6VQuJtnRA=";
+    rev = "a3d96a65e11e2bbca7d22a894e8313ede90a33a3";
+    hash = "sha256-Xd6o3RT6Q0tPutV77J0P1x3F6U3RHdCBOKGUKtkQCKk=";
   };
 
-  version = "20.0.0";
+  version = "22.0.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "arrow-cpp";
@@ -88,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "apache";
     repo = "arrow";
     rev = "apache-arrow-${version}";
-    hash = "sha256-JFPdKraCU+xRkBTAHyY4QGnBVlOjQ1P5+gq9uxyqJtk=";
+    hash = "sha256-i4Smt43oi4sddUt3qH7ePjensBSfPW+w/ExLVcVNKic=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/cpp";
@@ -107,21 +110,21 @@ stdenv.mkDerivation (finalAttrs: {
   ARROW_MIMALLOC_URL = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
-    rev = "v2.0.6";
-    hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc=";
+    tag = "v3.1.5";
+    hash = "sha256-fk6nfyBFS1G0sJwUJVgTC1+aKd0We/JjsIYTO+IOfyg=";
   };
 
   ARROW_XSIMD_URL = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xsimd";
-    rev = "13.0.0";
+    tag = "13.0.0";
     hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE=";
   };
 
   ARROW_SUBSTRAIT_URL = fetchFromGitHub {
     owner = "substrait-io";
     repo = "substrait";
-    rev = "v0.44.0";
+    tag = "v0.44.0";
     hash = "sha256-V739IFTGPtbGPlxcOi8sAaYSDhNUEpITvN9IqdPReug=";
   };
 
@@ -138,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     brotli
     bzip2
+    curl
     flatbuffers
     gflags
     glog
@@ -145,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     libbacktrace
     lz4
     nlohmann_json # alternative JSON parser to rapidjson
-    protobuf_31 # substrait requires protobuf
+    protobuf # substrait requires protobuf
     rapidjson
     re2
     snappy
@@ -157,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableFlight [
     grpc
     openssl
-    protobuf_31
+    protobuf
     sqlite
   ]
   ++ lib.optionals enableS3 [
@@ -166,10 +170,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableGcs [
     crc32c
-    curl
     google-cloud-cpp
     grpc
     nlohmann_json
+  ]
+  ++ lib.optionals enableAzure [
+    azure-sdk-for-cpp.identity
+    azure-sdk-for-cpp.storage-blobs
+    azure-sdk-for-cpp.storage-files-datalake
   ];
 
   # apache-orc looks for things in caps
@@ -188,55 +196,61 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   cmakeFlags = [
-    "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
-    "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
-    "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
-    "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}"
-    "-DARROW_BUILD_INTEGRATION=ON"
-    "-DARROW_BUILD_UTILITIES=ON"
-    "-DARROW_EXTRA_ERROR_CONTEXT=ON"
-    "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
-    "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
-    "-Dxsimd_SOURCE=AUTO"
-    "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
-    "-DARROW_COMPUTE=ON"
-    "-DARROW_CSV=ON"
-    "-DARROW_DATASET=ON"
-    "-DARROW_FILESYSTEM=ON"
-    "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}"
-    "-DARROW_HDFS=ON"
-    "-DARROW_IPC=ON"
-    "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}"
-    "-DARROW_JSON=ON"
-    "-DARROW_USE_GLOG=ON"
-    "-DARROW_WITH_BACKTRACE=ON"
-    "-DARROW_WITH_BROTLI=ON"
-    "-DARROW_WITH_BZ2=ON"
-    "-DARROW_WITH_LZ4=ON"
-    "-DARROW_WITH_NLOHMANN_JSON=ON"
-    "-DARROW_WITH_SNAPPY=ON"
-    "-DARROW_WITH_UTF8PROC=ON"
-    "-DARROW_WITH_ZLIB=ON"
-    "-DARROW_WITH_ZSTD=ON"
-    "-DARROW_MIMALLOC=ON"
-    "-DARROW_SUBSTRAIT=ON"
-    "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}"
-    "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
-    "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
-    "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
-    "-DARROW_ORC=ON"
+    (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true)
+    (lib.cmakeBool "ARROW_BUILD_SHARED" enableShared)
+    (lib.cmakeBool "ARROW_BUILD_STATIC" (!enableShared))
+    (lib.cmakeBool "ARROW_BUILD_TESTS" enableShared)
+    (lib.cmakeBool "ARROW_BUILD_INTEGRATION" true)
+    (lib.cmakeBool "ARROW_BUILD_UTILITIES" true)
+    (lib.cmakeBool "ARROW_EXTRA_ERROR_CONTEXT" true)
+    (lib.cmakeBool "ARROW_VERBOSE_THIRDPARTY_BUILD" true)
+    (lib.cmakeFeature "ARROW_DEPENDENCY_SOURCE" "SYSTEM")
+    (lib.cmakeFeature "xsimd_SOURCE" "AUTO")
+    (lib.cmakeBool "ARROW_DEPENDENCY_USE_SHARED" enableShared)
+    (lib.cmakeBool "ARROW_COMPUTE" true)
+    (lib.cmakeBool "ARROW_CSV" true)
+    (lib.cmakeBool "ARROW_DATASET" true)
+    (lib.cmakeBool "ARROW_FILESYSTEM" true)
+    (lib.cmakeBool "ARROW_FLIGHT_SQL" enableFlight)
+    (lib.cmakeBool "ARROW_HDFS" true)
+    (lib.cmakeBool "ARROW_IPC" true)
+    (lib.cmakeBool "ARROW_JEMALLOC" enableJemalloc)
+    (lib.cmakeBool "ARROW_JSON" true)
+    (lib.cmakeBool "ARROW_USE_GLOG" true)
+    (lib.cmakeBool "ARROW_WITH_BACKTRACE" true)
+    (lib.cmakeBool "ARROW_WITH_BROTLI" true)
+    (lib.cmakeBool "ARROW_WITH_BZ2" true)
+    (lib.cmakeBool "ARROW_WITH_LZ4" true)
+    (lib.cmakeBool "ARROW_WITH_NLOHMANN_JSON" true)
+    (lib.cmakeBool "ARROW_WITH_SNAPPY" true)
+    (lib.cmakeBool "ARROW_WITH_UTF8PROC" true)
+    (lib.cmakeBool "ARROW_WITH_ZLIB" true)
+    (lib.cmakeBool "ARROW_WITH_ZSTD" true)
+    (lib.cmakeBool "ARROW_MIMALLOC" true)
+    (lib.cmakeBool "ARROW_SUBSTRAIT" true)
+    (lib.cmakeBool "ARROW_FLIGHT" enableFlight)
+    (lib.cmakeBool "ARROW_FLIGHT_TESTING" enableFlight)
+    (lib.cmakeBool "ARROW_S3" enableS3)
+    (lib.cmakeBool "ARROW_GCS" enableGcs)
+    (lib.cmakeBool "ARROW_AZURE" enableAzure)
+    (lib.cmakeBool "ARROW_ORC" true)
     # Parquet options:
-    "-DARROW_PARQUET=ON"
-    "-DPARQUET_BUILD_EXECUTABLES=ON"
-    "-DPARQUET_REQUIRE_ENCRYPTION=ON"
+    (lib.cmakeBool "ARROW_PARQUET" true)
+    (lib.cmakeBool "PARQUET_BUILD_EXECUTABLES" true)
+    (lib.cmakeBool "PARQUET_REQUIRE_ENCRYPTION" true)
+  ]
+  ++ lib.optionals (!enableShared) [
+    (lib.cmakeFeature "ARROW_TEST_LINKAGE" "static")
   ]
-  ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
+    # needed for tools executables
+    (lib.cmakeFeature "CMAKE_INSTALL_RPATH" "@loader_path/../lib")
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
+    (lib.cmakeBool "ARROW_USE_SIMD" false)
   ]
-  ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ]
   ++ lib.optionals enableS3 [
-    "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h"
+    (lib.cmakeFeature "AWSSDK_CORE_HEADER_FILE" "${aws-sdk-cpp-arrow}/include/aws/core/Aws.h")
   ];
 
   doInstallCheck = true;
@@ -259,13 +273,6 @@ stdenv.mkDerivation (finalAttrs: {
           "TestMinioServer.Connect"
           "TestS3FS.*"
           "TestS3FSGeneric.*"
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # TODO: revisit at 12.0.0 or when
-          # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989
-          # is available, see
-          # https://github.com/apache/arrow/pull/15288#discussion_r1071244661
-          "ExecPlanExecution.StressSourceSinkStopped"
         ];
     in
     lib.optionalString finalAttrs.doInstallCheck "-${lib.concatStringsSep ":" filteredTests}";
@@ -278,7 +285,8 @@ stdenv.mkDerivation (finalAttrs: {
     sqlite
   ]
   ++ lib.optionals enableS3 [ minio ]
-  ++ lib.optionals enableFlight [ python3 ];
+  ++ lib.optionals enableFlight [ python3 ]
+  ++ lib.optionals enableAzure [ azurite ];
 
   installCheckPhase =
     let
@@ -309,6 +317,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Cross-language development platform for in-memory data";
     homepage = "https://arrow.apache.org/docs/cpp/";
+    changelog = "https://arrow.apache.org/release/${finalAttrs.version}.html";
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix
index 09a79fca6808..8646e4ee7994 100644
--- a/pkgs/by-name/ar/arsenal/package.nix
+++ b/pkgs/by-name/ar/arsenal/package.nix
@@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [
     "arsenal"
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 92ac5803cffa..55bca1158da1 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Raw converter based on RawTherapee";
-    homepage = "https://art.pixls.us";
+    homepage = "https://artraweditor.github.io";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ paperdigits ];
     mainProgram = "ART";
diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index 29daefe4e94e..e6dd7e667f31 100644
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 722988ea6fd6..863a84436d2c 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";
diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix
index 2803cd784ab2..4a3c65905ea4 100644
--- a/pkgs/by-name/as/asciinema_3/package.nix
+++ b/pkgs/by-name/as/asciinema_3/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://asciinema.org/";
diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix
index 42a9e13795a5..44ca288f6f38 100644
--- a/pkgs/by-name/as/aseprite/package.nix
+++ b/pkgs/by-name/as/aseprite/package.nix
@@ -107,6 +107,11 @@ clangStdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace src/ver/CMakeLists.txt \
       --replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
+
+    # Using substituteInPlace because no upstream patch for GCC 15 was found for this bundled library.
+    substituteInPlace third_party/json11/json11.cpp \
+      --replace-fail "#include <cmath>" "#include <cmath>
+    #include <cstdint>"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 4f479dc6e904..52b37a84f107 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix
index 21156962d605..a54e05d16cc4 100644
--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = !asLibrary;
 
   meta = {
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index a7f40c07c95d..07297cfe0a65 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-core";
-  version = "2.58.1";
+  version = "2.58.2";
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz";
-    hash = "sha256-fzdKajjNcP9LMsnToDEL+oBNlG/tTJ5pp9SfrNy5Xpw=";
+    hash = "sha256-ooI7li7RbN1csfxTZQKf0hg5TYUqzUCYsyGFS9ZpL24=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index d16ea8e58677..da374e413f20 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-legacy-actions"
     "--with-arm"
     "--with-aarch64"
+    "--with-riscv"
     "--with-io_uring"
     # allows putting audit files in /run/audit, which removes the requirement
     # to wait for tmpfiles to set up the /var/run -> /run symlink
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 58bbfc590da1..2793e668accf 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Automatically update system timezone based on location";
diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix
index 9da9946f4271..c3d71559d920 100644
--- a/pkgs/by-name/au/autotier/package.nix
+++ b/pkgs/by-name/au/autotier/package.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  # Required by rocksdb after 10.7.5
+  env.EXTRA_CFLAGS = "-std=c++20 -fno-char8_t";
+
   buildInputs = [
     rocksdb
     boost
diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix
index 956bf545bd4c..f2d83a65fe1a 100644
--- a/pkgs/by-name/av/avalanche-cli/package.nix
+++ b/pkgs/by-name/av/avalanche-cli/package.nix
@@ -73,7 +73,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/avalanche";
-  versionCheckProgramArg = "--version";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix
index ed40901ee66f..9762e2b75ba5 100644
--- a/pkgs/by-name/av/avro-cpp/package.nix
+++ b/pkgs/by-name/av/avro-cpp/package.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/avrogencpp";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "C++ library which implements parts of the Avro Specification";
diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index 989f78b7f187..f5f042ec3737 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}";
diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix
index c00dfb60bac3..cd360c7b9258 100644
--- a/pkgs/by-name/aw/aws-nuke/package.nix
+++ b/pkgs/by-name/aw/aws-nuke/package.nix
@@ -46,8 +46,6 @@ buildGoModule rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   postInstallCheck = ''
     $out/bin/aws-nuke resource-types | grep "IAMUser"
   '';
diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index 9b4e30277552..45b08ababf82 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -11,14 +11,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "1.143.0";
+  version = "1.146.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
     tag = "v${version}";
-    hash = "sha256-QnJQ45ucziHmOkQdAT29szOljBExiIXZ2zvhiKYXBxI=";
+    hash = "sha256-b0nXhhgQgV0TZ0PGYexKxsb1s7PIe+5dqjOWJiVlWJY=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -82,6 +82,12 @@ python3.pkgs.buildPythonApplication rec {
       xray
     ]);
 
+  # Remove after upstream bumps click > 8.1.8
+  postPatch = ''
+    substituteInPlace requirements/base.txt --replace-fail \
+      'click==8.1.8' 'click==${python3.pkgs.click.version}'
+  '';
+
   postFixup = ''
     # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272
     wrapProgram $out/bin/sam \
@@ -125,7 +131,9 @@ python3.pkgs.buildPythonApplication rec {
     "tests/unit/lib/observability/cw_logs/"
     "tests/unit/lib/build_module/"
     # Disable flaky tests
-    "tests/unit/lib/samconfig/test_samconfig.py"
+    "tests/unit/cli/test_main.py"
+    "tests/unit/commands/samconfig/test_samconfig.py"
+    "tests/unit/local/docker/test_lambda_image.py"
   ];
 
   disabledTests = [
diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index 2008cb72faa7..64311c3f5310 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -72,7 +72,6 @@ python.pkgs.buildPythonApplication rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   enabledTestPaths = [
     "tests/unit"
diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index 6ec81536d391..2db052e46212 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -29,8 +29,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Azure Data Exporter for BloodHound";
     homepage = "https://github.com/SpecterOps/AzureHound";
diff --git a/pkgs/by-name/b6/b612/package.nix b/pkgs/by-name/b6/b612/package.nix
index 1bd6ac5a1421..43a811cdd23a 100644
--- a/pkgs/by-name/b6/b612/package.nix
+++ b/pkgs/by-name/b6/b612/package.nix
@@ -46,6 +46,7 @@ stdenvNoCC.mkDerivation rec {
       epl10
       bsd3
     ];
+    maintainers = with lib.maintainers; [ sternenseemann ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 49609b5c3765..f9b715998d4a 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = lib.optionals withSound soundDependencies;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   postInstall =
diff --git a/pkgs/by-name/ba/bagr/package.nix b/pkgs/by-name/ba/bagr/package.nix
index 68eb4aede9e0..89fb229ab1e5 100644
--- a/pkgs/by-name/ba/bagr/package.nix
+++ b/pkgs/by-name/ba/bagr/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Command line utility for interacting with BagIt bags (RFC 8493)";
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index b3a178601789..771141e38266 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -3,6 +3,7 @@
   lib,
   binutils,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   ninja,
   pkg-config,
@@ -121,6 +122,13 @@ stdenv.mkDerivation (finalAttrs: {
     ./patches/no-cereal.patch
     # Cmake 4 support
     ./patches/cmake.patch
+    # Fix build with gcc15
+    # https://github.com/bambulab/BambuStudio/pull/8555
+    (fetchpatch {
+      name = "bambu-studio-include-stdint-header.patch";
+      url = "https://github.com/bambulab/BambuStudio/commit/434752bf643933f22348d78335abe7f60550e736.patch";
+      hash = "sha256-vWqTM6IHL/gBncLk6gZHw+dFe0sdVuPdUqYeVJUbTis=";
+    })
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix
index 2bfb51195593..ae9588cf4b46 100644
--- a/pkgs/by-name/ba/bark/package.nix
+++ b/pkgs/by-name/ba/bark/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (final: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index b096c9a9af80..4c0ec9af0b88 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -52,7 +52,6 @@ buildNpmPackage rec {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix
index bce78ee9efeb..861a598f0bec 100644
--- a/pkgs/by-name/ba/bashunit/package.nix
+++ b/pkgs/by-name/ba/bashunit/package.nix
@@ -62,7 +62,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix
index 1f39c3fdcde5..f7eb232f7163 100644
--- a/pkgs/by-name/ba/basilk/package.nix
+++ b/pkgs/by-name/ba/basilk/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix
index dffa79c2f7c4..13ea1b2659d0 100644
--- a/pkgs/by-name/ba/bazel_7/package.nix
+++ b/pkgs/by-name/ba/bazel_7/package.nix
@@ -6,6 +6,7 @@
   makeWrapper,
   writeTextFile,
   replaceVars,
+  fetchpatch,
   writeShellApplication,
   makeBinaryWrapper,
   autoPatchelfHook,
@@ -388,6 +389,12 @@ stdenv.mkDerivation rec {
     (replaceVars ./bazel_rc.patch {
       bazelSystemBazelRCPath = bazelRC;
     })
+
+    # Fix build with gcc 15 by adding missing headers
+    (fetchpatch {
+      url = "https://github.com/bazelbuild/bazel/commit/1d206cac050b6c7d9ce65403e6a9909a49bfe4bc.patch";
+      hash = "sha256-Tg5o1Va7dd5hvXbWhZiog+VtuiqngqbbYOkCafVudDs=";
+    })
   ]
   # See enableNixHacks argument above.
   ++ lib.optional enableNixHacks ./nix-build-bazel-package-hacks.patch;
diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index fdebf9c68d12..65b3b2d82626 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -33,7 +33,6 @@ buildGoModule rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix
index 77b63b8435fe..f226fc272722 100644
--- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix
+++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://rtyley.github.io/bfg-repo-cleaner/";
diff --git a/pkgs/by-name/bi/biber-ms/package.nix b/pkgs/by-name/bi/biber-ms/package.nix
index b221b1d15dbd..b04a1493945a 100644
--- a/pkgs/by-name/bi/biber-ms/package.nix
+++ b/pkgs/by-name/bi/biber-ms/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   perlPackages,
-  shortenPerlShebang,
   texlive,
 }:
 
@@ -78,7 +77,6 @@ perlPackages.buildPerlModule {
     XMLWriter
     autovivification
   ];
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
 
   preConfigure = ''
     cp '${multiscriptBltxml}' t/tdata/multiscript.bltxml
@@ -86,9 +84,6 @@ perlPackages.buildPerlModule {
 
   postInstall = ''
     mv "$out"/bin/biber{,-ms}
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang "$out"/bin/biber-ms
   '';
 
   meta = {
diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix
index 57c31398d7d3..a194682bcd7b 100644
--- a/pkgs/by-name/bi/biber/package.nix
+++ b/pkgs/by-name/bi/biber/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchpatch,
   perlPackages,
-  shortenPerlShebang,
   texlive,
 }:
 
@@ -69,11 +68,6 @@ perlPackages.buildPerlModule {
     TestDifferences
     PerlIOutf8_strict
   ];
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/biber
-  '';
 
   meta = {
     description = "Backend for BibLaTeX";
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index d615787792b2..1d09457302a8 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -14,13 +14,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "bitwarden-cli";
-  version = "2025.11.0";
+  version = "2025.12.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-wG0JKQKjNAEoQt/8BFIzISNNUrBqKQHPZ8DRJ69eA5s=";
+    hash = "sha256-Pas9NQKLblVuB0Gx4j6Y64Mb2+RaCg7iquSWtN4K7kU=";
   };
 
   patches = [
@@ -34,7 +34,7 @@ buildNpmPackage (finalAttrs: {
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-/57+ch1d1VMGIMO0Kzu6o3tUX/3adgLkONNRgtyARtQ=";
+  npmDepsHash = "sha256-N7e8WKk2REEH4gP5c7k5zsu3n44hFFLxQ2X35viMuwM=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     perl
@@ -91,7 +91,6 @@ buildNpmPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckKeepEnvironment = [ "HOME" ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/bm/bmputil/package.nix b/pkgs/by-name/bm/bmputil/package.nix
index e9401655ff70..b45e846db04d 100644
--- a/pkgs/by-name/bm/bmputil/package.nix
+++ b/pkgs/by-name/bm/bmputil/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
     udevCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix
index ffe5f166fbad..3521a7e628ba 100644
--- a/pkgs/by-name/bo/bootdev-cli/package.nix
+++ b/pkgs/by-name/bo/bootdev-cli/package.nix
@@ -41,7 +41,6 @@ buildGoModule rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/bootdev";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index a524235e2078..b9054cba1846 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/btm";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index 64543f14f4fa..d66c05d84b19 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -79,7 +79,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix
index 31115184f157..ee1c8535c0af 100644
--- a/pkgs/by-name/br/brotli/package.nix
+++ b/pkgs/by-name/br/brotli/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   python3Packages,
   staticOnly ? stdenv.hostPlatform.isStatic,
@@ -11,26 +10,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brotli";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kl8ZHt71v17QR2bDP+ad/5uixf+GStEPLQ5ooFoC5i8=";
   };
 
-  patches = [
-    # revert runpath change, breaks curl on darwin:
-    #   https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476
-    (fetchpatch {
-      name = "revert-runpath.patch";
-      url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch";
-      hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM=";
-      revert = true;
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
@@ -60,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/google/brotli";
+    changelog = "https://github.com/google/brotli/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "General-purpose lossless compression library with CLI";
     longDescription = ''
       Brotli is a generic-purpose lossless compression algorithm that
diff --git a/pkgs/by-name/br/brush-splat/package.nix b/pkgs/by-name/br/brush-splat/package.nix
index 452c72360efe..d53edccbb667 100644
--- a/pkgs/by-name/br/brush-splat/package.nix
+++ b/pkgs/by-name/br/brush-splat/package.nix
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix
index 17edbfd8819f..913563156d9c 100644
--- a/pkgs/by-name/br/brush/package.nix
+++ b/pkgs/by-name/br/brush/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
   doCheck = false;
diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix
index 7b2feeec25eb..905be6a65b4c 100644
--- a/pkgs/by-name/bs/bsky-cli/package.nix
+++ b/pkgs/by-name/bs/bsky-cli/package.nix
@@ -30,7 +30,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/bsky";
-  versionCheckProgramArg = "--version";
   nativeBuildInputs = [ versionCheckHook ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index 40daf894a3be..e781eb4038e2 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
index 96252ce5e273..13d4e4cf86e9 100644
--- a/pkgs/by-name/bu/buildah-unwrapped/package.nix
+++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix
@@ -74,7 +74,6 @@ buildGoModule (finalAttrs: {
     writableTmpDirAsHomeHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   meta = {
diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index 08abf06bf431..93c74c1e80f3 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -118,7 +118,6 @@ python3Packages.buildPythonApplication rec {
   '';
 
   versionCheckProgram = "${placeholder "out"}/bin/bst";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix
index a8d20c579b7d..0967e63903f6 100644
--- a/pkgs/by-name/bu/bulletty/package.nix
+++ b/pkgs/by-name/bu/bulletty/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index c1a9f5cc2b97..0c9ab5816356 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix
index 66a390b0c9d0..039b8e8ae09c 100644
--- a/pkgs/by-name/bu/bunbun/package.nix
+++ b/pkgs/by-name/bu/bunbun/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix
index 07f1b71d99dc..7a35a7ace0b5 100644
--- a/pkgs/by-name/bu/bundler/package.nix
+++ b/pkgs/by-name/bu/bundler/package.nix
@@ -25,7 +25,6 @@ buildRubyGem rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/bundler";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix
index efb7dc07077d..8da6559f602b 100644
--- a/pkgs/by-name/by/byacc/package.nix
+++ b/pkgs/by-name/by/byacc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchurl {
     urls = [
       "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz"
-      "ftp://ftp.invisible-island.net/byacc/byacc-${finalAttrs.version}.tgz"
+      "https://invisible-island.net/archives/byacc/byacc-${finalAttrs.version}.tgz"
     ];
     hash = "sha256-GSwvrgSNTn9RS6RRYn+cTmEnZQmfgZwZGR+f3j5glnM=";
   };
diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix
index 02beade08c97..e92080542def 100644
--- a/pkgs/by-name/ca/cacert/package.nix
+++ b/pkgs/by-name/ca/cacert/package.nix
@@ -23,7 +23,7 @@ let
     lib.concatStringsSep "\n\n" extraCertificateStrings
   );
 
-  srcVersion = "3.115";
+  srcVersion = "3.117";
   version = if nssOverride != null then nssOverride.version else srcVersion;
   meta = {
     homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -47,7 +47,7 @@ let
           owner = "nss-dev";
           repo = "nss";
           rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM";
-          hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
+          hash = "sha256-sAs0TiV3TK/WtgHvEjl2KFAgebyWZYmcRcmxjpn2AME=";
         };
 
     dontBuild = true;
diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix
index 61a915021c63..03c96de960de 100644
--- a/pkgs/by-name/ca/camilladsp/package.nix
+++ b/pkgs/by-name/ca/camilladsp/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Flexible cross-platform IIR and FIR engine for crossovers, room correction etc";
diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix
index a49ac279ace5..f536f0d642a9 100644
--- a/pkgs/by-name/ca/carapace-bridge/package.nix
+++ b/pkgs/by-name/ca/carapace-bridge/package.nix
@@ -28,7 +28,6 @@ buildGoModule (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix
index 53872b744128..c2a0bb2c9768 100644
--- a/pkgs/by-name/ca/cargo-aoc/package.nix
+++ b/pkgs/by-name/ca/cargo-aoc/package.nix
@@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ca/cargo-auditable/builder.nix b/pkgs/by-name/ca/cargo-auditable/builder.nix
new file mode 100644
index 000000000000..348ff29ef61a
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-auditable/builder.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  auditable-bootstrap,
+}:
+lib.extendMkDerivation {
+  constructDrv = rustPlatform.buildRustPackage.override { cargo-auditable = auditable-bootstrap; };
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname ? "cargo-auditable",
+      auditable ? true,
+      hash ? "",
+      cargoHash ? "",
+      ...
+    }:
+    {
+      inherit auditable pname;
+
+      src = fetchFromGitHub {
+        owner = "rust-secure-code";
+        repo = "cargo-auditable";
+        tag = "v${finalAttrs.version}";
+        inherit hash;
+      };
+
+      nativeBuildInputs = [
+        installShellFiles
+      ];
+
+      checkFlags = [
+        # requires wasm32-unknown-unknown target
+        "--skip=test_wasm"
+        # Seems to be a bug in tests of locked vs. semver compatible packages
+        # https://github.com/rust-secure-code/cargo-auditable/issues/235
+        "--skip=test_proc_macro"
+        "--skip=test_self_hosting"
+      ];
+
+      postInstall = ''
+        installManPage cargo-auditable/cargo-auditable.1
+      '';
+
+      passthru.bootstrap = auditable-bootstrap;
+
+      meta = {
+        description = "Tool to make production Rust binaries auditable";
+        mainProgram = "cargo-auditable";
+        homepage = "https://github.com/rust-secure-code/cargo-auditable";
+        changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${finalAttrs.version}/cargo-auditable/CHANGELOG.md";
+        license = with lib.licenses; [
+          mit # or
+          asl20
+        ];
+        maintainers = with lib.maintainers; [ RossSmyth ];
+        broken = stdenv.hostPlatform != stdenv.buildPlatform;
+      };
+    };
+}
diff --git a/pkgs/by-name/ca/cargo-auditable/package.nix b/pkgs/by-name/ca/cargo-auditable/package.nix
new file mode 100644
index 000000000000..b74e0abbd515
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-auditable/package.nix
@@ -0,0 +1,35 @@
+{
+  buildPackages,
+  callPackage,
+  makeRustPlatform,
+}:
+let
+  # Need to use the build platform rustc and Cargo so that
+  # we don't infrec
+  rustPlatform = makeRustPlatform {
+    inherit (buildPackages) rustc;
+    cargo = buildPackages.cargo.override {
+      auditable = false;
+    };
+  };
+
+  auditableBuilder = callPackage ./builder.nix {
+    inherit rustPlatform;
+    auditable-bootstrap = bootstrap;
+  };
+
+  version = "0.7.2";
+  hash = "sha256-hR6PjTOps8JSM7UbfGlCoZmmwtWExVqYwh4lxDiFWdc=";
+  cargoHash = "sha256-JEfnUJ9J6Xak3AOCwQCnu+v+3Wl3QbXX20qVFWB6040=";
+
+  # cargo-auditable cannot be built with cargo-auditable until cargo-auditable is built
+  bootstrap = auditableBuilder {
+    inherit version hash cargoHash;
+    pname = "cargo-auditable-bootstrap";
+    auditable = false;
+  };
+in
+auditableBuilder {
+  inherit version hash cargoHash;
+  auditable = true;
+}
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 897376b8ecc2..e4dd50fbe586 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-a8swmPQ+JuE/tqRYbV+kekZV8TloxszYq9k8VOGRBrM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index a03ee537c969..18bce576ee7e 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 52db65a97405..4de52a2360c3 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -93,7 +93,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       CobaltCause
     ];
 
-    # The profiler runtime is (currently) disabled on non-Linux platforms
-    broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox);
+    broken = stdenv.targetPlatform.isRedox;
   };
 })
diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index b98c0b3538ea..8196b5a9bcf7 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Cargo plugin for showing a tree-like overview of a crate's modules";
diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix
index 30cfdc3e53f1..40c2fe80f0fe 100644
--- a/pkgs/by-name/ca/cargo-seek/package.nix
+++ b/pkgs/by-name/ca/cargo-seek/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 84033d22dfe9..fb0355986bff 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -37,7 +37,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index 91e5bcf21edb..77c0d72ce4e7 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/cbmc";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [
diff --git a/pkgs/by-name/cd/cdrtools/package.nix b/pkgs/by-name/cd/cdrtools/package.nix
index bf36cda6f08b..ed58c6e850cb 100644
--- a/pkgs/by-name/cd/cdrtools/package.nix
+++ b/pkgs/by-name/cd/cdrtools/package.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     [
       "-Wno-error=implicit-int"
       "-Wno-error=implicit-function-declaration"
+      "-std=gnu89" # Isn't compatible with C23
     ]
     # https://github.com/macports/macports-ports/commit/656932616eebe60f4e8cfd96d8268801dad8224d
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
diff --git a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
index fb9f074ed5dd..a0ed56b85888 100644
--- a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
+++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
@@ -9,7 +9,7 @@
   rustPlatform,
   cargo,
   rustc,
-  setuptoolsRustBuildHook,
+  setuptools-rust,
   openssl,
   Security ? null,
   isPyPy,
@@ -74,9 +74,12 @@ buildPythonPackage rec {
 
   cargoRoot = "src/rust";
 
+  build-system = [
+    setuptools-rust
+  ];
+
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
-    setuptoolsRustBuildHook
     cargo
     rustc
     pkg-config
diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix
index 64ee3416ed82..5a7494eecda6 100644
--- a/pkgs/by-name/ce/ceph/package.nix
+++ b/pkgs/by-name/ce/ceph/package.nix
@@ -321,9 +321,6 @@ let
           };
         });
 
-        httpcore = super.httpcore.overridePythonAttrs (old: {
-          nativeCheckInputs = lib.remove self.pproxy old.nativeCheckInputs;
-        });
       };
   };
 
@@ -421,6 +418,11 @@ stdenv.mkDerivation {
       url = "https://github.com/ceph/ceph/commit/9b38df488d7101b02afa834ea518fd52076d582a.patch?full_index=1";
       hash = "sha256-VcbJhCGTUdNISBd6P96Mm5M3fFVmZ8r7pMl+srQmnIQ=";
     })
+    (fetchpatch2 {
+      name = "ceph-19.2.2-gcc15.patch";
+      url = "https://github.com/ceph/ceph/commit/830925f0dd196f920893b1947ae74171a202e825.patch";
+      hash = "sha256-bs+noyjiyAjwqfgSHDxdZJnZ/kptOOcz75KMqAaROpg=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix
index d6e768ba44b8..4d0e0403b7ca 100644
--- a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix
+++ b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix
@@ -24,7 +24,6 @@ buildNpmPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix
index d3a5d44bb67b..fc17052d90e5 100644
--- a/pkgs/by-name/ch/chaos/package.nix
+++ b/pkgs/by-name/ch/chaos/package.nix
@@ -29,8 +29,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Tool to communicate with Chaos DNS API";
     homepage = "https://github.com/projectdiscovery/chaos-client";
diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix
index 47c4fe522f34..34bfcc8f10cf 100644
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
diff --git a/pkgs/by-name/ch/check50/package.nix b/pkgs/by-name/ch/check50/package.nix
index f82720beca02..c2335ee90a3d 100644
--- a/pkgs/by-name/ch/check50/package.nix
+++ b/pkgs/by-name/ch/check50/package.nix
@@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "check50" ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # no python tests
 
diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix
index 36b22f932f97..8bf5a994fe9e 100644
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@@ -79,7 +79,6 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Customizable automatic UML diagram generator for C++ based on Clang";
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index 191c52f5d6a9..7c704ea10369 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [
diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix
index 086aec1809be..54081266a062 100644
--- a/pkgs/by-name/cl/clashtui/package.nix
+++ b/pkgs/by-name/cl/clashtui/package.nix
@@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index b7b7e17bd168..49421366bad4 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -43,7 +43,6 @@ buildNpmPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckKeepEnvironment = [ "HOME" ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = ./update.sh;
 
diff --git a/pkgs/by-name/cl/cli50/package.nix b/pkgs/by-name/cl/cli50/package.nix
index 08b849ae1fdc..52ce04e440b4 100644
--- a/pkgs/by-name/cl/cli50/package.nix
+++ b/pkgs/by-name/cl/cli50/package.nix
@@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "cli50" ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # no python tests
 
diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix
index f292ec880072..71f50a519232 100644
--- a/pkgs/by-name/cl/clive/package.nix
+++ b/pkgs/by-name/cl/clive/package.nix
@@ -43,7 +43,6 @@ buildGoModule rec {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doinstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/by-name/cl/clojure/package.nix
similarity index 97%
rename from pkgs/development/interpreters/clojure/default.nix
rename to pkgs/by-name/cl/clojure/package.nix
index eadf0f60b41a..0e4ef2efe6f8 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/by-name/cl/clojure/package.nix
@@ -4,6 +4,8 @@
   bashNonInteractive,
   fetchurl,
   installShellFiles,
+  # Be careful if you remove this, out-of-tree consumers expect to
+  # be able to override `jdk`.
   jdk,
   rlwrap,
   makeWrapper,
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/by-name/cl/clooj/package.nix
similarity index 100%
rename from pkgs/development/interpreters/clojure/clooj.nix
rename to pkgs/by-name/cl/clooj/package.nix
diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index b41f3d3be9ec..82b728259943 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 573703aab3f9..00b6fb81ba9a 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckPhaseInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index 4bd56963bca8..1715759a7690 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru = {
     inherit sources;
diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index af10f9c3bf07..43f2eea7fa7e 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -29,8 +29,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Tool for listing assets from multiple cloud providers";
     homepage = "https://github.com/projectdiscovery/cloudlist";
diff --git a/pkgs/by-name/cm/cmake-language-server/package.nix b/pkgs/by-name/cm/cmake-language-server/package.nix
index d03a6abe72bd..c28f5967b5a9 100644
--- a/pkgs/by-name/cm/cmake-language-server/package.nix
+++ b/pkgs/by-name/cm/cmake-language-server/package.nix
@@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec {
     pytest-datadir
     pytestCheckHook
   ]);
-  versionCheckProgramArg = "--version";
 
   # version.py generated by pdm, no idea why it's not present in test phase
   # https://github.com/regen100/cmake-language-server/blob/v0.1.11/pyproject.toml#L35-L36
diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index 58f582f9693e..7bc642641ec5 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.15.0";
+  version = "12.16.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-Vw+jGxPQBIwrHvh5JGJss5H9DR9QnktsKlW1CRnEN4Q=";
+    hash = "sha256-dArqHTlygqlSl3+yPoG94InGfIJsw26yh2VWoaibI58=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-BKMzSdl5h9bVTNviSv7KeI7cz6QTP0jX+LU9HqWkVgo=";
+  vendorHash = "sha256-AldUs9cWsNZ5zgeBwe40b1f4NlOReY54V6O+0gkbY7Y=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix
index d361b95dbdeb..ccb3e73b713a 100644
--- a/pkgs/by-name/co/cobalt/package.nix
+++ b/pkgs/by-name/co/cobalt/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-x4cnwCpbDYvUhlp8Fw2//NC9Z/kbv/hGF7MqKAft8bU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/co/cocom-tool-set/package.nix b/pkgs/by-name/co/cocom-tool-set/package.nix
index f4d2b2358d43..9ab545e01c4f 100644
--- a/pkgs/by-name/co/cocom-tool-set/package.nix
+++ b/pkgs/by-name/co/cocom-tool-set/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_COMPILE = toString [
       "-Wno-error=implicit-int"
       "-Wno-error=implicit-function-declaration"
+      "-std=gnu17"
     ];
   };
 
diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index bfdc3db155ee..95bffaf5aaaf 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Unholy spellchecker for code";
diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix
index a3121bf19eb2..b40238c1a992 100644
--- a/pkgs/by-name/co/codeium/package.nix
+++ b/pkgs/by-name/co/codeium/package.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix
index ff773fb4d6fa..797f5412cb56 100644
--- a/pkgs/by-name/co/codesnap/package.nix
+++ b/pkgs/by-name/co/codesnap/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix
index 242208008431..e3d1975ac146 100644
--- a/pkgs/by-name/co/cogl/package.nix
+++ b/pkgs/by-name/co/cogl/package.nix
@@ -111,9 +111,16 @@ stdenv.mkDerivation rec {
         "-I${harfbuzz.dev}/include/harfbuzz"
       ]
     );
-  }
-  // lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+    NIX_CFLAGS_COMPILE = toString (
+      [ ]
+      ++ lib.optional stdenv.cc.isGNU [
+        # Fix build with gcc15
+        "-std=gnu17"
+      ]
+      ++ lib.optional stdenv.cc.isClang [
+        "-Wno-error=implicit-function-declaration"
+      ]
+    );
   };
 
   #doCheck = true; # all tests fail (no idea why)
diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix
index 5a6203969511..7aa60418d134 100644
--- a/pkgs/by-name/co/committed/package.nix
+++ b/pkgs/by-name/co/committed/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/co/compare50/package.nix b/pkgs/by-name/co/compare50/package.nix
index e1fa66017524..4d02e49000c2 100644
--- a/pkgs/by-name/co/compare50/package.nix
+++ b/pkgs/by-name/co/compare50/package.nix
@@ -49,7 +49,6 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "compare50" ];
 
-  versionCheckProgramArg = "--version";
   nativeCheckInputs = [ versionCheckHook ];
 
   # repo does not use pytest
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index b600f997f041..89eec24a9f76 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";
diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix
index a2ec0d24a996..a20bd9201fda 100644
--- a/pkgs/by-name/co/conftest/package.nix
+++ b/pkgs/by-name/co/conftest/package.nix
@@ -56,7 +56,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Write tests against structured configuration data";
diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix
index fe51e62cac5c..d5cd3bb9e059 100644
--- a/pkgs/by-name/co/container/package.nix
+++ b/pkgs/by-name/co/container/package.nix
@@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix
index 5028b5fd2620..b1ee5ab384f1 100644
--- a/pkgs/by-name/co/conventional-changelog-cli/package.nix
+++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix
index aa65ed66b656..74c3b41cfbeb 100644
--- a/pkgs/by-name/co/convos/package.nix
+++ b/pkgs/by-name/co/convos/package.nix
@@ -5,7 +5,6 @@
   perl,
   perlPackages,
   makeWrapper,
-  shortenPerlShebang,
   openssl,
   nixosTests,
 }:
@@ -21,10 +20,7 @@ perlPackages.buildPerlPackage rec {
     sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs=";
   };
 
-  nativeBuildInputs = [
-    makeWrapper
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ];
+  nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = with perlPackages; [
     CryptPassphrase
@@ -108,9 +104,6 @@ perlPackages.buildPerlPackage rec {
     cp -vR templates $out/templates
     cp Makefile.PL $out/Makefile.PL
   ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/convos
-  ''
   + ''
     wrapProgram $out/bin/convos --set MOJO_HOME $out
   '';
diff --git a/pkgs/by-name/co/coordgenlibs/package.nix b/pkgs/by-name/co/coordgenlibs/package.nix
index eb421a3534bc..be43103068bb 100644
--- a/pkgs/by-name/co/coordgenlibs/package.nix
+++ b/pkgs/by-name/co/coordgenlibs/package.nix
@@ -45,6 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
         'cmake_minimum_required(VERSION 3.5)'
   '';
 
+  cmakeFlags = [
+    # Be more permissive to compiler warnings
+    # Fix the new -Wrestrict warning in gcc 15 blocking build
+    # https://github.com/schrodinger/coordgenlibs/issues/137
+    (lib.cmakeBool "COORDGEN_RIGOROUS_BUILD" false)
+  ];
+
   doCheck = true;
 
   # Fix the build with Clang 20.
diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix
index a138bd01cb9e..0c62015faec9 100644
--- a/pkgs/by-name/co/cope/package.nix
+++ b/pkgs/by-name/co/cope/package.nix
@@ -1,12 +1,9 @@
 {
   lib,
   fetchFromGitHub,
-  perl538Packages,
+  perlPackages,
   makeWrapper,
 }:
-let
-  perlPackages = perl538Packages;
-in
 perlPackages.buildPerlPackage {
   pname = "cope";
   version = "0-unstable-2025-06-20";
@@ -70,5 +67,6 @@ perlPackages.buildPerlPackage {
       gpl1Plus
     ];
     maintainers = with lib.maintainers; [ deftdawg ];
+    broken = true; # requires old Perl we don't ship anymore
   };
 }
diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix
index 16b5763fb051..560276cfffe6 100644
--- a/pkgs/by-name/co/countryfetch/package.nix
+++ b/pkgs/by-name/co/countryfetch/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoBuildFlags = [ "--package=countryfetch" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index 58cd3ea21d74..c86f39c30123 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   installCheckPhase = ''
     runHook preInstallCheck
 
diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix
index 196fe69cc674..765d79c48769 100644
--- a/pkgs/by-name/cp/cpplint/package.nix
+++ b/pkgs/by-name/cp/cpplint/package.nix
@@ -35,7 +35,6 @@ python3Packages.buildPythonApplication rec {
     testfixtures
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://github.com/cpplint/cpplint";
diff --git a/pkgs/by-name/cp/cppman/package.nix b/pkgs/by-name/cp/cppman/package.nix
index b0ed1eacf92a..176f2979bc2a 100644
--- a/pkgs/by-name/cp/cppman/package.nix
+++ b/pkgs/by-name/cp/cppman/package.nix
@@ -55,7 +55,6 @@ python3Packages.buildPythonApplication rec {
   ];
   # Writable $HOME is required for `cppman --version` to work
   versionCheckKeepEnvironment = "HOME";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix
index 257bba7420d5..4dc9a1c1d364 100644
--- a/pkgs/by-name/cp/cproto/package.nix
+++ b/pkgs/by-name/cp/cproto/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     urls = [
       "mirror://debian/pool/main/c/cproto/cproto_${version}.orig.tar.gz"
       # No version listings and apparently no versioned tarball over http(s).
-      "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
+      "https://invisible-island.net/archives/cproto/cproto-${version}.tgz"
     ];
     sha256 = "sha256-C9HYvo/wpMpD+Uf5V1DTT2TtqTyeLKeRAP1gFAt8YzE=";
   };
diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix
index 9d1409248466..274d541b7ffc 100644
--- a/pkgs/by-name/cr/criticality-score/package.nix
+++ b/pkgs/by-name/cr/criticality-score/package.nix
@@ -41,7 +41,6 @@ buildGo124Module rec {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Gives criticality score for an open source project";
diff --git a/pkgs/by-name/cr/cronie/package.nix b/pkgs/by-name/cr/cronie/package.nix
index 6c727dda3ca1..bb707390693e 100644
--- a/pkgs/by-name/cr/cronie/package.nix
+++ b/pkgs/by-name/cr/cronie/package.nix
@@ -2,6 +2,7 @@
   lib,
   autoreconfHook,
   fetchFromGitHub,
+  fetchpatch,
   stdenv,
 }:
 
@@ -16,6 +17,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-WrzdpE9t7vWpc8QFoFs+S/HgHwsidRNmfcHp7ltSWQw=";
   };
 
+  patches = [
+    # Fix build with GCC 15
+    (fetchpatch {
+      url = "https://github.com/cronie-crond/cronie/commit/09c630c654b2aeff06a90a412cce0a60ab4955a4.patch";
+      hash = "sha256-OU6pCFeEPC32cPE3K9Uq9HuvpwdUZpaBtyxNOaJkFVM=";
+    })
+  ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix
index c70d2e2ff951..ff10d08eca57 100644
--- a/pkgs/by-name/cr/crusader/package.nix
+++ b/pkgs/by-name/cr/crusader/package.nix
@@ -70,7 +70,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 44c55d6defff..229bdc49983b 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -42,7 +42,6 @@ buildGoModule (finalAttrs: {
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix
index dfcc8738343e..5a3bb73c571a 100644
--- a/pkgs/by-name/cs/csharp-ls/package.nix
+++ b/pkgs/by-name/cs/csharp-ls/package.nix
@@ -21,7 +21,6 @@ buildDotnetGlobalTool rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cs/csound/package.nix b/pkgs/by-name/cs/csound/package.nix
index 155fddc1ca92..95d836daba40 100644
--- a/pkgs/by-name/cs/csound/package.nix
+++ b/pkgs/by-name/cs/csound/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   libsndfile,
   libsamplerate,
@@ -36,6 +37,14 @@ stdenv.mkDerivation {
     sha256 = "sha256-NDYltwmjBsX1DWCjy8/4cXMSl3/mK+HaQHSKUmRR9TI=";
   };
 
+  patches = [
+    # Fix typo that breaks build
+    (fetchpatch {
+      url = "https://github.com/csound/csound/commit/bb9bafcfa17a87d3733eda1e25a812fd0be08ac6.diff";
+      hash = "sha256-0M047uALPAoyQP0LbfBAybb2DWQ2/6QwZXxUjs1O1fE=";
+    })
+  ];
+
   cmakeFlags = [
     "-DBUILD_CSOUND_AC=0"
   ] # fails to find Score.hpp
diff --git a/pkgs/by-name/ct/ctags-lsp/package.nix b/pkgs/by-name/ct/ctags-lsp/package.nix
index 676d358e53cc..81f884b39626 100644
--- a/pkgs/by-name/ct/ctags-lsp/package.nix
+++ b/pkgs/by-name/ct/ctags-lsp/package.nix
@@ -42,7 +42,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix
index 42639521e413..665ef7fab10f 100644
--- a/pkgs/by-name/cu/cups/package.nix
+++ b/pkgs/by-name/cu/cups/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cups";
-  version = "2.4.14";
+  version = "2.4.16";
 
   src = fetchurl {
     url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    hash = "sha256-ZgKIAg3W95yveZgRxMGjIHpIaJiZrCCTlZ1wo73Ldpk=";
+    hash = "sha256-AzlYcgS0+UKN0FkuswHewL+epuqNzl2WkNVr5YWrqS0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/cv/cvs/package.nix b/pkgs/by-name/cv/cvs/package.nix
index 47c4c2f888c7..f903bc16a74c 100644
--- a/pkgs/by-name/cv/cvs/package.nix
+++ b/pkgs/by-name/cv/cvs/package.nix
@@ -46,6 +46,10 @@ stdenv.mkDerivation {
     texinfo
   ];
 
+  # Fix build with gcc15
+  # https://savannah.nongnu.org/bugs/index.php?66726
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   configureFlags = [
     "--with-editor=${nano}/bin/nano"
 
diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index 94002e4821b5..7da2e189040d 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix
index 63dff1f5e4c5..16f83afbec07 100644
--- a/pkgs/by-name/cy/cyrus_sasl/package.nix
+++ b/pkgs/by-name/cy/cyrus_sasl/package.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch";
       hash = "sha256-pc0cZqj1QoxDqgd/j/5q3vWONEPrTm4Pr6MzHlfjRCc=";
     })
+    # Fix build with gcc15
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/cyrus-sasl/raw/388b80c6a8f93667587b4ac2e7992d0aa1c431f9/f/cyrus-sasl-2.1.28-gcc15.patch";
+      hash = "sha256-AfSQXFtVh0IHG8Uw9nWMWlkQnyaX3ZMsdZLd7hTru7Q=";
+    })
   ];
 
   outputs = [
@@ -63,7 +68,7 @@ stdenv.mkDerivation rec {
     libxcrypt
   ]
   ++ lib.optional enableLdap openldap
-  ++ lib.optional stdenv.hostPlatform.isLinux pam;
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform pam) pam;
 
   configureFlags = [
     "--with-openssl=${openssl.dev}"
diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index 592bbf2f1e71..496d56dda6ce 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -71,7 +71,6 @@ let
       versionCheckHook
     ];
     versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli";
-    versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
     passthru = {
diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix
index 67e802908d7a..9c40cd6b4d9e 100644
--- a/pkgs/by-name/da/dae/package.nix
+++ b/pkgs/by-name/da/dae/package.nix
@@ -54,8 +54,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru = {
     tests = {
       inherit (nixosTests) dae;
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index 5e214aa5a5b0..ec270b04428b 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -198,7 +198,6 @@ stdenv.mkDerivation rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = gitUpdater {
diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 38813b474450..ceb5acadf01f 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -84,7 +84,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/databricks";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix
index 29d90cd8eafa..e803dc6302fa 100644
--- a/pkgs/by-name/db/dbx/package.nix
+++ b/pkgs/by-name/db/dbx/package.nix
@@ -129,7 +129,6 @@ python.pkgs.buildPythonApplication rec {
     pytest-xdist
     pytestCheckHook
   ]);
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # Fails because of dbfs CLI wrong call
diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 739e3f1eb0d4..b3a4cab1345c 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -50,7 +50,6 @@ buildGoModule rec {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   meta = {
diff --git a/pkgs/by-name/de/deepcool-digital-linux/package.nix b/pkgs/by-name/de/deepcool-digital-linux/package.nix
index 427b8393a67a..ddcd9c19c3b3 100644
--- a/pkgs/by-name/de/deepcool-digital-linux/package.nix
+++ b/pkgs/by-name/de/deepcool-digital-linux/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = false; # FIXME: version cmd returns 0.8.3, set to true when we switch to a stable version
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/de/deputy/package.nix b/pkgs/by-name/de/deputy/package.nix
index 53d43df4c988..67687d15a77a 100644
--- a/pkgs/by-name/de/deputy/package.nix
+++ b/pkgs/by-name/de/deputy/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-TezOv07Dl99jw8FIqJvx6F8X8Au/aMPC/CXDYLkQDnE=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix
index 527ea94d2025..601d99c494b0 100644
--- a/pkgs/by-name/de/deterministic-zip/package.nix
+++ b/pkgs/by-name/de/deterministic-zip/package.nix
@@ -23,7 +23,6 @@ buildGoModule (finalAttrs: {
     "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.Version=${finalAttrs.version}"
   ];
 
-  versionCheckProgramArg = "--version";
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/de/dev86/package.nix b/pkgs/by-name/de/dev86/package.nix
index 726ba568479f..9b19da1d43e8 100644
--- a/pkgs/by-name/de/dev86/package.nix
+++ b/pkgs/by-name/de/dev86/package.nix
@@ -6,16 +6,22 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dev86";
-  version = "1.0.1";
+  version = "1.0.1-unstable-2025-02-12";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jbruchon";
     repo = "dev86";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-xeOtESc0X7RZWCIpNZSHE8au9+opXwnHsAcayYLSX7w=";
+    rev = "0332db1ceb238fa7f98603cdf4223a1d839d4b31";
+    hash = "sha256-f6C7ykOmOHwxeMsF1Wm81FBBJNwTP0cF4+mFMzsc208=";
   };
 
+  patches = [
+    # Fix for GCC 15/C23 by de-K&R-ing function definitions and adding
+    # missing parameters to function declarations where necessary.
+    ./unproto-c23-compatibility.patch
+  ];
+
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = {
diff --git a/pkgs/by-name/de/dev86/unproto-c23-compatibility.patch b/pkgs/by-name/de/dev86/unproto-c23-compatibility.patch
new file mode 100644
index 000000000000..a931f1072914
--- /dev/null
+++ b/pkgs/by-name/de/dev86/unproto-c23-compatibility.patch
@@ -0,0 +1,245 @@
+diff --git a/unproto/error.c b/unproto/error.c
+index 667d978cbb..2fbccacb4d 100644
+--- a/unproto/error.c
++++ b/unproto/error.c
+@@ -53,7 +53,7 @@
+ 
+ #include <stdio.h>
+ 
+-extern void exit();
++extern void exit(int status);
+ 
+ /* Application-specific stuff */
+ 
+diff --git a/unproto/error.h b/unproto/error.h
+index dfb27e9067..cb52ae646b 100644
+--- a/unproto/error.h
++++ b/unproto/error.h
+@@ -1,6 +1,6 @@
+ /* @(#) error.h 1.2 92/01/15 21:53:14 */
+ 
+ extern int errcount;			/* error counter */
+-extern void error();			/* default context */
+-extern void error_where();		/* user-specified context */
+-extern void fatal();			/* fatal error */
++extern void error(char *text);			/* default context */
++extern void error_where(char *path, int line, char *text);		/* user-specified context */
++extern void fatal(char *text);			/* fatal error */
+diff --git a/unproto/strsave.c b/unproto/strsave.c
+index 2ee00b4172..faa4e18686 100644
+--- a/unproto/strsave.c
++++ b/unproto/strsave.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ 
+ extern int hash(register char *s, unsigned size);
+-extern char *malloc();
++extern char *malloc(long size);
+ 
+ /* Application-specific stuff */
+ 
+diff --git a/unproto/symbol.c b/unproto/symbol.c
+index 67a4bf0bc6..a4beab5e92 100644
+--- a/unproto/symbol.c
++++ b/unproto/symbol.c
+@@ -45,7 +45,7 @@
+ #include <string.h>
+ 
+ extern int hash(register char *s, unsigned size);
+-extern char *malloc();
++extern char *malloc(long size);
+ 
+ /* Application-specific stuff */
+ 
+diff --git a/unproto/symbol.h b/unproto/symbol.h
+index 0711c1f4dc..0e2b1d88f8 100644
+--- a/unproto/symbol.h
++++ b/unproto/symbol.h
+@@ -6,6 +6,6 @@
+     struct symbol *next;
+ };
+ 
+-extern void sym_enter();		/* add symbol to table */
+-extern struct symbol *sym_find();	/* locate symbol */
++extern void sym_enter(char *name, int type);		/* add symbol to table */
++extern struct symbol *sym_find(register char *name);	/* locate symbol */
+ extern void sym_init();			/* prime the table */
+diff --git a/unproto/tok_class.c b/unproto/tok_class.c
+index 04207a07f3..9af67188ca 100644
+--- a/unproto/tok_class.c
++++ b/unproto/tok_class.c
+@@ -51,8 +51,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-extern long time();
+-extern char* ctime();
++extern long time(long *tloc);
++extern char* ctime(long *clock);
+ 
+ /* Application-specific stuff */
+ 
+@@ -61,13 +61,13 @@
+ #include "token.h"
+ #include "symbol.h"
+ 
+-static struct token *tok_list();
+-static void tok_list_struct();
+-static void tok_list_append();
+-static void tok_strcat();
+-static void tok_time();
+-static void tok_date();
+-static void tok_space_append();
++static struct token *tok_list(struct token *t);
++static void tok_list_struct(register struct token *list, register struct token *t);
++static void tok_list_append(struct token *h, struct token *t);
++static void tok_strcat(register struct token *t1);
++static void tok_time(struct token *t);
++static void tok_date(struct token *t);
++static void tok_space_append(register struct token *list, register struct token *t);
+ 
+ #if defined(MAP_VOID_STAR) || defined(MAP_VOID)
+ static void tok_void();			/* rewrite void keyword */
+diff --git a/unproto/tok_io.c b/unproto/tok_io.c
+index 288950b3ac..773ca5bf4d 100644
+--- a/unproto/tok_io.c
++++ b/unproto/tok_io.c
+@@ -89,7 +89,7 @@
+ #include "vstring.h"
+ #include "error.h"
+ 
+-extern char *strsave();			/* XXX need include file */
++extern char *strsave(register char *str);			/* XXX need include file */
+ 
+ /* Stuff to keep track of original source file name and position */
+ 
+@@ -104,12 +104,12 @@
+ 
+ /* Forward declarations */
+ 
+-static int read_quoted();
+-static void read_comment();
++static int read_quoted(register struct vstring *vs, int ch);
++static void read_comment(register struct vstring *vs);
+ static int backslash_newline();
+-static char *read_hex();
+-static char *read_octal();
+-static void fix_line_control();
++static char *read_hex(struct vstring *vs, register char *cp);
++static char *read_octal(register struct vstring *vs, register char *cp, register int c);
++static void fix_line_control(register char *path, register int line);
+ 
+  /*
+   * Character input with one level of pushback. The INPUT() macro recursively
+diff --git a/unproto/tok_pool.c b/unproto/tok_pool.c
+index e2ed107ce7..bbe3d184c5 100644
+--- a/unproto/tok_pool.c
++++ b/unproto/tok_pool.c
+@@ -37,7 +37,7 @@
+ 
+ /* C library */
+ 
+-extern char *malloc();
++extern char *malloc(long size);
+ 
+ /* Application-specific stuff */
+ 
+diff --git a/unproto/token.h b/unproto/token.h
+index bb2f50a106..e3752a0eb3 100644
+--- a/unproto/token.h
++++ b/unproto/token.h
+@@ -27,11 +27,11 @@
+ /* Input/output functions and macros */
+ 
+ extern struct token *tok_get();		/* read next single token */
+-extern void tok_show();			/* display (composite) token */
++extern void tok_show(register struct token *t);			/* display (composite) token */
+ extern struct token *tok_class();	/* classify tokens */
+-extern void tok_unget();		/* stuff token back into input */
++extern void tok_unget(register struct token *t);		/* stuff token back into input */
+ extern void put_nl();			/* print newline character */
+-extern void tok_show_ch();		/* emit single-character token */
++extern void tok_show_ch(register struct token *t);		/* emit single-character token */
+ 
+ #define	tok_flush(t)	(tok_show(t), tok_free(t))
+ 
+@@ -46,7 +46,7 @@
+ /* Memory management */
+ 
+ struct token *tok_alloc();		/* allocate token storage */
+-extern void tok_free();			/* re-cycle storage */
++extern void tok_free(register struct token *t);			/* re-cycle storage */
+ 
+ /* Context */
+ 
+diff --git a/unproto/unproto.c b/unproto/unproto.c
+index 18fc2aaecf..802b91dd3e 100644
+--- a/unproto/unproto.c
++++ b/unproto/unproto.c
+@@ -140,7 +140,7 @@
+ #include <errno.h>
+ #include <string.h>
+ 
+-extern void exit();
++extern void exit(int status);
+ extern int optind;
+ extern char *optarg;
+ extern int getopt();
+@@ -159,16 +159,16 @@
+ 
+ /* Forward declarations. */
+ 
+-static struct token *dcl_flush();
+-static void block_flush();
++static struct token *dcl_flush(register struct token *t);
++static void block_flush(register struct token *t);
+ static void block_dcls();
+-static struct token *show_func_ptr_type();
+-static struct token *show_struct_type();
+-static void show_arg_name();
+-static void show_type();
+-static void pair_flush();
+-static void check_cast();
+-static void show_empty_list();
++static struct token *show_func_ptr_type(struct token *t1, struct token *t2);
++static struct token *show_struct_type(register struct token *p);
++static void show_arg_name(register struct token *s);
++static void show_type(register struct token *s);
++static void pair_flush(register struct token *t, register int start, register int stop);
++static void check_cast(struct token *t);
++static void show_empty_list(register struct token *t);
+ 
+ #define	check_cast_flush(t)	(check_cast(t), tok_free(t))
+ 
+diff --git a/unproto/vstring.c b/unproto/vstring.c
+index 220bd530fe..ef9bcffa3c 100644
+--- a/unproto/vstring.c
++++ b/unproto/vstring.c
+@@ -67,8 +67,8 @@
+ 
+ /* C library */
+ 
+-extern char *malloc();
+-extern char *realloc();
++extern char *malloc(long size);
++extern char *realloc(char *p, long size);
+ 
+ /* Application-specific stuff */
+ 
+diff --git a/unproto/vstring.h b/unproto/vstring.h
+index c2e1f88a77..16a17aa815 100644
+--- a/unproto/vstring.h
++++ b/unproto/vstring.h
+@@ -5,9 +5,9 @@
+     char   *last;			/* last position */
+ };
+ 
+-extern struct vstring *vs_alloc();	/* initial allocation */
+-extern char *vs_realloc();		/* string extension */
+-extern char *vs_strcpy();		/* copy string */
++extern struct vstring *vs_alloc(int len);	/* initial allocation */
++extern char *vs_realloc(register struct vstring *vp, char *cp);		/* string extension */
++extern char *vs_strcpy(register struct vstring *vp, register char *dst, register char *src);		/* copy string */
+ 
+ /* macro to add one character to auto-resized string */
+ 
diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix
index 3744d3da2a2e..7aa1b6e3ed81 100644
--- a/pkgs/by-name/di/diffstat/package.nix
+++ b/pkgs/by-name/di/diffstat/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz"
+      "https://invisible-island.net/archives/diffstat/diffstat-${version}.tgz"
       "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz"
     ];
     hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc=";
diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index bfbfdd8c2207..92895f658894 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/difft";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix
index 697f30bdcedb..bd13d4084ac3 100644
--- a/pkgs/by-name/di/direwolf-unstable/package.nix
+++ b/pkgs/by-name/di/direwolf-unstable/package.nix
@@ -12,13 +12,13 @@
   inherit hamlibSupport gpsdSupport extraScripts;
 }).overrideAttrs
   (oldAttrs: {
-    version = "1.8.1-unstable-2025-12-19";
+    version = "1.8.1-unstable-2025-12-28";
 
     src = fetchFromGitHub {
       owner = "wb2osz";
       repo = "direwolf";
-      rev = "1924999dbd24ce155aff69fec76cee35ad478bdd";
-      hash = "sha256-Q9mYeDQHaMNez1oQHaQTfjU/AxAKhpB98UcmaNujMjA=";
+      rev = "01c31145716fd57e2e53844718bdc769dcce16dd";
+      hash = "sha256-OxNhSrxshbdCCNkwnYzz/1NNYwNJYAQiQ7iaXw3x7kc=";
     };
 
     # drop upstreamed cmake-4 patch
diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix
index 6b9667d82059..90d4121dd9a1 100644
--- a/pkgs/by-name/di/display3d/package.nix
+++ b/pkgs/by-name/di/display3d/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix
index 6573d5e9fbc8..6f51d4a6589c 100644
--- a/pkgs/by-name/di/distant/package.nix
+++ b/pkgs/by-name/di/distant/package.nix
@@ -66,7 +66,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix
index 228db44bb066..4e047a1130ab 100644
--- a/pkgs/by-name/dj/django-upgrade/package.nix
+++ b/pkgs/by-name/dj/django-upgrade/package.nix
@@ -26,8 +26,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   pythonImportsCheck = [ "django_upgrade" ];
 
   meta = {
diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix
index c0d8db509963..7fe0a09825c1 100644
--- a/pkgs/by-name/do/docker-language-server/package.nix
+++ b/pkgs/by-name/do/docker-language-server/package.nix
@@ -51,7 +51,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index b3b8244785a8..9cf19591cc63 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/dovi_tool";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/do/doxx/package.nix b/pkgs/by-name/do/doxx/package.nix
index b12464d65a31..e68a101187f0 100644
--- a/pkgs/by-name/do/doxx/package.nix
+++ b/pkgs/by-name/do/doxx/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix
index 40c5a5ed0fe1..c2e6b0ed08ed 100644
--- a/pkgs/by-name/dp/dpkg/package.nix
+++ b/pkgs/by-name/dp/dpkg/package.nix
@@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 0c44ccf9039d..dbea0403ed51 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/dprint";
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   passthru = {
diff --git a/pkgs/by-name/dr/drawpile/package.nix b/pkgs/by-name/dr/drawpile/package.nix
index d31a9ffc1626..9cf75ef2c1c0 100644
--- a/pkgs/by-name/dr/drawpile/package.nix
+++ b/pkgs/by-name/dr/drawpile/package.nix
@@ -94,12 +94,7 @@ stdenv.mkDerivation rec {
     extra-cmake-modules
     rustc
     rustPlatform.cargoSetupHook
-    (
-      if buildClient || buildServerGui then
-        qt6Packages.wrapQtAppsHook
-      else
-        qt6Packages.wrapQtAppsNoGuiHook
-    )
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/dt/dtach/package.nix b/pkgs/by-name/dt/dtach/package.nix
index 1d1be03dcd2c..9e359d43f594 100644
--- a/pkgs/by-name/dt/dtach/package.nix
+++ b/pkgs/by-name/dt/dtach/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,6 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/crigler/dtach/commit/6d80909a8c0fd19717010a3c76fec560f988ca48.patch?full_index=1";
+      hash = "sha256-v3vToJdSwihiPCSjXjEJghiaynHPTEql3F7URXRjCbM=";
+    })
+  ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp dtach $out/bin/dtach
diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index e9192fecaf46..d86c9a566447 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index 57ac6d47ccb4..ee2838fa65d3 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index 35d3afef4632..537c4af17314 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -48,7 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/dust";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/dw/dwarf2json/package.nix b/pkgs/by-name/dw/dwarf2json/package.nix
index d0a1980478f6..2551a24d5e64 100644
--- a/pkgs/by-name/dw/dwarf2json/package.nix
+++ b/pkgs/by-name/dw/dwarf2json/package.nix
@@ -20,7 +20,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://github.com/volatilityfoundation/dwarf2json";
diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix
index a43824fd2e87..8669f2eb3dde 100644
--- a/pkgs/by-name/dw/dwarfs/package.nix
+++ b/pkgs/by-name/dw/dwarfs/package.nix
@@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   versionCheckProgram = "${placeholder "out"}/bin/dwarfs";
 
   meta = {
diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix
index 7376c05b7121..c4e589d66aca 100644
--- a/pkgs/by-name/eb/eb-garamond/package.nix
+++ b/pkgs/by-name/eb/eb-garamond/package.nix
@@ -3,22 +3,22 @@
   stdenvNoCC,
   fetchFromGitHub,
   python3,
-  ttfautohint,
+  ttfautohint-nox,
 }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "eb-garamond";
   version = "0.016";
 
   src = fetchFromGitHub {
     owner = "georgd";
     repo = "EB-Garamond";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ=";
   };
 
   nativeBuildInputs = [
     (python3.withPackages (p: [ p.fontforge ]))
-    ttfautohint
+    ttfautohint-nox
   ];
 
   postPatch = ''
@@ -53,4 +53,4 @@ stdenvNoCC.mkDerivation rec {
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/ec/ec2-instance-selector/package.nix b/pkgs/by-name/ec/ec2-instance-selector/package.nix
index 58f72da2ba03..a8a0b9cb450a 100644
--- a/pkgs/by-name/ec/ec2-instance-selector/package.nix
+++ b/pkgs/by-name/ec/ec2-instance-selector/package.nix
@@ -32,7 +32,6 @@ buildGoModule (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix
index 6dd1b1b9aa2f..977c49caeff9 100644
--- a/pkgs/by-name/ed/eddie/package.nix
+++ b/pkgs/by-name/ed/eddie/package.nix
@@ -130,7 +130,6 @@ buildDotnetModule (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/eddie-cli";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix
index 716652c16190..9a46aa80f8ea 100644
--- a/pkgs/by-name/ed/editline/package.nix
+++ b/pkgs/by-name/ed/editline/package.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = lib.optional enableTermcap ncurses;
 
+  makeFlags = lib.optionals stdenv.hostPlatform.isPE [
+    "LDFLAGS=-no-undefined"
+  ];
+
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix
index 2188cc20ee1e..c1eeda41b870 100644
--- a/pkgs/by-name/ed/edk2/package.nix
+++ b/pkgs/by-name/ed/edk2/package.nix
@@ -55,6 +55,14 @@ stdenv.mkDerivation (finalAttrs: {
       })
 
       ./fix-cross-compilation-antlr-dlg.patch
+
+      # fix compatibility with nasm 3.01 (https://github.com/tianocore/edk2/pull/11691)
+      # TODO: remove when updating beyond 202511
+      (fetchpatch {
+        name = "UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructions.patch";
+        url = "https://github.com/tianocore/edk2/commit/9ccf8751a74f26142e584c7b7c7572a182b67997.patch";
+        hash = "sha256-0aqpuQDxLdbSJMBXzY/57GzL2wLn0m8dkT7X6uXtKMg=";
+      })
     ];
 
     # FIXME: unvendor OpenSSL again once upstream updates
diff --git a/pkgs/by-name/ek/eks-node-viewer/package.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix
index f52d258e7dbb..95cc6a51eb0e 100644
--- a/pkgs/by-name/ek/eks-node-viewer/package.nix
+++ b/pkgs/by-name/ek/eks-node-viewer/package.nix
@@ -31,7 +31,6 @@ buildGoModule rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index 4098753735ae..b9827432a71d 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
       sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
     })
+    # https://patchwork.sourceware.org/project/elfutils/patch/20251205145241.1165646-1-arnout@bzzt.net/
+    ./test-run-sysroot-reliability.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];
 
diff --git a/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch
new file mode 100644
index 000000000000..6e5b5890a758
--- /dev/null
+++ b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch
@@ -0,0 +1,44 @@
+commit 898804bed022d1ef26e5c0b12550f87fc86f29ed
+Author: Arnout Engelen <arnout@bzzt.net>
+Date:   Thu Dec 4 21:42:40 2025 +0100
+
+    tests: improve reliability of run-sysroot.sh
+    
+    Previously, the 'second' test would test the `RESOLVE_IN_ROOT` feature
+    when the current libc supports it, even when the currently running
+    kernel did not yet support it.
+    
+    Signed-off-by: Arnout Engelen <arnout@bzzt.net>
+
+diff --git a/tests/run-sysroot.sh b/tests/run-sysroot.sh
+index fe302446..d2041e8a 100755
+--- a/tests/run-sysroot.sh
++++ b/tests/run-sysroot.sh
+@@ -46,10 +46,14 @@ TID 431185:
+ #8  0x0000aaaae56127f0 _start
+ EOF
+ 
+-HAVE_OPENAT2=$(grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' \
+-                    ${abs_builddir}/../config.h | awk '{print $3}')
++libc_has_openat2_resolve_in_root() {
++  grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' ${abs_builddir}/../config.h | awk '{print $3}'
++}
++kernel_has_openat2_resolve_in_root() {
++  printf "%s\n%s" "5.6.0" "$(uname -r)" | sort -V -C
++}
+ 
+-if [[ "$HAVE_OPENAT2" = 1 ]]; then
++if libc_has_openat2_resolve_in_root && kernel_has_openat2_resolve_in_root; then
+     # Change the layout of files in sysroot to test symlink escape scenario
+     rm -f "${tmpdir}/sysroot/bin"
+     mkdir "${tmpdir}/sysroot/bin"
+@@ -57,7 +61,8 @@ if [[ "$HAVE_OPENAT2" = 1 ]]; then
+     ln -s /bin/bash "${tmpdir}/sysroot/usr/bin/bash"
+ 
+     # Check that stack with --sysroot generates correct backtrace even if target
+-    # binary is actually absolute symlink pointing outside of sysroot directory
++    # binary is actually absolute symlink to be interpreted relative to the sysroot
++    # directory
+     testrun "${abs_top_builddir}"/src/stack --core "${tmpdir}/core.bash" \
+ 	    --sysroot "${tmpdir}/sysroot" >"${tmpdir}/stack.out"
+ 
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 85795193b0d9..72f4afab8b01 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.80";
+  version = "0.81";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    hash = "sha256-B7Dz5H49d8kQaHfPQt7Y3f9D6EdqLOBMK+378g4E46U=";
+    hash = "sha256-NopI9aDtpEbf2JlboLTIg/9zXaZelfYhF0/RgwUgakI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix
index 07b4c59f6a9b..ee5de487db36 100644
--- a/pkgs/by-name/el/elm-land/package.nix
+++ b/pkgs/by-name/el/elm-land/package.nix
@@ -40,7 +40,6 @@ buildNpmPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = writeShellScript "update-elm-land" ''
diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix
index a487d0784bbe..0352f28b2099 100644
--- a/pkgs/by-name/em/emcee/package.nix
+++ b/pkgs/by-name/em/emcee/package.nix
@@ -29,7 +29,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = [ "--version" ];
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix
index 42425039ba02..e619ce38b2cc 100644
--- a/pkgs/by-name/em/emmylua-check/package.nix
+++ b/pkgs/by-name/em/emmylua-check/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/emmylua_check";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix
index dbd6d81d6f13..54acc7547db2 100644
--- a/pkgs/by-name/em/emmylua-doc-cli/package.nix
+++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/emmylua_doc_cli";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix
index 9a46edef78b0..9d07a651c26d 100644
--- a/pkgs/by-name/em/emmylua-ls/package.nix
+++ b/pkgs/by-name/em/emmylua-ls/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/emmylua_ls";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix
index dec24de92cce..1c9761440da0 100644
--- a/pkgs/by-name/en/encrypted-dns-server/package.nix
+++ b/pkgs/by-name/en/encrypted-dns-server/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/encrypted-dns";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}";
diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index cd3c45cdcf34..de96bc2a561e 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/envoy";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests.envoy-bin = nixosTests.envoy-bin;
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index bdbd0cb404bc..040055bade5f 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -177,8 +177,6 @@ python.pkgs.buildPythonApplication rec {
     "test_clang_tidy_mode_targeted_scan"
   ];
 
-  versionCheckProgramArg = "--version";
-
   passthru = {
     dashboard = python.pkgs.esphome-dashboard;
     updateScript = callPackage ./update.nix { };
diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index 49728c31cbe5..e66112303cab 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "etherpad-lite";
-  version = "2.5.1";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "ether";
     repo = "etherpad-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0Qrmpz9ehblS2Jdw137CJVKYmhkXt8c9B6kDG8OxZPo=";
+    hash = "sha256-S8sPS0agLXih39+v7ZXk/khxrjJfoq50j3eXSGa8FQU=";
   };
 
   patches = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 1;
-    hash = "sha256-gajm1yXQPZZ/oB27HwgTEoKLzwMKsHDoo2w+mIOnJrc=";
+    hash = "sha256-57LIfY1qH6/y11FB22lThCPUpsyr8YxgX7uNLP1jzAQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/eu/eukleides/package.nix b/pkgs/by-name/eu/eukleides/package.nix
index c36f0e313a86..dfa528afce27 100644
--- a/pkgs/by-name/eu/eukleides/package.nix
+++ b/pkgs/by-name/eu/eukleides/package.nix
@@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Geometry Drawing Language";
diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix
index 8b54b252b938..41027b972cc6 100644
--- a/pkgs/by-name/ev/evil-winrm-py/package.nix
+++ b/pkgs/by-name/ev/evil-winrm-py/package.nix
@@ -41,7 +41,6 @@ python3Packages.buildPythonApplication rec {
   buildInputs = lib.optionals enableKerberos [ libkrb5 ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fa/fahclient/package.nix b/pkgs/by-name/fa/fahclient/package.nix
index a4bb29661727..3d5ffd2a41d4 100644
--- a/pkgs/by-name/fa/fahclient/package.nix
+++ b/pkgs/by-name/fa/fahclient/package.nix
@@ -73,7 +73,6 @@ let
     nativeInstallCheckInputs = [
       versionCheckHook
     ];
-    versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
   };
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 65d2639b5dae..22885b8d5e51 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix
index a6f23962d367..3eba50a9e712 100644
--- a/pkgs/by-name/fa/faust2/package.nix
+++ b/pkgs/by-name/fa/faust2/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   pkg-config,
   cmake,
-  llvm_18, # does not build with 19+ due to API changes
+  llvm,
   emscripten,
   openssl,
   libsndfile,
@@ -24,13 +24,13 @@
 
 let
 
-  version = "2.81.10";
+  version = "2.83.1";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
     tag = version;
-    hash = "sha256-xmaZY1jFIZQjWlQkJ+uHC4tY4pFPLJ+fKSbktIZkBFI=";
+    hash = "sha256-DojqKLoGb6aGpqpeTAXyLFsbWs/UgYr9nA+JMGa712A=";
     fetchSubmodules = true;
   };
 
@@ -65,7 +65,7 @@ let
         which
       ];
       buildInputs = [
-        llvm_18
+        llvm
         emscripten
         openssl
         libsndfile
@@ -81,7 +81,7 @@ let
 
       preConfigure = ''
         # include llvm-config in path
-        export PATH="${lib.getDev llvm_18}/bin:$PATH"
+        export PATH="${lib.getDev llvm}/bin:$PATH"
         cd build
 
       ''
diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix
index 46add61d8dbc..b468221f8bbb 100644
--- a/pkgs/by-name/fe/feedgnuplot/package.nix
+++ b/pkgs/by-name/fe/feedgnuplot/package.nix
@@ -8,7 +8,6 @@
   perl,
   perlPackages,
   stdenv,
-  shortenPerlShebang,
   installShellFiles,
 }:
 
@@ -34,8 +33,7 @@ perlPackages.buildPerlPackage rec {
   nativeBuildInputs = [
     makeWrapper
     installShellFiles
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  ];
 
   buildInputs = [
     gnuplot
@@ -57,18 +55,14 @@ perlPackages.buildPerlPackage rec {
   # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5.
   doCheck = false;
 
-  postInstall =
-    lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/feedgnuplot
-    ''
-    + ''
-      wrapProgram $out/bin/feedgnuplot \
-          --prefix "PATH" ":" "$PATH" \
-          --prefix "PERL5LIB" ":" "$PERL5LIB"
+  postInstall = ''
+    wrapProgram $out/bin/feedgnuplot \
+        --prefix "PATH" ":" "$PATH" \
+        --prefix "PERL5LIB" ":" "$PERL5LIB"
 
-      installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot
-      installShellCompletion --zsh completions/zsh/_feedgnuplot
-    '';
+    installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot
+    installShellCompletion --zsh completions/zsh/_feedgnuplot
+  '';
 
   meta = {
     description = "General purpose pipe-oriented plotting tool";
diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix
index 2fc23fb8169e..6c5ab9db321a 100644
--- a/pkgs/by-name/fe/feroxbuster/package.nix
+++ b/pkgs/by-name/fe/feroxbuster/package.nix
@@ -36,8 +36,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix
index 6dbd19811140..0ee90dac7fad 100644
--- a/pkgs/by-name/fe/ferretdb/package.nix
+++ b/pkgs/by-name/fe/ferretdb/package.nix
@@ -34,7 +34,6 @@ buildGoModule (finalAttrs: {
   # the binary panics if something required wasn't set during compilation
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.tests = nixosTests.ferretdb;
 
diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix
index fe0185a23ccb..9d70a767381c 100644
--- a/pkgs/by-name/fe/ferron/package.nix
+++ b/pkgs/by-name/fe/ferron/package.nix
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix
index 1e08014e8fce..ae56ad4b321c 100644
--- a/pkgs/by-name/ff/fftw/package.nix
+++ b/pkgs/by-name/ff/fftw/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
       "https://fftw.org/fftw-${finalAttrs.version}.tar.gz"
       "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz"
     ];
-    sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=";
+    hash = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=";
   };
 
   patches = [
@@ -66,9 +66,15 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional (precision != "double") "--enable-${precision}"
   # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html
   # FFTW will try to detect at runtime whether the CPU supports these extensions
-  ++ lib.optional (
-    stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")
-  ) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma"
+  ++
+    lib.optionals (stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double"))
+      [
+        "--enable-sse2"
+        "--enable-avx"
+        "--enable-avx2"
+        "--enable-avx512"
+        "--enable-avx128-fma"
+      ]
   ++ lib.optionals enableMpi [
     "--enable-mpi"
     # link libfftw3_mpi explicitly with -lmpi
@@ -83,15 +89,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   # fftw builds with -mtune=native by default
   postPatch = ''
-    substituteInPlace configure --replace "-mtune=native" "-mtune=generic"
+    substituteInPlace configure --replace-fail "-mtune=native" "-mtune=generic"
   '';
 
+  strictDeps = true;
   enableParallelBuilding = true;
 
   nativeCheckInputs = [ perl ];
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
+  __structuredAttrs = true;
+
   meta = {
     description = "Fastest Fourier Transform in the West library";
     homepage = "https://www.fftw.org/";
diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix
index 3a89fbaa1b0d..102847390664 100644
--- a/pkgs/by-name/fi/filen-cli/package.nix
+++ b/pkgs/by-name/fi/filen-cli/package.nix
@@ -64,7 +64,6 @@ buildNpmPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/filen";
-  versionCheckProgramArg = "--version";
 
   # Writes $HOME/Library/Application Support on darwin
   doInstallCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 095e51157f30..eb8748075079 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -115,7 +115,6 @@ let
       # Note that at this point in evaluation, there is nothing whatsoever on the
       # fish_function_path. That means we don't have most fish builtins, e.g., `eval`.
 
-
       # additional profiles are expected in order of precedence, which means the reverse of the
       # NIX_PROFILES variable (same as config.environment.profiles)
       set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1]
@@ -151,13 +150,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-M1/jgIbFY0VSQrHwT9/gcfA0HJ0r2cL1eJ3Y7lmmYVE=";
+    hash = "sha256-/B4U3giKGmU5B/L5HQLS1lU8f7hsfI4aCeOjWcQ1dpA=";
   };
 
   env = {
@@ -168,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-j+V4/oxKDg4oQ+7eg34sefIMJLelOSUKXTXasQK2Z1g=";
+    hash = "sha256-/udRRs/ieLfazVTwM47ElExN40QdAG/OqQXmYurgC1I=";
   };
 
   patches = [
@@ -367,7 +366,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   # Ensure that we don't vendor libpcre2, but instead link against the one from nixpkgs
diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index cd1c69a56df6..62e0331aad90 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = lib.getExe (writeShellApplication {
diff --git a/pkgs/by-name/fi/fishy/package.nix b/pkgs/by-name/fi/fishy/package.nix
index 87633558cb7e..302525450f3c 100644
--- a/pkgs/by-name/fi/fishy/package.nix
+++ b/pkgs/by-name/fi/fishy/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix
index bcd2df459fc1..d8a654779866 100644
--- a/pkgs/by-name/fl/flac/package.nix
+++ b/pkgs/by-name/fl/flac/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 5f1c540477df..d68d7cfca833 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -113,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru = {
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       inherit (nixosTests) fluent-bit;
diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
index d6946bbe9458..1c69c4ff92a7 100644
--- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
@@ -32,7 +32,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix
index 1f68e529e81d..39fb152d2620 100644
--- a/pkgs/by-name/fl/fluxcd-operator/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator/package.nix
@@ -34,7 +34,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/flux-operator";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch b/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch
new file mode 100644
index 000000000000..4f03cf1541da
--- /dev/null
+++ b/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch
@@ -0,0 +1,18 @@
+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index c72273a73..d0408f2b3 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -61,10 +61,9 @@ if(LIBGFLAGS_FOUND)
+   set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
+ endif()
+ 
+-find_package(Glog MODULE)
+-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
++find_package(Glog CONFIG REQUIRED)
++set(FOLLY_HAVE_LIBGLOG True)
++list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
+ 
+ find_package(LibEvent MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 2e6584d32482..eca0493cc2f0 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -3,7 +3,6 @@
   stdenv,
 
   fetchFromGitHub,
-  fetchpatch,
 
   cmake,
   ninja,
@@ -139,11 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     ./char_traits.patch
 
     # <https://github.com/facebook/folly/issues/2171>
-    (fetchpatch {
-      name = "folly-fix-glog-0.7.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0";
-      hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE=";
-    })
+    ./folly-fix-glog-0.7.patch
 
     # Fix a GCC‐incompatible use of a private trait.
     #
diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index f94aeab1e50a..e3a367a0c37e 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -96,7 +96,6 @@ buildGoModule rec {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fo/fortran-fpm/package.nix b/pkgs/by-name/fo/fortran-fpm/package.nix
index 225684d8cd45..6f02474dbb84 100644
--- a/pkgs/by-name/fo/fortran-fpm/package.nix
+++ b/pkgs/by-name/fo/fortran-fpm/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index 817bfedb721b..2f6b138fe16b 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/forge";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fr/freifunk-meshviewer/package.nix b/pkgs/by-name/fr/freifunk-meshviewer/package.nix
index b0d20f0105ec..2214353fe409 100644
--- a/pkgs/by-name/fr/freifunk-meshviewer/package.nix
+++ b/pkgs/by-name/fr/freifunk-meshviewer/package.nix
@@ -7,16 +7,16 @@
 buildNpmPackage (finalAttrs: {
   pname = "freifunk-meshviewer";
 
-  version = "12.7.0";
+  version = "12.8.0";
 
   src = fetchFromGitHub {
     owner = "freifunk";
     repo = "meshviewer";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-nle99URK1s8v+fatpf9D0dIOIp6BKeaEYZ1PijLkt9A=";
+    sha256 = "sha256-M0ZTGH6MW8admkHvbFTgCHbRIlpDkgvSzaIfv7rDiyA=";
   };
 
-  npmDepsHash = "sha256-6XUe55X1WDPNldPRlgqG1C7CuGyYrS2vSiLmoza3QIs=";
+  npmDepsHash = "sha256-zrXhdR2k8HHvPBid004WtyZYPDWuRggSIkKcLVdb8Lc=";
 
   installPhase = ''
     mkdir -p $out/share/freifunk-meshviewer/
diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index 9639ef699484..69c0bc0bc327 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -38,7 +38,6 @@ buildGoModule (finalAttrs: {
   ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   meta = {
diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 8769439981f1..643f2c5c08f2 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -83,13 +83,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
-  version = "3.12.0";
+  version = "3.12.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-al7nDmUbKNP4kBMVBLWUUxn0QSAbYAJ1XhZWAVFk+sA=";
+    hash = "sha256-vs9qun9Z8o4KPxWjKOV9Lp/GgAsYW7gseYv4G7+liso=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gd/gdbuspp/package.nix b/pkgs/by-name/gd/gdbuspp/package.nix
index 178de797b65f..5bd0db891709 100644
--- a/pkgs/by-name/gd/gdbuspp/package.nix
+++ b/pkgs/by-name/gd/gdbuspp/package.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib ];
 
+  # fix build for gcc 15
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=free-nonheap-object";
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix
index e5aac5e11991..768c367be9e0 100644
--- a/pkgs/by-name/gd/gdscript-formatter/package.nix
+++ b/pkgs/by-name/gd/gdscript-formatter/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix
index d530aa02adee..ce1bee1ef3b5 100644
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
       addBinToPathHook
       versionCheckHook
     ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # Numerical precision error
diff --git a/pkgs/by-name/ge/get_iplayer/package.nix b/pkgs/by-name/ge/get_iplayer/package.nix
index 444bf7dee82a..23ca763f815e 100644
--- a/pkgs/by-name/ge/get_iplayer/package.nix
+++ b/pkgs/by-name/ge/get_iplayer/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   makeWrapper,
   stdenv,
-  shortenPerlShebang,
   perl,
   atomicparsley,
   ffmpeg,
@@ -23,7 +22,7 @@ perlPackages.buildPerlPackage rec {
     hash = "sha256-O/mVtbudrYw0jKeSckZlgonFDiWxfeiVc8gdcy4iNBw=";
   };
 
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ perl ];
   propagatedBuildInputs = with perlPackages; [
     LWP
@@ -54,10 +53,6 @@ perlPackages.buildPerlPackage rec {
     runHook postInstall
   '';
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/.get_iplayer-wrapped
-  '';
-
   passthru.tests.version = testers.testVersion {
     package = get_iplayer;
     command = "HOME=$(mktemp -d) get_iplayer --help";
diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix
index e38a24fd4b7b..c662ecdec1f2 100644
--- a/pkgs/by-name/ge/geteduroam-cli/package.nix
+++ b/pkgs/by-name/ge/geteduroam-cli/package.nix
@@ -26,7 +26,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/geteduroam-cli";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix
index fd4c0218b897..0b77dd2f1a20 100644
--- a/pkgs/by-name/ge/geteduroam/package.nix
+++ b/pkgs/by-name/ge/geteduroam/package.nix
@@ -61,7 +61,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/geteduroam-gui";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 3c7ad6786dde..7c14a55ba528 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
     rmdir $out/share/vim
     ln -s $vim $out/share/vim-plugins
 
-
     remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped
   '';
 
@@ -152,8 +151,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   passthru = {
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       inherit (nixosTests) allTerminfo;
diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix
index 874d7515cc0c..6608c40baa23 100644
--- a/pkgs/by-name/gi/gi-docgen/package.nix
+++ b/pkgs/by-name/gi/gi-docgen/package.nix
@@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec {
     markupsafe
     packaging
     pygments
-    toml # remove once python311 is the default
     typogrify
   ];
 
diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix
index 23eea9932438..b4a486588a0a 100644
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@@ -54,8 +54,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   disabledTestPaths = [
     "qtpy/"
     "contrib/win32"
diff --git a/pkgs/by-name/gi/git-conventional-commits/package.nix b/pkgs/by-name/gi/git-conventional-commits/package.nix
index 954247d554f4..d4191bd7715c 100644
--- a/pkgs/by-name/gi/git-conventional-commits/package.nix
+++ b/pkgs/by-name/gi/git-conventional-commits/package.nix
@@ -28,7 +28,6 @@ buildNpmPackage {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix
index dc17e1f8fbcd..3b6135ba5d46 100644
--- a/pkgs/by-name/gi/git-lfs/package.nix
+++ b/pkgs/by-name/gi/git-lfs/package.nix
@@ -94,7 +94,6 @@ buildGoModule rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix
index 2835e6270b10..6476d005edfe 100644
--- a/pkgs/by-name/gi/git/package.nix
+++ b/pkgs/by-name/gi/git/package.nix
@@ -58,7 +58,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.51.2";
+  version = "2.52.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-Iz1xQ6LVjmB1Xu6bdvVZ7HPqKzwpf1tQMWKs6VlmtOM=";
+    hash = "sha256-PNj+6G9pqUnLYQ/ujNkmTmhz0H+lhBH2Bgs9YnKe18U=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -120,6 +120,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./git-sh-i18n.patch
     # Do not search for sendmail in /usr, only in $PATH
     ./git-send-email-honor-PATH.patch
+    # Address test failure (new in 2.52.0) caused by `git-gui--askyesno` being
+    # installed by `make install`.
+    (fetchurl {
+      name = "expect-gui--askyesno-failure-in-t1517.patch";
+      url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw";
+      hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU=";
+    })
+
   ]
   ++ lib.optionals withSsh [
     # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
@@ -575,6 +583,7 @@ stdenv.mkDerivation (finalAttrs: {
       kashw2
       me-and
       philiptaron
+      zivarah
     ];
     mainProgram = "git";
   };
diff --git a/pkgs/by-name/gi/github-distributed-owners/package.nix b/pkgs/by-name/gi/github-distributed-owners/package.nix
index 4d8c8500e6d1..cd5523cf1b89 100644
--- a/pkgs/by-name/gi/github-distributed-owners/package.nix
+++ b/pkgs/by-name/gi/github-distributed-owners/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-pt/GoXF/uSU78pZqG8PgFe+tlbwZH2qpGQD7jgC52NM=";
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 066d185aeb36..3095a27601bb 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -31,7 +31,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 0592229902ec..c46291eeab87 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -101,8 +101,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/gi/gitlint/package.nix b/pkgs/by-name/gi/gitlint/package.nix
index a66dc6a866da..c880cf699c87 100644
--- a/pkgs/by-name/gi/gitlint/package.nix
+++ b/pkgs/by-name/gi/gitlint/package.nix
@@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec {
     python3Packages.pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [
     "gitlint"
diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index 4bbf18f7732c..a4e0581a7a9f 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -95,8 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [
     xvfb-run
-  ]
-  ++ testDeps;
+  ];
+
+  checkInputs = testDeps;
 
   propagatedBuildInputs = [
     glib
@@ -104,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+    (lib.mesonBool "skip_gtk_tests" (!finalAttrs.finalPackage.doCheck))
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [
     "-Dprofiler=disabled"
@@ -111,6 +113,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  strictDeps = true;
+
   postPatch = ''
     patchShebangs build/choose-tests-locale.sh
     substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index 7e3ef73d83d2..ca6aab816ade 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -27,7 +27,6 @@ buildGoModule (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index b6b72cde5ddf..c08465882ecc 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -40,7 +40,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Lightweight LDAP server for development, home use, or CI";
diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 314b6b26192e..887d6617d8ef 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -74,7 +74,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.86.1";
+  version = "2.86.3";
 
   outputs = [
     "bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc=";
+    hash = "sha256-syEdjTS5313KBXh+8K1dfKdd7JmLlw4aqwAB0imXfGU=";
   };
 
   patches =
diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix
index e6aef1932490..7cfbc3b72d42 100644
--- a/pkgs/by-name/gl/glpi-agent/package.nix
+++ b/pkgs/by-name/gl/glpi-agent/package.nix
@@ -118,7 +118,6 @@ perlPackages.buildPerlPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/gl/glpk/package.nix b/pkgs/by-name/gl/glpk/package.nix
index 463addadca62..f9d995f9b5e7 100644
--- a/pkgs/by-name/gl/glpk/package.nix
+++ b/pkgs/by-name/gl/glpk/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
+  fetchDebianPatch,
   libmysqlclient,
   # Excerpt from glpk's INSTALL file:
   # This feature allows the exact simplex solver to use the GNU MP
@@ -51,6 +52,14 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch";
       sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA=";
     })
+
+    # Fix build with gcc15
+    (fetchDebianPatch {
+      inherit pname version;
+      debianRevision = "2";
+      patch = "gcc-15.patch";
+      hash = "sha256-wuWPYqJKIKJAJaeJXW7lhvapu8Fd3zHjLAv7Ve7q8Qw=";
+    })
   ];
 
   postPatch =
diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index 283aa59dd2e4..e62d8596d31c 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "16.0.0";
+  version = "16.1.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY=";
+    hash = "sha256-cEREniYgSd62mnvKaQkgs69ETL5pLl5Gyv3hKOtSv3w=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 3167ceb85795..4aee8936d8fa 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -11,11 +11,11 @@
   version ?
     # This is a workaround for update-source-version to be able to update this
     let
-      _version = "0-unstable-2025-08-29";
+      _version = "0-unstable-2025-09-18";
     in
     _version,
-  rev ? "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
-  hash ? "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=",
+  rev ? "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+  hash ? "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=",
 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix
index 64de2292f07e..43c06c1312b7 100644
--- a/pkgs/by-name/go/go-chromecast/package.nix
+++ b/pkgs/by-name/go/go-chromecast/package.nix
@@ -38,8 +38,6 @@ buildGoModule rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
     installShellCompletion --cmd go-chromecast \
       --bash <($out/bin/go-chromecast completion bash) \
diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix
index 758107f8e537..d6faa1ddca62 100644
--- a/pkgs/by-name/go/go-passbolt-cli/package.nix
+++ b/pkgs/by-name/go/go-passbolt-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "go-passbolt-cli";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "passbolt";
     repo = "go-passbolt-cli";
     rev = "v${version}";
-    hash = "sha256-DTgvhmNzfr7ZXjVn+znXqFL+0bHBeGofFE521H7RUI4=";
+    hash = "sha256-EytU20jdrfXwuoofp8OAphX9jjUoFpKva75PBDIFDD8=";
   };
 
-  vendorHash = "sha256-QLTKCb3hl/0JFO2XKfLiOtnwfR/v+WqUx4vuaO/MoXo=";
+  vendorHash = "sha256-HbwGF9ZTwWdJf7XnUKnS1n58GSaPTRlblXAmtKQoooU=";
 
   ldflags = [
     "-X=main.version=${version}"
diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix
index c8fb29222155..0ec5f284bab9 100644
--- a/pkgs/by-name/go/go-sendxmpp/package.nix
+++ b/pkgs/by-name/go/go-sendxmpp/package.nix
@@ -30,7 +30,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Tool to send messages or files to an XMPP contact or MUC";
diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index 9dd8e5e53e64..f437a7340213 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -48,7 +48,6 @@ buildGoModule (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/task";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/go/gocatcli/package.nix b/pkgs/by-name/go/gocatcli/package.nix
index 4dacc3737f33..63a51f85a9ea 100644
--- a/pkgs/by-name/go/gocatcli/package.nix
+++ b/pkgs/by-name/go/gocatcli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gocatcli";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "deadc0de6";
     repo = "gocatcli";
     tag = "v${version}";
-    hash = "sha256-kNXuQlBLiDEbKwtSmdX4XPLyMZFyBvLKEmQdCDug4ao=";
+    hash = "sha256-a76vQGfw5LnLVurPkAXdwVtdCn+hjmC5Q5oNYSHRsjo=";
   };
 
-  vendorHash = "sha256-gi4/ekLGh5T5D3ifW/FF+ewHesWOyhY01ZZIG6+OENo=";
+  vendorHash = "sha256-aT56Xx6m/AlvzPmlaJR4wiqTsxjWk0lyPXShNaHPoaU=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/go/gocovsh/package.nix b/pkgs/by-name/go/gocovsh/package.nix
index d99fb8934d2e..929ce06968c4 100644
--- a/pkgs/by-name/go/gocovsh/package.nix
+++ b/pkgs/by-name/go/gocovsh/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix
index 682afc5fef85..a50fa19e5dd7 100644
--- a/pkgs/by-name/go/gojq/package.nix
+++ b/pkgs/by-name/go/gojq/package.nix
@@ -33,7 +33,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   postInstallCheck = ''
     $out/bin/gojq --help > /dev/null
     $out/bin/gojq --raw-output '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null
diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix
index 89e095fd5618..24334cd1f953 100644
--- a/pkgs/by-name/go/gokapi/package.nix
+++ b/pkgs/by-name/go/gokapi/package.nix
@@ -49,7 +49,6 @@ buildGoModule rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix
index 618952753b36..2dd2752690ee 100644
--- a/pkgs/by-name/go/golds/package.nix
+++ b/pkgs/by-name/go/golds/package.nix
@@ -27,7 +27,6 @@ buildGoModule rec {
   ldflags = [ "-s" ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix
index 0df59871d0c6..527d1d69ea48 100644
--- a/pkgs/by-name/go/golem/package.nix
+++ b/pkgs/by-name/go/golem/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = [ "${placeholder "out"}/bin/golem-cli" ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix
index 04b7afaf56ee..d370035add3b 100644
--- a/pkgs/by-name/go/gomanagedocker/package.nix
+++ b/pkgs/by-name/go/gomanagedocker/package.nix
@@ -48,7 +48,6 @@ buildGoModule {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/go/gonzo/package.nix b/pkgs/by-name/go/gonzo/package.nix
index 1d329fd42656..52d953fa9aed 100644
--- a/pkgs/by-name/go/gonzo/package.nix
+++ b/pkgs/by-name/go/gonzo/package.nix
@@ -33,7 +33,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "TUI log analysis tool";
diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
index 67f83f00d44c..778fe40d0177 100644
--- a/pkgs/by-name/go/google-cloud-cpp/package.nix
+++ b/pkgs/by-name/go/google-cloud-cpp/package.nix
@@ -14,32 +14,32 @@
   nlohmann_json,
   openssl,
   pkg-config,
-  protobuf_31,
+  protobuf,
   pkgsBuildHost,
-  # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
+  # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v2.44.0/cmake/GoogleCloudCppFeatures.cmake#L24
   apis ? [ "*" ],
   staticOnly ? stdenv.hostPlatform.isStatic,
 }:
 let
   # defined in cmake/GoogleapisConfig.cmake
-  googleapisRev = "f01a17a560b4fbc888fd552c978f4e1f8614100b";
+  googleapisRev = "8cd3749f4b98f2eeeef511c16431979aeb3a6502";
   googleapis = fetchFromGitHub {
     name = "googleapis-src";
     owner = "googleapis";
     repo = "googleapis";
     rev = googleapisRev;
-    hash = "sha256-eJA3KM/CZMKTR3l6omPJkxqIBt75mSNsxHnoC+1T4gw=";
+    hash = "sha256-w7jq21qLEiMhuI20C6iUeSskAfZCkZgDCPu5Flr8D48=";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "google-cloud-cpp";
-  version = "2.38.0";
+  version = "2.44.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-cpp";
-    rev = "v${version}";
-    sha256 = "sha256-TF3MLBmjUbKJkZVcaPXbagXrAs3eEhlNQBjYQf0VtT8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vE3oGGT33cITdAd4e5Xnlx9tX5Sz+wIFQXzj5hdcGDI=";
   };
 
   patches = [
@@ -48,6 +48,19 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # After 30acc3c, the configPhase fails with:
+  # Target "spanner_database_admin_client_samples" links to:
+  #   google-cloud-cpp::universe_domain
+  # but the target was not found.
+  #
+  # So, we explicitly add `universe_domain` to the list of default features
+  postPatch = ''
+    substituteInPlace cmake/GoogleCloudCppFeatures.cmake \
+      --replace-fail \
+        "bigtable;bigquery;iam;logging;pubsub;spanner;storage" \
+        "bigtable;bigquery;iam;logging;pubsub;spanner;storage;universe_domain" \
+  '';
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -61,7 +74,7 @@ stdenv.mkDerivation rec {
     grpc
     nlohmann_json
     openssl
-    protobuf_31
+    protobuf
     gbenchmark
     gtest
   ];
@@ -87,7 +100,7 @@ stdenv.mkDerivation rec {
       ];
       ldLibraryPathName = "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH";
     in
-    lib.optionalString doInstallCheck (
+    lib.optionalString finalAttrs.doInstallCheck (
       lib.optionalString (!staticOnly) ''
         export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths}
       ''
@@ -114,23 +127,27 @@ stdenv.mkDerivation rec {
       runHook postInstallCheck
     '';
 
-  nativeInstallCheckInputs = lib.optionals doInstallCheck [
+  nativeInstallCheckInputs = lib.optionals finalAttrs.doInstallCheck [
     gbenchmark
     gtest
   ];
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!staticOnly))
     # unconditionally build tests to catch linker errors as early as possible
     # this adds a good chunk of time to the build
-    "-DBUILD_TESTING:BOOL=ON"
-    "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF"
+    (lib.cmakeBool "BUILD_TESTING" true)
+    (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_EXAMPLES" false)
+
+    # Explicitly set this variable to true as otherwise `universe_domain` will be filtered out
+    # See https://github.com/googleapis/google-cloud-cpp/pull/15820 for context
+    (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_UNIVERSE_DOMAIN" true)
   ]
   ++ lib.optionals (apis != [ "*" ]) [
-    "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}"
+    (lib.cmakeFeature "GOOGLE_CLOUD_CPP_ENABLE" (lib.concatStringsSep ";" apis))
   ]
   ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin"
+    (lib.cmakeFeature "GOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE" "${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin")
   ];
 
   requiredSystemFeatures = [ "big-parallel" ];
@@ -139,7 +156,8 @@ stdenv.mkDerivation rec {
     license = with lib.licenses; [ asl20 ];
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
+    changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ cpcloud ];
   };
-}
+})
diff --git a/pkgs/by-name/go/gotestwaf/package.nix b/pkgs/by-name/go/gotestwaf/package.nix
index 2d96a832aa7c..6538101bcc4a 100644
--- a/pkgs/by-name/go/gotestwaf/package.nix
+++ b/pkgs/by-name/go/gotestwaf/package.nix
@@ -31,8 +31,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Tool for API and OWASP attack simulation";
     homepage = "https://github.com/wallarm/gotestwaf";
diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix
index 443e1d445e73..f3f2a963194e 100644
--- a/pkgs/by-name/go/gotip/package.nix
+++ b/pkgs/by-name/go/gotip/package.nix
@@ -26,7 +26,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix
index 349d37ba3ac7..29ec915516d2 100644
--- a/pkgs/by-name/gp/gpa/package.nix
+++ b/pkgs/by-name/gp/gpa/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   intltool,
   pkg-config,
   gtk3,
@@ -19,6 +20,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "remove-trust_item-stuff-to-make-it-build-with-gpgme-2.x.patch";
+      url = "https://dev.gnupg.org/rGPAb6ba8bcc6db7765667cd6c49b7edc9a2073bc74f?diff=1";
+      hash = "sha256-A3Cx4zub3Um09yjZ1mu0PZe/v7rmhXjND0Hg5WkcIf8=";
+    })
+  ];
+
   nativeBuildInputs = [
     intltool
     pkg-config
diff --git a/pkgs/development/libraries/gpgme/LFS64.patch b/pkgs/by-name/gp/gpgme/LFS64.patch
similarity index 100%
rename from pkgs/development/libraries/gpgme/LFS64.patch
rename to pkgs/by-name/gp/gpgme/LFS64.patch
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/by-name/gp/gpgme/package.nix
similarity index 80%
rename from pkgs/development/libraries/gpgme/default.nix
rename to pkgs/by-name/gp/gpgme/package.nix
index 5e3754f1206b..259870655bcd 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/by-name/gp/gpgme/package.nix
@@ -12,8 +12,8 @@
   which,
   texinfo,
   buildPackages,
-  qtbase ? null,
   # only for passthru.tests
+  gpa,
   libsForQt5,
   qt6Packages,
   python3,
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gpgme";
-  version = "1.24.3";
+  version = "2.0.1";
 
   outputs = [
     "out"
@@ -33,12 +33,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2";
-    hash = "sha256-v8F/W9GxeMhkn92RiVbSdwgPM98Aai3ECs3s3OaMUN0=";
+    hash = "sha256-ghqwaVyELqtRdSqBmAySsEEMfq3QQQP3kdXSpSZ4SWY=";
   };
 
   patches = [
-    # Fix a test after disallowing compressed signatures in gpg (PR #180336)
-    ./test_t-verify_double-plaintext.patch
     # Don't use deprecated LFS64 APIs (removed in musl 1.2.4)
     # https://dev.gnupg.org/D600
     ./LFS64.patch
@@ -56,8 +54,7 @@ stdenv.mkDerivation rec {
     libassuan
     libgpg-error
     pth
-  ]
-  ++ lib.optionals (qtbase != null) [ qtbase ];
+  ];
 
   nativeCheckInputs = [ which ];
 
@@ -77,11 +74,8 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ];
 
   env.NIX_CFLAGS_COMPILE = toString (
-    # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
-    # debugging is disabled
-    lib.optional (qtbase != null) "-DQT_NO_DEBUG"
     # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
-    ++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64"
+    lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64"
   );
 
   enableParallelBuilding = true;
@@ -97,14 +91,13 @@ stdenv.mkDerivation rec {
   ];
 
   passthru.tests = {
+    inherit gpa;
     python = python3.pkgs.gpgme;
     qt5 = libsForQt5.qgpgme;
     qt6 = qt6Packages.qgpgme;
   };
 
   meta = {
-    # fatal error: 'QtCore/qcompare.h' file not found
-    broken = qtbase != null && stdenv.hostPlatform.isDarwin;
     homepage = "https://gnupg.org/software/gpgme/index.html";
     changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${version}";
     description = "Library for making GnuPG easier to use";
diff --git a/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch b/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch
new file mode 100644
index 000000000000..3109da1af152
--- /dev/null
+++ b/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch
@@ -0,0 +1,39 @@
+From b56db4b30ec696b018c04400440d0252af13990a Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Mon, 22 Dec 2025 16:44:46 +0100
+Subject: [PATCH] Don't hardcode 'include' as includedir
+
+The headers are installed into the location pointed by
+CMAKE_INSTALL_INCLUDEDIR so if it's different than the default 'include'
+then the header path in the exported CMake targets is incorrect.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7be46cb..97d21b1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -128,7 +128,7 @@ if(ENABLE_SHARED)
+ 
+     target_include_directories(Gpgmepp
+         PRIVATE ${LibGpgError_INCLUDE_DIRS}
+-        INTERFACE $<INSTALL_INTERFACE:include>
++        INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+     )
+ 
+     target_link_libraries(Gpgmepp Gpgme::Gpgme)
+@@ -144,7 +144,7 @@ if(ENABLE_STATIC)
+ 
+     target_include_directories(GpgmeppStatic
+         PRIVATE ${LibGpgError_INCLUDE_DIRS}
+-        INTERFACE $<INSTALL_INTERFACE:include>
++        INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+     )
+ 
+     target_link_libraries(GpgmeppStatic Gpgme::Gpgme)
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/gp/gpgmepp/0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch b/pkgs/by-name/gp/gpgmepp/0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch
new file mode 100644
index 000000000000..4773cb0d082b
--- /dev/null
+++ b/pkgs/by-name/gp/gpgmepp/0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch
@@ -0,0 +1,59 @@
+From 7b8b17c82b1bc672df9c50d2b002242f00bc04a4 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Sun, 21 Dec 2025 14:51:33 +0100
+Subject: [PATCH] Fix handling of absolute install dirs in .pc installation
+
+CMAKE_INSTALL_*DIRs can be absolute and in this case shouldn't be
+appended to the install prefix. This is handled automatically by CMake
+for installation but needs to be done manually when generating
+pkg-config file.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ src/CMakeLists.txt | 12 +++++++++++-
+ src/gpgmepp.pc.in  |  4 ++--
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7be46cb..913dd79 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -209,10 +209,20 @@ set(pkgconfig_host_line "")
+ if(PKGCONFIG_HOST)
+     set(pkgconfig_host_line "host=${PKGCONFIG_HOST}\n")
+ endif()
++if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
++    set(pkgconfig_includedir "${CMAKE_INSTALL_INCLUDEDIR}")
++else()
++    set(pkgconfig_includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
++endif()
++if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
++    set(pkgconfig_libdir "${CMAKE_INSTALL_LIBDIR}")
++else()
++    set(pkgconfig_libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
++endif()
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gpgmepp.pc.in
+                ${CMAKE_CURRENT_BINARY_DIR}/gpgmepp.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpgmepp.pc
+-        DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ install(FILES ${Gpgmepp_HEADERS}
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gpgme++)
+diff --git a/src/gpgmepp.pc.in b/src/gpgmepp.pc.in
+index 626c5fb..cf3e67b 100644
+--- a/src/gpgmepp.pc.in
++++ b/src/gpgmepp.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=@pkgconfig_includedir@
++libdir=@pkgconfig_libdir@
+ @pkgconfig_host_line@
+ Name: gpgmepp
+ Description: GnuPG Made Easy (C++ binding)
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/gp/gpgmepp/package.nix b/pkgs/by-name/gp/gpgmepp/package.nix
new file mode 100644
index 000000000000..1c8225759bd1
--- /dev/null
+++ b/pkgs/by-name/gp/gpgmepp/package.nix
@@ -0,0 +1,46 @@
+{
+  cmake,
+  fetchurl,
+  gpgme,
+  lib,
+  libgpg-error,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gpgmepp";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnupg/gpgmepp/gpgmepp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-1HlgScBnCKJvMJb3SO8JU0fho8HlcFYXAf6VLD9WU4I=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  patches = [
+    ./0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch
+    ./0001-Don-t-hardcode-include-as-includedir.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    gpgme
+    libgpg-error
+  ];
+
+  meta = {
+    changelog = "https://dev.gnupg.org/source/gpgmepp/browse/master/NEWS;gpgmepp-${finalAttrs.version}?as=remarkup";
+    description = "C++ bindings/wrapper for GPGME";
+    homepage = "https://dev.gnupg.org/source/gpgmepp";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.dotlambda ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix
index dbad6a8f032b..4dd42e54ce94 100644
--- a/pkgs/by-name/gp/gping/package.nix
+++ b/pkgs/by-name/gp/gping/package.nix
@@ -41,8 +41,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/gp/gpt-cli/package.nix b/pkgs/by-name/gp/gpt-cli/package.nix
index d0bcb4129d6f..d8215eead6ca 100644
--- a/pkgs/by-name/gp/gpt-cli/package.nix
+++ b/pkgs/by-name/gp/gpt-cli/package.nix
@@ -51,8 +51,6 @@ python3Packages.buildPythonApplication rec {
 
   versionCheckProgram = "${placeholder "out"}/bin/gpt";
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Command-line interface for ChatGPT, Claude and Bard";
     homepage = "https://github.com/kharvd/gpt-cli";
diff --git a/pkgs/by-name/gp/gpufetch/package.nix b/pkgs/by-name/gp/gpufetch/package.nix
index 123dbe399224..79a8e051a7a8 100644
--- a/pkgs/by-name/gp/gpufetch/package.nix
+++ b/pkgs/by-name/gp/gpufetch/package.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
index b37513c03082..a89f975b67a1 100644
--- a/pkgs/by-name/gr/grafanactl/package.nix
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -37,7 +37,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/gr/gren/package.nix b/pkgs/by-name/gr/gren/package.nix
index d7e41e12eab3..197d69c5858d 100644
--- a/pkgs/by-name/gr/gren/package.nix
+++ b/pkgs/by-name/gr/gren/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/gren";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     backend = haskellPackages.callPackage ./generated-backend-package.nix { };
diff --git a/pkgs/by-name/gu/guesswidth/package.nix b/pkgs/by-name/gu/guesswidth/package.nix
index 92ad7241f369..69500e618912 100644
--- a/pkgs/by-name/gu/guesswidth/package.nix
+++ b/pkgs/by-name/gu/guesswidth/package.nix
@@ -45,7 +45,6 @@ buildGoModule rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index d5a3849796ce..772cd6476092 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix
index e7e1ff22ac46..e6bdb12bb62d 100644
--- a/pkgs/by-name/ha/har-to-k6/package.nix
+++ b/pkgs/by-name/ha/har-to-k6/package.nix
@@ -22,7 +22,6 @@ buildNpmPackage rec {
   npmDepsHash = "sha256-RuK3CzcMkPt5MFEZpYBDtMMShHTT/115pRk1CmRkiek=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index d172d5922dd9..042e82e6ae5b 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "12.1.0";
+  version = "12.2.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-5cgbf24LEC37AAz6QkU4uOiWq3ii9Lil7IyuYqtDNp4=";
+    hash = "sha256-7LYDqkJqiyRmVxhme9pkqEwVBNt0VO5Mrb02Lupk5UU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ha/hashrat/package.nix b/pkgs/by-name/ha/hashrat/package.nix
index 9f4fd90d8c62..e8947b1ad201 100644
--- a/pkgs/by-name/ha/hashrat/package.nix
+++ b/pkgs/by-name/ha/hashrat/package.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [ "PREFIX=$(out)" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix
index fcaa9017b260..7bc8326f3a6c 100644
--- a/pkgs/by-name/ha/hatch/package.nix
+++ b/pkgs/by-name/ha/hatch/package.nix
@@ -76,8 +76,6 @@ python3Packages.buildPythonApplication rec {
       darwin.ps
     ];
 
-  versionCheckProgramArg = "--version";
-
   disabledTests = [
     # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0)
     "test_default"
diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix
index 5fd02637da7a..90a7980efa81 100644
--- a/pkgs/by-name/ha/hath-rust/package.nix
+++ b/pkgs/by-name/ha/hath-rust/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-4xty4nUs81nq2Ax7koFplHlscpG1Pdbd5zwd/lQwbmg=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix
index e7423419472a..d5c428864957 100644
--- a/pkgs/by-name/ha/hatsu/package.nix
+++ b/pkgs/by-name/ha/hatsu/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-NXauXnCpk8YjiX4bqZMbEy/QPb7MiJYzY64YKDV6qq0=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/hc/hcdiag/package.nix b/pkgs/by-name/hc/hcdiag/package.nix
index 5b35011b9417..ec813e26140f 100644
--- a/pkgs/by-name/hc/hcdiag/package.nix
+++ b/pkgs/by-name/hc/hcdiag/package.nix
@@ -22,7 +22,6 @@ buildGoModule rec {
   nativeInstallCheckHooks = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix
index 98e446efb626..b3fd33d74aca 100644
--- a/pkgs/by-name/he/helix-db/package.nix
+++ b/pkgs/by-name/he/helix-db/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index c4ba2f0f3634..1355ee7b76e8 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (final: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/hx";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 20124ae210ca..40c252d4d33a 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "hermit";
-  version = "0.46.2";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "cashapp";
     repo = "hermit";
-    hash = "sha256-4SOwOO9ee7fKrby9sokWW/GPujT9/O+9emcaLIe+0C0=";
+    hash = "sha256-VAAdsZ3ZFY+BrH5KDERngxX5xp8CckcnlpSLq4XWU2s=";
   };
 
-  vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM=";
+  vendorHash = "sha256-KEwbADLm7oTChoLyx/0SykQX1Fy4bJxNbYcGmfEka7Q=";
 
   subPackages = [ "cmd/hermit" ];
 
diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
index f740a2dadd21..f765181dd649 100644
--- a/pkgs/by-name/he/hexpatch/package.nix
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix
index c01266c629c7..c0096251de06 100644
--- a/pkgs/by-name/he/hexyl/package.nix
+++ b/pkgs/by-name/he/hexyl/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/hg/hgrep/package.nix b/pkgs/by-name/hg/hgrep/package.nix
index 2fb66a2f19b5..35cac23994ba 100644
--- a/pkgs/by-name/hg/hgrep/package.nix
+++ b/pkgs/by-name/hg/hgrep/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix
index 330d0a42fc2b..53f9e68d6f6c 100644
--- a/pkgs/by-name/hl/hl-log-viewer/package.nix
+++ b/pkgs/by-name/hl/hl-log-viewer/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/hl";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
index 641245ea7fb6..14eb3dbe889b 100644
--- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
+++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
@@ -58,7 +58,6 @@ buildNpmPackage (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Configure Homebridge, monitor and backup from a browser";
diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index ec9643d7c686..596b7fbc8c4a 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -44,7 +44,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix
index 7637fd533105..93276187c153 100644
--- a/pkgs/by-name/ho/hot-resize/package.nix
+++ b/pkgs/by-name/ho/hot-resize/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/hp/hplip/gcc-compatability.patch b/pkgs/by-name/hp/hplip/gcc-compatability.patch
new file mode 100644
index 000000000000..65abfa6328eb
--- /dev/null
+++ b/pkgs/by-name/hp/hplip/gcc-compatability.patch
@@ -0,0 +1,14 @@
+diff --git a/scan/sane/ledmi.h b/scan/sane/ledmi.h
+index a987c5d..f72847b 100644
+--- a/scan/sane/ledmi.h
++++ b/scan/sane/ledmi.h
+@@ -162,7 +162,7 @@ struct ledm_session
+ int bb_open(struct ledm_session*);
+ int bb_close(struct ledm_session*);
+ int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int);
+-int bb_is_paper_in_adf();         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
++int bb_is_paper_in_adf(struct ledm_session*);         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
+ SANE_Status bb_start_scan(struct ledm_session*);
+ int bb_get_image_data(struct ledm_session*, int); 
+ int bb_end_page(struct ledm_session*, int);
+
diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix
index fa9cd6bf492d..57065682b7f6 100644
--- a/pkgs/by-name/hp/hplip/package.nix
+++ b/pkgs/by-name/hp/hplip/package.nix
@@ -144,6 +144,8 @@ python3Packages.buildPythonApplication {
     # don't on NixOS).  Add the equivalent NixOS path, /var/lib/cups/path/share.
     # See: https://github.com/NixOS/nixpkgs/issues/21796
     ./hplip-3.20.11-nixos-cups-ppd-search-path.patch
+    # https://bugs.launchpad.net/hplip/+bug/2096650
+    ./gcc-compatability.patch
 
     # Remove all ImageProcessor functionality since that is closed source
     (fetchurl {
diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix
index 22cd263adb51..8742f7775cb0 100644
--- a/pkgs/by-name/ht/httpyac/package.nix
+++ b/pkgs/by-name/ht/httpyac/package.nix
@@ -22,7 +22,6 @@ buildNpmPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index b8b15bd8ca18..e5b1cecf12ff 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwdata";
-  version = "0.401";
+  version = "0.402";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2NZwylrUfnzA0aE+xlVZ7QCpCzfW9DwGzRVHirt0TRU=";
+    hash = "sha256-akLI2MdF6BDwvSoKt1jhlMyhKQv4TWxLFZWF7ivIezA=";
   };
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix
index 9681f97f108f..602b0a5d2a5e 100644
--- a/pkgs/by-name/hw/hwloc/package.nix
+++ b/pkgs/by-name/hw/hwloc/package.nix
@@ -104,5 +104,6 @@ stdenv.mkDerivation (finalAttrs: {
       markuskowa
     ];
     platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isCygwin;
   };
 })
diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 58e7bcf3ee6d..0732c6deff0a 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -119,7 +119,6 @@ let
         TermReadKey
         Test2Harness
         TestPostgreSQL
-        TestSimple13
         TextDiff
         TextTable
         UUID4Tiny
diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix
index eafb97d2c3fc..79636cbd3399 100644
--- a/pkgs/by-name/hy/hydrus/package.nix
+++ b/pkgs/by-name/hy/hydrus/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "hydrus";
-  version = "652";
+  version = "653";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     tag = "v${version}";
-    hash = "sha256-3N6iuKY2+desdUeEZuYSVjqHi7d89oXnPySZwdUKEtE=";
+    hash = "sha256-OH07OvN5EaEsjlUHUJMqproiVcN75yL9u7lnCjXSITo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index d67f01dcd926..18819ba24078 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "PATH" ];
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix
index 7992aa8dddfa..d213abef5867 100644
--- a/pkgs/by-name/hy/hyperrogue/package.nix
+++ b/pkgs/by-name/hy/hyperrogue/package.nix
@@ -102,8 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   doInstallCheck = !stdenv.hostPlatform.isDarwin;
 
   passthru = {
diff --git a/pkgs/by-name/ia/iaito/package.nix b/pkgs/by-name/ia/iaito/package.nix
index 8eb467c7aca3..4edb3551cf30 100644
--- a/pkgs/by-name/ia/iaito/package.nix
+++ b/pkgs/by-name/ia/iaito/package.nix
@@ -11,14 +11,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "iaito";
-  version = "6.0.4";
+  version = "6.0.7";
 
   srcs = [
     (fetchFromGitHub {
       owner = "radareorg";
       repo = "iaito";
       tag = finalAttrs.version;
-      hash = "sha256-99SuUTwHcpyJ5V9Cnanm6ylH3NVgyk3TmDoaFVwFE4E=";
+      hash = "sha256-sATBtjNboSnk3j1PVm60HZO1MDw1A4FRttVp0M4t+/I=";
       name = "main";
     })
     (fetchFromGitHub {
diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix
index 6db78442252e..714c9c8f5f93 100644
--- a/pkgs/by-name/ia/iamb/package.nix
+++ b/pkgs/by-name/ia/iamb/package.nix
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ic/icoutils/package.nix b/pkgs/by-name/ic/icoutils/package.nix
index e85ef53206a8..b6505b0c768d 100644
--- a/pkgs/by-name/ic/icoutils/package.nix
+++ b/pkgs/by-name/ic/icoutils/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
       url = "https://git.savannah.nongnu.org/cgit/icoutils.git/patch/?id=aa3572119bfe34484025f37dbbc4d5070f735908";
       hash = "sha256-4YCI+SYT2bCBNegkpN5jcfi6gOeec65TmCABr98HHB4=";
     })
+    # Fix build with GCC 15 / C23.
+    # https://savannah.nongnu.org/bugs/index.php?66812
+    (fetchpatch {
+      url = "https://git.savannah.nongnu.org/cgit/icoutils.git/patch/?id=298da402990ebe1279fb82b63ae2dc66ad78fd36";
+      hash = "sha256-XQXhc1GkKhm4RJZPvkV8DYULziuBo0Dpt6hscM2Qcus=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intel-graphics-compiler/gcc15-allow-llvm-free-nonheap-object-warning.patch b/pkgs/by-name/in/intel-graphics-compiler/gcc15-allow-llvm-free-nonheap-object-warning.patch
new file mode 100644
index 000000000000..90cd81176d12
--- /dev/null
+++ b/pkgs/by-name/in/intel-graphics-compiler/gcc15-allow-llvm-free-nonheap-object-warning.patch
@@ -0,0 +1,14 @@
+diff --git a/igc/IGC/common/LLVMWarningsPush.hpp b/igc/IGC/common/LLVMWarningsPush.hpp
+index 12874dfcc2..38acd80943 100644
+--- a/igc/IGC/common/LLVMWarningsPush.hpp
++++ b/igc/IGC/common/LLVMWarningsPush.hpp
+@@ -43,6 +43,9 @@
+ #if __GNUC__ > 8
+ #pragma GCC diagnostic ignored "-Winit-list-lifetime"
+ #endif
++#if __GNUC__ > 14
++#pragma GCC diagnostic ignored "-Wfree-nonheap-object"
++#endif
+ #endif
+ 
+ #if defined(_WIN32) || defined(_WIN64)
diff --git a/pkgs/by-name/in/intel-graphics-compiler/gcc15-llvm-header-fixes.patch b/pkgs/by-name/in/intel-graphics-compiler/gcc15-llvm-header-fixes.patch
new file mode 100644
index 000000000000..b60b995a726c
--- /dev/null
+++ b/pkgs/by-name/in/intel-graphics-compiler/gcc15-llvm-header-fixes.patch
@@ -0,0 +1,25 @@
+diff --git a/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/llvm-project/llvm/include/llvm/ADT/SmallVector.h
+index 98dce89168..a52947e16e 100644
+--- a/llvm-project/llvm/include/llvm/ADT/SmallVector.h
++++ b/llvm-project/llvm/include/llvm/ADT/SmallVector.h
+@@ -19,6 +19,7 @@
+ #include <algorithm>
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstring>
+ #include <functional>
+diff --git a/llvm-project/llvm/include/llvm/Support/Threading.h b/llvm-project/llvm/include/llvm/Support/Threading.h
+index ba6c531ab4..78aa5e7be5 100644
+--- a/llvm-project/llvm/include/llvm/Support/Threading.h
++++ b/llvm-project/llvm/include/llvm/Support/Threading.h
+@@ -18,7 +18,7 @@
+ #include "llvm/ADT/StringRef.h"
+ #include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
+ #include "llvm/Support/Compiler.h"
+-#include <ciso646> // So we can check the C++ standard lib macros.
++#include <version> // So we can check the C++ standard lib macros.
+ #include <optional>
+ 
+ #if defined(_MSC_VER)
diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index d3d217f9591d..2b70443cec1c 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -66,6 +66,16 @@ stdenv.mkDerivation rec {
     # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d
     # https://github.com/intel/intel-graphics-compiler/pull/364
     ./bump-cmake.patch
+
+    # Fix for GCC 15 by adding a previously-implicit `#include <cstdint>` and
+    # replacing `<ciso646>` with `<version>` in the the llvm directory. Based
+    # on https://github.com/intel/intel-graphics-compiler/pull/383.
+    ./gcc15-llvm-header-fixes.patch
+
+    # Fix for GCC 15 by disabling `-Werror` for `-Wfree-nonheap-object`
+    # warnings within LLVM. This is in accordance with IGC disabling warnings
+    # that originate from within LLVM (see `IGC/common/LLVMWarningsPush.hpp`).
+    ./gcc15-allow-llvm-free-nonheap-object-warning.patch
   ];
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 1911045de8ad..700f0b087c3d 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -18,21 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.17.0";
+  version = "6.18.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-l4HllBCrfeqOn3m7EP8UiOY9EPy7cFA7lEJronqOLew=";
+    hash = "sha256-a6Ug4ZdeTFDckx7q6R6jfBmLihc3RIhfiJW4QyX51FY=";
   };
 
-  patches = [
-    (fetchurl {
-      name = "musl-redefinition.patch";
-      url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw";
-      hash = "sha256-8gSpZb/B5sMd2OilUQqg0FqM9y3GZd5Ch5AXV5wrCZQ=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace Makefile \
       --replace "CC := gcc" "CC ?= $CC"
diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix
index 122d62c7e5d8..220948ac4eb4 100644
--- a/pkgs/by-name/is/isa-l/package.nix
+++ b/pkgs/by-name/is/isa-l/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/igzip";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix
index fb9b58c586f7..21409812255b 100644
--- a/pkgs/by-name/is/isc-cron/package.nix
+++ b/pkgs/by-name/is/isc-cron/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  fetchpatch,
   fetchurl,
   stdenv,
   replaceVars,
@@ -28,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
         "/bin"
       ];
     })
+    # Fix build with gcc 15
+    (fetchpatch {
+      url = "https://github.com/vixie/cron/commit/3ce0c3acdf086a82638818635961c70cba2b6ba7.patch";
+      hash = "sha256-d1vN3TGAAOMlWpMZKnHU/RlZ5pBOl3+IXjZ4UALVqLI=";
+    })
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/is/ispell/package.nix b/pkgs/by-name/is/ispell/package.nix
index e7b97ffe11c0..08d17d88fd61 100644
--- a/pkgs/by-name/is/ispell/package.nix
+++ b/pkgs/by-name/is/ispell/package.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17"; # Doesn't compile with C23
+
   meta = {
     description = "Interactive spell-checking program for Unix";
     homepage = "https://www.cs.hmc.edu/~geoff/ispell.html";
diff --git a/pkgs/by-name/is/isync/package.nix b/pkgs/by-name/is/isync/package.nix
index 414299bab329..6e514b3dec23 100644
--- a/pkgs/by-name/is/isync/package.nix
+++ b/pkgs/by-name/is/isync/package.nix
@@ -8,7 +8,7 @@
   db,
   cyrus_sasl,
   zlib,
-  perl538Packages,
+  perlPackages,
   autoreconfHook,
   # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies
   # on a package that isn't really maintained anymore:
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ];
   buildInputs = [
-    perl538Packages.TimeDate
+    perlPackages.TimeDate
     openssl
     db
     cyrus_sasl
diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix
index 9e3893ba4fce..507bfb1898cb 100644
--- a/pkgs/by-name/iw/iwe/package.nix
+++ b/pkgs/by-name/iw/iwe/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/ja/jacktrip/package.nix b/pkgs/by-name/ja/jacktrip/package.nix
index 6e9b6dfa2290..7bb63f730996 100644
--- a/pkgs/by-name/ja/jacktrip/package.nix
+++ b/pkgs/by-name/ja/jacktrip/package.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 5a67ffa753d5..177f98179091 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index 72fcde7dfc7d..c4a12b766ef6 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/jd/jdd/package.nix b/pkgs/by-name/jd/jdd/package.nix
index 0fbecb95bcd2..9d61d4509041 100644
--- a/pkgs/by-name/jd/jdd/package.nix
+++ b/pkgs/by-name/jd/jdd/package.nix
@@ -22,7 +22,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Johnny Decimal daemon for automatically organizing files into the correct drawer using their filename";
diff --git a/pkgs/by-name/je/jedit/package.nix b/pkgs/by-name/je/jedit/package.nix
index 43949e0df605..18ca338dc964 100644
--- a/pkgs/by-name/je/jedit/package.nix
+++ b/pkgs/by-name/je/jedit/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchsvn,
+  fetchgit,
   ant,
   jdk,
   jre,
@@ -14,14 +14,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "jedit";
   version = "5.7.0";
 
-  src =
-    let
-      versionWithDashes = lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version;
-    in
-    fetchsvn {
-      url = "https://svn.code.sf.net/p/jedit/svn/jEdit/tags/jedit-${versionWithDashes}";
-      hash = "sha256-XfYK2C0QZrg4b//1eQcUNViRthBbXV+cbcYetzw2RG8=";
-    };
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/jedit/jEdit";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Q2uarFMWXTWuJ0brw1PNS/vKWUa9gOTpD6Fumn0wMoI=";
+  };
 
   ivyDeps = stdenv.mkDerivation {
     name = "${finalAttrs.pname}-${finalAttrs.version}-ivy-deps";
@@ -107,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    changelog = "${finalAttrs.src.url}/doc/CHANGES.txt";
+    changelog = "https://sourceforge.net/p/jedit/jEdit/ci/v${finalAttrs.version}/tree/doc/CHANGES.txt";
     description = "Programmer's text editor written in Java";
     homepage = "https://www.jedit.org";
     license = lib.licenses.gpl2Only;
diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index 30d98424d560..e540277cf49f 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
     writableTmpDirAsHomeHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
   preInstallCheck = ''
     mkdir -p "$HOME/${
diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix
index dbcfb71f6c39..ab7426a8677d 100644
--- a/pkgs/by-name/je/jen/package.nix
+++ b/pkgs/by-name/je/jen/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 148c728a990c..fc5f995c0a90 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-dR9cb3TBxrRGP3BFYro/nGe5XVEfJuTZbQLo+FUfFNs=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix
index bddd524cf6e0..e9467c3ddf59 100644
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
index 30972f40419e..57cd9cc11d47 100644
--- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix
+++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/json-schema-catalog";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix
index a1482a5d5826..a5eb941f4e09 100644
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -8,21 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jsonschema-cli";
-  version = "0.37.4";
+  version = "0.38.1";
 
   src = fetchCrate {
     pname = "jsonschema-cli";
     inherit (finalAttrs) version;
-    hash = "sha256-qmxl4DzctXnDGeqZukMiurFoLt982ngDIo0Cum4kkcQ=";
+    hash = "sha256-W3pyT5DK8ADkWi7znuTDTq1hjRTOwhg9rSmuGZTX8r0=";
   };
 
-  cargoHash = "sha256-t2lRBVPk9bkvRsCxMNi30F3dkwr6angEGfD34UuH+EY=";
+  cargoHash = "sha256-C8A+cyNix0Q9OACyyPM3A74jZKNBCGz/622YsZqtY2E=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 5216fd971c1a..9f2c4d36febb 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/jj";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix
index 0aebc3b28495..7e90468dac00 100644
--- a/pkgs/by-name/ka/kanidm-provision/package.nix
+++ b/pkgs/by-name/ka/kanidm-provision/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix
index fb6753d555bb..3311db51f0dd 100644
--- a/pkgs/by-name/kd/kdlfmt/package.nix
+++ b/pkgs/by-name/kd/kdlfmt/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index aca9a620cf03..da5fe7bd421e 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -91,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix
index 5ae56e34cbd5..3c9cf26a59eb 100644
--- a/pkgs/by-name/ko/koto/package.nix
+++ b/pkgs/by-name/ko/koto/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoBuildFlags = [ "--package=koto_cli" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
index 7b55b7f76acf..fdfd92a84dfb 100644
--- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
+++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
@@ -39,7 +39,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "kubernetes_validate" ];
 
diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix
index 934b843ec25c..46c5f0fe21af 100644
--- a/pkgs/by-name/ku/kubexporter/package.nix
+++ b/pkgs/by-name/ku/kubexporter/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix
index 056efc08c68c..e63600462c99 100644
--- a/pkgs/by-name/ku/kuzu/package.nix
+++ b/pkgs/by-name/ku/kuzu/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = [ "--version" ];
 
   meta = {
     changelog = "https://github.com/kuzudb/kuzu/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index 181f5ef31551..7c7c9bc4db8a 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -79,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru = {
     providedSessions = [ "labwc" ];
diff --git a/pkgs/by-name/la/ladspa-sdk/package.nix b/pkgs/by-name/la/ladspa-sdk/package.nix
index 6f154ea224d8..561e7a3fec96 100644
--- a/pkgs/by-name/la/ladspa-sdk/package.nix
+++ b/pkgs/by-name/la/ladspa-sdk/package.nix
@@ -2,16 +2,19 @@
   lib,
   stdenv,
   fetchurl,
+  libsndfile,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa-sdk";
-  version = "1.15";
+  version = "1.17";
   src = fetchurl {
     url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
-    sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
+    hash = "sha256-J9JPJ55Lgb0X7L3MOOTEKZG7OIgmwLIABnzg61nT2ls=";
   };
 
+  buildInputs = [ libsndfile ];
+
   sourceRoot = "ladspa_sdk_${finalAttrs.version}/src";
 
   strictDeps = true;
@@ -41,10 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
       The LADSPA SDK, including the ladspa.h API header file,
       ten example LADSPA plugins and
       three example programs (applyplugin, analyseplugin and listplugins).
+      For just ladspa.h, use the ladspaH package.
     '';
     homepage = "http://www.ladspa.org/ladspa_sdk/overview.html";
     license = lib.licenses.lgpl2;
-    maintainers = [ lib.maintainers.magnetophon ];
+    maintainers = with lib.maintainers; [ magnetophon ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/la/ladspaH/package.nix b/pkgs/by-name/la/ladspaH/package.nix
index 7c2515002b1c..fbd90eb81df7 100644
--- a/pkgs/by-name/la/ladspaH/package.nix
+++ b/pkgs/by-name/la/ladspaH/package.nix
@@ -5,10 +5,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa.h";
-  version = "1.15";
+  version = "1.17";
   src = fetchurl {
     url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
-    sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
+    hash = "sha256-J9JPJ55Lgb0X7L3MOOTEKZG7OIgmwLIABnzg61nT2ls=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix
index 51597f740649..758faf417a7d 100644
--- a/pkgs/by-name/la/laze/package.nix
+++ b/pkgs/by-name/la/laze/package.nix
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix
index 64e3a0a57499..9a79af2c7ed8 100644
--- a/pkgs/by-name/la/lazyjj/package.nix
+++ b/pkgs/by-name/la/lazyjj/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix
index dbb78518612d..084152895912 100644
--- a/pkgs/by-name/lc/lcov/package.nix
+++ b/pkgs/by-name/lc/lcov/package.nix
@@ -62,8 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index e3a4acd82250..233e6c9c7caf 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix
index e3ee393a0306..b432523f41b1 100644
--- a/pkgs/by-name/le/less/package.nix
+++ b/pkgs/by-name/le/less/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix
index 5f3ebdeed22c..fd386e4b87a6 100644
--- a/pkgs/by-name/le/lexical/package.nix
+++ b/pkgs/by-name/le/lexical/package.nix
@@ -43,7 +43,6 @@ beamPackages.mixRelease rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix
index 749125043f06..0f61c70c5f7a 100644
--- a/pkgs/by-name/li/libLAS/package.nix
+++ b/pkgs/by-name/li/libLAS/package.nix
@@ -54,6 +54,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/libLAS/libLAS/commit/be77a75f475ec8d59c0dae1c3c896289bcb5a287.patch";
       hash = "sha256-5XDexk3IW7s2/G27GXkWp7cw1WZyQLMk/lTpfOM6PM0=";
     })
+    (fetchpatch {
+      name = "fix-gcc15.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/liblas/-/raw/1.8.1.r128+gded46373-17/liblas-gcc15.patch";
+      hash = "sha256-cOm5ElnR2mK+ofU0F4xzYTkFa3Oq8r/WSm4qo45vkt8=";
+    })
   ];
 
   # Disable setting of C++98 standard which was dropped in boost 1.84.0
diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index a1954d7c71b0..27e4948d74e7 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.8.1";
+  version = "1.8.2";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-9CcmzwQYZZc6dZAv6x90Od4lrRcYZIejzPgm6S1vz/U=";
+    hash = "sha256-bymC3B5mY4r7oteA6WRViWIyazt0YE6T+P+RHrYifyY=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/li/libarchive-qt/package.nix b/pkgs/by-name/li/libarchive-qt/package.nix
index 0286a374fba3..03b024ecb8f3 100644
--- a/pkgs/by-name/li/libarchive-qt/package.nix
+++ b/pkgs/by-name/li/libarchive-qt/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    qt6.wrapQtAppsNoGuiHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 528e52dc6a72..1cfcfd29c4b7 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -31,13 +31,13 @@
 assert xarSupport -> libxml2 != null;
 stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive";
-  version = "3.8.2";
+  version = "3.8.4";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-s7duwuNFyYq8obTS3qc6JewJ9f8LJhItlEx8wxnMgwk=";
+    hash = "sha256-qNz7BAvi3dTNg6Bz2cfqaYGKFJlM4C+y/GARsQRRYsY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index a55c166df6a0..6259025537b9 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -6,8 +6,7 @@
   fetchpatch,
   onetbb,
 
-  # TBB doesn't support being built static
-  useTBB ? !stdenv.hostPlatform.isStatic,
+  useTBB ? lib.meta.availableOn stdenv.hostPlatform onetbb,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls=";
       relative = "c";
     })
+    # fix cygwin build
+    (fetchpatch {
+      url = "https://github.com/BLAKE3-team/BLAKE3/commit/d62babb7ebb01c8ac4aaa580f4b49071a639195e.patch";
+      hash = "sha256-qO8HsmBIAkR03rqITooyBiQTorUM6JCJLZOrOc2yss8=";
+      relative = "c";
+    })
   ];
 
   sourceRoot = finalAttrs.src.name + "/c";
diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix
new file mode 100644
index 000000000000..5a09f78f35d0
--- /dev/null
+++ b/pkgs/by-name/li/libbluray-full/package.nix
@@ -0,0 +1,6 @@
+{ libbluray }:
+libbluray.override {
+  withAACS = true;
+  withBDplus = true;
+  withJava = true;
+}
diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix
index 4b3dfdd295d4..fe6f8feb611f 100644
--- a/pkgs/by-name/li/libbluray/package.nix
+++ b/pkgs/by-name/li/libbluray/package.nix
@@ -1,12 +1,14 @@
 {
   lib,
+  callPackage,
   stdenv,
   fetchurl,
   pkg-config,
   fontconfig,
-  autoreconfHook,
+  meson,
+  ninja,
   withJava ? false,
-  jdk17,
+  jdk21_headless, # Newer JDK's depend on a release with a fix for https://code.videolan.org/videolan/libbluray/-/issues/46
   ant,
   stripJavaArchivesHook,
   withAACS ? false,
@@ -17,6 +19,7 @@
   libxml2,
   withFonts ? true,
   freetype,
+  libbluray-full, # Used for tests
 }:
 
 # Info on how to use:
@@ -24,19 +27,20 @@
 
 stdenv.mkDerivation rec {
   pname = "libbluray";
-  version = "1.3.4";
+  version = "1.4.0";
 
   src = fetchurl {
-    url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys=";
+    url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-d5N7rwfq3aSysxHPOvTFAmnS6jFlBB9YQ9lkdsTJJ3c=";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkg-config
-    autoreconfHook
   ]
   ++ lib.optionals withJava [
-    jdk17
+    jdk21_headless
     ant
     stripJavaArchivesHook
   ];
@@ -49,15 +53,15 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = lib.optional withAACS libaacs;
 
-  env.JAVA_HOME = lib.optionalString withJava jdk17.home; # Fails at runtime without this
+  env.JAVA_HOME = lib.optionalString withJava jdk21_headless.home; # Fails at runtime without this
   env.NIX_LDFLAGS =
     lib.optionalString withAACS "-L${libaacs}/lib -laacs"
     + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus";
 
-  configureFlags =
-    lib.optional (!withJava) "--disable-bdjava-jar"
-    ++ lib.optional (!withMetadata) "--without-libxml2"
-    ++ lib.optional (!withFonts) "--without-freetype";
+  mesonFlags =
+    lib.optional (!withJava) "-Dbdj_jar=disabled"
+    ++ lib.optional (!withMetadata) "-dlibxml2=disabled"
+    ++ lib.optional (!withFonts) "-Dfreetype=disabled";
 
   meta = {
     homepage = "http://www.videolan.org/developers/libbluray.html";
@@ -66,4 +70,11 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
+
+  passthru = {
+    tests = {
+      # Verify the "full" package when verifying changes to this package
+      inherit libbluray-full;
+    };
+  };
 }
diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index 5633a74ec866..97d3893925eb 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -27,12 +27,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libcamera";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchgit {
     url = "https://git.libcamera.org/libcamera/libcamera.git";
     rev = "v${version}";
-    hash = "sha256-nr1LmnedZMGBWLf2i5uw4E/OMeXObEKgjuO+PUx/GDY=";
+    hash = "sha256-zGcbzL1Q2hUaj/s9NjBlp7hVjmSFb0GF8CnCoDS82Tw=";
   };
 
   outputs = [
@@ -112,6 +112,7 @@ stdenv.mkDerivation rec {
     "-Dv4l2=true"
     (lib.mesonEnable "tracing" withTracing)
     (lib.mesonEnable "qcam" withQcam)
+    "-Dlibunwind=disabled"
     "-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled
     # Avoid blanket -Werror to evade build failures on less
     # tested compilers.
diff --git a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh
index 7245d51495c0..e6a523191956 100644
--- a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh
+++ b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh
@@ -15,11 +15,7 @@ libcosmicAppVergenHook() {
 
 libcosmicAppLinkerArgsHook() {
   # Force linking to certain libraries like libEGL, which are always dlopen()ed
-  # local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS"
-
-  # Temporarily use this simpler solution, it should work for simple cross compilation
-  # https://github.com/NixOS/nixpkgs/issues/464392
-  local flags="RUSTFLAGS"
+  local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS"
 
   export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed"
   # shellcheck disable=SC2043
diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix
index f6eca00a1e0a..416ec8029da3 100644
--- a/pkgs/by-name/li/libcosmicAppHook/package.nix
+++ b/pkgs/by-name/li/libcosmicAppHook/package.nix
@@ -57,10 +57,7 @@ makeSetupHook {
       lib.makeSearchPath "share" (
         lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons or cosmic-icons ]
       );
-    # Temporarily using RUSTFLAGS: https://github.com/NixOS/nixpkgs/issues/464392
-    # See ./libcosmic-app-hook.sh
-    # cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;
-
+    cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;
     # force linking for all libraries that may be dlopen'd by libcosmic/iced apps
     cargoLinkLibs = lib.escapeShellArgs (
       [
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index 901e7de81f72..a56344d168b2 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.128";
+  version = "2.4.129";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-O7NduHAMKgtWnyxnKaU/VJV4aFazEIVMjeV3gqIr3aw=";
+    hash = "sha256-WXgYP5eNaX4mpQugZhdJZO+wq5fKoeyqG4Yfvl3fd9w=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libedit/01-cygwin.patch b/pkgs/by-name/li/libedit/01-cygwin.patch
index 33bd39ed61e5..ef6aa79c9561 100644
--- a/pkgs/by-name/li/libedit/01-cygwin.patch
+++ b/pkgs/by-name/li/libedit/01-cygwin.patch
@@ -1,17 +1,3 @@
---- libedit-20120311-3.0/src/chartype.h	2012-03-11 10:54:58.000000000 +0100
-+++ libedit-20120311-3.0/src/chartype.h	2012-05-03 19:00:20.651847423 +0200
-@@ -56,9 +56,11 @@
- /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
-  * ref: ISO/IEC DTR 19769
-  */
-+#ifndef __CYGWIN__
- #if WCHAR_MAX < INT32_MAX
- #warning Build environment does not support non-BMP characters
- #endif
-+#endif
- 
- #ifndef HAVE_WCSDUP
- wchar_t *wcsdup(const wchar_t *s);
 --- libedit-20120311-3.0/src/editline/readline.h	2011-02-26 23:42:59.000000000 +0100
 +++ libedit-20120311-3.0/src/editline/readline.h	2012-05-03 19:00:49.211244803 +0200
 @@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
@@ -23,3 +9,14 @@
  #include <sys/ttydefaults.h>
  #endif
  #ifndef CTRL
+
+--- a/src/read.c
++++ b/src/read.c
+@@ -51,6 +51,7 @@ __RCSID("$NetBSD: read.c,v 1.109 2025/01/03 00:40:08 rillig Exp $");
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/ioctl.h>
+ 
+ #include "el.h"
+ #include "fcns.h"
diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index 6f3caa1f45da..30a316d0074d 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
       similar to those found in GNU Readline.
     '';
     license = with lib.licenses; [ bsd3 ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ corngood ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/li/libev/package.nix b/pkgs/by-name/li/libev/package.nix
index cf0f426f96b2..86462cc5380f 100644
--- a/pkgs/by-name/li/libev/package.nix
+++ b/pkgs/by-name/li/libev/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   updateAutotoolsGnuConfigScriptsHook,
   # Note: -static hasn’t work on darwin
   static ? with stdenv.hostPlatform; isStatic && !isDarwin,
@@ -21,10 +22,22 @@ stdenv.mkDerivation rec {
     sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/21a6f0f5829384117dfc1ed11ad67954562ef7d6/devel/libev/files/patch-ev.c";
+      hash = "sha256-jaeJuCYM/U2ZNbbyA/7YOKvo0lj7Dc9L3LNJfZwcaw0=";
+      extraPrefix = "";
+    })
+  ];
+
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
   configureFlags = lib.optional static "LDFLAGS=-static";
 
+  makeFlags =
+    # doing this in configureFlags causes configure to fail
+    lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS=-no-undefined";
+
   meta = {
     description = "High-performance event loop/event model with lots of features";
     maintainers = [ lib.maintainers.raskin ];
diff --git a/pkgs/by-name/li/libexsid/package.nix b/pkgs/by-name/li/libexsid/package.nix
index d4ce696e2858..c9c59508ca0b 100644
--- a/pkgs/by-name/li/libexsid/package.nix
+++ b/pkgs/by-name/li/libexsid/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   pkg-config,
   docSupport ? true,
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
     sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r";
   };
 
+  patches = [
+    # fix build with GCC 15 by removing unneeded argument
+    (fetchpatch {
+      url = "https://github.com/libsidplayfp/exsid-driver/commit/99bfaf25f73f96d588a38a4309fa5f18c364f4d4.patch";
+      hash = "sha256-wg/oJieejyXiP5Ff9FRfACNELUt5021kXS1/zT7dMgA=";
+    })
+  ];
+
   outputs = [ "out" ] ++ lib.optional docSupport "doc";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libfido2/package.nix b/pkgs/by-name/li/libfido2/package.nix
index 2dc6ea440ffa..710960b91fb7 100644
--- a/pkgs/by-name/li/libfido2/package.nix
+++ b/pkgs/by-name/li/libfido2/package.nix
@@ -48,6 +48,12 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
 
+  # Required for FreeBSD
+  # https://github.com/freebsd/freebsd-ports/blob/21a6f0f5829384117dfc1ed11ad67954562ef7d6/security/libfido2/Makefile#L37C27-L37C77
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail "-D_POSIX_C_SOURCE=200809L" "-D_POSIX_C_SOURCE=202405L"
+  '';
+
   cmakeFlags = [
     "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
     "-DCMAKE_INSTALL_LIBDIR=lib"
diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock
index eaed4b693bfe..989062e597b6 100644
--- a/pkgs/by-name/li/libimagequant/Cargo.lock
+++ b/pkgs/by-name/li/libimagequant/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "arrayvec"
@@ -16,15 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bytemuck"
-version = "1.21.0"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
 
 [[package]]
 name = "c_test"
@@ -36,24 +36,25 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.10"
+version = "1.2.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -85,23 +86,30 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
 
 [[package]]
 name = "flate2"
-version = "1.0.35"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
+ "libz-rs-sys",
  "miniz_oxide",
 ]
 
 [[package]]
 name = "imagequant"
-version = "4.4.0"
+version = "4.4.1"
 dependencies = [
  "arrayvec",
  "lodepng",
@@ -122,15 +130,24 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "libz-rs-sys"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd"
+dependencies = [
+ "zlib-rs",
+]
 
 [[package]]
 name = "lodepng"
-version = "3.11.0"
+version = "3.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7720115060cd38dcfe5c758525a43fd34dc615d0566374212ff0dc3b6151eac"
+checksum = "77a32335d22e44238e2bb0b4d726964d18952ce1f1279ec3305305d2c61539eb"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -140,24 +157,25 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -165,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -175,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.50"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
+checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
 dependencies = [
  "bytemuck",
 ]
@@ -189,11 +207,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
-name = "thread_local"
-version = "1.1.8"
+name = "simd-adler32"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "thread_local"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
+
+[[package]]
+name = "zlib-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2"
diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix
index ec783eb93571..75f8a26aa77c 100644
--- a/pkgs/by-name/li/libimagequant/package.nix
+++ b/pkgs/by-name/li/libimagequant/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "libimagequant";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "libimagequant";
     rev = version;
-    hash = "sha256-c9j0wVwTWtNrPy9UUsc0Gxbe6lP82C3DMXe+k/ZBYEw=";
+    hash = "sha256-A7idjAAJ+syqIahyU+LPZBF+MLxVDymY+M3HM7d/qk0=";
   };
 
   cargoLock = {
diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
index e30ee22edbd5..deeed0c7d87d 100644
--- a/pkgs/by-name/li/libjpeg_turbo/package.nix
+++ b/pkgs/by-name/li/libjpeg_turbo/package.nix
@@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjpeg-turbo";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "libjpeg-turbo";
     repo = "libjpeg-turbo";
     tag = finalAttrs.version;
-    hash = "sha256-tmeWLJxieV42f9ljSpKJoLER4QOYQLsLFC7jW54YZAk=";
+    hash = "sha256-jcdoCJlsDEr87i5MN4I6zARZVUxQfzdM0Ltg3IyrNRg=";
   };
 
   patches =
diff --git a/pkgs/by-name/li/liblqr1/package.nix b/pkgs/by-name/li/liblqr1/package.nix
index bfe56beef91b..337381f04d71 100644
--- a/pkgs/by-name/li/liblqr1/package.nix
+++ b/pkgs/by-name/li/liblqr1/package.nix
@@ -6,7 +6,7 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "liblqr-1";
   version = "0.4.2";
 
@@ -18,8 +18,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "carlobaldassi";
     repo = "liblqr";
-    rev = "v${version}";
-    sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rgVX+hEGRfWY1FvwDBLy5nLPOyh2JE4+lB0KOmahuYI=";
+  };
+
+  # Fix build with gcc15
+  env = lib.optionalAttrs stdenv.cc.isGNU {
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -34,4 +39,4 @@ stdenv.mkDerivation rec {
       lgpl3
     ];
   };
-}
+})
diff --git a/pkgs/by-name/li/libmcrypt/package.nix b/pkgs/by-name/li/libmcrypt/package.nix
index 31b8f5a9c4e9..59828384b855 100644
--- a/pkgs/by-name/li/libmcrypt/package.nix
+++ b/pkgs/by-name/li/libmcrypt/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   cctools,
   disablePosixThreads ? false,
 }:
@@ -15,6 +16,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5OtsB0u6sWisR7lHwZX/jO+dUaIRzdGMqcnvNNJ6Nz4=";
   };
 
+  patches = [
+    # Fix build with GCC 15
+    (fetchpatch {
+      url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/v20251224/community/libmcrypt/c23.patch";
+      hash = "sha256-yTBCi5f0s8SiM5aq8X135E2Wwl7S2sO1tsVDthCdAMg=";
+    })
+  ];
+
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin cctools;
 
   configureFlags =
diff --git a/pkgs/by-name/li/libmhash/package.nix b/pkgs/by-name/li/libmhash/package.nix
index ce3706fe4e19..89cbb8c679d3 100644
--- a/pkgs/by-name/li/libmhash/package.nix
+++ b/pkgs/by-name/li/libmhash/package.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./autotools-define-conflict-debian-fix.patch ];
 
+  # Fix build with gcc15
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   meta = {
     description = "Hash algorithms library";
     longDescription = ''
diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix
index 73799c03d809..dbde8f84ac3d 100644
--- a/pkgs/by-name/li/libnftnl/package.nix
+++ b/pkgs/by-name/li/libnftnl/package.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.3.1";
   pname = "libnftnl";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
-    hash = "sha256-D0vkeou4t3o1DuWMvUtfrmJgrUhqUncGqxXP4d1Vo8Q=";
+    hash = "sha256-YH2ijbpm+97M+O8Tld3tkHfo0Z8plfmk1FqcLwvP+6g=";
   };
 
   configureFlags = lib.optional (
diff --git a/pkgs/by-name/li/libpst/package.nix b/pkgs/by-name/li/libpst/package.nix
index e8f4837dc1d1..c759994252b4 100644
--- a/pkgs/by-name/li/libpst/package.nix
+++ b/pkgs/by-name/li/libpst/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   autoreconfHook,
   bzip2,
   doxygen,
@@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-PSkb7rvbSNK5NGCLwGGVtkHaY9Ko9eDThvLp1tBaC0I=";
   };
 
+  patches = [
+    # readpst: Fix a build with gcc/C23 standard
+    (fetchpatch {
+      url = "https://github.com/pst-format/libpst/commit/cc600ee98c4ed23b8ab0bc2cf6b6c6e9cb587e89.patch";
+      hash = "sha256-lD6vJrRbqnlG69+aU0v32UTxD0NfKNr6vPcysXK7ir0=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     doxygen
diff --git a/pkgs/by-name/li/librep/package.nix b/pkgs/by-name/li/librep/package.nix
index 795d43eea991..bc6b148962ff 100644
--- a/pkgs/by-name/li/librep/package.nix
+++ b/pkgs/by-name/li/librep/package.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
 
   meta = {
diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix
index b0296afa746f..11acc1076428 100644
--- a/pkgs/by-name/li/libtirpc/package.nix
+++ b/pkgs/by-name/li/libtirpc/package.nix
@@ -6,16 +6,16 @@
   libkrb5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libtirpc";
   version = "1.3.7";
 
   src = fetchurl {
     url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${
-      lib.replaceStrings [ "." ] [ "-" ] version
+      lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     };sf=tgz";
     hash = "sha256-VGftEr3xzCp8O3oqCjIZozlq599gxN5IsHBRaG37GP4=";
-    name = "${pname}-${version}.tar.gz";
+    name = "${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
   };
 
   outputs = [
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config";
+  env.KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config";
+
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libkrb5 ];
   strictDeps = true;
@@ -44,6 +45,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  __structuredAttrs = true;
+
   meta = {
     homepage = "https://sourceforge.net/projects/libtirpc/";
     description = "Transport-independent Sun RPC implementation (TI-RPC)";
@@ -64,4 +67,4 @@ stdenv.mkDerivation rec {
       been ported to replace the SunRPC of the glibc.
     '';
   };
-}
+})
diff --git a/pkgs/by-name/li/libultrahdr/package.nix b/pkgs/by-name/li/libultrahdr/package.nix
index 4bf5fa1563a9..7097884d9fa8 100644
--- a/pkgs/by-name/li/libultrahdr/package.nix
+++ b/pkgs/by-name/li/libultrahdr/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   replaceVars,
   cmake,
   ninja,
@@ -30,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
+    # Fix build with gcc 15 by adding missing cstdint header
+    (fetchpatch {
+      url = "https://github.com/google/libultrahdr/commit/5fa99b5271a3c80a13c78062d7adc6310222dd8e.patch";
+      hash = "sha256-o6lbDOdx+ZrCy/Iq02WjM9Tas8C5P/FMwUtXMUCoZGY=";
+    })
+
     (replaceVars ./gtest.patch {
       GTEST_INCLUDE_DIRS = "${lib.getDev gtest}/include";
     })
diff --git a/pkgs/by-name/li/libwacom-surface/package.nix b/pkgs/by-name/li/libwacom-surface/package.nix
index d83b6e4f5cb4..c4f308816a56 100644
--- a/pkgs/by-name/li/libwacom-surface/package.nix
+++ b/pkgs/by-name/li/libwacom-surface/package.nix
@@ -8,8 +8,8 @@ let
   libwacom-surface = fetchFromGitHub {
     owner = "linux-surface";
     repo = "libwacom-surface";
-    tag = "v2.16.1-1";
-    hash = "sha256-xyKG9QqL7cQH1aW66pIg7J2rikxfU/n/0iEvKXNQ1kA=";
+    tag = "v2.17.0-1";
+    hash = "sha256-0p68GMtQPlf/lX0Sl0VtttRODBKPMSeQOu3Le5JorSQ=";
   };
 in
 libwacom.overrideAttrs (prevAttrs: {
diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index eb43c5a0148d..0f6833c92b42 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libwacom";
-  version = "2.16.1";
+  version = "2.17.0";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linuxwacom";
     repo = "libwacom";
     rev = "libwacom-${finalAttrs.version}";
-    hash = "sha256-YP6z+2HyIRmIAJIdJMbVTQA0rf3EXBZvlCdM4jrmHXM=";
+    hash = "sha256-2JbO3B/PqsLKnaCeQcn1x9Z2pQL4kScuS39F1JlpDpc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libxslt/package.nix b/pkgs/by-name/li/libxslt/package.nix
index ed1b8770b4cb..1718598b01e7 100644
--- a/pkgs/by-name/li/libxslt/package.nix
+++ b/pkgs/by-name/li/libxslt/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxslt";
-  version = "1.1.43";
+  version = "1.1.45";
 
   outputs = [
     "bin"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Wj1rODylr8I1sXERjpD1/2qifp/qMwMGUjGm1APwGDo=";
+    hash = "sha256-ms/mhBnE0GpFxVAyGzISdi2S9BRlBiyk6hnmMu5dIW4=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix
index 6943c8a28ef5..4410bfa9d613 100644
--- a/pkgs/by-name/li/lightning-terminal/package.nix
+++ b/pkgs/by-name/li/lightning-terminal/package.nix
@@ -95,7 +95,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/litcli";
-  versionCheckProgramArg = "--version";
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
diff --git a/pkgs/by-name/li/lightningstream/package.nix b/pkgs/by-name/li/lightningstream/package.nix
index 94f19ca2d3c6..25a6c4d1d1d7 100644
--- a/pkgs/by-name/li/lightningstream/package.nix
+++ b/pkgs/by-name/li/lightningstream/package.nix
@@ -53,7 +53,6 @@ buildGoModule {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix
index d7571b1435ce..50b59a1fa42a 100644
--- a/pkgs/by-name/li/ligolo-ng/package.nix
+++ b/pkgs/by-name/li/ligolo-ng/package.nix
@@ -43,7 +43,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/ligolo-agent";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix
index f4231043c34f..55c4f1f44327 100644
--- a/pkgs/by-name/li/lima/package.nix
+++ b/pkgs/by-name/li/lima/package.nix
@@ -95,7 +95,6 @@ buildGoModule (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/limactl";
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   installCheckPhase = ''
diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix
index 252c6725db7a..547fd49e10b9 100644
--- a/pkgs/by-name/li/linyaps/package.nix
+++ b/pkgs/by-name/li/linyaps/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     copyDesktopItems
     pkg-config
-    qt6Packages.wrapQtAppsNoGuiHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch
deleted file mode 100644
index 1ed9b4a97b7a..000000000000
--- a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4ee5d9b78ca1425b4473ede98602b656f28027e8 Mon Sep 17 00:00:00 2001
-From: David Disseldorp <ddiss@suse.de>
-Date: Fri, 4 Jul 2025 15:51:14 +1000
-Subject: [PATCH] lkl: fix hijack and zpoline parallel builds
-
-This is a follow up change for commit 3c97822a40cb1 ("lkl: add tests
-build barrier") tracked via https://github.com/lkl/linux/issues/558.
-The hijack and zpoline libraries also share object files, so need a
-barrier to avoid parallel build failures.
-
-Signed-off-by: David Disseldorp <ddiss@suse.de>
----
- tools/lkl/Makefile | 7 ++++---
- tools/lkl/Targets  | 2 ++
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
-index 9ca22b7605e3ad..dfe7f6aef5fe02 100644
---- a/tools/lkl/Makefile
-+++ b/tools/lkl/Makefile
-@@ -176,10 +176,11 @@ headers_install: $(TARGETS)
- 	      include/lkl_config.h $(DESTDIR)$(INCDIR) ; \
- 	    cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR)
- 
--libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a
--	$(call QUIET_INSTALL, libraries) \
-+libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a
-+	# filter out special .WAIT targets from install
-+	$(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \
- 	    install -d $(DESTDIR)$(LIBDIR) ; \
--	    install -m 644 $^ $(DESTDIR)$(LIBDIR)
-+	    install -m 644 $^ $(DESTDIR)$(LIBDIR))
- 
- programs_install: $(call expand-targets,$(progs-y),$(EXESUF))
- 	$(call QUIET_INSTALL, programs) \
-diff --git a/tools/lkl/Targets b/tools/lkl/Targets
-index 3d30bd8be3c840..089a832ee23627 100644
---- a/tools/lkl/Targets
-+++ b/tools/lkl/Targets
-@@ -2,6 +2,8 @@ libs-y += lib/liblkl
- 
- ifneq ($(LKL_HOST_CONFIG_BSD),y)
- libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack
-+# hijack and zpoline targets share object files, breaking parallel builds
-+libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT
- libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline
- endif
- LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs
diff --git a/pkgs/by-name/lk/lkl/package.nix b/pkgs/by-name/lk/lkl/package.nix
index 1d6ae37fdddd..b074d078da75 100644
--- a/pkgs/by-name/lk/lkl/package.nix
+++ b/pkgs/by-name/lk/lkl/package.nix
@@ -16,7 +16,7 @@
 stdenv.mkDerivation {
   pname = "lkl";
 
-  version = "2025-03-20";
+  version = "2025-11-13";
 
   outputs = [
     "dev"
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "lkl";
     repo = "linux";
-    rev = "fd33ab3d21a99a31683ebada5bd3db3a54a58800";
-    sha256 = "sha256-3uPkOyL/hoA/H2gKrEEDsuJvwOE2x27vxY5Y2DyNNxU=";
+    rev = "9c51103caa1481493ebbbaf858f016e7f25ab921";
+    hash = "sha256-7S1lA6qfpGLj5lCqdOEEfcChxNw+35SC/NEjFWcwvko=";
   };
 
   nativeBuildInputs = [
@@ -43,22 +43,11 @@ stdenv.mkDerivation {
     libarchive
   ];
 
-  patches = [
-    # Fix corruption in hijack and zpoline libraries when building in parallel,
-    # because both hijack and zpoline share object files, which may result in
-    # missing symbols.
-    # https://github.com/lkl/linux/pull/612/commits/4ee5d9b78ca1425b4473ede98602b656f28027e8
-    ./fix-hijack-and-zpoline-parallel-builds.patch
-  ];
-
   postPatch = ''
     # Fix a /usr/bin/env reference in here that breaks sandboxed builds
     patchShebangs arch/lkl/scripts
 
     patchShebangs scripts/ld-version.sh
-
-    # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
-    sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
   ''
   + lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isLoongArch64) ''
     echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig
diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix
index b60cc62023b8..821a8a11a8a2 100644
--- a/pkgs/by-name/ll/llm-ls/package.nix
+++ b/pkgs/by-name/ll/llm-ls/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch b/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch
new file mode 100644
index 000000000000..411266b13089
--- /dev/null
+++ b/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch
@@ -0,0 +1,64 @@
+diff --git a/Makefile b/Makefile
+index 8877a17..f73fe5f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -161,7 +161,7 @@ MAIN_OBJS	 = $(COMPAT_OBJS)
+ 
+ # Mac OS X and other Unix systems use different conventions for
+ # indicating shared library versions.
+-.if $(LINKER_SOSUFFIX) == "dylib"
++.if $(LINKER_SOSUFFIX) == "dylib" || $(LINKER_SOSUFFIX) == "dll"
+ LIB_SOVER	 = liblowdown.$(LIBVER).$(LINKER_SOSUFFIX)
+ .else
+ LIB_SOVER	 = liblowdown.$(LINKER_SOSUFFIX).$(LIBVER)
+@@ -190,7 +190,7 @@ REGRESS_ARGS	+= "--parse-no-deflists"
+ REGRESS_ENV	 = LC_ALL=en_US.UTF-8
+ 
+ all: bins lowdown.pc $(LIB_SO)
+-bins: lowdown lowdown-diff
++bins: lowdown$(EXESUFFIX) lowdown-diff
+ 
+ www: all $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+ 
+@@ -202,11 +202,11 @@ installwww: www
+ 	$(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+ 	$(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+ 
+-lowdown: $(LIB_LOWDOWN) $(MAIN_OBJS) main.o
++lowdown$(EXESUFFIX): $(LIB_LOWDOWN) $(MAIN_OBJS) main.o
+ 	$(CC) -o $@ main.o $(MAIN_OBJS) $(LIB_LOWDOWN) $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
+ 
+-lowdown-diff: lowdown
+-	ln -f lowdown lowdown-diff
++lowdown-diff: lowdown$(EXESUFFIX)
++	ln -f lowdown$(EXESUFFIX) lowdown-diff
+ 
+ $(LIB_ST): $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+@@ -240,7 +240,7 @@ install: bins
+ 	$(INSTALL_DATA) share/man/* $(DESTDIR)$(SHAREDIR)/lowdown/man
+ 	$(INSTALL_DATA) share/ms/* $(DESTDIR)$(SHAREDIR)/lowdown/ms
+ 	$(INSTALL_DATA) share/odt/* $(DESTDIR)$(SHAREDIR)/lowdown/odt
+-	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
++	$(INSTALL_PROGRAM) lowdown$(EXESUFFIX) $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+ 	for f in $(MAN1S) $(MAN5S) ; do \
+ 		name=`basename $$f .html` ; \
+@@ -273,7 +273,7 @@ uninstall_shared: uninstall_lib_common
+ 	rm -f $(LIBDIR)/$(LIB_SOVER) $(LIBDIR)/$(LIB_SO)
+ 
+ install_shared: $(LIB_SO) install_lib_common
+-	$(INSTALL_LIB) $(LIB_SOVER) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) $(LIB_SOVER) $(IMPLIB) $(DESTDIR)$(LIBDIR)
+ 	( cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIB_SOVER) $(LIB_SO) )
+ 
+ uninstall_static: uninstall_lib_common
+@@ -406,7 +406,7 @@ main.o: lowdown.h
+ 
+ clean:
+ 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
+-	rm -f lowdown lowdown-diff lowdown.pc
++	rm -f lowdown$(EXESUFFIX) lowdown-diff lowdown.pc
+ 	rm -f $(LIB_ST) $(LIB_SO) $(LIB_SOVER)
+ 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
diff --git a/pkgs/by-name/lo/lowdown/package.nix b/pkgs/by-name/lo/lowdown/package.nix
index d4720161aa07..684ca14b0cd9 100644
--- a/pkgs/by-name/lo/lowdown/package.nix
+++ b/pkgs/by-name/lo/lowdown/package.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     sha512 = "649a508b7727df6e7e1203abb3853e05f167b64832fd5e1271f142ccf782e600b1de73c72dc02673d7b175effdc54f2c0f60318208a968af9f9763d09cf4f9ef";
   };
 
+  # https://github.com/kristapsdz/lowdown/pull/171
+  patches = [ ./fix-cygwin-build.patch ];
+
   nativeBuildInputs = [
     which
     dieHook
@@ -60,6 +63,7 @@ stdenv.mkDerivation rec {
     runHook postConfigure
   '';
 
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isCygwin "-D_GNU_SOURCE";
   # Fix rpath change on darwin to avoid failure like:
   #     error: install_name_tool: changing install names or
   #     rpaths can't be redone for: liblowdown.1.dylib (for architecture
@@ -69,6 +73,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "bins" # prevents shared object from being built unnecessarily
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isCygwin [
+    "EXESUFFIX=.exe"
+    "LINKER_SOSUFFIX=dll"
+    "LIB_SO=cyglowdown.dll"
+    "IMPLIB=liblowdown.dll.a"
+    "LDFLAGS=-Wl,--out-implib,liblowdown.dll.a"
   ];
 
   installTargets = [
diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix
index bbce9432aae4..ba458cf30419 100644
--- a/pkgs/by-name/ls/lsr/package.nix
+++ b/pkgs/by-name/ls/lsr/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://tangled.sh/@rockorager.dev/lsr";
diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index 49564b56d767..47343ecd6937 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -126,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 0cf2ca404349..9098b44ded57 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix
index 9eb99bbc2e2b..8c08df5c20cb 100644
--- a/pkgs/by-name/lu/lubelogger/package.nix
+++ b/pkgs/by-name/lu/lubelogger/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "lubelogger";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "hargata";
     repo = "lubelog";
     rev = "v${version}";
-    hash = "sha256-xoq1EgwA4MScuyVN4djqWPjlRXouMR3JnZviOIaDNUU=";
+    hash = "sha256-UzYPmNHvVYCQU2OfvJK7W5oLL0P1B7CrgMxbBvf3b28=";
   };
 
   projectFile = "CarCareTracker.sln";
diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 1ce2a73bd5b0..740eec364586 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix
index d4b6bd227292..2ec3cab0c39d 100644
--- a/pkgs/by-name/ly/lynx/package.nix
+++ b/pkgs/by-name/ly/lynx/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2"
+      "https://invisible-island.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
       "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
     ];
     hash = "sha256-c3S4mTbZkWaeEB9Ol/LJWSA24ejNqnuvwlmnerb7B84=";
diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix
index 6d984640b4d5..55ee34bf4fdc 100644
--- a/pkgs/by-name/ma/mactop/package.nix
+++ b/pkgs/by-name/ma/mactop/package.nix
@@ -25,7 +25,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips";
diff --git a/pkgs/by-name/ma/magento-cloud/package.nix b/pkgs/by-name/ma/magento-cloud/package.nix
index 15ba8a455f98..5f5298c5411b 100644
--- a/pkgs/by-name/ma/magento-cloud/package.nix
+++ b/pkgs/by-name/ma/magento-cloud/package.nix
@@ -39,7 +39,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   passthru = {
diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index 315685e76a36..40d240405eca 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix
index d70c39d7b8b5..f0d30309ee90 100644
--- a/pkgs/by-name/ma/mailutils/package.nix
+++ b/pkgs/by-name/ma/mailutils/package.nix
@@ -90,6 +90,13 @@ stdenv.mkDerivation (finalAttrs: {
     # https://github.com/NixOS/nixpkgs/issues/223967
     # https://lists.gnu.org/archive/html/bug-mailutils/2023-04/msg00000.html
     ./don-t-use-descrypt-password-in-the-test-suite.patch
+    # Fix build with gcc15
+    # https://lists.gnu.org/archive/html/bug-mailutils/2025-06/msg00000.html
+    (fetchpatch {
+      name = "mailutils-fix-sighandler-incompatible-pointer-types-gcc15.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/mailutils/-/raw/87c3614083260f52dd1222e872a1836f0ff9abe1/fix-build.patch";
+      hash = "sha256-RN62l5mYqtViEjXpAlQKWhFez1TPynRMj/1nvZkq5Gs=";
+    })
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
index c860048d10a2..74e72dc859e5 100644
--- a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
+++ b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
@@ -89,7 +89,7 @@ makeDocumentedCWrapper() {
 # ARGS: same as makeWrapper
 makeCWrapper() {
     local argv0 inherit_argv0 n params cmd main flags executable length
-    local uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf
+    local uses_sep_surround_check uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf
     local flagsBefore=() flagsAfter=()
     executable=$(escapeStringLiteral "$1")
     params=("$@")
@@ -122,9 +122,11 @@ makeCWrapper() {
             --prefix)
                 cmd=$(setEnvPrefix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}")
                 main="$main$cmd"$'\n'
+                uses_sep_surround_check=1
                 uses_prefix=1
                 uses_asprintf=1
                 uses_stdio=1
+                uses_string=1
                 uses_assert_success=1
                 uses_assert=1
                 n=$((n + 3))
@@ -133,9 +135,11 @@ makeCWrapper() {
             --suffix)
                 cmd=$(setEnvSuffix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}")
                 main="$main$cmd"$'\n'
+                uses_sep_surround_check=1
                 uses_suffix=1
                 uses_asprintf=1
                 uses_stdio=1
+                uses_string=1
                 uses_assert_success=1
                 uses_assert=1
                 n=$((n + 3))
@@ -208,6 +212,7 @@ makeCWrapper() {
     [ -z "$uses_stdio" ]    || printf '%s\n' "#include <stdio.h>"
     [ -z "$uses_string" ]   || printf '%s\n' "#include <string.h>"
     [ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)"
+    [ -z "$uses_sep_surround_check" ] || printf '\n%s\n' "$(setSepSurroundCheck)"
     [ -z "$uses_prefix" ] || printf '\n%s\n' "$(setEnvPrefixFn)"
     [ -z "$uses_suffix" ] || printf '\n%s\n' "$(setEnvSuffixFn)"
     [ -z "$resolve_argv0" ] || printf '\n%s\n' "$(resolveArgv0Fn)"
@@ -318,18 +323,59 @@ assertValidEnvName() {
     esac
 }
 
+setSepSurroundCheck() {
+    printf '%s' "\
+int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) {
+  unsigned long sep_len = strlen(sep);
+
+  // Check left side (if not at start)
+  if (env != ptr) {
+    if (ptr - env < sep_len)
+      return 0;
+    if (strncmp(sep, ptr - sep_len, sep_len) != 0) {
+      return 0;
+    }
+  }
+  // Check right side (if not at end)
+  char *end_ptr = ptr + len;
+  if (*end_ptr != '\0') {
+    if (strncmp(sep, ptr + len, sep_len) != 0) {
+      return 0;
+    }
+  }
+
+  return 1;
+}
+"
+}
+
 setEnvPrefixFn() {
     printf '%s' "\
 void set_env_prefix(char *env, char *sep, char *prefix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, \"%s%s%s\", prefix, sep, existing));
-        assert_success(setenv(env, val, 1));
-        free(val);
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_prefix = strstr(existing_env, prefix);
+    unsigned long prefix_len = strlen(prefix);
+    // If the prefix already exists, remove the original
+    if (existing_prefix && is_surrounded_by_sep(existing_env, existing_prefix, prefix_len, sep)) {
+      if (existing_env == existing_prefix) {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_prefix - existing_env;
+      assert_success(asprintf(&val, \"%s%s%.*s%s\", prefix, sep,
+                              n_before, existing_env,
+                              existing_prefix + prefix_len + sep_len));
     } else {
-        assert_success(setenv(env, prefix, 1));
+      assert_success(asprintf(&val, \"%s%s%s\", prefix, sep, existing_env));
     }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, prefix, 1));
+  }
 }
 "
 }
@@ -337,15 +383,32 @@ void set_env_prefix(char *env, char *sep, char *prefix) {
 setEnvSuffixFn() {
     printf '%s' "\
 void set_env_suffix(char *env, char *sep, char *suffix) {
-    char *existing = getenv(env);
-    if (existing) {
-        char *val;
-        assert_success(asprintf(&val, \"%s%s%s\", existing, sep, suffix));
-        assert_success(setenv(env, val, 1));
-        free(val);
+  char *existing_env = getenv(env);
+  if (existing_env) {
+    char *val;
+
+    char *existing_suffix = strstr(existing_env, suffix);
+    unsigned long suffix_len = strlen(suffix);
+    // If the suffix already exists, remove the original
+    if (existing_suffix && is_surrounded_by_sep(existing_env, existing_suffix, suffix_len, sep)) {
+      char *end_ptr = existing_suffix + suffix_len;
+      if (*end_ptr == '\0') {
+        return;
+      }
+      unsigned long sep_len = strlen(sep);
+      int n_before = existing_suffix - existing_env;
+      assert_success(asprintf(&val, \"%.*s%s%s%s\",
+                              n_before, existing_env,
+                              existing_suffix + suffix_len + sep_len,
+                              sep, suffix));
     } else {
-        assert_success(setenv(env, suffix, 1));
+      assert_success(asprintf(&val, \"%s%s%s\", existing_env, sep, suffix));
     }
+    assert_success(setenv(env, val, 1));
+    free(val);
+  } else {
+    assert_success(setenv(env, suffix, 1));
+  }
 }
 "
 }
diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix
index 098c0b25a1e5..9b402a080538 100644
--- a/pkgs/by-name/ma/markdown-code-runner/package.nix
+++ b/pkgs/by-name/ma/markdown-code-runner/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Configurable Markdown code runner that executes and optionally replaces code blocks using external commands";
diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix
index b82b4f42df79..a50c8d0246c3 100644
--- a/pkgs/by-name/ma/mask/package.nix
+++ b/pkgs/by-name/ma/mask/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^mask/(.*)$" ]; };
diff --git a/pkgs/by-name/ma/maskprocessor/package.nix b/pkgs/by-name/ma/maskprocessor/package.nix
index a146421a5982..08265f683b2f 100644
--- a/pkgs/by-name/ma/maskprocessor/package.nix
+++ b/pkgs/by-name/ma/maskprocessor/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 9f924166b63e..c410ee1d2ee3 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -168,7 +168,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/environmentd";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index 4c3a33b113d0..a4bfa13e31ba 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -29,7 +29,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 50fe894d0711..3b5a046611ca 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -87,7 +87,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   passthru.updateScript = nix-update-script {
     extraArgs = [
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 51d013195197..0ef8df0dc624 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.9.6";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-hMMX59nq9Wusb0XZb8i5/EmQiPL4WopuZX7maycj0J4=";
+    hash = "sha256-txbMVkbws/3mvYsxf332WhTymsVdr6JlgQoi85e4pgE=";
   };
 
-  cargoHash = "sha256-hNFbRtt/sVlEffu7RgXxC1NHzakP8miMyHIV/cf4sfM=";
+  cargoHash = "sha256-2eLzT9Ozz7p43hbysoE5isLuithqJhvo8TfRZnklzf4=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index 7f087df9bc88..f20cc2881c08 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -67,7 +67,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://github.com/mautrix/signal";
diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix
index 141c9617654d..72b53cf8e207 100644
--- a/pkgs/by-name/ma/mautrix-slack/package.nix
+++ b/pkgs/by-name/ma/mautrix-slack/package.nix
@@ -30,7 +30,6 @@ buildGoModule rec {
   tags = lib.optional withGoolm "goolm";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   ldflags = [
diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix
index 020435e7a420..7de0684d118c 100644
--- a/pkgs/by-name/ma/mawk/package.nix
+++ b/pkgs/by-name/ma/mawk/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchurl {
     urls = [
       "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz"
-      "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz"
+      "https://invisible-island.net/archives/mawk/mawk-${finalAttrs.version}.tgz"
     ];
     hash = "sha256-bh/ejuetilwVOCMWhj/WtMbSP6t4HdWrAXf/o+6arlw=";
   };
diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix
index a9e69f8e4146..4f6b295178a0 100644
--- a/pkgs/by-name/mb/mbake/package.nix
+++ b/pkgs/by-name/mb/mbake/package.nix
@@ -40,7 +40,6 @@ python3Packages.buildPythonApplication rec {
     python3Packages.pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "mbake" ];
 
diff --git a/pkgs/by-name/mc/mcp-k8s-go/package.nix b/pkgs/by-name/mc/mcp-k8s-go/package.nix
index 131cd879243a..7b1096d835c5 100644
--- a/pkgs/by-name/mc/mcp-k8s-go/package.nix
+++ b/pkgs/by-name/mc/mcp-k8s-go/package.nix
@@ -30,7 +30,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "MCP server connecting to Kubernetes";
diff --git a/pkgs/by-name/md/md-lsp/package.nix b/pkgs/by-name/md/md-lsp/package.nix
index 670f57f85754..37fc33ab9c9b 100644
--- a/pkgs/by-name/md/md-lsp/package.nix
+++ b/pkgs/by-name/md/md-lsp/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-YS7ANZlxlRpl4ww/EJM57MTb+5WAW4mH6cQoziFCv18=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix
index 4ab03088820b..206fc84d7d05 100644
--- a/pkgs/by-name/md/mdbook-plugins/package.nix
+++ b/pkgs/by-name/md/mdbook-plugins/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix
index 9a581078b72a..1fe9a359e224 100644
--- a/pkgs/by-name/md/mdbtools/package.nix
+++ b/pkgs/by-name/md/mdbtools/package.nix
@@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/mdb-ver";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix
index 046b1a37a8bb..d91c0553c703 100644
--- a/pkgs/by-name/md/mdq/package.nix
+++ b/pkgs/by-name/md/mdq/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Like jq but for Markdown: find specific elements in a md doc";
diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix
index 5052fd5b5e04..bc00dad687e9 100644
--- a/pkgs/by-name/me/meowlnir/package.nix
+++ b/pkgs/by-name/me/meowlnir/package.nix
@@ -25,7 +25,6 @@ buildGoModule rec {
   doCheck = true;
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix
index c6137a31a783..fc624c5e238e 100644
--- a/pkgs/by-name/me/mercurial/package.nix
+++ b/pkgs/by-name/me/mercurial/package.nix
@@ -63,6 +63,10 @@ let
         null;
     cargoRoot = if rustSupport then "rust" else null;
 
+    # enable building with Python 3.14
+    # FIXME remove once PyO3 is updated in Cargo.lock
+    env.PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1;
+
     propagatedBuildInputs =
       lib.optional re2Support google-re2
       ++ lib.optional gitSupport pygit2
diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 4c40ea86e905..8945328f808b 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -28,8 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   cargoBuildFlags = [
     # don't install the `mgf_dev`
     "--bin"
diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix
index b8589c546eb4..81d1daf470b3 100644
--- a/pkgs/by-name/me/metal-cli/package.nix
+++ b/pkgs/by-name/me/metal-cli/package.nix
@@ -42,7 +42,6 @@ buildGoModule (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/metal";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Official Equinix Metal CLI";
diff --git a/pkgs/by-name/mi/migrate-to-uv/package.nix b/pkgs/by-name/mi/migrate-to-uv/package.nix
index eb828604c790..fb3d2f905ab2 100644
--- a/pkgs/by-name/mi/migrate-to-uv/package.nix
+++ b/pkgs/by-name/mi/migrate-to-uv/package.nix
@@ -34,7 +34,6 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix
index 587229b2c9b9..8dc0f3b3631b 100644
--- a/pkgs/by-name/mi/minimap2/package.nix
+++ b/pkgs/by-name/mi/minimap2/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix
index 1ac108ceb8af..cb50680ab54e 100644
--- a/pkgs/by-name/mi/minio-warp/package.nix
+++ b/pkgs/by-name/mi/minio-warp/package.nix
@@ -36,7 +36,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index bc621976bb1d..1dd14eee2dd7 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix
index 3543f9f9baec..69877851fcd2 100644
--- a/pkgs/by-name/mi/miro/package.nix
+++ b/pkgs/by-name/mi/miro/package.nix
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index 3bfbd81c62d4..83f5f4946376 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -177,7 +177,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/mistralrs-server";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/mn/mnamer/package.nix b/pkgs/by-name/mn/mnamer/package.nix
index 5facfc460980..bd2b297806b5 100644
--- a/pkgs/by-name/mn/mnamer/package.nix
+++ b/pkgs/by-name/mn/mnamer/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mnamer";
-  version = "2.5.5";
+  version = "2.6.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "jkwill87";
     repo = "mnamer";
     tag = version;
-    sha256 = "sha256-qQu5V1GOsbrR00HOrot6TTAkc3KRasBPDEU7ZojUBio=";
+    sha256 = "sha256-lu1DWbR7LkaRddeAAHBWM61cnEZG4KVZdQWWRsbghb8=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/mo/mold-unwrapped/package.nix b/pkgs/by-name/mo/mold-unwrapped/package.nix
index 6c8d2f36e645..9b0d0c678a79 100644
--- a/pkgs/by-name/mo/mold-unwrapped/package.nix
+++ b/pkgs/by-name/mo/mold-unwrapped/package.nix
@@ -56,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index 042f8ecfc348..126f9fed5831 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = stdenv.hostPlatform.isDarwin;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/mongod";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     sources = {
diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 529ff04a6cab..158e2b95d393 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -12,14 +12,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "monophony";
-  version = "4.2.1";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
     tag = "v${version}";
-    hash = "sha256-3RuAFg+9Mi+tBuLmXyWlFFNOfrUvrkNvedo9Au3tMYU=";
+    hash = "sha256-w2ev/fpswaNcutxg2zMwrtFkulMbbG7BUm3L8qlnZKk=";
   };
 
   sourceRoot = "${src.name}/source";
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index 2b208fb331c7..e5ffb12c30fb 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -122,12 +122,15 @@ stdenv.mkDerivation rec {
     "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ];
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = toString [
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-std=gnu17"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
       "-Wno-error=implicit-function-declaration"
       "-Wno-error=incompatible-function-pointer-types"
-    ];
-  };
+    ]
+  );
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix
index 037bc80413c0..633a19fd9f1c 100644
--- a/pkgs/by-name/mo/mount-zip/package.nix
+++ b/pkgs/by-name/mo/mount-zip/package.nix
@@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix
index 86fbbd5d8e91..8a45d1202a23 100644
--- a/pkgs/by-name/mp/mpir/package.nix
+++ b/pkgs/by-name/mp/mpir/package.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
       url = "https://github.com/wbhart/mpir/commit/4ff3b770cbf86e29b75d12c13e8b854c74bccc5a.patch";
       hash = "sha256-dCB2+1IYTGzHUQkDUF4gqvR1xoMPEYVPLGE+EP2wLL4=";
     })
+    (fetchpatch {
+      url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/a67361db03777a80446ffa8e512f26edb299268f/community/mpir/gcc15.patch";
+      hash = "sha256-8RqMHYqDowHytgBd4RsGEOLkk+spYS+iqWQL2kzGAtI=";
+    })
   ];
 
   configureFlags = [ "--enable-cxx" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ];
diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix
index 3cab390e3e83..ce7229790821 100644
--- a/pkgs/by-name/mp/mpls/package.nix
+++ b/pkgs/by-name/mp/mpls/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix
index 1cdb821befac..416f9c76f93c 100644
--- a/pkgs/by-name/mp/mprocs/package.nix
+++ b/pkgs/by-name/mp/mprocs/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix
index 3c20016fcb0e..8b9a2ed13745 100644
--- a/pkgs/by-name/ms/msedit/package.nix
+++ b/pkgs/by-name/ms/msedit/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = false;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/edit";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix
index 00371de9e1ad..34c1984f756e 100644
--- a/pkgs/by-name/mu/mubeng/package.nix
+++ b/pkgs/by-name/mu/mubeng/package.nix
@@ -28,7 +28,6 @@ buildGoModule rec {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Proxy checker and IP rotator";
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index af6e38d4cf17..640a837fcdbd 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -20,7 +20,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Website link checker which scrapes and inspects all pages in a website recursively";
diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix
index eb911d0f767b..f1e2fd3474f1 100644
--- a/pkgs/by-name/mu/mullvad-vpn/package.nix
+++ b/pkgs/by-name/mu/mullvad-vpn/package.nix
@@ -147,7 +147,6 @@ stdenv.mkDerivation {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix
index 3e119e11187a..cc164f0588d6 100644
--- a/pkgs/by-name/mu/multiqc/package.nix
+++ b/pkgs/by-name/mu/multiqc/package.nix
@@ -119,8 +119,6 @@ python3Packages.buildPythonApplication rec {
       addBinToPathHook
     ];
 
-  versionCheckProgramArg = "--version";
-
   disabledTests =
     # On darwin, kaleido fails to starts
     lib.optionals (stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix
index 82615f1db76d..ca61ba16713c 100644
--- a/pkgs/by-name/n9/n98-magerun2/package.nix
+++ b/pkgs/by-name/n9/n98-magerun2/package.nix
@@ -19,7 +19,6 @@ php83.buildComposerProject2 (finalAttrs: {
   vendorHash = "sha256-0Bk01aU3vicwk9swkv+8VZxcPdaEMOOtp9niNfPfQyA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix
index 8370b2647c4c..a2c84d130c39 100644
--- a/pkgs/by-name/na/nak/package.nix
+++ b/pkgs/by-name/na/nak/package.nix
@@ -30,7 +30,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/na/nasm/package.nix b/pkgs/by-name/na/nasm/package.nix
index 7092f5b57a61..dcda488d7e17 100644
--- a/pkgs/by-name/na/nasm/package.nix
+++ b/pkgs/by-name/na/nasm/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nasm";
-  version = "2.16.03";
+  version = "3.01";
 
   src = fetchurl {
     url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-FBKhx2C70F2wJrbA0WV6/9ZjHNCmPN229zzG1KphYUg=";
+    hash = "sha256-tzJMvobnZ7ZfJvRn7YsSrYDhJOPMuJB2hVyY5Dqe3dQ=";
   };
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix
index 14f3fee1db43..39b6d185c02d 100644
--- a/pkgs/by-name/na/natscli/package.nix
+++ b/pkgs/by-name/na/natscli/package.nix
@@ -36,7 +36,6 @@ buildGoModule rec {
   '';
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "NATS Command Line Interface";
diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix
index 2e711ecf7c9b..7a1b855b0b72 100644
--- a/pkgs/by-name/nb/nbqa/package.nix
+++ b/pkgs/by-name/nb/nbqa/package.nix
@@ -75,7 +75,6 @@ let
         addBinToPathHook
         versionCheckHook
       ];
-    versionCheckProgramArg = "--version";
 
     disabledTests = [
       # Test data not found
diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix
index 179e92ff781d..c8315d24b689 100644
--- a/pkgs/by-name/nb/nbtscanner/package.nix
+++ b/pkgs/by-name/nb/nbtscanner/package.nix
@@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "NetBIOS scanner written in Rust";
     homepage = "https://github.com/jonkgrimes/nbtscanner";
diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 8e9003322412..f1cc506086fb 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix
index b71b8e4b1579..332ce4ece99e 100644
--- a/pkgs/by-name/nc/ncompress/package.nix
+++ b/pkgs/by-name/nc/ncompress/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,6 +16,26 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0=";
   };
 
+  patches = [
+    # dependencies for gcc15 patch
+    (fetchpatch {
+      url = "https://github.com/vapier/ncompress/commit/af7d29d87ddf8b2002dad41152efa94e9c825b35.patch";
+      excludes = [ "Changes" ];
+      hash = "sha256-zc+59RHVt5/aw5a4OVnOmXyFdeoshqbARG2upDujEk4=";
+    })
+    (fetchpatch {
+      url = "https://github.com/vapier/ncompress/commit/aa359df10ec29a56c12f6e5c2bcec8d8ecfa2740.patch";
+      excludes = [ "Changes" ];
+      hash = "sha256-wtZJBSfJ6QmYK+ywijQ263PnjGwD2mXcvFWvBNeODpc=";
+    })
+    # fix build against gcc15
+    # https://github.com/vapier/ncompress/pull/40
+    (fetchpatch {
+      url = "https://github.com/vapier/ncompress/pull/40/commits/90810a7f11bf157b479c23c0fe6cee0bebec15c6.patch";
+      hash = "sha256-aqIofwTxlg2lq2+ZBhG6X6MKUoafHrADZlw7Avj8anQ=";
+    })
+  ];
+
   makeFlags = [ "PREFIX=$(out)" ];
   installTargets = "install_core";
 
@@ -23,7 +44,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://ncompress.sourceforge.net/";
+    homepage = "https://vapier.github.io/ncompress/";
     license = lib.licenses.publicDomain;
     description = "Fast, simple LZW file compressor";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index 0bf753a556b1..32f0c134cfb0 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -3,7 +3,6 @@
   curl,
   dbmate,
   fetchFromGitHub,
-  go,
   lib,
   minio,
   minio-client,
@@ -26,14 +25,6 @@ let
       "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
     ];
 
-    # XXX: ncps is built with Go 1.25.5 that is available in release-25.11 but
-    # master is currently still using 1.25.4 (update waiting in the
-    # staging/staging-next branches.) This is a workaround for this issue and
-    # will automatically becomes no-op once Go is updated.
-    preBuild = lib.optionalString (go.version == "1.25.4") ''
-      sed -e 's:go 1.25.5:go 1.25.4:g' -i go.mod
-    '';
-
     vendorHash = "sha256-3YPKlz7+x7nYCqKmOroaiUyZGKIQMGFxcNyPnrA9Tio=";
 
     doCheck = true;
diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix
index 9015a737ada8..ff8d50a0ddd3 100644
--- a/pkgs/by-name/ne/neon/package.nix
+++ b/pkgs/by-name/ne/neon/package.nix
@@ -22,12 +22,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.35.0";
+  version = "0.36.0";
   pname = "neon";
 
   src = fetchurl {
     url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-FGevtz814/XQ6f1wYowUy6Jmpl4qH7bj+UXuM4XIWVs=";
+    sha256 = "sha256-cMx/Ku694mOQbhhbJm4E4N6Ss45fTszL9h6LeRd8Lwc=";
   };
 
   patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ];
diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix
index 87e645bedd53..06efddae9cfa 100644
--- a/pkgs/by-name/ne/neovim-node-client/package.nix
+++ b/pkgs/by-name/ne/neovim-node-client/package.nix
@@ -38,7 +38,6 @@ buildNpmPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 0059228a3da7..43546f509ff6 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -236,7 +236,6 @@ stdenv.mkDerivation (
       versionCheckHook
     ];
     versionCheckProgram = "${placeholder "out"}/bin/nvim";
-    versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
     passthru = {
diff --git a/pkgs/by-name/ne/netboot/package.nix b/pkgs/by-name/ne/netboot/package.nix
index 48c427cb4134..fea31de59dcc 100644
--- a/pkgs/by-name/ne/netboot/package.nix
+++ b/pkgs/by-name/ne/netboot/package.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/nbdbtool";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix
index da71033b90e1..f08dfe02bcfa 100644
--- a/pkgs/by-name/ne/netcap/package.nix
+++ b/pkgs/by-name/ne/netcap/package.nix
@@ -74,7 +74,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/net";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ne/netperf/package.nix b/pkgs/by-name/ne/netperf/package.nix
index 53081ccff956..ebcce6d49080 100644
--- a/pkgs/by-name/ne/netperf/package.nix
+++ b/pkgs/by-name/ne/netperf/package.nix
@@ -26,6 +26,14 @@ stdenv.mkDerivation {
       url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch";
       sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4=";
     })
+    # Fix build with gcc15
+    # https://github.com/HewlettPackard/netperf/pull/86
+    # https://salsa.debian.org/debian/netperf/-/commit/a278c7a8eb24cb45dc500393c6e8749a3427f650
+    (fetchpatch {
+      name = "netperf-fix-build-with-gcc15.patch";
+      url = "https://salsa.debian.org/debian/netperf/-/raw/a278c7a8eb24cb45dc500393c6e8749a3427f650/debian/patches/0004-Fix-build-with-gcc-15.patch";
+      hash = "sha256-fv/cx1rkUQRqyluWQKO5q5sNWPYcyZUz2NNYwalDizQ=";
+    })
   ];
 
   buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios;
diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix
index a3a62ffa0e5c..161a32206c79 100644
--- a/pkgs/by-name/ng/nghttp2/package.nix
+++ b/pkgs/by-name/ng/nghttp2/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
 
   # Optional dependencies
-  enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic,
+  enableApp ? with stdenv.hostPlatform; !(isWindows || isCygwin) && !isStatic,
   c-aresMinimal,
   libev,
   openssl,
diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix
index cff35f454d3a..410708dbb7f0 100644
--- a/pkgs/by-name/ng/nghttp3/package.nix
+++ b/pkgs/by-name/ng/nghttp3/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nghttp3";
-  version = "1.12.0";
+  version = "1.13.1";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-KFl4NTevIT1npc5Cd923nIlBrUXtv6XM3VLZz0/6Qi0=";
+    hash = "sha256-8lH+Vm4oIdz9BChVN15QsevqxfHKeUjQDiFWPFgiHiA=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix
index cb7aee0da561..84f38ac203db 100644
--- a/pkgs/by-name/ng/nginx-language-server/package.nix
+++ b/pkgs/by-name/ng/nginx-language-server/package.nix
@@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index c02bbef5f50f..fb788bf21a68 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index cb5b5a0f70e9..6d50a02eb1e2 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -76,7 +76,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix
index 0f1b424db2a0..6f15be615ace 100644
--- a/pkgs/by-name/ni/ninja/package.nix
+++ b/pkgs/by-name/ni/ninja/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   version =
     {
       "1.11" = "1.11.1";
-      latest = "1.13.1";
+      latest = "1.13.2";
     }
     .${ninjaRelease};
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       {
         # TODO: Remove Ninja 1.11 as soon as possible.
         "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
-        latest = "sha256-GhAF5wUT19E02ZekW+ywsCMVGYrt56hES+MHCH4lNG4=";
+        latest = "sha256-D9HsIjv8EJ1qAdXFAKy260K77cCvopgQ2Fx6uXpt6VI=";
       }
       .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
   };
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 88298d8da92e..e5358ff18462 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -124,7 +124,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   checkFlags = [ "--skip=::egl" ];
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix
index e97b3da9815b..74ef6fa07bd3 100644
--- a/pkgs/by-name/ni/nitter/package.nix
+++ b/pkgs/by-name/ni/nitter/package.nix
@@ -10,13 +10,13 @@
 buildNimPackage (
   finalAttrs: prevAttrs: {
     pname = "nitter";
-    version = "0-unstable-2025-10-12";
+    version = "0-unstable-2025-12-24";
 
     src = fetchFromGitHub {
       owner = "zedeus";
       repo = "nitter";
-      rev = "662ae90e2246c8a01c811f68750b7e5033e0fa69";
-      hash = "sha256-icjbAG/VkhzgKO2dyJYL/yc1VrVmU25Ymkz/41Ckd3M=";
+      rev = "a92e79ebc3581702dc427434a782a5fc1d28cc91";
+      hash = "sha256-bCogvVO99HPiZZOMDd0IDBNGBKIZ+My493SnbK+6HxM=";
     };
 
     lockFile = ./lock.json;
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 5504e02a8ddc..e6a84d96ea5e 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -85,7 +85,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ni/nix-prefetch/package.nix b/pkgs/by-name/ni/nix-prefetch/package.nix
index a1ee9754a661..fc3096692aa1 100644
--- a/pkgs/by-name/ni/nix-prefetch/package.nix
+++ b/pkgs/by-name/ni/nix-prefetch/package.nix
@@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 305c6d03bca6..74e03c8124a0 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   makeWrapperArgs =
     let
diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 032529630b86..8766afcc859a 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
@@ -21,6 +22,9 @@ buildGoModule rec {
     "-X 'main.version=${version}'"
   ];
 
+  # only run xdg-specific test on linux
+  checkFlags = lib.optional stdenv.hostPlatform.isDarwin "-skip=^TestNewDefaultWithXDGConfigHome$";
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix
index 0c792869e96f..02e7b34175de 100644
--- a/pkgs/by-name/no/noseyparker/package.nix
+++ b/pkgs/by-name/no/noseyparker/package.nix
@@ -81,7 +81,6 @@ rustPlatform.buildRustPackage rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/noseyparker-cli";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Find secrets and sensitive information in textual data";
diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix
index a8866b96c9cc..7c1af81f15eb 100644
--- a/pkgs/by-name/nr/nrfutil/package.nix
+++ b/pkgs/by-name/nr/nrfutil/package.nix
@@ -81,7 +81,6 @@ let
           nativeInstallCheckInputs = [
             versionCheckHook
           ];
-          versionCheckProgramArg = "--version";
 
           meta = sharedMeta // {
             mainProgram = name;
diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index 74568d49b6ad..21fb513d6b35 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/nv/nvi/debian-patches.nix b/pkgs/by-name/nv/nvi/debian-patches.nix
index be60d0939eb2..87559570cee4 100644
--- a/pkgs/by-name/nv/nvi/debian-patches.nix
+++ b/pkgs/by-name/nv/nvi/debian-patches.nix
@@ -1,6 +1,6 @@
 # Generated by debian-patches.sh from debian-patches.txt
 let
-  prefix = "https://sources.debian.org/data/main/n/nvi/1.81.6-23/debian/patches";
+  prefix = "https://sources.debian.org/data/main/n/nvi/1.81.6-24/debian/patches";
 in
 [
   {
@@ -167,4 +167,8 @@ in
     url = "${prefix}/0041-Fix-FTBFS-because-of-incompatible-pointer-type-error.patch";
     sha256 = "1qvzrxfbk3ylr6cc3y94rlgfbdj2z14dhh6m09drkxb4bqcp2awv";
   }
+  {
+    url = "${prefix}/0042-Fix-ftbfs-with-GCC-15.patch";
+    sha256 = "13v5ydsnmbfqww2j8v13r83iz9zkk2z5wd9qccz7sb5wzm32zs59";
+  }
 ]
diff --git a/pkgs/by-name/nv/nvi/debian-patches.txt b/pkgs/by-name/nv/nvi/debian-patches.txt
index 32e7b4a8448b..21089f6984fe 100644
--- a/pkgs/by-name/nv/nvi/debian-patches.txt
+++ b/pkgs/by-name/nv/nvi/debian-patches.txt
@@ -1,4 +1,4 @@
-nvi/1.81.6-23
+nvi/1.81.6-24
 01additional_upstream_data.patch
 03db4.patch
 04confdefs.patch
@@ -40,3 +40,4 @@ upstream/0038-Fix-A-word-search-for-keywords-starting-with-a-non-w.patch
 0039-Add-function-prototypes-to-fix-implicit-function-dec.patch
 0040-Add-more-function-prototypes-to-fix-Wimplicit-functi.patch
 0041-Fix-FTBFS-because-of-incompatible-pointer-type-error.patch
+0042-Fix-ftbfs-with-GCC-15.patch
diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix
index 92af62a522a9..8335c908661b 100644
--- a/pkgs/by-name/nv/nvidia_oc/package.nix
+++ b/pkgs/by-name/nv/nvidia_oc/package.nix
@@ -29,8 +29,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Simple command line tool to overclock Nvidia GPUs using the NVML library on Linux";
     homepage = "https://github.com/Dreaming-Codes/nvidia_oc";
diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix
index b26d69abe728..b955732b809e 100644
--- a/pkgs/by-name/nv/nvitop/package.nix
+++ b/pkgs/by-name/nv/nvitop/package.nix
@@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "nvitop" ];
 
diff --git a/pkgs/by-name/nv/nvme-rs/package.nix b/pkgs/by-name/nv/nvme-rs/package.nix
index dfda2ee05949..9e1859688010 100644
--- a/pkgs/by-name/nv/nvme-rs/package.nix
+++ b/pkgs/by-name/nv/nvme-rs/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix
index cc731edd50d3..19897468082b 100644
--- a/pkgs/by-name/nv/nvrh/package.nix
+++ b/pkgs/by-name/nv/nvrh/package.nix
@@ -35,7 +35,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
index 1f4c7bd1d806..191de4d0a340 100644
--- a/pkgs/by-name/oa/oauth2-proxy/package.nix
+++ b/pkgs/by-name/oa/oauth2-proxy/package.nix
@@ -22,7 +22,6 @@ buildGoModule rec {
   ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/ob/obj2tiles/package.nix b/pkgs/by-name/ob/obj2tiles/package.nix
index ceb363537724..7ee5817026c2 100644
--- a/pkgs/by-name/ob/obj2tiles/package.nix
+++ b/pkgs/by-name/ob/obj2tiles/package.nix
@@ -19,7 +19,6 @@ buildDotnetModule (finalAttrs: {
   nugetDeps = ./deps.json;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/Obj2Tiles";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   meta = {
     description = "Converts OBJ files to OGC 3D tiles by performing splitting, decimation and conversion";
diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix
index 5201ab07a5a7..4b2f8c83d024 100644
--- a/pkgs/by-name/ob/obs-do/package.nix
+++ b/pkgs/by-name/ob/obs-do/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-V5j+zi7ogwxs2kCMRjDD7pF8yBWE6p7J2UAOXeJGbFw=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix
index 1a3ef373e127..f9c5bc2f1144 100644
--- a/pkgs/by-name/oc/ocsinventory-agent/package.nix
+++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   fetchpatch,
   makeWrapper,
-  shortenPerlShebang,
   coreutils,
   dmidecode,
   findutils,
@@ -43,7 +42,7 @@ perlPackages.buildPerlPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  nativeBuildInputs = [ makeWrapper ];
 
   buildInputs =
     with perlPackages;
@@ -94,10 +93,7 @@ perlPackages.buildPerlPackage rec {
         util-linux # last, lsblk, mount
       ];
     in
-    lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/ocsinventory-agent
     ''
-    + ''
       wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies}
     '';
 
diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix
index 4679f16def11..02b7bda379ee 100644
--- a/pkgs/by-name/oc/ocsp-server/package.nix
+++ b/pkgs/by-name/oc/ocsp-server/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix
index 10d643676f05..201ea4ed7d66 100644
--- a/pkgs/by-name/ok/oklch-color-picker/package.nix
+++ b/pkgs/by-name/ok/oklch-color-picker/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 4520411b42c4..2eab4fa97557 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -269,7 +269,6 @@ goBuild (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
   versionCheckKeepEnvironment = "HOME";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix
index b22304aa2591..ebf206ee8489 100644
--- a/pkgs/by-name/om/omnictl/package.nix
+++ b/pkgs/by-name/om/omnictl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "omnictl";
-  version = "1.4.4";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "omni";
     rev = "v${version}";
-    hash = "sha256-0dj8z7u0drd7cVDgprwEHKLZJyPyZmhDqk6nEhtr62s=";
+    hash = "sha256-p2DKfDf76xr42LLvtVFrSfxJkrpOeFUhtrViI/cD66Y=";
   };
 
-  vendorHash = "sha256-RdwdocSQK54f8vD7waBzYJ4DsbgdBDpUVlk4MVn6tvQ=";
+  vendorHash = "sha256-lVUe1XQr46uzx3kfj7KmoiGFUGEb7UT16IQSI8In8RU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/om/omnix/package.nix b/pkgs/by-name/om/omnix/package.nix
index 31f363258f1f..8c9b417100c7 100644
--- a/pkgs/by-name/om/omnix/package.nix
+++ b/pkgs/by-name/om/omnix/package.nix
@@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/om";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix
index 927489863a7d..34b43ec46047 100644
--- a/pkgs/by-name/on/onetbb/package.nix
+++ b/pkgs/by-name/on/onetbb/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     hwloc
   ];
 
-  doCheck = true;
+  doCheck = !stdenv.hostPlatform.isStatic;
 
   dontUseNinjaCheck = true;
 
@@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false)
+    (lib.cmakeBool "TBB_TEST" finalAttrs.finalPackage.doCheck)
   ];
 
   env = {
@@ -99,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       template-based runtime library can help you harness the latent
       performance of multi-core processors.
     '';
-    platforms = lib.platforms.all;
+    platforms = lib.subtractLists lib.platforms.cygwin lib.platforms.all;
     # oneTBB does not support static builds
     # "You are building oneTBB as a static library. This is highly discouraged and such configuration is not supported. Consider building a dynamic library to avoid unforeseen issues."
     # https://github.com/uxlfoundation/oneTBB/blob/db7891a246cafbb90719c3dee497d96889ca692b/CMakeLists.txt#L160
diff --git a/pkgs/by-name/op/openapi-down-convert/package.nix b/pkgs/by-name/op/openapi-down-convert/package.nix
index 03ef6be0ed82..559fdc47d5da 100644
--- a/pkgs/by-name/op/openapi-down-convert/package.nix
+++ b/pkgs/by-name/op/openapi-down-convert/package.nix
@@ -29,7 +29,6 @@ buildNpmPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index a1c867874c1e..aca2c8584063 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -57,7 +57,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/bao";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/op/opencc/package.nix b/pkgs/by-name/op/opencc/package.nix
index a3b116d34b8d..820da80aa8dd 100644
--- a/pkgs/by-name/op/opencc/package.nix
+++ b/pkgs/by-name/op/opencc/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   python3,
   opencc,
@@ -20,6 +21,18 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic=";
   };
 
+  patches = [
+    # fix build with gcc15 by adding cstdint include
+    (fetchpatch {
+      url = "https://github.com/BYVoid/OpenCC/commit/3d3adca2dbee0da7d33eb3c3563299fcbd2255e3.patch";
+      hash = "sha256-4ZQxVnEHnNBKtEu0IPnSC/ZX7gm2cJ1Ss00PvCZr5P8=";
+    })
+    (fetchpatch {
+      url = "https://github.com/BYVoid/OpenCC/commit/72cae18cfe4272f2b11c9ec1c44d6af7907abcab.patch";
+      hash = "sha256-Cd95AsW/tLk2l8skxqfEfQUm0t23G4ocoirauwMbuwk=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     python3
diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix
index fc57a566c3fd..3bb3e6081f90 100644
--- a/pkgs/by-name/op/openfortivpn/package.nix
+++ b/pkgs/by-name/op/openfortivpn/package.nix
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix
index 1edf8370b443..ccfc5f180726 100644
--- a/pkgs/by-name/op/openscad-lsp/package.nix
+++ b/pkgs/by-name/op/openscad-lsp/package.nix
@@ -24,8 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix
index c7e090b03d47..09eecdbd3606 100644
--- a/pkgs/by-name/op/openscap/package.nix
+++ b/pkgs/by-name/op/openscap/package.nix
@@ -36,7 +36,7 @@
   perl,
   doxygen,
   pkg-config,
-  perl538Packages,
+  perlPackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    with perl538Packages;
+    with perlPackages;
     [
       XMLXPath
       LinuxACL
diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix
index a433db6cf822..91194e4ef660 100644
--- a/pkgs/by-name/op/opkssh/package.nix
+++ b/pkgs/by-name/op/opkssh/package.nix
@@ -24,7 +24,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix
index 2002a48e8d5a..821742994cfe 100644
--- a/pkgs/by-name/op/opnborg/package.nix
+++ b/pkgs/by-name/op/opnborg/package.nix
@@ -30,7 +30,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/opnborg";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 10be6a1e2d21..ca8e98654831 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index 931e7b19bbbd..f9c24dd77bc5 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -40,7 +40,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index fae2f54fe6c2..614963d2c87c 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -61,7 +61,6 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ov/overpush/package.nix b/pkgs/by-name/ov/overpush/package.nix
index d7f6cc8a4579..114de0299538 100644
--- a/pkgs/by-name/ov/overpush/package.nix
+++ b/pkgs/by-name/ov/overpush/package.nix
@@ -34,7 +34,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index d9252d2d35a0..b1603cac0eb2 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 22215b1749b2..3134678c63c0 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index 570ba547d382..79c1fa0877c5 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -37,7 +37,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "HOME" ];
 
   meta = {
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
index a012d6ed43df..ee6085b37d11 100644
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   # packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154
diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
index f430d699ace3..863ee69a708c 100644
--- a/pkgs/by-name/pa/pahole/package.nix
+++ b/pkgs/by-name/pa/pahole/package.nix
@@ -14,10 +14,10 @@
 
 stdenv.mkDerivation rec {
   pname = "pahole";
-  version = "1.30";
+  version = "1.31";
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz";
-    hash = "sha256-JF4KnI05uOlPuunJuetX/fX3ZRT6TDXdjCNG9/ufkgI=";
+    hash = "sha256-Afy0SysuDbTOa8H3m4hexy12Rmuv2NZL2wHfO4JtKL0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix
index aca01a279a31..09974b1d8b11 100644
--- a/pkgs/by-name/pa/pakku/package.nix
+++ b/pkgs/by-name/pa/pakku/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = ./update.sh;
 
diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix
index a65c15564fd2..140bee6b6f44 100644
--- a/pkgs/by-name/pa/paps/package.nix
+++ b/pkgs/by-name/pa/paps/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/pa/paq/package.nix b/pkgs/by-name/pa/paq/package.nix
index 72e17b2dd54f..ef9125d814f5 100644
--- a/pkgs/by-name/pa/paq/package.nix
+++ b/pkgs/by-name/pa/paq/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-M3UtXCX4caYYaXoS8F2kKheP5qX5xac2WPNCnw94B6Q=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix
index 343b4c79c470..15c73ff7ebe3 100644
--- a/pkgs/by-name/pa/paratest/package.nix
+++ b/pkgs/by-name/pa/paratest/package.nix
@@ -23,7 +23,6 @@
     nativeInstallCheckInputs = [
       versionCheckHook
     ];
-    versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
     meta = {
diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix
index cc62c5066068..3ab66f0be613 100644
--- a/pkgs/by-name/pa/parseable/package.nix
+++ b/pkgs/by-name/pa/parseable/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
   buildFeatures = [ "rdkafka/dynamic-linking" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix
index af0b7f3d1a68..cdeb2f959bf0 100644
--- a/pkgs/by-name/pa/patchy/package.nix
+++ b/pkgs/by-name/pa/patchy/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-QaFIu7YVixQsDGL5fjQ3scKMyr0hw8lEWVc80EMTBB8=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix
index 771ffae430c5..bfc0ef13296d 100644
--- a/pkgs/by-name/pa/patroni/package.nix
+++ b/pkgs/by-name/pa/patroni/package.nix
@@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix
index 9fc769253e4e..54ee72547dc0 100644
--- a/pkgs/by-name/pd/pdepend/package.nix
+++ b/pkgs/by-name/pd/pdepend/package.nix
@@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/pdepend/pdepend/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/by-name/pd/pdftowrite/package.nix b/pkgs/by-name/pd/pdftowrite/package.nix
index 700efbdde5ba..6d4bd9bebeef 100644
--- a/pkgs/by-name/pd/pdftowrite/package.nix
+++ b/pkgs/by-name/pd/pdftowrite/package.nix
@@ -78,7 +78,6 @@ python3Packages.buildPythonApplication rec {
     '';
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/pf/pfetch/package.nix b/pkgs/by-name/pf/pfetch/package.nix
index 700c6778e6a3..6e4b44fe5302 100644
--- a/pkgs/by-name/pf/pfetch/package.nix
+++ b/pkgs/by-name/pf/pfetch/package.nix
@@ -26,7 +26,6 @@ stdenvNoCC.mkDerivation rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix
index 05a491f51baa..0721b37acb20 100644
--- a/pkgs/by-name/pg/pgformatter/package.nix
+++ b/pkgs/by-name/pg/pgformatter/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   perlPackages,
   fetchFromGitHub,
-  shortenPerlShebang,
 }:
 
 perlPackages.buildPerlPackage rec {
@@ -33,11 +31,6 @@ perlPackages.buildPerlPackage rec {
       --replace "'INSTALLDIRS'  => \$INSTALLDIRS," "'INSTALLDIRS'  => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3',"
   '';
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/pg_format
-  '';
-
   doCheck = false;
 
   meta = {
diff --git a/pkgs/by-name/pg/pgpdump/package.nix b/pkgs/by-name/pg/pgpdump/package.nix
index 1c0d4de41615..0bc0b051f683 100644
--- a/pkgs/by-name/pg/pgpdump/package.nix
+++ b/pkgs/by-name/pg/pgpdump/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   supportCompressedPackets ? true,
   zlib,
   bzip2,
@@ -18,6 +19,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JKedgHCTDnvLyLR3nGl4XFAaxXDU1TgHrxPMlRFwtBo=";
   };
 
+  patches = [
+    # Fix for GCC 15. Remove on next package update.
+    # https://github.com/kazu-yamamoto/pgpdump/pull/45
+    (fetchpatch2 {
+      name = "fix-c23-compatibility.patch";
+      url = "https://github.com/kazu-yamamoto/pgpdump/commit/541442dc04259bde680b46742522177be40cc065.patch?full_index=1";
+      hash = "sha256-ye+B8hy0etGcwCG9pD0jCnrg+U5VpFkERad61CexW9Y=";
+    })
+  ];
+
   buildInputs = lib.optionals supportCompressedPackets [
     zlib
     bzip2
diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix
index f34ae6c2e4f4..fdb3153caf5f 100644
--- a/pkgs/by-name/pg/pgtop/package.nix
+++ b/pkgs/by-name/pg/pgtop/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   perlPackages,
   fetchFromGitHub,
-  shortenPerlShebang,
 }:
 
 perlPackages.buildPerlPackage rec {
@@ -27,11 +25,6 @@ perlPackages.buildPerlPackage rec {
     LWP
   ];
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/pgtop
-  '';
-
   meta = {
     description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL";
     mainProgram = "pgtop";
diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix
index c748ee0a0952..2ee1db1e2a3b 100644
--- a/pkgs/by-name/ph/phase-cli/package.nix
+++ b/pkgs/by-name/ph/phase-cli/package.nix
@@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec {
   pythonRelaxDeps = true;
 
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Securely manage and sync environment variables with Phase";
diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 30969f1d4f84..ba1c0851cebf 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix
index 0ae366d493e6..90d1703f3da5 100644
--- a/pkgs/by-name/ph/phpactor/package.nix
+++ b/pkgs/by-name/ph/phpactor/package.nix
@@ -27,7 +27,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/phpactor/phpactor/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix
index d8b4b101113f..54bf824719df 100644
--- a/pkgs/by-name/ph/phpdocumentor/package.nix
+++ b/pkgs/by-name/ph/phpdocumentor/package.nix
@@ -30,7 +30,6 @@ php.buildComposerProject2 (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index f8fc830fb3f6..b399bd1486f1 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -25,7 +25,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix
index 5f93b3d9f897..cbcf649a5115 100644
--- a/pkgs/by-name/pi/pipenv/package.nix
+++ b/pkgs/by-name/pi/pipenv/package.nix
@@ -74,7 +74,6 @@ buildPythonApplication rec {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # this test wants access to the internet
diff --git a/pkgs/by-name/pi/piston-cli/package.nix b/pkgs/by-name/pi/piston-cli/package.nix
index 8484f6523357..d4a91d0ee319 100644
--- a/pkgs/by-name/pi/piston-cli/package.nix
+++ b/pkgs/by-name/pi/piston-cli/package.nix
@@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   versionCheckProgram = "${placeholder "out"}/bin/piston";
 
   pythonImportsCheck = [ "piston" ];
diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix
index a7a30ee53be9..48ace993870c 100644
--- a/pkgs/by-name/pi/pixi-pack/package.nix
+++ b/pkgs/by-name/pi/pixi-pack/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 616f3d00df49..91754cf30999 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix
index 27a26e46c2ed..f14cbc5fa303 100644
--- a/pkgs/by-name/pl/platformio-core/package.nix
+++ b/pkgs/by-name/pl/platformio-core/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  python3Packages,
+  python3,
   fetchFromGitHub,
   fetchpatch,
   installShellFiles,
@@ -11,6 +11,23 @@
   udevCheckHook,
 }:
 
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = self: super: {
+      marshmallow = super.marshmallow.overridePythonAttrs (oldAttrs: rec {
+        version = "3.26.1";
+        src = fetchFromGitHub {
+          owner = "marshmallow-code";
+          repo = "marshmallow";
+          tag = version;
+          hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38=";
+        };
+      });
+    };
+  };
+  python3Packages = python.pkgs;
+in
 with python3Packages;
 buildPythonApplication rec {
   pname = "platformio";
diff --git a/pkgs/by-name/pl/plotutils/debian-patches.nix b/pkgs/by-name/pl/plotutils/debian-patches.nix
index d7c60a11eb67..26c88843f08a 100644
--- a/pkgs/by-name/pl/plotutils/debian-patches.nix
+++ b/pkgs/by-name/pl/plotutils/debian-patches.nix
@@ -1,15 +1,15 @@
 # Generated by debian-patches.sh from debian-patches.txt
 let
-  prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-9/debian/patches";
+  prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-15/debian/patches";
 in
 [
   {
     url = "${prefix}/01_AC_PROG_CXX.diff";
-    sha256 = "0r7xgwbk2yqs7b29gwhr8pnbqvy3a3x698j17s4yg501ragw1gqv";
+    sha256 = "0ka2iazhc8bkq10iwjhd2d89h0qzrv1pzflkb6d7bj6nd75zrssb";
   }
   {
     url = "${prefix}/10_repair_postscript";
-    sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p";
+    sha256 = "0br09qxwkp6kbgq1wrz886h0ddfq74jfyismc9vbs5karfa8c22j";
   }
   {
     url = "${prefix}/11_manpages_sb_macro";
@@ -17,7 +17,7 @@ in
   }
   {
     url = "${prefix}/14_manpage_spline";
-    sha256 = "1xp3cx9y9njp5wp40dkp7rwd2flkiik2gb08nh4516vkm73avfrd";
+    sha256 = "0087ryzs0fvqcr6ghbiq263hyzxx3a83ywhdgcsm7mh06zb9k1q7";
   }
   {
     url = "${prefix}/20_svg_attribute_syntax";
@@ -29,14 +29,18 @@ in
   }
   {
     url = "${prefix}/25_libpng15";
-    sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0";
+    sha256 = "0944mvwbp10fr27b6bp8xgiq3568lrp18bxcgppl7yfanz9b74mf";
   }
   {
     url = "${prefix}/30_hershey_glyphs";
-    sha256 = "0n7rn6ln9ikzq2dialif58ag5pch7q7zqd5zcsxxdyyasx4s5gm2";
+    sha256 = "01lrpxji95v3qd3hs0rqdcmxz7khvn7axv12y56p8r232dxd5nd0";
   }
   {
     url = "${prefix}/35_spline.test.error.diff";
-    sha256 = "1kqj1n8myk8xmglj6qcybj34zm4kpn6aw320jbpqhblkgp7m0fb1";
+    sha256 = "013d2xndf728ycdviib8q11zdms4c18dm2qfgc764wb6580zd08k";
+  }
+  {
+    url = "${prefix}/42_plotutils-gcc15.patch";
+    sha256 = "0rlb282kn9l2jgwb94975d3difbh6bwpyks1860by43yk5sczm3n";
   }
 ]
diff --git a/pkgs/by-name/pl/plotutils/debian-patches.txt b/pkgs/by-name/pl/plotutils/debian-patches.txt
index c28d96fdd5bc..c884390cea84 100644
--- a/pkgs/by-name/pl/plotutils/debian-patches.txt
+++ b/pkgs/by-name/pl/plotutils/debian-patches.txt
@@ -1,4 +1,4 @@
-plotutils/2.6-9
+plotutils/2.6-15
 01_AC_PROG_CXX.diff
 10_repair_postscript
 11_manpages_sb_macro
@@ -8,3 +8,4 @@ plotutils/2.6-9
 25_libpng15
 30_hershey_glyphs
 35_spline.test.error.diff
+42_plotutils-gcc15.patch
diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index cacb413cb856..7e7d8fe6d331 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -62,8 +62,6 @@ python3Packages.buildPythonApplication rec {
     "test_valid_chroots"
   ];
 
-  versionCheckProgramArg = "--version";
-
   makeWrapperArgs = [
     "--prefix PATH : ${
       lib.makeBinPath [
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 5090d9dd84ac..aa1092a7115f 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -148,7 +148,6 @@ buildGoModule (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
   versionCheckKeepEnvironment = [ "HOME" ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 25c28917edb5..fe70abdc40e6 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index c0267f44fd3d..57c132588ff1 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Multiple USB File Flasher";
diff --git a/pkgs/by-name/po/portfolio_rs/package.nix b/pkgs/by-name/po/portfolio_rs/package.nix
index 41e693754adc..35dfe4e2d186 100644
--- a/pkgs/by-name/po/portfolio_rs/package.nix
+++ b/pkgs/by-name/po/portfolio_rs/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "portfolio_rs";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "MarkusZoppelt";
     repo = "portfolio_rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kXpelx/6XIZGpKPY6tRwria5rnofGLnT5T+N+6jZkyw=";
+    hash = "sha256-SuukTNEfPOCCE5bg08/K7M68R2dAe75cch39whtcSWg=";
   };
 
-  cargoHash = "sha256-VfhqbE9XZptlUOxkYjTB3JlzNOT7i9B2khT8yCpl/sI=";
+  cargoHash = "sha256-L14Cu/Gex6FGeSEL7zcY+E6khtkH6fwzqkjHm67ALUw=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index f61aebbeff62..e4a8c21fe4fe 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -85,7 +85,6 @@ python3Packages.buildPythonApplication rec {
     # Node.js-related tests that are currently disabled on i686-linux.
     nodejs
   ];
-  versionCheckProgramArg = "--version";
 
   postPatch = ''
     substituteInPlace pre_commit/resources/hook-tmpl \
@@ -179,6 +178,26 @@ python3Packages.buildPythonApplication rec {
     "test_swift_language"
     "test_run_example_executable"
     "test_run_dep"
+    "test_control_c_control_c_on_install"
+    "test_healthy_default_creator"
+    "test_healthy_venv_creator"
+    "test_invalidated_virtualenv"
+    "test_language_versioned_python_hook"
+    "test_local_python_repo"
+    "test_local_repo_with_other_artifacts"
+    "test_python_hook_weird_setup_cfg"
+    "test_really_long_file_paths"
+    "test_reinstall"
+    "test_repository_state_compatibility[v1]"
+    "test_repository_state_compatibility[v2]"
+    "test_simple_python_hook_default_version"
+    "test_simple_python_hook"
+    "test_unhealthy_old_virtualenv"
+    "test_unhealthy_python_goes_missing"
+    "test_unhealthy_system_version_changes"
+    "test_unhealthy_then_replaced"
+    "test_unhealthy_unexpected_pyvenv"
+    "test_unhealthy_with_version_change"
 
     # i don't know why these fail
     "test_install_existing_hooks_no_overwrite"
diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index f316c383b442..b0eef6e5731e 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 94bc5950bfba..91aa344f3510 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchPypi,
   nodejs,
-  python3,
+  python312,
   gettext,
   nixosTests,
   pretix,
@@ -12,7 +12,7 @@
 }:
 
 let
-  python = python3.override {
+  python = python312.override {
     self = python;
     packageOverrides = self: super: {
       django = super.django_4;
diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix
index c9886eb4fff8..71f43ec18168 100644
--- a/pkgs/by-name/pr/prettier/package.nix
+++ b/pkgs/by-name/pr/prettier/package.nix
@@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = ./update.sh;
 
diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix
index d1bd01527d80..4fee4cd48bc0 100644
--- a/pkgs/by-name/pr/prmt/package.nix
+++ b/pkgs/by-name/pr/prmt/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix
index 538741ab28a6..baf6d9131422 100644
--- a/pkgs/by-name/pr/procfd/package.nix
+++ b/pkgs/by-name/pr/procfd/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix
index c3fc6d5901a0..584c43497f90 100644
--- a/pkgs/by-name/pr/proksi/package.nix
+++ b/pkgs/by-name/pr/proksi/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=proksi-v(.*)" ]; };
diff --git a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix
index 138dc46fc8ce..c099befd7d19 100644
--- a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix
@@ -44,7 +44,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/chrony_exporter";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/superq/chrony_exporter/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix
index 9075e350ec6d..12ed985a6260 100644
--- a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix
@@ -66,7 +66,6 @@ buildGoModule.override { stdenv = clangStdenv; } (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix
index 626a95d76ccd..d9f2b017b10d 100644
--- a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix
@@ -33,7 +33,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/richih/modbus_exporter/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix
index d326c422b492..bfee635449bb 100644
--- a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix
@@ -33,7 +33,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/paepckehh/solaredge_exporter/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix
index 7f17a0b70019..e52f456a1fc2 100644
--- a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix
@@ -47,7 +47,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/tibber-exporter";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/terjesannum/tibber-exporter/releases/tag/tibber-exporter-${finalAttrs.version}";
diff --git a/pkgs/by-name/pr/protonmail-export/package.nix b/pkgs/by-name/pr/protonmail-export/package.nix
index 5197b511a2dd..403f6f41f789 100644
--- a/pkgs/by-name/pr/protonmail-export/package.nix
+++ b/pkgs/by-name/pr/protonmail-export/package.nix
@@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/proton-mail-export-cli";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
index 362470ee6c92..2ace65fd7142 100644
--- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
+++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Tool to prepare a Proxmox installation ISO for automated installations";
diff --git a/pkgs/by-name/pr/proxyauth/package.nix b/pkgs/by-name/pr/proxyauth/package.nix
index cb118fa5e625..a624eb2f30df 100644
--- a/pkgs/by-name/pr/proxyauth/package.nix
+++ b/pkgs/by-name/pr/proxyauth/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix
index 3bafbb2615d2..3ad7be627cd4 100644
--- a/pkgs/by-name/pr/prs/package.nix
+++ b/pkgs/by-name/pr/prs/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index 09543fac64c1..64428c0ba552 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -18,13 +18,13 @@ assert lib.xor withLibiodbc withUnixODBC;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "psqlodbc";
-  version = "17.00.0006";
+  version = "17.00.0007";
 
   src = fetchFromGitHub {
     owner = "postgresql-interfaces";
     repo = "psqlodbc";
     tag = "REL-${lib.replaceString "." "_" finalAttrs.version}";
-    hash = "sha256-iu1PWkfOyWtMmy7/8W+acu8v+e8nUPkCIHtVNZ8HzRg=";
+    hash = "sha256-KlAGA+oNV/jJpcDJNGzsq/n55QKhUwTwhfNJ6QL6Pas=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix
index ab61bfc1dd1a..d6f867670b11 100644
--- a/pkgs/by-name/ps/psysh/package.nix
+++ b/pkgs/by-name/ps/psysh/package.nix
@@ -50,7 +50,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
index 09df1b471010..a54b70e96ead 100644
--- a/pkgs/by-name/pu/publicsuffix-list/package.nix
+++ b/pkgs/by-name/pu/publicsuffix-list/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "publicsuffix-list";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-11-14";
 
   src = fetchFromGitHub {
     owner = "publicsuffix";
     repo = "list";
-    rev = "ee7dec4a99602baaf51879dd8469b6642881a494";
-    hash = "sha256-IlR3dICad9EZeizI3V0A1YCQZiV/xg2GxtmTLG4EASU=";
+    rev = "64ba165cf391818a086139239c8fa223264eebcc";
+    hash = "sha256-Ugou4SzYx9EtzcBtocCqhCZZaU1Sngvk1IEVAIJZ4KY=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/pu/puredata/package.nix b/pkgs/by-name/pu/puredata/package.nix
index 461da99484a9..54e04bba7ebb 100644
--- a/pkgs/by-name/pu/puredata/package.nix
+++ b/pkgs/by-name/pu/puredata/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   autoreconfHook,
   gettext,
   makeWrapper,
@@ -25,6 +26,12 @@ stdenv.mkDerivation rec {
   patches = [
     # expose error function used by dependents
     ./expose-error.patch
+
+    # Fix build with GCC 15
+    (fetchpatch {
+      url = "https://github.com/pure-data/pure-data/commit/95e4105bc1044cbbcbbbcc369480a77c298d7475.patch";
+      hash = "sha256-zFB9m8Nw80X9+a64Uft4tNRA4BHsVr8zxLqAof0jJEI=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index 16f006bc92a8..fa326d936b99 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 74fdc2f64af2..0822f93a9d43 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -38,7 +38,6 @@ let
         jq
         versionCheckHook
       ];
-    versionCheckProgramArg = "--version";
 
     pythonImportsCheck = [
       "pyp"
diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index 99f9dbab6530..d21cf6254984 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -16,12 +16,17 @@ let
     hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM=";
   };
 
-  patchedPackageJSON = runCommand "package.json" { } ''
-    ${jq}/bin/jq '
-      .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser"))
-      | .scripts =  {  }
-      ' ${src}/package.json > $out
-  '';
+  patchedPackageJSON =
+    runCommand "package.json"
+      {
+        nativeBuildInputs = [ jq ];
+      }
+      ''
+        jq '
+          .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser"))
+          | .scripts =  {  }
+          ' ${src}/package.json > $out
+      '';
 
   pyright-root = buildNpmPackage {
     pname = "pyright-root";
diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix
index 18f2bf17ecff..98dcb16a7d04 100644
--- a/pkgs/by-name/py/pyroscope/package.nix
+++ b/pkgs/by-name/py/pyroscope/package.nix
@@ -39,7 +39,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix
index f7eb33198865..d79ac9089f77 100644
--- a/pkgs/by-name/py/pytr/package.nix
+++ b/pkgs/by-name/py/pytr/package.nix
@@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec {
     python3Packages.pytestCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   pythonImportsCheck = [ "pytr" ];
 
   meta = {
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index 8370fa110e02..a0e121ef8f69 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   preVersionCheck = ''
     export version='${finalAttrs.internalVersion}'
   '';
diff --git a/pkgs/by-name/qb/qbittorrent-cli/package.nix b/pkgs/by-name/qb/qbittorrent-cli/package.nix
index a58a8bbe7282..908da9522a56 100644
--- a/pkgs/by-name/qb/qbittorrent-cli/package.nix
+++ b/pkgs/by-name/qb/qbittorrent-cli/package.nix
@@ -38,7 +38,6 @@ buildDotnetModule {
   ];
 
   versionCheckProgram = "${placeholder "out"}/bin/qbt";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix
index 2232b2761d77..c27d11345d05 100644
--- a/pkgs/by-name/qd/qdrant/package.nix
+++ b/pkgs/by-name/qd/qdrant/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 79ff104b6bf9..1bf49b13e252 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix
index 7c88897c51b3..55d539b652f1 100644
--- a/pkgs/by-name/qp/qpwgraph/package.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-sd97sIne8tigCDFMnEv0ruM86NfiJZoJ+jsDv3VSdsg=";
+    sha256 = "sha256-fbkRSM4HFH1f/qZgRmEz7q5kvt2YAKWu/FX2GOXHhbQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qr/qr-backup/package.nix b/pkgs/by-name/qr/qr-backup/package.nix
index 0d59ac4044b3..9f4b620a71e0 100644
--- a/pkgs/by-name/qr/qr-backup/package.nix
+++ b/pkgs/by-name/qr/qr-backup/package.nix
@@ -85,7 +85,6 @@ python3Packages.buildPythonApplication rec {
 
     runHook postInstallCheck
   '';
-  versionCheckProgramArg = [ "--version" ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/qu/quick-lint-js/package.nix b/pkgs/by-name/qu/quick-lint-js/package.nix
index b83a7a164ca5..bbdcb9dfeae9 100644
--- a/pkgs/by-name/qu/quick-lint-js/package.nix
+++ b/pkgs/by-name/qu/quick-lint-js/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix
index c2ad46d75b4c..336be1a9dbb6 100644
--- a/pkgs/by-name/qx/qxmpp/package.nix
+++ b/pkgs/by-name/qx/qxmpp/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    kdePackages.wrapQtAppsNoGuiHook
+    kdePackages.wrapQtAppsHook
   ]
   ++ lib.optionals (withGstreamer || withOmemo) [
     pkg-config
diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix
index e9215823f40c..72c71b01b20d 100644
--- a/pkgs/by-name/ra/radicle-ci-broker/package.nix
+++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix
@@ -57,7 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = [ "--skip=acceptance_criteria_for_upgrades" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index 681a4295ec4e..005817420272 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix
index 6fb5de3a329b..c17da970c09a 100644
--- a/pkgs/by-name/ra/radicle-native-ci/package.nix
+++ b/pkgs/by-name/ra/radicle-native-ci/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index e9a0806c5fa2..d1e984a74701 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -92,7 +92,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   postFixup = ''
diff --git a/pkgs/by-name/ra/rails-new/package.nix b/pkgs/by-name/ra/rails-new/package.nix
index a181e923e727..c7edad231ed2 100644
--- a/pkgs/by-name/ra/rails-new/package.nix
+++ b/pkgs/by-name/ra/rails-new/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-FrndtE9hjP1WswfOYJM4LW1UsE8S9QXthYO7P3nzs2I=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix
index a73acc3d78f1..06d881833e7d 100644
--- a/pkgs/by-name/ra/rates/package.nix
+++ b/pkgs/by-name/ra/rates/package.nix
@@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "CLI tool that brings currency exchange rates right into your terminal";
     homepage = "https://github.com/lunush/rates";
diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index 6ebcabed19ff..89341f7c201f 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix
index 9495eb01fea6..e2d53e5f21de 100644
--- a/pkgs/by-name/rc/rclip/package.nix
+++ b/pkgs/by-name/rc/rclip/package.nix
@@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ]
   ++ (with python3Packages; [ pytestCheckHook ]);
-  versionCheckProgramArg = "--version";
 
   disabledTestPaths = [
     # requires network
diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix
index 617f899ec9a7..90e4b5d6d5af 100644
--- a/pkgs/by-name/rc/rcodesign/package.nix
+++ b/pkgs/by-name/rc/rcodesign/package.nix
@@ -53,7 +53,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix
index ea0ae6fe3fdb..f3cd39eb7c81 100644
--- a/pkgs/by-name/re/re2c/package.nix
+++ b/pkgs/by-name/re/re2c/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "re2c";
-  version = "4.3";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "skvadrik";
     repo = "re2c";
     rev = version;
-    hash = "sha256-zPOENMfXXgTwds1t+Lrmz9+GTHJf2yRpQsGT7nLRvcg=";
+    hash = "sha256-ihtAB6HLgYhX+FKPFy01RByy/M468YrHv2v5wB9bJws=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/readstat/package.nix b/pkgs/by-name/re/readstat/package.nix
index ba0e9097d245..f1861768ce6e 100644
--- a/pkgs/by-name/re/readstat/package.nix
+++ b/pkgs/by-name/re/readstat/package.nix
@@ -39,6 +39,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/WizardMac/ReadStat/commit/718d49155e327471ed9bf4a8c157f849f285b46c.patch";
       hash = "sha256-9hmuFa05b4JlxSzquIxXArOGhbi27A+3y5gH1IDg+R0=";
     })
+
+    # fix stringop-truncation warning
+    (fetchpatch {
+      url = "https://github.com/WizardMac/ReadStat/commit/43d4cdec6783b29d0f1d0ae9564507739cd27567.patch";
+      hash = "sha256-LZtdFdru2y89NvmLqa1sryhfzZX09jEeC2qWJpDS/kI=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index 0959e3ef32ae..144d25859e29 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/rebels";
-  versionCheckProgramArg = "--version";
   # Darwin: "Error: Operation not permitted (os error 1)"
   doInstallCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index a5fadbf38160..bd2880e22895 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -100,7 +100,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.tests = {
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 4bec7e3d9623..b4a0ab80ef87 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/redis-server";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests.redis = nixosTests.redis;
diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix
index aae561ed8e5e..307357bf0480 100644
--- a/pkgs/by-name/re/regolith/package.nix
+++ b/pkgs/by-name/re/regolith/package.nix
@@ -27,7 +27,6 @@ buildGoModule rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/re/remod/package.nix b/pkgs/by-name/re/remod/package.nix
index 699cbe74a842..3a51f585a1e3 100644
--- a/pkgs/by-name/re/remod/package.nix
+++ b/pkgs/by-name/re/remod/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/re/render50/package.nix b/pkgs/by-name/re/render50/package.nix
index 22d62f2db5e1..cde655ee408d 100644
--- a/pkgs/by-name/re/render50/package.nix
+++ b/pkgs/by-name/re/render50/package.nix
@@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # no pytest checks
 
diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index 103aef1baf65..22e835c7b1c9 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = ./update.sh;
 
diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix
index e34a2860868b..1790ecffc6e0 100644
--- a/pkgs/by-name/re/repro-env/package.nix
+++ b/pkgs/by-name/re/repro-env/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/kpcyrd/repro-env/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 82a5541ed2c0..c1b6445c2eb8 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -186,7 +186,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix
index c6ee9cbc2147..71ea91149d41 100644
--- a/pkgs/by-name/re/rescript-language-server/package.nix
+++ b/pkgs/by-name/re/rescript-language-server/package.nix
@@ -54,7 +54,6 @@ buildNpmPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
index 1dc235668dd6..91c7e175df8e 100644
--- a/pkgs/by-name/re/restate/package.nix
+++ b/pkgs/by-name/re/restate/package.nix
@@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix
index 7b98a06d3f89..1dddef1895c6 100644
--- a/pkgs/by-name/ri/rich-cli/package.nix
+++ b/pkgs/by-name/ri/rich-cli/package.nix
@@ -56,7 +56,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/rich";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 155d6752055d..afc1a1a1a6d3 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix
index 8a707bfba15a..6912fda7f6ab 100644
--- a/pkgs/by-name/ro/robo/package.nix
+++ b/pkgs/by-name/ro/robo/package.nix
@@ -21,7 +21,6 @@ php82.buildComposerProject2 (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix
index 895d4bae952d..f2b4c98885fc 100644
--- a/pkgs/by-name/ro/rocksdb/package.nix
+++ b/pkgs/by-name/ro/rocksdb/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rocksdb";
-  version = "10.5.1";
+  version = "10.7.5";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TDYXzYbOLhcIRi+qi0FW1OLVtfKOF+gUbj62Tgpp3/E=";
+    hash = "sha256-kKMwgRcjELla/9aak5gZbUHg1bkgGhlobr964wdatxI=";
   };
 
   patches = lib.optional (
@@ -90,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: {
       sed -e '1i #include <cstdint>' -i util/string_util.h
       sed -e '1i #include <cstdint>' -i include/rocksdb/utilities/checkpoint.h
     ''
+    + lib.optionalString (lib.versionOlder finalAttrs.version "10.4.2") ''
+      # Fix gcc-15 build failures due to missing <cstdint>
+      sed -e '1i #include <cstdint>' -i db/blob/blob_file_meta.h
+      sed -e '1i #include <cstdint>' -i include/rocksdb/sst_partitioner.h
+      sed -e '1i #include <cstdint>' -i include/rocksdb/write_batch_base.h
+      # Some older versions don't have this
+      sed -e '1i #include <cstdint>' -i include/rocksdb/trace_record.h || true
+    ''
     + lib.optionalString (lib.versionOlder finalAttrs.version "7") ''
       # Fix gcc-13 build failures due to missing <cstdint> and
       # <system_error> includes, fixed upstyream sice 7.x
diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix
index f09fd79acb99..06577483ef77 100644
--- a/pkgs/by-name/ro/rogcat/package.nix
+++ b/pkgs/by-name/ro/rogcat/package.nix
@@ -35,8 +35,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Adb logcat wrapper";
     homepage = "https://github.com/flxo/rogcat";
diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix
index f5f0ad6415a2..6641cd8af4ef 100644
--- a/pkgs/by-name/ro/rojo/package.nix
+++ b/pkgs/by-name/ro/rojo/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/rojo";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index 4d5c9323cfa6..c47be258500f 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/rs/rsnapshot/package.nix b/pkgs/by-name/rs/rsnapshot/package.nix
index 575e0278ce6b..185028327c88 100644
--- a/pkgs/by-name/rs/rsnapshot/package.nix
+++ b/pkgs/by-name/rs/rsnapshot/package.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 17ce5aa19ab4..f96425f63112 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix
index a28dcaca7afc..8c4afaaac66e 100644
--- a/pkgs/by-name/ru/rumdl/package.nix
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix
index 7133be4c9825..0460f469e6f1 100644
--- a/pkgs/by-name/ru/rundeck-cli/package.nix
+++ b/pkgs/by-name/ru/rundeck-cli/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/rd";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix
index 7f1e1a5620e4..453200807e4a 100644
--- a/pkgs/by-name/ru/rust-parallel/package.nix
+++ b/pkgs/by-name/ru/rust-parallel/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ru/rustpython/package.nix b/pkgs/by-name/ru/rustpython/package.nix
index 36bb063c07d4..ff9ccff266b6 100644
--- a/pkgs/by-name/ru/rustpython/package.nix
+++ b/pkgs/by-name/ru/rustpython/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index 1ff58f933b6d..bdac57fd6f7b 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index f877eec94f6f..8b11def63bcf 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix
index 2bde52b68d42..d435206ece67 100644
--- a/pkgs/by-name/ry/rye/package.nix
+++ b/pkgs/by-name/ry/rye/package.nix
@@ -93,7 +93,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix
index a50126e9bd4c..7da850e385a6 100644
--- a/pkgs/by-name/s5/s5/package.nix
+++ b/pkgs/by-name/s5/s5/package.nix
@@ -30,8 +30,6 @@ buildGoModule rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Cipher/decipher text within a file";
     mainProgram = "s5";
diff --git a/pkgs/by-name/sa/salt-lint/package.nix b/pkgs/by-name/sa/salt-lint/package.nix
index 859a84ee7d3f..b538d7b69b60 100644
--- a/pkgs/by-name/sa/salt-lint/package.nix
+++ b/pkgs/by-name/sa/salt-lint/package.nix
@@ -31,8 +31,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Command-line utility that checks for best practices in SaltStack";
     homepage = "https://salt-lint.readthedocs.io/en/latest/";
diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix
index 01051d19a4dd..9ff815ea6c3d 100644
--- a/pkgs/by-name/sa/samply/package.nix
+++ b/pkgs/by-name/sa/samply/package.nix
@@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix
index 97c632438477..d4bdc781f31c 100644
--- a/pkgs/by-name/sa/sampo/package.nix
+++ b/pkgs/by-name/sa/sampo/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch b/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch
new file mode 100644
index 000000000000..062bb357fce5
--- /dev/null
+++ b/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch
@@ -0,0 +1,22 @@
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index ed5096b32d..adb6a91c7e 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -146,7 +146,7 @@
+ 
+ #define MAX_LINE 16384
+ 
+-void sigwinch_handler()
++void sigwinch_handler(int _signal)
+ {
+ 	struct winsize winsize;
+ 
+@@ -160,7 +160,7 @@
+ }
+ 
+ 
+-void sigalrm_handler()
++void sigalrm_handler(int _signal)
+ {
+ 	rotate = (rotate + 1) % 4;
+ }
diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix
index fba9da9c1dbb..fac1e79e72e3 100644
--- a/pkgs/by-name/sa/sasquatch/package.nix
+++ b/pkgs/by-name/sa/sasquatch/package.nix
@@ -23,7 +23,12 @@ let
       hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ=";
     };
 
-    patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
+    patches = [
+      # Fix build for GCC 15/C23 by adding parameters to unsquashfs signal
+      # handlers instead of relying on an empty parameter list.
+      ./gcc15-fix-prototypes.patch
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
 
     strictDeps = true;
     nativeBuildInputs = [ which ];
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index 3bca8006e213..aa1e8290dc70 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
 
   meta = {
diff --git a/pkgs/by-name/sb/sbom-tool/package.nix b/pkgs/by-name/sb/sbom-tool/package.nix
index 04ba91427e99..7d50b5bd6159 100644
--- a/pkgs/by-name/sb/sbom-tool/package.nix
+++ b/pkgs/by-name/sb/sbom-tool/package.nix
@@ -37,7 +37,6 @@ buildDotnetModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = [ "--version" ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix
index d45186882529..86d54abd0e0a 100644
--- a/pkgs/by-name/sb/sbom4python/package.nix
+++ b/pkgs/by-name/sb/sbom4python/package.nix
@@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [
     "sbom4python"
diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix
index 408337773ba7..049eff90a8d8 100644
--- a/pkgs/by-name/sc/scalapack/package.nix
+++ b/pkgs/by-name/sc/scalapack/package.nix
@@ -46,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/c3d6b22b0032fd2b8772d99c2239c18473e197a7.patch";
       hash = "sha256-935KtaqPO2cghbD9Z8YMxGGOQJo1D1LqTje6/IL4bGI=";
     })
+
+    # Fix build with gcc15
+    # https://github.com/Reference-ScaLAPACK/scalapack/pull/139
+    (fetchpatch {
+      name = "scalapack-fix-function-declaration-arguments.patch";
+      url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/0cd017afa3eefd0597cfe71b7bcfd6356a258da2.patch";
+      hash = "sha256-uUdazKplDt8K5yuVaHX5pLFqDMh0F7eBBGEHfxOiM0Y=";
+    })
   ];
 
   # Required to activate ILP64.
diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index e7f552274ce8..5e5fe6178ffd 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -47,8 +47,6 @@ buildGo124Module (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "SCIP Code Intelligence Protocol CLI";
     mainProgram = "scip";
diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix
index 05ba1d72b1b7..3a012c643cbc 100644
--- a/pkgs/by-name/sc/scmpuff/package.nix
+++ b/pkgs/by-name/sc/scmpuff/package.nix
@@ -33,7 +33,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Numeric file shortcuts for common git commands";
diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix
index c1393046acdd..436c30b1f8df 100644
--- a/pkgs/by-name/sc/scons/package.nix
+++ b/pkgs/by-name/sc/scons/package.nix
@@ -6,13 +6,13 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "scons";
-  version = "4.10.0";
+  version = "4.10.1";
 
   src = fetchFromGitHub {
     owner = "Scons";
     repo = "scons";
     tag = version;
-    hash = "sha256-ZmJETrznHH3zsNBO5o8JCvf+6l7NICOAfIqASYzYBaM=";
+    hash = "sha256-Lq6sDd6Bs9lMfTptlxdeNhOc1acP7xuLdDhIi65uqFo=";
   };
 
   pyproject = true;
diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index d96e7a988215..c1f3dc77015d 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   autoconf,
   bison,
   boost,
@@ -70,6 +71,16 @@ stdenv.mkDerivation (finalAttrs: {
     gputils
   ];
 
+  patches = [
+    # Fix build with gcc15
+    # https://sourceforge.net/p/sdcc/bugs/3846/
+    (fetchpatch {
+      name = "sdcc-fix-aslink-elf-signature.patch";
+      url = "https://src.fedoraproject.org/rpms/sdcc/raw/4a7c2a7e32369461eb451fc6f4d678a010135afc/f/sdcc-4.4.0-aslink.patch";
+      hash = "sha256-xGilNetecPBj2VV3ebmln5BKqs3OoWFf6y2S3TBTHMQ=";
+    })
+  ];
+
   # sdcc 4.5.0 massively rewrote sim/ucsim/Makefile.in, and lost the `.PHONY`
   # rule in the process. As a result, on macOS (which uses a case-insensitive
   # filesystem), the INSTALL file keeps the `install` target in the ucsim
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index e16eb5927cec..fde780a23042 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -2,7 +2,6 @@
   cmake,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   ninja,
   sdl3,
   stdenv,
@@ -31,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.32.58";
+  version = "2.32.60";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM=";
+    hash = "sha256-8nhSyifEeYEZj9tqid1x67jhxqmrR61NwQ/g0Z8vbw8=";
   };
 
   nativeBuildInputs = [
@@ -74,12 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./find-headers.patch
-
-    # https://github.com/libsdl-org/sdl2-compat/pull/545
-    (fetchpatch2 {
-      url = "https://github.com/libsdl-org/sdl2-compat/commit/b799076c72c2492224e81544f58f92b737cccbd3.patch?full_index=1";
-      hash = "sha256-fAc8yBlT+XFHDKcF4MFgBAz2WtXGmhYzNNrjaGSr+do=";
-    })
   ];
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 0e5feb85776a..dae3517ae9be 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -61,7 +61,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.26";
+  version = "3.2.28";
 
   outputs = [
     "lib"
@@ -74,18 +74,14 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k=";
+    hash = "sha256-nfnvzog1bON2IaBOeWociV82lmRY+qXgdeXBe6GYlww=";
   };
 
   postPatch =
     # Tests timeout on Darwin
-    # `testtray` loads assets from a relative path, which we are patching to be absolute
     lib.optionalString (finalAttrs.finalPackage.doCheck) ''
       substituteInPlace test/CMakeLists.txt \
         --replace-fail 'set(noninteractive_timeout 10)' 'set(noninteractive_timeout 30)'
-
-      substituteInPlace test/testtray.c \
-        --replace-warn '../test/' '${placeholder "installedTests"}/share/assets/'
     ''
     + lib.optionalString waylandSupport ''
       substituteInPlace src/video/wayland/SDL_waylandmessagebox.c \
@@ -171,6 +167,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "SDL_TESTS" true)
     (lib.cmakeBool "SDL_INSTALL_TESTS" true)
     (lib.cmakeBool "SDL_DEPS_SHARED" false)
+
+    # Only ppc64le baseline guarantees AltiVec
+    (lib.cmakeBool "SDL_ALTIVEC" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
   ]
   ++
     lib.optionals
diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
index 18d89bda4ff6..27ba7d4a5d9e 100644
--- a/pkgs/by-name/se/sea-orm-cli/package.nix
+++ b/pkgs/by-name/se/sea-orm-cli/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-AqrS+5y3bKuqAVvbmWDO3V0OBVSkW6212WQeY1hixsk=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix
index 2d0550823c09..9745ac054492 100644
--- a/pkgs/by-name/se/seagoat/package.nix
+++ b/pkgs/by-name/se/seagoat/package.nix
@@ -68,7 +68,6 @@ python3Packages.buildPythonApplication rec {
       versionCheckHook
       writableTmpDirAsHomeHook
     ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = import ./failing_tests.nix;
 
diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix
index 4d39408085c7..2fc83e64a54a 100644
--- a/pkgs/by-name/se/seahorse/package.nix
+++ b/pkgs/by-name/se/seahorse/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   vala,
   meson,
   ninja,
@@ -37,6 +38,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-nBkX5KYff+u3h4Sc42znF/znBsNGiAuZHQVtVNrbysw=";
   };
 
+  patches = [
+    # Fix build with gpgme 2.0+
+    # https://gitlab.gnome.org/GNOME/seahorse/-/merge_requests/248
+    (fetchpatch {
+      name = "seahorse-allow-build-with-gpgme-2_0.patch";
+      url = "https://gitlab.gnome.org/GNOME/seahorse/-/commit/aa68522cc696fa491ccfdff735b77bcf113168d0.patch";
+      hash = "sha256-xd5K8xUGuMk+41JROsq7QpZ5gD2jPAbv1kQdLI3z9lc=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 3b57bb465256..2f59b87f87f3 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/serpl";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch
new file mode 100644
index 000000000000..bdf45af1d604
--- /dev/null
+++ b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
+index 6e94318..dca18bb 100644
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -10,8 +10,7 @@ check_PROGRAMS = \
+     test_snprintf \
+     test_strncpy \
+     test_strtcpy \
+-    test_typetraits \
+-    test_xaprintf
++    test_typetraits
+ 
+ if ENABLE_LOGIND
+ check_PROGRAMS += \
diff --git a/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
index ff6166b92f1d..33d90fe1e48e 100644
--- a/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
+++ b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
@@ -1,28 +1,12 @@
 diff --git a/src/Makefile.am b/src/Makefile.am
-index a1a2e4e..fa17f9d 100644
+index 6981815..bcc4568 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap
- endif
- endif
- 
--if WITH_TCB
--shadowsgidubins = passwd
--endif
--
- LDADD          = $(INTLLIBS) \
- 		 $(top_builddir)/libmisc/libmisc.la \
- 		 $(top_builddir)/lib/libshadow.la \
-@@ -146,12 +142,6 @@ install-am: all-am
- 	set -e; for i in $(suidusbins); do \
- 		chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \
+@@ -152,7 +152,6 @@ install-am: all-am
  	done
--if WITH_TCB
--	set -e; for i in $(shadowsgidubins); do \
+ if WITH_TCB
+ 	set -e; for i in $(shadowsgidubins); do \
 -		chown root:shadow $(DESTDIR)$(ubindir)/$$i; \
--		chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \
--	done
--endif
- if ENABLE_SUBIDS
- if FCAPS
- 	setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap
+ 		chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \
+ 	done
+ endif
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 028576075fdc..c904337dc53d 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -19,6 +19,7 @@
   libbsd,
   withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb,
   tcb,
+  cmocka,
 }:
 let
   glibc' =
@@ -68,10 +69,17 @@ stdenv.mkDerivation rec {
   ++ lib.optional withTcb tcb;
 
   patches = [
+    # Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the caller.
     ./keep-path.patch
     # Obtain XML resources from XML catalog (patch adapted from gtk-doc)
     ./respect-xml-catalog-files-var.patch
+    # Avoid a chown during install to fix installation with tcb enabled
+    # Would have to be done as part of the NixOS modules,
+    # see https://github.com/NixOS/nixpkgs/issues/109457
     ./fix-install-with-tcb.patch
+    # This unit test fails: https://github.com/shadow-maint/shadow/issues/1382
+    # Can be removed after the next release
+    ./disable-xaprintf-test.patch
   ];
 
   postPatch = ''
@@ -104,6 +112,11 @@ stdenv.mkDerivation rec {
     substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc'.bin}/bin/nscd
   '';
 
+  doCheck = true;
+  nativeCheckInputs = [
+    cmocka
+  ];
+
   postInstall = ''
     # Move the su binary into the su package
     mkdir -p $su/bin
@@ -125,6 +138,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     shellPath = "/bin/nologin";
+    # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests
     tests = { inherit (nixosTests) shadow; };
   };
 }
diff --git a/pkgs/by-name/sh/shapelib/package.nix b/pkgs/by-name/sh/shapelib/package.nix
index 6c363af98835..f202f6da2574 100644
--- a/pkgs/by-name/sh/shapelib/package.nix
+++ b/pkgs/by-name/sh/shapelib/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchDebianPatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,6 +14,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-S3SjbO2U6ae+pAEVfmZK3cxb4lHn33+I1GdDYdoBLCE=";
   };
 
+  patches = [
+    # Fix build with gcc 15
+    (fetchDebianPatch {
+      inherit pname version;
+      debianRevision = "1";
+      patch = "gcc-15.patch";
+      hash = "sha256-ubd8L2hxSAxTDiOSToVHGLHkpGOap5bnozdVdv9VgCQ=";
+    })
+  ];
+
   doCheck = true;
   preCheck = ''
     patchShebangs tests contrib/tests
diff --git a/pkgs/by-name/sh/shaperglot-cli/package.nix b/pkgs/by-name/sh/shaperglot-cli/package.nix
index b04135fde4c5..dbefda1670f8 100644
--- a/pkgs/by-name/sh/shaperglot-cli/package.nix
+++ b/pkgs/by-name/sh/shaperglot-cli/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   installCheckPhase = ''
     runHook preInstallCheck
 
diff --git a/pkgs/by-name/sh/sharutils/gcc15-c23-port.patch b/pkgs/by-name/sh/sharutils/gcc15-c23-port.patch
new file mode 100644
index 000000000000..be321476ff48
--- /dev/null
+++ b/pkgs/by-name/sh/sharutils/gcc15-c23-port.patch
@@ -0,0 +1,125 @@
+From: Petr Písař <ppisar@redhat.com>
+
+With GCC 15, which defaults to ISO 23, a build failed, for example like
+this:
+
+    gcc -DLOCALEDIR=\"/usr/local/share/locale\" -DHAVE_CONFIG_H -I. -I..  -I../libopts -I. -I.. -I../lib -I
+    ../lib -I../intl  -Wno-format-contains-nul -g -O2 -Wno-format-contains-nul -c -o shar.o shar.c
+    In file included from local.h:23,
+		     from shar-opts.h:354,
+		     from shar.c:46:
+    ../lib/system.h:78:7: error: conflicting types for ‘fdopen’; have ‘FILE *(void)’
+       78 | FILE *fdopen ();
+	  |       ^~~~~~
+
+The cause is that ISO C23 changed a meaning of an empty argument list
+from an unspecified list to no arguments.
+
+Also K&R syntax is now deprecated and the compiler warned:
+
+    encode.c: In function ‘write_encoded_bytes’:
+    encode.c:33:1: warning: old-style function definition [-Wold-style-definition]
+       33 | write_encoded_bytes (group, file)
+	  | ^~~~~~~~~~~~~~~~~~~
+
+This patch fixes both the erros and the warnigs by specifying all the
+arguments in the modern syntax.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/system.h   |  6 +++---
+ src/encode.c   | 13 +++----------
+ src/shar.c     |  2 +-
+ src/uudecode.c |  2 +-
+ 4 files changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/lib/system.h b/lib/system.h
+index 2b9846b..811e8cf 100644
+--- a/lib/system.h
++++ b/lib/system.h
+@@ -52,7 +52,7 @@ typedef enum {false = 0, true = 1} bool;
+ #endif
+ 
+ #if !HAVE_DECL_STRTOIMAX && !defined strtoimax
+-intmax_t strtoimax ();
++intmax_t strtoimax (const char *nptr, char **endptr, int base);
+ #endif
+ 
+ #if HAVE_STRING_H
+@@ -75,8 +75,8 @@ intmax_t strtoimax ();
+ # include <unistd.h>
+ #endif
+ 
+-FILE *fdopen ();
+-FILE *popen ();
++FILE *fdopen (int fd, const char *mode);
++FILE *popen (const char *command, const char *type);
+ 
+ /* Global functions of the shar package.  */
+ 
+diff --git a/src/encode.c b/src/encode.c
+index 09e0c69..b1de8bd 100644
+--- a/src/encode.c
++++ b/src/encode.c
+@@ -30,9 +30,7 @@
+ `------------------------------------------*/
+ 
+ static void
+-write_encoded_bytes (group, file)
+-     char *group;
+-     FILE *file;
++write_encoded_bytes (char *group, FILE *file)
+ {
+   int c1, c2, c3, c4;
+ 
+@@ -52,10 +50,7 @@ write_encoded_bytes (group, file)
+ `--------------------------------------------------------------------*/
+ 
+ static int
+-read_raw_bytes (file, buffer, buffer_size)
+-     FILE *file;
+-     char *buffer;
+-     int buffer_size;
++read_raw_bytes (FILE *file, char *buffer, int buffer_size)
+ {
+   int character;
+   int counter;
+@@ -75,9 +70,7 @@ read_raw_bytes (file, buffer, buffer_size)
+ `----------------------------------------------------*/
+ 
+ void
+-copy_file_encoded (input, output)
+-     FILE *input;
+-     FILE *output;
++copy_file_encoded (FILE *input, FILE *output)
+ {
+   char buffer[LINE_BUFFER_SIZE];
+   int counter;
+diff --git a/src/shar.c b/src/shar.c
+index 6d7ed1d..2c6e2e1 100644
+--- a/src/shar.c
++++ b/src/shar.c
+@@ -109,7 +109,7 @@ static inline unsigned char to_uchar (char ch) { return ch; }
+ #define IS_GRAPH(_c) (isprint (to_uchar (_c)) && !isspace (to_uchar (_c)))
+ #endif
+ 
+-struct tm *localtime ();
++struct tm *localtime (const time_t *timep);
+ 
+ #if MSDOS
+           /* 1 extra for CR.  */
+diff --git a/src/uudecode.c b/src/uudecode.c
+index 0621c99..b8a316e 100644
+--- a/src/uudecode.c
++++ b/src/uudecode.c
+@@ -82,7 +82,7 @@ static char const cright_years_z[] =
+ #define UU_CHMOD(_n, _fd, _m)   chmod ((_n), UU_MODE_BITS(_m))
+ #endif
+ 
+-struct passwd *getpwnam ();
++struct passwd *getpwnam (const char *name);
+ 
+ static uudecode_exit_code_t read_stduu(
+         const char *inname, const char *outname);
+-- 
+2.48.1
diff --git a/pkgs/by-name/sh/sharutils/gcc15-getcwdm4-port.patch b/pkgs/by-name/sh/sharutils/gcc15-getcwdm4-port.patch
new file mode 100644
index 000000000000..0c0d7fdac4b1
--- /dev/null
+++ b/pkgs/by-name/sh/sharutils/gcc15-getcwdm4-port.patch
@@ -0,0 +1,37 @@
+From: Petr Písař <ppisar@redhat.com>
+
+Some confgure tests failed because of function arguments missing from
+the prototypes:
+
+    configure:16105: checking whether getcwd (NULL, 0) allocates memory for result
+    configure:16162: gcc -o conftest -g -O2   conftest.c  >&5
+    conftest.c:186:16: error: conflicting types for 'getcwd'; have 'char *(void)'
+      186 |          char *getcwd ();
+	  |                ^~~~~~
+    In file included from conftest.c:181:
+    /usr/include/unistd.h:531:14: note: previous declaration of 'getcwd' with type 'char *(char *, size_t)'
+
+This patch fixes it.
+
+Maintainer is encouraged to rebase the m4 files to the latest gnulib.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ m4/getcwd.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
+index b9fbcec..6f24b14 100644
+--- a/m4/getcwd.m4
++++ b/m4/getcwd.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
+ #         include <direct.h>
+ #        endif
+ #        ifndef getcwd
+-         char *getcwd ();
++         char *getcwd (char *buf, size_t size);
+ #        endif
+ ]], [[
+ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+-- 
+2.48.1
diff --git a/pkgs/by-name/sh/sharutils/gcc15-stdboolm4-backport.patch b/pkgs/by-name/sh/sharutils/gcc15-stdboolm4-backport.patch
new file mode 100644
index 000000000000..ae8d27306774
--- /dev/null
+++ b/pkgs/by-name/sh/sharutils/gcc15-stdboolm4-backport.patch
@@ -0,0 +1,202 @@
+From: Petr Písař <ppisar@redhat.com>
+
+The bundled gnulib check for stdbool.h did not account for ISO C23
+which provides its own false and true keywords. As a result stdbool.h
+presence was not correctly detected and libopts/compat/compat.h,
+bundled from AutoGen, failed to compile with GCC 15 which defaults to
+ISO C23:
+
+    In file included from autoopts/project.h:30,
+		     from libopts.c:2:
+    ./compat/compat.h:188:19: error: cannot use keyword ‘false’ as enumeration constant
+      188 |    typedef enum { false = 0, true = 1 } _Bool;
+	  |                   ^~~~~
+    ./compat/compat.h:188:19: note: ‘false’ is a keyword with ‘-std=c23’ onwards
+    ./compat/compat.h:188:41: error: expected ‘;’, identifier or ‘(’ before ‘_Bool’
+      188 |    typedef enum { false = 0, true = 1 } _Bool;
+	  |                                         ^~~~~
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ m4/stdbool.m4 | 129 +++++++++++++++++++++++++++++---------------------
+ 1 file changed, 74 insertions(+), 55 deletions(-)
+
+diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
+index 7273b82..8e00e4a 100644
+--- a/m4/stdbool.m4
++++ b/m4/stdbool.m4
+@@ -1,27 +1,40 @@
+ # Check for stdbool.h that conforms to C99.
+ 
+-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
++dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ 
+-#serial 5
++#serial 10
+ 
+ # Prepare for substituting <stdbool.h> if it is not supported.
+ 
+ AC_DEFUN([AM_STDBOOL_H],
+ [
+   AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
++  AC_REQUIRE([AC_CANONICAL_HOST])
+ 
+-  # Define two additional variables used in the Makefile substitution.
+-
++  dnl On some platforms, <stdbool.h> does not exist or does not conform to C99.
++  dnl On Solaris 10 with CC=cc CXX=CC, <stdbool.h> exists but is not usable
++  dnl in C++ mode (and no <cstdbool> exists). In this case, we use our
++  dnl replacement, also in C mode (for binary compatibility between C and C++).
+   if test "$ac_cv_header_stdbool_h" = yes; then
+-    STDBOOL_H=''
++    case "$host_os" in
++      solaris*)
++        if test -z "$GCC"; then
++          GL_GENERATE_STDBOOL_H=true
++        else
++          GL_GENERATE_STDBOOL_H=false
++        fi
++        ;;
++      *)
++        GL_GENERATE_STDBOOL_H=false
++        ;;
++    esac
+   else
+-    STDBOOL_H='stdbool.h'
++    GL_GENERATE_STDBOOL_H=true
+   fi
+-  AC_SUBST([STDBOOL_H])
+-  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
++  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test "$GL_GENERATE_STDBOOL_H" = "true"])
+ 
+   if test "$ac_cv_type__Bool" = yes; then
+     HAVE__BOOL=1
+@@ -31,70 +44,76 @@ AC_DEFUN([AM_STDBOOL_H],
+   AC_SUBST([HAVE__BOOL])
+ ])
+ 
+-# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
+-AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
+-
+-# This version of the macro is needed in autoconf <= 2.68.
++m4_version_prereq([2.72], [], [
+ 
+ AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
+-  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
++  [AC_CHECK_TYPES([_Bool])
++   AC_CACHE_CHECK([for stdbool.h that conforms to C99 or later],
+      [ac_cv_header_stdbool_h],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+-           [[
+-             #include <stdbool.h>
+-             #ifndef bool
+-              "error: bool is not defined"
++           [[#include <stdbool.h>
++
++             /* "true" and "false" should be usable in #if expressions and
++                integer constant expressions, and "bool" should be a valid
++                type name.
++
++                Although C99 requires bool, true, and false to be macros,
++                C23 and C++11 overrule that, so do not test for that.
++                Although C99 requires __bool_true_false_are_defined and
++                _Bool, C23 says they are obsolescent, so do not require
++                them.  */
++
++             #if !true
++               #error "'true' is not true"
+              #endif
+-             #ifndef false
+-              "error: false is not defined"
++             #if true != 1
++               #error "'true' is not equal to 1"
+              #endif
++             char b[true == 1 ? 1 : -1];
++             char c[true];
++
+              #if false
+-              "error: false is not 0"
++               #error "'false' is not false"
+              #endif
+-             #ifndef true
+-              "error: true is not defined"
+-             #endif
+-             #if true != 1
+-              "error: true is not 1"
+-             #endif
+-             #ifndef __bool_true_false_are_defined
+-              "error: __bool_true_false_are_defined is not defined"
++             #if false != 0
++               #error "'false' is not equal to 0"
+              #endif
++             char d[false == 0 ? 1 : -1];
++
++             enum { e = false, f = true, g = false * true, h = true * 256 };
++
++             char i[(bool) 0.5 == true ? 1 : -1];
++             char j[(bool) 0.0 == false ? 1 : -1];
++             char k[sizeof (bool) > 0 ? 1 : -1];
++
++             struct sb { bool s: 1; bool t; } s;
++             char l[sizeof s.t > 0 ? 1 : -1];
+ 
+-             struct s { _Bool s: 1; _Bool t; } s;
+-
+-             char a[true == 1 ? 1 : -1];
+-             char b[false == 0 ? 1 : -1];
+-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+-             char d[(bool) 0.5 == true ? 1 : -1];
+-             /* See body of main program for 'e'.  */
+-             char f[(_Bool) 0.0 == false ? 1 : -1];
+-             char g[true];
+-             char h[sizeof (_Bool)];
+-             char i[sizeof s.t];
+-             enum { j = false, k = true, l = false * true, m = true * 256 };
+              /* The following fails for
+                 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+-             _Bool n[m];
+-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
++             bool m[h];
++             char n[sizeof m == h * sizeof m[0] ? 1 : -1];
++             char o[-1 - (bool) 0 < 0 ? 1 : -1];
+              /* Catch a bug in an HP-UX C compiler.  See
+-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
++                https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
++                https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html
+               */
+-             _Bool q = true;
+-             _Bool *pq = &q;
++             bool p = true;
++             bool *pp = &p;
+            ]],
+            [[
+-             bool e = &s;
+-             *pq |= q;
+-             *pq |= ! q;
+-             /* Refer to every declared value, to avoid compiler optimizations.  */
+-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+-                     + !m + !n + !o + !p + !q + !pq);
++             bool ps = &s;
++             *pp |= p;
++             *pp |= ! p;
++
++             /* Refer to every declared value, so they cannot be
++                discarded as unused.  */
++             return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k
++                     + !l + !m + !n + !o + !p + !pp + !ps);
+            ]])],
+         [ac_cv_header_stdbool_h=yes],
+         [ac_cv_header_stdbool_h=no])])
+-   AC_CHECK_TYPES([_Bool])
+-])
++])# AC_CHECK_HEADER_STDBOOL
++
++]) # m4_version_prereq 2.72
+-- 
+2.48.1
diff --git a/pkgs/by-name/sh/sharutils/package.nix b/pkgs/by-name/sh/sharutils/package.nix
index 959940b27672..8128c520b1f2 100644
--- a/pkgs/by-name/sh/sharutils/package.nix
+++ b/pkgs/by-name/sh/sharutils/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
+  autoreconfHook,
   gettext,
   coreutils,
   updateAutotoolsGnuConfigScriptsHook,
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
 
   # GNU Gettext is needed on non-GNU platforms.
   buildInputs = [
+    autoreconfHook
     coreutils
     gettext
   ];
@@ -55,6 +57,12 @@ stdenv.mkDerivation rec {
       url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txt5Z_KZup0yN.txt";
       sha256 = "0an8vfy3qj6sss9w0i4j8ilf7g5mbc7y13l644jy5bcm9przcjbd";
     })
+
+    # various build fixes for >= gcc 15, sourced from
+    # https://lists.gnu.org/archive/html/bug-gnu-utils/2025-03/msg00000.html
+    ./gcc15-stdboolm4-backport.patch
+    ./gcc15-getcwdm4-port.patch
+    ./gcc15-c23-port.patch
   ];
 
   postPatch =
diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix
index 3144a7fdce05..4b222ed0e8b7 100644
--- a/pkgs/by-name/sh/shelldap/package.nix
+++ b/pkgs/by-name/sh/shelldap/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   perlPackages,
-  shortenPerlShebang,
 }:
 
 perlPackages.buildPerlPackage rec {
@@ -29,8 +28,6 @@ perlPackages.buildPerlPackage rec {
     YAMLSyck
   ];
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-
   prePatch = ''
     touch Makefile.PL
   '';
@@ -41,10 +38,6 @@ perlPackages.buildPerlPackage rec {
     runHook postInstall
   '';
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/shelldap
-  '';
-
   # no make target 'test', not tests provided by source
   doCheck = false;
 
diff --git a/pkgs/by-name/sh/shine/package.nix b/pkgs/by-name/sh/shine/package.nix
index 903fd51e4edf..ad53d5aed78a 100644
--- a/pkgs/by-name/sh/shine/package.nix
+++ b/pkgs/by-name/sh/shine/package.nix
@@ -5,15 +5,15 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "shine";
-  version = "3.1.1";
+  version = "3.1.1-unstable-2023-01-01";
 
   src = fetchFromGitHub {
     owner = "toots";
     repo = "shine";
-    rev = version;
-    sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg";
+    rev = "ab5e3526b64af1a2eaa43aa6f441a7312e013519";
+    hash = "sha256-rlKWVgIl/WVIzwwMuPyWaiwvbpZi5HvKXU3S6qLoN3I=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/by-name/sh/shtris/package.nix b/pkgs/by-name/sh/shtris/package.nix
index ee70c6eea6ef..269fee615f29 100644
--- a/pkgs/by-name/sh/shtris/package.nix
+++ b/pkgs/by-name/sh/shtris/package.nix
@@ -29,7 +29,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix
index 3ff0b4340c44..c63dc1e22aa7 100644
--- a/pkgs/by-name/si/sidekick/package.nix
+++ b/pkgs/by-name/si/sidekick/package.nix
@@ -42,7 +42,6 @@ buildGoModule rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Command-line tool designed to simplify the process of deploying and managing applications on a VPS";
diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index 3f9db37f9e08..f4797f9349bb 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -63,7 +63,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   doInstallCheck = stdenvNoCC.hostPlatform.isLinux;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://github.com/AsamK/signal-cli";
diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix
index cd94e53c8c97..06a931d16b5f 100644
--- a/pkgs/by-name/si/sigsum/package.nix
+++ b/pkgs/by-name/si/sigsum/package.nix
@@ -35,7 +35,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/sigsum-key";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix
index 3ad4c9c5072d..7ee56ceacbf2 100644
--- a/pkgs/by-name/si/similarity/package.nix
+++ b/pkgs/by-name/si/similarity/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix
index d35779d0f926..9461a0e0b1a4 100644
--- a/pkgs/by-name/si/siril/package.nix
+++ b/pkgs/by-name/si/siril/package.nix
@@ -94,8 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index e8f8ce09677a..d1b47969597e 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix
index 4c2012220a51..f487cd126672 100644
--- a/pkgs/by-name/sk/skhd/package.nix
+++ b/pkgs/by-name/sk/skhd/package.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 1f5aaf9ebda3..e901343a2941 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -40,6 +40,16 @@ clangStdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
+  # Using substituteInPlace because no clean upstream backport for GCC 15 exists for this version of Skia, newer versions fix this with large refactorings.
+  postPatch = ''
+    substituteInPlace include/private/SkSLProgramKind.h \
+      --replace-fail "#include <cinttypes>" "#include <cinttypes>
+    #include <cstdint>"
+    substituteInPlace src/sksl/transform/SkSLTransform.h \
+      --replace-fail "#include <vector>" "#include <vector>
+    #include <cstdint>"
+  '';
+
   preConfigure = with depSrcs; ''
     mkdir -p third_party/externals
     ln -s ${angle2} third_party/externals/angle2
diff --git a/pkgs/by-name/sk/skktools/package.nix b/pkgs/by-name/sk/skktools/package.nix
index 7fb5f1992a84..816b60adbcfe 100644
--- a/pkgs/by-name/sk/skktools/package.nix
+++ b/pkgs/by-name/sk/skktools/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   gdbm,
   glib,
@@ -34,6 +35,16 @@ stdenv.mkDerivation rec {
   #   sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2";
   # };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/skk-dev/skktools/pull/30
+    (fetchpatch {
+      name = "skktools-fix-function-prototype-empty-arguments-gcc15.patch";
+      url = "https://github.com/skk-dev/skktools/commit/fb6a295607dbe2b5171c2c89f8a2f0b82bee9766.patch";
+      hash = "sha256-wao2kRsDq5WN4JO/YpXhNirsdnA3vZpsY9GDCTPSJKY=";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gdbm
diff --git a/pkgs/by-name/sl/sleuthkit/package.nix b/pkgs/by-name/sl/sleuthkit/package.nix
index 2241c3c18c69..d91930eaa07f 100644
--- a/pkgs/by-name/sl/sleuthkit/package.nix
+++ b/pkgs/by-name/sl/sleuthkit/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   ant,
   jdk,
@@ -75,6 +76,18 @@ stdenv.mkDerivation (finalAttrs: {
     chmod -R 755 $IVY_HOME
   '';
 
+  patches = [
+    # Fix build with gcc 15
+    (fetchpatch {
+      url = "https://github.com/sleuthkit/sleuthkit/commit/8d710c36a947a2666bbef689155831d76fff56b9.patch";
+      hash = "sha256-/mCal0EVTM2dM5ok3OmAXQ1HiaCUi0lmhavIuwxVEMA=";
+    })
+    (fetchpatch {
+      url = "https://github.com/sleuthkit/sleuthkit/commit/f78bd37db6be72f8f4d444d124be4e26488dce4b.patch";
+      hash = "sha256-ZEeN0jp5cRi6dOpWlcGYm0nLLu5b56ivdR+WrhnhCz0=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset
   '';
diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix
index 7a68b342ad61..e686bb3d6852 100644
--- a/pkgs/by-name/sl/slipshow/package.nix
+++ b/pkgs/by-name/sl/slipshow/package.nix
@@ -48,7 +48,6 @@ ocamlPackages.buildDunePackage rec {
   doCheck = true;
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix
index 984ca77783f2..55ddccfcf4ff 100644
--- a/pkgs/by-name/sl/slowlorust/package.nix
+++ b/pkgs/by-name/sl/slowlorust/package.nix
@@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Lightweight slowloris (HTTP DoS) tool";
     homepage = "https://github.com/MJVL/slowlorust";
diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index abea2a8237bd..b6ae7a98d191 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sm/smeagol/package.nix b/pkgs/by-name/sm/smeagol/package.nix
index 52aa642aee0a..b886431d0caa 100644
--- a/pkgs/by-name/sm/smeagol/package.nix
+++ b/pkgs/by-name/sm/smeagol/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/smeagol-wiki";
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix
index f4b2cd5a1534..5f9a63eca5e7 100644
--- a/pkgs/by-name/sm/smpmgr/package.nix
+++ b/pkgs/by-name/sm/smpmgr/package.nix
@@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "smpmgr" ];
 
diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix
index 9aa688267d78..ee7cf904e451 100644
--- a/pkgs/by-name/sn/snakefmt/package.nix
+++ b/pkgs/by-name/sn/snakefmt/package.nix
@@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec {
   pythonImportsCheck = [ "snakefmt" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 740e5530b44c..b531989299cf 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -87,8 +87,6 @@ python3Packages.buildPythonApplication rec {
     ])
     ++ [ writableTmpDirAsHomeHook ];
 
-  versionCheckProgramArg = "--version";
-
   enabledTestPaths = [
     "tests/tests.py"
     "tests/test_expand.py"
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index 6da62da38bc4..d092483c5c25 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -88,7 +88,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/sn/snitch/package.nix b/pkgs/by-name/sn/snitch/package.nix
index 2dfdc5f6ac95..1615c366faed 100644
--- a/pkgs/by-name/sn/snitch/package.nix
+++ b/pkgs/by-name/sn/snitch/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "snitch";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "karol-broda";
     repo = "snitch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-V9YoyDAdH/TODVP5nGfOIh0KfsPyZVQg9Mkj7cjy3Xo=";
+    hash = "sha256-SssAiRUfUaDgAoVO2rDacru8e914Wl+4sA4JQ4Mv4eA=";
   };
 
   vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk=";
diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 58ac5cce5dc9..4b9cb21ff217 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Open source Linux client for Checkpoint VPN tunnels";
diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix
index 05eb62917bc7..a74d92b29a99 100644
--- a/pkgs/by-name/so/solana-cli/package.nix
+++ b/pkgs/by-name/so/solana-cli/package.nix
@@ -82,7 +82,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/solana";
-  versionCheckProgramArg = "--version";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd solana \
diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix
index 0edaea143d2a..141795a126a2 100644
--- a/pkgs/by-name/so/solc/package.nix
+++ b/pkgs/by-name/so/solc/package.nix
@@ -32,7 +32,6 @@ let
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
@@ -55,7 +54,6 @@ let
           pname
           version
           nativeInstallCheckInputs
-          versionCheckProgramArg
           doInstallCheck
           meta
           ;
@@ -158,7 +156,6 @@ let
           pname
           version
           nativeInstallCheckInputs
-          versionCheckProgramArg
           doInstallCheck
           meta
           ;
diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix
index ab4a8d5537fd..676fae36822e 100644
--- a/pkgs/by-name/so/somo/package.nix
+++ b/pkgs/by-name/so/somo/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix
index 5b9f8c8977a1..bdf11b100e4d 100644
--- a/pkgs/by-name/so/sops/package.nix
+++ b/pkgs/by-name/so/sops/package.nix
@@ -42,7 +42,6 @@ buildGoModule (final: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix
index 0e3f3afca43d..4a015d8f1063 100644
--- a/pkgs/by-name/sp/spacetimedb/package.nix
+++ b/pkgs/by-name/sp/spacetimedb/package.nix
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/spacetime";
-  versionCheckProgramArg = "--version";
 
   postInstall = ''
     mv $out/bin/spacetimedb-cli $out/bin/spacetime
diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix
index d7a205d02b5c..02c62bc429c4 100644
--- a/pkgs/by-name/sp/spdlog/package.nix
+++ b/pkgs/by-name/sp/spdlog/package.nix
@@ -16,24 +16,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spdlog";
-  version = "1.15.3";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "gabime";
     repo = "spdlog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0rOR9G2Y4Z4OBZtUHxID0s1aXN9ejodHrurlVCA0pIo=";
+    hash = "sha256-VB82cNfpJlamUjrQFYElcy0CXAbkPqZkD5zhuLeHLzs=";
   };
 
-  patches = [
-    # https://github.com/gabime/spdlog/pull/3451
-    (fetchpatch {
-      name = "catch2-3.9.0-compat.patch";
-      url = "https://github.com/gabime/spdlog/commit/3edc8036dbf3c7cdf0e460a913ae294c87ae90dc.patch";
-      hash = "sha256-0XtNaAvDGpSTtQZjxmLbHOoY4OMZDJfLDzBh7gNQh2c=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
   # Required to build tests, even if they aren't executed
   buildInputs = [ catch2_3 ];
diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix
index 1768b139638d..361304524ec1 100644
--- a/pkgs/by-name/sp/speechd/package.nix
+++ b/pkgs/by-name/sp/speechd/package.nix
@@ -15,6 +15,7 @@
   glib,
   dotconf,
   libsndfile,
+  runtimeShell,
   withLibao ? true,
   libao,
   withPulse ? false,
@@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
+    "--sysconfdir=/etc"
     # Audio method falls back from left to right.
     "--with-default-audio-method=\"libao,pulse,alsa,oss\""
     "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
@@ -127,8 +129,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = lib.optionalString withPico ''
     substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang"
+    substituteInPlace src/modules/generic.c --replace-fail "/bin/bash" "${runtimeShell}"
   '';
 
+  installFlags = [
+    "sysconfdir=${placeholder "out"}/etc"
+  ];
+
   postInstall =
     if libsOnly then
       ''
diff --git a/pkgs/by-name/sp/sphinxygen/package.nix b/pkgs/by-name/sp/sphinxygen/package.nix
index 2d227085768a..3d24ecb148a9 100644
--- a/pkgs/by-name/sp/sphinxygen/package.nix
+++ b/pkgs/by-name/sp/sphinxygen/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sphinxygen";
-  version = "1.0.10";
+  version = "1.0.12";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "drobilla";
     repo = "sphinxygen";
     tag = "v${version}";
-    hash = "sha256-Xii5pDa1eHrHUKERC2gDif/NIkpab/IZYBRvMq9YKtE=";
+    hash = "sha256-54D7h6JCsUEh3y6WmpSaMFlRBElve1lscbQtJz+OJTQ=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index 86e2dc3e1d7a..d07a58c5d72d 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -66,7 +66,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix
index afb3bf7411c7..7836c338656e 100644
--- a/pkgs/by-name/sp/spirv-cross/package.nix
+++ b/pkgs/by-name/sp/spirv-cross/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-cross";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Cross";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-Fq2Kw8KOlh35hRZy5EnPtWAjazun4vdTk/HyhY76GRM=";
+    hash = "sha256-BmWHmGh7wu2hkOm04PhHxwTs3e8r8O62tq6SDx6b5xM=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isUnix [
     (lib.cmakeBool "SPIRV_CROSS_SHARED" true)
   ];
 
diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix
index c6861fa3453f..41fe45a1f388 100644
--- a/pkgs/by-name/sp/spirv-headers/package.nix
+++ b/pkgs/by-name/sp/spirv-headers/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-headers";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08=";
+    hash = "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix
index 0a79caa40efe..9cb82cd659f5 100644
--- a/pkgs/by-name/sp/spirv-tools/package.nix
+++ b/pkgs/by-name/sp/spirv-tools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-tools";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-NXxC5XLvEEIAlA0sym6l7vWj+g8pJ4trsJI3pmZwRxU=";
+    hash = "sha256-H+t7ZH4SB+XgWTLj9XaJWZwAWk8M2QeC98Zi5ay8PBc=";
   };
 
   # The cmake options are sufficient for turning on static building, but not
diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix
index 2f12436bb919..8254f81468b0 100644
--- a/pkgs/by-name/sq/sqld/package.nix
+++ b/pkgs/by-name/sq/sqld/package.nix
@@ -65,7 +65,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix
index 954e095ef2ab..a9f3bd29dd16 100644
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
   '';
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix
index f8379d08d710..ee6ebf08e052 100644
--- a/pkgs/by-name/ss/sscg/package.nix
+++ b/pkgs/by-name/ss/sscg/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = gitUpdater { rev-prefix = "sscg-"; };
diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix
index 183925c932bc..0ef9b33ba08f 100644
--- a/pkgs/by-name/ss/ssh-vault/package.nix
+++ b/pkgs/by-name/ss/ssh-vault/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix
index 6ba6011895e0..bfa19b7c947e 100644
--- a/pkgs/by-name/ss/sshocker/package.nix
+++ b/pkgs/by-name/ss/sshocker/package.nix
@@ -28,8 +28,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Tool for SSH, reverse sshfs and port forwarder";
     homepage = "https://github.com/lima-vm/sshocker";
diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix
index f7a9298884bf..01e976f35945 100644
--- a/pkgs/by-name/ss/sshwifty/package.nix
+++ b/pkgs/by-name/ss/sshwifty/package.nix
@@ -1,46 +1,47 @@
 {
   lib,
-  buildGo125Module,
-  buildNpmPackage,
+  buildGoModule,
   fetchFromGitHub,
+  fetchNpmDeps,
+  nodejs,
+  npmHooks,
   versionCheckHook,
   nixosTests,
   nix-update-script,
-  go_1_25,
 }:
-buildGo125Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "sshwifty";
-  version = "0.4.1-beta-release";
+  version = "0.4.2-beta-release";
 
   src = fetchFromGitHub {
     owner = "nirui";
     repo = "sshwifty";
     tag = finalAttrs.version;
-    hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4=";
+    hash = "sha256-nx485HB0JqexcSdwhgbhoAwpK3Cg7tkgDrV3NM93pXk=";
   };
 
-  sshwifty-ui = buildNpmPackage {
-    pname = "sshwifty-ui";
-    inherit (finalAttrs) version src;
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+  ];
 
-    npmDepsHash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA=";
-
-    npmBuildScript = "generate";
-
-    postInstall = ''
-      cp -r application/controller/{static_pages,static_pages.go} \
-        $out/lib/node_modules/sshwifty-ui/application/controller
-    '';
-
-    nativeBuildInputs = [ go_1_25 ];
+  overrideModAttrs = oldAttrs: {
+    nativeBuildInputs = lib.filter (drv: drv != npmHooks.npmConfigHook) oldAttrs.nativeBuildInputs;
+    preBuild = null;
   };
 
-  postPatch = ''
-    cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* .
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-5Y6hTsHSFOPhgLwEhMNOOCyLYNjp1Q5n8My3Q6lr7hQ=";
+  };
+
+  vendorHash = "sha256-4K0fxBBcv+ZSV0ocsoagjFAXRphA27xGO40pnewaKSU=";
+
+  preBuild = ''
+    # Generate static pages
+    npm run generate
   '';
 
-  vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY=";
-
   ldflags = [
     "-s"
     "-X github.com/nirui/sshwifty/application.version=${finalAttrs.version}"
@@ -59,8 +60,6 @@ buildGo125Module (finalAttrs: {
       extraArgs = [
         "--version=unstable"
         "--version-regex=^([0-9.]+(?!.+-prebuild).+$)"
-        "--subpackage"
-        "sshwifty-ui"
       ];
     };
   };
diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix
index e0fdbb09050e..4c9d813e7a2f 100644
--- a/pkgs/by-name/st/stalwart-cli/package.nix
+++ b/pkgs/by-name/st/stalwart-cli/package.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # Prerelease reports incorrect version
   dontVersionCheck = true;
diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix
index 94775b0de9be..aa12d73861a6 100644
--- a/pkgs/by-name/st/star/package.nix
+++ b/pkgs/by-name/st/star/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/STAR";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix
index ddd5c444f98b..97815d6a4791 100644
--- a/pkgs/by-name/st/stasis/package.nix
+++ b/pkgs/by-name/st/stasis/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/st/strip-tags/package.nix b/pkgs/by-name/st/strip-tags/package.nix
index 8f3343bb94fe..1387d5f6f3b8 100644
--- a/pkgs/by-name/st/strip-tags/package.nix
+++ b/pkgs/by-name/st/strip-tags/package.nix
@@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec {
     pyyaml
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "CLI tool for stripping tags from HTML";
diff --git a/pkgs/by-name/st/style50/package.nix b/pkgs/by-name/st/style50/package.nix
index 034f7428aa4e..b72831d5d7f8 100644
--- a/pkgs/by-name/st/style50/package.nix
+++ b/pkgs/by-name/st/style50/package.nix
@@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "style50" ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # no python tests
 
diff --git a/pkgs/by-name/su/submit50/package.nix b/pkgs/by-name/su/submit50/package.nix
index 6c6ddcb451bf..646cd5831241 100644
--- a/pkgs/by-name/su/submit50/package.nix
+++ b/pkgs/by-name/su/submit50/package.nix
@@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "submit50" ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # no python tests
 
diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index f112b9b1309a..7504db39c031 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -78,7 +78,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   # sudo binary fails because it checks if it is suid 0
   versionCheckProgram = "${placeholder "out"}/bin/su";
-  versionCheckProgramArg = "--version";
 
   postInstallCheck = ''
     [ -e ${placeholder "out"}/share/man/man8/sudo.8.gz ] || \
diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix
index 5c4c7e7bbdfa..cd06a419ba49 100644
--- a/pkgs/by-name/su/sus-compiler/package.nix
+++ b/pkgs/by-name/su/sus-compiler/package.nix
@@ -61,7 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/sus_compiler";
-  versionCheckProgramArg = "--version";
 
   updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
 
diff --git a/pkgs/by-name/su/suspicious-package/package.nix b/pkgs/by-name/su/suspicious-package/package.nix
index b757bccd6715..63ba2be0c032 100644
--- a/pkgs/by-name/su/suspicious-package/package.nix
+++ b/pkgs/by-name/su/suspicious-package/package.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix
index 30a4a003359a..7fde0706582f 100644
--- a/pkgs/by-name/sw/swaysome/package.nix
+++ b/pkgs/by-name/sw/swaysome/package.nix
@@ -25,8 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Helper to make sway behave more like awesomewm";
     homepage = "https://gitlab.com/hyask/swaysome";
diff --git a/pkgs/by-name/sy/sylkserver/package.nix b/pkgs/by-name/sy/sylkserver/package.nix
index 154cfcdb3db5..8f8fce608f9f 100644
--- a/pkgs/by-name/sy/sylkserver/package.nix
+++ b/pkgs/by-name/sy/sylkserver/package.nix
@@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/sylk-server";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "SIP/XMPP/WebRTC Application Server";
diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix
index 9cf7000501ef..03d697c53cb2 100644
--- a/pkgs/by-name/sy/systemctl-tui/package.nix
+++ b/pkgs/by-name/sy/systemctl-tui/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index ff1efef04cde..328af70e0ec9 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -141,7 +141,6 @@ rustPlatform.buildRustPackage {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tableplus/darwin.nix b/pkgs/by-name/ta/tableplus/darwin.nix
new file mode 100644
index 000000000000..3326898505e0
--- /dev/null
+++ b/pkgs/by-name/ta/tableplus/darwin.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  fetchurl,
+  _7zz,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tableplus";
+  version = "538";
+  src = fetchurl {
+    url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
+    hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
+  };
+
+  sourceRoot = "TablePlus.app";
+
+  nativeBuildInputs = [ _7zz ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications/TablePlus.app"
+    cp -R . "$out/Applications/TablePlus.app"
+    mkdir "$out/bin"
+    ln -s "$out/Applications/TablePlus.app/Contents/MacOS/TablePlus" "$out/bin/${finalAttrs.pname}"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Database management made easy";
+    homepage = "https://tableplus.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ yamashitax ];
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/by-name/ta/tableplus/linux.nix b/pkgs/by-name/ta/tableplus/linux.nix
new file mode 100644
index 000000000000..7d5e1f3fdaee
--- /dev/null
+++ b/pkgs/by-name/ta/tableplus/linux.nix
@@ -0,0 +1,74 @@
+{
+  autoPatchelfHook,
+  dpkg,
+  fetchurl,
+  gtk3,
+  gtksourceview3,
+  krb5,
+  lib,
+  libgee,
+  libsecret,
+  libxkbcommon,
+  stdenv,
+  wrapGAppsHook3,
+  xorg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tableplus";
+  version = "0.1.284";
+
+  src = fetchurl {
+    url = "https://web.archive.org/web/20251230232124/https://deb.tableplus.com/debian/22/pool/main/t/tableplus/tableplus_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-TrYRRpjSVRD721XEd0gwGPv4RNq/uwaswPW2J8oVjXQ=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+    gtksourceview3
+    krb5
+    libgee
+    libsecret
+    libxkbcommon
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libxcb
+  ];
+
+  unpackPhase = ''
+    dpkg-deb -x $src .
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    substituteInPlace opt/tableplus/tableplus.desktop \
+      --replace-fail "Exec=/usr/local/bin/tableplus" "Exec=tableplus" \
+      --replace-fail "Icon=/opt/tableplus/resource/image/logo.png" "Icon=tableplus"
+    install -Dt $out/bin opt/tableplus/tableplus
+    install -Dt $out/share/applications/ opt/tableplus/tableplus.desktop
+    install -Dt $out/share/icons/hicolor/256x256/apps/ opt/tableplus/resource/image/tableplus.png
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Database management made easy";
+    homepage = "https://tableplus.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ rhydianjenkins ];
+    platforms = lib.platforms.linux;
+    mainProgram = "tableplus";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/ta/tableplus/package.nix b/pkgs/by-name/ta/tableplus/package.nix
index 3326898505e0..7bb06016e0de 100644
--- a/pkgs/by-name/ta/tableplus/package.nix
+++ b/pkgs/by-name/ta/tableplus/package.nix
@@ -1,38 +1,11 @@
 {
-  lib,
-  fetchurl,
-  _7zz,
+  callPackage,
   stdenv,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tableplus";
-  version = "538";
-  src = fetchurl {
-    url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
-    hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
-  };
-
-  sourceRoot = "TablePlus.app";
-
-  nativeBuildInputs = [ _7zz ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/Applications/TablePlus.app"
-    cp -R . "$out/Applications/TablePlus.app"
-    mkdir "$out/bin"
-    ln -s "$out/Applications/TablePlus.app/Contents/MacOS/TablePlus" "$out/bin/${finalAttrs.pname}"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Database management made easy";
-    homepage = "https://tableplus.com";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ yamashitax ];
-    platforms = lib.platforms.darwin;
-  };
-})
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix { }
+else if stdenv.hostPlatform.isLinux then
+  callPackage ./linux.nix { }
+else
+  throw "Unsupported platform: ${stdenv.hostPlatform.system}"
diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index 0850840ca3fb..406ef554b90e 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -125,8 +125,6 @@ python3Packages.buildPythonApplication rec {
       versionCheckHook
     ];
 
-  versionCheckProgramArg = "--version";
-
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 9f55a5263c28..e76305461a08 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -24,7 +24,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "tailscale";
-  version = "1.90.9";
+  version = "1.92.3";
 
   outputs = [
     "out"
@@ -35,10 +35,10 @@ buildGoModule (finalAttrs: {
     owner = "tailscale";
     repo = "tailscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gfpjP1i9077VR/sDclnz+QXJcCffuS0i33m75zo91kM=";
+    hash = "sha256-6dE3kgYABAVtrAjGWnWZ3X4Aq7yJagxNEk6BSyIC3Yk=";
   };
 
-  vendorHash = "sha256-AUOjLomba75qfzb9Vxc0Sktyeces6hBSuOMgboWcDnE=";
+  vendorHash = "sha256-jJSSXMyUqcJoZuqfSlBsKDQezyqS+jDkRglMMjG1K8g=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix
index 6663fe67a9f7..40eee21c2f35 100644
--- a/pkgs/by-name/ta/tailspin/package.nix
+++ b/pkgs/by-name/ta/tailspin/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/tspin";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 56d1e6f1bb74..105b0140ea67 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ta/task-master-ai/package.nix b/pkgs/by-name/ta/task-master-ai/package.nix
index de5dd29aebef..44f2e3b52847 100644
--- a/pkgs/by-name/ta/task-master-ai/package.nix
+++ b/pkgs/by-name/ta/task-master-ai/package.nix
@@ -40,7 +40,6 @@ buildNpmPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/task-master";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Node.js agentic AI workflow orchestrator";
diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 99c765af724a..b1b6d10b9998 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index b59fb0f3d754..4162bf025d27 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -121,8 +121,6 @@ buildNpmPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Unofficial Microsoft Teams client for Linux";
     mainProgram = "teams-for-linux";
diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix
index 8ef60ecc8cfd..539f9a503049 100644
--- a/pkgs/by-name/te/teamtype/package.nix
+++ b/pkgs/by-name/te/teamtype/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix
index 56d99458b46d..2c40c961f145 100644
--- a/pkgs/by-name/te/telegram-bot-api/package.nix
+++ b/pkgs/by-name/te/telegram-bot-api/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Telegram Bot API server";
diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix
index 0680c614457d..4c99b73ff6ca 100644
--- a/pkgs/by-name/te/termshot/package.nix
+++ b/pkgs/by-name/te/termshot/package.nix
@@ -28,7 +28,6 @@ buildGoModule (finalAttrs: {
   checkFlags = [ "-skip=^TestPtexec$" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
index 4da018d02a38..ed913bb669e2 100644
--- a/pkgs/by-name/te/terraform-mcp-server/package.nix
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -28,7 +28,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Terraform Model Context Protocol (MCP) Server";
diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix
index 7027ebf3f7d9..dc7ad1480a25 100644
--- a/pkgs/by-name/te/texlab/package.nix
+++ b/pkgs/by-name/te/texlab/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "texlab";
-  version = "5.25.0";
+  version = "5.25.1";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UI88DQjLRJRPgKX3A+PoLNzgm/9uJeNERTrzh5mnAEk=";
+    hash = "sha256-hd7fDnZqNEz4Ayop3uPqL4IU6xgGsTjMhGvgF+Trgcw=";
   };
 
-  cargoHash = "sha256-xDLKuAfLyo3V++OKb+anw9oHxehwUxqfnDCuT2GSDWw=";
+  cargoHash = "sha256-4HFl6bPCHSUhHD5QB8sOK6irUaCAioZgKBm67REEYR8=";
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
 
diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 7b10f2fd4a20..671c325cb75d 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -36,8 +36,6 @@ buildGo125Module (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru.withPlugins =
     plugins:
     let
diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index b56882f7d653..5ab5c6a01b55 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -49,7 +49,6 @@ buildGoModule rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix
index f3913ee6bd05..6e10752f66dc 100644
--- a/pkgs/by-name/th/theharvester/package.nix
+++ b/pkgs/by-name/th/theharvester/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "theharvester";
-  version = "4.8.2";
+  version = "4.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "laramies";
     repo = "theharvester";
     tag = version;
-    hash = "sha256-Sui9PKpp+iMxCUbFcZE2OVDiBCxXLwR9iuXFIbd0P0k=";
+    hash = "sha256-2PiwfLqpVa29//DJJRM/zw2xFHI4cp1WE4VKsJ/zEro=";
   };
 
   pythonRelaxDeps = true;
@@ -33,19 +33,19 @@ python3.pkgs.buildPythonApplication rec {
     certifi
     dnspython
     fastapi
+    httpx
     lxml
     netaddr
-    ujson
     playwright
     plotly
     pyppeteer
     python-dateutil
     pyyaml
-    requests
     retrying
     shodan
     slowapi
     starlette
+    ujson
     uvicorn
     uvloop
   ];
@@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec {
       gathers emails, names, subdomains, IPs, and URLs using multiple public data sources.
     '';
     homepage = "https://github.com/laramies/theHarvester";
-    changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}";
+    changelog = "https://github.com/laramies/theHarvester/releases/tag/${src.tag}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       c0bw3b
diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index 1286d54fb83a..834048882e0f 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -56,6 +56,14 @@ stdenv.mkDerivation rec {
       extraPrefix = "tiledb/sm/serialization/";
       hash = "sha256-5z/eJEHl+cnWRf1sMULodJyhmNh5KinDLlL1paMNiy4=";
     })
+
+    # Fix build with gcc15
+    # https://github.com/TileDB-Inc/TileDB/pull/5612
+    (fetchpatch {
+      name = "tiledb-set-c-version-to-c99.patch";
+      url = "https://github.com/TileDB-Inc/TileDB/commit/4f946ad57fe823c3f53c06bf29dc18799ec6395a.patch";
+      hash = "sha256-chdaa6Ysqeb3p+FcWp7GTnAzgShoPGSCErmIGn+Q4tA=";
+    })
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ];
 
diff --git a/pkgs/by-name/ti/timoni/package.nix b/pkgs/by-name/ti/timoni/package.nix
index b5940eb3a44b..a6cd04268d3a 100644
--- a/pkgs/by-name/ti/timoni/package.nix
+++ b/pkgs/by-name/ti/timoni/package.nix
@@ -42,7 +42,6 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/tm/tmc-cli/package.nix b/pkgs/by-name/tm/tmc-cli/package.nix
index 21d407b6729a..84913922d3d4 100644
--- a/pkgs/by-name/tm/tmc-cli/package.nix
+++ b/pkgs/by-name/tm/tmc-cli/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix
index 2d0068284bf7..babf4f711d14 100644
--- a/pkgs/by-name/tm/tmux-sessionizer/package.nix
+++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix
index 538f734e86c1..d5684ba350c3 100644
--- a/pkgs/by-name/tm/tmuxai/package.nix
+++ b/pkgs/by-name/tm/tmuxai/package.nix
@@ -33,7 +33,6 @@ buildGoModule (finalAttrs: {
   ];
 
   versionCheckKeepEnvironment = [ "HOME" ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/to/tocaia/package.nix b/pkgs/by-name/to/tocaia/package.nix
index 1ba0b6493120..3c52e4d5271f 100644
--- a/pkgs/by-name/to/tocaia/package.nix
+++ b/pkgs/by-name/to/tocaia/package.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix
index d79c2a1a5adf..81cd240974fb 100644
--- a/pkgs/by-name/to/tofu-ls/package.nix
+++ b/pkgs/by-name/to/tofu-ls/package.nix
@@ -42,7 +42,6 @@ buildGoModule (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix
index 59d995a4cd83..fd3614a81618 100644
--- a/pkgs/by-name/to/tokei/package.nix
+++ b/pkgs/by-name/to/tokei/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures = [ "all" ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/to/tombl/package.nix b/pkgs/by-name/to/tombl/package.nix
index 6ceb7edd459b..d2f54cb6e440 100644
--- a/pkgs/by-name/to/tombl/package.nix
+++ b/pkgs/by-name/to/tombl/package.nix
@@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index 70b9a6243187..e0d31196d588 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -81,7 +81,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix
index e3691a0467b6..68b0e864c5dd 100644
--- a/pkgs/by-name/to/tor/package.nix
+++ b/pkgs/by-name/to/tor/package.nix
@@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 73d4a973d2af..f2bf86154ba1 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix
index e7afc2c7675b..352891d3c75d 100644
--- a/pkgs/by-name/tr/tradcpp/package.nix
+++ b/pkgs/by-name/tr/tradcpp/package.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
   # tradcpp only comes with BSD-make Makefile; the patch adds configure support
   patches = [ ./tradcpp-configure.patch ];
 
+  # Fix build with gcc15
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   strictDeps = true;
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index d7bdbebf2884..74e83f4442c7 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -42,8 +42,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Find credentials all over the place";
     homepage = "https://github.com/trufflesecurity/trufflehog";
diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix
index 8d0dcad7b22e..d9f7b7d9442b 100644
--- a/pkgs/by-name/tr/trurl/package.nix
+++ b/pkgs/by-name/tr/trurl/package.nix
@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Command line tool for URL parsing and manipulation";
diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix
index 8194ae38e2f1..9feafa7fb7cb 100644
--- a/pkgs/by-name/tr/trzsz-ssh/package.nix
+++ b/pkgs/by-name/tr/trzsz-ssh/package.nix
@@ -27,7 +27,6 @@ buildGoModule (finalAttrs: {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index 5e0b84586d11..1688c044550b 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
   ]);
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix
index 7db0c2905888..9f836c1c5bdc 100644
--- a/pkgs/by-name/ts/tsx/package.nix
+++ b/pkgs/by-name/ts/tsx/package.nix
@@ -92,7 +92,6 @@ stdenv.mkDerivation rec {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js";
diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix
index fff3cb24c36e..453f3752c257 100644
--- a/pkgs/by-name/tt/tt-burnin/package.nix
+++ b/pkgs/by-name/tt/tt-burnin/package.nix
@@ -36,8 +36,6 @@ python3Packages.buildPythonApplication rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     mainProgram = "tt-burnin";
     description = "Command line utility to run a high power consumption workload on TT devices";
diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix
index fad569cf70db..d0a10ed363d5 100644
--- a/pkgs/by-name/tt/tt-smi/package.nix
+++ b/pkgs/by-name/tt/tt-smi/package.nix
@@ -42,8 +42,6 @@ python3Packages.buildPythonApplication rec {
   # Fails due to having no tests
   dontUsePytestCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     mainProgram = "tt-smi";
     description = "Tenstorrent console based hardware information program";
diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix
index 0ae7af8deccb..239f5c9e6ff8 100644
--- a/pkgs/by-name/tt/tt-topology/package.nix
+++ b/pkgs/by-name/tt/tt-topology/package.nix
@@ -54,8 +54,6 @@ python3Packages.buildPythonApplication rec {
   # Tests are broken
   dontUsePytestCheck = true;
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     mainProgram = "tt-topology";
     description = "Command line utility used to flash multiple NB cards on a system to use specific eth routing configurations";
diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix
index 64779dc217c1..1e445ffa6b84 100644
--- a/pkgs/by-name/tt/ttysvr/package.nix
+++ b/pkgs/by-name/tt/ttysvr/package.nix
@@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 5c377cc73405..1f8c85e31b3b 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix
index 0409eb13f390..4aaeee7869f8 100644
--- a/pkgs/by-name/tu/tuisky/package.nix
+++ b/pkgs/by-name/tu/tuisky/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index a386f18e687d..f6cac261265e 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/turn-server";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/tu/turso/package.nix b/pkgs/by-name/tu/turso/package.nix
index f2315e5499a8..17f653dfe44a 100644
--- a/pkgs/by-name/tu/turso/package.nix
+++ b/pkgs/by-name/tu/turso/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix
index df15a1f91d29..d498219fcc7c 100644
--- a/pkgs/by-name/tu/tuxedo-rs/package.nix
+++ b/pkgs/by-name/tu/tuxedo-rs/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   postInstall = ''
     install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d
diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 8be945c009fb..f5da6e9c8111 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -65,7 +65,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index 792bad6e71f7..d7083e498969 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -28,7 +28,6 @@ buildNpmPackage (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/tsc";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index dd33b6964e95..87fab88b53a6 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -98,7 +98,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ];
diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 7b27c250474a..6c62d627d255 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Source code spell checker";
diff --git a/pkgs/by-name/ty/typst/build-universe-package.nix b/pkgs/by-name/ty/typst/build-universe-package.nix
new file mode 100644
index 000000000000..a7628f6412dd
--- /dev/null
+++ b/pkgs/by-name/ty/typst/build-universe-package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildTypstPackage,
+  fetchzip,
+  typstPackages,
+}:
+lib.extendMkDerivation {
+  inheritFunctionArgs = false;
+  constructDrv = buildTypstPackage;
+
+  excludeDrvArgNames = [
+    "description"
+    "hash"
+    "license"
+    "homepage"
+    "typstDeps"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname,
+      version,
+      description,
+      hash,
+      license,
+      homepage ? null,
+      typstDeps ? [ ],
+    }:
+    {
+      src = fetchzip {
+        inherit hash;
+        url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+        stripRoot = false;
+      };
+
+      typstDeps = builtins.filter (x: x != null) (
+        lib.map (d: (lib.attrsets.attrByPath [ d ] null typstPackages)) typstDeps
+      );
+
+      meta = {
+        inherit description;
+        maintainers = with lib.maintainers; [
+          cherrypiejam
+          RossSmyth
+        ];
+        license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) license;
+      }
+      // lib.optionalAttrs (homepage != null) { inherit homepage; };
+    };
+}
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index 945bed2da8d5..d39d2ec94d3c 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix
index 6a460aafb80f..a32f92cc95a0 100644
--- a/pkgs/by-name/ty/typst/typst-packages.nix
+++ b/pkgs/by-name/ty/typst/typst-packages.nix
@@ -1,53 +1,69 @@
 {
   lib,
   callPackage,
+  newScope,
 }:
-
 let
   toPackageName = name: version: "${name}_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
-lib.makeExtensible (
-  final:
-  lib.recurseIntoAttrs (
-    lib.foldlAttrs (
-      packageSet: pname: versionSet:
-      packageSet
-      // (lib.foldlAttrs (
-        subPackageSet: version: packageSpec:
-        subPackageSet
-        // {
-          ${toPackageName pname version} = callPackage (
-            {
-              lib,
-              buildTypstPackage,
-              fetchzip,
-            }:
-            buildTypstPackage (finalAttrs: {
-              inherit pname version;
+lib.makeScope newScope (
+  self:
+  let
+    # Not public, so do not expose to the package set
+    buildUniversePackage = self.callPackage ./build-universe-package.nix { typstPackages = self; };
 
-              src = fetchzip {
-                inherit (packageSpec) hash;
-                url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-                stripRoot = false;
-              };
+    # Creates a versioned package out of a name, version, and packageSpec
+    makeVersionedPackage = pname: version: packageSpec: {
+      name = toPackageName pname version;
 
-              typstDeps = builtins.filter (x: x != null) (
-                lib.map (d: (lib.attrsets.attrByPath [ d ] null final)) packageSpec.typstDeps
-              );
+      value = buildUniversePackage {
+        homepage = packageSpec.homepage or null;
+        inherit pname version;
+        inherit (packageSpec)
+          hash
+          description
+          license
+          typstDeps
+          ;
+      };
+    };
 
-              meta = {
-                inherit (packageSpec) description;
-                maintainers = with lib.maintainers; [ cherrypiejam ];
-                license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) packageSpec.license;
-              }
-              // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { });
-            })
-          ) { };
-        }
-      ) { } versionSet)
-      // {
-        ${pname} = final.${toPackageName pname (lib.last (lib.attrNames versionSet))};
-      }
-    ) { } (lib.importTOML ./typst-packages-from-universe.toml)
-  )
+    # Create a derivation for each package. This is in the format of
+    # typstPackages.${package}_version
+    versionedPackages = lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [
+      # 1. Create a list of versioned packages
+      # Only recurse 2 levels deep because the leaf attrs are the pkgspec attrs
+      (lib.mapAttrsToListRecursiveCond (path: _: (lib.length path) < 2) (
+        path:
+        let
+          # Path is always [ path version ]
+          pname = lib.head path;
+          version = lib.last path;
+        in
+        makeVersionedPackage pname version
+      ))
+      # 2. Transform the list into a flat attrset
+      lib.listToAttrs
+    ];
+
+    # Take two version strings and return the newer one
+    selectNewerVersion = v1: v2: if lib.versionOlder v1 v2 then v2 else v1;
+
+    # Select the latest version of each package to represent the
+    # unversioned derivation in the format of:
+    # typstPackages.${package}
+    latestPackages = lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [
+      # Take in the attrset of each package and all its versions
+      # Compare each version and find the latest one.
+      # Then select it from the versioned package set
+      (lib.mapAttrs (
+        pname: versions:
+        let
+          latestVersion = lib.foldl' selectNewerVersion "0.0.0" (lib.attrNames versions);
+        in
+        versionedPackages.${toPackageName pname latestVersion}
+      ))
+    ];
+  in
+  versionedPackages // latestPackages
 )
diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 4c132b3d4e6e..ab55601b3741 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/uc/ucon64/package.nix b/pkgs/by-name/uc/ucon64/package.nix
index 7f5551fd7108..d1045d1b946a 100644
--- a/pkgs/by-name/uc/ucon64/package.nix
+++ b/pkgs/by-name/uc/ucon64/package.nix
@@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index dfc61152edf7..c68cc0dd19b2 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -73,7 +73,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = versionInfo.updateScript;
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index e2a02d4e371f..ee09fdb98eb5 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ultrastardx";
-  version = "2025.12.0";
+  version = "2025.12.1";
 
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "USDX";
     rev = "v${version}";
-    hash = "sha256-t+sfDmZmZccFndlL+v3H3qyTLD5sCsYbWmwqYtC9jK0=";
+    hash = "sha256-NwYFsd15nUgEnzQaoZdp7Au1H1QrrpoZX8PmnQ9URVA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix
index dc45542e7cd7..a2cb8c016542 100644
--- a/pkgs/by-name/un/unblob/package.nix
+++ b/pkgs/by-name/un/unblob/package.nix
@@ -122,8 +122,6 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ runtimeDeps;
 
-  versionCheckProgramArg = "--version";
-
   pytestFlags = [
     "--no-cov"
   ];
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 62657e2f4c36..dc8c7879d523 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -52,17 +52,18 @@
   nix-update-script,
   # for passthru.tests
   gnutls,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
-  version = "1.24.1";
+  version = "1.24.2";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "unbound";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ=";
+    hash = "sha256-kyTcDmNGKJuOMZ7cxIWh6o7aasRUoAB4M0tIG81BQsE=";
   };
 
   outputs = [
@@ -202,6 +203,12 @@ stdenv.mkDerivation (finalAttrs: {
       ) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'"
     ) (builtins.filter (p: p != null) finalAttrs.buildInputs);
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "-V";
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [
@@ -219,7 +226,9 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Validating, recursive, and caching DNS resolver";
     license = lib.licenses.bsd3;
     homepage = "https://www.unbound.net";
+    changelog = "https://github.com/NLnetLabs/unbound/releases/tag/release-${finalAttrs.version}";
     maintainers = with lib.maintainers; [ Scrumplex ];
+    mainProgram = "unbound";
     platforms = with lib.platforms; unix ++ windows;
   };
 })
diff --git a/pkgs/by-name/un/unftp/package.nix b/pkgs/by-name/un/unftp/package.nix
index 5741d5017b74..59b456e791c1 100644
--- a/pkgs/by-name/un/unftp/package.nix
+++ b/pkgs/by-name/un/unftp/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch b/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch
new file mode 100644
index 000000000000..11fa0d9f9bfa
--- /dev/null
+++ b/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch
@@ -0,0 +1,20 @@
+From: Andreas Schwab <schwab@linux-m68k.org>
+Subject: Initialize the symlink flag
+Bug-Debian: https://bugs.debian.org/717029
+X-Debian-version: 6.0-10
+
+--- a/process.c
++++ b/process.c
+@@ -1758,6 +1758,12 @@
+         = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11);
+ #endif
+ 
++#ifdef SYMLINKS
++    /* Initialize the symlink flag, may be set by the platform-specific
++       mapattr function.  */
++    G.pInfo->symlink = 0;
++#endif
++
+     return PK_COOL;
+ 
+ } /* end function process_cdir_file_hdr() */
diff --git a/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch b/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch
new file mode 100644
index 000000000000..8f5351e8cd82
--- /dev/null
+++ b/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch
@@ -0,0 +1,173 @@
+From: Steven M. Schweda <sms@antinode.info>
+Subject: Fix for CVE-2022-0529 and CVE-2022-0530
+Bug-Debian: https://bugs.debian.org/1010355
+X-Debian-version: 6.0-27
+
+--- a/fileio.c
++++ b/fileio.c
+@@ -171,8 +171,10 @@
+ static ZCONST char Far FilenameTooLongTrunc[] =
+   "warning:  filename too long--truncating.\n";
+ #ifdef UNICODE_SUPPORT
++   static ZCONST char Far UFilenameCorrupt[] =
++     "error: Unicode filename corrupt.\n";
+    static ZCONST char Far UFilenameTooLongTrunc[] =
+-     "warning:  Converted unicode filename too long--truncating.\n";
++     "warning:  Converted Unicode filename too long--truncating.\n";
+ #endif
+ static ZCONST char Far ExtraFieldTooLong[] =
+   "warning:  extra field too long (%d).  Ignoring...\n";
+@@ -2361,16 +2363,30 @@
+                   /* convert UTF-8 to local character set */
+                   fn = utf8_to_local_string(G.unipath_filename,
+                                             G.unicode_escape_all);
+-                  /* make sure filename is short enough */
+-                  if (strlen(fn) >= FILNAMSIZ) {
+-                    fn[FILNAMSIZ - 1] = '\0';
++
++                  /* 2022-07-22 SMS, et al.  CVE-2022-0530
++                   * Detect conversion failure, emit message.
++                   * Continue with unconverted name.
++                   */
++                  if (fn == NULL)
++                  {
+                     Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(UFilenameTooLongTrunc)));
+-                    error = PK_WARN;
++                     LoadFarString(UFilenameCorrupt)));
++                    error = PK_ERR;
++                  }
++                  else
++                  {
++                    /* make sure filename is short enough */
++                    if (strlen(fn) >= FILNAMSIZ) {
++                      fn[FILNAMSIZ - 1] = '\0';
++                      Info(slide, 0x401, ((char *)slide,
++                        LoadFarString(UFilenameTooLongTrunc)));
++                      error = PK_WARN;
++                    }
++                    /* replace filename with converted UTF-8 */
++                    strcpy(G.filename, fn);
++                    free(fn);
+                   }
+-                  /* replace filename with converted UTF-8 */
+-                  strcpy(G.filename, fn);
+-                  free(fn);
+                 }
+ # endif /* UNICODE_WCHAR */
+                 if (G.unipath_filename != G.filename_full)
+--- a/process.c
++++ b/process.c
+@@ -222,6 +222,8 @@
+      "\nwarning:  Unicode Path version > 1\n";
+    static ZCONST char Far UnicodeMismatchError[] =
+      "\nwarning:  Unicode Path checksum invalid\n";
++   static ZCONST char Far UFilenameTooLongTrunc[] =
++     "warning:  filename too long (P1) -- truncating.\n";
+ #endif
+ 
+ 
+@@ -1915,7 +1917,7 @@
+     Sets both local header and central header fields.  Not terribly clever,
+     but it means that this procedure is only called in one place.
+ 
+-    2014-12-05 SMS.
++    2014-12-05 SMS.  (oCERT.org report.)  CVE-2014-8141.
+     Added checks to ensure that enough data are available before calling
+     makeint64() or makelong().  Replaced various sizeof() values with
+     simple ("4" or "8") constants.  (The Zip64 structures do not depend
+@@ -1947,9 +1949,10 @@
+               ef_len - EB_HEADSIZE));
+             break;
+         }
++
+         if (eb_id == EF_PKSZ64)
+         {
+-          int offset = EB_HEADSIZE;
++          unsigned offset = EB_HEADSIZE;
+ 
+           if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
+           {
+@@ -2046,7 +2049,7 @@
+         }
+         if (eb_id == EF_UNIPATH) {
+ 
+-          int offset = EB_HEADSIZE;
++          unsigned offset = EB_HEADSIZE;
+           ush ULen = eb_len - 5;
+           ulg chksum = CRCVAL_INITIAL;
+ 
+@@ -2504,16 +2507,17 @@
+   int state_dependent;
+   int wsize = 0;
+   int max_bytes = MB_CUR_MAX;
+-  char buf[9];
++  char buf[ MB_CUR_MAX+ 1];             /* ("+1" not really needed?) */
+   char *buffer = NULL;
+   char *local_string = NULL;
++  size_t buffer_size;                   /* CVE-2022-0529 */
+ 
+   for (wsize = 0; wide_string[wsize]; wsize++) ;
+ 
+   if (max_bytes < MAX_ESCAPE_BYTES)
+     max_bytes = MAX_ESCAPE_BYTES;
+-
+-  if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
++  buffer_size = wsize * max_bytes + 1;          /* Reused below. */
++  if ((buffer = (char *)malloc( buffer_size)) == NULL) {
+     return NULL;
+   }
+ 
+@@ -2551,8 +2555,28 @@
+     } else {
+       /* no MB for this wide */
+         /* use escape for wide character */
+-        char *escape_string = wide_to_escape_string(wide_string[i]);
+-        strcat(buffer, escape_string);
++        size_t buffer_len;
++        size_t escape_string_len;
++        char *escape_string;
++        int err_msg = 0;
++
++        escape_string = wide_to_escape_string(wide_string[i]);
++        buffer_len = strlen( buffer);
++        escape_string_len = strlen( escape_string);
++
++        /* Append escape string, as space allows. */
++        /* 2022-07-18 SMS, et al.  CVE-2022-0529 */
++        if (escape_string_len > buffer_size- buffer_len- 1)
++        {
++            escape_string_len = buffer_size- buffer_len- 1;
++            if (err_msg == 0)
++            {
++                err_msg = 1;
++                Info(slide, 0x401, ((char *)slide,
++                 LoadFarString( UFilenameTooLongTrunc)));
++            }
++        }
++        strncat( buffer, escape_string, escape_string_len);
+         free(escape_string);
+     }
+   }
+@@ -2604,9 +2628,18 @@
+   ZCONST char *utf8_string;
+   int escape_all;
+ {
+-  zwchar *wide = utf8_to_wide_string(utf8_string);
+-  char *loc = wide_to_local_string(wide, escape_all);
+-  free(wide);
++  zwchar *wide;
++  char *loc = NULL;
++
++  wide = utf8_to_wide_string( utf8_string);
++
++  /* 2022-07-25 SMS, et al.  CVE-2022-0530 */
++  if (wide != NULL)
++  {
++    loc = wide_to_local_string( wide, escape_all);
++    free( wide);
++  }
++
+   return loc;
+ }
+ 
diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix
index edcf4bdfa13e..efe3226d6cdd 100644
--- a/pkgs/by-name/un/unzip/package.nix
+++ b/pkgs/by-name/un/unzip/package.nix
@@ -52,14 +52,8 @@ stdenv.mkDerivation rec {
       name = "CVE-2019-13232-3.patch";
       sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
     })
-    (fetchurl {
-      url = "https://gist.github.com/veprbl/41261bb781571e2246ea42d3f37795f5/raw/d8533d8c6223150f76b0f31aec03e185fcde3579/06-initialize-the-symlink-flag.patch";
-      sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj";
-    })
-    (fetchurl {
-      url = "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch";
-      sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc=";
-    })
+    ./06-initialize-the-symlink-flag.patch
+    ./28-cve-2022-0529-and-cve-2022-0530.patch
     # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the
     # configure script to fail to detect errno and the directory libraries on Darwin.
     ./implicit-declarations-fix.patch
diff --git a/pkgs/by-name/up/updog/package.nix b/pkgs/by-name/up/updog/package.nix
index af3b627f4c4b..cf5cd839c175 100644
--- a/pkgs/by-name/up/updog/package.nix
+++ b/pkgs/by-name/up/updog/package.nix
@@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # no python tests
 
diff --git a/pkgs/by-name/ur/uradvd/package.nix b/pkgs/by-name/ur/uradvd/package.nix
index 12d12905b3b6..71a0729b5541 100644
--- a/pkgs/by-name/ur/uradvd/package.nix
+++ b/pkgs/by-name/ur/uradvd/package.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix
index 6111d773cefe..84db6dddf93f 100644
--- a/pkgs/by-name/us/usacloud/package.nix
+++ b/pkgs/by-name/us/usacloud/package.nix
@@ -27,7 +27,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix
index 861a16faf1f3..ec2586bb7d67 100644
--- a/pkgs/by-name/ut/utf8proc/package.nix
+++ b/pkgs/by-name/ut/utf8proc/package.nix
@@ -7,24 +7,25 @@
   tmux,
   fcft,
   arrow-cpp,
+  enableStatic ? stdenv.hostPlatform.isStatic,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "utf8proc";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "JuliaStrings";
     repo = "utf8proc";
-    rev = "v${version}";
-    hash = "sha256-fFeevzek6Oql+wMmkZXVzKlDh3wZ6AjGCKJFsXBaqzg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/+/IrsLQ9ykuVOaItd2ZbX60pPlP2omvS1qJz51AnWA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DUTF8PROC_ENABLE_TESTING=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!enableStatic))
+    (lib.cmakeBool "UTF8PROC_ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
   ];
 
   doCheck = true;
@@ -43,4 +44,4 @@ stdenv.mkDerivation rec {
       lib.maintainers.sternenseemann
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index b71a6d6bfb03..2127517fe8e0 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -183,6 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -svf "$bin/bin/hexdump" "$bin/bin/hd"
     ln -svf "$man/share/man/man1/hexdump.1" "$man/share/man/man1/hd.1"
 
+    rm -f bash-completion/Makemodule.am
     installShellCompletion --bash bash-completion/*
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
index 1d9630d28651..e5142e2ce05d 100644
--- a/pkgs/by-name/uu/uutils-coreutils/package.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: {
       prefix' = lib.optionalString (prefix != null) prefix;
     in
     "${placeholder "out"}/bin/${prefix'}ls";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix
index 4ca34b96f303..b072ad7ef08f 100644
--- a/pkgs/by-name/uu/uutils-findutils/package.nix
+++ b/pkgs/by-name/uu/uutils-findutils/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/find";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 113c53af2120..c92c9362668c 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.9.20";
+  version = "0.9.21";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-q8NoNzsqSCsnQNGXNYhW1shSwrpRjoiqq6L8LEHUbVU=";
+    hash = "sha256-/Fis5719wA76HzyfVCOboXUhCVXBtGvNZm2lIhESv5o=";
   };
 
-  cargoHash = "sha256-E+ruzlsiyolctbnNi7vvkNO6j/5HpAir3UXz6uTbJos=";
+  cargoHash = "sha256-N0D0PSehHKioI4SWqLfCV/eoLjM6MbNySOWYabzKd4I=";
 
   buildInputs = [
     rust-jemalloc-sys
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   );
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix
index 6879cf04b862..d565f8de3fc9 100644
--- a/pkgs/by-name/v4/v4l-utils/package.nix
+++ b/pkgs/by-name/v4/v4l-utils/package.nix
@@ -18,6 +18,7 @@
   udevCheckHook,
   withUtils ? true,
   withGUI ? true,
+  withBPF ? true,
   alsa-lib,
   libGLU,
   qt6Packages,
@@ -62,14 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "gconv" stdenv.hostPlatform.isGnu)
     (lib.mesonEnable "qv4l2" withQt)
     (lib.mesonEnable "qvidcap" withQt)
+    (lib.mesonEnable "bpf" withBPF)
     (lib.mesonOption "udevdir" "${placeholder "out"}/lib/udev")
   ]
   ++ lib.optionals stdenv.hostPlatform.isGnu [
     (lib.mesonOption "gconvsysdir" "${glibc.out}/lib/gconv")
-  ]
-  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    # BPF support fail to cross compile, unable to find `linux/lirc.h`
-    (lib.mesonOption "bpf" "disabled")
   ];
 
   postFixup = ''
@@ -78,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    clang
     doxygen
     meson
     ninja
@@ -86,15 +83,18 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     udevCheckHook
   ]
+  ++ lib.optional withBPF clang
   ++ lib.optional withQt qt6Packages.wrapQtAppsHook;
 
   buildInputs = [
     json_c
-    libbpf
-    libelf
     udev
   ]
   ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone
+  ++ lib.optionals withBPF [
+    libbpf
+    libelf
+  ]
   ++ lib.optionals withQt [
     alsa-lib
     qt6Packages.qt5compat
diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix
index 0d782f78ce65..10852ffa951a 100644
--- a/pkgs/by-name/va/vassal/package.nix
+++ b/pkgs/by-name/va/vassal/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/vassal";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Free, open-source boardgame engine";
diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix
index cd70ea32d0e7..59e9df325a08 100644
--- a/pkgs/by-name/va/vaultwarden/package.nix
+++ b/pkgs/by-name/va/vaultwarden/package.nix
@@ -19,16 +19,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "vaultwarden";
-  version = "1.34.3";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
-    rev = version;
-    hash = "sha256-Dj0ySVRvBZ/57+UHas3VI8bi/0JBRqn0IW1Dq+405J0=";
+    tag = version;
+    hash = "sha256-Thj/I9eLngErUskKxnJ5Bd2Q9Hgp1e/6hWiiEyJ7lOQ=";
   };
 
-  cargoHash = "sha256-4sDagd2XGamBz1XvDj4ycRVJ0F+4iwHOPlj/RglNDqE=";
+  cargoHash = "sha256-/sKUAADlxzMOyThvYhFLK52oOePFQC1V8hF9Ay5Atis=";
 
   # used for "Server Installed" version in admin panel
   env.VW_VERSION = version;
diff --git a/pkgs/by-name/va/vaultwarden/update.nix b/pkgs/by-name/va/vaultwarden/update.nix
index 94034fa03884..514f2377cdc8 100644
--- a/pkgs/by-name/va/vaultwarden/update.nix
+++ b/pkgs/by-name/va/vaultwarden/update.nix
@@ -30,12 +30,12 @@ lib.getExe (writeShellApplication {
     VAULTWARDEN_VERSION=$(curl --silent https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest | jq -r '.tag_name')
     nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION"
 
-    URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/DockerSettings.yaml"
-    WEBVAULT_VERSION="$(curl --silent "$URL" | yq -r ".vault_version" | sed s/^v//)"
-    old_hash="$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash)"
-    new_hash="$(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")"
-    new_hash_sri="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$new_hash")"
-    sed -e "s#$old_hash#$new_hash_sri#" -i pkgs/tools/security/vaultwarden/webvault.nix
-    nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION"
+    URL_VAULTWARDEN_DOCKER_SETTINGS="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/DockerSettings.yaml"
+    WEBVAULT_VERSION="$(curl --silent "$URL_VAULTWARDEN_DOCKER_SETTINGS" | yq -r ".vault_version")"
+    URL_BW_WEBVAULT_DOCKERFILE="https://raw.githubusercontent.com/dani-garcia/bw_web_builds/refs/tags/''${WEBVAULT_VERSION}/Dockerfile"
+    WEBVAULT_REV="$(curl --silent "$URL_BW_WEBVAULT_DOCKERFILE" | grep -m1 "^ARG VAULT_VERSION=" | cut -d'=' -f2)"
+    URL_VW_WEBVAULT_TAGS="https://api.github.com/repos/vaultwarden/vw_web_builds/tags"
+    WEBVAULT_TAG="$(curl --silent "$URL_VW_WEBVAULT_TAGS" | jq -r --arg rev "''${WEBVAULT_REV}" '.[] | select(.commit.sha == $rev) | .name')"
+    nix-update "vaultwarden.webvault" --version "$WEBVAULT_TAG"
   '';
 })
diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix
index 9735a0c06ee6..5f292537c3a7 100644
--- a/pkgs/by-name/va/vaultwarden/webvault.nix
+++ b/pkgs/by-name/va/vaultwarden/webvault.nix
@@ -1,27 +1,33 @@
 {
   lib,
   buildNpmPackage,
+  nodejs_22,
   fetchFromGitHub,
   nixosTests,
   python3,
+  dart-sass,
   vaultwarden,
 }:
 
 buildNpmPackage rec {
   pname = "vaultwarden-webvault";
-  version = "2025.7.0.0";
+  version = "2025.12.0.0";
+
+  # doesn't build with newer versions
+  nodejs = nodejs_22;
 
   src = fetchFromGitHub {
     owner = "vaultwarden";
     repo = "vw_web_builds";
     tag = "v${version}";
-    hash = "sha256-CnVOi4xE0+VFTm0yI4++MBv8w0vgtsRE5E2RwsLojMI=";
+    hash = "sha256-j31wroJKBa6pQFDTGtZBBljXVvpt8233G2oTj8oz3fo=";
   };
 
-  npmDepsHash = "sha256-QoZtiZpS8jVIaGKHcfKbtBrrn+RcMRvm1/oF23nPPQw=";
+  npmDepsHash = "sha256-OT9Ll+F4e/yOJVpay/zwfEHcBqRvSFOM2mtlrJ8E6fs=";
 
   nativeBuildInputs = [
     python3
+    dart-sass
   ];
 
   makeCacheWritable = true;
@@ -31,6 +37,10 @@ buildNpmPackage rec {
     npm_config_build_from_source = "true";
   };
 
+  preBuild = ''
+    echo "export const compilerCommand = ['dart-sass'];" > node_modules/sass-embedded/dist/lib/src/compiler-path.js
+  '';
+
   npmRebuildFlags = [
     # FIXME one of the esbuild versions fails to download @esbuild/linux-x64
     "--ignore-scripts"
diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix
index 24ad702e6607..4123f5a5d7ea 100644
--- a/pkgs/by-name/vc/vcsi/package.nix
+++ b/pkgs/by-name/vc/vcsi/package.nix
@@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec {
   ++ (with python3Packages; [
     pytestCheckHook
   ]);
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Create video contact sheets";
diff --git a/pkgs/by-name/vd/vde2/package.nix b/pkgs/by-name/vd/vde2/package.nix
index 15b9a1961849..58fb31bcfe99 100644
--- a/pkgs/by-name/vd/vde2/package.nix
+++ b/pkgs/by-name/vd/vde2/package.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # Fix build with gcc15
+  # https://github.com/virtualsquare/vde-2/commit/fedcb99c5f44c397f459ed0951a8fba4f4effb73
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
     MACOSX_DEPLOYMENT_TARGET=10.16
   '';
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 9c15e9e9f788..aa599f06f90d 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -115,7 +115,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh
index 4a977fe7a888..080aca4bd551 100644
--- a/pkgs/by-name/ve/versionCheckHook/hook.sh
+++ b/pkgs/by-name/ve/versionCheckHook/hook.sh
@@ -61,7 +61,7 @@ versionCheckHook(){
         exit 2
     fi
     if [[ -z "${versionCheckProgramArg}" ]]; then
-        for cmdArg in "--help" "--version"; do
+        for cmdArg in "--version" "--help"; do
             echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg" "$versionCheckKeepEnvironment")"
             if [[ "$echoPrefix" == "Successfully managed to" ]]; then
                 break
diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix
index 5505e9fb82fd..09c033ade782 100644
--- a/pkgs/by-name/vi/vi-mongo/package.nix
+++ b/pkgs/by-name/vi/vi-mongo/package.nix
@@ -26,7 +26,6 @@ buildGoModule rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/vi/video2x/package.nix b/pkgs/by-name/vi/video2x/package.nix
index 9a2edb4387fc..15553dde300c 100644
--- a/pkgs/by-name/vi/video2x/package.nix
+++ b/pkgs/by-name/vi/video2x/package.nix
@@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/vi/vim-vint/package.nix b/pkgs/by-name/vi/vim-vint/package.nix
index b1bf0757f078..4264afe26bac 100644
--- a/pkgs/by-name/vi/vim-vint/package.nix
+++ b/pkgs/by-name/vi/vim-vint/package.nix
@@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
     pytest-cov-stub
   ]);
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Fast and Highly Extensible Vim script Language Lint implemented by Python";
diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix
index ab000b32cf96..803df92f8ddc 100644
--- a/pkgs/by-name/vo/volta/package.nix
+++ b/pkgs/by-name/vo/volta/package.nix
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   # Tries to create /var/empty/.volta as $HOME is not writable
   doInstallCheck = !stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/vo/vorta/package.nix b/pkgs/by-name/vo/vorta/package.nix
index f7fcc6c6c641..682820e8ea10 100644
--- a/pkgs/by-name/vo/vorta/package.nix
+++ b/pkgs/by-name/vo/vorta/package.nix
@@ -68,7 +68,6 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   preCheck =
     let
diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix
index cfe64458fb4e..2a44db230520 100644
--- a/pkgs/by-name/vs/vsce/package.nix
+++ b/pkgs/by-name/vs/vsce/package.nix
@@ -40,7 +40,6 @@ buildNpmPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script {
diff --git a/pkgs/by-name/vt/vttest/package.nix b/pkgs/by-name/vt/vttest/package.nix
index ae713db4afe2..ac4ce1c4e4a8 100644
--- a/pkgs/by-name/vt/vttest/package.nix
+++ b/pkgs/by-name/vt/vttest/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     urls = [
       "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz"
-      "ftp://ftp.invisible-island.net/vttest/vttest-${version}.tgz"
+      "https://invisible-island.net/archives/vttest/vttest-${version}.tgz"
     ];
     sha256 = "sha256-j+47rH6H1KpKIXvSs4q5kQw7jPmmBbRQx2zMCtKmUZ0=";
   };
diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
index 9d1561c00027..6651d61f24dd 100644
--- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ExtensionLayer";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-J9l20abn7meSF0WnCh3cepYKQh10ezb0mAKzc0HAo1w=";
+    hash = "sha256-1Ax/0W882nJFO2hVqXamT89lFu5ncnrytnwDdUIihnk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix
index dad0deb6d48f..a97e281624a7 100644
--- a/pkgs/by-name/vu/vulkan-headers/package.nix
+++ b/pkgs/by-name/vu/vulkan-headers/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or
   # later the build fails as:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU=";
+    hash = "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg=";
   };
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 8043d3832e15..558ea79570d2 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-loader";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-+cuKdhdCMIL4b+GzIpCNrDBmC7cVX0iX2QW7BQIj9Tc=";
+    hash = "sha256-1xLT4AynJumzwkYOBS5i0OpCi3EdE8QctctDn+DGrvU=";
   };
 
   patches = [ ./fix-pkgconfig.patch ];
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 81fa934a8b35..ba2cc8f59c46 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools-lunarg";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "VulkanTools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-kywAcpBYLSlhEbgssXGwMoXQC03QUEz4dwsvI0I8Nh4=";
+    hash = "sha256-2DUxlGH9Yco64Y74QByVniWXiYYy+e4MfyN4S+E6KKA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index b94aa794915f..4934c99eeea7 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.4.328.0";
+  version = "1.4.335";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-QoqlHrhgaV1SRLAxmYUXaKxH1IdbnxqkcJklDy20ORg=";
+    hash = "sha256-C/wzLLiG7DrLyP3YRKhjawNoEOCCogXkrFeBczeVZR0=";
   };
 
   patches = [ ./wayland-scanner.patch ];
diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
index e63ae5c80887..cd947b27809e 100644
--- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
+++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-utility-libraries";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Utility-Libraries";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg=";
+    hash = "sha256-lDO0B7wEYT6cc/t/ZW5OAxxgRfDORoGd+pF5r5R7yoQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index e62d1e94e4c7..43fe919e19b8 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
+  python3,
   jq,
   glslang,
   libffi,
@@ -25,13 +26,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-iz6kWvnfVnznn78XNHJqSvIW4TYkp2KgEFT302VAiaY=";
+    hash = "sha256-FRxr33epHe+HIH/7Y7ms+6E9L0yzaNnFzN3YnswZfRo=";
   };
 
   strictDeps = true;
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    python3
     jq
   ];
 
diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix
index 63d7c341d303..1534219f2756 100644
--- a/pkgs/by-name/vu/vulkan-volk/package.nix
+++ b/pkgs/by-name/vu/vulkan-volk/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "volk";
-  version = "1.4.328.0";
+  version = "1.4.335.0";
 
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "volk";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-7JhTLhCqdn/zDIYdIb2xJnjJVk57i+6M5OXk0KvfpDk=";
+    hash = "sha256-qAMMhaeJweHNeW7+5RUpFh65jUnuw0TsYwq3PrKvCkM=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 0a91ae4c50b1..826ed315999f 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.46.1";
+  version = "0.46.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-WRQ3CGLdnrfRboM+0S+6ausqiAcESsJcekq09wERwNI=";
+    hash = "sha256-wQ+tu6XotTN/QcemTGzeN6/pcuEb4aRJkZROQ3liY9I=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/by-name/w3/w3m/https.patch b/pkgs/by-name/w3/w3m/https.patch
new file mode 100644
index 000000000000..31286a70d5ae
--- /dev/null
+++ b/pkgs/by-name/w3/w3m/https.patch
@@ -0,0 +1,19 @@
+Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
+
+--- old/url.c	2011-01-04 14:52:24.000000000 +0530
++++ new/url.c	2011-09-02 18:25:43.305652690 +0530
+@@ -82,11 +82,11 @@
+     {"ftp", SCM_FTP},
+     {"local", SCM_LOCAL},
+     {"file", SCM_LOCAL},
+-    /*  {"exec", SCM_EXEC}, */
++    {"exec", SCM_EXEC}, 
+     {"nntp", SCM_NNTP},
+-    /*  {"nntp", SCM_NNTP_GROUP}, */
++    {"nntp", SCM_NNTP_GROUP}, 
+     {"news", SCM_NEWS},
+-    /*  {"news", SCM_NEWS_GROUP}, */
++    {"news", SCM_NEWS_GROUP}, 
+     {"data", SCM_DATA},
+ #ifndef USE_W3MMAILER
+     {"mailto", SCM_MAILTO},
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index c9d00588502a..73e82859bf63 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromSourcehut,
-  fetchpatch,
   ncurses,
   boehmgc,
   gettext,
@@ -66,11 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./RAND_egd.libressl.patch
-    (fetchpatch {
-      name = "https.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk";
-    })
+    ./https.patch
   ];
 
   postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix
index ad1b14998c63..5d8f113d041f 100644
--- a/pkgs/by-name/wa/waf/package.nix
+++ b/pkgs/by-name/wa/waf/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waf";
-  version = "2.1.7";
+  version = "2.1.9";
 
   src = fetchFromGitLab {
     owner = "ita1024";
     repo = "waf";
     rev = "waf-${finalAttrs.version}";
-    hash = "sha256-qJDnox7+MUtAK8NaaDgEdRVU4YVA8f5Ky9Suv/qLI3g=";
+    hash = "sha256-myPGbJW/RkOtEas+qZ/vTL66bekwDBPhC6AmfXECkcw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix
index 0c8201e8e389..17ad2046d65a 100644
--- a/pkgs/by-name/wa/wakapi/package.nix
+++ b/pkgs/by-name/wa/wakapi/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "2.16.1";
+  version = "2.17.0";
 in
 buildGoLatestModule {
   pname = "wakapi";
@@ -16,10 +16,10 @@ buildGoLatestModule {
     owner = "muety";
     repo = "wakapi";
     tag = version;
-    hash = "sha256-CmbQWOTurz2NlZq89zbjGHUnMo55sJD7N/u/etginmM=";
+    hash = "sha256-aQh1Jn718sk/Wvsjk9xFJ5NBSmsF6OOYtj22g6kwY8k=";
   };
 
-  vendorHash = "sha256-Rki0KPJgAFLXlVsufl4wQPWKz6Km7cbD/jF4/Zp2tdk=";
+  vendorHash = "sha256-wlpTC050EYEjA5fteaGOGVKonMNOr7Ym2uoGUj0fw/M=";
 
   # Not a go module required by the project, contains development utilities
   excludedPackages = [ "scripts" ];
diff --git a/pkgs/by-name/wa/wakeonlan/package.nix b/pkgs/by-name/wa/wakeonlan/package.nix
index 7434dca4f4ec..e91ddbc31b31 100644
--- a/pkgs/by-name/wa/wakeonlan/package.nix
+++ b/pkgs/by-name/wa/wakeonlan/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   perlPackages,
   fetchFromGitHub,
   installShellFiles,
-  shortenPerlShebang,
 }:
 
 perlPackages.buildPerlPackage rec {
@@ -22,8 +20,7 @@ perlPackages.buildPerlPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  ];
 
   nativeCheckInputs = [
     perlPackages.TestPerlCritic
@@ -38,9 +35,6 @@ perlPackages.buildPerlPackage rec {
   installPhase = ''
     install -Dt $out/bin wakeonlan
     installManPage blib/man1/wakeonlan.1
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/wakeonlan
   '';
 
   meta = {
diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix
index d3d750f0a16b..96cd974c7489 100644
--- a/pkgs/by-name/wa/wapiti/package.nix
+++ b/pkgs/by-name/wa/wapiti/package.nix
@@ -70,8 +70,6 @@ python3Packages.buildPythonApplication rec {
       writableTmpDirAsHomeHook
     ];
 
-  versionCheckProgramArg = "--version";
-
   disabledTests = [
     # Tests requires network access
     "test_attr"
diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix
index 3bdf66a2d8ba..e1adcb080635 100644
--- a/pkgs/by-name/wa/wasm-language-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-language-tools/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/wat_server";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index a32a985e4df7..5829e0e7004a 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -91,7 +91,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix
index 20f6b9501a40..bc7d6bf6476d 100644
--- a/pkgs/by-name/wa/waybar-lyric/package.nix
+++ b/pkgs/by-name/wa/waybar-lyric/package.nix
@@ -36,7 +36,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "XDG_CACHE_HOME" ];
   preInstallCheck = ''
     # ERROR Failed to find cache directory
diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index d915092c3346..1d166b8de1f0 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -193,7 +193,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/wa/waywall/package.nix b/pkgs/by-name/wa/waywall/package.nix
index 516278c5b3ad..8d36e31cf2fb 100644
--- a/pkgs/by-name/wa/waywall/package.nix
+++ b/pkgs/by-name/wa/waywall/package.nix
@@ -6,6 +6,7 @@
   libspng,
   libxkbcommon,
   luajit,
+  makeWrapper,
   meson,
   ninja,
   pkg-config,
@@ -15,18 +16,19 @@
   xorg,
   xwayland,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "waywall";
-  version = "0-unstable-2025-08-03";
+  version = "0.2025.12.20";
 
   src = fetchFromGitHub {
     owner = "tesselslate";
     repo = "waywall";
-    rev = "d77f51926a203b7ddfe095971e7c6c740dad0ffc";
-    hash = "sha256-ev/A5ksqmWz6hpwUIoxg2k9BwzE4BNCZO4tpXq790zo=";
+    tag = finalAttrs.version;
+    hash = "sha256-sGb/dxXBlzXBvv2IWjgwSE8WM5qB04mYATl0uhSozMQ=";
   };
 
   nativeBuildInputs = [
+    makeWrapper
     meson
     ninja
     pkg-config
@@ -49,6 +51,9 @@ stdenv.mkDerivation {
 
     install -Dm755 waywall/waywall -t $out/bin
 
+    wrapProgram $out/bin/waywall \
+      --prefix PATH : ${lib.makeBinPath [ xwayland ]}
+
     runHook postInstall
   '';
 
@@ -64,8 +69,9 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       monkieeboi
+      uku3lig
     ];
     platforms = lib.platforms.linux;
     mainProgram = "waywall";
   };
-}
+})
diff --git a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix
index 2d061db64706..cf4191c2ad10 100644
--- a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix
+++ b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/0630fa25465530c0e7358f00016bdc812894f67f/community/webrtc-audio-processing-1/add-loongarch-support.patch";
       hash = "sha256-Cn3KwKSSV/QJm1JW0pkEWB6OmeA0fRlVkiMU8OzXNzY=";
     })
+    # Fix compilation against gcc15
+    (fetchurl {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/webrtc-audio-processing-1/-/raw/9de1306d3a6a78f435666453b85ba8ede0dd91ea/0001-Fix-compilation-with-GCC-15.patch";
+      hash = "sha256-Ws7FRBX5+nIKWJv6cROqO5eSm5AJGyZVWrAjQ4R3n0I=";
+    })
   ];
 
   outputs = [
diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix
index b573d532ea4b..8e02b1141b68 100644
--- a/pkgs/by-name/wg/wget2/package.nix
+++ b/pkgs/by-name/wg/wget2/package.nix
@@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Successor of GNU Wget, a file and recursive website downloader";
diff --git a/pkgs/by-name/wi/wild-unwrapped/package.nix b/pkgs/by-name/wi/wild-unwrapped/package.nix
index 312917e35780..453d810cd079 100644
--- a/pkgs/by-name/wi/wild-unwrapped/package.nix
+++ b/pkgs/by-name/wi/wild-unwrapped/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/wk/wkg/package.nix b/pkgs/by-name/wk/wkg/package.nix
index 379cd83a0275..7c9dccb8dd73 100644
--- a/pkgs/by-name/wk/wkg/package.nix
+++ b/pkgs/by-name/wk/wkg/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index 36caf9222a63..869ddd5e8957 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/wo/woke/package.nix b/pkgs/by-name/wo/woke/package.nix
index 0d13c7ff25c8..d28f60f9b5ca 100644
--- a/pkgs/by-name/wo/woke/package.nix
+++ b/pkgs/by-name/wo/woke/package.nix
@@ -34,7 +34,6 @@ buildGoModule rec {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/woke";
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/get-woke/woke/releases/tag/${src.tag}";
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index b513fda7ce47..349ada62a5ee 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoBuildFlags = [ "--package wstunnel-cli" ];
 
   nativeBuildInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   checkFlags = [
diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix
index dd7839a15793..1504e919c1b3 100644
--- a/pkgs/by-name/wt/wtfutil/package.nix
+++ b/pkgs/by-name/wt/wtfutil/package.nix
@@ -46,7 +46,6 @@ buildGoModule rec {
   doInstallCheck = true;
   # Darwin Error: mkdir /var/empty: file exists
   nativeInstallCheckInputs = lib.optional (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix
index 17ace827e11b..dff37b0ff870 100644
--- a/pkgs/by-name/xc/xcodegen/package.nix
+++ b/pkgs/by-name/xc/xcodegen/package.nix
@@ -55,7 +55,6 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/xc/xcur2png/malloc.diff b/pkgs/by-name/xc/xcur2png/malloc.diff
index 88f4e8e17ba9..d069db6a5297 100644
--- a/pkgs/by-name/xc/xcur2png/malloc.diff
+++ b/pkgs/by-name/xc/xcur2png/malloc.diff
@@ -16,7 +16,7 @@
  #include <X11/Xcursor/Xcursor.h>
 
 +
-+void *malloc ();
++void *malloc (size_t __size);
 +
 +/* Allocate an N-byte block of memory from the heap.
 +   If N is zero, allocate a 1-byte block.  */
diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix
index 02c6e312b1e4..6a3f7769a99c 100644
--- a/pkgs/by-name/xd/xdvdfs-cli/package.nix
+++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/xdvdfs";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/xe/xee/package.nix b/pkgs/by-name/xe/xee/package.nix
index e8d4eca6fc60..7e88d94aec89 100644
--- a/pkgs/by-name/xe/xee/package.nix
+++ b/pkgs/by-name/xe/xee/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "XML Execution Engine written in Rust";
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index a1bcc635ca5a..827af00f896e 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.121";
+  version = "0.8.129";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H/QGGyqV9Xdpo4JR8JZgEDyzho7jxT3H5uv/T5NV95E=";
+    hash = "sha256-Y7iIODMczLFRisOPxLPsl2Ot44I8pvjflD3vI+4rIlk=";
 
     nativeBuildInputs = [
       git
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index f3d6be777469..3609712c8298 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -61,7 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/xl/xlsxsql/package.nix b/pkgs/by-name/xl/xlsxsql/package.nix
index 55de4d353cd5..69a2d7810154 100644
--- a/pkgs/by-name/xl/xlsxsql/package.nix
+++ b/pkgs/by-name/xl/xlsxsql/package.nix
@@ -45,7 +45,6 @@ buildGoModule rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix
index 723500fdbdfd..164669f5ed63 100644
--- a/pkgs/by-name/xm/xmake/package.nix
+++ b/pkgs/by-name/xm/xmake/package.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/xm/xmlrpc_c/package.nix b/pkgs/by-name/xm/xmlrpc_c/package.nix
index 67646135aa20..2b029663b05d 100644
--- a/pkgs/by-name/xm/xmlrpc_c/package.nix
+++ b/pkgs/by-name/xm/xmlrpc_c/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchDebianPatch,
   pkg-config,
   curl,
   libxml2,
@@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-Z9hgBiRZ6ieEwHtNeRMxnZU5+nKfU0N46OQciRjyrfY=";
   };
 
+  patches = [
+    (fetchDebianPatch {
+      inherit pname version;
+      debianRevision = "1";
+      patch = "fix-gcc15-build.patch";
+      hash = "sha256-VcjXzzruDBuDarqhgNDHOtLxz2vlBrUAylILfMEGPmA=";
+    })
+  ];
+
   postPatch = ''
     rm -rf lib/expat
   '';
diff --git a/pkgs/servers/x11/xorg/darwin/bundle_main.patch b/pkgs/by-name/xo/xorg-server/darwin/bundle_main.patch
similarity index 100%
rename from pkgs/servers/x11/xorg/darwin/bundle_main.patch
rename to pkgs/by-name/xo/xorg-server/darwin/bundle_main.patch
diff --git a/pkgs/by-name/xo/xorg-server/darwin/find-cpp.patch b/pkgs/by-name/xo/xorg-server/darwin/find-cpp.patch
new file mode 100644
index 000000000000..973a21184dd9
--- /dev/null
+++ b/pkgs/by-name/xo/xorg-server/darwin/find-cpp.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build
+index 22941203b..4d3f159cf 100644
+--- a/hw/xquartz/bundle/meson.build
++++ b/hw/xquartz/bundle/meson.build
+@@ -38,7 +38,7 @@ install_data('Resources/X11.icns',
+     install_mode: 'rw-r--r--')
+ 
+ custom_target('Info.plist',
+-    command: [cpp, '-P', cpp_defs, '@INPUT@'],
++    command: ['clang', '-E', '-P', cpp_defs, '@INPUT@'],
+     capture: true,
+     input: 'Info.plist.cpp',
+     output: 'Info.plist',
diff --git a/pkgs/servers/x11/xorg/darwin/stub.patch b/pkgs/by-name/xo/xorg-server/darwin/stub.patch
similarity index 100%
rename from pkgs/servers/x11/xorg/darwin/stub.patch
rename to pkgs/by-name/xo/xorg-server/darwin/stub.patch
diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
new file mode 100644
index 000000000000..bfede48f705a
--- /dev/null
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -0,0 +1,241 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+
+  # build system
+  meson,
+  ninja,
+  pkg-config,
+
+  # deps
+  dbus,
+  dri-pkgconfig-stub,
+  fontutil,
+  libdrm,
+  libepoxy,
+  libgbm,
+  libGL,
+  libGLU,
+  libpciaccess,
+  libtirpc,
+  libunwind,
+  libx11,
+  libxau,
+  libxcb,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-util,
+  libxcb-wm,
+  libxcvt,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxfont_1,
+  libxfont_2,
+  libxkbfile,
+  libxshmfence,
+  mesa,
+  mesa-gl-headers,
+  openssl,
+  pixman,
+  udev,
+  xkbcomp,
+  xkeyboardconfig,
+  xorgproto,
+  xtrans,
+  zlib,
+
+  # darwin specific deps
+  darwin,
+  utilmacros,
+  libapplewm,
+
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xorg-server";
+  version = "21.1.20";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
+    hash = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc=";
+  };
+
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [
+    ./darwin/bundle_main.patch
+    ./darwin/find-cpp.patch
+    ./darwin/stub.patch
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.bootstrap_cmds
+    utilmacros
+  ];
+
+  buildInputs = [
+    fontutil
+    libx11
+    libxau
+    libxcb
+    libxcb-image
+    libxcb-keysyms
+    libxcb-render-util
+    libxcb-util
+    libxcb-wm
+    libxcvt
+    libxdmcp
+    libxfixes
+    libxkbfile
+    mesa-gl-headers
+    openssl
+    xorgproto
+    xtrans
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    dri-pkgconfig-stub
+    libdrm
+    libgbm
+    libtirpc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.bootstrap_cmds
+    mesa
+  ];
+
+  propagatedBuildInputs = [
+    dbus
+    libepoxy
+    libGL
+    libGLU
+    libunwind
+    libxext
+    libxfont_1
+    libxfont_2
+    libxshmfence
+    pixman
+    xorgproto
+    zlib
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libpciaccess ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libapplewm ];
+
+  mesonFlags = [
+    "-Dxephyr=true"
+    "-Dxvfb=true"
+    "-Dxnest=true"
+    "-Dxorg=true"
+
+    "-Dlog_dir=/var/log"
+    "-Ddefault_font_path="
+
+    "-Dxkb_bin_dir=${xkbcomp}/bin"
+    "-Dxkb_dir=${xkeyboardconfig}/share/X11/xkb"
+    "-Dxkb_output_dir=$out/share/X11/xkb/compiled"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    "-Dxcsecurity=true"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "-Dglamor=false"
+    "-Dsecure-rpc=false"
+    "-Dint10=false"
+    "-Dpciaccess=false"
+    "-Dapple-application-name=XQuartz"
+    "-Dapple-applications-dir=${placeholder "out"}/Applications"
+    "-Dbundle-id-prefix=org.nixos.xquartz"
+    "-Dsha1=CommonCrypto"
+  ];
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace hw/xquartz/mach-startup/stub.c \
+      --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
+  '';
+
+  # default X install symlinks this to Xorg, we want XQuartz
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ln -sf $out/bin/Xquartz $out/bin/X
+  '';
+
+  passthru = {
+    inherit (finalAttrs) version; # needed by virtualbox guest additions
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/xserver/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X server implementation by X.org";
+    longDescription = ''
+      The X server accepts requests from client applications to create windows, which are (normally
+      rectangular) "virtual screens" that the client program can draw into.
+      Windows are then composed on the actual screen by the X server (or by a separate composite
+      manager) as directed by the window manager, which usually communicates with the user via
+      graphical controls such as buttons and draggable titlebars and borders.
+
+      For a comprehensive overview of X Server and X Window System, consult the following article:
+      https://en.wikipedia.org/wiki/X_server
+    '';
+    homepage = "https://x.org/wiki";
+    license = with lib.licenses; [
+      # because the license list is huge (1848 lines) this is documented by line range
+      # https://gitlab.freedesktop.org/xorg/xserver/-/blob/f05f269f1d5bddafe71cdfb290b118820bf17fdd/COPYING
+
+      # 10-45, 148-170, 364-390, 431-454, 485-511, 512-534, 535-558, 1573-1593, 1692-1711, 1760-1779
+      mit
+
+      # 53-77, 124-147, 317-343, 455-484, 559-583, 629-654, 891-918, 1008-1034, 1056-1079,
+      # 1296-1326, 1438-1470, 1499-1522, 1523-1548
+      x11
+
+      # 78-99, 171-191, 391-430 (doubled text), 584-605, 606-628, 707-729, 730-750, 807-828,
+      # 829-853, 854-879, 880-890, 919-939, 940-962, 963-985, 986-1007, 1035-1055, 1080-1102,
+      # 1103-1125, 1126-1148, 1149-1169, 1170-1192, 1193-1215, 1216-1236, 1237-1259, 1275-1295,
+      # 1327-1359, 1360-1383, 1549-1572, 1594-1617, 1618-1638, 1639-1670, 1671-1691, 1712-1732,
+      # 1733-1756, 1795-1814
+      hpndSellVariant
+
+      mitOpenGroup # 100-123
+      hpnd # 192-214, 215-237, 344-363, 686-706, 1416-1437
+      dec3Clause # 238-267
+      x11NoPermitPersons # 268-292
+      # missing last paragraph likely due to an error
+      # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2097
+      sgi-b-20 # 293-316
+      bsd3 # 655-685, 1471-1498, 1815-1848 (BSD-4-Clause UC with rescinded third clause)
+      adobeDisplayPostScript # 751-782
+      ntp # 783-795
+      hpndUc # 796-806
+      isc # 1260-1274
+      icu # 1383-1415
+      # missing author/copyright notice
+      # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2098
+      hpndSellVariantMitDisclaimerXserver # 1780-1793
+    ];
+    mainProgram = "X";
+    maintainers = [ ];
+    pkgConfigModules = [ "xorg-server" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 97f2f708c6bd..1503f2432788 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation rec {
   pname = "xterm";
-  version = "403";
+  version = "404";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
+      "https://invisible-island.net/archives/xterm/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
     ];
-    hash = "sha256-EzGw31kZyyQ//jJtxv8QopHmg6Ji9wzflkpmS+czrYM=";
+    hash = "sha256-YzMvkhwie6WeWJ+gff2tFZnBCshZ6ibHKsHdSkG1ZaQ=";
   };
 
   patches = [ ./sixel-256.support.patch ];
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
new file mode 100644
index 000000000000..c81ee24becee
--- /dev/null
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -0,0 +1,96 @@
+# xvfb is used by a bunch of things to run tests
+# so try to reduce its reverse closure
+{
+  lib,
+  stdenv,
+  pkg-config,
+  xorg-server,
+  dri-pkgconfig-stub,
+  libdrm,
+  libGL,
+  libX11,
+  libXau,
+  libxcb,
+  libxcvt,
+  libxdmcp,
+  libxfixes,
+  libxfont_2,
+  libxkbfile,
+  libxshmfence,
+  mesa-gl-headers,
+  openssl,
+  pixman,
+  xcbutil,
+  xcbutilimage,
+  xcbutilkeysyms,
+  xcbutilrenderutil,
+  xcbutilwm,
+  xkbcomp,
+  xkeyboardconfig,
+  xorgproto,
+  xtrans,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xvfb";
+
+  inherit (xorg-server) src version;
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    dri-pkgconfig-stub
+    libdrm
+    libGL
+    libX11
+    libXau
+    libxcb
+    libxcvt
+    libxdmcp
+    libxfixes
+    libxfont_2
+    libxkbfile
+    libxshmfence
+    mesa-gl-headers
+    openssl
+    pixman
+    xcbutil
+    xcbutilimage
+    xcbutilkeysyms
+    xcbutilrenderutil
+    xcbutilwm
+    xorgproto
+    xtrans
+  ];
+
+  configureFlags = [
+    "--enable-xvfb"
+    "--disable-xorg"
+    "--disable-xquartz"
+    "--disable-xwayland"
+    "--with-xkb-bin-directory=${xkbcomp}/bin"
+    "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb"
+    "--with-xkb-output=$out/share/X11/xkb/compiled"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace";
+
+  meta = {
+    description = "X virtual framebuffer";
+    longDescription = ''
+      Xvfb or X virtual framebuffer is a display server implementing the X11 display server
+      protocol. In contrast to other display servers, Xvfb performs all graphical operations in
+      virtual memory without showing any screen output. From the point of view of the X client app,
+      it acts exactly like any other X display server, serving requests and sending events and
+      errors as appropriate. However, no output is shown. This virtual server does not require the
+      computer it is running on to have any kind of graphics adapter, a screen or any input device.
+      Is is primarily used for testing.
+    '';
+    inherit (xorg-server.meta)
+      homepage
+      license
+      mainProgram
+      ;
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix
index 77f54e745e32..05711bf2e003 100644
--- a/pkgs/by-name/xv/xvidcore/package.nix
+++ b/pkgs/by-name/xv/xvidcore/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   yasm,
   autoconf,
@@ -8,15 +9,23 @@
   libtool,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xvidcore";
   version = "1.3.7";
 
   src = fetchurl {
-    url = "https://downloads.xvid.com/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf";
+    url = "https://downloads.xvid.com/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/xvidcore/raw/95382dbe529e5589a727fffceb620b0a89ff55f2/f/xvidcore-c23.patch";
+      hash = "sha256-bGwWNmXIEIIw4Tc7lrMZ4jnhcQ+uKAsxL6fuAOosMVA=";
+    })
+  ];
+
   preConfigure = ''
     # Configure script is not in the root of the source directory
     cd build/generic
@@ -70,4 +79,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index d93a92167b64..c1d168820230 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
       '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix
index fcd2943e52e7..531a2744b45b 100644
--- a/pkgs/by-name/ya/yaml2json/package.nix
+++ b/pkgs/by-name/ya/yaml2json/package.nix
@@ -27,7 +27,6 @@ buildGoModule (finalAttrs: {
   ];
 
   nativeCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index fce075e3f7aa..1b2e238e2e38 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -41,7 +41,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Extensible command line tool or library to format yaml files";
diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix
index 9addf8c5857c..7beebb658165 100644
--- a/pkgs/by-name/ya/yarr/package.nix
+++ b/pkgs/by-name/ya/yarr/package.nix
@@ -35,7 +35,6 @@ buildGoModule rec {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ye/yek/package.nix b/pkgs/by-name/ye/yek/package.nix
index 800212911cbc..23fe911c5e3f 100644
--- a/pkgs/by-name/ye/yek/package.nix
+++ b/pkgs/by-name/ye/yek/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix
index 0856afcfc7f2..aa579c1ba014 100644
--- a/pkgs/by-name/yl/yle-dl/package.nix
+++ b/pkgs/by-name/yl/yle-dl/package.nix
@@ -41,8 +41,6 @@ python3Packages.buildPythonApplication {
     # python3Packages.pytestCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
     homepage = "https://aajanki.github.io/yle-dl/";
diff --git a/pkgs/by-name/yo/yodl/package.nix b/pkgs/by-name/yo/yodl/package.nix
index 5e074c5fc7be..7e284a61bedc 100644
--- a/pkgs/by-name/yo/yodl/package.nix
+++ b/pkgs/by-name/yo/yodl/package.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix
index 9e2288d7c48a..61064f552f68 100644
--- a/pkgs/by-name/yt/ytcc/package.nix
+++ b/pkgs/by-name/yt/ytcc/package.nix
@@ -45,8 +45,6 @@ python3Packages.buildPythonApplication {
     ]
     ++ [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   # Disable tests that touch network or shell out to commands
   disabledTests = [
     "get_channels"
diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 2f07f44e1c8c..34da2fe8cb61 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec {
     python3Packages.pytestCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   env = {
     YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg_7 "ffmpeg"}";
diff --git a/pkgs/by-name/yu/yuhaiin/package.nix b/pkgs/by-name/yu/yuhaiin/package.nix
index f662cd6b9467..b4653c9de3d3 100644
--- a/pkgs/by-name/yu/yuhaiin/package.nix
+++ b/pkgs/by-name/yu/yuhaiin/package.nix
@@ -37,8 +37,6 @@ buildGoModule rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = [ "--version" ];
-
   meta = {
     description = "Proxy kit for Linux/Windows/MacOS";
     homepage = "https://github.com/yuhaiin/yuhaiin";
diff --git a/pkgs/by-name/za/zaparoo/package.nix b/pkgs/by-name/za/zaparoo/package.nix
index ce6e16edf6a5..da271137b42d 100644
--- a/pkgs/by-name/za/zaparoo/package.nix
+++ b/pkgs/by-name/za/zaparoo/package.nix
@@ -66,7 +66,6 @@ buildGoModule (finalAttrs: {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 2e2067df61e9..aed007f98beb 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -311,7 +311,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/zeditor";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 5bdeba8e0fad..ce80c2fc802d 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs
diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix
index 2fb60a954eb3..cfce73d35be6 100644
--- a/pkgs/by-name/zi/zig-zlint/package.nix
+++ b/pkgs/by-name/zi/zig-zlint/package.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/zlint";
-  versionCheckProgramArg = "--version";
 
   # `zig build` produces a lot more artifacts, just copy over the ones we want
   installPhase = ''
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index b8a71e348804..0bed24621f7d 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -123,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/ziplinectl";
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [ "DATABASE_URL" ];
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix
index b324726b804a..cc3bed8a187f 100644
--- a/pkgs/by-name/zu/zuban/package.nix
+++ b/pkgs/by-name/zu/zuban/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/zu/zug/gcc15.patch b/pkgs/by-name/zu/zug/gcc15.patch
new file mode 100644
index 000000000000..b0e44a4b7b1d
--- /dev/null
+++ b/pkgs/by-name/zu/zug/gcc15.patch
@@ -0,0 +1,15 @@
+diff --git a/zug/sequence.hpp b/zug/sequence.hpp
+index d7ac093..bffb771 100644
+--- a/zug/sequence.hpp
++++ b/zug/sequence.hpp
+@@ -76,8 +76,9 @@ struct sequence_data
+ 
+     sequence_data& operator=(sequence_data&& other)
+     {
+-        impl_ = std::move(other.impl);
++        impl_ = std::move(other.impl_);
+         impl_.reductor.current(this);
++        return *this;
+     }
+ 
+     sequence_data& operator=(const sequence_data& other)
diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix
index 95c9d82f06aa..97eb691bbb90 100644
--- a/pkgs/by-name/zu/zug/package.nix
+++ b/pkgs/by-name/zu/zug/package.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/arximboldi/zug/commit/c8c74ada30d931e40636c13763b892f20d3ce1ae.patch";
       hash = "sha256-0x+ScRnziBeyHWYJowcVb2zahkcK2qKrMVVk2twhtHA=";
     })
+
+    # https://github.com/arximboldi/zug/issues/45
+    ./gcc15.patch
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix
index 7afb0bf41a9f..6526e447c6f5 100644
--- a/pkgs/by-name/zv/zvm/package.nix
+++ b/pkgs/by-name/zv/zvm/package.nix
@@ -20,7 +20,6 @@ buildGoModule rec {
   vendorHash = "sha256-yk1n0mW4WIKHTg9xgr+1IKbUpZWIaBaYrA6FwNBjVKc=";
 
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix
index c990625106ff..ada370da25cd 100644
--- a/pkgs/by-name/zx/zx/package.nix
+++ b/pkgs/by-name/zx/zx/package.nix
@@ -55,8 +55,6 @@ buildNpmPackage (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix
index 5f711e071486..82ebeba65138 100644
--- a/pkgs/development/compilers/dart/default.nix
+++ b/pkgs/development/compilers/dart/default.nix
@@ -41,8 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  versionCheckProgramArg = "--version";
-
   passthru = {
     fetchGitHashesScript = ./fetch-git-hashes.py;
     updateScript = ./update.sh;
diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch
index 810d8e6f69a1..41e1c4c89869 100644
--- a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch
+++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch
@@ -1,11 +1,12 @@
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -239,7 +239,7 @@ case ${host} in
+@@ -239,8 +239,8 @@ case ${host} in
      x86_64-*-darwin2[0-2]*)
        tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
        ;;
 -    *-*-darwin2*)
+-      tmake_file="t-darwin-min-11 $tmake_file"
 +    *-*-darwin2* | *-*-darwin)
-       tmake_file="t-darwin-min-11 $tmake_file"
++      tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
        ;;
      *-*-darwin1[89]*)
diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch
new file mode 100644
index 000000000000..dbb790e1eec3
--- /dev/null
+++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch
@@ -0,0 +1,11 @@
+--- a/libgcc/config/t-slibgcc-darwin
++++ b/libgcc/config/t-slibgcc-darwin
+@@ -139,8 +139,7 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)
+ 	  $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \
+ 	    -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \
+ 	    -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \
+ 	    -lSystem \
+-	    -Wl,-reexported_symbols_list,$(srcdir)/config/darwin-unwind.ver \
+ 	    -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \
+ 	    -compatibility_version 1 -current_version 1.1 ; \
+ 	done
diff --git a/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch b/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch
new file mode 100644
index 000000000000..572829c45c6a
--- /dev/null
+++ b/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch
@@ -0,0 +1,80 @@
+From 3f1f99ef82a65d66e3aaa429bf4fb746b93da0db Mon Sep 17 00:00:00 2001
+From: Kito Cheng <kito.cheng@sifive.com>
+Date: Tue, 27 May 2025 10:10:15 +0800
+Subject: [PATCH] c++tools: Don't check --enable-default-pie.
+
+`--enable-default-pie` is an option to specify whether to enable
+position-independent executables by default for `target`.
+
+However c++tools is build for `host`, so it should just follow
+`--enable-host-pie` option to determine whether to build with
+position-independent executables or not.
+
+NOTE:
+
+I checked PR 98324 and build with same configure option
+(`--enable-default-pie` and lto bootstrap) on x86-64 linux to make sure
+it won't cause same problem.
+
+c++tools/ChangeLog:
+
+	* configure.ac: Don't check `--enable-default-pie`.
+	* configure: Regen.
+---
+ c++tools/configure    | 11 -----------
+ c++tools/configure.ac |  6 ------
+ 2 files changed, 17 deletions(-)
+
+diff --git a/c++tools/configure b/c++tools/configure
+index 1353479becaf4..6df4a2f0dfaed 100755
+--- a/c++tools/configure
++++ b/c++tools/configure
+@@ -700,7 +700,6 @@ enable_option_checking
+ enable_c___tools
+ enable_maintainer_mode
+ enable_checking
+-enable_default_pie
+ enable_host_pie
+ enable_host_bind_now
+ with_gcc_major_version_only
+@@ -1335,7 +1334,6 @@ Optional Features:
+                           enable expensive run-time checks. With LIST, enable
+                           only specific categories of checks. Categories are:
+                           yes,no,all,none,release.
+-  --enable-default-pie    enable Position Independent Executable as default
+   --enable-host-pie       build host code as PIE
+   --enable-host-bind-now  link host code as BIND_NOW
+ 
+@@ -2946,15 +2944,6 @@ $as_echo "#define ENABLE_ASSERT_CHECKING 1" >>confdefs.h
+ 
+ fi
+ 
+-# Check whether --enable-default-pie was given.
+-# Check whether --enable-default-pie was given.
+-if test "${enable_default_pie+set}" = set; then :
+-  enableval=$enable_default_pie; PICFLAG=-fPIE
+-else
+-  PICFLAG=
+-fi
+-
+-
+ # Enable --enable-host-pie
+ # Check whether --enable-host-pie was given.
+ if test "${enable_host_pie+set}" = set; then :
+diff --git a/c++tools/configure.ac b/c++tools/configure.ac
+index db34ee678e033..8c4b72a8023a8 100644
+--- a/c++tools/configure.ac
++++ b/c++tools/configure.ac
+@@ -97,12 +97,6 @@ if test x$ac_assert_checking != x ; then
+ [Define if you want assertions enabled.  This is a cheap check.])
+ fi
+ 
+-# Check whether --enable-default-pie was given.
+-AC_ARG_ENABLE(default-pie,
+-[AS_HELP_STRING([--enable-default-pie],
+-		  [enable Position Independent Executable as default])],
+-[PICFLAG=-fPIE], [PICFLAG=])
+-
+ # Enable --enable-host-pie
+ AC_ARG_ENABLE(host-pie,
+ [AS_HELP_STRING([--enable-host-pie],
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index bfe11cb0b835..d7eeee3eb739 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -97,6 +97,9 @@ optionals noSysDirs (
 # See https://github.com/NixOS/nixpkgs/pull/354107/commits/2de1b4b14e17f42ba8b4bf43a29347c91511e008
 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff
 ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff
+# c++tools: Don't check --enable-default-pie.
+# --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found
+++ optional (is14 || is15) ./c++tools-dont-check-enable-default-pie.patch
 
 ## 2. Patches relevant on specific platforms ####################################
 
@@ -160,13 +163,14 @@ optionals noSysDirs (
 
 ## Darwin
 
-# Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64.
+# Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64.
+++ optional (is14 && stdenv.hostPlatform.isDarwin) ../patches/14/libgcc-darwin-detection.patch
+++ optional (atLeast15 && stdenv.hostPlatform.isDarwin) ../patches/15/libgcc-darwin-detection.patch
+
+# Fix libgcc_s.1.dylib build on Darwin 11+ by not reexporting unwind symbols that don't exist
 ++ optional (
-  is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
-) ../patches/14/libgcc-darwin-detection.patch
-++ optional (
-  atLeast15 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
-) ../patches/15/libgcc-darwin-detection.patch
+  atLeast15 && stdenv.hostPlatform.isDarwin
+) ../patches/15/libgcc-darwin-fix-reexport.patch
 
 # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin
 ++ optional (stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index 4239212f2879..cc3eb43b8ac0 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -250,7 +250,7 @@ stdenv.mkDerivation {
   # of the bindist installer can find the libraries they expect.
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location.
-  ${libEnvVar} = libPath;
+  env.${libEnvVar} = libPath;
 
   postUnpack =
     # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index 35f692d41eb5..c19b35a51a61 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -232,7 +232,7 @@ stdenv.mkDerivation {
   # of the bindist installer can find the libraries they expect.
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location.
-  ${libEnvVar} = libPath;
+  env.${libEnvVar} = libPath;
 
   postUnpack =
     # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index fe7dba89c6b8..acc8569de85c 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.25.4";
+  version = "1.25.5";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-FgBDt/F7bWC1A2lDaRf9qNUDRkC6Oa4kMca5WoicyYw=";
+    hash = "sha256-IqX9CpHvzSihsFNxBrmVmygEth9Zw3WLUejlQpwalU8=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 22904e925dc9..4dbf85637819 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -2,6 +2,7 @@
   autoPatchelfHook,
   fetchFromGitHub,
   fetchurl,
+  fetchpatch,
   stdenv,
   cmake,
   python3,
@@ -76,6 +77,15 @@ let
     cmakeFlags = (old.cmakeFlags or [ ]) ++ [
       "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
     ];
+    patches = (old.patches or [ ]) ++ [
+      # Fix build with gcc15
+      # https://github.com/apache/thrift/pull/3078
+      (fetchpatch {
+        name = "thrift-add-missing-cstdint-include-gcc15.patch";
+        url = "https://github.com/apache/thrift/commit/947ad66940cfbadd9b24ba31d892dfc1142dd330.patch";
+        hash = "sha256-pWcG6/BepUwc/K6cBs+6d74AWIhZ2/wXvCunb/KyB0s=";
+      })
+    ];
   });
 
 in
diff --git a/pkgs/development/compilers/llvm/18/mlir/mlir-add-include-cstdint.patch b/pkgs/development/compilers/llvm/18/mlir/mlir-add-include-cstdint.patch
new file mode 100644
index 000000000000..181d53c54184
--- /dev/null
+++ b/pkgs/development/compilers/llvm/18/mlir/mlir-add-include-cstdint.patch
@@ -0,0 +1,28 @@
+Rebase of 2 upstream commits:
+https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f
+https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687
+
+diff --git a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
+index 451c466fa0c95..642e99d963ef6 100644
+--- a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
++++ b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
+@@ -10,6 +10,7 @@
+ #define MLIR_DIALECT_AFFINE_IR_VALUEBOUNDSOPINTERFACEIMPL_H
+ 
+ #include "mlir/Support/LogicalResult.h"
++#include <cstdint>
+ 
+ namespace mlir {
+ class DialectRegistry;
+diff --git a/include/mlir/Target/SPIRV/Deserialization.h b/include/mlir/Target/SPIRV/Deserialization.h
+index e39258beeaac8..a346a7fd1e5f7 100644
+--- a/include/mlir/Target/SPIRV/Deserialization.h
++++ b/include/mlir/Target/SPIRV/Deserialization.h
+@@ -15,6 +15,7 @@
+ 
+ #include "mlir/IR/OwningOpRef.h"
+ #include "mlir/Support/LLVM.h"
++#include <cstdint>
+ 
+ namespace mlir {
+ class MLIRContext;
diff --git a/pkgs/development/compilers/llvm/19/mlir/mlir-add-include-cstdint.patch b/pkgs/development/compilers/llvm/19/mlir/mlir-add-include-cstdint.patch
new file mode 100644
index 000000000000..3e1ff09bc3ef
--- /dev/null
+++ b/pkgs/development/compilers/llvm/19/mlir/mlir-add-include-cstdint.patch
@@ -0,0 +1,29 @@
+Rebase of 2 upstream commits:
+https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f
+https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687
+
+diff --git a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
+index 451c466fa0c95..642e99d963ef6 100644
+--- a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
++++ b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
+@@ -10,6 +10,7 @@
+ #define MLIR_DIALECT_AFFINE_IR_VALUEBOUNDSOPINTERFACEIMPL_H
+ 
+ #include "mlir/Support/LLVM.h"
++#include <cstdint>
+ 
+ namespace mlir {
+ class DialectRegistry;
+diff --git a/include/mlir/Target/SPIRV/Deserialization.h b/include/mlir/Target/SPIRV/Deserialization.h
+index e39258beeaac8..a346a7fd1e5f7 100644
+--- a/include/mlir/Target/SPIRV/Deserialization.h
++++ b/include/mlir/Target/SPIRV/Deserialization.h
+@@ -15,6 +15,7 @@
+ 
+ #include "mlir/IR/OwningOpRef.h"
+ #include "mlir/Support/LLVM.h"
++#include <cstdint>
+ 
+ namespace mlir {
+ class MLIRContext;
+
diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix
index f67da5042667..ac4c4fbacd7f 100644
--- a/pkgs/development/compilers/llvm/common/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/common/lldb/default.nix
@@ -70,7 +70,14 @@ stdenv.mkDerivation (
 
     sourceRoot = "${finalAttrs.src.name}/lldb";
 
-    patches = [ ./gnu-install-dirs.patch ];
+    patches = [
+      ./gnu-install-dirs.patch
+    ]
+    ++ lib.optional (lib.versions.major release_version == "18") [
+      # Fix build with gcc15
+      # https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314
+      ./lldb-add-include-cstdint.patch
+    ];
 
     nativeBuildInputs = [
       cmake
diff --git a/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch b/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch
new file mode 100644
index 000000000000..2ca0b9a3eb38
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch
@@ -0,0 +1,16 @@
+Rebase of upstream commit:
+https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314
+
+diff --git a/include/lldb/Utility/AddressableBits.h b/include/lldb/Utility/AddressableBits.h
+index 0d27c3561ec27..8c7a1ec5f52c0 100644
+--- a/include/lldb/Utility/AddressableBits.h
++++ b/include/lldb/Utility/AddressableBits.h
+@@ -12,6 +12,8 @@
+ #include "lldb/lldb-forward.h"
+ 
++#include <cstdint>
++
+ namespace lldb_private {
+ 
+ /// \class AddressableBits AddressableBits.h "lldb/Core/AddressableBits.h"
+
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index a7821a0d976a..00171a97068e 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -193,6 +193,10 @@ stdenv.mkDerivation (
           stripLen = 1;
           hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg=";
         })
+        # Fix build with gcc15
+        # https://github.com/llvm/llvm-project/commit/8f39502b85d34998752193e85f36c408d3c99248
+        # https://github.com/llvm/llvm-project/commit/7abf44069aec61eee147ca67a6333fc34583b524
+        ./llvm-add-include-cstdint.patch
       ]
       ++ lib.optionals (lib.versionOlder release_version "19") [
         # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804)
diff --git a/pkgs/development/compilers/llvm/common/llvm/llvm-add-include-cstdint.patch b/pkgs/development/compilers/llvm/common/llvm/llvm-add-include-cstdint.patch
new file mode 100644
index 000000000000..d1e327668bc5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/llvm/llvm-add-include-cstdint.patch
@@ -0,0 +1,27 @@
+Rebase of 2 upstream commits:
+https://github.com/llvm/llvm-project/commit/8f39502b85d34998752193e85f36c408d3c99248
+https://github.com/llvm/llvm-project/commit/7abf44069aec61eee147ca67a6333fc34583b524
+
+diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
+index 3ef00f75735b0..879dbe1b279b1 100644
+--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
++++ b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
+@@ -15,6 +15,7 @@
+ #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H
+ #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H
+ 
++#include <cstdint>
+ #include <memory>
+ 
+ namespace llvm {
+diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+index e166b68668d9b..0e0e13e896aea 100644
+--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
++++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+@@ -14,6 +14,7 @@
+ #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
+ 
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ 
diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix
index ec4944c34aaf..c68f6a9b0b68 100644
--- a/pkgs/development/compilers/llvm/common/mlir/default.nix
+++ b/pkgs/development/compilers/llvm/common/mlir/default.nix
@@ -12,6 +12,7 @@
   libllvm,
   version,
   devExtraCmakeFlags ? [ ],
+  getVersionFile,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,6 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./gnu-install-dirs.patch
+  ]
+  ++ lib.optional (lib.versionOlder release_version "20") [
+    # Fix build with gcc15
+    # https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f
+    # https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687
+    (getVersionFile "mlir/mlir-add-include-cstdint.patch")
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix
index 757eaf7230e5..30fa0411956a 100644
--- a/pkgs/development/compilers/llvm/common/patches.nix
+++ b/pkgs/development/compilers/llvm/common/patches.nix
@@ -126,4 +126,16 @@
       path = ../21;
     }
   ];
+  "mlir/mlir-add-include-cstdint.patch" = [
+    {
+      after = "18";
+      before = "19";
+      path = ../18;
+    }
+    {
+      after = "19";
+      before = "20";
+      path = ../19;
+    }
+  ];
 }
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2493597be825..1e4f24cbc83f 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -25,7 +25,7 @@ let
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
-    "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
+    "21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o=";
     "22.0.0-git".gitRelease = {
       rev = "2c72af88213c0f9c507d9c8b34a39de8173a6fcc";
       rev-version = "22.0.0-unstable-2025-12-28";
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 4a66393946b2..f09ec3f79683 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -118,6 +118,10 @@ stdenv.mkDerivation (
       ++ optional noNakedPointers (flags "--disable-naked-pointers" "-no-naked-pointers");
     dontAddStaticConfigureFlags = lib.versionOlder version "4.08";
 
+    env = lib.optionalAttrs (lib.versionOlder version "4.14") {
+      NIX_CFLAGS_COMPILE = "-std=gnu11";
+    };
+
     # on aarch64-darwin using --host and --target causes the build to invoke
     # `aarch64-apple-darwin-clang` while using assembler. However, such binary
     # does not exist. So, disable these configure flags on `aarch64-darwin`.
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 8b180376f10c..1deaf765d57c 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -412,10 +412,16 @@ stdenv.mkDerivation (finalAttrs: {
       if atLeast17 then
         "-Wno-error"
       else if atLeast11 then
-        # Workaround for
-        # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
-        # when building jtreg
-        "-Wformat"
+        lib.concatStringsSep " " (
+          # Workaround for
+          # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
+          # when building jtreg
+          [ "-Wformat" ]
+          ++ lib.optionals (stdenv.cc.isGNU && featureVersion == "11") [
+            # Fix build with gcc15
+            "-std=gnu17"
+          ]
+        )
       else
         lib.concatStringsSep " " (
           [
@@ -436,6 +442,10 @@ stdenv.mkDerivation (finalAttrs: {
             "-Wno-error=int-conversion"
             "-Wno-error=incompatible-pointer-types"
           ]
+          ++ lib.optionals (stdenv.cc.isGNU && featureVersion == "8") [
+            # Fix build with gcc15
+            "-std=gnu17"
+          ]
         );
 
     NIX_LDFLAGS = lib.concatStringsSep " " (
diff --git a/pkgs/development/compilers/rust/1_91.nix b/pkgs/development/compilers/rust/1_91.nix
index a5fee800afa4..c9d31d1899d4 100644
--- a/pkgs/development/compilers/rust/1_91.nix
+++ b/pkgs/development/compilers/rust/1_91.nix
@@ -8,6 +8,11 @@
 #    Check the version number in the src/llvm-project git submodule in:
 #    https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
 
+# Note: The way this is structured is:
+# 1. Import default.nix, and apply arguments as needed for the file-defined function
+# 2. Implicitly, all arguments to this file are applied to the function that is imported.
+#    if you want to add an argument to default.nix's top-level function, but not the function
+#    it instantiates, add it to the `removeAttrs` call below.
 {
   stdenv,
   lib,
@@ -22,6 +27,7 @@
   wrapRustcWith,
   llvmPackages,
   llvm,
+  cargo-auditable,
   wrapCCWith,
   overrideCC,
   fetchpatch,
@@ -51,7 +57,7 @@ import ./default.nix
     llvmSharedForHost = llvmSharedFor pkgsBuildHost;
     llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
 
-    inherit llvmPackages;
+    inherit llvmPackages cargo-auditable;
 
     # For use at runtime
     llvmShared = llvmSharedFor pkgsHostTarget;
@@ -93,5 +99,6 @@ import ./default.nix
       "overrideCC"
       "pkgsHostTarget"
       "fetchpatch"
+      "cargo-auditable"
     ]
   )
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
deleted file mode 100644
index 2abda28c4d11..000000000000
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  lib,
-  buildPackages,
-  fetchFromGitHub,
-  makeRustPlatform,
-  installShellFiles,
-  stdenv,
-}:
-
-let
-  args = rec {
-    pname = "cargo-auditable";
-    version = "0.6.5";
-
-    src = fetchFromGitHub {
-      owner = "rust-secure-code";
-      repo = "cargo-auditable";
-      rev = "v${version}";
-      sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8=";
-    };
-
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit pname version src;
-      hash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc=";
-    };
-
-    checkFlags = [
-      # requires wasm32-unknown-unknown target
-      "--skip=test_wasm"
-    ];
-
-    meta = {
-      description = "Tool to make production Rust binaries auditable";
-      mainProgram = "cargo-auditable";
-      homepage = "https://github.com/rust-secure-code/cargo-auditable";
-      changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
-      license = with lib.licenses; [
-        mit # or
-        asl20
-      ];
-      maintainers = with lib.maintainers; [ RossSmyth ];
-      broken = stdenv.hostPlatform != stdenv.buildPlatform;
-    };
-  };
-
-  rustPlatform = makeRustPlatform {
-    inherit (buildPackages) rustc;
-    cargo = buildPackages.cargo.override {
-      auditable = false;
-    };
-  };
-
-  bootstrap = rustPlatform.buildRustPackage (
-    args
-    // {
-      auditable = false;
-    }
-  );
-in
-
-rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (
-  args
-  // {
-    nativeBuildInputs = [
-      installShellFiles
-    ];
-
-    postInstall = ''
-      installManPage cargo-auditable/cargo-auditable.1
-    '';
-
-    passthru = {
-      inherit bootstrap;
-    };
-  }
-)
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 460c99ef5e17..5324a9f84020 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -11,6 +11,7 @@
   llvmSharedForHost,
   llvmSharedForTarget,
   llvmPackages, # Exposed through rustc for LTO in Firefox
+  cargo-auditable,
 }:
 {
   stdenv,
@@ -125,7 +126,7 @@ in
             }
           else
             self.callPackage ./cargo_cross.nix { };
-        cargo-auditable = self.callPackage ./cargo-auditable.nix { };
+        inherit cargo-auditable;
         cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
         clippy-unwrapped = self.callPackage ./clippy.nix { };
         clippy = if !fastCross then self.clippy-unwrapped else self.callPackage ./clippy-wrapper.nix { };
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 8213769844f5..43f4c9565165 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -240,6 +240,15 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optionals (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) [
       "--enable-profiler" # build libprofiler_builtins
     ]
+    ++ optionals stdenv.targetPlatform.isDarwin [
+      # potentially other llvm targets work with the same fix?
+      "--enable-profiler" # build libprofiler_builtins
+      # Disable profiler for targets that don't support it
+      "--set=target.wasm32-unknown-unknown.profiler=false"
+      "--set=target.wasm32v1-none.profiler=false"
+      "--set=target.bpfel-unknown-none.profiler=false"
+      "--set=target.bpfeb-unknown-none.profiler=false"
+    ]
     ++ optionals stdenv.buildPlatform.isMusl [
       "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}"
     ]
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 301123a0e3b9..6a9f36829d2b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2870,12 +2870,12 @@ with haskellLib;
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "14.1";
+          version = "14.2";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-VGmo0Y8Q86euPlu3AhMmcmy3rintNy6s9efpUaliBWY=";
+            hash = "sha256-wvE3foz2miOzA3hZ1Ar5XR0FUvP5EqAk010dXp8hiz0=";
           };
         })
       ];
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 6de11fc7d090..ebf85f05fc22 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -401,6 +401,13 @@ self: super:
         ${old.postInstall or ""}
       '';
     }) super.cabal2nix-unstable;
+    happy = overrideCabal (old: {
+      postInstall = ''
+        remove-references-to -t ${lib.getLib self.happy-lib} "''${!outputBin}/bin/happy"
+
+        ${old.postInstall or ""}
+      '';
+    }) super.happy;
 
     # https://github.com/fpco/unliftio/issues/87
     unliftio = dontCheck super.unliftio;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index dee820f447df..4da70c0a7a2f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -2168,7 +2168,7 @@ builtins.intersectAttrs super {
   lib.genAttrs
     [
       "2captcha"
-      "3d-graphics-example"
+      "3d-graphics-examples"
       "3dmodels"
       "4Blocks"
       "assert"
diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix
index 4b4c9e0c0aac..344713d4e341 100644
--- a/pkgs/development/interpreters/emilua/default.nix
+++ b/pkgs/development/interpreters/emilua/default.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/development/interpreters/perl/CVE-2024-56406.patch b/pkgs/development/interpreters/perl/CVE-2024-56406.patch
deleted file mode 100644
index 3960d17e6519..000000000000
--- a/pkgs/development/interpreters/perl/CVE-2024-56406.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 385e8759c3ff1e7f7f996bd4ea391074d61d48c1
-Author:     Karl Williamson <khw@cpan.org>
-AuthorDate: 2024-12-18 18:25:29 -0700
-Commit:     Steve Hay <steve.m.hay@googlemail.com>
-CommitDate: 2025-03-30 11:59:51 +0100
-
-    CVE-2024-56406: Heap-buffer-overflow with tr//
-
-    This was due to underallocating needed space.  If the translation forces
-    something to become UTF-8 that is initially bytes, that UTF-8 could
-    now require two bytes where previously a single one would do.
-
-    (cherry picked from commit f93109c8a6950aafbd7488d98e112552033a3686)
-
-diff --git a/op.c b/op.c
-index 3fc23eca49a..aeee88e0335 100644
---- a/op.c
-+++ b/op.c
-@@ -6649,6 +6649,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl)
-                  * same time.  But otherwise one crosses before the other */
-                 if (t_cp < 256 && r_cp_end > 255 && r_cp != t_cp) {
-                     can_force_utf8 = TRUE;
-+                    max_expansion = MAX(2, max_expansion);
-                 }
-             }
-
diff --git a/pkgs/development/interpreters/perl/CVE-2025-40909.patch b/pkgs/development/interpreters/perl/CVE-2025-40909.patch
deleted file mode 100644
index 984c56e871ff..000000000000
--- a/pkgs/development/interpreters/perl/CVE-2025-40909.patch
+++ /dev/null
@@ -1,408 +0,0 @@
-From 918bfff86ca8d6d4e4ec5b30994451e0bd74aba9 Mon Sep 17 00:00:00 2001
-From: Leon Timmermans <fawaka@gmail.com>
-Date: Fri, 23 May 2025 15:40:41 +0200
-Subject: [PATCH] CVE-2025-40909: Clone dirhandles without fchdir
-
-This uses fdopendir and dup to dirhandles. This means it won't change
-working directory during thread cloning, which prevents race conditions
-that can happen if a third thread is active at the same time.
----
- Configure                      |   6 ++
- Cross/config.sh-arm-linux      |   1 +
- Cross/config.sh-arm-linux-n770 |   1 +
- Porting/Glossary               |   5 ++
- Porting/config.sh              |   1 +
- config_h.SH                    |   6 ++
- configure.com                  |   1 +
- plan9/config_sh.sample         |   1 +
- sv.c                           |  91 +----------------------------
- t/op/threads-dirh.t            | 104 +--------------------------------
- win32/config.gc                |   1 +
- win32/config.vc                |   1 +
- 12 files changed, 28 insertions(+), 191 deletions(-)
-
-diff --git a/Configure b/Configure
-index 44c12ced4014..7a13249caa96 100755
---- a/Configure
-+++ b/Configure
-@@ -478,6 +478,7 @@ d_fd_set=''
- d_fds_bits=''
- d_fdclose=''
- d_fdim=''
-+d_fdopendir=''
- d_fegetround=''
- d_ffs=''
- d_ffsl=''
-@@ -13344,6 +13345,10 @@ esac
- set i_fcntl
- eval $setvar
- 
-+: see if fdopendir exists
-+set fdopendir d_fdopendir
-+eval $inlibc
-+
- : see if fork exists
- set fork d_fork
- eval $inlibc
-@@ -25052,6 +25057,7 @@ d_flockproto='$d_flockproto'
- d_fma='$d_fma'
- d_fmax='$d_fmax'
- d_fmin='$d_fmin'
-+d_fdopendir='$d_fdopendir'
- d_fork='$d_fork'
- d_fp_class='$d_fp_class'
- d_fp_classify='$d_fp_classify'
-diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
-index bfa0b00d5f0f..9e056539198b 100644
---- a/Cross/config.sh-arm-linux
-+++ b/Cross/config.sh-arm-linux
-@@ -212,6 +212,7 @@ d_fd_macros='define'
- d_fd_set='define'
- d_fdclose='undef'
- d_fdim='undef'
-+d_fdopendir=undef
- d_fds_bits='undef'
- d_fegetround='define'
- d_ffs='undef'
-diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
-index 47ad5c37e3fd..365e4c4f9671 100644
---- a/Cross/config.sh-arm-linux-n770
-+++ b/Cross/config.sh-arm-linux-n770
-@@ -211,6 +211,7 @@ d_fd_macros='define'
- d_fd_set='define'
- d_fdclose='undef'
- d_fdim='undef'
-+d_fdopendir=undef
- d_fds_bits='undef'
- d_fegetround='define'
- d_ffs='undef'
-diff --git a/Porting/Glossary b/Porting/Glossary
-index bb505c653b0b..8b2965ca99c6 100644
---- a/Porting/Glossary
-+++ b/Porting/Glossary
-@@ -947,6 +947,11 @@ d_fmin (d_fmin.U):
- 	This variable conditionally defines the HAS_FMIN symbol, which
- 	indicates to the C program that the fmin() routine is available.
- 
-+d_fdopendir (d_fdopendir.U):
-+	This variable conditionally defines the HAS_FORK symbol, which
-+	indicates that the fdopen routine is available to open a
-+	directory descriptor.
-+
- d_fork (d_fork.U):
- 	This variable conditionally defines the HAS_FORK symbol, which
- 	indicates to the C program that the fork() routine is available.
-diff --git a/Porting/config.sh b/Porting/config.sh
-index a921f7e1c79a..6231ea0f31ea 100644
---- a/Porting/config.sh
-+++ b/Porting/config.sh
-@@ -223,6 +223,7 @@ d_fd_macros='define'
- d_fd_set='define'
- d_fdclose='undef'
- d_fdim='define'
-+d_fdopendir='define'
- d_fds_bits='define'
- d_fegetround='define'
- d_ffs='define'
-diff --git a/config_h.SH b/config_h.SH
-index da0f2dbcd7b7..5a0f81cf2011 100755
---- a/config_h.SH
-+++ b/config_h.SH
-@@ -142,6 +142,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
-  */
- #$d_fcntl HAS_FCNTL		/**/
- 
-+/* HAS_FDOPENDIR:
-+ * This symbol, if defined, indicates that the fdopen routine is
-+ * available to open a directory descriptor.
-+ */
-+#$d_fdopendir HAS_FDOPENDIR		/**/
-+
- /* HAS_FGETPOS:
-  *	This symbol, if defined, indicates that the fgetpos routine is
-  *	available to get the file position indicator, similar to ftell().
-diff --git a/configure.com b/configure.com
-index 99527c180bfc..7c38711bb85d 100644
---- a/configure.com
-+++ b/configure.com
-@@ -6010,6 +6010,7 @@ $ WC "d_fd_set='" + d_fd_set + "'"
- $ WC "d_fd_macros='define'"
- $ WC "d_fdclose='undef'"
- $ WC "d_fdim='" + d_fdim + "'"
-+$ WC "d_fdopendir='undef'"
- $ WC "d_fds_bits='define'"
- $ WC "d_fegetround='undef'"
- $ WC "d_ffs='undef'"
-diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
-index 636acbdf6db3..246bad954424 100644
---- a/plan9/config_sh.sample
-+++ b/plan9/config_sh.sample
-@@ -212,6 +212,7 @@ d_fd_macros='undef'
- d_fd_set='undef'
- d_fdclose='undef'
- d_fdim='undef'
-+d_fdopendir=undef
- d_fds_bits='undef'
- d_fegetround='undef'
- d_ffs='undef'
-diff --git a/sv.c b/sv.c
-index ae6d09dea28a..8a005b2d165b 100644
---- a/sv.c
-+++ b/sv.c
-@@ -14096,15 +14096,6 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param)
- {
-     DIR *ret;
- 
--#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR)
--    DIR *pwd;
--    const Direntry_t *dirent;
--    char smallbuf[256]; /* XXX MAXPATHLEN, surely? */
--    char *name = NULL;
--    STRLEN len = 0;
--    long pos;
--#endif
--
-     PERL_UNUSED_CONTEXT;
-     PERL_ARGS_ASSERT_DIRP_DUP;
- 
-@@ -14116,89 +14107,13 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param)
-     if (ret)
-         return ret;
- 
--#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR)
-+#ifdef HAS_FDOPENDIR
- 
-     PERL_UNUSED_ARG(param);
- 
--    /* create anew */
--
--    /* open the current directory (so we can switch back) */
--    if (!(pwd = PerlDir_open("."))) return (DIR *)NULL;
--
--    /* chdir to our dir handle and open the present working directory */
--    if (fchdir(my_dirfd(dp)) < 0 || !(ret = PerlDir_open("."))) {
--        PerlDir_close(pwd);
--        return (DIR *)NULL;
--    }
--    /* Now we should have two dir handles pointing to the same dir. */
--
--    /* Be nice to the calling code and chdir back to where we were. */
--    /* XXX If this fails, then what? */
--    PERL_UNUSED_RESULT(fchdir(my_dirfd(pwd)));
-+    ret = fdopendir(dup(my_dirfd(dp)));
- 
--    /* We have no need of the pwd handle any more. */
--    PerlDir_close(pwd);
--
--#ifdef DIRNAMLEN
--# define d_namlen(d) (d)->d_namlen
--#else
--# define d_namlen(d) strlen((d)->d_name)
--#endif
--    /* Iterate once through dp, to get the file name at the current posi-
--       tion. Then step back. */
--    pos = PerlDir_tell(dp);
--    if ((dirent = PerlDir_read(dp))) {
--        len = d_namlen(dirent);
--        if (len > sizeof(dirent->d_name) && sizeof(dirent->d_name) > PTRSIZE) {
--            /* If the len is somehow magically longer than the
--             * maximum length of the directory entry, even though
--             * we could fit it in a buffer, we could not copy it
--             * from the dirent.  Bail out. */
--            PerlDir_close(ret);
--            return (DIR*)NULL;
--        }
--        if (len <= sizeof smallbuf) name = smallbuf;
--        else Newx(name, len, char);
--        Move(dirent->d_name, name, len, char);
--    }
--    PerlDir_seek(dp, pos);
--
--    /* Iterate through the new dir handle, till we find a file with the
--       right name. */
--    if (!dirent) /* just before the end */
--        for(;;) {
--            pos = PerlDir_tell(ret);
--            if (PerlDir_read(ret)) continue; /* not there yet */
--            PerlDir_seek(ret, pos); /* step back */
--            break;
--        }
--    else {
--        const long pos0 = PerlDir_tell(ret);
--        for(;;) {
--            pos = PerlDir_tell(ret);
--            if ((dirent = PerlDir_read(ret))) {
--                if (len == (STRLEN)d_namlen(dirent)
--                    && memEQ(name, dirent->d_name, len)) {
--                    /* found it */
--                    PerlDir_seek(ret, pos); /* step back */
--                    break;
--                }
--                /* else we are not there yet; keep iterating */
--            }
--            else { /* This is not meant to happen. The best we can do is
--                      reset the iterator to the beginning. */
--                PerlDir_seek(ret, pos0);
--                break;
--            }
--        }
--    }
--#undef d_namlen
--
--    if (name && name != smallbuf)
--        Safefree(name);
--#endif
--
--#ifdef WIN32
-+#elif defined(WIN32)
-     ret = win32_dirp_dup(dp, param);
- #endif
- 
-diff --git a/t/op/threads-dirh.t b/t/op/threads-dirh.t
-index bb4bcfc14184..14c399ca19cd 100644
---- a/t/op/threads-dirh.t
-+++ b/t/op/threads-dirh.t
-@@ -13,16 +13,12 @@ BEGIN {
-      skip_all_if_miniperl("no dynamic loading on miniperl, no threads");
-      skip_all("runs out of memory on some EBCDIC") if $ENV{PERL_SKIP_BIG_MEM_TESTS};
- 
--     plan(6);
-+     plan(1);
- }
- 
- use strict;
- use warnings;
- use threads;
--use threads::shared;
--use File::Path;
--use File::Spec::Functions qw 'updir catdir';
--use Cwd 'getcwd';
- 
- # Basic sanity check: make sure this does not crash
- fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh';
-@@ -31,101 +27,3 @@ fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh';
-    async{}->join for 1..2;
-    print "ok";
- # this is no comment
--
--my $dir;
--SKIP: {
-- skip "telldir or seekdir not defined on this platform", 5
--    if !$Config::Config{d_telldir} || !$Config::Config{d_seekdir};
-- my $skip = sub {
--   chdir($dir);
--   chdir updir;
--   skip $_[0], 5
-- };
--
-- if(!$Config::Config{d_fchdir} && $^O ne "MSWin32") {
--  $::TODO = 'dir handle cloning currently requires fchdir on non-Windows platforms';
-- }
--
-- my @w :shared; # warnings accumulator
-- local $SIG{__WARN__} = sub { push @w, $_[0] };
--
-- $dir = catdir getcwd(), "thrext$$" . int rand() * 100000;
--
-- rmtree($dir) if -d $dir;
-- mkdir($dir);
--
-- # Create a dir structure like this:
-- #   $dir
-- #     |
-- #     `- toberead
-- #            |
-- #            +---- thrit
-- #            |
-- #            +---- rile
-- #            |
-- #            `---- zor
--
-- chdir($dir);
-- mkdir 'toberead';
-- chdir 'toberead';
-- {open my $fh, ">thrit" or &$skip("Cannot create file thrit")}
-- {open my $fh, ">rile" or &$skip("Cannot create file rile")}
-- {open my $fh, ">zor" or &$skip("Cannot create file zor")}
-- chdir updir;
--
-- # Then test that dir iterators are cloned correctly.
--
-- opendir my $toberead, 'toberead';
-- my $start_pos = telldir $toberead;
-- my @first_2 = (scalar readdir $toberead, scalar readdir $toberead);
-- my @from_thread = @{; async { [readdir $toberead ] } ->join };
-- my @from_main = readdir $toberead;
-- is join('-', sort @from_thread), join('-', sort @from_main),
--     'dir iterator is copied from one thread to another';
-- like
--   join('-', "", sort(@first_2, @from_thread), ""),
--   qr/(?<!-rile)-rile-thrit-zor-(?!zor-)/i,
--  'cloned iterator iterates exactly once over everything not already seen';
--
-- seekdir $toberead, $start_pos;
-- readdir $toberead for 1 .. @first_2+@from_thread;
-- {
--  local $::TODO; # This always passes when dir handles are not cloned.
--  is
--    async { readdir $toberead // 'undef' } ->join, 'undef',
--   'cloned dir iterator that points to the end of the directory'
--  ;
-- }
--
-- # Make sure the cloning code can handle file names longer than 255 chars
-- SKIP: {
--  chdir 'toberead';
--  open my $fh,
--    ">floccipaucinihilopilification-"
--   . "pneumonoultramicroscopicsilicovolcanoconiosis-"
--   . "lopadotemachoselachogaleokranioleipsanodrimypotrimmatosilphiokarabo"
--   . "melitokatakechymenokichlepikossyphophattoperisteralektryonoptokephal"
--   . "liokinklopeleiolagoiosiraiobaphetraganopterygon"
--    or
--     chdir updir,
--     skip("OS does not support long file names (and I mean *long*)", 1);
--  chdir updir;
--  opendir my $dirh, "toberead";
--  my $test_name
--    = "dir iterators can be cloned when the next fn > 255 chars";
--  while() {
--   my $pos = telldir $dirh;
--   my $fn = readdir($dirh);
--   if(!defined $fn) { fail($test_name); last SKIP; }
--   if($fn =~ 'lagoio') { 
--    seekdir $dirh, $pos;
--    last;
--   }
--  }
--  is length async { scalar readdir $dirh } ->join, 258, $test_name;
-- }
--
-- is scalar @w, 0, 'no warnings during all that' or diag @w;
-- chdir updir;
--}
--rmtree($dir);
-diff --git a/win32/config.gc b/win32/config.gc
-index f8776188c09c..34aa8de6ed75 100644
---- a/win32/config.gc
-+++ b/win32/config.gc
-@@ -199,6 +199,7 @@ d_fd_macros='define'
- d_fd_set='define'
- d_fdclose='undef'
- d_fdim='undef'
-+d_fdopendir='undef'
- d_fds_bits='define'
- d_fegetround='undef'
- d_ffs='undef'
-diff --git a/win32/config.vc b/win32/config.vc
-index 619979e22b53..536085fe94e0 100644
---- a/win32/config.vc
-+++ b/win32/config.vc
-@@ -199,6 +199,7 @@ d_fd_macros='define'
- d_fd_set='define'
- d_fdclose='undef'
- d_fdim='undef'
-+d_fdopendir='undef'
- d_fds_bits='define'
- d_fegetround='undef'
- d_ffs='undef'
diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch
index e0f05ede90d0..46ed70bbeb7c 100644
--- a/pkgs/development/interpreters/perl/cross.patch
+++ b/pkgs/development/interpreters/perl/cross.patch
@@ -7,15 +7,15 @@ ExtUtils::MakeMaker
 JSON::PP
 Data::Dumper
 
-Updated for perl v5.38.0 by stig@stig.io
+Updated for perl v5.40.0 by marcus@means.no
 
 ---
 
-diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm
+diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm
 index b0e83b0d2d..dab4907704 100644
---- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm
-+++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm
-@@ -86,21 +86,7 @@ sub new {
+--- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm
++++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm
+@@ -52,21 +52,38 @@
  # from version::vpp
  sub _find_magic_vstring {
    my $value = shift;
@@ -31,13 +31,42 @@ index b0e83b0d2d..dab4907704 100644
 -    }
 -    else {
 -      $magic = $magic->MOREMAGIC;
--    }
--  }
++
++  # B is not available in miniperl (it depends on XS), so try to load it safely
++  my $has_B = eval { require B; 1 };
++
++  if ($has_B) {
++     my $sv = B::svref_2object(\$value);
++     my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
++     while ($magic) {
++       if ($magic->TYPE eq 'V') {
++         my $tvalue = $magic->PTR;
++         $tvalue =~ s/^v?(.+)$/v$1/;
++         return $tvalue;
++       }
++       $magic = $magic->MOREMAGIC;
+     }
+   }
 -  return $tvalue;
-+  return version::->parse($value)->stringify;
++
++  # --- Fallback for miniperl ---
++  # Perl represents vstrings internally as sequences of bytes like "\x01\x02\x03"
++  # and only shows them as "v1.2.3" when printed.
++  # Try to detect that pattern heuristically.
++  use builtin qw/reftype/;
++  if (!ref($value) && reftype(\$value) eq 'VSTRING') {
++    return sprintf("v%vd", $value);
++  }
++
++  # If it's already a "v1.2.3" string, just return it as is
++  if ($value =~ /^v\d+(?:\.\d+)*$/) {
++    return $value;
++  }
++
++  return '';
  }
- 
- # safe if given an unblessed reference
+
+ # Perl 5.10.0 didn't have "is_qv" in version.pm
 diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm
 index 746abd63bc..c55d7cd2d0 100644
 --- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm
@@ -47,13 +76,13 @@ index 746abd63bc..c55d7cd2d0 100644
  use strict;
  use warnings;
 +no warnings 'experimental::builtin';
- package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e
+ package CPAN::Meta::YAML; # git description: v1.75-3-g85169f1
  # XXX-INGY is 5.8.1 too old/broken for utf8?
  # XXX-XDG Lancaster consensus was that it was sufficient until
 @@ -650,27 +651,29 @@ sub _dump_string {
      join '', map { "$_\n" } @lines;
  }
- 
+
 -sub _has_internal_string_value {
 +# taken from cpan/JSON-PP/lib/JSON/PP.pm
 +sub _looks_like_number {
@@ -72,7 +101,7 @@ index 746abd63bc..c55d7cd2d0 100644
 +    return 1 if $value * 0 == 0;
 +    return -1; # inf/nan
  }
- 
+
  sub _dump_scalar {
      my $string = $_[1];
      my $is_key = $_[2];
@@ -95,8 +124,8 @@ index 746abd63bc..c55d7cd2d0 100644
          $string =~ s/\\/\\\\/g;
 @@ -800,9 +803,6 @@ sub errstr {
  # Helper functions. Possibly not needed.
- 
- 
+
+
 -# Use to detect nv or iv
 -use B;
 -
@@ -106,7 +135,7 @@ index 746abd63bc..c55d7cd2d0 100644
 @@ -822,35 +822,8 @@ sub _can_flock {
      }
  }
- 
+
 -
 -# XXX-INGY Is this core in 5.8.1? Can we remove this?
 -# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this
@@ -138,7 +167,7 @@ index 746abd63bc..c55d7cd2d0 100644
 -    }
 +    *refaddr = *builtin::refaddr;
  }
- 
+
  delete $CPAN::Meta::YAML::{refaddr};
 diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm
 index 3604eae402..991f69d275 100644
@@ -148,16 +177,16 @@ index 3604eae402..991f69d275 100644
  use strict;
  use warnings;
 +no warnings 'experimental::builtin';
- 
+
  package CPAN::Meta::Merge;
- 
+
  our $VERSION = '2.150010';
- 
+
  use Carp qw/croak/;
 -use Scalar::Util qw/blessed/;
 +use builtin qw/blessed/;
  use CPAN::Meta::Converter 2.141170;
- 
+
  sub _is_identical {
 diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm
 index d4e93fd8a5..809da68d02 100644
@@ -169,40 +198,27 @@ index d4e93fd8a5..809da68d02 100644
  use warnings;
 +no warnings 'experimental::builtin';
  package CPAN::Meta::Prereqs;
- 
+
  our $VERSION = '2.150010';
-@@ -14,7 +15,6 @@ our $VERSION = '2.150010';
+@@ -14,7 +14,7 @@ our $VERSION = '2.150010';
  #pod =cut
- 
+
  use Carp qw(confess);
 -use Scalar::Util qw(blessed);
++use builtin qw(blessed);
  use CPAN::Meta::Requirements 2.121;
- 
+
  #pod =method new
-@@ -168,7 +168,12 @@ sub types_in {
- sub with_merged_prereqs {
-   my ($self, $other) = @_;
- 
--  my @other = blessed($other) ? $other : @$other;
-+  eval 'require Scalar::Util';
-+  my @other = unless($@){
-+    Scalar::Util::blessed($other) ? $other : @$other;
-+  }else{
-+    builtin::blessed($other) ? $other : @$other;
-+  }
- 
-   my @prereq_objs = ($self, @other);
- 
 diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm
 index fc8fcbc8f0..cda7b90c65 100644
 --- a/cpan/JSON-PP/lib/JSON/PP.pm
 +++ b/cpan/JSON-PP/lib/JSON/PP.pm
 @@ -4,6 +4,7 @@ package JSON::PP;
- 
+
  use 5.008;
  use strict;
 +no warnings 'experimental::builtin';
- 
+
  use Exporter ();
  BEGIN { our @ISA = ('Exporter') }
 diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm
@@ -210,34 +226,34 @@ index bb6d3caedb..0c2fde4743 100644
 --- a/dist/Data-Dumper/Dumper.pm
 +++ b/dist/Data-Dumper/Dumper.pm
 @@ -11,6 +11,7 @@ package Data::Dumper;
- 
+
  use strict;
  use warnings;
 +no warnings 'experimental::builtin';
- 
+
  #$| = 1;
- 
+
 @@ -125,8 +126,7 @@ sub new {
  # Packed numeric addresses take less memory. Plus pack is faster than sprintf
- 
+
  sub format_refaddr {
 -    require Scalar::Util;
 -    pack "J", Scalar::Util::refaddr(shift);
 +    pack "J", builtin::refaddr(shift);
  };
- 
+
  #
 @@ -282,9 +282,8 @@ sub _dump {
        warn "WARNING(Freezer method call failed): $@" if $@;
      }
- 
+
 -    require Scalar::Util;
 -    my $realpack = Scalar::Util::blessed($val);
 -    my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val;
 +    my $realpack = builtin::blessed($val);
 +    my $realtype = $realpack ? builtin::reftype($val) : ref $val;
      $id = format_refaddr($val);
- 
+
      # Note: By this point $name is always defined and of non-zero length.
 @@ -576,7 +575,7 @@ sub _dump {
      # here generates a different result. So there are actually "three" different
@@ -248,3 +264,36 @@ index bb6d3caedb..0c2fde4743 100644
        $out .= sprintf "v%vd", $val;
      }
      # \d here would treat "1\x{660}" as a safe decimal number
+diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm
+index fc8fcbc8f0..cda7b90c65 100644
+--- a/cpan/JSON-PP/lib/JSON/PP.pm
++++ b/cpan/JSON-PP/lib/JSON/PP.pm
+@@ -12,6 +12,6 @@ package JSON::PP;
+
+ use Carp ();
+-use Scalar::Util qw(blessed reftype refaddr);
++use builtin qw(blessed reftype refaddr);
+ #use Devel::Peek;
+
+
+diff --git a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm
+--- a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm
++++ b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm
+@@ -53,7 +53,8 @@ sub load_json_string {
+   my ($class, $string) = @_;
+   require Encode;
+   # load_json_string takes characters, decode_json expects bytes
+-  my $encoded = Encode::encode('UTF-8', $string, Encode::PERLQQ());
++  my $encoded = $string;
++  utf8::encode($encoded); # Miniperl workaround
+   my $data = eval { $class->json_decoder()->can('decode_json')->($encoded) };
+   croak $@ if $@;
+   return $data || {};
+@@ -122,7 +122,7 @@ sub _slurp {
+   open my $fh, "<:raw", "$_[0]" ## no critic
+     or die "can't open $_[0] for reading: $!";
+   my $content = do { local $/; <$fh> };
+-  $content = Encode::decode('UTF-8', $content, Encode::PERLQQ());
++  utf8::decode($content); # Workaround for miniperl
+   return $content;
+ }
diff --git a/pkgs/development/interpreters/perl/cross540.patch b/pkgs/development/interpreters/perl/cross540.patch
deleted file mode 100644
index 0736c16d4f45..000000000000
--- a/pkgs/development/interpreters/perl/cross540.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
-Date: Mon, 10 Apr 2023 22:12:24 +0200
-Subject: [PATCH] miniperl compatible modules
-
-CPAN::Meta
-ExtUtils::MakeMaker
-JSON::PP
-Data::Dumper
-
-Updated for perl v5.40.0 by marcus@means.no
-
----
-
- # safe if given an unblessed reference
-diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm
-index 746abd63bc..c55d7cd2d0 100644
---- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm
-+++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm
-@@ -1,6 +1,7 @@
- use 5.008001; # sane UTF-8 support
- use strict;
- use warnings;
-+no warnings 'experimental::builtin';
- package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e
- # XXX-INGY is 5.8.1 too old/broken for utf8?
- # XXX-XDG Lancaster consensus was that it was sufficient until
-@@ -650,27 +651,29 @@ sub _dump_string {
-     join '', map { "$_\n" } @lines;
- }
- 
--sub _has_internal_string_value {
-+# taken from cpan/JSON-PP/lib/JSON/PP.pm
-+sub _looks_like_number {
-     my $value = shift;
--    my $b_obj = B::svref_2object(\$value);  # for round trip problem
--    return $b_obj->FLAGS & B::SVf_POK();
-+    no warnings 'numeric';
-+    # if the utf8 flag is on, it almost certainly started as a string
-+    return if utf8::is_utf8($value);
-+    # detect numbers
-+    # string & "" -> ""
-+    # number & "" -> 0 (with warning)
-+    # nan and inf can detect as numbers, so check with * 0
-+    return unless length((my $dummy = "") & $value);
-+    return unless 0 + $value eq $value;
-+    return 1 if $value * 0 == 0;
-+    return -1; # inf/nan
- }
- 
- sub _dump_scalar {
-     my $string = $_[1];
-     my $is_key = $_[2];
--    # Check this before checking length or it winds up looking like a string!
--    my $has_string_flag = _has_internal_string_value($string);
-     return '~'  unless defined $string;
-     return "''" unless length  $string;
--    if (Scalar::Util::looks_like_number($string)) {
--        # keys and values that have been used as strings get quoted
--        if ( $is_key || $has_string_flag ) {
--            return qq['$string'];
--        }
--        else {
--            return $string;
--        }
-+    if (_looks_like_number($string)) {
-+        return qq['$string'];
-     }
-     if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) {
-         $string =~ s/\\/\\\\/g;
-@@ -800,9 +803,6 @@ sub errstr {
- # Helper functions. Possibly not needed.
- 
- 
--# Use to detect nv or iv
--use B;
--
- # XXX-INGY Is flock CPAN::Meta::YAML's responsibility?
- # Some platforms can't flock :-(
- # XXX-XDG I think it is.  When reading and writing files, we ought
-@@ -822,35 +822,8 @@ sub _can_flock {
-     }
- }
- 
--
--# XXX-INGY Is this core in 5.8.1? Can we remove this?
--# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this
--#####################################################################
--# Use Scalar::Util if possible, otherwise emulate it
--
--use Scalar::Util ();
- BEGIN {
--    local $@;
--    if ( eval { Scalar::Util->VERSION(1.18); } ) {
--        *refaddr = *Scalar::Util::refaddr;
--    }
--    else {
--        eval <<'END_PERL';
--# Scalar::Util failed to load or too old
--sub refaddr {
--    my $pkg = ref($_[0]) or return undef;
--    if ( !! UNIVERSAL::can($_[0], 'can') ) {
--        bless $_[0], 'Scalar::Util::Fake';
--    } else {
--        $pkg = undef;
--    }
--    "$_[0]" =~ /0x(\w+)/;
--    my $i = do { no warnings 'portable'; hex $1 };
--    bless $_[0], $pkg if defined $pkg;
--    $i;
--}
--END_PERL
--    }
-+    *refaddr = *builtin::refaddr;
- }
- 
- delete $CPAN::Meta::YAML::{refaddr};
-diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm
-index 3604eae402..991f69d275 100644
---- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm
-+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm
-@@ -1,12 +1,13 @@
- use strict;
- use warnings;
-+no warnings 'experimental::builtin';
- 
- package CPAN::Meta::Merge;
- 
- our $VERSION = '2.150010';
- 
- use Carp qw/croak/;
--use Scalar::Util qw/blessed/;
-+use builtin qw/blessed/;
- use CPAN::Meta::Converter 2.141170;
- 
- sub _is_identical {
-diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm
-index d4e93fd8a5..809da68d02 100644
---- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm
-+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm
-@@ -1,6 +1,7 @@
- use 5.006;
- use strict;
- use warnings;
-+no warnings 'experimental::builtin';
- package CPAN::Meta::Prereqs;
- 
- our $VERSION = '2.150010';
-@@ -14,7 +15,6 @@ our $VERSION = '2.150010';
- #pod =cut
- 
- use Carp qw(confess);
--use Scalar::Util qw(blessed);
- use CPAN::Meta::Requirements 2.121;
- 
- #pod =method new
-@@ -168,7 +168,12 @@ sub types_in {
- sub with_merged_prereqs {
-   my ($self, $other) = @_;
- 
--  my @other = blessed($other) ? $other : @$other;
-+  eval 'require Scalar::Util';
-+  my @other = unless($@){
-+    Scalar::Util::blessed($other) ? $other : @$other;
-+  }else{
-+    builtin::blessed($other) ? $other : @$other;
-+  }
- 
-   my @prereq_objs = ($self, @other);
- 
-diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm
-index fc8fcbc8f0..cda7b90c65 100644
---- a/cpan/JSON-PP/lib/JSON/PP.pm
-+++ b/cpan/JSON-PP/lib/JSON/PP.pm
-@@ -4,6 +4,7 @@ package JSON::PP;
- 
- use 5.008;
- use strict;
-+no warnings 'experimental::builtin';
- 
- use Exporter ();
- BEGIN { our @ISA = ('Exporter') }
-diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm
-index bb6d3caedb..0c2fde4743 100644
---- a/dist/Data-Dumper/Dumper.pm
-+++ b/dist/Data-Dumper/Dumper.pm
-@@ -11,6 +11,7 @@ package Data::Dumper;
- 
- use strict;
- use warnings;
-+no warnings 'experimental::builtin';
- 
- #$| = 1;
- 
-@@ -125,8 +126,7 @@ sub new {
- # Packed numeric addresses take less memory. Plus pack is faster than sprintf
- 
- sub format_refaddr {
--    require Scalar::Util;
--    pack "J", Scalar::Util::refaddr(shift);
-+    pack "J", builtin::refaddr(shift);
- };
- 
- #
-@@ -282,9 +282,8 @@ sub _dump {
-       warn "WARNING(Freezer method call failed): $@" if $@;
-     }
- 
--    require Scalar::Util;
--    my $realpack = Scalar::Util::blessed($val);
--    my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val;
-+    my $realpack = builtin::blessed($val);
-+    my $realtype = $realpack ? builtin::reftype($val) : ref $val;
-     $id = format_refaddr($val);
- 
-     # Note: By this point $name is always defined and of non-zero length.
-@@ -576,7 +575,7 @@ sub _dump {
-     # here generates a different result. So there are actually "three" different
-     # implementations of Data::Dumper (kind of sort of) but we only test two.
-     elsif (!defined &_vstring
--       and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) {
-+       and ref $ref eq 'VSTRING') {
-       $out .= sprintf "v%vd", $val;
-     }
-     # \d here would treat "1\x{660}" as a safe decimal number
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 69d02530a90f..8fc7b5dd07a3 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -68,19 +68,10 @@ let
 
 in
 rec {
-  # Maint version
-  perl538 = callPackage ./interpreter.nix {
-    self = perl538;
-    version = "5.38.2";
-    sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4=";
-    inherit passthruFun;
-  };
-
-  # Maint version
-  perl540 = callPackage ./interpreter.nix {
-    self = perl540;
-    version = "5.40.0";
-    sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8=";
+  perl5 = callPackage ./interpreter.nix {
+    self = perl5;
+    version = "5.42.0";
+    sha256 = "sha256-4JPvGE1/mhuXl+JGUpb1VRCtttq4hCsMPtUzKWYwltw=";
     inherit passthruFun;
   };
 }
diff --git a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch
deleted file mode 100644
index 9f9e1e96f619..000000000000
--- a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001
-From: Andrei Horodniceanu <a.horodniceanu@proton.me>
-Date: Wed, 4 Sep 2024 12:46:44 +0300
-Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale
-
-Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>
----
- AUTHORS  |  1 +
- locale.c | 16 ++++++++++++++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/AUTHORS b/AUTHORS
-index b2e0bf2043a9..b196b93bda13 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -103,6 +103,7 @@ Andreas König                  <a.koenig@mind.de>
- Andreas Marienborg             <andreas.marienborg@gmail.com>
- Andreas Schwab                 <schwab@suse.de>
- Andreas Voegele                <andreas@andreasvoegele.com>
-+Andrei Horodniceanu            <a.horodniceanu@proton.me>
- Andrei Yelistratov             <andrew@sundale.net>
- Andrej Borsenkow               <Andrej.Borsenkow@mow.siemens.ru>
- Andrew Bettison                <andrewb@zip.com.au>
-diff --git a/locale.c b/locale.c
-index 168b94914318..d764b4b3c11e 100644
---- a/locale.c
-+++ b/locale.c
-@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
-      * categories into our internal indices. */
-     if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) {
- 
-+#    ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT
-         /* Use this array, initialized by a config.h constant */
-         int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT;
-         STATIC_ASSERT_STMT(   C_ARRAY_LENGTH(lc_all_category_positions)
-@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
-             map_LC_ALL_position_to_index[i] =
-                               get_category_index(lc_all_category_positions[i]);
-         }
-+#    else
-+        /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and
-+         * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on
-+         * systems with only a C locale during ./Configure.  Assume that this
-+         * can only happen as part of some sort of bootstrapping so allow
-+         * compilation to succeed by ignoring correctness.
-+         */
-+        for (unsigned int i = 0;
-+             i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index);
-+             i++)
-+        {
-+            map_LC_ALL_position_to_index[i] = 0;
-+        }
-+#    endif
-+
-     }
- 
-     LOCALE_UNLOCK;
diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index 16e6bd821d5a..ee59b10344c5 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -15,7 +15,7 @@
   zlib,
   config,
   passthruFun,
-  perlAttr ? "perl${lib.versions.major version}${lib.versions.minor version}",
+  perlAttr ? "perl${lib.versions.major version}",
   enableThreading ? true,
   coreutils,
   makeWrapper,
@@ -33,6 +33,13 @@ assert (enableCrypt -> (libxcrypt != null));
 
 let
   crossCompiling = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
+  commonPatches = [
+    ./no-sys-dirs.patch
+  ]
+  ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch
+  ++ lib.optional stdenv.hostPlatform.isDarwin ./cpp-precomp.patch
+  ++ lib.optional crossCompiling ./cross.patch;
+
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
   libcInc = lib.getDev libc;
   libcLib = lib.getLib libc;
@@ -71,27 +78,7 @@ stdenv.mkDerivation (
 
     disallowedReferences = [ stdenv.cc ];
 
-    patches = [
-      ./CVE-2024-56406.patch
-      ./CVE-2025-40909.patch
-    ]
-    # Do not look in /usr etc. for dependencies.
-    ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch
-    ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch
-
-    # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569
-    ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch
-
-    ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./cpp-precomp.patch
-      ./sw_vers.patch
-    ]
-    # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option
-    # https://github.com/arsv/perl-cross/pull/159
-    ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross-fdopendir.patch
-    ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch
-    ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch;
+    patches = commonPatches;
 
     # This is not done for native builds because pwd may need to come from
     # bootstrap tools when building bootstrap perl.
@@ -159,6 +146,7 @@ stdenv.mkDerivation (
         "-Dinstallstyle=lib/perl5"
         "-Dlocincpth=${libcInc}/include"
         "-Dloclibpth=${libcLib}/lib"
+        "-Accflags=-D_GNU_SOURCE"
       ]
       ++ lib.optional stdenv.hostPlatform.isStatic "-Uusedl"
       ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [
@@ -177,16 +165,20 @@ stdenv.mkDerivation (
     configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
 
     # !canExecute cross uses miniperl which doesn't have this
-    postConfigure = lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") ''
-      substituteInPlace Makefile \
-        --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar"
-    '';
+    postConfigure =
+      lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") ''
+        substituteInPlace Makefile \
+          --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar"
+      ''
+      + lib.optionalString crossCompiling ''
+        substituteInPlace miniperl_top --replace-fail '-I$top/lib' '-I$top/cpan/JSON-PP/lib -I$top/cpan/CPAN-Meta-YAML/lib -I$top/lib'
+      '';
 
     dontAddStaticConfigureFlags = true;
 
     dontAddPrefix = !crossCompiling;
 
-    enableParallelBuilding = false;
+    enableParallelBuilding = true;
 
     # perl includes the build date, the uname of the build system and the
     # username of the build user in some files.
@@ -237,6 +229,13 @@ stdenv.mkDerivation (
 
     setupHook = ./setup-hook.sh;
 
+    env = {
+      # https://github.com/llvm/llvm-project/issues/152241
+      NIX_CFLAGS_COMPILE = lib.optionalString (
+        stdenv.hasCC && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "21"
+      ) "-fno-strict-aliasing";
+    };
+
     # copied from python
     passthru =
       let
@@ -329,8 +328,14 @@ stdenv.mkDerivation (
       rev = crossVersion;
       hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw=";
     };
-
-    # Patches are above!!!
+    patches = commonPatches ++ [
+      # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option
+      # https://github.com/arsv/perl-cross/pull/159
+      ./cross-fdopendir.patch
+      # Add patchset for 5.42.0 - Can hopefully be removed once perl-cross is updated
+      # https://github.com/arsv/perl-cross/pull/164
+      ./perl-5.42.0-cross.patch
+    ];
 
     depsBuildBuild = [
       buildPackages.stdenv.cc
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch
deleted file mode 100644
index c959730d1420..000000000000
--- a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-diff --git a/Configure b/Configure
-index e261cb9548..3bbbc4b9df 100755
---- a/Configure
-+++ b/Configure
-@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th
- fi
- 
- : Proper PATH setting
--paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
--paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
--paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
--paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
--paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
--paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
--paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
--paths="$paths /sbin /usr/sbin /usr/libexec"
--paths="$paths /system/gnu_library/bin"
-+paths=''
- 
- for p in $paths
- do
-@@ -1455,8 +1447,7 @@ groupstype=''
- i_whoami=''
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
--locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-+locincpth=""
- :
- : no include file wanted by default
- inclwanted=''
-@@ -1470,17 +1461,12 @@ DEBUGGING=''
- archobjs=''
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
--xlibpth='/usr/lib/386 /lib/386'
-+xlibpth=''
- : Possible local library directories to search.
--loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
--loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-+loclibpth=""
- 
- : general looking path for locating libraries
--glibpth="/lib /usr/lib $xlibpth"
--glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
--test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
--test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
--test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-+glibpth=""
- 
- : Private path used by Configure to find libraries.  Its value
- : is prepended to libpth. This variable takes care of special
-@@ -1515,8 +1501,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld"
- libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
--glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
--glibpth="/usr/shlib $glibpth"
- : Do not use vfork unless overridden by a hint file.
- usevfork=false
- 
-@@ -2581,7 +2565,6 @@ uname
- zip
- "
- pth=`echo $PATH | sed -e "s/$p_/ /g"`
--pth="$pth $sysroot/lib $sysroot/usr/lib"
- for file in $loclist; do
- 	eval xxx=\$$file
- 	case "$xxx" in
-@@ -5023,7 +5006,7 @@ esac
- : Set private lib path
- case "$plibpth" in
- '') if ./mips; then
--	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
-+	plibpth="$incpath/usr/lib"
-     fi;;
- esac
- case "$libpth" in
-@@ -8860,13 +8843,8 @@ esac
- echo " "
- case "$sysman" in
- '')
--	syspath='/usr/share/man/man1 /usr/man/man1'
--	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
--	syspath="$syspath /usr/man/u_man/man1"
--	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
--	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
--	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
--	sysman=`./loc . /usr/man/man1 $syspath`
-+	syspath=''
-+	sysman=''
- 	;;
- esac
- if $test -d "$sysman"; then
-@@ -21500,9 +21478,10 @@ $rm_try tryp
- case "$full_ar" in
- '') full_ar=$ar ;;
- esac
-+full_ar=ar
- 
- : Store the full pathname to the sed program for use in the C program
--full_sed=$sed
-+full_sed=sed
- 
- : see what type gids are declared as in the kernel
- echo " "
-diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index ae647d5f06..9a05d66592 100644
---- a/ext/Errno/Errno_pm.PL
-+++ b/ext/Errno/Errno_pm.PL
-@@ -135,12 +135,7 @@ sub get_files {
- 	if ($dep =~ /(\S+errno\.h)/) {
- 	     push(@file, $1);
- 	}
--    } elsif ($^O eq 'linux' &&
--	      $Config{gccversion} ne '' && 
--	      $Config{gccversion} !~ /intel/i &&
--	      # might be using, say, Intel's icc
--	      $linux_errno_h
--	     ) {
-+    } elsif (0) {
- 	push(@file, $linux_errno_h);
-     } elsif ($^O eq 'haiku') {
- 	# hidden in a special place
-diff --git a/hints/freebsd.sh b/hints/freebsd.sh
-index 4d26835e99..c6d365d84d 100644
---- a/hints/freebsd.sh
-+++ b/hints/freebsd.sh
-@@ -127,21 +127,21 @@ case "$osvers" in
-         objformat=`/usr/bin/objformat`
-         if [ x$objformat = xaout ]; then
-             if [ -e /usr/lib/aout ]; then
--                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
--                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+                libpth=""
-+                glibpth=""
-             fi
-             lddlflags='-Bshareable'
-         else
--            libpth="/usr/lib /usr/local/lib"
--            glibpth="/usr/lib /usr/local/lib"
-+            libpth=""
-+            glibpth=""
-             ldflags="-Wl,-E "
-             lddlflags="-shared "
-         fi
-         cccdlflags='-DPIC -fPIC'
-         ;;
- *)
--       libpth="/usr/lib /usr/local/lib"
--       glibpth="/usr/lib /usr/local/lib"
-+       libpth=""
-+       glibpth=""
-        ldflags="-Wl,-E "
-         lddlflags="-shared "
-         cccdlflags='-DPIC -fPIC'
-diff --git a/hints/linux.sh b/hints/linux.sh
-index e1508c7509..5a187c583a 100644
---- a/hints/linux.sh
-+++ b/hints/linux.sh
-@@ -150,28 +150,6 @@ case "$optimize" in
-     ;;
- esac
- 
--# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
--# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
--# where to look.  We don't want gcc's own libraries, however, so we
--# filter those out.
--# This could be conditional on Ubuntu, but other distributions may
--# follow suit, and this scheme seems to work even on rather old gcc's.
--# This unconditionally uses gcc because even if the user is using another
--# compiler, we still need to find the math library and friends, and I don't
--# know how other compilers will cope with that situation.
--# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
--# we don't want its libraries. So we try to prefer the system gcc
--# Still, as an escape hatch, allow Configure command line overrides to
--# plibpth to bypass this check.
--if [ -x /usr/bin/gcc ] ; then
--    gcc=/usr/bin/gcc
--# clang also provides -print-search-dirs
--elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
--    gcc=${cc:-cc}
--else
--    gcc=gcc
--fi
--
- case "$plibpth" in
- '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
- 	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
-@@ -208,32 +186,6 @@ case "$usequadmath" in
-   ;;
- esac
- 
--case "$libc" in
--'')
--# If you have glibc, then report the version for ./myconfig bug reporting.
--# (Configure doesn't need to know the specific version since it just uses
--# gcc to load the library for all tests.)
--# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
--# are insufficiently precise to distinguish things like
--# libc-2.0.6 and libc-2.0.7.
--    for p in $plibpth
--    do
--        for trylib in libc.so.6 libc.so
--        do
--            if $test -e $p/$trylib; then
--                libc=`ls -l $p/$trylib | awk '{print $NF}'`
--                if $test "X$libc" != X; then
--                    break
--                fi
--            fi
--        done
--        if $test "X$libc" != X; then
--            break
--        fi
--    done
--    ;;
--esac
--
- if ${sh:-/bin/sh} -c exit; then
-   echo ''
-   echo 'You appear to have a working bash.  Good.'
-@@ -311,33 +263,6 @@ sparc*)
- 	;;
- esac
- 
--# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
--# true libraries. The scripts cause binding against static
--# version of -lgdbm which is a bad idea. So if we have 'nm'
--# make sure it can read the file
--# NI-S 2003/08/07
--case "$nm" in
--    '') ;;
--    *)
--    for p in $plibpth
--    do
--        if $test -r $p/libndbm.so; then
--            if $nm $p/libndbm.so >/dev/null 2>&1 ; then
--                echo 'Your shared -lndbm seems to be a real library.'
--                _libndbm_real=1
--                break
--            fi
--        fi
--    done
--    if $test "X$_libndbm_real" = X; then
--        echo 'Your shared -lndbm is not a real library.'
--        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
--        shift
--        libswanted="$*"
--    fi
--    ;;
--esac
--
- # Linux on Synology.
- if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
-     # Tested on Synology DS213 and DS413
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch
rename to pkgs/development/interpreters/perl/no-sys-dirs.patch
diff --git a/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch b/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch
new file mode 100644
index 000000000000..66b536b6973d
--- /dev/null
+++ b/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch
@@ -0,0 +1,186 @@
+From b47ef629459076a5ccb3d0caf83ccfbb8ba0571b Mon Sep 17 00:00:00 2001
+From: Marcus Ramberg <marcus@means.no>
+Date: Wed, 3 Sep 2025 10:35:58 +0200
+Subject: [PATCH] patches for perl-5.42.0
+
+---
+ cnf/diffs/perl5-5.42.0/constant.patch       |  1 +
+ cnf/diffs/perl5-5.42.0/dynaloader.patch     |  1 +
+ cnf/diffs/perl5-5.42.0/findext.patch        |  1 +
+ cnf/diffs/perl5-5.42.0/installscripts.patch |  1 +
+ cnf/diffs/perl5-5.42.0/liblist.patch        | 80 +++++++++++++++++++++
+ cnf/diffs/perl5-5.42.0/makemaker.patch      |  1 +
+ cnf/diffs/perl5-5.42.0/posix-makefile.patch |  1 +
+ cnf/diffs/perl5-5.42.0/test-checkcase.patch |  1 +
+ cnf/diffs/perl5-5.42.0/test-makemaker.patch |  1 +
+ cnf/diffs/perl5-5.42.0/xconfig.patch        |  1 +
+ 10 files changed, 89 insertions(+)
+ create mode 120000 cnf/diffs/perl5-5.42.0/constant.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/dynaloader.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/findext.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/installscripts.patch
+ create mode 100644 cnf/diffs/perl5-5.42.0/liblist.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/makemaker.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/posix-makefile.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/test-checkcase.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/test-makemaker.patch
+ create mode 120000 cnf/diffs/perl5-5.42.0/xconfig.patch
+
+diff --git a/cnf/diffs/perl5-5.42.0/constant.patch b/cnf/diffs/perl5-5.42.0/constant.patch
+new file mode 120000
+index 0000000..065e198
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/constant.patch
+@@ -0,0 +1 @@
++../perl5-5.22.3/constant.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/dynaloader.patch b/cnf/diffs/perl5-5.42.0/dynaloader.patch
+new file mode 120000
+index 0000000..ffb73eb
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/dynaloader.patch
+@@ -0,0 +1 @@
++../perl5-5.22.3/dynaloader.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/findext.patch b/cnf/diffs/perl5-5.42.0/findext.patch
+new file mode 120000
+index 0000000..9efbe5b
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/findext.patch
+@@ -0,0 +1 @@
++../perl5-5.22.3/findext.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/installscripts.patch b/cnf/diffs/perl5-5.42.0/installscripts.patch
+new file mode 120000
+index 0000000..1c05e0f
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/installscripts.patch
+@@ -0,0 +1 @@
++../perl5-5.36.0/installscripts.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/liblist.patch b/cnf/diffs/perl5-5.42.0/liblist.patch
+new file mode 100644
+index 0000000..5e6331f
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/liblist.patch
+@@ -0,0 +1,80 @@
++When deciding which libraries are available, the original Configure uses
++shaky heuristics to physically locate library files.
++This is a very very bad thing to do, *especially* when cross-compiling,
++as said heiristics are likely to locate the host libraries, not the target ones.
++
++The only real need for this test is to make sure it's safe to pass -llibrary
++to the compiler. So that's exactly what perl-cross does, pass -llibrary
++and see if it breaks things.
++
++Note this is a part of MakeMaker, and only applies to module Makefiles.
++
++
++--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
++@@ -20,9 +20,10 @@
++ use File::Spec;
++ 
++ sub ext {
++-    if    ( $^O eq 'VMS' )     { goto &_vms_ext; }
++-    elsif ( $^O eq 'MSWin32' ) { goto &_win32_ext; }
++-    else                       { goto &_unix_os2_ext; }
+++  if   ($Config{usemmldlt}){ goto &_ld_ext;       }
+++  elsif($^O eq 'VMS')      { goto &_vms_ext;      }
+++  elsif($^O eq 'MSWin32')  { goto &_win32_ext;    }
+++  else                     { goto &_unix_os2_ext; }
++ }
++ 
++ sub _unix_os2_ext {
++@@ -661,4 +662,51 @@
++     wantarray ? ( $lib, '', $ldlib, '', ( $give_libs ? \@flibs : () ) ) : $lib;
++ }
++ 
+++# A direct test for -l validity.
+++# Because guessing real file names for -llib options when dealing
+++# with a cross compiler is generally a BAD IDEA^tm.
+++sub _ld_ext {
+++    my($self,$potential_libs, $verbose, $give_libs) = @_;
+++    $verbose ||= 0;
+++
+++    if ($^O =~ 'os2' and $Config{perllibs}) { 
+++	# Dynamic libraries are not transitive, so we may need including
+++	# the libraries linked against perl.dll again.
+++
+++	$potential_libs .= " " if $potential_libs;
+++	$potential_libs .= $Config{perllibs};
+++    }
+++    return ("", "", "", "", ($give_libs ? [] : ())) unless $potential_libs;
+++    warn "Potential libraries are '$potential_libs':\n" if $verbose;
+++
+++    my($ld)   = $Config{ld};
+++    my($ldflags)   = $Config{ldflags};
+++    my($libs) = defined $Config{perllibs} ? $Config{perllibs} : $Config{libs};
+++
+++    my $try = 'try_mm.c';
+++    my $tryx = 'try_mm.x';
+++    open(TRY, '>', $try) || die "Can't create MakeMaker test file $try: $!\n";
+++    print TRY "int main(void) { return 0; }\n";
+++    close(TRY);
+++
+++    my $testlibs = '';
+++    my @testlibs = ();
+++    foreach my $thislib (split ' ', $potential_libs) {
+++        $testlibs = join(' ', @testlibs);
+++	if($thislib =~ /^-L/) {
+++		push(@testlibs, $thislib);
+++		next
+++	};
+++	my $cmd = "$ld $ldflags -o $tryx $try $testlibs $thislib >/dev/null 2>&1";
+++	my $ret = system($cmd);
+++	warn "Warning (mostly harmless): " . "No library found for $thislib\n" if $ret;
+++	next if $ret;
+++	push @testlibs, $thislib;
+++    }
+++    unlink($try);
+++    unlink($tryx);
+++
+++    return (join(' ', @testlibs), '', join(' ', @testlibs), '');
+++}
+++
++ 1;
+diff --git a/cnf/diffs/perl5-5.42.0/makemaker.patch b/cnf/diffs/perl5-5.42.0/makemaker.patch
+new file mode 120000
+index 0000000..d7bd609
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/makemaker.patch
+@@ -0,0 +1 @@
++../perl5-5.38.0/makemaker.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/posix-makefile.patch b/cnf/diffs/perl5-5.42.0/posix-makefile.patch
+new file mode 120000
+index 0000000..29463b7
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/posix-makefile.patch
+@@ -0,0 +1 @@
++../perl5-5.22.3/posix-makefile.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/test-checkcase.patch b/cnf/diffs/perl5-5.42.0/test-checkcase.patch
+new file mode 120000
+index 0000000..36c5186
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/test-checkcase.patch
+@@ -0,0 +1 @@
++../perl5-5.22.3/test-checkcase.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/test-makemaker.patch b/cnf/diffs/perl5-5.42.0/test-makemaker.patch
+new file mode 120000
+index 0000000..4e970ff
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/test-makemaker.patch
+@@ -0,0 +1 @@
++../perl5-5.34.0/test-makemaker.patch
+\ No newline at end of file
+diff --git a/cnf/diffs/perl5-5.42.0/xconfig.patch b/cnf/diffs/perl5-5.42.0/xconfig.patch
+new file mode 120000
+index 0000000..1c22c96
+--- /dev/null
++++ b/cnf/diffs/perl5-5.42.0/xconfig.patch
+@@ -0,0 +1 @@
++../perl5-5.41.3/xconfig.patch
+\ No newline at end of file
diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch
deleted file mode 100644
index 2e30dba92924..000000000000
--- a/pkgs/development/interpreters/perl/sw_vers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index afadf53..80b7533 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -329,7 +329,7 @@ EOM
-     # sw_vers output                 what we want
-     # "ProductVersion:    10.10.5"   "10.10"
-     # "ProductVersion:    10.11"     "10.11"
--        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
-+        prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
-     case "$prodvers" in
-     10.*)
-       add_macosx_version_min ccflags $prodvers
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 1e8b00c05cd5..13ede05bf2b7 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -405,6 +405,10 @@ stdenv.mkDerivation (finalAttrs: {
     # backport fix for https://github.com/python/cpython/issues/95855
     ./platform-triplet-detection.patch
   ]
+  ++ optionals (version == "3.13.10" || version == "3.14.1") [
+    # https://github.com/python/cpython/issues/142218
+    ./${lib.versions.majorMinor version}/gh-142218.patch
+  ]
   ++ optionals (stdenv.hostPlatform.isMinGW) (
     let
       # https://src.fedoraproject.org/rpms/mingw-python3
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index d1ac795c472f..9c5dc4671b56 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
         sourceVersion = {
           major = "3";
           minor = "13";
-          patch = "9";
+          patch = "11";
           suffix = "";
         };
-        hash = "sha256-7V7zTNo2z6Lzo0DwfKx+eBT5HH88QR9tNWIyOoZsXGY=";
+        hash = "sha256-Fu3nu3zb+oldEbBkL6DlI/KR5khxlNU89tOzOMOhfqI=";
       };
     };
 
@@ -91,10 +91,10 @@
       sourceVersion = {
         major = "3";
         minor = "14";
-        patch = "0";
+        patch = "2";
         suffix = "";
       };
-      hash = "sha256-Ipna5ULTlc44g6ygDTyRAwfNaOCy9zNgmMjnt+7p8+k=";
+      hash = "sha256-zlQ6uFS8JWthtx6bJ/gx/9G/1gpHnWOfi+f5dXz1c+k=";
       inherit passthruFun;
     };
 
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index b3c97de30317..0bba05d7330e 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -138,6 +138,7 @@ in
           propagatedBuildInputs = [ installer ];
           substitutions = {
             inherit pythonInterpreter pythonSitePackages;
+            python = python.interpreter;
           };
         } ./pypa-install-hook.sh
       )
@@ -441,20 +442,6 @@ in
     } ./setuptools-build-hook.sh
   ) { };
 
-  setuptoolsRustBuildHook = callPackage (
-    { makePythonHook, setuptools-rust }:
-    makePythonHook {
-      name = "setuptools-rust-setup-hook";
-      propagatedBuildInputs = [ setuptools-rust ];
-      substitutions = {
-        pyLibDir = "${python}/lib/${python.libPrefix}";
-        cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec;
-        cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget;
-        targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
-      };
-    } ./setuptools-rust-hook.sh
-  ) { };
-
   unittestCheckHook = callPackage (
     { makePythonHook }:
     makePythonHook {
diff --git a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh
index f6d60be35d21..54e6375bb861 100644
--- a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh
@@ -8,7 +8,7 @@ pypaInstallPhase() {
     pushd dist >/dev/null
 
     for wheel in *.whl; do
-        @pythonInterpreter@ -m installer --prefix "$out" "$wheel"
+        @pythonInterpreter@ -m installer --prefix "$out" --executable "@python@" "$wheel"
         echo "Successfully installed $wheel"
     done
 
diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix
index 451292d198e9..8b930de5f394 100644
--- a/pkgs/development/interpreters/python/passthrufun.nix
+++ b/pkgs/development/interpreters/python/passthrufun.nix
@@ -141,7 +141,13 @@ rec {
   pythonAtLeast = lib.versionAtLeast pythonVersion;
   pythonOlder = lib.versionOlder pythonVersion;
   inherit hasDistutilsCxxPatch;
-  inherit pythonOnBuildForHost;
+  inherit
+    pythonOnBuildForBuild
+    pythonOnBuildForHost
+    pythonOnBuildForTarget
+    pythonOnHostForHost
+    pythonOnTargetForTarget
+    ;
   inherit pythonABITags;
 
   tests = callPackage ./tests.nix {
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 55e86a8b9c36..914e4b354c49 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -50,6 +50,7 @@ let
                 if [ "$prg" = "${python.executable}" ]; then
                   makeWrapper "${python.interpreter}" "$out/bin/$prg" \
                     --inherit-argv0 \
+                    --resolve-argv0 \
                     ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \
                     ${lib.concatStringsSep " " makeWrapperArgs}
                 elif [ "$(readlink "$prg")" = "${python.executable}" ]; then
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 420c883e290c..363397c70dca 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -20,7 +20,6 @@
   buildEnv,
   bundler,
   bundix,
-  cargo,
   rustPlatform,
   rustc,
   makeBinaryWrapper,
@@ -100,7 +99,6 @@ let
           # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
           removeReferencesTo,
           jitSupport ? yjitSupport,
-          cargo,
           rustPlatform,
           rustc,
           yjitSupport ? yjitSupported,
@@ -150,7 +148,6 @@ let
           ])
           ++ ops yjitSupport [
             rustPlatform.cargoSetupHook
-            cargo
             rustc
           ]
           ++ op useBaseRuby baseRuby;
diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix
index 862aa494d240..8187047403b7 100644
--- a/pkgs/development/interpreters/spidermonkey/140.nix
+++ b/pkgs/development/interpreters/spidermonkey/140.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "140.5.0";
-  hash = "sha512-QSI2oly+oXG9W9U15Fw7pAlXqU4fjdOrdCQeCqHEB1/LjTlLlhlZnWDOPkVj5xLIJfqL7EQXlPIpNWgC9ysoYQ==";
+  version = "140.6.0";
+  hash = "sha512-7WZle9Sy2UeRiSJh18DA2VC09jDRKrKKd32TOTQnRRqaoSXloB7hXyrA/zeNC+B0oIWD3P/TVgkRK6Tm+a2nmA==";
 }
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 5251fdb8c7d6..4ef2631b8d7d 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -49,6 +49,12 @@ mkDerivation rec {
       url = "https://github.com/supercollider/supercollider/commit/7d1f3fbe54e122889489a2f60bbc6cd6bb3bce28.patch";
       hash = "sha256-gyE0B2qTbj0ppbLlYTMa2ooY3FHzzIrdrpWYr81Hy1Y=";
     })
+
+    # Fixes the build with GCC 15
+    (fetchpatch {
+      url = "https://github.com/supercollider/supercollider/commit/edfac5e24959b12286938a9402326e521c2d2b63.patch";
+      hash = "sha256-8DNCO5VEX6V0Q29A/v5tFC7u835bwNHvcNlZzmS0ADg=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
index a364f7ea032c..b3d5df6ac587 100644
--- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
+++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/supercollider/sc3-plugins/commit/3dc56bf7fcc1f2261afc13f96da762b78bcbfa51.patch";
       hash = "sha256-lvXvGunfmjt6i+XPog14IKdnH1Qk8vefxplSDkXXXHU=";
     })
+
+    # Fix build with GCC 15
+    (fetchpatch2 {
+      url = "https://github.com/supercollider/sc3-plugins/commit/deaa55a7204bedf65a2000a463ae87a481bf3eb8.patch";
+      hash = "sha256-d8+4ZmedAwVt/AlU/YKqQF+80shEa8DiPnvMwJtW/RM=";
+    })
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index b99eef4c4eca..216f5807ea7d 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -218,17 +218,20 @@ stdenv.mkDerivation {
     ++ lib.optional (
       lib.versionAtLeast version "1.81" && lib.versionOlder version "1.88" && stdenv.cc.isClang
     ) ./fix-clang-target.patch
-    ++ lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87") [
-      # Backport fix for NumPy 2 support.
-      (fetchpatch {
-        name = "boost-numpy-2-compatibility.patch";
-        url = "https://github.com/boostorg/python/commit/0474de0f6cc9c6e7230aeb7164af2f7e4ccf74bf.patch";
-        stripLen = 1;
-        extraPrefix = "libs/python/";
-        hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U=";
-      })
-    ]
-    ++ lib.optional (version == "1.87.0") [
+    ++
+      lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87")
+        # Backport fix for NumPy 2 support.
+        (
+          fetchpatch {
+            name = "boost-numpy-2-compatibility.patch";
+            url = "https://github.com/boostorg/python/commit/0474de0f6cc9c6e7230aeb7164af2f7e4ccf74bf.patch";
+            stripLen = 1;
+            extraPrefix = "libs/python/";
+            hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U=";
+          }
+        )
+
+    ++ lib.optionals (version == "1.87.0") [
       # Fix operator<< for shared_ptr and intrusive_ptr
       # https://github.com/boostorg/smart_ptr/issues/115
       (fetchpatch {
@@ -404,4 +407,6 @@ stdenv.mkDerivation {
     "dev"
   ];
   setOutputFlags = false;
+
+  __structuredAttrs = true;
 }
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 03cebad99942..46c34d0db20a 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-fZNXkOmvCBwlxJX9E8LPzaR5KYNBjpY1jvbnMg7gY0Y=";
   };
 
+  patches = [
+    # Fix being unable to use Ipv6 link-local DNS servers. See: https://github.com/c-ares/c-ares/pull/997.
+    ./fix-link-local-dns-servers.patch
+  ];
+
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch b/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch
new file mode 100644
index 000000000000..07a5b5f2084c
--- /dev/null
+++ b/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch
@@ -0,0 +1,50 @@
+From 0fbeb87f65ad9e9e6cead10d778291db71489f34 Mon Sep 17 00:00:00 2001
+From: iucoen <68678186+iucoen@users.noreply.github.com>
+Date: Thu, 5 Jun 2025 20:08:43 -0700
+Subject: [PATCH] Fix IPv6 link-local nameservers in /etc/resolv.conf (#997)
+
+There are two issues that broke link-local nameservers in resolv.conf
+1. channel->sock_funcs needs to be initialized before
+ares_init_by_sysconfig()
+2. The aif_nametoindex and aif_indextoname function pointers were not
+initlized at all.
+---
+ src/lib/ares_init.c                 | 4 ++--
+ src/lib/ares_set_socket_functions.c | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/ares_init.c b/src/lib/ares_init.c
+index ae78262a11..ce6181833c 100644
+--- a/src/lib/ares_init.c
++++ b/src/lib/ares_init.c
+@@ -271,6 +271,8 @@ int ares_init_options(ares_channel_t           **channelptr,
+     goto done;
+   }
+ 
++  ares_set_socket_functions_def(channel);
++
+   /* Initialize Server List */
+   channel->servers =
+     ares_slist_create(channel->rand_state, server_sort_cb, server_destroy_cb);
+@@ -346,8 +348,6 @@ int ares_init_options(ares_channel_t           **channelptr,
+     goto done;
+   }
+ 
+-  ares_set_socket_functions_def(channel);
+-
+   /* Initialize the event thread */
+   if (channel->optmask & ARES_OPT_EVENT_THREAD) {
+     ares_event_thread_t *e = NULL;
+diff --git a/src/lib/ares_set_socket_functions.c b/src/lib/ares_set_socket_functions.c
+index cfe434327d..9994e81df5 100644
+--- a/src/lib/ares_set_socket_functions.c
++++ b/src/lib/ares_set_socket_functions.c
+@@ -127,6 +127,8 @@ ares_status_t
+     channel->sock_funcs.asendto      = funcs->asendto;
+     channel->sock_funcs.agetsockname = funcs->agetsockname;
+     channel->sock_funcs.abind        = funcs->abind;
++    channel->sock_funcs.aif_nametoindex = funcs->aif_nametoindex;
++    channel->sock_funcs.aif_indextoname = funcs->aif_indextoname;
+   }
+ 
+   /* Implement newer versions here ...*/
\ No newline at end of file
diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix
index 176fef8f6077..a84969e2a80b 100644
--- a/pkgs/development/libraries/c-blosc/1.nix
+++ b/pkgs/development/libraries/c-blosc/1.nix
@@ -27,9 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # backport patch for cmake 4 compatibility
     (fetchpatch {
-      url = "https://github.com/Blosc/c-blosc/commit/051b9d2cb9437e375dead8574f66d80ebce47bee.patch";
+      url = "https://github.com/Blosc/c-blosc/commit/051b9d2cb9437e375dead8574f66d80ebce47bee.patch?full_index=1";
       hash = "sha256-90dUd8KQqq+uVbngfoKF45rmFxbLVVgZjg0Xfc/vpcc=";
     })
+    # backport patch for gcc 15 compatibility
+    (fetchpatch {
+      url = "https://github.com/Blosc/c-blosc/commit/774f6a0ebaa0c617f7f13ccf6bc89d17eba04654.patch?full_index=1";
+      hash = "sha256-C5nwMXjmlxkBvN1/4fuGTgFANqTD/+ikxYPLo1fwm6Q=";
+    })
   ];
 
   # https://github.com/NixOS/nixpkgs/issues/144170
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index b91ec5dd5b6a..23ed07441755 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   autoreconfHook,
   ...
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index 77e9a1a04269..c9e1a6bb1d1e 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   autoreconfHook,
   ...
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index f720ca180639..a23ee5b936fc 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   autoreconfHook,
   ...
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix
index 2f573aaca1e9..78c6cf4eb8a7 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/pkgs/development/libraries/db/db-6.2.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   autoreconfHook,
   ...
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 9f411f1cd2a5..bbfd5820ffc5 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   autoreconfHook,
   cxxSupport ? true,
@@ -29,7 +30,14 @@ stdenv.mkDerivation (
     # configure checks to work incorrectly with clang 16.
     nativeBuildInputs = [ autoreconfHook ];
 
-    patches = extraPatches;
+    patches = [
+      (fetchpatch {
+        name = "gcc15.patch";
+        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/db/files/db-4.8.30-tls-configure.patch?id=1ae36006c79ef705252f5f7009e79f6add7dc353";
+        hash = "sha256-OzQL+kgXtcvhvyleDLuH1abhY4Shb/9IXx4ZkeFbHOA=";
+      })
+    ]
+    ++ extraPatches;
 
     outputs = [
       "bin"
@@ -75,6 +83,10 @@ stdenv.mkDerivation (
       popd
     '';
 
+    NIX_CFLAGS_COMPILE = [
+      "-Wno-error=incompatible-pointer-types"
+    ];
+
     configureFlags = [
       (if cxxSupport then "--enable-cxx" else "--disable-cxx")
       (if compat185 then "--enable-compat185" else "--disable-compat185")
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index a8dc55ce3f86..7eae647efc8d 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -8,7 +8,6 @@
   pkg-config,
   perl,
   texinfo,
-  texinfo6,
   nasm,
 
   # You can fetch any upstream version using this derivation by specifying version and hash
@@ -226,10 +225,10 @@
     || buildSwscale,
   # Documentation options
   withDocumentation ? withHtmlDoc || withManPages || withPodDoc || withTxtDoc,
-  withHtmlDoc ? withHeadlessDeps, # HTML documentation pages
-  withManPages ? withHeadlessDeps, # Man documentation pages
-  withPodDoc ? withHeadlessDeps, # POD documentation pages
-  withTxtDoc ? withHeadlessDeps, # Text documentation pages
+  withHtmlDoc ? withHeadlessDeps && lib.versionAtLeast version "6", # HTML documentation pages
+  withManPages ? withHeadlessDeps && lib.versionAtLeast version "6", # Man documentation pages
+  withPodDoc ? withHeadlessDeps && lib.versionAtLeast version "6", # POD documentation pages
+  withTxtDoc ? withHeadlessDeps && lib.versionAtLeast version "6", # Text documentation pages
   # Whether a "doc" output will be produced. Note that withManPages does not produce
   # a "doc" output because its files go to "man".
   withDoc ? withDocumentation && (withHtmlDoc || withPodDoc || withTxtDoc),
@@ -826,7 +825,7 @@ stdenv.mkDerivation (
     ]
     ++ optionals stdenv.hostPlatform.isx86 [ nasm ]
     # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
-    ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
+    ++ optionals (lib.versionAtLeast version "6") [ texinfo ]
     ++ optionals withCudaLLVM [ clang ]
     ++ optionals withCudaNVCC [ cuda_nvcc ];
 
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 420837ce60a0..dee1e197dd6e 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "bin"}/bin/fc-list";
-  versionCheckProgramArg = "--version";
 
   installCheckPhase = ''
     runHook preInstallCheck
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 9054cf6756ba..9351a5179226 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,5 +1,6 @@
 {
   buildPackages,
+  writeText,
   fontconfig,
   lib,
   runCommand,
@@ -13,15 +14,16 @@ in
   fontDirectories,
 }:
 
+let
+  fontDirsPath = writeText "font-dirs" ''
+    <!-- Font directories -->
+    ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fontDirectories)}
+  '';
+in
 runCommand "fc-cache"
   {
     preferLocalBuild = true;
     allowSubstitutes = false;
-    passAsFile = [ "fontDirs" ];
-    fontDirs = ''
-      <!-- Font directories -->
-      ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fontDirectories)}
-    '';
   }
   ''
     export FONTCONFIG_FILE=$(pwd)/fonts.conf
@@ -33,7 +35,7 @@ runCommand "fc-cache"
       <include>${fontconfig.out}/etc/fonts/fonts.conf</include>
       <cachedir>$out</cachedir>
     EOF
-    cat "$fontDirsPath" >> fonts.conf
+    cat "${fontDirsPath}" >> fonts.conf
     echo "</fontconfig>" >> fonts.conf
 
     # N.B.: fc-cache keys its cache entries by architecture.
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 64b41a684c59..2cce91e8115d 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -59,11 +59,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnutls";
-  version = "3.8.10";
+  version = "3.8.11";
 
   src = fetchurl {
     url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
-    hash = "sha256-23+rfM55Hncn677yM0MByCHXmlUOxVye8Ja2ELA+trc=";
+    hash = "sha256-kb0jxKhuvGFS6BMD0gz2zq65e8j4QmbQ+uxuKfF7qiA=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch b/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch
deleted file mode 100644
index 8f866af0da91..000000000000
--- a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/tests/gpg/t-verify.c
-+++ b/tests/gpg/t-verify.c
-@@ -304,7 +304,7 @@
-   err = gpgme_data_new (&text);
-   fail_if_err (err);
-   err = gpgme_op_verify (ctx, sig, NULL, text);
--  if (gpgme_err_code (err) != GPG_ERR_BAD_DATA)
-+  if (gpgme_err_code (err) == GPG_ERR_NO_ERROR)
-     {
-       fprintf (stderr, "%s:%i: Double plaintext message not detected\n",
- 	       PGM, __LINE__);
---- a/lang/python/tests/t-verify.py
-+++ b/lang/python/tests/t-verify.py
-@@ -142,7 +142,7 @@
-     c.op_verify(sig, None, text)
- except Exception as e:
-     assert type(e) == gpg.errors.GPGMEError
--    assert e.getcode() == gpg.errors.BAD_DATA
-+    assert e.getcode() != gpg.errors.NO_ERROR
- else:
-     assert False, "Expected an error but got none."
- 
-@@ -178,7 +178,7 @@
-     try:
-         c.verify(double_plaintext_sig)
-     except gpg.errors.GPGMEError as e:
--        assert e.getcode() == gpg.errors.BAD_DATA
-+        assert e.getcode() != gpg.errors.NO_ERROR
-     else:
-         assert False, "Expected an error but got none."
- 
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 6b3e7463bef4..f2330c8cf20f 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -322,6 +322,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "doc" enableDocumentation)
     (lib.mesonEnable "directfb" false)
     (lib.mesonEnable "lcevcdecoder" lcevcdecSupport)
+    (lib.mesonEnable "ldac" ldacbtSupport)
+    (lib.mesonEnable "webrtcdsp" webrtcAudioProcessingSupport)
+    (lib.mesonEnable "isac" webrtcAudioProcessingSupport)
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
     "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 8ec391c601c9..d63620734862 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     version = "1.4";
   };
 
-  PERL_USE_UNSAFE_INC = "1";
+  env.PERL_USE_UNSAFE_INC = "1";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.gz";
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
   ];
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   meta = {
     description = "Hebrew spell checker";
diff --git a/pkgs/development/libraries/libcryptui/debian-patches.nix b/pkgs/development/libraries/libcryptui/debian-patches.nix
new file mode 100644
index 000000000000..d9114aecc770
--- /dev/null
+++ b/pkgs/development/libraries/libcryptui/debian-patches.nix
@@ -0,0 +1,26 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "https://sources.debian.org/data/main/libc/libcryptui/3.12.2-8/debian/patches";
+in
+[
+  {
+    url = "${prefix}/build-use-pkg-config-to-detect-gpgme.patch";
+    sha256 = "1kvp30qrnnhnjma8vgi3acvjn74fzig1mdmkxn6xbdz2vj12wwns";
+  }
+  {
+    url = "${prefix}/daemon-fix-conflicting-return-types.patch";
+    sha256 = "1iqr58v1rmykq2z48sniixfvq2v0qaifdfihkq6is2a711fkigxp";
+  }
+  {
+    url = "${prefix}/daemon-port-to-gcr-3.patch";
+    sha256 = "1j1nbh03m4cqymhqiamndn3gmi7bdzv0srr90nhlgjhszmyg150g";
+  }
+  {
+    url = "${prefix}/git_allow-gpg2-2.1.patch";
+    sha256 = "1g93psg0cki4wnyymc59wchzhas3qqja7y46rbzdksp5wmfl51ap";
+  }
+  {
+    url = "${prefix}/libcryptui-fix-logic-flaw-in-the-prompt-recipients-d.patch";
+    sha256 = "1qnd6j2zk8gssj2fgrgikc05ccdv7sqabprykzxix7v8827sa56j";
+  }
+]
diff --git a/pkgs/development/libraries/libcryptui/debian-patches.txt b/pkgs/development/libraries/libcryptui/debian-patches.txt
new file mode 100644
index 000000000000..575274ebf425
--- /dev/null
+++ b/pkgs/development/libraries/libcryptui/debian-patches.txt
@@ -0,0 +1,6 @@
+libcryptui/3.12.2-8
+build-use-pkg-config-to-detect-gpgme.patch
+daemon-fix-conflicting-return-types.patch
+daemon-port-to-gcr-3.patch
+git_allow-gpg2-2.1.patch
+libcryptui-fix-logic-flaw-in-the-prompt-recipients-d.patch
diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix
index a32a03de103c..5a476aeba795 100644
--- a/pkgs/development/libraries/libcryptui/default.nix
+++ b/pkgs/development/libraries/libcryptui/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   autoreconfHook,
   gettext,
   pkg-config,
@@ -13,7 +14,7 @@
   gnupg,
   gpgme,
   dbus-glib,
-  libgnome-keyring,
+  gcr,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,10 +26,12 @@ stdenv.mkDerivation rec {
     sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
   };
 
-  patches = [
-    # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch
-    # https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1
-    ./fix-latest-gnupg.patch
+  patches = (lib.map fetchurl (import ./debian-patches.nix)) ++ [
+    # Fix build with gpgme 2.0
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libcryptui/-/raw/1-3.12.2+r71+ged4f890e-2/gpgme-2.0.patch";
+      hash = "sha256-yftIixqVGUqn/VP0tfzPnhLPI7A/m61kVY5P1NDTIqQ=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
     gnupg
     gpgme
     dbus-glib
-    libgnome-keyring
+    gcr
   ];
   propagatedBuildInputs = [ dbus-glib ];
 
diff --git a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
deleted file mode 100644
index 19aa27b549c2..000000000000
--- a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Fri, 10 Nov 2017 08:55:55 +0100
-Subject: [PATCH] Accept GnuPG 2.2.x as supported version
-
-https://bugzilla.gnome.org/show_bug.cgi?id=790152
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4486e7b2..be5b28b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.2 2.3 2.4"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
- 	ok="no"
--- 
-GitLab
-
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 5daa6063932f..4b2bd41af972 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -2,21 +2,32 @@
   lib,
   stdenv,
   fetchurl,
+  meson,
+  ninja,
+  pkg-config,
   libdvdcss,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libdvdread";
-  version = "6.1.3";
+  version = "7.0.1";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-zjVFSZeiCMvlDpEjLw5z+xrDRxllgToTuHMKjxihU2k=";
+    url = "http://get.videolan.org/libdvdread/${finalAttrs.version}/libdvdread-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Lj4EowXBXDljqgOuG5qDwdI5iAAD/PPd6YbTlDNV1Ac=";
   };
 
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
   buildInputs = [ libdvdcss ];
 
-  NIX_LDFLAGS = "-ldvdcss";
+  mesonFlags = [
+    (lib.mesonEnable "libdvdcss" true)
+  ];
 
   postInstall = ''
     ln -s dvdread $out/include/libdvdread
@@ -29,4 +40,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.wmertens ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 39802ed7c1c3..7af29dedd1ac 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -20,11 +20,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpng" + whenPatched "-apng";
-  version = "1.6.50";
+  version = "1.6.52";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TfOWUYYgp6o2UUQ+h9Gyhi5OiMrRNai5NCPgFwYjIwc=";
+    hash = "sha256-Nr1yYijsk6O2wi/bSelKZ7FvL+mzm3i3y2V3KWZmHMw=";
   };
   postPatch =
     whenPatched "gunzip < ${patch_src} | patch -Np1"
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
index 8f76a9676b5e..b3624f93dd3c 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -8,11 +8,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "medfile";
-  version = "5.0.0";
+  version = "6.0.1";
 
   src = fetchurl {
-    url = "https://files.salome-platform.org/Salome/medfile/med-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-Jn520MZ+xRwQ4xmUhOwVCLqo1e2EXGKK32YFKdzno9Q=";
+    url = "https://files.salome-platform.org/Salome/medfile/med-${finalAttrs.version}.tar.gz";
+    hash = "sha256-+PHtxodLxI2PPk6L4c9zee0xhybYq8aAToXoIVVbH6g=";
+
+    # salome uses tiger-protect-waf (https://faq.o2switch.fr/cpanel/o2switch/tiger-protect-waf/),
+    # which blocks Nixpkgs's custom UA, 403 otherwise
+    # OpenSUSE does the same: https://github.com/bmwiedemann/openSUSE/blob/08303e6e850f0de37bfabbd184dae73009f3038b/packages/m/med-tools/med-tools.spec#L32
+    curlOptsList = [
+      "--user-agent"
+      "MozillaFirefox (really Nixpkgs, see https://github.com/NixOS/nixpkgs/pull/474599)"
+    ];
   };
 
   outputs = [
@@ -21,16 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch = ''
-    # Patch cmake and source files to work with hdf5
-    substituteInPlace config/cmake_files/medMacros.cmake --replace-fail \
-      "IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)" \
-      "IF (HDF5_VERSION VERSION_LESS 1.12.0)"
-    substituteInPlace src/*/*.c --replace-warn \
-      "#if H5_VERS_MINOR > 12" \
-      "#if H5_VERS_MINOR > 14"
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Some medfile test files #define _a, which
     # breaks system header files that use _a as a function parameter
     substituteInPlace tests/c/*.c \
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index cef563d99f7a..efc54fd6fca0 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ngtcp2";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-j8hYGdFp5il4pODbNlVILOdJUafqsMdmc3tXoxQY2mE=";
+    hash = "sha256-E7r7bFCdv2pw2WBaLIkuE/WuuTZnOZWHeKhXvHDOH6c=";
   };
 
   outputs = [
@@ -39,8 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
     # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
-    # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD too.
-    (lib.cmakeBool "ENABLE_LIB_ONLY" (stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD))
+    # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD/Cygwin too.
+    (lib.cmakeBool "ENABLE_LIB_ONLY" (
+      stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isCygwin
+    ))
     (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
     (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
   ];
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 452c234f646a..bb71457fc37b 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -310,6 +310,13 @@ effectiveStdenv.mkDerivation {
       url = "https://github.com/opencv/opencv/commit/dbb622b7f59c3f0e5bd3487252ef37cf72dcdcdb.patch";
       hash = "sha256-MS9WizZQu0Gxw/daDDFmETxcDJYRTyhSq/xK0X5lAZM=";
     })
+    # Backport upstream fix for reproducible builds
+    # https://github.com/opencv/opencv/pull/27962
+    (fetchpatch {
+      name = "support-reproducible-builds.patch";
+      url = "https://github.com/opencv/opencv/commit/7224bced8bff9d16d5e869d44f90f95ad8fdfe25.patch";
+      hash = "sha256-DIlTQaIVWpPgJgPktY+0vd3BWJoS38YZn5aFS7DqsNM=";
+    })
   ]
   ++ optionals enableCuda [
     ./cuda_opt_flow.patch
@@ -467,6 +474,7 @@ effectiveStdenv.mkDerivation {
   OpenBLAS = optionalString withOpenblas openblas_;
 
   cmakeFlags = [
+    (cmakeBool "BUILD_INFO_SKIP_SYSTEM_VERSION" true)
     (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
     (cmakeBool "WITH_OPENMP" true)
     (cmakeBool "BUILD_PROTOBUF" false)
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 59dd8e187cca..8aa898b1615c 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -66,6 +66,7 @@
   ffado,
   libselinux,
   libebur128,
+  bashNonInteractive,
 }:
 
 let
@@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
     lilv
     ncurses
     readline
+    bashNonInteractive
   ]
   ++ (
     if enableSystemd then
diff --git a/pkgs/development/libraries/protobuf/33.nix b/pkgs/development/libraries/protobuf/33.nix
index 6365e5fac5a5..dec1aa836ed8 100644
--- a/pkgs/development/libraries/protobuf/33.nix
+++ b/pkgs/development/libraries/protobuf/33.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (
   {
-    version = "33.1";
-    hash = "sha256-IW6wLkr/NwIZy5N8s+7Fe9CSexXgliW8QSlvmUD+g5Q=";
+    version = "33.2";
+    hash = "sha256-SguWBa9VlE15C+eLzcqqusVLgx9kDyPXwYImSE75HCM=";
   }
   // args
 )
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 11fa9ebff6c1..45b8fc5565c9 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
   versionCheckProgram = [ "${placeholder "out"}/bin/protoc" ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   env = lib.optionalAttrs (lib.versions.major version == "29") {
diff --git a/pkgs/development/libraries/qgpgme/default.nix b/pkgs/development/libraries/qgpgme/default.nix
new file mode 100644
index 000000000000..c3dbe6800552
--- /dev/null
+++ b/pkgs/development/libraries/qgpgme/default.nix
@@ -0,0 +1,51 @@
+{
+  cmake,
+  fetchurl,
+  gpgmepp,
+  lib,
+  qtbase,
+  stdenv,
+  which,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qgpgme";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnupg/qgpgme/qgpgme-${finalAttrs.version}.tar.xz";
+    hash = "sha256-FWRbJHXMphGOsu0zGzqNlELJ1AGcOEa6P20lMhtKYa0=";
+  };
+
+  patches = [
+    ./includedir-absolute-path.patch
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    qtbase
+  ];
+
+  propagatedBuildInputs = [
+    gpgmepp
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    changelog = "https://dev.gnupg.org/source/gpgmeqt/browse/master/NEWS;gpgmeqt-${finalAttrs.version}?as=remarkup";
+    description = "Qt API bindings/wrapper for GPGME";
+    homepage = "https://dev.gnupg.org/source/gpgmeqt/";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.dotlambda ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/development/libraries/qgpgme/includedir-absolute-path.patch b/pkgs/development/libraries/qgpgme/includedir-absolute-path.patch
new file mode 100644
index 000000000000..7b9543b6a9f6
--- /dev/null
+++ b/pkgs/development/libraries/qgpgme/includedir-absolute-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0955b27..e648982 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -264,7 +264,7 @@ set_target_properties(${targetname} PROPERTIES
+     SOVERSION "${LIBQGPGME_SOVERSION}"
+ )
+ 
+-target_include_directories(${targetname} INTERFACE "$<INSTALL_INTERFACE:include/qgpgme-qt${QT_MAJOR_VERSION}>")
++target_include_directories(${targetname} INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/qgpgme-qt${QT_MAJOR_VERSION}>")
+ 
+ if (${QT_MAJOR_VERSION} EQUAL 6)
+     set(config_suffix Qt6)
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 2236001ad901..69381ff13e23 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -131,20 +131,6 @@ let
         makeSetupHook {
           name = "wrap-qt6-apps-hook";
           propagatedBuildInputs = [ makeBinaryWrapper ];
-          depsTargetTargetPropagated = [
-            (onlyPluginsAndQml qtbase)
-          ]
-          ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [
-            (onlyPluginsAndQml qtwayland)
-          ];
-        } ./hooks/wrap-qt-apps-hook.sh
-      ) { };
-
-      wrapQtAppsNoGuiHook = callPackage (
-        { makeBinaryWrapper, qtbase }:
-        makeSetupHook {
-          name = "wrap-qt6-apps-no-gui-hook";
-          propagatedBuildInputs = [ makeBinaryWrapper ];
           depsTargetTargetPropagated = [
             (onlyPluginsAndQml qtbase)
           ];
@@ -164,6 +150,7 @@ let
     }
     // lib.optionalAttrs config.allowAliases {
       full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21
+      wrapQtAppsNoGuiHook = lib.warn "wrapQtAppsNoGuiHook is deprecated, use wrapQtAppsHook instead" self.wrapQtAppsHook;
     };
 
   baseScope = makeScopeWithSplicing' {
diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
index 44e48db7dad8..c70bf22759de 100644
--- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
@@ -77,11 +77,10 @@ else # Only set up Qt once.
     fi
 
     qtPreHook() {
-        # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled.
+        # Check that wrapQtAppsHook is used, or it is explicitly disabled.
         if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then
             echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified."
-            echo >&2 "  - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs"
-            echo >&2 "  - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs"
+            echo >&2 "  - If this is an application, add wrapQtAppsHook to nativeBuildInputs"
             echo >&2 "  - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true"
             exit 1
         fi
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index c27c96d5802e..eb0564226cbf 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -215,6 +215,9 @@ stdenv.mkDerivation rec {
     # allow translations to be found outside of install prefix, as is the case in our split builds
     ./allow-translations-outside-prefix.patch
 
+    # make internal find_package calls between Qt components work with split builds
+    ./use-cmake-path.patch
+
     # always link to libraries by name in qmake-generated build scripts
     ./qmake-always-use-libname.patch
     # always explicitly list includedir in qmake-generated pkg-config files
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch
new file mode 100644
index 000000000000..4f5b48f18993
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch
@@ -0,0 +1,60 @@
+diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in
+index 93f47570706..b00d398d671 100644
+--- a/cmake/QtConfig.cmake.in
++++ b/cmake/QtConfig.cmake.in
+@@ -190,7 +190,6 @@ foreach(module ${__qt_umbrella_find_components})
+                 ${_qt_additional_packages_prefix_paths}
+                 ${__qt_find_package_host_qt_path}
+                 ${_qt_additional_host_packages_prefix_paths}
+-            ${__qt_use_no_default_path_for_qt_packages}
+         )
+     endif()
+ 
+diff --git a/cmake/QtFindWrapHelper.cmake b/cmake/QtFindWrapHelper.cmake
+index c43824b8234..7ef65eb0f36 100644
+--- a/cmake/QtFindWrapHelper.cmake
++++ b/cmake/QtFindWrapHelper.cmake
+@@ -79,7 +79,6 @@ macro(qt_find_package_system_or_bundled _unique_prefix)
+                     "${CMAKE_CURRENT_LIST_DIR}/.."
+                     ${_qt_cmake_dir}
+                     ${_qt_additional_packages_prefix_paths}
+-                ${${_unique_prefix}_qt_use_no_default_path_for_qt_packages}
+             )
+         else()
+             # For the non-bundled case we will look for FindWrapSystemFoo.cmake module files,
+diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in
+index e3af0299c57..2bbc06ddec3 100644
+--- a/cmake/QtModuleConfig.cmake.in
++++ b/cmake/QtModuleConfig.cmake.in
+@@ -59,7 +59,6 @@ if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND
+             "${CMAKE_CURRENT_LIST_DIR}/.."
+             "${_qt_cmake_dir}"
+             ${_qt_additional_packages_prefix_paths}
+-        ${__qt_use_no_default_path_for_qt_packages}
+     )
+ 
+     if(NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND)
+diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
+index 78ada0a7425..74659943a83 100644
+--- a/cmake/QtModuleDependencies.cmake.in
++++ b/cmake/QtModuleDependencies.cmake.in
+@@ -23,7 +23,6 @@ if(NOT @INSTALL_CMAKE_NAMESPACE@_FOUND)
+             "${CMAKE_CURRENT_LIST_DIR}/.."
+             "${_qt_cmake_dir}"
+             ${_qt_additional_packages_prefix_paths}
+-        ${__qt_use_no_default_path_for_qt_packages}
+     )
+ endif()
+ 
+diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake
+index b4a0342ad87..a7de8750485 100644
+--- a/cmake/QtPublicDependencyHelpers.cmake
++++ b/cmake/QtPublicDependencyHelpers.cmake
+@@ -144,7 +144,6 @@ macro(_qt_internal_find_qt_dependencies target target_dep_list find_dependency_p
+                     ${QT_BUILD_CMAKE_PREFIX_PATH}
+                     ${${find_dependency_path_list}}
+                     ${_qt_additional_packages_prefix_paths}
+-                ${__qt_use_no_default_path_for_qt_packages}
+             )
+             if(NOT ${__qt_${target}_pkg}_FOUND)
+                 list(APPEND __qt_${target}_missing_deps "${__qt_${target}_pkg}")
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 58271c82c9ba..07f95c229028 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -10,6 +10,7 @@
   lib,
   pkgsBuildBuild,
   replaceVars,
+  fetchpatch,
 }:
 
 qtModule {
@@ -35,6 +36,25 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
+
+    # fix common Plasma crasher
+    # FIXME: remove in 6.10.2
+    (fetchpatch {
+      url = "https://github.com/qt/qtdeclarative/commit/9c6b2b78e9076f1c2676aa0c41573db9ca480654.diff";
+      hash = "sha256-KMFurA9Q84qwuyBraU3ZdoFWs8uO3uoUcinfcfh/ps8=";
+    })
+
+    # https://qt-project.atlassian.net/browse/QTBUG-137440
+    (fetchpatch {
+      name = "rb-dialogs-link-labsfolderlistmodel-into-quickdialogs2quickimpl.patch";
+      url = "https://github.com/qt/qtdeclarative/commit/4047fa8c6017d8e214e6ec3ddbed622fd34058e4.patch";
+      hash = "sha256-0a7a1AI8N35rqLY4M3aSruXXPBqz9hX2yT65r/xzfhc=";
+    })
+    (fetchpatch {
+      name = "rb-quickcontrols-fix-controls-styles-linkage.patch";
+      url = "https://github.com/qt/qtdeclarative/commit/aa805ed54d55479360e0e95964dcc09a858aeb28.patch";
+      hash = "sha256-EDdsXRokHPQ5jflaVucOZP3WSopMjrAM39WZD1Hk/5I=";
+    })
   ];
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 50528aa4e823..471c427cbd8c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -27,17 +27,17 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite${lib.optionalString interactive "-interactive"}";
-  version = "3.50.4";
+  version = "3.51.1";
 
   # nixpkgs-update: no auto update
   # NB! Make sure to update ./tools.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    hash = "sha256-o9tYehuS7l3awvZrPttBsm+chnJ1eC1Gw6CIl31qWxg=";
+    hash = "sha256-TyRFzXBHlyTTKtAV7H/Tf7tvYTABO9S/vIDDK+tCt+A=";
   };
   docsrc = fetchurl {
     url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip";
-    hash = "sha256-+KA89GFQAxDHp4XJ1vhhIayUZWAZgs3Kxt4MWYfb/C8=";
+    hash = "sha256-cygHoBzJ/K8ftBxw5Bam7dUVlXeI89Wud/7J2BtuIns=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 3002199f250b..1669bbd25334 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -19,14 +19,14 @@ let
     }:
     stdenv.mkDerivation rec {
       inherit pname;
-      version = "3.50.4";
+      version = "3.51.1";
 
       # nixpkgs-update: no auto update
       src =
         assert version == sqlite.version;
         fetchurl {
           url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip";
-          hash = "sha256-t7TcBg82BTkC+2WzRLu+1ZLmSyKRomrAb+d+7Al4UOk=";
+          hash = "sha256-D452WsjqfDbPjqm//dXBA1ZPSopjXyFfn3g7M4oT2XE=";
         };
 
       nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index bfb7477d6323..a7e93cfedf10 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,5 +1,6 @@
 {
   config,
+  fetchpatch,
   fetchurl,
   stdenv,
   unixODBC,
@@ -60,6 +61,14 @@
       ./mariadb-connector-odbc-unistd.patch
 
       ./mariadb-connector-odbc-musl.patch
+
+      # Fix build with gcc15
+      # https://github.com/mariadb-corporation/mariadb-connector-odbc/pull/63
+      (fetchpatch {
+        name = "mariadb-connector-odbc-add-include-cstdint-gcc15.patch";
+        url = "https://github.com/mariadb-corporation/mariadb-connector-odbc/commit/a3ced654db2ef93de0a818f2d66171f6084e5f2d.patch";
+        hash = "sha256-GZITSryfRdAgNxZehasoBModGNZo575Dd5aokwNWzpY=";
+      })
     ];
 
     nativeBuildInputs = [ cmake ];
@@ -104,13 +113,22 @@
 
   sqlite = stdenv.mkDerivation rec {
     pname = "sqlite-connector-odbc";
-    version = "0.9993";
+    version = "0.99991";
 
     src = fetchurl {
       url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz";
-      sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs";
+      hash = "sha256-TZStuNPN4fqUoorrDfzHvnMUW8383z1eIlQ02zHcilw=";
     };
 
+    patches = [
+      # Fix build with gcc15
+      (fetchpatch {
+        name = "sqlite-connector-odbc-fix-incompatible-pointer-compilation-error.patch";
+        url = "https://src.fedoraproject.org/rpms/sqliteodbc/raw/e3d93f5909c884fd8846b36b71ba67a3ad65da2a/f/sqliteodbc-0.99991-Fix-incompatible-pointer-compilation-error.patch";
+        hash = "sha256-IAZDujEkAyU40sKa4GC+upURNt7vplCDAx91Eeny+bU=";
+      })
+    ];
+
     buildInputs = [
       unixODBC
       sqlite
@@ -140,6 +158,7 @@
     meta = {
       description = "ODBC driver for SQLite";
       homepage = "http://www.ch-werner.de/sqliteodbc";
+      changelog = "http://www.ch-werner.de/sqliteodbc/html/index.html#changelog";
       license = lib.licenses.bsd2;
       platforms = lib.platforms.unix;
       maintainers = with lib.maintainers; [ vlstill ];
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index be42ad4ec53c..760e4918059b 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland-protocols";
-  version = "1.45";
+  version = "1.46";
 
   doCheck =
     stdenv.hostPlatform == stdenv.buildPlatform
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TSsqnj4JnQF9yBB78cM00nu4fZ5K/xmgyNhW0XzUHvA=";
+    hash = "sha256-/Q3gVqiV+ki9GqXwuN/u1FQQG4i8fhxhqVNCLrcdsWc=";
   };
 
   postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 28dc1346c7b0..9eecf781a3d1 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -643,7 +643,6 @@ in
     dontUseCmakeConfigure = true;
 
     doInstallCheck = true;
-    versionCheckProgramArg = "--version";
 
     propagatedBuildInputs = [
       zip
diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix
index cdcb11219875..995e732631bd 100644
--- a/pkgs/development/misc/resholve/resholve-utils.nix
+++ b/pkgs/development/misc/resholve/resholve-utils.nix
@@ -200,9 +200,6 @@ rec {
             )
           ))
         }
-      ''
-      + lib.optionalString (partialSolution.interpreter != "none") ''
-        ${partialSolution.interpreter} -n $out
       '';
     };
   writeScriptBin =
@@ -220,9 +217,6 @@ rec {
             }
           )
         )}
-      ''
-      + lib.optionalString (partialSolution.interpreter != "none") ''
-        ${partialSolution.interpreter} -n $out/bin/${name}
       '';
     };
   mkDerivation =
@@ -232,6 +226,7 @@ rec {
       version,
       passthru ? { },
       solutions,
+      postResholve ? "",
       ...
     }@attrs:
     let
@@ -286,6 +281,8 @@ rec {
         # LOGLEVEL="INFO";
         preFixup = phraseSolutions solutions unresholved;
 
+        postFixup = postResholve;
+
         # don't break the metadata...
         meta = unresholved.meta;
       }
diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix
index eccb1c7cf7d3..16c9924510e3 100644
--- a/pkgs/development/misc/resholve/resholve.nix
+++ b/pkgs/development/misc/resholve/resholve.nix
@@ -42,7 +42,10 @@ python27.pkgs.buildPythonApplication {
   ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ gawk ]}"
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ gawk ])
   ];
 
   postPatch = ''
@@ -78,6 +81,8 @@ python27.pkgs.buildPythonApplication {
     };
   };
 
+  __structuredAttrs = true;
+
   meta = {
     description = "Resolve external shell-script dependencies";
     homepage = "https://github.com/abathur/resholve";
diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix
index d3a10f305231..89277dee7e03 100644
--- a/pkgs/development/misc/resholve/source.nix
+++ b/pkgs/development/misc/resholve/source.nix
@@ -4,11 +4,11 @@
 }:
 
 rec {
-  version = "0.10.6";
+  version = "0.10.7";
   rSrc = fetchFromGitHub {
     owner = "abathur";
     repo = "resholve";
     rev = "v${version}";
-    hash = "sha256-iJEkfW60QO4nFp+ib2+DeDRsZviYFhWRQoBw1VAhzJY=";
+    hash = "sha256-aUhxaxniGcmFAawUTXa5QrWUSpw5NUoJO5y4INk5mQU=";
   };
 }
diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix
index 99fdb817db2b..17124aeada6d 100644
--- a/pkgs/development/misc/resholve/test.nix
+++ b/pkgs/development/misc/resholve/test.nix
@@ -25,6 +25,7 @@
   rlwrap,
   gnutar,
   bc,
+  systemd,
   # override testing
   esh,
   getconf,
@@ -48,7 +49,6 @@
   nix-direnv,
   pdf2odt,
   pdfmm,
-  rancid,
   s0ix-selftest-tool,
   unix-privesc-check,
   wgnord,
@@ -76,6 +76,9 @@ let
     gnutar
     bc
     msmtp
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    systemd
   ];
 in
 rec {
@@ -157,6 +160,9 @@ rec {
         inputs = [ ];
       };
     };
+    postResholve = ''
+      echo "not a load-bearing test, just prove we exist"
+    '';
   };
   # demonstrate that we could use resholve in larger build
   module3 = stdenv.mkDerivation {
@@ -218,6 +224,8 @@ rec {
     INTERP = "${bash}/bin/bash";
 
     checkPhase = ''
+      echo removing parse tests matching no${stdenv.buildPlatform.uname.system}
+      rm tests/parse_*no${stdenv.buildPlatform.uname.system}.sh || true # ok if none exist
       patchShebangs .
       mkdir empty_lore
       touch empty_lore/{execers,wrappers}
@@ -335,7 +343,6 @@ rec {
 // lib.optionalAttrs stdenv.hostPlatform.isLinux {
   inherit arch-install-scripts;
   inherit dgoss;
-  inherit rancid;
   inherit unix-privesc-check;
   inherit wgnord;
   inherit wsl-vpnkit;
diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index 0d5753568d74..bc474a3ed6d6 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -27,13 +27,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IFjaZcwBiM/xA39W+FuJ87OSEvAhvhEsZ1cF2KrxrhY=";
+    hash = "sha256-s72m7N9Ovd2Vl4F+hb2MsNmnF1hFQGkf2s7TrJ9IWI8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix
index caca8be2c14f..f9f7adbfff81 100644
--- a/pkgs/development/perl-modules/ImageExifTool/default.nix
+++ b/pkgs/development/perl-modules/ImageExifTool/default.nix
@@ -3,8 +3,6 @@
   fetchFromGitHub,
   gitUpdater,
   lib,
-  shortenPerlShebang,
-  stdenv,
   versionCheckHook,
   ArchiveZip,
   CompressRawLzma,
@@ -27,8 +25,6 @@ buildPerlPackage rec {
     patchShebangs exiftool
   '';
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-
   propagatedBuildInputs = [
     ArchiveZip
     CompressRawLzma
@@ -36,10 +32,6 @@ buildPerlPackage rec {
     IOCompressBrotli
   ];
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/exiftool
-  '';
-
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "-ver";
diff --git a/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch b/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch
new file mode 100644
index 000000000000..f558f7c4dada
--- /dev/null
+++ b/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch
@@ -0,0 +1,19 @@
+Patch from Fedora to fix ExtUtils::ParseXS ≥ 3.57:
+
+  Unparseable XSUB parameter: 'offsets ...' in DiscID.xs, line 116
+
+https://bugzilla-attachments.redhat.com/attachment.cgi?id=2089957
+https://bugzilla.redhat.com/show_bug.cgi?id=2364631
+
+diff -up MusicBrainz-DiscID-0.06/DiscID.xs.orig MusicBrainz-DiscID-0.06/DiscID.xs
+--- MusicBrainz-DiscID-0.06/DiscID.xs.orig	2025-05-15 14:01:31.501503137 +0200
++++ MusicBrainz-DiscID-0.06/DiscID.xs	2025-05-15 14:02:10.538285963 +0200
+@@ -113,7 +113,7 @@ discid_get_track_length( disc, track_num
+ ## Provides the TOC of a known CD.
+ ##
+ int
+-discid_put( disc, first_track, sectors, offsets ... )
++discid_put( disc, first_track, sectors, offsets, ... )
+   DiscId *disc
+   int first_track
+   int sectors
diff --git a/pkgs/development/perl-modules/NetRemctl/default.nix b/pkgs/development/perl-modules/NetRemctl/default.nix
index 78ee5dfdffcb..7d51489a9b0e 100644
--- a/pkgs/development/perl-modules/NetRemctl/default.nix
+++ b/pkgs/development/perl-modules/NetRemctl/default.nix
@@ -11,6 +11,7 @@ buildPerlModule {
 
   postPatch = ''
     cp -R tests/tap/perl/Test perl/t/lib
+    rm perl/t/backend/options.t
     cd perl
   '';
 
diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
index 396e7951629d..43794e71f105 100644
--- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix
+++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPerlPackage,
-  shortenPerlShebang,
   DBDmysql,
   DBI,
   IOSocketSSL,
@@ -42,7 +41,6 @@ buildPerlPackage {
 
   nativeBuildInputs = [
     git
-    shortenPerlShebang
   ];
 
   buildInputs = [
@@ -64,10 +62,6 @@ buildPerlPackage {
     export HOME=$TMPDIR
   '';
 
-  postInstall = ''
-    shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*)
-  '';
-
   meta = {
     description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks";
     homepage = "https://www.percona.com/software/database-tools/percona-toolkit";
diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
index f74ebc238570..022da985986d 100644
--- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
+++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
@@ -3,7 +3,6 @@
   lib,
   fetchFromGitHub,
   buildPerlPackage,
-  shortenPerlShebang,
   LWP,
   LWPProtocolHttps,
   DataDump,
@@ -22,16 +21,12 @@ buildPerlPackage rec {
     sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs=";
   };
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
   propagatedBuildInputs = [
     LWP
     LWPProtocolHttps
     DataDump
     JSON
   ];
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/youtube-viewer
-  '';
 
   passthru.updateScript = gitUpdater { };
 
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 97d0bbcce7ac..afd42c840182 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -1,9 +1,10 @@
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
 
-perlFlags=
+perlUseLibs='use lib'
 for i in $(IFS=:; echo $PERL5LIB); do
-    perlFlags="$perlFlags -I$i"
+    perlUseLibs="$perlUseLibs \"$i\","
 done
+perlUseLibs=$(echo "$perlUseLibs" | sed 's/,$/;/')
 
 oldPreConfigure="$preConfigure"
 preConfigure() {
@@ -15,7 +16,7 @@ preConfigure() {
             first=$(dd if="$fn" count=2 bs=1 2> /dev/null)
             if test "$first" = "#!"; then
                 echo "patching $fn..."
-                sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1$perlFlags|"
+                sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1\n$perlUseLibs|"
             fi
         fi
     done
diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
index b30d55851b08..039721faa111 100644
--- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix
+++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix
@@ -7,7 +7,6 @@
   ArchiveZip,
   ArchiveCpio,
   SubOverride,
-  shortenPerlShebang,
   gitUpdater,
 }:
 
@@ -29,7 +28,6 @@ buildPerlPackage rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ];
   buildInputs = [
     ArchiveZip
     ArchiveCpio
@@ -49,9 +47,6 @@ buildPerlPackage rec {
     # we don’t need the debhelper script
     rm $out/bin/dh_strip_nondeterminism
     rm $out/share/man/man1/dh_strip_nondeterminism.1
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/strip-nondeterminism
   '';
 
   installCheckPhase = ''
@@ -60,8 +55,6 @@ buildPerlPackage rec {
     runHook postInstallCheck
   '';
 
-  # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error'
-  doCheck = !stdenv.hostPlatform.isDarwin;
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix
index 8d43a6d27127..d288bdd8ce51 100644
--- a/pkgs/development/php-packages/box/default.nix
+++ b/pkgs/development/php-packages/box/default.nix
@@ -20,7 +20,6 @@ php82.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix
index 71b5ce0c09ac..52dbd874b5a4 100644
--- a/pkgs/development/php-packages/castor/default.nix
+++ b/pkgs/development/php-packages/castor/default.nix
@@ -32,7 +32,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 91a29988a93b..dc05187b4efb 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -50,7 +50,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
   # use together with the version from this package to keep the
diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 29db90bd5a7a..622996584858 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index f1a6c3fb7c15..893e38296d1e 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix
index 9872955ffa43..686ffc0ae3a2 100644
--- a/pkgs/development/php-packages/phpinsights/default.nix
+++ b/pkgs/development/php-packages/phpinsights/default.nix
@@ -22,7 +22,6 @@ php.buildComposerProject2 (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix
index 18a2adfd73fd..23d0a9a16504 100644
--- a/pkgs/development/php-packages/phpmd/default.nix
+++ b/pkgs/development/php-packages/phpmd/default.nix
@@ -22,7 +22,6 @@ php.buildComposerProject2 (finalAttrs: {
   vendorHash = "sha256-Vx5JolyOeCRst+wzqPB7bZopBa2LU7SOJmA4tEvWj1c=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 13b745d486d6..34104291c42d 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/phpstan/phpstan/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index ca0e06e9cb16..72a79eee851a 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -35,7 +35,6 @@ php.buildComposerProject2 (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 99b22ee2aedb..efbd55a78b3a 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "11.0.0";
+  version = "11.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-uyMtQs5nLwIgG9A5peCzFjUIyjeM8VfjmicVcTLV36I=";
+    hash = "sha256-nxKWnNLmraPtMA+WZO4FOWbcbZr/HS6dhACKcFUq7D0=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index bc1eeaa85ddf..1767262c629f 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2.7.1";
+  version = "2.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     tag = "v${version}";
-    hash = "sha256-+OzCs+yNU7ni+Lua2gAhaqYdb8dQz3lhtEdhdDgvMxo=";
+    hash = "sha256-fRfcdE76BJE7GHobZU7mYmmtnN4gBxNd5KofdE0Sm0Y=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 2706b731c80a..ccbf466cf16f 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -103,8 +103,10 @@ buildPythonPackage rec {
 
   optional-dependencies.speedups = [
     aiodns
-    backports-zstd
     (if isPyPy then brotlicffi else brotli)
+  ]
+  ++ lib.optionals (pythonOlder "3.14") [
+    backports-zstd
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix
index b9360af17aed..6dc3739c4e0a 100644
--- a/pkgs/development/python-modules/aiotractive/default.nix
+++ b/pkgs/development/python-modules/aiotractive/default.nix
@@ -3,28 +3,25 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   yarl,
 }:
 
 buildPythonPackage rec {
   pname = "aiotractive";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "zhulik";
     repo = "aiotractive";
     tag = "v${version}";
-    hash = "sha256-QwwW/UxRgd4rco80SqQUGt0ArDNT9MXa/U/W2/dHZT0=";
+    hash = "sha256-tdeRl3fY+OPlLnh/KixdKSy6WLIH/qQR3icoUkKGeGo=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     yarl
   ];
@@ -35,9 +32,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aiotractive" ];
 
   meta = {
-    changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}";
     description = "Python client for the Tractive REST API";
     homepage = "https://github.com/zhulik/aiotractive";
+    changelog = "https://github.com/zhulik/aiotractive/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 983c7e0dede4..35c72db050ed 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.16.4";
+  version = "1.17.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-76tq2g3Q+uLJIGCADgv1wdwmrxWhDgL7S6v/FktHJeI=";
+    hash = "sha256-u+l1FwXF4PFId/AtRsU9EIheN349kO2oEKAW+bqhno4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix
index 0315ac2d3d70..667c6d864d89 100644
--- a/pkgs/development/python-modules/alexapy/default.nix
+++ b/pkgs/development/python-modules/alexapy/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "alexapy";
-  version = "1.29.13";
+  version = "1.29.14";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "keatontaylor";
     repo = "alexapy";
     tag = "v${version}";
-    hash = "sha256-GQ4Xv/4OdBRAc9qP0qO75FtqRVX0+v5zSjVjeOYr17Q=";
+    hash = "sha256-ZbdaiPyrF7EiigFHHFEQom+LsQKITD7FO9PdUVnoDvE=";
   };
 
   pythonRelaxDeps = [ "aiofiles" ];
diff --git a/pkgs/development/python-modules/annotated-doc/default.nix b/pkgs/development/python-modules/annotated-doc/default.nix
new file mode 100644
index 000000000000..d3e9777a97e1
--- /dev/null
+++ b/pkgs/development/python-modules/annotated-doc/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  uv-build,
+  pytestCheckHook,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "annotated-doc";
+  version = "0.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fastapi";
+    repo = "annotated-doc";
+    tag = version;
+    hash = "sha256-PFB+GqFRe5vF8xoWJPsXligSpzkUIt8TOqsmrKlfwyc=";
+  };
+
+  build-system = [
+    uv-build
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "annotated_doc"
+  ];
+
+  meta = {
+    description = "Document parameters, class attributes, return types, and variables inline, with Annotated";
+    homepage = "https://github.com/fastapi/annotated-doc";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 6dce6afd2718..cb6bcffb7f5d 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -74,7 +74,6 @@ buildPythonPackage rec {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   preCheck = ''
     # avoid coverage flags
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 77fa044a8dde..7ab4bb888177 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.11.0";
+  version = "4.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "anyio";
     tag = version;
-    hash = "sha256-TOXg9J/Z2S5/X7OBgU+J0HZNB3BDluaWTqDiqp3O4ek=";
+    hash = "sha256-zFVvAK06HG40numRihLHBMKCI3d1wQvmEKk+EaBFVVU=";
   };
 
   build-system = [ setuptools-scm ];
@@ -77,6 +77,9 @@ buildPythonPackage rec {
 
   pytestFlags = [
     "-Wignore::trio.TrioDeprecationWarning"
+    # DeprecationWarning for asyncio.iscoroutinefunction is propagated from uvloop used internally
+    # https://github.com/agronholm/anyio/commit/e7bb0bd496b1ae0d1a81b86de72312d52e8135ed
+    "-Wignore::DeprecationWarning"
   ];
 
   disabledTestMarks = [
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index 54e37bf56a3b..c7e0e5ef3a1c 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "apsw";
-  version = "3.48.0.0";
+  version = "3.51.0.0";
   pyproject = true;
 
   # https://github.com/rogerbinns/apsw/issues/548
   src = fetchurl {
     url = "https://github.com/rogerbinns/apsw/releases/download/${version}/apsw-${version}.tar.gz";
-    hash = "sha256-iwvUW6vOQu2EiUuYWVaz5D3ePSLrj81fmLxoGRaTzRk=";
+    hash = "sha256-8I1/HnGO9eOs9CUFwvN5BcpHtCxXD7qlF9WBA4E1Rls=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix
index 1c59c8c8e6a4..81c73582462d 100644
--- a/pkgs/development/python-modules/argparse-manpage/default.nix
+++ b/pkgs/development/python-modules/argparse-manpage/default.nix
@@ -41,6 +41,11 @@ buildPythonPackage rec {
     "test_old_example_file_name"
   ];
 
+  disabledTestPaths = [
+    # network access to install setuptools, likely due to pip update
+    "tests/test_examples.py"
+  ];
+
   pythonImportsCheck = [ "argparse_manpage" ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix
index f5e1cac08acb..fd3575e6bc77 100644
--- a/pkgs/development/python-modules/asn1tools/default.nix
+++ b/pkgs/development/python-modules/asn1tools/default.nix
@@ -50,7 +50,6 @@ buildPythonPackage rec {
     versionCheckHook
   ]
   ++ lib.concatAttrValues optional-dependencies;
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "asn1tools" ];
 
diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
index 6daa3d471320..55f09d2d2c4e 100644
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -1,30 +1,42 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
+  unstableGitUpdater,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "astor";
-  version = "0.8.1";
-  format = "setuptools";
+  version = "0.8.1-unstable-2024-03-30";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka";
+  src = fetchFromGitHub {
+    owner = "berkerpeksag";
+    repo = "astor";
+    rev = "df09001112f079db54e7c5358fa143e1e63e74c4";
+    hash = "sha256-VF+harl/q2yRU2yqN1Txud3YBNSeedQNw2SZNYQFsno=";
   };
 
-  # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89
+  patches = [
+    # https://github.com/berkerpeksag/astor/pull/233
+    ./python314-compat.patch
+  ];
+
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
     # https://github.com/berkerpeksag/astor/issues/196
     "test_convert_stdlib"
-    # https://github.com/berkerpeksag/astor/issues/212
-    "test_huge_int"
   ];
 
+  passthru.updateScript = unstableGitUpdater {
+    branch = "master";
+  };
+
   meta = {
     description = "Library for reading, writing and rewriting python AST";
     homepage = "https://github.com/berkerpeksag/astor";
diff --git a/pkgs/development/python-modules/astor/python314-compat.patch b/pkgs/development/python-modules/astor/python314-compat.patch
new file mode 100644
index 000000000000..e5af45648393
--- /dev/null
+++ b/pkgs/development/python-modules/astor/python314-compat.patch
@@ -0,0 +1,99 @@
+From d0b5563cc1e263f08df9312d89a7691167448f4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 14 May 2025 19:52:30 +0200
+Subject: [PATCH] Fix compatibility with Python 3.14 (mostly)
+
+Fix the code and the test suite to work with Python 3.14, where
+deprecated constant-like AST nodes were removed. Notably:
+
+1. Skip tests for deprecated nodes in Python 3.14.
+
+2. Use `ast.Constant` over `ast.Num` for non-deprecated code
+   in Python 3.6+.
+
+3. Check for `ast.Str` only in Python < 3.14, and handle `ast.Constant`
+   being used to represent a string instead.
+
+With these changes, all tests except for:
+
+    tests/test_rtrip.py::RtripTestCase::test_convert_stdlib
+
+pass. However, this particular test also hanged for me with older Python
+versions.
+
+Related to #217
+---
+ astor/code_gen.py      |  9 +++++++--
+ tests/test_code_gen.py | 11 ++++++++---
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/astor/code_gen.py b/astor/code_gen.py
+index b2bae12..4330f49 100644
+--- a/astor/code_gen.py
++++ b/astor/code_gen.py
+@@ -692,6 +692,7 @@ def _handle_string_constant(self, node, value, is_joined=False):
+         current_line = ''.join(current_line)
+ 
+         has_ast_constant = sys.version_info >= (3, 6)
++        has_ast_str = sys.version_info < (3, 14)
+ 
+         if is_joined:
+             # Handle new f-strings.  This is a bit complicated, because
+@@ -700,7 +701,7 @@ def _handle_string_constant(self, node, value, is_joined=False):
+ 
+             def recurse(node):
+                 for value in node.values:
+-                    if isinstance(value, ast.Str):
++                    if has_ast_str and isinstance(value, ast.Str):
+                         # Double up braces to escape them.
+                         self.write(value.s.replace('{', '{{').replace('}', '}}'))
+                     elif isinstance(value, ast.FormattedValue):
+@@ -713,7 +714,11 @@ def recurse(node):
+                                 self.write(':')
+                                 recurse(value.format_spec)
+                     elif has_ast_constant and isinstance(value, ast.Constant):
+-                        self.write(value.value)
++                        if isinstance(value.value, str):
++                            # Double up braces to escape them.
++                            self.write(value.value.replace('{', '{{').replace('}', '}}'))
++                        else:
++                            self.write(value.value)
+                     else:
+                         kind = type(value).__name__
+                         assert False, 'Invalid node %s inside JoinedStr' % kind
+diff --git a/tests/test_code_gen.py b/tests/test_code_gen.py
+index e828eb9..1825030 100644
+--- a/tests/test_code_gen.py
++++ b/tests/test_code_gen.py
+@@ -28,7 +28,10 @@ def astorexpr(x):
+     return eval(astor.to_source(ast.Expression(body=x)))
+ 
+ def astornum(x):
+-    return astorexpr(ast.Num(n=x))
++    if sys.version_info >= (3, 6):
++        return astorexpr(ast.Constant(x))
++    else:
++        return astorexpr(ast.Num(n=x))
+ 
+ class Comparisons(object):
+ 
+@@ -515,8 +518,8 @@ def test_deprecated_constants_as_name(self):
+             ast.Assign(targets=[ast.Name(id='spam')], value=ast.Name(id='None')),
+             "spam = None")
+ 
+-    @unittest.skipUnless(sys.version_info >= (3, 4),
+-                         "ast.NameConstant introduced in Python 3.4")
++    @unittest.skipUnless((3, 4) <= sys.version_info < (3, 14),
++                         "ast.NameConstant introduced in Python 3.4, removed in 3.14")
+     def test_deprecated_name_constants(self):
+         self.assertAstEqualsSource(
+             ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=True)),
+@@ -530,6 +533,8 @@ def test_deprecated_name_constants(self):
+             ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=None)),
+             "spam = None")
+ 
++    @unittest.skipIf(sys.version_info >= (3, 14),
++                     "Deprecated Constant nodes removed in Python 3.14")
+     def test_deprecated_constant_nodes(self):
+         self.assertAstEqualsSource(
+             ast.Assign(targets=[ast.Name(id='spam')], value=ast.Num(3)),
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 6507eeba8c62..265e045d832f 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "3.3.11"; # Check whether the version is compatible with pylint
+  version = "4.0.1"; # Check whether the version is compatible with pylint
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "PyCQA";
     repo = "astroid";
     tag = "v${version}";
-    hash = "sha256-lv+BQDYP7N4UGMf7XhB6HVDORPU0kZQPYveQWOcAqfQ=";
+    hash = "sha256-Ulifj+ym0j0LqhmKPfM8vVCjz71Gwd483ke3PkMnHb8=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix
index c737ec1190f2..0226f800834a 100644
--- a/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/pkgs/development/python-modules/astropy-iers-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "astropy-iers-data";
-  version = "0.2025.8.4.0.42.59";
+  version = "0.2025.11.24.0.39.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "astropy-iers-data";
     tag = "v${version}";
-    hash = "sha256-Izqm626PZzjnMNUzPW2x15ER7fn5f9+m2X434vXV/yo=";
+    hash = "sha256-B8568fGvS76igIlEWIbsTczQYqL0nPISM8rfUrF/DS4=";
   };
 
   build-system = [
@@ -29,6 +29,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
+    changelog = "https://github.com/astropy/astropy-iers-data/releases/tag/${src.tag}";
     description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers";
     homepage = "https://github.com/astropy/astropy-iers-data";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 0489821f7a82..d07f43684f89 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   pythonOlder,
 
@@ -55,14 +55,16 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "7.1.0";
+  version = "7.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-yPJUMiKVsbjPJDA9bxVb9+/bbBKCiCuWbOMEDv+MU8U=";
+  src = fetchFromGitHub {
+    owner = "astropy";
+    repo = "astropy";
+    tag = "v${version}";
+    hash = "sha256-cvwwTa6eJYncB2V6UCuBrQ5WRRvjgZF5/z4d7Z/uHc8=";
   };
 
   env = lib.optionalAttrs stdenv.cc.isClang {
@@ -159,6 +161,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
+    changelog = "https://docs.astropy.org/en/${src.tag}/changelog.html";
     description = "Astronomy/Astrophysics library for Python";
     homepage = "https://www.astropy.org";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix
index e260e2efdd59..a1f257bc5c8b 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/pkgs/development/python-modules/asttokens/default.nix
@@ -2,24 +2,25 @@
   lib,
   astroid,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "asttokens";
-  version = "3.0.0";
+  version = "3.0.0-unstable-2025-11-08";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Dc2Lqo1isMHRGLOZst26PEr/Jx0Nep4NTBaBx5A1u8c=";
+  src = fetchFromGitHub {
+    owner = "gristlabs";
+    repo = "asttokens";
+    rev = "f859c055e8453650e1987c5aefaaec36582d3a07";
+    hash = "sha256-dHtKyd5rj1Y7m1vTL9toyQ+GLV5fBNUFNkBM9t4e8yM=";
   };
 
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "3.0.0";
+
   build-system = [ setuptools-scm ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix
index 2903446788fc..3c0f1ded70ae 100644
--- a/pkgs/development/python-modules/async-lru/default.nix
+++ b/pkgs/development/python-modules/async-lru/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  fetchpatch2,
   setuptools,
   typing-extensions,
   pytestCheckHook,
@@ -23,6 +24,15 @@ buildPythonPackage rec {
     hash = "sha256-FJ1q6W9IYs0OSMZc+bI4v22hOAAWAv2OW3BAqixm8Hs=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/aio-libs/async-lru/issues/635
+      name = "python314-compatibility.patch";
+      url = "https://github.com/aio-libs/async-lru/commit/4df3785d3e5210ce6277b3137c4625cd73918088.patch";
+      hash = "sha256-B9KCJPbiZTQJrnxC/7VI+jgr2PKfwOmS7naXZwKtF9c=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index fa02faf81a58..42da2e01a42d 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "attrs";
-  version = "25.3.0";
+  version = "25.4.0";
   disabled = pythonOlder "3.7";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ddfO/H+1dnR7LIG0RC1NShzgkAlzUnwBHRAw/Tv0rxs=";
+    hash = "sha256-FtWWm4fwhZ7zOkizXVWsG+bkKuSdXoU7WX23DDXFfhE=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   postInstall = ''
     # Install tests as the tests output.
     mkdir $testout
-    cp -R conftest.py tests $testout
+    cp -R tests $testout
   '';
 
   pythonImportsCheck = [ "attr" ];
diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix
index e722aa26f240..fbd1a5925e3e 100644
--- a/pkgs/development/python-modules/auditwheel/default.nix
+++ b/pkgs/development/python-modules/auditwheel/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   setuptools-scm,
   pyelftools,
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "6.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-T7y9WFQFS7HdeHDbA3J7hxuWsYFH21cllWHAWGA5h9c=";
diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index 22931621c8e8..41a6ffba2001 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.58.0";
+  version = "1.59.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     tag = "v${version}";
-    hash = "sha256-rscE6eiJ2lbI/U20YRmcUj21PdB9nXpjfyBvu+msC/A=";
+    hash = "sha256-US8NHNEvYlYJMurXjvlySIdKIgKjAwIws8PmnPF0J6Q=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 26a928da8b48..ff59db6ac3d8 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,7 +10,7 @@
   pytest-rerunfailures,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
+  pythonAtLeast,
   pyyaml,
   setuptools,
   typing-extensions,
@@ -18,16 +18,17 @@
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.99.0";
+  version = "1.103.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  # https://github.com/aws/serverless-application-model/issues/3831
+  disabled = pythonAtLeast "3.14";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "serverless-application-model";
     tag = "v${version}";
-    hash = "sha256-Y82qN2bmzE5Xqz2wSw9lWItsPbsRevLL7FlLN0FGKs0=";
+    hash = "sha256-FW7tmXsD4VfR/c6IJUCvsYPYLIisaEqAhD0sp9ufA/s=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix
index 6c7ad6239018..bcdd271792bc 100644
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/pkgs/development/python-modules/backoff/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage rec {
     hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI=";
   };
 
+  patches = [
+    # https://github.com/litl/backoff/pull/220
+    ./python314-compat.patch
+  ];
+
   nativeBuildInputs = [ poetry-core ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/backoff/python314-compat.patch b/pkgs/development/python-modules/backoff/python314-compat.patch
new file mode 100644
index 000000000000..2393be2868fd
--- /dev/null
+++ b/pkgs/development/python-modules/backoff/python314-compat.patch
@@ -0,0 +1,108 @@
+diff --git a/tests/test_backoff_async.py b/tests/test_backoff_async.py
+index 226ef08..9298b5f 100644
+--- a/tests/test_backoff_async.py
++++ b/tests/test_backoff_async.py
+@@ -692,7 +692,7 @@ def test_on_predicate_on_regular_function_without_event_loop(monkeypatch):
+     monkeypatch.setattr('time.sleep', lambda x: None)
+ 
+     # Set default event loop to None.
+-    loop = asyncio.get_event_loop()
++    loop = asyncio.new_event_loop()
+     asyncio.set_event_loop(None)
+ 
+     try:
+@@ -716,7 +716,7 @@ def test_on_exception_on_regular_function_without_event_loop(monkeypatch):
+     monkeypatch.setattr('time.sleep', lambda x: None)
+ 
+     # Set default event loop to None.
+-    loop = asyncio.get_event_loop()
++    loop = asyncio.new_event_loop()
+     asyncio.set_event_loop(None)
+ 
+     try:
+
+From 401709d040df302cdf3cd4a7e0d7703c90ff2d9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= <edgarrm358@gmail.com>
+Date: Thu, 17 Oct 2024 16:28:46 -0600
+Subject: [PATCH] Use `inspect.iscoroutinefunction` instead of
+ `asyncio.iscoroutinefunction`
+
+---
+ backoff/_async.py     | 13 +++++++------
+ backoff/_decorator.py |  6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/backoff/_async.py b/backoff/_async.py
+index 82fd477..c24587c 100644
+--- a/backoff/_async.py
++++ b/backoff/_async.py
+@@ -1,5 +1,6 @@
+ # coding:utf-8
+ import datetime
++import inspect
+ import functools
+ import asyncio
+ from datetime import timedelta
+@@ -8,7 +9,7 @@
+ 
+ 
+ def _ensure_coroutine(coro_or_func):
+-    if asyncio.iscoroutinefunction(coro_or_func):
++    if inspect.iscoroutinefunction(coro_or_func):
+         return coro_or_func
+     else:
+         @functools.wraps(coro_or_func)
+@@ -47,10 +48,10 @@ def retry_predicate(target, wait_gen, predicate,
+     on_giveup = _ensure_coroutines(on_giveup)
+ 
+     # Easy to implement, please report if you need this.
+-    assert not asyncio.iscoroutinefunction(max_tries)
+-    assert not asyncio.iscoroutinefunction(jitter)
++    assert not inspect.iscoroutinefunction(max_tries)
++    assert not inspect.iscoroutinefunction(jitter)
+ 
+-    assert asyncio.iscoroutinefunction(target)
++    assert inspect.iscoroutinefunction(target)
+ 
+     @functools.wraps(target)
+     async def retry(*args, **kwargs):
+@@ -124,8 +125,8 @@ def retry_exception(target, wait_gen, exception,
+     giveup = _ensure_coroutine(giveup)
+ 
+     # Easy to implement, please report if you need this.
+-    assert not asyncio.iscoroutinefunction(max_tries)
+-    assert not asyncio.iscoroutinefunction(jitter)
++    assert not inspect.iscoroutinefunction(max_tries)
++    assert not inspect.iscoroutinefunction(jitter)
+ 
+     @functools.wraps(target)
+     async def retry(*args, **kwargs):
+diff --git a/backoff/_decorator.py b/backoff/_decorator.py
+index 77ed8c2..ca5d0ff 100644
+--- a/backoff/_decorator.py
++++ b/backoff/_decorator.py
+@@ -1,5 +1,5 @@
+ # coding:utf-8
+-import asyncio
++import inspect
+ import logging
+ import operator
+ from typing import Any, Callable, Iterable, Optional, Type, Union
+@@ -98,7 +98,7 @@ def decorate(target):
+             log_level=giveup_log_level
+         )
+ 
+-        if asyncio.iscoroutinefunction(target):
++        if inspect.iscoroutinefunction(target):
+             retry = _async.retry_predicate
+         else:
+             retry = _sync.retry_predicate
+@@ -198,7 +198,7 @@ def decorate(target):
+             log_level=giveup_log_level,
+         )
+ 
+-        if asyncio.iscoroutinefunction(target):
++        if inspect.iscoroutinefunction(target):
+             retry = _async.retry_exception
+         else:
+             retry = _sync.retry_exception
diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix
index 412b35bcb992..ec965af56c47 100644
--- a/pkgs/development/python-modules/backports-zstd/default.nix
+++ b/pkgs/development/python-modules/backports-zstd/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "backports-zstd";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm -r "$out/src/c/zstd"
     '';
-    hash = "sha256-5t5ET8b65v4ArV9zrmu+kDXLG3QQRpMMZPSG+RRaCLk=";
+    hash = "sha256-qgPtLl8oPvM9XDlW72NNX1JqCxzcnLlHyUNNxU9e2PY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index 405161169116..b32ee083f165 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
-  version = "4.13.4";
+  version = "4.14.3";
   pyproject = true;
 
   outputs = [
@@ -45,15 +45,15 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-27PE4c6uau/r2vJCMkcmDNBiQwpBDjjGbyuqUKhDcZU=";
+    hash = "sha256-YpKxxRhtNWu6Zp759/BRdXCZVlrZraXdYwvZ3l+n+4Y=";
   };
 
   patches = [
-    # backport test fix for behavior changes in libxml 2.14.3
+    # Fix tests with python 3.13.10 / 3.14.1
     (fetchpatch {
-      url = "https://git.launchpad.net/beautifulsoup/patch/?id=53d328406ec8c37c0edbd00ace3782be63e2e7e5";
+      url = "https://git.launchpad.net/beautifulsoup/patch/?id=55f655ffb7ef03bdd1df0f013743831fe54e3c7a";
       excludes = [ "CHANGELOG" ];
-      hash = "sha256-RtavbpnfT6x0A8L3tAvCXwKUpty1ASPGJKdks7evBr8=";
+      hash = "sha256-DJl1pey0NdJH+SyBH9+y6gwUvQCmou0D9xcRAEV8OBw=";
     })
   ];
 
diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index 9490795d769a..3c4acd157be3 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -29,10 +29,10 @@ buildPythonPackage rec {
 
   dependencies = [
     bleak
+    dbus-fast
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     bluetooth-adapters
-    dbus-fast
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index 98e27dccac5b..659f3523d5b3 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -1,41 +1,46 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  six,
+  fetchFromGitHub,
+  flit-core,
   wcwidth,
-  pytest,
+  six,
+  pytestCheckHook,
   mock,
   glibcLocales,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "blessed";
-  version = "1.21.0";
-  format = "setuptools";
+  # We need https://github.com/jquast/blessed/pull/311 to fix 3.13
+  version = "1.25-unstable-2025-12-05";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7Oi7xHWKuRdkUvTjpxnXAIjrVzl5jNVYLJ4F8qKDN+w=";
+  src = fetchFromGitHub {
+    owner = "jquast";
+    repo = "blessed";
+    rev = "cee680ff7fb3ad31f42ae98582ba74629f1fd6b0";
+    hash = "sha256-4K1W0LXJKkb2wKE6D+IkX3oI5KxkpKbO661W/VTHgts=";
   };
 
+  build-system = [ flit-core ];
+
+  dependencies = [
+    wcwidth
+    six
+  ];
+
   nativeCheckInputs = [
-    pytest
+    pytestCheckHook
     mock
     glibcLocales
   ];
 
   # Default tox.ini parameters not needed
-  checkPhase = ''
+  preCheck = ''
     rm tox.ini
-    pytest
   '';
 
-  propagatedBuildInputs = [
-    wcwidth
-    six
-  ];
-
   meta = {
     homepage = "https://github.com/jquast/blessed";
     description = "Thin, practical wrapper around terminal capabilities in Python";
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index cfe65be72471..25ff99755a88 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.42.17";
+  version = "1.42.18";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-hHVnEH1liqAUPdCQdLupy2RkUyUahvuWxf4Ss7DlBO4=";
+    hash = "sha256-iFJwsP9w9LDUS7zDp5m4AlUhQbJVErb5arnZUwWsf6M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index cfb932a22186..35997f98974e 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.42.17";
+  version = "1.42.18";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-tYr/vJeWSMVwgiMn0DXjWSebXqDVSc6xlL55qtpVKvI=";
+    hash = "sha256-FfL3cVoh1ELB763GCHbSl3Diu4RBxhw7hquQEi+/1LU=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index fb78ead78779..6746fb5707fa 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -10,18 +10,9 @@
 
 buildPythonPackage rec {
   pname = "brotli";
-  version = "1.2.0";
+  inherit (brotli) version src;
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "brotli";
-    tag = "v${version}";
-    hash = "sha256-ePfllKdY12hOPuO9uHuXFZ3Bdib6BLD4ghiaeurJZ28=";
-    # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
-    forceFetchGit = true;
-  };
-
   build-system = [
     pkgconfig
     setuptools
diff --git a/pkgs/development/python-modules/bump-my-version/default.nix b/pkgs/development/python-modules/bump-my-version/default.nix
index e08b27a1a23c..88b2e472c301 100644
--- a/pkgs/development/python-modules/bump-my-version/default.nix
+++ b/pkgs/development/python-modules/bump-my-version/default.nix
@@ -76,8 +76,6 @@ buildPythonPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [ "bumpversion" ];
diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix
index 9d571b5ec183..0aaeee120721 100644
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@@ -54,7 +54,6 @@ buildPythonPackage {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/bw";
-  versionCheckProgramArg = "--version";
 
   enabledTestPaths = [
     # only unit tests as integration tests need a OpenSSH client/server setup
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index 65f79584bd61..73920987827c 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -2,23 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "cachetools";
-  version = "6.1.0";
+  version = "6.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "tkem";
     repo = "cachetools";
     tag = "v${version}";
-    hash = "sha256-o3Ice6w7Ovot+nsmTpsl/toosZuVbi9RvRGs07W4H0Y=";
+    hash = "sha256-seoyqkrRQpRiMd5GTEvenjirn173Hq40Zuk1u7TvMPI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix
index 091fb30e7577..a7cdbb001720 100644
--- a/pkgs/development/python-modules/capturer/default.nix
+++ b/pkgs/development/python-modules/capturer/default.nix
@@ -3,14 +3,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   humanfriendly,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "capturer";
   version = "3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xolox";
@@ -19,7 +21,18 @@ buildPythonPackage rec {
     sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1";
   };
 
-  propagatedBuildInputs = [ humanfriendly ];
+  patches = [
+    # https://github.com/xolox/python-capturer/pull/16
+    (fetchpatch {
+      name = "python314-compat.patch";
+      url = "https://github.com/xolox/python-capturer/commit/3d0a9a040ecaa78ce2d39ec76ff5084ee7be6653.patch";
+      hash = "sha256-NW+X6wdXMHSLswO7M7/YeIyHu+EDYTLJE/mBkqyhKUM=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [ humanfriendly ];
 
   # hangs on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 9d635cd1c9bb..670f51a6ea90 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "cattrs";
-  version = "25.1.1";
+  version = "25.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-attrs";
     repo = "cattrs";
     tag = "v${version}";
-    hash = "sha256-kaB/UJcd4E4PUkz6mD53lXtmj4Z4P+Tuu7bSljYVOO4=";
+    hash = "sha256-6oQblSanvSZOMD5ossCP7fNjyxF54SRbU1cQrW1I5Ps=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 259479646175..61648a3a527f 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   jschema-to-python,
   jsonpatch,
-  jsonschema,
   junit-xml,
   mock,
   networkx,
@@ -18,11 +17,12 @@
   sarif-om,
   setuptools,
   sympy,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "1.38.3";
+  version = "1.41.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,23 +31,19 @@ buildPythonPackage rec {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
     tag = "v${version}";
-    hash = "sha256-n3NHmbo3qRhP7oqUOokw8oGnNXo4rhRhuAgL66hvfog=";
+    hash = "sha256-AudCeFMbCQucANLLAknCKC7gzi0vvFh9c9k7ll0a1MM=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     aws-sam-translator
-    jschema-to-python
     jsonpatch
-    jsonschema
-    junit-xml
-    networkx
     networkx
     pyyaml
     regex
-    sarif-om
     sympy
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -57,12 +53,7 @@ buildPythonPackage rec {
       jschema-to-python
       sarif-om
     ];
-    full = [
-      jschema-to-python
-      junit-xml
-      pydot
-      sarif-om
-    ];
+    full = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "full" ]);
   };
 
   nativeCheckInputs = [
@@ -70,19 +61,12 @@ buildPythonPackage rec {
     mock
     pytestCheckHook
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ optional-dependencies.full;
 
   preCheck = ''
     export PATH=$out/bin:$PATH
   '';
 
-  disabledTestPaths = [
-    # tests fail starting on 2025-10-01
-    # related: https://github.com/aws-cloudformation/cfn-lint/issues/4125
-    "test/integration/test_quickstart_templates.py"
-    "test/integration/test_quickstart_templates_non_strict.py"
-  ];
-
   disabledTests = [
     # Requires git directory
     "test_update_docs"
diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix
index c788999d2927..d29d0f36a6cf 100644
--- a/pkgs/development/python-modules/ciso8601/default.nix
+++ b/pkgs/development/python-modules/ciso8601/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ciso8601";
-  version = "2.3.2";
+  version = "2.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "closeio";
     repo = "ciso8601";
     tag = "v${version}";
-    hash = "sha256-oVnQ0vHhWs8spfOnJOgTJ6MAHcY8VGZHZ0E/T8JsKqE=";
+    hash = "sha256-14HiCn8BPALPaW53k118lHb5F4oG9mMNN6sdLdKB6v0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix
index b21bf0cdab14..66891ba7decc 100644
--- a/pkgs/development/python-modules/clarabel/default.nix
+++ b/pkgs/development/python-modules/clarabel/default.nix
@@ -5,6 +5,7 @@
   fetchPypi,
   rustPlatform,
   libiconv,
+  cffi,
   numpy,
   scipy,
   nix-update-script,
@@ -12,17 +13,17 @@
 
 buildPythonPackage rec {
   pname = "clarabel";
-  version = "0.10.0";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qKIQUFj9fbVHGL5TxIcVpQkQUAsQ/wuPU4BDTmnBChA=";
+    hash = "sha256-58QcR/Dlmuq5mu//nlivSodT7lJpu+7L1VJvxvQblZg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Ohbeavkayl6vMyYX9kVVLRddvVB9gWOxfzdWAOg+gac=";
+    hash = "sha256-Cmxbz1zPA/J7EeJhGfD4Zt+QvyJK6BOZ+YQAsf8H+is=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -32,7 +33,8 @@ buildPythonPackage rec {
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
-  propagatedBuildInputs = [
+  dependencies = [
+    cffi
     numpy
     scipy
   ];
diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix
index 17e76e1dba95..d3036cb894ae 100644
--- a/pkgs/development/python-modules/clarifai-protocol/default.nix
+++ b/pkgs/development/python-modules/clarifai-protocol/default.nix
@@ -18,23 +18,34 @@ let
     "x86_64-darwin" = "macosx_11_0_universal2";
   };
 
-  hashes = {
-    "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0=";
-    "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E=";
-    "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8=";
-    "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU=";
-    "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg=";
-    "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE=";
-    "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA=";
-    "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU=";
-    "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g=";
-    "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0=";
-    "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY=";
-    "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0=";
-    "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU=";
-    "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o=";
-    "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg=";
-  };
+  key =
+    if stdenv.hostPlatform.isDarwin then
+      "${pythonVersionNoDot}-darwin"
+    else
+      "${pythonVersionNoDot}-${stdenv.hostPlatform.system}";
+
+  hash =
+    {
+      "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0=";
+      "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E=";
+      "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8=";
+      "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU=";
+      "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg=";
+      "314-x86_64-linux" = "";
+      "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE=";
+      "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA=";
+      "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU=";
+      "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g=";
+      "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0=";
+      "314-aarch64-linux" = "";
+      "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY=";
+      "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0=";
+      "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU=";
+      "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o=";
+      "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg=";
+      "314-darwin" = "";
+    }
+    .key or (throw "clarifai-protocol: unsupported system/python (${key}) version combination");
 in
 buildPythonPackage rec {
   pname = "clarifai-protocol";
@@ -49,12 +60,7 @@ buildPythonPackage rec {
     abi = "cp${pythonVersionNoDot}";
     dist = "cp${pythonVersionNoDot}";
     platform = systemToPlatform.${stdenv.hostPlatform.system} or (throw "unsupported system");
-    hash =
-      if stdenv.hostPlatform.isDarwin then
-        hashes."${pythonVersionNoDot}-darwin" or (throw "unsupported system/python version combination")
-      else
-        hashes."${pythonVersionNoDot}-${stdenv.hostPlatform.system}"
-          or (throw "unsupported system/python version combination");
+    inherit hash;
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 368589cac6ef..47f53fb6580b 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   importlib-metadata,
   pytestCheckHook,
 
@@ -17,25 +16,16 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.2.1";
+  version = "8.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-3FfLKwpfkiGfY2+H2fQoZwLBqfPlV46xw2Bc4YEsyps=";
+    hash = "sha256-MbaIQJr6GbM8JwdbUkbeC8TqWN5dH82pFOqHwJE2PBA=";
   };
 
-  patches = [
-    # https://github.com/pallets/click/pull/2940
-    (fetchpatch {
-      name = "fix-SystemExit-when-using-stdin.patch";
-      url = "https://github.com/pallets/click/commit/93c6966eb3a575c2b600434d1cc9f4b3aee505ac.patch";
-      hash = "sha256-DkVF0JnKbcsdAhgVjWJEDZZ8vr2sf6wba8P3SyRUy6o=";
-    })
-  ];
-
   build-system = [ flit-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index 8fdb9ec23f12..048aca02e856 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,34 +2,29 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   flit-core,
 
   # tests
-  psutil,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "cloudpickle";
-  version = "3.1.1";
+  version = "3.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "cloudpipe";
     repo = "cloudpickle";
     tag = "v${version}";
-    hash = "sha256-e8kEznjuIrdjNsXwXJO3lcEEpiCR+UQzXnGrTarUb5E=";
+    hash = "sha256-BsCOEpNCNqq8PS+SdbzF1wq0LXEmtcHJs0pdt2qFw/w=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
   nativeCheckInputs = [
-    psutil
     pytestCheckHook
   ];
 
@@ -37,6 +32,7 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # ModuleNotFoundError: No module named 'psutil'
+    # (because _make_cwd_env() overwrites $PYTHONPATH)
     "tests/cloudpickle_test.py"
   ];
 
@@ -44,7 +40,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/cloudpipe/cloudpickle/blob/${src.tag}/CHANGES.md";
     description = "Extended pickling support for Python objects";
     homepage = "https://github.com/cloudpipe/cloudpickle";
-    license = with lib.licenses; [ bsd3 ];
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
index 16de23b159dd..55728123534e 100644
--- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix
+++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
@@ -15,19 +15,19 @@
 
 buildPythonPackage rec {
   pname = "cmsis-pack-manager";
-  version = "0.5.2";
+  version = "0.6.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pyocd";
     repo = "cmsis-pack-manager";
     tag = "v${version}";
-    hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg=";
+    hash = "sha256-kb0VSg89qglL6Q5kx1nEN1OW1GYoccBTITtPw2/dXTY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-OBh5WWSekrqdLLmxEXS0LfPIfy4QWKYgO+8o6PYWjN4=";
+    hash = "sha256-yRNSFlEwFhfkSNjbFHipVZvJZ40pKbI9HhLtciws7nc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index 2ae6894a190b..473fb1805490 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -84,7 +84,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Python client for coiled.io dask clusters";
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index af2fdd133c1d..36d367e81759 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.13.0";
+  version = "7.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "coveragepy";
     repo = "coveragepy";
     tag = version;
-    hash = "sha256-2i01Jlk4oj/0WhoYE1BgeKKjZK3YpEOrGHEgNhTruR4=";
+    hash = "sha256-xdbgHUE+vbSiqLRDhd5G5u90VU5+TxLehAuwdhdGzBQ=";
   };
 
   build-system = [ setuptools ];
@@ -47,27 +47,11 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
-    "test_doctest"
-    "test_files_up_one_level"
-    "test_get_encoded_zip_files"
-    "test_multi"
-    "test_no_duplicate_packages"
-    "test_zipfile"
     # tests expect coverage source to be there
     "test_all_our_source_files"
-    "test_metadata"
-    "test_more_metadata"
     "test_real_code_regions"
   ];
 
-  disabledTestPaths = [
-    "tests/test_debug.py"
-    "tests/test_plugins.py"
-    "tests/test_process.py"
-    "tests/test_report.py"
-    "tests/test_venv.py"
-  ];
-
   meta = {
     changelog = "https://github.com/coveragepy/coveragepy/blob/${src.tag}/CHANGES.rst";
     description = "Code coverage measurement for Python";
diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix
index 3f2abc025855..ae303a57bab9 100644
--- a/pkgs/development/python-modules/crewai/default.nix
+++ b/pkgs/development/python-modules/crewai/default.nix
@@ -76,6 +76,7 @@ buildPythonPackage rec {
     "pydantic"
     "pydantic-settings"
     "pyjwt"
+    "python-dotenv"
     "regex"
     "tokenizers"
     "tomli"
@@ -445,8 +446,6 @@ buildPythonPackage rec {
     "--override-ini=addopts="
   ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Framework for orchestrating role-playing, autonomous AI agents";
     homepage = "https://github.com/crewAIInc/crewAI";
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index d9b3a68715ae..15016552b3d4 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "46.0.2";
+  version = "46.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,12 +31,12 @@ buildPythonPackage rec {
     owner = "pyca";
     repo = "cryptography";
     tag = version;
-    hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA=";
+    hash = "sha256-6t7f/BaMkA24MY05B7aYa0myxnCjrCsh1qk6RgAjeQc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-aCQzY2gBjVVwiqlqAxkH4y6yf4lqdQuSEnQSIjLPRJg=";
+    hash = "sha256-5ElDEl7MdcQfu/hy+POSBcvkNCFAMo6La5s6uRhZ/fM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index 48dacf09a566..8fca41d9b161 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -90,7 +90,6 @@ buildPythonPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/cxfreeze";
-  versionCheckProgramArg = "--version";
 
   preCheck = ''
     rm -rf cx_Freeze
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index c7ccfa5295cc..796df1cad647 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   gdb,
-  isPyPy,
   ncurses,
   numpy,
   pkg-config,
@@ -16,31 +15,30 @@
 
 buildPythonPackage rec {
   pname = "cython";
-  version = "3.1.4";
+  version = "3.1.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cython";
     repo = "cython";
     tag = version;
-    hash = "sha256-qFj7w0fQY6X1oADLsAgwFefzx92/Pmgv9j5S6v0sdPg=";
+    hash = "sha256-OB9DsGabbn5pE+8Ru29D3Jp9Wu+gwlHYYy79x+M+HPI=";
   };
 
   build-system = [
-    pkg-config
     setuptools
   ];
 
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   nativeCheckInputs = [
     gdb
     numpy
     ncurses
   ];
 
-  env = lib.optionalAttrs (!isPyPy) {
-    LC_ALL = "en_US.UTF-8";
-  };
-
   # https://github.com/cython/cython/issues/2785
   # Temporary solution
   doCheck = false;
diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix
index 9426692a2088..ed4bc835a634 100644
--- a/pkgs/development/python-modules/dacite/default.nix
+++ b/pkgs/development/python-modules/dacite/default.nix
@@ -2,16 +2,15 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
   pytestCheckHook,
+  pythonAtLeast,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "dacite";
   version = "1.9.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "konradhalas";
@@ -23,8 +22,14 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace "--benchmark-autosave --benchmark-json=benchmark.json" ""
+  ''
+  + lib.optionalString (pythonAtLeast "3.14") ''
+    substituteInPlace tests/core/test_union.py \
+      --replace-fail "typing.Union[int, str]" "int | str"
   '';
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "dacite" ];
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 47bf61b9db09..cb7ae00121df 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build-system
   setuptools,
@@ -50,6 +51,12 @@ buildPythonPackage rec {
     hash = "sha256-oGBOt2ULLn0Kx1rOVNWaC3l1ECotMC2yNeCHya9Tx+s=";
   };
 
+  # https://github.com/dask/dask/issues/12043
+  postPatch = lib.optionalString (pythonAtLeast "3.14") ''
+    substituteInPlace dask/dataframe/dask_expr/tests/_util.py \
+      --replace-fail "except AttributeError:" "except (AttributeError, pickle.PicklingError):"
+  '';
+
   build-system = [
     setuptools
     setuptools-scm
@@ -102,7 +109,6 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.array
   ++ optional-dependencies.dataframe;
-  versionCheckProgramArg = "--version";
 
   pytestFlags = [
     # Rerun failed tests up to three times
@@ -114,6 +120,11 @@ buildPythonPackage rec {
     "network"
   ];
 
+  # https://github.com/dask/dask/issues/12042
+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    "test_multiple_repartition_partition_size"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix
index 7a11e307b64e..d5bb8918d91f 100644
--- a/pkgs/development/python-modules/dataclasses-json/default.nix
+++ b/pkgs/development/python-modules/dataclasses-json/default.nix
@@ -25,6 +25,12 @@ buildPythonPackage rec {
     hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM=";
   };
 
+  patches = [
+    ./marshmallow-4.0-compat.patch
+    # https://github.com/lidatong/dataclasses-json/pull/565
+    ./python-3.14-compat.patch
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail 'documentation =' 'Documentation =' \
@@ -36,6 +42,8 @@ buildPythonPackage rec {
     poetry-dynamic-versioning
   ];
 
+  pythonRelaxDeps = [ "marshmallow" ];
+
   dependencies = [
     typing-inspect
     marshmallow
@@ -46,6 +54,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # fails to deserialize None with marshmallow 4.0
+    "test_deserialize"
+  ];
+
   disabledTestPaths = [
     # fails with the following error and avoid dependency on mypy
     # mypy_main(None, text_io, text_io, [__file__], clean_exit=True)
diff --git a/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch b/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch
new file mode 100644
index 000000000000..aafbb08b63eb
--- /dev/null
+++ b/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch
@@ -0,0 +1,62 @@
+diff --git a/dataclasses_json/api.py b/dataclasses_json/api.py
+index 3481e93..a19eb0a 100644
+--- a/dataclasses_json/api.py
++++ b/dataclasses_json/api.py
+@@ -79,7 +79,6 @@ class DataClassJsonMixin(abc.ABC):
+                only=None,
+                exclude=(),
+                many: bool = False,
+-               context=None,
+                load_only=(),
+                dump_only=(),
+                partial: bool = False,
+@@ -95,7 +94,6 @@ class DataClassJsonMixin(abc.ABC):
+         return Schema(only=only,
+                       exclude=exclude,
+                       many=many,
+-                      context=context,
+                       load_only=load_only,
+                       dump_only=dump_only,
+                       partial=partial,
+
+diff --git a/dataclasses_json/mm.py b/dataclasses_json/mm.py
+index 9cfacf1..cecd3b0 100644
+--- a/dataclasses_json/mm.py
++++ b/dataclasses_json/mm.py
+@@ -248,7 +248,7 @@ def build_type(type_, options, mixin, field, cls):
+                 options['field_many'] = bool(
+                     _is_supported_generic(field.type) and _is_collection(
+                         field.type))
+-                return fields.Nested(type_.schema(), **options)
++                return fields.Nested(type_.schema(), metadata=options)
+             else:
+                 warnings.warn(f"Nested dataclass field {field.name} of type "
+                               f"{field.type} detected in "
+
+From b5ea169f19cea0e346ba152c75ab49802f307e5e Mon Sep 17 00:00:00 2001
+From: Steven Packard <spackard1@bloomberg.net>
+Date: Sat, 9 Apr 2022 03:37:52 -0400
+Subject: [PATCH] fix(mm): Replace deprecated Marshmallow Field parameters
+
+In Marshmallow 3.13.0, the `default` and `missing` parameters of the
+`Field` object were deprecated and replaced with `dump_default` and
+`load_default` respectively.
+
+fixes: #328
+---
+ dataclasses_json/mm.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dataclasses_json/mm.py b/dataclasses_json/mm.py
+index 9cfacf1d..b9e54d8e 100644
+--- a/dataclasses_json/mm.py
++++ b/dataclasses_json/mm.py
+@@ -305,7 +305,7 @@ def schema(cls, mixin, infer_missing):
+         else:
+             type_ = field.type
+             options: typing.Dict[str, typing.Any] = {}
+-            missing_key = 'missing' if infer_missing else 'default'
++            missing_key = 'load_default' if infer_missing else 'dump_default'
+             if field.default is not MISSING:
+                 options[missing_key] = field.default
+             elif field.default_factory is not MISSING:
diff --git a/pkgs/development/python-modules/dataclasses-json/python-3.14-compat.patch b/pkgs/development/python-modules/dataclasses-json/python-3.14-compat.patch
new file mode 100644
index 000000000000..e09a5d91b4d5
--- /dev/null
+++ b/pkgs/development/python-modules/dataclasses-json/python-3.14-compat.patch
@@ -0,0 +1,145 @@
+From 20799887ff1d50dc6ca5d90bc1038ff5160b97f3 Mon Sep 17 00:00:00 2001
+From: "paul@iqmo.com" <paul@iqmo.com>
+Date: Tue, 19 Aug 2025 21:38:21 -0400
+Subject: [PATCH 3/8] fix 3.14 / PEP649, but maintain bw compat
+
+---
+ dataclasses_json/core.py           | 40 +++++++++++++++++++++++++++++-
+ dataclasses_json/undefined.py      |  3 ++-
+ tests/test_undefined_parameters.py | 36 +++++++++++++++++++++++++++
+ 3 files changed, 77 insertions(+), 2 deletions(-)
+
+diff --git a/dataclasses_json/core.py b/dataclasses_json/core.py
+index 69f51a3a..313e2615 100644
+--- a/dataclasses_json/core.py
++++ b/dataclasses_json/core.py
+@@ -18,6 +18,7 @@
+ from uuid import UUID
+ 
+ from typing_inspect import is_union_type  # type: ignore
++import typing
+ 
+ from dataclasses_json import cfg
+ from dataclasses_json.utils import (_get_type_cons, _get_type_origin,
+@@ -44,6 +45,43 @@
+     Set: frozenset,
+ })
+ 
++PEP649 = sys.version_info >= (3, 14)
++
++if PEP649:
++    import inspect
++
++def _safe_get_type_hints(c, **kwargs):
++
++    if not PEP649: 
++        # not running under PEP 649 (future/deferred annotations),
++        return typing.get_type_hints(c, include_extras=True, **kwargs)
++
++    else:        
++        if not isinstance(c, type):
++            # If we're passed an instance instead of a class, normalize to its type
++            c = c.__class__     
++        if "." not in getattr(c, "__qualname__", ""):
++            # If this is a *top-level class* (no "." in __qualname__),
++            # typing.get_type_hints works fine even under PEP 649.
++            return typing.get_type_hints(c, include_extras=True, **kwargs)
++        else:
++            # Otherwise, this is a *nested class* (defined inside another class or function),
++            # where typing.get_type_hints may fail under PEP 649.
++            ann = {}
++
++            # First collect annotations from bases in the MRO
++            for base in reversed(c.__mro__[:-1]):
++                ann.update(inspect.get_annotations(base, format=inspect.Format.VALUE) or {})
++
++            # For the class itself, use FORWARDREF format to keep "Self"/recursive types intact
++            ann.update(inspect.get_annotations(c, format=inspect.Format.FORWARDREF) or {})
++
++            if ann:
++                return ann
++            else:
++                return {f.name: f.type for f in fields(c)}
++
++
+ 
+ class _ExtendedEncoder(json.JSONEncoder):
+     def default(self, o) -> Json:
+@@ -175,7 +213,7 @@ def _decode_dataclass(cls, kvs, infer_missing):
+     kvs = _handle_undefined_parameters_safe(cls, kvs, usage="from")
+ 
+     init_kwargs = {}
+-    types = get_type_hints(cls)
++    types = _safe_get_type_hints(cls)
+     for field in fields(cls):
+         # The field should be skipped from being added
+         # to init_kwargs as it's not intended as a constructor argument.
+diff --git a/dataclasses_json/undefined.py b/dataclasses_json/undefined.py
+index cb8b2cfc..a94b4718 100644
+--- a/dataclasses_json/undefined.py
++++ b/dataclasses_json/undefined.py
+@@ -7,6 +7,7 @@
+ from typing import Any, Callable, Dict, Optional, Tuple, Union, Type, get_type_hints
+ from enum import Enum
+ 
++from .core import _safe_get_type_hints
+ from marshmallow.exceptions import ValidationError  # type: ignore
+ 
+ from dataclasses_json.utils import CatchAllVar
+@@ -248,7 +249,7 @@ def _catch_all_init(self, *args, **kwargs):
+     @staticmethod
+     def _get_catch_all_field(cls) -> Field:
+         cls_globals = vars(sys.modules[cls.__module__])
+-        types = get_type_hints(cls, globalns=cls_globals)
++        types = _safe_get_type_hints(cls, globalns=cls_globals)
+         catch_all_fields = list(
+             filter(lambda f: types[f.name] == Optional[CatchAllVar], fields(cls)))
+         number_of_catch_all_fields = len(catch_all_fields)
+diff --git a/tests/test_undefined_parameters.py b/tests/test_undefined_parameters.py
+index bac711af..6bd33406 100644
+--- a/tests/test_undefined_parameters.py
++++ b/tests/test_undefined_parameters.py
+@@ -221,6 +221,42 @@ class Boss:
+     assert json.loads(boss_json) == Boss.schema().dump(boss)
+     assert "".join(boss_json.replace('\n', '').split()) == "".join(Boss.schema().dumps(boss).replace('\n', '').split())
+ 
++@dataclass_json(undefined=Undefined.INCLUDE)
++@dataclass(frozen=True)
++class Minion2:
++    name: str
++    catch_all: CatchAll
++
++@dataclass_json(undefined=Undefined.INCLUDE)
++@dataclass(frozen=True)
++class Boss2:
++    minions: List[Minion2]
++    catch_all: CatchAll
++
++def test_undefined_parameters_catch_all_schema_roundtrip2(boss_json):
++    boss1 = Boss2.schema().loads(boss_json)
++    dumped_s = Boss2.schema().dumps(boss1)
++    boss2 = Boss2.schema().loads(dumped_s)
++    assert boss1 == boss2
++
++
++def test_undefined_parameters_catch_all_schema_roundtrip(boss_json):
++    @dataclass_json(undefined=Undefined.INCLUDE)
++    @dataclass(frozen=True)
++    class Minion:
++        name: str
++        catch_all: CatchAll
++
++    @dataclass_json(undefined=Undefined.INCLUDE)
++    @dataclass(frozen=True)
++    class Boss:
++        minions: List[Minion]
++        catch_all: CatchAll
++
++    boss1 = Boss.schema().loads(boss_json)
++    dumped_s = Boss.schema().dumps(boss1)
++    boss2 = Boss.schema().loads(dumped_s)
++    assert boss1 == boss2
+ 
+ def test_undefined_parameters_catch_all_schema_roundtrip(boss_json):
+     @dataclass_json(undefined=Undefined.INCLUDE)
+
diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix
index 48aae1bd883a..8d783a15c3b5 100644
--- a/pkgs/development/python-modules/db-dtypes/default.nix
+++ b/pkgs/development/python-modules/db-dtypes/default.nix
@@ -7,24 +7,29 @@
   pandas,
   pyarrow,
   pytest8_3CheckHook,
-  pythonOlder,
+  pythonAtLeast,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "db-dtypes";
-  version = "1.4.3";
+  version = "1.4.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-db-dtypes-pandas";
     tag = "v${version}";
-    hash = "sha256-AyO/GwtExMWi4mB3OMtYPFvAVS/ylcBXGiGXgaScyCA=";
+    hash = "sha256-Aq/2yDyvUpLsGr+mmBDQpC9X1pWLpDtYD6qql2sgGNw=";
   };
 
+  # https://github.com/googleapis/python-db-dtypes-pandas/pull/379
+  postPatch = lib.optionalString (pythonAtLeast "3.14") ''
+    substituteInPlace tests/unit/test_date.py \
+      --replace-fail '"year 10000 is out of range"' '"year must be in 1..9999, not 10000"' \
+      --replace-fail '"day is out of range for month"' '"day 99 must be in range 1..28 for month 2 in year 2021"'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index 87aac6af1762..b0d90c7a5cdc 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  enabledTestPaths = [ "tests/test.py " ];
+  enabledTestPaths = [ "tests/test.py" ];
 
   meta = {
     changelog = "https://github.com/micheles/decorator/blob/${src.tag}/CHANGES.md";
diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix
index d51a351a0ff9..10cd9938b130 100644
--- a/pkgs/development/python-modules/deid/default.nix
+++ b/pkgs/development/python-modules/deid/default.nix
@@ -62,7 +62,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "deid" ];
 
diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix
index c5c824467526..57ffacf002fb 100644
--- a/pkgs/development/python-modules/deltalake/default.nix
+++ b/pkgs/development/python-modules/deltalake/default.nix
@@ -8,6 +8,8 @@
   openssl,
   stdenv,
   libiconv,
+  opentelemetry-api,
+  opentelemetry-sdk,
   pkg-config,
   polars,
   pytestCheckHook,
@@ -18,21 +20,22 @@
   pandas,
   deprecated,
   azure-storage-blob,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "deltalake";
-  version = "1.1.4";
+  version = "1.2.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LpeJUNQg4FC73LX2LjvpPTMctRarTJsWlM8aeIfGPiU=";
+    hash = "sha256-dqzkiWHeAbfXzEsaKyRiJx+0m/dIOMi9+gxjcuBT2QU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-4VmNhUijQMC/Wazcx+uT7mQqD+wutXrBJ+HN3AyxQRw=";
+    hash = "sha256-MPwoGJ7xcsBRgaaM4jxhC6Vv2+Jhh0oYYtbji/Hc+vQ=";
   };
 
   env.OPENSSL_NO_VENDOR = 1;
@@ -51,25 +54,32 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     pkg-config # openssl-sys needs this
+    writableTmpDirAsHomeHook
   ]
   ++ (with rustPlatform; [
     cargoSetupHook
     maturinBuildHook
   ]);
 
+  optional-dependencies = {
+    pandas = [ pandas ];
+    pyarrow = [ pyarrow ];
+  };
+
   pythonImportsCheck = [ "deltalake" ];
 
   nativeCheckInputs = [
-    pytestCheckHook
-    pandas
+    azure-storage-blob
+    opentelemetry-api
+    opentelemetry-sdk
     polars
+    pytestCheckHook
     pytest-benchmark
     pytest-cov-stub
     pytest-mock
     pytest-timeout
-    azure-storage-blob
-    pyarrow
-  ];
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
 
   preCheck = ''
     # For paths in test to work, we have to be in python dir
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index e79469d71ad4..d04dd0ec6a64 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   python,
-  pythonOlder,
   setuptools,
 
   # passthru tests
@@ -13,16 +12,14 @@
 
 buildPythonPackage rec {
   pname = "dill";
-  version = "0.4.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "0.4.0-unstable-2025-11-09";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "uqfoundation";
     repo = "dill";
-    tag = version;
-    hash = "sha256-RIyWTeIkK5cS4Fh3TK48XLa/EU9Iwlvcml0CTs5+Uh8=";
+    rev = "d948ecd748772f2812361982ec1496da0cd47b53";
+    hash = "sha256-/A84BpZnwSwsEYqLL0Xdf8OjJtg1UMu6dig3QEN+n1A=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix
index 310c26911e5e..0cd673918890 100644
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -36,6 +36,9 @@ buildPythonPackage rec {
     flit-core
   ];
 
+  pythonRemoveDeps = [
+    "tfp-nightly"
+  ];
   dependencies = [
     absl-py
     chex
diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix
index 33d0aed2d89e..727b109d64bc 100644
--- a/pkgs/development/python-modules/distutils/default.nix
+++ b/pkgs/development/python-modules/distutils/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
   setuptools-scm,
   setuptools,
   python,
@@ -11,6 +12,7 @@
   jaraco-envs,
   jaraco-path,
   jaraco-text,
+  libz,
   more-itertools,
   packaging,
   path,
@@ -27,8 +29,8 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "distutils";
-    rev = "72837514c2b67081401db556be9aaaa43debe44f"; # correlate commit from setuptools version
-    hash = "sha256-Kx4Iudy9oZ0oQT96Meyq/m0k0BuexPLVxwvpNJehCW0=";
+    rev = "5ad8291ff2ad3e43583bc72a4c09299ca6134f09"; # correlate commit from setuptools version
+    hash = "sha256-3Mqpe/Goj3lQ6GEbX3DHWjdoh7XsFIg9WkOCK138OAo=";
   };
 
   build-system = [ setuptools-scm ];
@@ -58,9 +60,19 @@ buildPythonPackage {
     pytestCheckHook
   ];
 
+  checkInputs = [
+    # https://github.com/pypa/distutils/blob/5ad8291ff2ad3e43583bc72a4c09299ca6134f09/distutils/tests/test_build_ext.py#L107
+    libz
+  ];
+
   # jaraco-path depends ob pyobjc
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    #  AssertionError: assert '(?s:foo[^/]*)\\z' == '(?s:foo[^/]*)\\Z'
+    "test_glob_to_re"
+  ];
+
   meta = {
     description = "Distutils as found in cpython";
     homepage = "https://github.com/pypa/distutils";
diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix
index 1f5db03385ed..b17f2681c8cf 100644
--- a/pkgs/development/python-modules/django-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap3/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   uv-build,
@@ -17,24 +16,16 @@
 
 buildPythonPackage rec {
   pname = "django-bootstrap3";
-  version = "25.2";
+  version = "25.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap3";
     tag = "v${version}";
-    hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo=";
+    hash = "sha256-OCr25Sc5fbL5ivrM2LpDAcTj8bPX4Q23Yj1j6jRG03U=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "uv-build.patch";
-      url = "https://github.com/zostera/django-bootstrap3/commit/5e1a86549e9607b8e2a9772a3a839fc81b9ae6c0.patch?full_index=1";
-      hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw=";
-    })
-  ];
-
   build-system = [ uv-build ];
 
   dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix
index b316af4b37e4..1e504aa7d2cb 100644
--- a/pkgs/development/python-modules/django-bootstrap4/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap4/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   uv-build,
@@ -20,24 +19,16 @@
 
 buildPythonPackage rec {
   pname = "django-bootstrap4";
-  version = "25.2";
+  version = "25.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap4";
     tag = "v${version}";
-    hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4=";
+    hash = "sha256-aayR9yXsC1Kt4PtlhhdnaPA5cqYuL4CV0UY1fvA/ntk=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "uv-build.patch";
-      url = "https://github.com/zostera/django-bootstrap4/commit/09b14bc9b70e7da92200c4bc014e2d3c597f0ea6.patch?full_index=1";
-      hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8=";
-    })
-  ];
-
   build-system = [ uv-build ];
 
   dependencies = [ beautifulsoup4 ];
diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix
index 02825509ebfe..10c3810b2269 100644
--- a/pkgs/development/python-modules/django-cryptography/default.nix
+++ b/pkgs/development/python-modules/django-cryptography/default.nix
@@ -5,45 +5,52 @@
   django-appconf,
   fetchFromGitHub,
   lib,
-  python,
-  pythonOlder,
+  pytestCheckHook,
+  pytest-django,
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "django-cryptography";
-  version = "1.1";
-  disabled = pythonOlder "3.7";
-  format = "pyproject";
+  version = "1.1-unstable-2024-02-16";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "georgemarshall";
     repo = "django-cryptography";
-    tag = version;
-    hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk=";
+    rev = "a5cde9beed707a14a2ef2f1f7f1fee172feb8b5e";
+    hash = "sha256-Xj/fw8EapsYvVbZPRQ81yeE9QpIQ1TIuk+ASOCGh/Uc=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace-fail "packages = django_cryptography" "packages = find:"
+  '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cryptography
     django
     django-appconf
   ];
 
-  patches = [
-    # See: https://github.com/georgemarshall/django-cryptography/pull/88
-    ./fix-setup-cfg.patch
-  ];
-
   pythonImportsCheck = [ "django_cryptography" ];
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} ./runtests.py
-    runHook postCheck
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
   '';
 
+  disabledTests = [
+    # self.assertEqual(len(errors), 1) - AssertionError: 0 != 1
+    "test_field_checks"
+  ];
+
   meta = {
     homepage = "https://github.com/georgemarshall/django-cryptography";
     description = "Set of primitives for performing cryptography in Django";
diff --git a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch b/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch
deleted file mode 100644
index 0cb7b9dba2aa..000000000000
--- a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 865b4c3..577d917 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -35,7 +35,10 @@ project_urls =
-     Documentation = https://django-cryptography.readthedocs.io
- 
- [options]
--packages = django_cryptography
-+packages =
-+    django_cryptography
-+    django_cryptography.core
-+    django_cryptography.utils
- python_requires = >=3.6
- include_package_data = True
- install_requires =
diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja/default.nix
similarity index 54%
rename from pkgs/development/python-modules/django-jinja2/default.nix
rename to pkgs/development/python-modules/django-jinja/default.nix
index 0bbaf6e0699d..20f88ca5ac2c 100644
--- a/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/pkgs/development/python-modules/django-jinja/default.nix
@@ -1,20 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   django,
   jinja2,
-  python,
+
+  # tests
+  pytest-django,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "django-jinja";
   version = "2.11.0";
-
-  disabled = pythonOlder "3.8";
-
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "niwinz";
@@ -23,17 +27,34 @@ buildPythonPackage rec {
     hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     django
     jinja2
   ];
 
-  checkPhase = ''
-    runHook preCheck
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-django
+  ];
 
-    ${python.interpreter} testing/runtests.py
+  preCheck = ''
+    pushd testing
+    export DJANGO_SETTINGS_MODULE=settings
+  '';
 
-    runHook postCheck
+  pytestFlagsArray = [
+    "testapp/tests.py"
+  ];
+
+  disabledTests = lib.optionals (lib.versionAtLeast django.version "5.2") [
+    # https://github.com/niwinz/django-jinja/issues/317
+    "test_autoscape_with_form_errors"
+  ];
+
+  postCheck = ''
+    popd
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix
index 53db6d735155..6d47d5a9ed89 100644
--- a/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/pkgs/development/python-modules/django-mailman3/default.nix
@@ -64,6 +64,7 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/mailman/django-mailman3";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ qyliss ];
-    broken = lib.versionAtLeast django-allauth.version "65.0.0";
+    broken =
+      lib.versionAtLeast django-allauth.version "65.0.0" || lib.versionAtLeast django.version "5.1";
   };
 }
diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix
index f0424882f277..758cc5fe3351 100644
--- a/pkgs/development/python-modules/django-ninja/default.nix
+++ b/pkgs/development/python-modules/django-ninja/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "django-ninja";
-  version = "1.4.3t";
+  version = "1.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vitalik";
     repo = "django-ninja";
     tag = "v${version}";
-    hash = "sha256-IiOj2fBuClHyIdn/r3XxKwO+DyrgahagUKrxp+YKZ4E=";
+    hash = "sha256-C54Y5Rmhk9trEeNhE+i3aeKcnoeUc6BqFbp3dzL9xjA=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
index 695da5c5470c..bd3f7ff6e52c 100644
--- a/pkgs/development/python-modules/django-rest-registration/default.nix
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -5,9 +5,10 @@
   djangorestframework,
   fetchFromGitHub,
   pytest-django,
+  pytest-xdist,
   pytestCheckHook,
   pythonOlder,
-  jwt,
+  pyjwt,
   setuptools,
 }:
 
@@ -35,16 +36,15 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-django
-    jwt
+    pytest-xdist
+    pyjwt
   ];
 
   pythonImportsCheck = [ "rest_registration" ];
 
   disabledTests = [
-    # This test fails on Python 3.10
+    # Failed: DID NOT RAISE <class 'rest_registration.utils.html.MLStripperParseFailed'>
     "test_convert_html_to_text_fails"
-    # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3
-    "test_coreapi_autoschema_success"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/django-scheduler/default.nix b/pkgs/development/python-modules/django-scheduler/default.nix
index e7d768fb91d0..8c82c0078ee4 100644
--- a/pkgs/development/python-modules/django-scheduler/default.nix
+++ b/pkgs/development/python-modules/django-scheduler/default.nix
@@ -30,9 +30,9 @@ buildPythonPackage rec {
 
   dependencies = [
     django
+    icalendar
     python-dateutil
     pytz
-    icalendar
   ];
 
   nativeCheckInputs = [
@@ -44,6 +44,24 @@ buildPythonPackage rec {
     export DJANGO_SETTINGS_MODULE=tests.settings
   '';
 
+  patches = [
+    # Remove in Django 5.1
+    # https://github.com/llazzaro/django-scheduler/pull/567
+    ./index_together.patch
+  ];
+
+  postPatch = ''
+    # Remove in Django 5.1
+    substituteInPlace tests/settings.py \
+      --replace-fail "SHA1PasswordHasher" "PBKDF2PasswordHasher"
+  '';
+
+  disabledTests = lib.optionals (lib.versionAtLeast django.version "5.1") [
+    # test_delete_event_authenticated_user - AssertionError: 302 != 200
+    "test_delete_event_authenticated_user"
+    "test_event_creation_authenticated_user"
+  ];
+
   pythonImportsCheck = [ "schedule" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/django-scheduler/index_together.patch b/pkgs/development/python-modules/django-scheduler/index_together.patch
new file mode 100644
index 000000000000..5777410eca67
--- /dev/null
+++ b/pkgs/development/python-modules/django-scheduler/index_together.patch
@@ -0,0 +1,65 @@
+From d691550163941db6dbcec2f347fee4d3941615a0 Mon Sep 17 00:00:00 2001
+From: Robin <robin@whoisearth.com>
+Date: Wed, 1 Jan 2025 10:31:44 -0500
+Subject: [PATCH 1/2] Update calendars.py
+
+Django 5.1 ... index_together deprecated.
+---
+ schedule/models/calendars.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/schedule/models/calendars.py b/schedule/models/calendars.py
+index 81f8a7de..d37097a7 100644
+--- a/schedule/models/calendars.py
++++ b/schedule/models/calendars.py
+@@ -231,7 +231,7 @@ class CalendarRelation(models.Model):
+     class Meta:
+         verbose_name = _("calendar relation")
+         verbose_name_plural = _("calendar relations")
+-        index_together = [("content_type", "object_id")]
++        indexes = [models.Index(fields=["content_type", "object_id"])]
+ 
+     def __str__(self):
+         return "{} - {}".format(self.calendar, self.content_object)
+
+From 768d2d3842ce6af8115741ef5758a72ab4659491 Mon Sep 17 00:00:00 2001
+From: Robin <robin@whoisearth.com>
+Date: Wed, 1 Jan 2025 10:32:56 -0500
+Subject: [PATCH 2/2] Update events.py
+
+Django 5.1 .... index_together deprecated
+---
+ schedule/models/events.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/schedule/models/events.py b/schedule/models/events.py
+index bf6fa5f1..bc9671c5 100644
+--- a/schedule/models/events.py
++++ b/schedule/models/events.py
+@@ -92,7 +92,7 @@ class Event(models.Model):
+     class Meta:
+         verbose_name = _("event")
+         verbose_name_plural = _("events")
+-        index_together = (("start", "end"),)
++        indexes = [models.Index(fields=["start", "end"])]
+ 
+     def __str__(self):
+         return gettext("%(title)s: %(start)s - %(end)s") % {
+@@ -571,7 +571,7 @@ class EventRelation(models.Model):
+     class Meta:
+         verbose_name = _("event relation")
+         verbose_name_plural = _("event relations")
+-        index_together = [("content_type", "object_id")]
++        indexes = [models.Index(fields=["content_type", "object_id"])]
+ 
+     def __str__(self):
+         return "{}({})-{}".format(
+@@ -594,7 +594,7 @@ class Occurrence(models.Model):
+     class Meta:
+         verbose_name = _("occurrence")
+         verbose_name_plural = _("occurrences")
+-        index_together = (("start", "end"),)
++        indexes = [models.Index(fields=["start", "end"])]
+ 
+     def __init__(self, *args, **kwargs):
+         super().__init__(*args, **kwargs)
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 342a30080432..37805cfe1e47 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,16 +45,16 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.26";
+  version = "4.2.27";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
 
   src = fetchFromGitHub {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-2NkkQcsY+BDvLGtvjYfGwgAK2S6LDbbcl7CwbwuF5a0=";
+    hash = "sha256-vdY85Ib2knRFLPmZZ6ojiD5R9diuvpVut1+nOVXSp0Y=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index 005df4abe306..9a5fa2ba4381 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
+  fetchpatch,
   pythonOlder,
   replaceVars,
 
@@ -63,6 +63,18 @@ buildPythonPackage rec {
     ./django_5_tests_pythonpath.patch
     # disable test that expects timezone issues
     ./django_5_disable_failing_tests.patch
+
+    # 3.14.1/3.13.10 comapt
+    (fetchpatch {
+      # https://github.com/django/django/pull/20390
+      url = "https://github.com/django/django/commit/5ca0f62213911a77dd4a62e843db7e420cc98b78.patch";
+      hash = "sha256-SpVdbS4S5wqvrrUOoZJ7d2cIbtmgI0mvxwwCveSA068=";
+    })
+    (fetchpatch {
+      # https://github.com/django/django/pull/20392
+      url = "https://github.com/django/django/commit/9cc231e8243091519f5d627cd02ee40bbb853ced.patch";
+      hash = "sha256-/aimmqxurMCCntraxOtybEq8qNgZgQWLD5Gxs/3pkIU=";
+    })
   ]
   ++ lib.optionals withGdal [
     (replaceVars ./django_5_set_geos_gdal_lib.patch {
diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix
index dc5b6c33bbe1..7c432645e7b9 100644
--- a/pkgs/development/python-modules/docstring-parser/default.nix
+++ b/pkgs/development/python-modules/docstring-parser/default.nix
@@ -2,26 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "docstring-parser";
-  version = "0.16";
+  version = "0.17.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "rr-";
     repo = "docstring_parser";
     tag = version;
-    hash = "sha256-xwV+mgCOC/MyCqGELkJVqQ3p2g2yw/Ieomc7k0HMXms=";
+    hash = "sha256-hR+i1HU/ZpN6I3a8k/Wv2OrXgB4ls/A5OHZRqxEZS78=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index 030da79204f7..57310f82d8c0 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   cmake,
   ninja,
   duckdb,
@@ -16,6 +15,7 @@
   psutil,
   pyarrow,
   pybind11,
+  pytz,
   scikit-build-core,
   setuptools-scm,
   pytest-reraise,
@@ -73,16 +73,11 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    # Note: ipython and adbc_driver_manager currently excluded despite inclusion in upstream
-    # https://github.com/duckdb/duckdb-python/blob/v1.4.0/pyproject.toml#L44-L52
     all = [
+      # FIXME package adbc_driver_manager
       ipython
       fsspec
       numpy
-    ]
-    ++ lib.optionals (pythonOlder "3.14") [
-      # https://github.com/duckdb/duckdb-python/blob/0ee500cfa35fc07bf81ed02e8ab6984ea1f665fd/pyproject.toml#L49-L51
-      # adbc_driver_manager noted for migration to duckdb C source
       pandas
       pyarrow
     ];
@@ -105,6 +100,7 @@ buildPythonPackage rec {
     psutil
     pytest-reraise
     pytestCheckHook
+    pytz
   ]
   ++ optional-dependencies.all;
 
diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 86730658f856..bcce7d3b5e6d 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "3.16.12";
+  version = "3.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc-data";
     tag = version;
-    hash = "sha256-eGicR+fWsgE2mSjhf/r96IBvXX4cLG/nmtt7Q2MCxkE=";
+    hash = "sha256-KDChfJ16tINpALtiisBn5t9hi3l6v03wVeMkukIecqs=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/dynaconf/default.nix b/pkgs/development/python-modules/dynaconf/default.nix
index 362c96457519..eaa43423ad3b 100644
--- a/pkgs/development/python-modules/dynaconf/default.nix
+++ b/pkgs/development/python-modules/dynaconf/default.nix
@@ -94,8 +94,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dynaconf" ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     description = "Dynamic configurator for Python Project";
     homepage = "https://github.com/dynaconf/dynaconf";
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index c409deabb149..0a6c9ef33736 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -2,24 +2,24 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "eradicate";
-  version = "3.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "3.0.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wemake-services";
     repo = "eradicate";
     tag = version;
-    hash = "sha256-V3g9qYM/TiOz83IMoUwu0CvFWBxB5Yk3Dy3G/Dz3vYw=";
+    hash = "sha256-D9V9PQ3HVmShmPgTInOJaVmujy1fQyQn6qYn/Pa0kMg=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "eradicate" ];
diff --git a/pkgs/development/python-modules/et-xmlfile/default.nix b/pkgs/development/python-modules/et-xmlfile/default.nix
index 5167f6064fd2..6f025cb9d6cd 100644
--- a/pkgs/development/python-modules/et-xmlfile/default.nix
+++ b/pkgs/development/python-modules/et-xmlfile/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
+  fetchpatch,
   lxml,
   pytestCheckHook,
   pythonOlder,
@@ -23,6 +24,14 @@ buildPythonPackage rec {
     hash = "sha256-JZ1fJ9o4/Z+9uSlaoq+pNpLSwl5Yv6BJCI1G7GOaQ1I=";
   };
 
+  patches = [
+    (fetchpatch {
+      # python 3.14 compat
+      url = "https://foss.heptapod.net/openpyxl/et_xmlfile/-/commit/73172a7ce6d819ce13e6706f9a1c6d50f1646dde.patch";
+      hash = "sha256-PMtzIGtXJ/vp0VRmBodvyaG/Ptn2DwrTTC1EyLSChHU=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/eval-type-backport/default.nix b/pkgs/development/python-modules/eval-type-backport/default.nix
index ab36c93c7773..2e27ee3370d3 100644
--- a/pkgs/development/python-modules/eval-type-backport/default.nix
+++ b/pkgs/development/python-modules/eval-type-backport/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "eval-type-backport";
-  version = "0.2.2";
+  version = "0.3.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = "eval_type_backport";
     tag = "v${version}";
-    hash = "sha256-r+JiPBcU/6li9R/CQP0CKoWJiMgky03GKrMIsmaSJEk=";
+    hash = "sha256-K+FrgRyxCbrKHcrUaHEJWlLp2i0xes3HwXPN9ucioZY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 1f411adefc66..4b84afbc6175 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -22,24 +22,24 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.40.0";
+  version = "0.40.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eventlet";
     repo = "eventlet";
     tag = version;
-    hash = "sha256-fzCN+idYQ97nuDVfYn6VYQFBaaMxmnjWzFrmn+Aj+u4=";
+    hash = "sha256-yieyNx91jvKoh02zDFIEFk70yf3I27DWiumqoOjtdzQ=";
   };
 
   pythonRelaxDeps = lib.optionals isPyPy [ "greenlet" ];
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dnspython
     greenlet
     six
@@ -78,7 +78,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "eventlet" ];
 
   meta = {
-    changelog = "https://github.com/eventlet/eventlet/blob/v${version}/NEWS";
+    changelog = "https://github.com/eventlet/eventlet/blob/${src.tag}/NEWS";
     description = "Concurrent networking library for Python";
     homepage = "https://github.com/eventlet/eventlet/";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 2e8cdbff1c70..a06c80e94365 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -31,6 +31,12 @@ buildPythonPackage rec {
 
   doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest
 
+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    # RecursionError not raised
+    "test_deep_split"
+    "test_deep_subgroup"
+  ];
+
   pythonImportsCheck = [ "exceptiongroup" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 840ee16d0b66..5d1e75b7d830 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pythonAtLeast,
   pythonOlder,
 
@@ -19,26 +18,16 @@
 
 buildPythonPackage rec {
   pname = "executing";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = "executing";
     rev = "v${version}";
-    hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g=";
+    hash = "sha256-UlXuXBW9TmJ0xG/0yMdx8EDQDSzVgtsgFJIj/O7pmio=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "pytest-8.4.1-compat.patch";
-      url = "https://github.com/alexmojaki/executing/commit/fae0dd2f4bd0e74b8a928e19407fd4167f4b2295.patch";
-      hash = "sha256-ccYBeP4yXf3U4sRyeGUYhLz7QHbXFiMviQ1n+AIVMdo=";
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
@@ -59,9 +48,6 @@ buildPythonPackage rec {
     # if the test runs fast enough. That makes the test flaky when
     # running on slow systems or cross- / emulated building
     "test_many_source_for_filename_calls"
-
-    # https://github.com/alexmojaki/executing/issues/91
-    "test_exception_catching"
   ];
 
   pythonImportsCheck = [ "executing" ];
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 10e7b59fde18..1ad50d73326c 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -8,6 +8,7 @@
   pdm-backend,
 
   # dependencies
+  annotated-doc,
   starlette,
   pydantic,
   typing-extensions,
@@ -18,6 +19,7 @@
   flask,
   inline-snapshot,
   passlib,
+  pwdlib,
   pyjwt,
   pytest-asyncio,
   pytestCheckHook,
@@ -41,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.116.1";
+  version = "0.121.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -50,7 +52,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = "fastapi";
     tag = version;
-    hash = "sha256-sd0SnaxuuF3Zaxx7rffn4ttBpRmWQoOtXln/amx9rII=";
+    hash = "sha256-uUUARIHY8VBoLfWfMvveapypqiB00cTTWpJ4fi9nvUo=";
   };
 
   build-system = [ pdm-backend ];
@@ -61,6 +63,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    annotated-doc
     starlette
     pydantic
     typing-extensions
@@ -103,6 +106,7 @@ buildPythonPackage rec {
     flask
     inline-snapshot
     passlib
+    pwdlib
     pyjwt
     pytestCheckHook
     pytest-asyncio
diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix
index 94c4fed846b0..478b9dcaee93 100644
--- a/pkgs/development/python-modules/fastcrc/default.nix
+++ b/pkgs/development/python-modules/fastcrc/default.nix
@@ -10,13 +10,13 @@
 }:
 let
   pname = "fastcrc";
-  version = "0.3.2";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "overcat";
     repo = "fastcrc";
     tag = "v${version}";
-    hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA=";
+    hash = "sha256-iBbYiF0y/3Cax4P9+/gKS6FUBqZ3BleCwnpItsVd7Ps=";
   };
 in
 buildPythonPackage {
@@ -32,7 +32,7 @@ buildPythonPackage {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU=";
+    hash = "sha256-VbS5xTqj+Flxxdg06MO34AZCVozlNgFvc+yKemEmCzs=";
   };
 
   pythonImportsCheck = [ "fastcrc" ];
diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix
index 29d6fc79c16d..b263f32ad06e 100644
--- a/pkgs/development/python-modules/files-to-prompt/default.nix
+++ b/pkgs/development/python-modules/files-to-prompt/default.nix
@@ -31,8 +31,6 @@ buildPythonPackage rec {
 
   disabledTests = [ "test_binary_file_warning" ];
 
-  versionCheckProgramArg = "--version";
-
   meta = {
     mainProgram = "files-to-prompt";
     description = "Concatenate a directory full of files into a single prompt for use with LLMs";
diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
index 7db322c17c39..99b7699ae935 100644
--- a/pkgs/development/python-modules/fmpy/default.nix
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -141,7 +141,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   passthru = {
     # From sundials, build only the CVODE solver. C.f.
diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index d86c905581a7..88735e65ad02 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "freezegun";
-  version = "1.5.4";
+  version = "1.5.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eYuTcv3U2QfzPotqWLxk5oLZ/6jUlM5g94AZfugfrtE=";
+    hash = "sha256-rHdCpsxsJaLDXpKS39VUuJe1F9LewmiRoujevyBcuUo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index abdce30f6e72..4f55ef6384bf 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -10,7 +10,7 @@
   psutil,
   pyftpdlib,
   pytestCheckHook,
-  pythonOlder,
+  pythonAtLeast,
   pytz,
   setuptools,
   six,
@@ -21,7 +21,8 @@ buildPythonPackage rec {
   version = "2.4.16";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  # https://github.com/PyFilesystem/pyfilesystem2/issues/596
+  disabled = pythonAtLeast "3.14";
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index 9143470c44b0..231c0b27f051 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "fsspec";
-  version = "2025.3.2";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "filesystem_spec";
     tag = version;
-    hash = "sha256-FsgDILnnr+WApoTv/y1zVFSeBNysvkizdKtMeRegbfI=";
+    hash = "sha256-rIn2m3lRhlJwkB54X4sRT9JH+e4pIIEt7dPjnknczjs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix
index 2bd51e80fa1c..75241018e2b0 100644
--- a/pkgs/development/python-modules/gb-io/default.nix
+++ b/pkgs/development/python-modules/gb-io/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "gb-io";
-  version = "0.3.6";
+  version = "0.3.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "althonos";
     repo = "gb-io.py";
     rev = "v${version}";
-    hash = "sha256-iLRXyiVji9q4C5YtBsTT9bklSueY9RlX7Kz4cu+hmpE=";
+    hash = "sha256-ArJTK6YcuyExIMBUYBxpr7TpKeVMF6Nk4ObAZLuOgJA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-miwCgZpaFVMaNJLUTYSGEkmg+uT7lbzJZnBa9yZqC8U=";
+    hash = "sha256-3mgvT8b4tpoUScs5yk6IbGBUJ/czu3XSdFXhfT/c5S8=";
   };
 
   sourceRoot = src.name;
diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix
index 681fb725d273..9372c189b5d3 100644
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "gcsfs";
-  version = "2025.3.2";
+  version = "2025.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "fsspec";
     repo = "gcsfs";
     tag = version;
-    hash = "sha256-aXBlj9ej3Ya7h4x/akl/iX6dDS/SgkkEsOQ2E9KmCDU=";
+    hash = "sha256-Co98M3zK839mIWhV1Sifyb9r0sy1BjX6stDIj/0ONYo=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
index 86680fc01f2e..4088d11c34b1 100644
--- a/pkgs/development/python-modules/geojson/default.nix
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -2,31 +2,22 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   setuptools,
   unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "geojson";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "geojson";
     tag = version;
-    hash = "sha256-OL+7ntgzpA63ALQ8whhKRePsKxcp81PLuU1bHJvxN9U=";
+    hash = "sha256-0p8FW9alcWCSdi66wanS/F9IgO714WIRQIXvg3f9op8=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "dont-fail-with-python-313.patch";
-      url = "https://github.com/jazzband/geojson/commit/c13afff339e6b78f442785cc95f0eb66ddab3e7b.patch?full_index=1";
-      hash = "sha256-xdz96vzTA+zblJtCvXIZe5p51xJGM5eB/HAtCXgy5JA=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "geojson" ];
diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index d0c1bb7260aa..ffa2cecf3973 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -4,29 +4,21 @@
   fetchFromGitHub,
   gevent,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "gipc";
-  version = "1.6.0";
+  version = "1.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "jgehrcke";
     repo = "gipc";
     tag = version;
-    hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y=";
+    hash = "sha256-P3soMA/EBMuhkXQsiLv9gnDBfo9XGosKnSMi+EZ0gaM=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [ gevent ];
diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 34144ff5a139..df9ed11f79c7 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -91,9 +91,15 @@ buildPythonPackage rec {
     "test_rsgi_ws_scope"
   ];
 
-  pythonImportsCheck = [ "granian" ];
+  # This is a measure of last resort. Granian tests fully lock up
+  # on shutdown in >90% of cases, which makes the whole thing
+  # impossible to build without restarting it double digits
+  # numbers of times. The issue has not been fully identified,
+  # and upstream claims it does not exist.
+  # FIXME: root cause and fix this.
+  doCheck = false;
 
-  versionCheckProgramArg = "--version";
+  pythonImportsCheck = [ "granian" ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index 8e45bdfd03ea..b4e5d3bf8cad 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   replaceVars,
   graphviz-nox,
   xdg-utils,
@@ -33,6 +34,11 @@ buildPythonPackage rec {
       graphviz = graphviz-nox;
       xdgutils = xdg-utils;
     })
+    (fetchpatch {
+      # python314 compat; https://github.com/xflr6/graphviz/pull/238
+      url = "https://github.com/xflr6/graphviz/commit/7e0fae6d28792a628a25cadd4ec1582c7351a7a3.patch";
+      hash = "sha256-cZhNsQFi30uFpPXbEJHQ9eol7g6pdv6w8kp1GxLTBD4=";
+    })
   ];
 
   # Fontconfig error: Cannot load default config file
diff --git a/pkgs/development/python-modules/graspologic-native/Cargo.lock b/pkgs/development/python-modules/graspologic-native/Cargo.lock
index e2133ee8c5d5..1dcb0bef624b 100644
--- a/pkgs/development/python-modules/graspologic-native/Cargo.lock
+++ b/pkgs/development/python-modules/graspologic-native/Cargo.lock
@@ -1,104 +1,99 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
-name = "android-tzdata"
-version = "0.1.1"
+name = "anstream"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
- "libc",
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "anstyle"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
- "winapi",
+ "utf8parse",
 ]
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "anstyle-query"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
 dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "cc"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets",
-]
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
+ "clap_builder",
 ]
 
+[[package]]
+name = "clap_builder"
+version = "4.5.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+
 [[package]]
 name = "cli"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "clap",
  "network_partitions",
@@ -107,16 +102,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
+name = "colorchoice"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
@@ -125,9 +120,8 @@ dependencies = [
 
 [[package]]
 name = "graspologic_native"
-version = "1.2.1"
+version = "1.2.5"
 dependencies = [
- "chrono",
  "network_partitions",
  "pyo3",
  "rand",
@@ -135,242 +129,153 @@ dependencies = [
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.1.19"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indoc"
-version = "0.3.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
 dependencies = [
- "indoc-impl",
- "proc-macro-hack",
+ "rustversion",
 ]
 
 [[package]]
-name = "indoc-impl"
-version = "0.3.6"
+name = "is_terminal_polyfill"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "unindent",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
-name = "lock_api"
-version = "0.4.12"
+name = "memoffset"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
- "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
 [[package]]
 name = "network_partitions"
 version = "0.1.0"
 dependencies = [
- "chrono",
  "rand",
  "rand_xorshift",
 ]
 
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
-name = "parking_lot"
-version = "0.11.2"
+name = "once_cell_polyfill"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
-name = "parking_lot_core"
-version = "0.8.6"
+name = "portable-atomic"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "paste"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "paste-impl"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
-dependencies = [
- "proc-macro-hack",
-]
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.15.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
+checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
 dependencies = [
  "cfg-if",
  "indoc",
  "libc",
- "parking_lot",
- "paste",
+ "memoffset",
+ "once_cell",
+ "portable-atomic",
  "pyo3-build-config",
+ "pyo3-ffi",
  "pyo3-macros",
  "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.15.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
+checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
 dependencies = [
  "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
 ]
 
 [[package]]
 name = "pyo3-macros"
-version = "0.15.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
+checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
 dependencies = [
+ "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.15.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
+checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
 dependencies = [
+ "heck",
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -415,37 +320,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.2.16"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -453,146 +343,57 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.69"
+name = "target-lexicon"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
-version = "0.1.11"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
 [[package]]
-name = "vec_map"
-version = "0.8.2"
+name = "utf8parse"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
+name = "windows-link"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
+name = "windows-sys"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.69",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.69",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.52.6"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
+ "windows-link",
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
@@ -605,48 +406,68 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.6"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/development/python-modules/graspologic-native/default.nix b/pkgs/development/python-modules/graspologic-native/default.nix
index dee882025222..e191f6dd0022 100644
--- a/pkgs/development/python-modules/graspologic-native/default.nix
+++ b/pkgs/development/python-modules/graspologic-native/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "graspologic-native";
-  version = "1.2.1";
+  version = "1.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "graspologic-org";
     repo = "graspologic-native";
     tag = version;
-    hash = "sha256-fgiBUzYBerYX59uj+I0Yret94vA+FpQK+MckskCBqj4=";
+    hash = "sha256-JIFg+JIxRKXgWLAGgOyKZTe2gXa8wZW5pEubTBLqwmQ=";
   };
 
   cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index e5826164a6a1..d119bdf1169f 100644
--- a/pkgs/development/python-modules/hatchling/default.nix
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "hatchling";
-  version = "1.27.0";
+  version = "1.28.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lxwpbZgZq7OBERL8UsepdRyNOBiY82Uzuxb5eR6UH9Y=";
+    hash = "sha256-TVCwKuzmiSuM0LPObILLIYWU0+xYNtvedb9BohqwBMg=";
   };
 
   # listed in backend/pyproject.toml
diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix
index fb6e80b44995..990ccacb4fbc 100644
--- a/pkgs/development/python-modules/html5lib/default.nix
+++ b/pkgs/development/python-modules/html5lib/default.nix
@@ -1,47 +1,48 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fetchpatch,
+  fetchFromGitHub,
+  setuptools,
   six,
   webencodings,
-  mock,
   pytest-expect,
   pytestCheckHook,
+  unstableGitUpdater,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "html5lib";
-  version = "1.1";
-  format = "setuptools";
+  version = "1.1-unstable-2024-02-21";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f";
+  src = fetchFromGitHub {
+    owner = "html5lib";
+    repo = "html5lib-python";
+    rev = "fd4f032bc090d44fb11a84b352dad7cbee0a4745";
+    hash = "sha256-Hyte1MEqlrD2enfunK1qtm3FJlUDqmhSyrCjo7VaBgA=";
   };
 
   patches = [
-    # Fix compatibility with pytest 6.
-    # Will be included in the next release after 1.1.
-    (fetchpatch {
-      url = "https://github.com/html5lib/html5lib-python/commit/2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch";
-      hash = "sha256-VGCeB6o2QO/skeCZs8XLPfgEYVOSRL8cCpG7ajbZWEs=";
-    })
+    # https://github.com/html5lib/html5lib-python/pull/583
+    ./python314-compat.patch
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     six
     webencodings
   ];
 
-  # latest release not compatible with pytest 6
-  doCheck = false;
   nativeCheckInputs = [
-    mock
     pytest-expect
     pytestCheckHook
   ];
 
+  passthru.updateScript = unstableGitUpdater {
+    branch = "master";
+  };
+
   meta = {
     homepage = "https://github.com/html5lib/html5lib-python";
     downloadPage = "https://github.com/html5lib/html5lib-python/releases";
diff --git a/pkgs/development/python-modules/html5lib/python314-compat.patch b/pkgs/development/python-modules/html5lib/python314-compat.patch
new file mode 100644
index 000000000000..5351032f1232
--- /dev/null
+++ b/pkgs/development/python-modules/html5lib/python314-compat.patch
@@ -0,0 +1,26 @@
+From 379f9476c2a5ee370cd7ec856ee9092cace88499 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 30 Oct 2024 15:44:40 +0100
+Subject: [PATCH] Avoid ast.Str on Python 3.8+
+
+It has been deprecated since Python 3.8 and was removed from Python 3.14+.
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 30ee0575..62272c18 100644
+--- a/setup.py
++++ b/setup.py
+@@ -93,8 +93,9 @@ def default_environment():
+         if (len(a.targets) == 1 and
+                 isinstance(a.targets[0], ast.Name) and
+                 a.targets[0].id == "__version__" and
+-                isinstance(a.value, ast.Str)):
+-            version = a.value.s
++                ((sys.version_info >= (3, 8) and isinstance(a.value, ast.Constant)) or
++                    isinstance(a.value, ast.Str))):
++            version = a.value.value if sys.version_info >= (3, 8) else a.value.s
+ 
+ setup(name='html5lib',
+       version=version,
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 3382c25bf625..f586d6deeab4 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -8,8 +8,6 @@
   hatch-fancy-pypi-readme,
   h11,
   h2,
-  pproxy,
-  pytest-asyncio,
   pytest-httpbin,
   pytest-trio,
   pytestCheckHook,
@@ -54,8 +52,6 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    pproxy
-    pytest-asyncio
     pytest-httpbin
     pytest-trio
     pytestCheckHook
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index dfe3b1127402..181bd6a2f676 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.136.9";
+  version = "6.145.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     tag = "hypothesis-python-${version}";
-    hash = "sha256-Q1wxIJwAYKZ0x6c85CJSGgcdKw9a3xFw8YpJROElSNU=";
+    hash = "sha256-xyUR3yY2tmF4LGhZRUlv6fdcfVyVWwukodA0WIW0bXU=";
   };
 
   # I tried to package sphinx-selective-exclude, but it throws
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index a5fcc3116566..e79db32270e4 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202512291";
+  version = "0.1.202512301";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-mxnPrl9INy/PgSc0M9qPDTvI5vtlvpLvbity5YWqDeg=";
+    hash = "sha256-IafnDDsOVzsQsBJb5QhUuwfbVixnoBWGHTAmETslefQ=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index dd15dca3079d..eb28003c170a 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -1,10 +1,10 @@
 {
   buildPythonPackage,
-  click,
   fetchFromGitHub,
+  hatchling,
   lib,
+  packaging,
   pythonOlder,
-  setuptools,
   tomli,
   twisted,
 }:
@@ -12,25 +12,19 @@
 let
   incremental = buildPythonPackage rec {
     pname = "incremental";
-    version = "24.7.2";
+    version = "24.11.0";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "twisted";
       repo = "incremental";
       tag = "incremental-${version}";
-      hash = "sha256-5MlIKUaBUwLTet23Rjd2Opf5e54LcHuZDowcGon0lOE=";
+      hash = "sha256-GkTCQYGrgCUzizSgKhWeqJ25pfaYA7eUJIHt0q/iO0E=";
     };
 
-    # From upstream's pyproject.toml:
-    # "Keep this aligned with the project dependencies."
-    build-system = dependencies;
+    build-system = [ hatchling ];
 
-    dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
-
-    optional-dependencies = {
-      scripts = [ click ];
-    };
+    dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
     # escape infinite recursion with twisted
     doCheck = false;
@@ -50,10 +44,11 @@ let
     pythonImportsCheck = [ "incremental" ];
 
     meta = {
-      changelog = "https://github.com/twisted/incremental/blob/${src.rev}/NEWS.rst";
+      changelog = "https://github.com/twisted/incremental/blob/${src.tag}/NEWS.rst";
       homepage = "https://github.com/twisted/incremental";
       description = "Small library that versions your Python projects";
       license = lib.licenses.mit;
+      mainProgram = "incremental";
       maintainers = with lib.maintainers; [ dotlambda ];
     };
   };
diff --git a/pkgs/development/python-modules/installer/cross.patch b/pkgs/development/python-modules/installer/cross.patch
new file mode 100644
index 000000000000..3e7f185f041d
--- /dev/null
+++ b/pkgs/development/python-modules/installer/cross.patch
@@ -0,0 +1,67 @@
+diff --git a/src/installer/__main__.py b/src/installer/__main__.py
+index 51014b9..45682d0 100644
+--- a/src/installer/__main__.py
++++ b/src/installer/__main__.py
+@@ -30,6 +30,13 @@ def _get_main_parser() -> argparse.ArgumentParser:
+         type=str,
+         help="override prefix to install packages to",
+     )
++    parser.add_argument(
++        "--executable",
++        metavar="path",
++        default=sys.executable,
++        type=str,
++        help="#! executable to install scripts with (default=sys.executable)",
++    )
+     parser.add_argument(
+         "--compile-bytecode",
+         action="append",
+@@ -86,7 +93,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
+     with WheelFile.open(args.wheel) as source:
+         destination = SchemeDictionaryDestination(
+             scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix),
+-            interpreter=sys.executable,
++            interpreter=args.executable,
+             script_kind=get_launcher_kind(),
+             bytecode_optimization_levels=bytecode_levels,
+             destdir=args.destdir,
+@@ -94,5 +101,6 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
+         installer.install(source, destination, {})
+ 
+ 
++
+ if __name__ == "__main__":  # pragma: no cover
+     _main(sys.argv[1:], "python -m installer")
+diff --git a/tests/test_main.py b/tests/test_main.py
+index 391a13d..d7b4192 100644
+--- a/tests/test_main.py
++++ b/tests/test_main.py
+@@ -53,6 +53,28 @@ def test_main_prefix(fancy_wheel, tmp_path):
+     }
+ 
+ 
++def test_main_executable(fancy_wheel, tmp_path):
++    destdir = tmp_path / "dest"
++
++    main(
++        [
++            str(fancy_wheel),
++            "-d",
++            str(destdir),
++            "--executable",
++            "/monty/python3.x",
++        ],
++        "python -m installer",
++    )
++
++    installed_scripts = destdir.rglob("bin/*")
++
++    for f in installed_scripts:
++        with f.open("rb") as fp:
++            shebang = fp.readline()
++            assert shebang == b"#!/monty/python3.x\n"
++
++
+ def test_main_no_pyc(fancy_wheel, tmp_path):
+     destdir = tmp_path / "dest"
+ 
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index 3d2069370eb4..17ba8a94749a 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -21,11 +21,17 @@ buildPythonPackage rec {
     hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
   };
 
-  patches = lib.optionals (pythonAtLeast "3.13") [
-    # Fix compatibility with Python 3.13
-    # https://github.com/pypa/installer/pull/201
-    ./python313-compat.patch
-  ];
+  patches =
+    lib.optionals (pythonAtLeast "3.13") [
+      # Fix compatibility with Python 3.13
+      # https://github.com/pypa/installer/pull/201
+      ./python313-compat.patch
+    ]
+    ++ [
+      # Add -m flag to installer to correctly support cross
+      # https://github.com/pypa/installer/pull/258
+      ./cross.patch
+    ];
 
   nativeBuildInputs = [ flit-core ];
 
diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index be5f60fd0287..77f77a7e47ad 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "invoke";
-  version = "2.2.0";
+  version = "2.2.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7my7EBrxqFnH/oTyomTAWQILDLf+NTX5QkMAq1aPa9U=";
+    hash = "sha256-UVv0m0pIkyt5sCRZA0jaIvOcSULf+ZGtH7i4uuob5wc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index bd0bd4544c10..f92475f19fe1 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -36,12 +36,16 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "9.5.0";
+  version = "9.7.0";
+  outputs = [
+    "out"
+    "man"
+  ];
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EpxEuUH+bZuC02/Hp8GBJ92x1vAvePhn9ALi463eMRM=";
+    hash = "sha256-X23ojJBaVmxqnWxACo/tVKY44fdUPReq4lURMyFrHk4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/j2lint/default.nix b/pkgs/development/python-modules/j2lint/default.nix
index bb777d5bb660..b8c82e86f471 100644
--- a/pkgs/development/python-modules/j2lint/default.nix
+++ b/pkgs/development/python-modules/j2lint/default.nix
@@ -32,7 +32,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     homepage = "https://github.com/aristanetworks/j2lint";
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 65ee7b942b3c..658a63c8ed85 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
+  pythonAtLeast,
   fetchFromGitHub,
 
   # build-system
@@ -21,8 +21,6 @@ buildPythonPackage rec {
   version = "0.19.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "davidhalter";
     repo = "jedi";
@@ -57,6 +55,20 @@ buildPythonPackage rec {
     "test_dict_completion"
   ];
 
+  disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
+    # Jedi.api.environment.InvalidPythonEnvironment: The python binary is potentially unsafe
+    "test/test_inference/test_sys_path.py::test_venv_and_pths"
+    "test/test_api/test_environment.py::test_create_environment_venv_path"
+    "test/test_api/test_environment.py::test_create_environment_executable"
+    # can't find system env nor venv
+    "test/test_api/test_environment.py::test_find_system_environments"
+    "test/test_api/test_environment.py::test_scanning_venvs"
+    # https://github.com/davidhalter/jedi/issues/2064
+    "test/test_api/test_interpreter.py::test_string_annotation"
+    # type repr mismatch: Union[Type, int] vs Type | int
+    "test/test_inference/test_mixed.py::test_compiled_signature_annotation_string"
+  ];
+
   meta = {
     description = "Autocompletion tool for Python that can be used for text editors";
     homepage = "https://github.com/davidhalter/jedi";
diff --git a/pkgs/development/python-modules/jellyfish/Cargo.lock b/pkgs/development/python-modules/jellyfish/Cargo.lock
index b8e248240923..47b4d56322d7 100644
--- a/pkgs/development/python-modules/jellyfish/Cargo.lock
+++ b/pkgs/development/python-modules/jellyfish/Cargo.lock
@@ -1,12 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -17,46 +17,63 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "cc"
+version = "1.2.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "csv"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938"
 dependencies = [
  "csv-core",
  "itoa",
  "ryu",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "csv-core"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.2.15"
+name = "find-msvc-tools"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "r-efi",
+ "wasip2",
 ]
 
 [[package]]
@@ -67,19 +84,22 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jellyfish"
-version = "1.1.2"
+version = "1.2.1"
 dependencies = [
  "ahash",
  "csv",
@@ -92,15 +112,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -122,32 +142,31 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "portable-atomic"
-version = "1.10.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -161,19 +180,19 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
+ "python3-dll-a",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -181,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -193,9 +212,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -205,34 +224,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.38"
+name = "python3-dll-a"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "ryu"
-version = "1.0.18"
+name = "r-efi"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
-name = "serde"
-version = "1.0.217"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[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.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -240,16 +280,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "smallvec"
-version = "1.13.2"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.95"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -258,15 +304,15 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "tinyvec"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -279,15 +325,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
 dependencies = [
  "tinyvec",
 ]
@@ -300,9 +346,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unindent"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
 [[package]]
 name = "version_check"
@@ -311,25 +357,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix
index 39a96abbe261..e442e9d87f9d 100644
--- a/pkgs/development/python-modules/jellyfish/default.nix
+++ b/pkgs/development/python-modules/jellyfish/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "jellyfish";
-  version = "1.1.2";
+  version = "1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jamesturk";
     repo = "jellyfish";
-    rev = version;
-    hash = "sha256-xInjoTXYgZuHyvyKm+N4PAwHozE5BOkxoYhRzZnPs3Q=";
+    rev = "v${version}";
+    hash = "sha256-jKz7FYzV66TUkJZfWDTy8GXmTZ6SU5jEdtkjYLDfS/8=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock
index 8d4e23c2c22b..b2a86580589f 100644
--- a/pkgs/development/python-modules/jiter/Cargo.lock
+++ b/pkgs/development/python-modules/jiter/Cargo.lock
@@ -17,9 +17,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -74,9 +74,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.41"
+version = "1.2.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -119,18 +119,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.50"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.50"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -270,7 +270,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "fuzz"
-version = "0.11.1"
+version = "0.12.0"
 dependencies = [
  "indexmap",
  "jiter",
@@ -343,13 +343,13 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -369,7 +369,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiter"
-version = "0.11.1"
+version = "0.12.0"
 dependencies = [
  "ahash",
  "bitvec",
@@ -387,7 +387,7 @@ dependencies = [
 
 [[package]]
 name = "jiter-python"
-version = "0.11.1"
+version = "0.12.0"
 dependencies = [
  "jiter",
  "pyo3",
@@ -405,9 +405,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -460,12 +460,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
-
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -563,23 +557,24 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e0f6df8eaa422d97d72edcd152e1451618fed47fabbdbd5a8864167b1d4aff7"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
  "indoc",
  "libc",
  "memoffset",
  "num-bigint",
+ "num-traits",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
@@ -590,9 +585,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
  "python3-dll-a",
  "target-lexicon",
@@ -600,9 +595,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -610,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -622,9 +617,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -644,9 +639,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -791,9 +786,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.108"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -824,9 +819,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
@@ -872,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -883,25 +878,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -909,31 +890,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix
index ce44681e80aa..5ee0d5846d89 100644
--- a/pkgs/development/python-modules/jiter/default.nix
+++ b/pkgs/development/python-modules/jiter/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "jiter";
-  version = "0.11.1";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "jiter";
     tag = "v${version}";
-    hash = "sha256-/OSLwqSy/CkAFv0hn1zED70MRsWV8/NTrSfqP7OSRFc=";
+    hash = "sha256-d87RUXKEmZXxVQZnAvjwRKSP6F3Z+kXxg/LdY2l9B+k=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 362fa5077ad9..a849ed0b91fd 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "joblib";
-  version = "1.5.1";
+  version = "1.5.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9PhuNR85/j0NMqnyw9ivHuTOwoWq/LJwA92lIFV2tEQ=";
+    hash = "sha256-P6pcOQVLLwPKVH2psvUv3mfAYkDDGFPzBq6pfxNke1U=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -53,11 +53,6 @@ buildPythonPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
-  ]
-  ++ lib.optionals (pythonAtLeast "3.12") [
-    # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478
-    "test_main_thread_renamed_no_warning"
-    "test_background_thread_parallelism"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
index ae7d77d47eda..41f803ad4ab9 100644
--- a/pkgs/development/python-modules/jupyter-server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pythonOlder,
   stdenv,
   buildPythonPackage,
   fetchPypi,
@@ -35,14 +34,13 @@
 
 buildPythonPackage rec {
   pname = "jupyter-server";
-  version = "2.16.0";
+  version = "2.17.0";
   pyproject = true;
-  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     pname = "jupyter_server";
     inherit version;
-    hash = "sha256-ZdS0T98ty73+CqGs5KhC1Kr3RqK3sWgTTVqu01Yht/Y=";
+    hash = "sha256-w46omFZpZMiItHcq4e1Y7KhFkuiCUdLPxNFx+B9+mdU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index b703b620eae2..cca87a91652d 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -138,7 +138,6 @@ buildPythonPackage rec {
     versionCheckHook
     virtualenv
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # Tries to install older versions through pip
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 3789ffb1311b..c886b68a480a 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -99,7 +99,6 @@ buildPythonPackage rec {
     # Tests that use a Jupyter notebook require $HOME to be writable
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   preCheck = ''
     substituteInPlace tests/functional/contents_manager/test_async_and_sync_contents_manager_are_in_sync.py \
diff --git a/pkgs/development/python-modules/keymap-drawer/default.nix b/pkgs/development/python-modules/keymap-drawer/default.nix
index fffc10aa8252..bece9396dd9f 100644
--- a/pkgs/development/python-modules/keymap-drawer/default.nix
+++ b/pkgs/development/python-modules/keymap-drawer/default.nix
@@ -59,7 +59,6 @@ buildPythonPackage {
   pythonImportsCheck = [ "keymap_drawer" ];
 
   versionCheckProgram = "${placeholder "out"}/bin/keymap";
-  versionCheckProgramArg = "--version";
 
   passthru.tests = callPackages ./tests {
     # Explicitly pass the correctly scoped package.
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 0aa328f53091..f08c690823ef 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -19,17 +19,21 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "25.6.0";
+  version = "25.7.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "keyring";
     tag = "v${version}";
-    hash = "sha256-qu9HAlZMLlIVs8c9ClzWUljezhrt88gu1kouklMNxMY=";
+    hash = "sha256-v9s28vwx/5DJRa3dQyS/mdZppfvFcfBtafjBRi2c1oQ=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"coherent.licensed",' ""
+  '';
+
   build-system = [ setuptools-scm ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/kornia-rs/Cargo.lock b/pkgs/development/python-modules/kornia-rs/Cargo.lock
index 66a5b60cfafc..78401674a000 100644
--- a/pkgs/development/python-modules/kornia-rs/Cargo.lock
+++ b/pkgs/development/python-modules/kornia-rs/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arbitrary"
@@ -60,9 +60,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "av1-grain"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8"
+checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8"
 dependencies = [
  "anyhow",
  "arrayvec",
@@ -89,18 +89,23 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
 
 [[package]]
 name = "bincode"
-version = "1.3.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
 dependencies = [
+ "bincode_derive",
  "serde",
+ "unty",
 ]
 
 [[package]]
-name = "bit_field"
-version = "0.10.3"
+name = "bincode_derive"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6"
+checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
+dependencies = [
+ "virtue",
+]
 
 [[package]]
 name = "bitflags"
@@ -110,9 +115,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.3"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bitstream-io"
@@ -143,18 +148,18 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.2"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.10.1"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29"
+checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,10 +180,11 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.34"
+version = "1.2.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -196,15 +202,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
-
-[[package]]
-name = "circular-buffer"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bdce1da528cadbac4654b5632bfcd8c6c63e25b1d42cea919a95958790b51d"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cmake"
@@ -227,12 +227,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e8f1e641542c07631228b1e0dc04b69ae3c1d58ef65d5691a439711d805c698"
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -284,9 +278,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "typenum",
@@ -316,15 +310,15 @@ checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82"
 
 [[package]]
 name = "doc-comment"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9"
 
 [[package]]
 name = "document-features"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
 dependencies = [
  "litrs",
 ]
@@ -340,13 +334,20 @@ dependencies = [
 
 [[package]]
 name = "dyn-stack"
-version = "0.13.0"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490bd48eb68fffcfed519b4edbfd82c69cbe741d175b84f0e0cbe8c57cbe0bdd"
+checksum = "1c4713e43e2886ba72b8271aa66c93d722116acf7a75555cce11dcde84388fe8"
 dependencies = [
  "bytemuck",
+ "dyn-stack-macros",
 ]
 
+[[package]]
+name = "dyn-stack-macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d926b4d407d372f141f93bb444696142c29d32962ccbd3531117cf3aa0bfa9"
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -411,26 +412,11 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
-[[package]]
-name = "exr"
-version = "1.73.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
-dependencies = [
- "bit_field",
- "half",
- "lebe",
- "miniz_oxide",
- "rayon-core",
- "smallvec",
- "zune-inflate",
-]
-
 [[package]]
 name = "faer"
-version = "0.20.2"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2b19b8c3570ea226e507fe3dbae2aa9d7e0f16676abd35ea3adeeb9f90f7b5d"
+checksum = "c23c499be0d3ad8167878497cd114ec5ff356556652c651eb5f209a1579032d2"
 dependencies = [
  "bytemuck",
  "coe-rs",
@@ -472,16 +458,39 @@ dependencies = [
 
 [[package]]
 name = "fast_image_resize"
-version = "5.2.2"
+version = "5.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80af28351fb3cb22f67880126f65034892e7b414d3be3d6b0aa85d79ecf0c"
+checksum = "d372ab3252d8f162d858d675a3d88a8c33ba24a6238837c50c8851911c7e89cd"
 dependencies = [
+ "bytemuck",
  "cfg-if",
  "document-features",
+ "image",
  "num-traits",
+ "rayon",
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "fax"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab"
+dependencies = [
+ "fax_derive",
+]
+
+[[package]]
+name = "fax_derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -491,6 +500,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
 [[package]]
 name = "fixed"
 version = "1.29.0"
@@ -506,9 +521,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -526,7 +541,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab96b703d31950f1aeddded248bc95543c9efc7ac9c4a21fda8703a83ee35451"
 dependencies = [
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "gemm-c32",
  "gemm-c64",
  "gemm-common",
@@ -546,7 +561,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6db9fd9f40421d00eea9dd0770045a5603b8d684654816637732463f4073847"
 dependencies = [
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "gemm-common",
  "num-complex",
  "num-traits",
@@ -561,7 +576,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfcad8a3d35a43758330b635d02edad980c1e143dc2f21e6fd25f9e4eada8edf"
 dependencies = [
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "gemm-common",
  "num-complex",
  "num-traits",
@@ -577,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a352d4a69cbe938b9e2a9cb7a3a63b7e72f9349174a2752a558a8a563510d0f3"
 dependencies = [
  "bytemuck",
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "half",
  "libm",
  "num-complex",
@@ -597,7 +612,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cff95ae3259432f3c3410eaa919033cd03791d81cebd18018393dc147952e109"
 dependencies = [
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "gemm-common",
  "gemm-f32",
  "half",
@@ -615,7 +630,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc8d3d4385393304f407392f754cd2dc4b315d05063f62cf09f47b58de276864"
 dependencies = [
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "gemm-common",
  "num-complex",
  "num-traits",
@@ -630,7 +645,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35b2a4f76ce4b8b16eadc11ccf2e083252d8237c1b589558a49b0183545015bd"
 dependencies = [
- "dyn-stack 0.13.0",
+ "dyn-stack 0.13.2",
  "gemm-common",
  "num-complex",
  "num-traits",
@@ -677,48 +692,39 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.3+wasi-0.2.4",
-]
-
-[[package]]
-name = "gif"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
-dependencies = [
- "color_quant",
- "weezl",
+ "wasip2",
 ]
 
 [[package]]
 name = "half"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
  "bytemuck",
  "cfg-if",
  "crunchy",
  "num-traits",
+ "zerocopy",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.5"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
 [[package]]
 name = "heck"
@@ -728,48 +734,29 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "image"
-version = "0.25.6"
+version = "0.25.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
+checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
- "color_quant",
- "exr",
- "gif",
- "image-webp",
+ "moxcms",
  "num-traits",
- "png",
- "qoi",
  "ravif",
  "rayon",
- "rgb",
- "tiff",
- "zune-core",
- "zune-jpeg",
-]
-
-[[package]]
-name = "image-webp"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
-dependencies = [
- "byteorder-lite",
- "quick-error",
 ]
 
 [[package]]
 name = "imgref"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
+checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8"
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -777,9 +764,12 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "interpolate_name"
@@ -807,16 +797,10 @@ version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
-
 [[package]]
 name = "jpeg-encoder"
 version = "0.6.1"
@@ -846,57 +830,56 @@ dependencies = [
 
 [[package]]
 name = "kornia-3d"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "bincode",
  "faer",
  "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "kornia-icp"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "faer",
  "kiddo",
  "kornia-3d",
  "log",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "kornia-image"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "kornia-tensor",
  "num-traits",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "kornia-imgproc"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "fast_image_resize",
  "kornia-image",
  "kornia-tensor",
  "num-traits",
  "rayon",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "kornia-io"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
- "circular-buffer",
- "image",
  "jpeg-encoder",
  "kornia-image",
+ "kornia-tensor",
  "log",
  "png",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tiff",
  "turbojpeg",
  "zune-jpeg",
@@ -904,7 +887,7 @@ dependencies = [
 
 [[package]]
 name = "kornia-py"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "kornia-3d",
  "kornia-icp",
@@ -917,10 +900,10 @@ dependencies = [
 
 [[package]]
 name = "kornia-tensor"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "num-traits",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -929,17 +912,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lebe"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
-
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -959,15 +936,15 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "litrs"
-version = "0.4.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "loop9"
@@ -1016,9 +993,9 @@ dependencies = [
 
 [[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 = "memoffset"
@@ -1029,12 +1006,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1045,6 +1016,16 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "moxcms"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbdd3d7436f8b5e892b8b7ea114271ff0fa00bc5acae845d53b07d498616ef6"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
 [[package]]
 name = "nano-gemm"
 version = "0.1.3"
@@ -1138,12 +1119,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nom"
-version = "7.1.3"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
 dependencies = [
  "memchr",
- "minimal-lexical",
 ]
 
 [[package]]
@@ -1165,11 +1145,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1236,9 +1216,9 @@ dependencies = [
 
 [[package]]
 name = "numpy"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cfbf3f0feededcaa4d289fe3079b03659e85c5b5a177f4ba6fb01ab4fb3e39"
+checksum = "9b2dba356160b54f5371b550575b78130a54718b4c6e46b3f33a6da74a27e78b"
 dependencies = [
  "libc",
  "ndarray",
@@ -1258,9 +1238,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "ordered-float"
-version = "5.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
+checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d"
 dependencies = [
  "num-traits",
 ]
@@ -1273,20 +1253,19 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pest"
-version = "2.8.1"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
+checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4"
 dependencies = [
  "memchr",
- "thiserror 2.0.16",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.8.1"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc"
+checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1294,9 +1273,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.1"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966"
+checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843"
 dependencies = [
  "pest",
  "pest_meta",
@@ -1307,9 +1286,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.8.1"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5"
+checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a"
 dependencies = [
  "pest",
  "sha2",
@@ -1366,9 +1345,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -1418,6 +1397,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "pxfm"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "py_literal"
 version = "0.4.0"
@@ -1433,11 +1421,10 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.24.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -1451,19 +1438,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.24.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
- "target-lexicon 0.13.2",
+ "target-lexicon 0.13.3",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.24.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1471,9 +1457,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.24.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1483,9 +1469,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1494,15 +1480,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "qoi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "quick-error"
 version = "2.0.1"
@@ -1511,9 +1488,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -1616,11 +1593,11 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "11.5.0"
+version = "11.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -1690,18 +1667,28 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
 
 [[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",
+ "serde_derive",
+]
+
+[[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",
@@ -1766,15 +1753,15 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "sorted-vec"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee66d25213bcbd4feb55704c0c8eee3f95d022c693dab42d796e1b8f23666d9a"
+checksum = "19f58d7b0190c7f12df7e8be6b79767a0836059159811b869d5ab55721fe14d0"
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1787,7 +1774,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.10.0",
  "byteorder",
  "enum-as-inner",
  "libc",
@@ -1816,9 +1803,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "thiserror"
@@ -1831,11 +1818,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.16",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -1851,9 +1838,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1871,13 +1858,16 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.9.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
 dependencies = [
+ "fax",
  "flate2",
- "jpeg-decoder",
+ "half",
+ "quick-error",
  "weezl",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -1997,9 +1987,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "ucd-trie"
@@ -2009,9 +1999,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
@@ -2019,6 +2009,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
+[[package]]
+name = "unty"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
+
 [[package]]
 name = "v_frame"
 version = "0.3.9"
@@ -2038,9 +2034,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "version-compare"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
 
 [[package]]
 name = "version_check"
@@ -2048,6 +2044,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "virtue"
+version = "0.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -2065,45 +2067,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.3+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2111,39 +2100,39 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "weezl"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2155,7 +2144,7 @@ dependencies = [
  "windows-collections",
  "windows-core",
  "windows-future",
- "windows-link",
+ "windows-link 0.1.3",
  "windows-numerics",
 ]
 
@@ -2176,7 +2165,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link",
+ "windows-link 0.1.3",
  "windows-result",
  "windows-strings",
 ]
@@ -2188,15 +2177,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core",
- "windows-link",
+ "windows-link 0.1.3",
  "windows-threading",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2205,9 +2194,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2220,6 +2209,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-numerics"
 version = "0.2.0"
@@ -2227,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
  "windows-core",
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -2236,7 +2231,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -2245,58 +2240,16 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.3",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
-dependencies = [
- "windows-link",
- "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 0.2.1",
 ]
 
 [[package]]
@@ -2305,105 +2258,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
 [[package]]
 name = "winnow"
 version = "0.7.13"
@@ -2415,24 +2272,24 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2445,20 +2302,11 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
-[[package]]
-name = "zune-inflate"
-version = "0.2.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
-dependencies = [
- "simd-adler32",
-]
-
 [[package]]
 name = "zune-jpeg"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089"
+checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
 dependencies = [
  "zune-core",
 ]
diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix
index ae318af5a3ca..86de2432268f 100644
--- a/pkgs/development/python-modules/kornia-rs/default.nix
+++ b/pkgs/development/python-modules/kornia-rs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "kornia-rs";
-  version = "0.1.9";
+  version = "0.1.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kornia";
     repo = "kornia-rs";
     tag = "v${version}";
-    hash = "sha256-0Id1Iyd/xyqSqFvg/TXnlX1DgMUWuMS9KbtDXduwU+Y=";
+    hash = "sha256-rC5NqyQah3D4tGLefS4cSIXA3+gQ0+4RNcXOcEYxryg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index ecb9fa3e0a28..de50526c0ae0 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -3,14 +3,12 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  callPackage,
   cargo,
   hypothesmith,
+  isPy313,
   libcst,
   libiconv,
   pytestCheckHook,
-  python,
-  pythonOlder,
   pyyaml,
   pyyaml-ft,
   rustPlatform,
@@ -58,7 +56,7 @@ buildPythonPackage rec {
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   dependencies = [
-    (if pythonOlder "3.13" then pyyaml else pyyaml-ft)
+    (if isPy313 then pyyaml-ft else pyyaml)
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 22d760edd6a5..e75482ac7cee 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -3,24 +3,20 @@
   stdenv,
   buildPythonPackage,
   colorama,
-  exceptiongroup,
   fetchFromGitHub,
+  fetchpatch,
   flit-core,
   freezegun,
   pytest-mypy-plugins,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "loguru";
   version = "0.7.3";
-
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Delgan";
     repo = "loguru";
@@ -28,6 +24,14 @@ buildPythonPackage rec {
     hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4=";
   };
 
+  patches = [
+    (fetchpatch {
+      # python 3.14 compat
+      url = "https://github.com/Delgan/loguru/commit/84023e2bd8339de95250470f422f096edcb8f7b7.patch";
+      hash = "sha256-yXRSwI7Yjm1myL20EoU/jVuEdadmbMlCpP19YKn1MAU=";
+    })
+  ];
+
   build-system = [ flit-core ];
 
   nativeCheckInputs = [
@@ -36,8 +40,7 @@ buildPythonPackage rec {
     colorama
     freezegun
     pytest-mypy-plugins
-  ]
-  ++ lib.optional (pythonOlder "3.10") exceptiongroup;
+  ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
 
diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index 2384cf0b5e51..a9f3869d284e 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -4,31 +4,26 @@
   fetchFromGitHub,
   pkgconfig,
   psutil,
+  pytest-cov-stub,
   pytestCheckHook,
   python,
-  pythonOlder,
   setuptools,
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "lz4";
-  version = "4.4.4";
+  version = "4.4.4-unstable-2025-10-21";
   pyproject = true;
 
-  disabled = pythonOlder "3.5";
-
-  # get full repository in order to run tests
   src = fetchFromGitHub {
     owner = "python-lz4";
     repo = "python-lz4";
-    tag = "v${version}";
-    hash = "sha256-RoM2U47T5WLepJlbJhJAeqKRP8Zf3twndqmMSViI5Z8=";
+    rev = "59b2d8176072bdee50d38cc68ec65c33b928a980";
+    hash = "sha256-2D30n5j5r4+gcrjEXPu+WpZ4QsugCPyC1xCZuJIPcI0=";
   };
 
-  postPatch = ''
-    sed -i '/pytest-cov/d' setup.py
-  '';
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.4";
 
   build-system = [
     pkgconfig
@@ -45,6 +40,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     psutil
+    pytest-cov-stub
     pytestCheckHook
   ];
 
@@ -60,7 +56,6 @@ buildPythonPackage rec {
   meta = {
     description = "LZ4 Bindings for Python";
     homepage = "https://github.com/python-lz4/python-lz4";
-    changelog = "https://github.com/python-lz4/python-lz4/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index e3fe76eddce3..3e5cdfc308b7 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -263,7 +263,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   # about 55 of ~600 tests failing mostly due to demand for display
   disabledTests = import ./failing_tests.nix;
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 24e51364669b..9cea49c6c646 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -81,7 +81,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps";
diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix
index 259813eb918e..23854dc060bc 100644
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/pkgs/development/python-modules/markdown/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "markdown";
-  version = "3.9.0";
+  version = "3.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Python-Markdown";
     repo = "markdown";
     tag = version;
-    hash = "sha256-wrDS7ajP031YKejD9Y83xg5bMl8ihBMSVZGov+1Y7Kg=";
+    hash = "sha256-GqYmlSNCJ8qLz4uJBJJAkiMwa+Q96f1S0jPuHrHwqpE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
index bb2a4231dc7f..c1b33f6e239c 100644
--- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix
+++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
@@ -35,6 +35,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "marshmallow" ];
 
   meta = {
+    # https://github.com/Bachmann1234/marshmallow-polyfield/issues/45
+    broken = true;
     description = "Extension to Marshmallow to allow for polymorphic fields";
     homepage = "https://github.com/Bachmann1234/marshmallow-polyfield";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 4c065eb081de..a5aa9ee8713d 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -3,27 +3,38 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonOlder,
+
+  # build-system
   flit-core,
-  packaging,
+
+  # dependencies
+  backports-datetime-fromisoformat,
+  typing-extensions,
+
+  # tests
   pytestCheckHook,
   simplejson,
 }:
 
 buildPythonPackage rec {
   pname = "marshmallow";
-  version = "3.26.1";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "marshmallow";
     tag = version;
-    hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38=";
+    hash = "sha256-h1wkeJbJY/0K3Vpxz+Bc2/2PDWgOMqropG0XMBzAOq8=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [ packaging ];
+  dependencies = lib.optionals (pythonOlder "3.11") [
+    backports-datetime-fromisoformat
+    typing-extensions
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index f75b9ba52faf..60db42babc15 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -101,7 +101,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Handy tool to trash your metadata";
diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index c561b1b914b3..7d3c239b1a27 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -52,8 +52,6 @@ buildPythonPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index a1561ed3d4f0..1a0519f1e2ed 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -15,6 +15,7 @@
   jsonschema,
   pydantic,
   pydantic-settings,
+  pyjwt,
   python-multipart,
   sse-starlette,
   starlette,
@@ -41,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.15.0";
+  version = "1.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-pvbrNkGfQaZX95JZyYXuuH2gMzWouuGXjaDxPyKW0Zw=";
+    hash = "sha256-fSQCvKaNMeCzguM2tcTJJlAeZQmzSJmbfEK35D8pQcs=";
   };
 
   postPatch = lib.optionalString stdenv.buildPlatform.isDarwin ''
@@ -79,6 +80,7 @@ buildPythonPackage rec {
     jsonschema
     pydantic
     pydantic-settings
+    pyjwt
     python-multipart
     sse-starlette
     starlette
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 0c825469ed6e..7b465d78510d 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # AssertionError CLI exists with non-zero error code
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index 2e4f36b1dc16..08be1bf506e2 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -68,6 +68,8 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    # not updated to django 5.x
+    broken = lib.versionAtLeast django.version "5";
     description = "Content management platform built using the Django framework";
     mainProgram = "mezzanine-project";
     longDescription = ''
diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix
index c334aef04cd8..eb48339a27f0 100644
--- a/pkgs/development/python-modules/mike/default.nix
+++ b/pkgs/development/python-modules/mike/default.nix
@@ -46,7 +46,6 @@ buildPythonPackage rec {
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch b/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch
new file mode 100644
index 000000000000..5cfabfd9ec26
--- /dev/null
+++ b/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch
@@ -0,0 +1,25 @@
+diff --git a/mkdocs/__main__.py b/mkdocs/__main__.py
+index c8d40969..3432ff40 100644
+--- a/mkdocs/__main__.py
++++ b/mkdocs/__main__.py
+@@ -253,8 +253,8 @@ def cli():
+ @cli.command(name="serve")
+ @click.option('-a', '--dev-addr', help=dev_addr_help, metavar='<IP:PORT>')
+ @click.option('-o', '--open', 'open_in_browser', help=serve_open_help, is_flag=True)
+-@click.option('--no-livereload', 'livereload', flag_value=False, help=no_reload_help)
+-@click.option('--livereload', 'livereload', flag_value=True, default=True, hidden=True)
++@click.option('--no-livereload', is_flag=True, help=no_reload_help)
++@click.option('--livereload', is_flag=True, hidden=True)
+ @click.option('--dirtyreload', 'build_type', flag_value='dirty', hidden=True)
+ @click.option('--dirty', 'build_type', flag_value='dirty', help=serve_dirty_help)
+ @click.option('-c', '--clean', 'build_type', flag_value='clean', help=serve_clean_help)
+@@ -268,6 +268,9 @@ def serve_command(**kwargs):
+     """Run the builtin development server."""
+     from mkdocs.commands import serve
+ 
++    kwargs['livereload'] = kwargs['livereload'] or not kwargs['no_livereload']
++    del kwargs['no_livereload']
++
+     _enable_warnings()
+     serve.serve(**kwargs)
+ 
diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix
index b90abe5ad3b3..8f822f09b579 100644
--- a/pkgs/development/python-modules/mkdocs/default.nix
+++ b/pkgs/development/python-modules/mkdocs/default.nix
@@ -48,6 +48,11 @@ buildPythonPackage rec {
     hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak=";
   };
 
+  patches = [
+    # https://github.com/mkdocs/mkdocs/pull/4065
+    ./click-8.3.0-compat.patch
+  ];
+
   build-system = [
     hatchling
     # babel, setuptools required as "build hooks"
diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index e9f4650acb18..c013377c3143 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -47,7 +47,6 @@ buildPythonPackage rec {
     rasterio
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # AssertionError CLI exists with non-zero error code
diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix
index 6cfaac43bcfd..66700ea2fae8 100644
--- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix
@@ -59,8 +59,6 @@ buildPythonPackage rec {
     versionCheckHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   pythonImportsCheck = [ "mypy_boto3_builder" ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5bf1d2a82b4d..24ec1069e042 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -338,8 +338,8 @@ in
       "sha256-zMNP1LXKSynkfJSLn19sz5UoT8LiswD5qSZCn1y5GsA=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.42.14"
-      "sha256-IG24SYEczO1XbjusR1zgHLGtMF3k43OXEsZKh7aShrI=";
+    buildMypyBoto3Package "connect" "1.42.18"
+      "sha256-/BfqYdUJygoVgTkDK20q72ihFPNmvrqIymzjj+48pns=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.42.3"
@@ -1073,8 +1073,8 @@ in
       "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
 
   mypy-boto3-quicksight =
-    buildMypyBoto3Package "quicksight" "1.42.8"
-      "sha256-gzUtWuBpdWN+nRaJmsrs4EKzsTeRgiDnacEs8yG9PjQ=";
+    buildMypyBoto3Package "quicksight" "1.42.18"
+      "sha256-6gYCSoGVbd2hw/NktDiLo1QlOO23LrwlaJ3gm30gpDQ=";
 
   mypy-boto3-ram =
     buildMypyBoto3Package "ram" "1.42.3"
diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 7e900e6b6ee7..652c276534b7 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
+  pythonAtLeast,
   setuptools,
   setuptools-scm,
 }:
@@ -13,8 +13,6 @@ buildPythonPackage rec {
   version = "1.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "erdewit";
     repo = "nest_asyncio";
@@ -22,13 +20,17 @@ buildPythonPackage rec {
     hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
+    "tests/nest_test.py::NestTest::test_timeout"
+  ];
+
   pythonImportsCheck = [ "nest_asyncio" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix
index 67a4295c7b2f..1fc3c27e27a5 100644
--- a/pkgs/development/python-modules/nh3/default.nix
+++ b/pkgs/development/python-modules/nh3/default.nix
@@ -9,12 +9,12 @@
 }:
 let
   pname = "nh3";
-  version = "0.2.21";
+  version = "0.3.2";
   src = fetchFromGitHub {
     owner = "messense";
     repo = "nh3";
     rev = "v${version}";
-    hash = "sha256-DskjcKjdz1HmKzmA568zRCjh4UK1/LBD5cSIu7Rfwok=";
+    hash = "sha256-2D8ZLmVRA+SuMqeUsSXyY+0zlgqp7TSRyQuJMjmRVFk=";
   };
 in
 buildPythonPackage {
@@ -24,7 +24,7 @@ buildPythonPackage {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-1Ytca/GiHidR8JOcz+DydN6N/iguLchbP8Wnrd/0NTk=";
+    hash = "sha256-dN6zdwMGh8stgDuGiO+T/ZZ3/3P9Wu/gUw5gHJ1pPGA=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index 70f5a96196be..3f41e2b621b2 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -17,23 +17,25 @@
 
   # optional-dependencies
   crc32c,
+  pyzstd,
 
   # tests
   msgpack,
   pytestCheckHook,
   importlib-metadata,
+  zstd,
 }:
 
 buildPythonPackage rec {
   pname = "numcodecs";
-  version = "0.16.1";
+  version = "0.16.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xH8g1lZFRWjGtGl84CCB5ru1EvGYc4xqVvr+gCnJf7E=";
+    hash = "sha256-U9cFhl+q8KeSfJc683d1MgAcj7tlPeEZwehEYIYU15k=";
   };
 
   build-system = [
@@ -51,6 +53,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     crc32c = [ crc32c ];
     msgpack = [ msgpack ];
+    pyzstd = [ pyzstd ];
     # zfpy = [ zfpy ];
   };
 
@@ -61,6 +64,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     importlib-metadata
+    zstd
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 7bbd7781cb83..778bcdbc6f21 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   python,
   numpy_2,
   pythonAtLeast,
@@ -60,7 +61,7 @@ let
 in
 buildPythonPackage rec {
   pname = "numpy";
-  version = "2.3.4";
+  version = "2.3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -70,15 +71,28 @@ buildPythonPackage rec {
     repo = "numpy";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-MfL7UQeSuxJIEQzY/0LIuScyBCilINt8e+zAeUNPmH0=";
+    hash = "sha256-CMgJmsjPLgMCWN2iJk0OzcKIlnRRcayrTAns51S4B6k=";
   };
 
-  patches = lib.optionals python.hasDistutilsCxxPatch [
-    # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
-    # Patching of numpy.distutils is needed to prevent it from undoing the
-    # patch to distutils.
-    ./numpy-distutils-C++.patch
-  ];
+  patches =
+    lib.optionals python.hasDistutilsCxxPatch [
+      # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
+      # Patching of numpy.distutils is needed to prevent it from undoing the
+      # patch to distutils.
+      ./numpy-distutils-C++.patch
+    ]
+    ++
+      lib.optionals
+        (pythonAtLeast "3.14" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
+        [
+          # don't assert RecursionError in monster dtype test
+          # see https://github.com/numpy/numpy/pull/30375
+          (fetchpatch2 {
+            url = "https://github.com/numpy/numpy/commit/eeaf04662e07cc8e2041f3e25bbd3698949a0c02.patch?full_index=1";
+            excludes = [ ".github/workflows/macos.yml" ];
+            hash = "sha256-bLPLExlKnX18MXhbZxzCHniaAE0yTSyK9WuQyFyYHOI=";
+          })
+        ];
 
   postPatch = ''
     # remove needless reference to full Python path stored in built wheel
diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index 7adf333d2f28..61517a7a5ab7 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -40,6 +40,13 @@ buildPythonPackage rec {
     hash = "sha256-Q7Z6bq8TztNm2QLL7g23rOGnXVfiTDjquHAhcSWYlC4=";
   };
 
+  postPatch = ''
+    # https://github.com/python-openapi/openapi-core/issues/1009
+    substituteInPlace tests/unit/extensions/test_factories.py \
+      --replace-fail 'assert test_model_class.__dataclass_fields__["name"].type == str(Any)' \
+                     'assert str(test_model_class.__dataclass_fields__["name"].type) == str(Any)'
+  '';
+
   build-system = [ poetry-core ];
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 07ee8fa12d60..ee240ced4d4d 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -101,7 +101,6 @@ buildPythonPackage rec {
   ]
   ++ fakeredis.optional-dependencies.lua
   ++ optional-dependencies.optional;
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # ValueError: Transform failed with error code 525: error creating static canvas/context for image server
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 7c5216a98dab..eeffe9bfe5df 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "orjson";
-  version = "3.11.3";
+  version = "3.11.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "ijl";
     repo = "orjson";
     tag = version;
-    hash = "sha256-oTrmDYmUHXMKxgxzBIStw7nnWXcyH9ir0ohnbX4bdjU=";
+    hash = "sha256-LK3Up6bAWZkou791nrA9iHlgfDLbk196iTn3CBfeyYc=";
   };
 
   patches = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
@@ -49,7 +49,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-y6FmK1RR1DAswVoTlnl19CmoYXAco1dY7lpV/KTypzE=";
+    hash = "sha256-TdZtbb9zR0T+0eauEgRVrDKN2eyCNfEQCJziPlKPWpI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock
index 20b287a1c984..fb6bba097780 100644
--- a/pkgs/development/python-modules/outlines-core/Cargo.lock
+++ b/pkgs/development/python-modules/outlines-core/Cargo.lock
@@ -2,41 +2,38 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.4.0"
+name = "atomic-waker"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.13.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
+checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -44,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.29.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
+checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc"
 dependencies = [
  "bindgen",
  "cc",
@@ -55,21 +52,6 @@ dependencies = [
  "fs_extra",
 ]
 
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -104,44 +86,35 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.5"
+version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
+ "itertools 0.13.0",
  "log",
  "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 1.1.0",
+ "rustc-hash",
  "shlex",
  "syn",
- "which",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byteorder"
@@ -157,10 +130,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.23"
+version = "1.2.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
+checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -177,9 +151,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -222,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -376,16 +350,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
-[[package]]
-name = "errno"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "esaxx-rs"
 version = "0.1.10"
@@ -393,10 +357,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6"
 
 [[package]]
-name = "flate2"
-version = "1.1.1"
+name = "find-msvc-tools"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "flate2"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -410,9 +380,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -493,41 +463,35 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
 [[package]]
 name = "heck"
@@ -550,19 +514,10 @@ dependencies = [
  "rustls",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "ureq",
 ]
 
-[[package]]
-name = "home"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -605,18 +560,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -624,11 +581,10 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
  "http",
  "hyper",
  "hyper-util",
@@ -637,22 +593,26 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots 0.26.11",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
  "hyper",
+ "ipnet",
  "libc",
+ "percent-encoding",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -662,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -675,9 +635,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -688,11 +648,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -703,42 +662,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -754,9 +709,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -775,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -798,9 +753,12 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "ipnet"
@@ -809,19 +767,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
-name = "itertools"
-version = "0.11.0"
+name = "iri-string"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
 dependencies = [
- "either",
+ "memchr",
+ "serde",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
 dependencies = [
  "either",
 ]
@@ -843,19 +802,19 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -867,55 +826,43 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libloading"
-version = "0.8.7"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.0",
+ "windows-link",
 ]
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags",
  "libc",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "lru-slab"
@@ -925,9 +872,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "macro_rules_attribute"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13"
+checksum = "65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520"
 dependencies = [
  "macro_rules_attribute-proc_macro",
  "paste",
@@ -935,15 +882,15 @@ dependencies = [
 
 [[package]]
 name = "macro_rules_attribute-proc_macro"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568"
+checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30"
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -954,12 +901,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -968,39 +909,41 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "monostate"
-version = "0.1.14"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee"
+checksum = "3341a273f6c9d5bef1908f17b7267bbab0e95c9bf69a0d4dcf8e9e1b2c76ef67"
 dependencies = [
  "monostate-impl",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "monostate-impl"
-version = "0.1.14"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5"
+checksum = "e4db6d5580af57bf992f59068d4ea26fd518574ff48d7639b255a36f9de6e7e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1023,15 +966,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -1040,11 +974,11 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "onig"
-version = "6.4.0"
+version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
+checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "libc",
  "once_cell",
  "onig_sys",
@@ -1052,9 +986,9 @@ dependencies = [
 
 [[package]]
 name = "onig_sys"
-version = "69.8.1"
+version = "69.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
 dependencies = [
  "cc",
  "pkg-config",
@@ -1068,7 +1002,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "outlines-core"
-version = "0.2.11"
+version = "0.0.0"
 dependencies = [
  "bincode",
  "hf-hub",
@@ -1076,11 +1010,11 @@ dependencies = [
  "pyo3",
  "regex",
  "regex-automata",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "serde",
  "serde-pyobject",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokenizers",
 ]
 
@@ -1092,9 +1026,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project-lite"
@@ -1116,15 +1050,15 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
  "zerovec",
 ]
@@ -1140,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.32"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -1150,18 +1084,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
+checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -1177,19 +1111,20 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
+checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
 dependencies = [
  "once_cell",
+ "python3-dll-a",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
+checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1197,9 +1132,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
+checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1209,9 +1144,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.5"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
+checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1221,20 +1156,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "quinn"
-version = "0.11.8"
+name = "python3-dll-a"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "rustls",
  "socket2",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "web-time",
@@ -1242,20 +1186,20 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
  "bytes",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "lru-slab",
- "rand 0.9.1",
+ "rand 0.9.2",
  "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tinyvec",
  "tracing",
  "web-time",
@@ -1263,32 +1207,32 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.12"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
@@ -1303,9 +1247,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -1346,14 +1290,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -1372,9 +1316,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -1393,9 +1337,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1405,9 +1349,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1416,15 +1360,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1436,16 +1380,12 @@ dependencies = [
  "hyper",
  "hyper-rustls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
- "mime",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
  "rustls",
- "rustls-pemfile",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -1455,14 +1395,14 @@ dependencies = [
  "tokio-rustls",
  "tokio-util",
  "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 0.26.11",
- "windows-registry",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
@@ -1479,42 +1419,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.9.1",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -1526,20 +1441,11 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
 dependencies = [
  "web-time",
  "zeroize",
@@ -1547,9 +1453,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -1559,9 +1465,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -1571,28 +1477,38 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[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",
  "serde_derive",
 ]
 
 [[package]]
 name = "serde-pyobject"
-version = "0.5.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bb5418e5b2eb469c0e8e6eb2c9de96aa1db5e2e04f25560de78e02bb746aa6"
+checksum = "4c485853a65e1a5f2db72e818ec4c7548a39614fabdd988f5e3504071453b7d7"
 dependencies = [
  "pyo3",
  "serde",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.219"
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1601,15 +1517,16 @@ 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 = [
  "indexmap",
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1631,28 +1548,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
-name = "slab"
-version = "0.4.9"
+name = "simd-adler32"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1680,9 +1600,9 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "strsim"
@@ -1698,9 +1618,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1729,9 +1649,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "thiserror"
@@ -1744,11 +1664,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -1764,9 +1684,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1775,9 +1695,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -1785,9 +1705,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1824,7 +1744,7 @@ dependencies = [
  "serde",
  "serde_json",
  "spm_precompiled",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "unicode-normalization-alignments",
  "unicode-segmentation",
  "unicode_categories",
@@ -1832,24 +1752,23 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.45.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
  "socket2",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -1857,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.15"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1883,6 +1802,24 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -1907,9 +1844,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
 ]
@@ -1922,9 +1859,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-normalization-alignments"
@@ -1943,9 +1880,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode_categories"
@@ -1992,13 +1929,14 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -2024,50 +1962,37 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2078,9 +2003,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2088,22 +2013,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
@@ -2123,9 +2048,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2147,30 +2072,18 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.0",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -2195,38 +2108,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
-
-[[package]]
-name = "windows-registry"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets 0.53.0",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
-dependencies = [
- "windows-link",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-sys"
@@ -2255,6 +2139,24 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "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]]
 name = "windows-targets"
 version = "0.48.5"
@@ -2288,18 +2190,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+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]]
@@ -2316,9 +2219,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"
@@ -2334,9 +2237,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"
@@ -2352,9 +2255,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"
@@ -2364,9 +2267,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"
@@ -2382,9 +2285,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"
@@ -2400,9 +2303,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"
@@ -2418,9 +2321,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"
@@ -2436,32 +2339,28 @@ 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 = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.1",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -2469,9 +2368,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2481,18 +2380,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2522,15 +2421,15 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -2539,9 +2438,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -2550,9 +2449,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix
index 945875486443..24811b5bc9ba 100644
--- a/pkgs/development/python-modules/outlines-core/default.nix
+++ b/pkgs/development/python-modules/outlines-core/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "outlines-core";
-  version = "0.2.11";
+  version = "0.2.13";
 
   pyproject = true;
 
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "dottxt-ai";
     repo = "outlines-core";
     tag = version;
-    hash = "sha256-lLMTHFytJT2MhnzT0RlRCaSBPijA81fjxUqx4IGfVo8=";
+    hash = "sha256-mfw/cOLZPRcL3HWmrm/SyA0zDCPWr5F19EWIUdNu9jM=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index fdc623ef775b..508e9821cdd1 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -63,7 +63,7 @@
 let
   pandas = buildPythonPackage rec {
     pname = "pandas";
-    version = "2.3.1";
+    version = "2.3.3";
     pyproject = true;
 
     disabled = pythonOlder "3.9";
@@ -72,7 +72,7 @@ let
       owner = "pandas-dev";
       repo = "pandas";
       tag = "v${version}";
-      hash = "sha256-xvdiWjJ5uHfrzXB7c4cYjFjZ6ue5i7qzb4tAEPJMAV0=";
+      hash = "sha256-jY1uM9HmJzoFk26ilbtzJnxAsQhmXS19r73JcFeFWRQ=";
     };
 
     # A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x &
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 5e6bb7b71327..655af74fc3b6 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -88,7 +88,6 @@ buildPythonPackage rec {
   ++ optional-dependencies.azure
   ++ optional-dependencies.s3
   ++ optional-dependencies.gcs;
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "papermill" ];
 
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index b7248d9a1b41..f38a20297060 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -1,34 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonAtLeast,
-  pythonOlder,
+  fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "parso";
-  version = "0.8.4";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "0.8.5";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-6zp7WCQPuZCZo0VXHe7MD5VA6l9N0v4UwqmdaygauS0=";
+  src = fetchFromGitHub {
+    owner = "davidhalter";
+    repo = "parso";
+    tag = "v${version}";
+    hash = "sha256-faSXCrOkybLr0bboF/8rPV/Humq8s158A3UOpdlYi0I=";
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  build-system = [ setuptools ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.10") [
-    # python changed exception message format in 3.10, 3.10 not yet supported
-    "test_python_exception_matches"
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     description = "Python Parser";
     homepage = "https://parso.readthedocs.io/en/latest/";
-    changelog = "https://github.com/davidhalter/parso/blob/master/CHANGELOG.rst";
+    changelog = "https://github.com/davidhalter/parso/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix
index 98c808f960b6..a30a0c5b9479 100644
--- a/pkgs/development/python-modules/pdm-backend/default.nix
+++ b/pkgs/development/python-modules/pdm-backend/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pdm-backend";
-  version = "2.4.5";
+  version = "2.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-backend";
     tag = version;
-    hash = "sha256-tXgojVE/Bh2OVeMG/P5aCK5HEeUhiypUjTrS4yOwvZU=";
+    hash = "sha256-lR3ZxwPvyv/Ffez6cfz8Gzc6h4PeqmgsTGNEVv9K+tU=";
   };
 
   env.PDM_BUILD_SCM_VERSION = version;
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index b2839e36177e..b6472c24528d 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -27,21 +27,21 @@
 
 buildPythonPackage rec {
   pname = "pendulum";
-  version = "3.1.0";
+  version = "3.1.0-unstable-2025-10-28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sdispater";
     repo = "pendulum";
-    tag = version;
-    hash = "sha256-ZjQaN5vT1+3UxwLNNsUmU4gSs6reUl90VSEumS0sEGY=";
+    rev = "2982f25feaad2e58ad1530d3b53cc30fc1c82bd6";
+    hash = "sha256-1ULvlWLZx3z5eGmWJfrN46x0ohJ+mAxipm6l6rykGPY=";
   };
 
   cargoRoot = "rust";
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
     sourceRoot = "${src.name}/rust";
-    hash = "sha256-F5bCuvI8DcyeUTS7UyYBixCjuGFKGOXPw8HLVlYKuxA=";
+    hash = "sha256-Ozg+TW/woJsqmbmyDsgdMua3Lmnn+KBvBhd9kVik3XY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix
index 39ce3b00fca8..67af1c29893c 100644
--- a/pkgs/development/python-modules/periodiq/default.nix
+++ b/pkgs/development/python-modules/periodiq/default.nix
@@ -45,7 +45,6 @@ buildPythonPackage rec {
     pytest-mock
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   enabledTestPaths = [ "tests/unit" ];
 
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a84ad25d1aeb..0554f3ed8d68 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -4,8 +4,7 @@
   buildPythonPackage,
   build,
   click,
-  fetchPypi,
-  fetchpatch,
+  fetchFromGitHub,
   pep517,
   pip,
   pytest-xdist,
@@ -20,33 +19,22 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "7.4.1";
+  version = "7.5.1-unstable-2025-11-08";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk=";
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "pip-tools";
+    rev = "785ed5e30f4c86c24141898553a356402b142adf";
+    hash = "sha256-2mYUjLqrpN/sjR79t/ZIfpvVXAgpk/tpZWFcT/6e7uk=";
   };
 
   patches = [
     ./fix-setup-py-bad-syntax-detection.patch
-
-    # Backport click 8.2 + 8.3 compatibility from 7.5.1
-    # We can't update to 7.5.1 because of https://github.com/jazzband/pip-tools/issues/2231,
-    # which breaks home-assisstant-chip-wheels.
-    (fetchpatch {
-      url = "https://github.com/jazzband/pip-tools/commit/c7f128e7c533033c2436b52c972eee521fe3890c.diff";
-      excludes = [ "pyproject.toml" ];
-      hash = "sha256-cIFAE/VKyyDWVQktPtPPuxY85DtTvH6pK539WD2cDn4=";
-    })
-    (fetchpatch {
-      url = "https://github.com/jazzband/pip-tools/commit/816ee196c543be53ddba0ea33fb4c7e84217b3b3.diff";
-      hash = "sha256-3GTUNWoy/AmpWv7NUCWIZ+coxb1vUgg6CZhwh6FehZo=";
-    })
   ];
 
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "7.5.1";
+
   build-system = [ setuptools-scm ];
 
   dependencies = [
@@ -80,6 +68,7 @@ buildPythonPackage rec {
     "test_bad_setup_file"
     # Assertion error
     "test_compile_recursive_extras"
+    "test_compile_build_targets_setuptools_no_wheel_dep"
     "test_combine_different_extras_of_the_same_package"
     "test_diff_should_not_uninstall"
     "test_cli_compile_all_extras_with_multiple_packages"
diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix
index b07c062c96fb..6402596f8333 100644
--- a/pkgs/development/python-modules/propcache/default.nix
+++ b/pkgs/development/python-modules/propcache/default.nix
@@ -10,11 +10,12 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  tomli,
 }:
 
 buildPythonPackage rec {
   pname = "propcache";
-  version = "0.3.2";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,18 +24,21 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "propcache";
     tag = "v${version}";
-    hash = "sha256-G8SLIZaJUu3uwyFicrQF+PjKp3vsUh/pNUsmDpnnAAg=";
+    hash = "sha256-7HQUOggbFC7kWcXqatLeCTNJqo0fW9FRCy8UkYL6wvM=";
   };
 
   postPatch = ''
     substituteInPlace packaging/pep517_backend/_backend.py \
-      --replace "Cython ~= 3.0.12" Cython
+      --replace "Cython ~=" "Cython >="
   '';
 
   build-system = [
     cython
     expandvars
     setuptools
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix
index bba5b5da6dac..16e959977440 100644
--- a/pkgs/development/python-modules/protobuf/6.nix
+++ b/pkgs/development/python-modules/protobuf/6.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "6.33.1";
+  version = "6.33.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-l/ZXV+jQmHDeb9lzrt25L4VDVgcjXSCy3+2TQF0AyFs=";
+    hash = "sha256-Vtw3DJH7uKyFvBNYLJ43NWlmiikKouZqWQwqDTXdueQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index dac2afcd346f..d1d2f609d652 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "7.1.2";
+  version = "7.1.3";
   pyproject = true;
 
   inherit stdenv;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "giampaolo";
     repo = "psutil";
     tag = "release-${version}";
-    hash = "sha256-LyGnLrq+SzCQmz8/P5DOugoNEyuH0IC7uIp8UAPwH0U=";
+    hash = "sha256-vMGUoiPr+QIe1N+I++d/DM9i2jeHTI68npGoJ2vKF10=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix
index 349e6a0e7b23..63688ca8b028 100644
--- a/pkgs/development/python-modules/py-opensonic/default.nix
+++ b/pkgs/development/python-modules/py-opensonic/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "py-opensonic";
-  version = "7.0.3";
+  version = "7.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "khers";
     repo = "py-opensonic";
     tag = "v${version}";
-    hash = "sha256-3ull0vZxkORh7WRvXPopjLqhZ5+70RTNjqUJ9FpUPJI=";
+    hash = "sha256-5wsisIfYW+0uh0khUzt9wKFxBf/ZXVsKpNF/Dcrj2wI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix
index 717811aa2a10..1a62250667d8 100644
--- a/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/pkgs/development/python-modules/pyannote-metrics/default.nix
@@ -65,7 +65,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems";
diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix
index ecd4c17af84e..8b53f3f9e150 100644
--- a/pkgs/development/python-modules/pyannote-pipeline/default.nix
+++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix
@@ -63,7 +63,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Tunable pipelines";
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index da0a64a1498f..95d6683bc2b9 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -97,55 +97,67 @@ buildPythonPackage rec {
     find "$PWD/pyarrow/src/arrow" -type f -name '*.h' -exec cp {} "$pyarrow_include/arrow/python" \;
   '';
 
-  pytestFlagsArray = [
-    # A couple of tests are missing fixture imports, luckily pytest offers a
-    # clean solution.
-    "--fixtures pyarrow/tests/conftest.py"
-    # Deselect a single test because pyarrow prints a 2-line error message where
-    # only a single line is expected. The additional line of output comes from
-    # the glog library which is an optional dependency of arrow-cpp that is
-    # enabled in nixpkgs.
-    # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
-    "--deselect=pyarrow/tests/test_memory.py::test_env_var"
-    # these tests require access to s3 via the internet
-    "--deselect=pyarrow/tests/test_fs.py::test_resolve_s3_region"
-    "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws"
-    "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection"
-    "--deselect=pyarrow/tests/test_fs.py::test_s3_options"
+  disabledTestPaths = [
+    # These tests require access to s3 via the internet.
+    "pyarrow/tests/test_fs.py::test_resolve_s3_region"
+    "pyarrow/tests/test_fs.py::test_s3_finalize"
+    "pyarrow/tests/test_fs.py::test_s3_finalize_region_resolver"
+    "pyarrow/tests/test_fs.py::test_s3_real_aws"
+    "pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection"
+    "pyarrow/tests/test_fs.py::test_s3_options"
     # Flaky test
-    "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors"
-    "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import"
-    # Flaky test, works locally but not on Hydra
-    "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation"
-    # expects arrow-cpp headers to be bundled
-    "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include"
+    "pyarrow/tests/test_flight.py::test_roundtrip_errors"
+    "pyarrow/tests/test_pandas.py::test_threaded_pandas_import"
+    # Flaky test, works locally but not on Hydra.
+    "pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation"
+    # expects arrow-cpp headers to be bundled.
+    "pyarrow/tests/test_cpp_internals.py::test_pyarrow_include"
+    # Searches for TZDATA in /usr.
+    "pyarrow/tests/test_orc.py::test_example_using_json"
+    # AssertionError: assert 'Europe/Monaco' == 'Europe/Paris'
+    "pyarrow/tests/test_types.py::test_dateutil_tzinfo_to_string"
+    # These fail with xxx_fixture not found.
+    # xxx = unary_func, unary_agg_func, varargs_agg_func
+    "pyarrow/tests/test_substrait.py::test_udf_via_substrait"
+    "pyarrow/tests/test_substrait.py::test_scalar_aggregate_udf_basic"
+    "pyarrow/tests/test_substrait.py::test_hash_aggregate_udf_basic"
+    "pyarrow/tests/test_udf.py::test_hash_agg_basic"
+    "pyarrow/tests/test_udf.py::test_hash_agg_empty"
+    "pyarrow/tests/test_udf.py::test_input_lifetime"
+    "pyarrow/tests/test_udf.py::test_scalar_agg_basic"
+    "pyarrow/tests/test_udf.py::test_scalar_agg_empty"
+    "pyarrow/tests/test_udf.py::test_scalar_agg_varargs"
+    "pyarrow/tests/test_udf.py::test_scalar_input"
+    "pyarrow/tests/test_udf.py::test_scalar_udf_context"
+    "pyarrow/tests/test_udf.py::test_udf_array_unary"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Requires loopback networking
-    "--deselect=pyarrow/tests/test_ipc.py::test_socket_"
-    "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data"
-    "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor"
-    "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client"
-    "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect"
-    # fails to compile
-    "--deselect=pyarrow/tests/test_cython.py::test_cython_api"
+    # Requires loopback networking.
+    "pyarrow/tests/test_ipc.py::test_socket_"
+    "pyarrow/tests/test_flight.py::test_never_sends_data"
+    "pyarrow/tests/test_flight.py::test_large_descriptor"
+    "pyarrow/tests/test_flight.py::test_large_metadata_client"
+    "pyarrow/tests/test_flight.py::test_none_action_side_effect"
+    # Fails to compile.
+    "pyarrow/tests/test_cython.py::test_cython_api"
   ]
   ++ lib.optionals (pythonAtLeast "3.11") [
     # Repr output is printing number instead of enum name so these tests fail
-    "--deselect=pyarrow/tests/test_fs.py::test_get_file_info"
+    "pyarrow/tests/test_fs.py::test_get_file_info"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    # this test requires local networking
-    "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs"
+    # This test requires local networking.
+    "pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs"
   ];
 
   disabledTests = [ "GcsFileSystem" ];
 
   preCheck = ''
+    export PARQUET_TEST_DATA="${arrow-cpp.PARQUET_TEST_DATA}"
     shopt -s extglob
     rm -r pyarrow/!(conftest.py|tests)
     mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py
-    substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest
+    substituteInPlace pyarrow/tests/conftest.py --replace-fail ..conftest .parent_conftest
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # OSError: [Errno 24] Too many open files
diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index 27d6186d5e4d..c59679649a88 100644
--- a/pkgs/development/python-modules/pydantic-core/default.nix
+++ b/pkgs/development/python-modules/pydantic-core/default.nix
@@ -1,84 +1,74 @@
 {
-  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
   cargo,
   rustPlatform,
   rustc,
-  libiconv,
   typing-extensions,
   pytestCheckHook,
   hypothesis,
+  inline-snapshot,
+  pytest-benchmark,
+  pytest-run-parallel,
   pytest-timeout,
   pytest-mock,
   dirty-equals,
   pydantic,
+  typing-inspection,
 }:
 
 let
   pydantic-core = buildPythonPackage rec {
     pname = "pydantic-core";
-    version = "2.33.2";
+    version = "2.41.5";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "pydantic";
       repo = "pydantic-core";
       tag = "v${version}";
-      hash = "sha256-2jUkd/Y92Iuq/A31cevqjZK4bCOp+AEC/MAnHSt2HLY=";
+      hash = "sha256-oIYHLSep8tWOXEaUybXG8Gv9WBoPGQ1Aj7QyqYksvMw=";
     };
 
     cargoDeps = rustPlatform.fetchCargoVendor {
       inherit pname version src;
-      hash = "sha256-MY6Gxoz5Q7nCptR+zvdABh2agfbpqOtfTtor4pmkb9c=";
+      hash = "sha256-Kvc0a34C6oGc9oS/iaPaazoVUWn5ABUgrmPa/YocV+Y=";
     };
 
     nativeBuildInputs = [
       cargo
       rustPlatform.cargoSetupHook
+      rustPlatform.maturinBuildHook
       rustc
     ];
 
-    build-system = [
-      rustPlatform.maturinBuildHook
-      typing-extensions
-    ];
-
-    buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
     dependencies = [ typing-extensions ];
 
     pythonImportsCheck = [ "pydantic_core" ];
 
-    # escape infinite recursion with pydantic via dirty-equals
+    # escape infinite recursion with pydantic via inline-snapshot
     doCheck = false;
-    passthru.tests.pytest = pydantic-core.overrideAttrs { doCheck = true; };
+    passthru.tests.pytest = pydantic-core.overridePythonAttrs { doCheck = true; };
 
     nativeCheckInputs = [
       pytestCheckHook
       hypothesis
+      inline-snapshot
       pytest-timeout
       dirty-equals
+      pytest-benchmark
       pytest-mock
-    ];
-
-    disabledTests = [
-      # RecursionError: maximum recursion depth exceeded while calling a Python object
-      "test_recursive"
-    ];
-
-    disabledTestPaths = [
-      # no point in benchmarking in nixpkgs build farm
-      "tests/benchmarks"
+      pytest-run-parallel
+      typing-inspection
     ];
 
     meta = {
-      changelog = "https://github.com/pydantic/pydantic-core/releases/tag/v${version}";
+      changelog = "https://github.com/pydantic/pydantic-core/releases/tag/${src.tag}";
       description = "Core validation logic for pydantic written in rust";
       homepage = "https://github.com/pydantic/pydantic-core";
       license = lib.licenses.mit;
-      maintainers = pydantic.meta.maintainers;
+      inherit (pydantic.meta) maintainers;
     };
   };
 in
diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix
index bd3f62e8f928..62cbec965209 100644
--- a/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix
@@ -6,6 +6,7 @@
   hatchling,
   pydantic,
   typing-extensions,
+  cron-converter,
   semver,
   pendulum,
   phonenumbers,
@@ -13,19 +14,20 @@
   pymongo,
   python-ulid,
   pytz,
+  tzdata,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pydantic-extra-types";
-  version = "2.10.5";
+  version = "2.10.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-extra-types";
     tag = "v${version}";
-    hash = "sha256-05yGIAgN/sW+Nj7F720ZAHeMz/AyvwHMfzp4OdLREe4=";
+    hash = "sha256-g2a7tfldt39RCZxd9ta/JTPYnfZTTsLE6kA2fuo3fFg=";
   };
 
   build-system = [ hatchling ];
@@ -37,6 +39,7 @@ buildPythonPackage rec {
 
   optional-dependencies = {
     all = [
+      cron-converter
       pendulum
       phonenumbers
       pycountry
@@ -44,7 +47,9 @@ buildPythonPackage rec {
       python-ulid
       pytz
       semver
+      tzdata
     ];
+    cron = [ cron-converter ];
     phonenumbers = [ phonenumbers ];
     pycountry = [ pycountry ];
     semver = [ semver ];
@@ -52,6 +57,15 @@ buildPythonPackage rec {
     pendulum = [ pendulum ];
   };
 
+  pytestFlags = [
+    "-Wignore::DeprecationWarning"
+  ];
+
+  disabledTests = [
+    # https://github.com/pydantic/pydantic-extra-types/issues/346
+    "test_json_schema"
+  ];
+
   pythonImportsCheck = [ "pydantic_extra_types" ];
 
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all;
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 6cb1b950e923..2047ef5c4388 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -1,8 +1,9 @@
 {
   lib,
+  python,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  fetchpatch,
 
   # build-system
   hatchling,
@@ -20,27 +21,30 @@
   dirty-equals,
   jsonschema,
   pytestCheckHook,
-  pytest-codspeed,
   pytest-mock,
   pytest-run-parallel,
-  eval-type-backport,
-  rich,
 }:
 
 buildPythonPackage rec {
   pname = "pydantic";
-  version = "2.11.7";
+  version = "2.12.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic";
     tag = "v${version}";
-    hash = "sha256-5EQwbAqRExApJvVUJ1C6fsEC1/rEI6/bQEQkStqgf/Q=";
+    hash = "sha256-CHJahAgs+vQQzhIZjP+6suvbmRrGZI0H5UxoXg4I90o=";
   };
 
+  patches = lib.optionals (lib.versionAtLeast python.version "3.14.1") [
+    # Fix build with python 3.14.1
+    (fetchpatch {
+      url = "https://github.com/pydantic/pydantic/commit/53cb5f830207dd417d20e0e55aab2e6764f0d6fc.patch";
+      hash = "sha256-Y1Ob1Ei0rrw0ua+0F5L2iE2r2RdpI9DI2xuiu9pLr5Y=";
+    })
+  ];
+
   postPatch = ''
     sed -i "/--benchmark/d" pyproject.toml
   '';
@@ -65,18 +69,11 @@ buildPythonPackage rec {
     cloudpickle
     dirty-equals
     jsonschema
-    pytest-codspeed
     pytest-mock
     pytest-run-parallel
     pytestCheckHook
-    rich
   ]
-  ++ lib.concatAttrValues optional-dependencies
-  ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  ++ lib.concatAttrValues optional-dependencies;
 
   disabledTestPaths = [
     "tests/benchmarks"
diff --git a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch b/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
deleted file mode 100644
index 1e1f407dbc19..000000000000
--- a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 3e3fbdc11ab00c4c04eb68c40b23979245c987fa Mon Sep 17 00:00:00 2001
-From: Marcin Serwin <marcin@serwin.dev>
-Date: Sat, 8 Nov 2025 19:47:41 +0100
-Subject: [PATCH] Use SDL_AllocFormat instead of creating it manually
-
-According to the docs, `SDL_PixelFormat` is a read-only structure.
-Creating it manually leaves out some important fields like `format` and
-`next` pointer to be undefined.
-
-Signed-off-by: Marcin Serwin <marcin@serwin.dev>
----
- src_c/surface.c | 80 ++++++++++++++-----------------------------------
- 1 file changed, 23 insertions(+), 57 deletions(-)
-
-diff --git a/src_c/surface.c b/src_c/surface.c
-index f118a4db4..e51e80554 100644
---- a/src_c/surface.c
-+++ b/src_c/surface.c
-@@ -1844,9 +1844,8 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
-              */
-             int bpp = 0;
-             SDL_Palette *palette = SDL_AllocPalette(default_palette_size);
--            SDL_PixelFormat format;
-+            Uint32 format_enum = 0;
- 
--            memcpy(&format, surf->format, sizeof(format));
-             if (pg_IntFromObj(argobject, &bpp)) {
-                 Uint32 Rmask, Gmask, Bmask, Amask;
- 
-@@ -1904,30 +1903,23 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
-                                          "nonstandard bit depth given");
-                     }
-                 }
--                format.Rmask = Rmask;
--                format.Gmask = Gmask;
--                format.Bmask = Bmask;
--                format.Amask = Amask;
-+                format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask,
-+                                                         Bmask, Amask);
-             }
-             else if (PySequence_Check(argobject) &&
-                      PySequence_Size(argobject) == 4) {
--                Uint32 mask;
-+                Uint32 Rmask, Gmask, Bmask, Amask;
- 
--                if (!pg_UintFromObjIndex(argobject, 0, &format.Rmask) ||
--                    !pg_UintFromObjIndex(argobject, 1, &format.Gmask) ||
--                    !pg_UintFromObjIndex(argobject, 2, &format.Bmask) ||
--                    !pg_UintFromObjIndex(argobject, 3, &format.Amask)) {
-+                if (!pg_UintFromObjIndex(argobject, 0, &Rmask) ||
-+                    !pg_UintFromObjIndex(argobject, 1, &Gmask) ||
-+                    !pg_UintFromObjIndex(argobject, 2, &Bmask) ||
-+                    !pg_UintFromObjIndex(argobject, 3, &Amask)) {
-                     pgSurface_Unprep(self);
-                     return RAISE(PyExc_ValueError,
-                                  "invalid color masks given");
-                 }
--                mask =
--                    format.Rmask | format.Gmask | format.Bmask | format.Amask;
--                for (bpp = 0; bpp < 32; ++bpp) {
--                    if (!(mask >> bpp)) {
--                        break;
--                    }
--                }
-+                format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask,
-+                                                         Bmask, Amask);
-             }
-             else {
-                 pgSurface_Unprep(self);
-@@ -1935,22 +1927,11 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
-                     PyExc_ValueError,
-                     "invalid argument specifying new format to convert to");
-             }
--            format.BitsPerPixel = (Uint8)bpp;
--            format.BytesPerPixel = (bpp + 7) / 8;
--            if (PG_FORMAT_BitsPerPixel((&format)) > 8) {
--                /* Allow a 8 bit source surface with an empty palette to be
--                 * converted to a format without a palette (pygame-ce issue
--                 * #146). If the target format has a non-NULL palette pointer
--                 * then SDL_ConvertSurface checks that the palette is not
--                 * empty-- that at least one entry is not black.
--                 */
--                format.palette = NULL;
--            }
--            if (SDL_ISPIXELFORMAT_INDEXED(SDL_MasksToPixelFormatEnum(
--                    PG_FORMAT_BitsPerPixel((&format)), format.Rmask,
--                    format.Gmask, format.Bmask, format.Amask))) {
-+            SDL_PixelFormat *format = SDL_AllocFormat(format_enum);
-+
-+            if (SDL_ISPIXELFORMAT_INDEXED(format_enum)) {
-                 if (SDL_ISPIXELFORMAT_INDEXED(PG_SURF_FORMATENUM(surf))) {
--                    SDL_SetPixelFormatPalette(&format, surf->format->palette);
-+                    SDL_SetPixelFormatPalette(format, surf->format->palette);
-                 }
-                 else {
-                     /* Give the surface something other than an all white
-@@ -1958,12 +1939,13 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
-                      */
-                     SDL_SetPaletteColors(palette, default_palette_colors, 0,
-                                          default_palette_size);
--                    SDL_SetPixelFormatPalette(&format, palette);
-+                    SDL_SetPixelFormatPalette(format, palette);
-                 }
-             }
--            newsurf = PG_ConvertSurface(surf, &format);
-+            newsurf = PG_ConvertSurface(surf, format);
-             SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_NONE);
-             SDL_FreePalette(palette);
-+            SDL_FreeFormat(format);
-         }
-     }
-     else {
-@@ -4540,29 +4522,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
-         }
-         else {
-             SDL_PixelFormat *fmt = src->format;
--            SDL_PixelFormat newfmt;
-+            SDL_PixelFormat *newfmt =
-+                SDL_AllocFormat(SDL_MasksToPixelFormatEnum(
-+                    fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, 0));
- 
--            newfmt.palette = 0; /* Set NULL (or SDL gets confused) */
--#if SDL_VERSION_ATLEAST(3, 0, 0)
--            newfmt.bits_per_pixel = fmt->bits_per_pixel;
--            newfmt.bytes_per_pixel = fmt->bytes_per_pixel;
--#else
--            newfmt.BitsPerPixel = fmt->BitsPerPixel;
--            newfmt.BytesPerPixel = fmt->BytesPerPixel;
--#endif
--            newfmt.Amask = 0;
--            newfmt.Rmask = fmt->Rmask;
--            newfmt.Gmask = fmt->Gmask;
--            newfmt.Bmask = fmt->Bmask;
--            newfmt.Ashift = 0;
--            newfmt.Rshift = fmt->Rshift;
--            newfmt.Gshift = fmt->Gshift;
--            newfmt.Bshift = fmt->Bshift;
--            newfmt.Aloss = 0;
--            newfmt.Rloss = fmt->Rloss;
--            newfmt.Gloss = fmt->Gloss;
--            newfmt.Bloss = fmt->Bloss;
--            src = PG_ConvertSurface(src, &newfmt);
-+            src = PG_ConvertSurface(src, newfmt);
-+
-+            SDL_FreeFormat(newfmt);
-             if (src) {
- #if SDL_VERSION_ATLEAST(3, 0, 0)
-                 result = SDL_BlitSurface(src, srcrect, dst, dstrect) ? 0 : -1;
--- 
-2.51.0
-
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 1f132ab7fab0..ed120e12e761 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -62,11 +62,8 @@ buildPythonPackage rec {
       );
     })
 
-    # Can be removed with the next SDL3 bump.
+    # Can be removed after the SDL 3.4.0 bump.
     ./skip-rle-tests.patch
-
-    # https://github.com/pygame-community/pygame-ce/pull/3639
-    ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
index f7ecc1ccb330..6b488f0c880a 100644
--- a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
+++ b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
@@ -2,14 +2,6 @@ diff --git a/test/surface_test.py b/test/surface_test.py
 index c2c91f4f5..58d916de8 100644
 --- a/test/surface_test.py
 +++ b/test/surface_test.py
-@@ -404,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429")
-     def test_solarwolf_rle_usage_2(self):
-         """Test for RLE status after setting alpha"""
- 
 @@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase):
          finally:
              pygame.display.quit()
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index 701b6dc3a7fd..bed2e9d702a3 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -7,15 +7,12 @@
   numpy,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pyhamcrest";
   version = "2.1.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hamcrest";
@@ -24,12 +21,17 @@ buildPythonPackage rec {
     hash = "sha256-VkfHRo4k8g9/QYG4r79fXf1NXorVdpUKUgVrbV2ELMU=";
   };
 
+  patches = [
+    # https://github.com/hamcrest/PyHamcrest/pull/270
+    ./python314-compat.patch
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
diff --git a/pkgs/development/python-modules/pyhamcrest/python314-compat.patch b/pkgs/development/python-modules/pyhamcrest/python314-compat.patch
new file mode 100644
index 000000000000..18f990723b33
--- /dev/null
+++ b/pkgs/development/python-modules/pyhamcrest/python314-compat.patch
@@ -0,0 +1,130 @@
+From bfe0ff68d1b1c9601a7a4bf4b6ce8aded1ea0c9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?=
+ <meggy.calabkova@gmail.com>
+Date: Wed, 24 Sep 2025 12:33:18 +0200
+Subject: [PATCH 1/2] use `asyncio.new_event_loop` in tests for compatibility
+ with Python 3.14
+
+---
+ tests/hamcrest_unit_test/core/future_test.py | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/hamcrest_unit_test/core/future_test.py b/tests/hamcrest_unit_test/core/future_test.py
+index 7963d9e..147286e 100644
+--- a/tests/hamcrest_unit_test/core/future_test.py
++++ b/tests/hamcrest_unit_test/core/future_test.py
+@@ -40,13 +40,13 @@ async def test():
+                 await resolved(raise_exception()),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchIfActualIsNotAFuture(self):
+         async def test():
+             self.assert_does_not_match("Not a future", future_raising(TypeError), 23)
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchIfFutureIsNotDone(self):
+         future = asyncio.Future()
+@@ -69,7 +69,7 @@ async def test():
+                 expected_message, future_raising(TypeError), await resolved(raise_exception())
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testMatchesIfFutureHasASubclassOfTheExpectedException(self):
+         async def test():
+@@ -79,7 +79,7 @@ async def test():
+                 await resolved(raise_exception()),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchIfFutureDoesNotHaveException(self):
+         async def test():
+@@ -87,7 +87,7 @@ async def test():
+                 "No exception", future_raising(ValueError), await resolved(no_exception())
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchExceptionIfRegularExpressionDoesNotMatch(self):
+         async def test():
+@@ -102,7 +102,7 @@ async def test():
+                 await resolved(raise_exception()),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testMatchesRegularExpressionToStringifiedException(self):
+         async def test():
+@@ -118,7 +118,7 @@ async def test():
+                 await resolved(raise_exception(3, 1, 4)),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testMachesIfExceptionMatchesAdditionalMatchers(self):
+         async def test():
+@@ -128,7 +128,7 @@ async def test():
+                 await resolved(raise_exception_with_properties(prip="prop")),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchIfAdditionalMatchersDoesNotMatch(self):
+         async def test():
+@@ -143,7 +143,7 @@ async def test():
+                 await resolved(raise_exception_with_properties(prip="prop")),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchIfNeitherPatternOrMatcherMatch(self):
+         async def test():
+@@ -162,4 +162,4 @@ async def test():
+                 await resolved(raise_exception_with_properties(prip="prop")),
+             )
+ 
+-        asyncio.get_event_loop().run_until_complete(test())
++        asyncio.new_event_loop().run_until_complete(test())
+
+From 5f5ca0424cc9315504e8445cae2076e55764859b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?=
+ <meggy.calabkova@gmail.com>
+Date: Wed, 24 Sep 2025 12:58:33 +0200
+Subject: [PATCH 2/2] create loop in asyncio.Future
+
+---
+ tests/hamcrest_unit_test/core/future_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/hamcrest_unit_test/core/future_test.py b/tests/hamcrest_unit_test/core/future_test.py
+index 147286e..3ddde49 100644
+--- a/tests/hamcrest_unit_test/core/future_test.py
++++ b/tests/hamcrest_unit_test/core/future_test.py
+@@ -49,11 +49,11 @@ async def test():
+         asyncio.new_event_loop().run_until_complete(test())
+ 
+     def testDoesNotMatchIfFutureIsNotDone(self):
+-        future = asyncio.Future()
++        future = asyncio.Future(loop=asyncio.new_event_loop())
+         self.assert_does_not_match("Unresolved future", future_raising(TypeError), future)
+ 
+     def testDoesNotMatchIfFutureIsCancelled(self):
+-        future = asyncio.Future()
++        future = asyncio.Future(loop=asyncio.new_event_loop())
+         future.cancel()
+         self.assert_does_not_match("Cancelled future", future_raising(TypeError), future)
+ 
+
diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix
index 1612eec39791..be35eeaa96a1 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/pkgs/development/python-modules/pylint-django/default.nix
@@ -9,21 +9,18 @@
   poetry-core,
   pylint-plugin-utils,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pylint-django";
-  version = "2.6.1";
+  version = "2.6.1-unstable-2025-11-09";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pylint-django";
-    tag = "v${version}";
-    hash = "sha256-9b0Sbo6E036UmUmP/CVPrS9cxxKtkMMZtqJsI53g4sU=";
+    rev = "e40d785abbf26af0738c14247fb4ac0aa7265b24";
+    hash = "sha256-INQSQjubcwQwspaxevXQOF92L2K9WRLMLYsP18Ffhos=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 78cfec1a22be..698da478fced 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "3.3.7";
+  version = "4.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "pylint-dev";
     repo = "pylint";
     tag = "v${version}";
-    hash = "sha256-EMLnwFurIhTdUJqy9/DLTuucDhlmA5fCPZZ6TA87nEU=";
+    hash = "sha256-DzS5ORhFWmA+eEhGDdpXdHLgWTfw198S7pQueBk44Cw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix
index 7e2a9abcd07f..8af34616e46e 100644
--- a/pkgs/development/python-modules/pyproject-api/default.nix
+++ b/pkgs/development/python-modules/pyproject-api/default.nix
@@ -20,23 +20,18 @@
   # tests
   pytest-mock,
   pytestCheckHook,
-  setuptools,
-  virtualenv,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "pyproject-api";
-  version = "1.9.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  version = "1.10.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "pyproject-api";
     tag = version;
-    hash = "sha256-Bf/FG5BNKbV3lfebEHFJ3cy80L1mWTYLXJfqPUzeNXc=";
+    hash = "sha256-fWlGGVjB43NPfBRFfOWqZUDQuqOdrFP7jsqq9xOfvaw=";
   };
 
   outputs = [
@@ -44,31 +39,23 @@ buildPythonPackage rec {
     "doc"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
+  ];
 
+  nativeBuildInputs = [
     # docs
     sphinxHook
     furo
     sphinx-autodoc-typehints
   ];
 
-  propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
     pytest-mock
     pytestCheckHook
-    setuptools
-    virtualenv
-    wheel
-  ];
-
-  disabledTests = [
-    # requires eol python2 interpreter
-    "test_can_build_on_python_2"
-    # different formatting for version specifier
-    "test_setuptools_prepare_metadata_for_build_wheel"
   ];
 
   pythonImportsCheck = [ "pyproject_api" ];
diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix
index 41cccd86c7a1..320d62eb7302 100644
--- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix
+++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix
@@ -2,18 +2,14 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+
+  # build-system
   setuptools,
   setuptools-scm,
-  wheel,
+
+  # dependencies
   django,
   pyscaffold,
-  configupdater,
-  pre-commit,
-  pytest,
-  pytest-cov,
-  pytest-xdist,
-  tox,
-  virtualenv,
 }:
 
 buildPythonPackage rec {
@@ -26,29 +22,19 @@ buildPythonPackage rec {
     hash = "sha256-5yzF3VK/9VlCSrRsRJWX4arr9n34G2R6O5A51jTpLhg=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     django
     pyscaffold
   ];
 
-  optional-dependencies = {
-    testing = [
-      configupdater
-      pre-commit
-      pytest
-      pytest-cov
-      pytest-xdist
-      setuptools-scm
-      tox
-      virtualenv
-    ];
-  };
+  pythonRelaxDeps = [ "django" ];
+
+  doCheck = false; # tests require git checkout
 
   pythonImportsCheck = [ "pyscaffoldext.django" ];
 
diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix
index 64a793ae4a12..39c0cfa07056 100644
--- a/pkgs/development/python-modules/pystemmer/default.nix
+++ b/pkgs/development/python-modules/pystemmer/default.nix
@@ -40,9 +40,10 @@ buildPythonPackage rec {
     export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include"
   '';
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ];
-
-  NIX_CFLAGS_LINK = [ "-L${libstemmer}/lib" ];
+  env = {
+    NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ];
+    NIX_CFLAGS_LINK = toString [ "-L${libstemmer}/lib" ];
+  };
 
   pythonImportsCheck = [ "Stemmer" ];
 
@@ -52,6 +53,8 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  __structuredAttrs = true;
+
   meta = {
     description = "Snowball stemming algorithms, for information retrieval";
     downloadPage = "https://github.com/snowballstem/pystemmer";
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index bd8838b0f84e..0b060ebe243e 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "1.2.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  version = "1.3.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
     tag = "v${version}";
-    hash = "sha256-27FCV7zgFGe/Q0fkYyh5Z05foVGhbKBRPTH4UK/tW5A=";
+    hash = "sha256-MWKMJkvxdvuOyxE8rNlf15j7C+MwJibnNsbfS0biKwo=";
   };
 
   outputs = [
@@ -31,12 +31,13 @@ buildPythonPackage rec {
 
   buildInputs = [ pytest ];
 
-  dependencies = [
-    backports-asyncio-runner
-  ]
-  ++ lib.optionals (pythonOlder "3.13") [
-    typing-extensions
-  ];
+  dependencies =
+    lib.optionals (pythonOlder "3.11") [
+      backports-asyncio-runner
+    ]
+    ++ lib.optionals (pythonOlder "3.13") [
+      typing-extensions
+    ];
 
   postInstall = ''
     mkdir $testout
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index 065649d70b48..5bddec13f295 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -15,18 +15,19 @@
   pythonAtLeast,
   pythonOlder,
   setuptools,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-benchmark";
-  version = "5.1.0";
+  version = "5.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ionelmc";
     repo = "pytest-benchmark";
     tag = "v${version}";
-    hash = "sha256-4fD9UfZ6jtY7Gx/PVzd1JNWeQNz+DJ2kQmCku2TgxzI=";
+    hash = "sha256-qjgP9H3WUYFm1xamOqhGk5YJQv94QfyJvrRoltHJHHc=";
   };
 
   build-system = [ setuptools ];
@@ -55,30 +56,25 @@ buildPythonPackage rec {
     mercurial
     nbmake
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
   preCheck = ''
     export PATH="$out/bin:$PATH"
-    export HOME=$(mktemp -d)
   '';
 
-  disabledTests =
-    lib.optionals (pythonOlder "3.12") [
-      # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec'
-      "test_compare_1"
-      "test_compare_2"
-      "test_regression_checks"
-      "test_regression_checks_inf"
-      "test_rendering"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # argparse usage changes mismatches test artifact
-      "test_help"
-    ];
+  disabledTests = lib.optionals (pythonOlder "3.12") [
+    # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec'
+    "test_compare_1"
+    "test_compare_2"
+    "test_regression_checks"
+    "test_regression_checks_inf"
+    "test_rendering"
+  ];
 
   meta = {
-    changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.rev}/CHANGELOG.rst";
+    changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.tag}/CHANGELOG.rst";
     description = "Pytest fixture for benchmarking code";
     homepage = "https://github.com/ionelmc/pytest-benchmark";
     license = lib.licenses.bsd2;
diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix
index 0de2195da0fc..4b3eebde0119 100644
--- a/pkgs/development/python-modules/pytest-codspeed/default.nix
+++ b/pkgs/development/python-modules/pytest-codspeed/default.nix
@@ -3,9 +3,6 @@
   buildPythonPackage,
   cffi,
   fetchFromGitHub,
-  filelock,
-  hatchling,
-  importlib-metadata,
   pytest-benchmark,
   pytest-cov-stub,
   pytest-xdist,
@@ -44,16 +41,16 @@ buildPythonPackage rec {
     popd
   '';
 
-  build-system = [ hatchling ];
+  build-system = [
+    cffi
+    setuptools
+  ];
 
   buildInputs = [ pytest ];
 
   dependencies = [
     cffi
-    filelock
-    importlib-metadata
     rich
-    setuptools
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix
index 436740349ae3..a8635b38d0f2 100644
--- a/pkgs/development/python-modules/pytest-describe/default.nix
+++ b/pkgs/development/python-modules/pytest-describe/default.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
+  uv-build,
 
   # dependencies
   pytest,
 
   # tests
-  pytest7CheckHook,
+  pytestCheckHook,
 }:
 
 let
   pname = "pytest-describe";
-  version = "2.2.0";
+  version = "3.0.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -25,15 +25,14 @@ buildPythonPackage {
     owner = "pytest-dev";
     repo = "pytest-describe";
     tag = version;
-    hash = "sha256-ih0XkYOtB+gwUsgo1oSti2460P3gq3tR+UsyRlzMjLE=";
+    hash = "sha256-rMO+Hkz3iWFML8UUq4aDl+t7epzqXmYGZrgRB9OYf6w=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ uv-build ];
 
   buildInputs = [ pytest ];
 
-  # test_fixture breaks with pytest 8.4
-  nativeCheckInputs = [ pytest7CheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     description = "Describe-style plugin for the pytest framework";
diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix
index d3dfb5078333..7110f205387c 100644
--- a/pkgs/development/python-modules/pytest-subprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-subprocess/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  pythonAtLeast,
+  fetchpatch,
   setuptools,
   pytest,
   pytestCheckHook,
@@ -28,6 +30,16 @@ buildPythonPackage rec {
     hash = "sha256-3vBYOk/P78NOjAbs3fT6py5QOOK3fX+AKtO4j5vxZfk=";
   };
 
+  patches = lib.optionals (pythonAtLeast "3.13") [
+    (fetchpatch {
+      # python 3.14 compat
+      # the patch however breaks 3.12:
+      # https://github.com/aklajnert/pytest-subprocess/issues/192
+      url = "https://github.com/aklajnert/pytest-subprocess/commit/be30d9a94ba45afb600717e3fcd95b8b2ff2c60e.patch";
+      hash = "sha256-TYk/Zu2MF+ROEKTgZI1rzA2MlW2it++xElfGZS0Dn5s=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 55fcd3b06162..39826f6418c5 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -60,6 +60,8 @@ buildPythonPackage rec {
     "test_internal_errors_propagate_to_controller"
     # https://github.com/pytest-dev/pytest-xdist/issues/985
     "test_workqueue_ordered_by_size"
+    # https://github.com/pytest-dev/pytest-xdist/issues/1248
+    "test_workqueue_ordered_by_input"
   ];
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix
index fa680ba04b92..a9f0c71dbe7b 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/pkgs/development/python-modules/python-dotenv/default.nix
@@ -4,7 +4,6 @@
   click,
   fetchFromGitHub,
   ipython,
-  mock,
   pytestCheckHook,
   setuptools,
   sh,
@@ -12,32 +11,35 @@
 
 buildPythonPackage rec {
   pname = "python-dotenv";
-  version = "1.1.1";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theskumar";
     repo = "python-dotenv";
     tag = "v${version}";
-    hash = "sha256-GeN6/pnqhm7TTP+H9bKhJat6EwEl2EPl46mNSJWwFKk=";
+    hash = "sha256-YOwe/MHIyGdt6JqiwXwYi1cYxyPkGsBdUhjoG2Ks0y0=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ click ];
+  optional-dependencies.cli = [ click ];
 
   nativeCheckInputs = [
     ipython
-    mock
     pytestCheckHook
     sh
-  ];
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
 
-  disabledTests = [ "cli" ];
+  preCheck = ''
+    export PATH="$out/bin:$PATH"
+  '';
 
   pythonImportsCheck = [ "dotenv" ];
 
   meta = {
+    changelog = "https://github.com/theskumar/python-dotenv/blob/${src.tag}/CHANGELOG.md";
     description = "Add .env support to your django/flask apps in development and deployments";
     mainProgram = "dotenv";
     homepage = "https://github.com/theskumar/python-dotenv";
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 06b1493032c8..92e1c37b5358 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -114,7 +114,6 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ]
   ++ optional-dependencies.all;
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # avoid dependencies on many Qt things just to run one singular test
diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix
index 3101e29049d1..212a90f2bede 100644
--- a/pkgs/development/python-modules/python3-application/default.nix
+++ b/pkgs/development/python-modules/python3-application/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   gitUpdater,
+  setuptools,
   zope-interface,
   twisted,
 }:
@@ -22,6 +23,8 @@ buildPythonPackage rec {
     hash = "sha256-79Uu9zaBIuuc+1O5Y7Vp4Qg2/aOrwvmdi5G/4AvL+T4=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [
     zope-interface
     twisted
diff --git a/pkgs/development/python-modules/quart-trio/default.nix b/pkgs/development/python-modules/quart-trio/default.nix
new file mode 100644
index 000000000000..67170265ca70
--- /dev/null
+++ b/pkgs/development/python-modules/quart-trio/default.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+
+  # build-system
+  pdm-backend,
+
+  # dependencies
+  exceptiongroup,
+  hypercorn,
+  quart,
+  trio,
+
+  # tests
+  pytest-cov-stub,
+  pytest-trio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "quart-trio";
+  version = "0.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pgjones";
+    repo = "quart-trio";
+    tag = version;
+    hash = "sha256-n41XATex20iw3ZYxud/5cTdx+F6tTQQJmP91TIw2xJo=";
+  };
+
+  build-system = [
+    pdm-backend
+  ];
+
+  dependencies = [
+    hypercorn
+    quart
+    trio
+  ]
+  ++ hypercorn.optional-dependencies.trio
+  ++ lib.optionals (pythonOlder "3.11") [
+    exceptiongroup
+  ];
+
+  pythonImportsCheck = [
+    "quart_trio"
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytest-trio
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Quart-Trio is an extension for Quart to support the Trio event loop";
+    homepage = "https://github.com/pgjones/quart-trio";
+    changelog = "https://github.com/pgjones/quart-trio/blob/${src.tag}/CHANGELOG.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 91036cf45c07..ade8f0740fa1 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "3.14.1";
+  version = "3.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     tag = "v${version}";
-    hash = "sha256-p+Z2c+PBNdjfaRjZErWwWgihzuddV14PgTHE3NVNHs8=";
+    hash = "sha256-DOXeZaD21Qsum4brBlMSFcBAUbNEOgCXc6AqEboP1e4=";
   };
 
   patches = [
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython >=3.1.6, <3.2.0" "Cython >=3.1.6"
+  '';
+
   build-system = [
     cmake
     cython
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index dd0af137a3df..30161b345ed1 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -98,7 +98,6 @@ buildPythonPackage rec {
     shapely
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   preCheck = ''
     rm -r rasterio # prevent importing local rasterio
diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index 144f78733233..a7eb959a5cb5 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -105,7 +105,6 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # Tests touch network
diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix
index 3bd6757f9a5c..089f0516f1d5 100644
--- a/pkgs/development/python-modules/rembg/default.nix
+++ b/pkgs/development/python-modules/rembg/default.nix
@@ -84,7 +84,6 @@ buildPythonPackage rec {
 
   # not running python tests, as they require network access
   nativeCheckInputs = lib.optionals withCli [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "rembg" ];
 
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 15ed639a7cfa..b22e2001e8df 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "14.1.0";
+  version = "14.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "rich";
     tag = "v${version}";
-    hash = "sha256-44L3eVf/gI0FlOlxzJ7/+A1jN6ILkeVEelaru1Io20U=";
+    hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix
index f4830da2ccd5..8e106b949c65 100644
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -2,10 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
-  setuptools,
+  flit-core,
 
   # dependencies
   absl-py,
@@ -15,7 +14,6 @@
   jax,
   jaxlib,
   numpy,
-  tensorflow-probability,
 
   # tests
   dm-haiku,
@@ -37,7 +35,7 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    setuptools
+    flit-core
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 7cb580d1d661..b0fbb26d7bb5 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -45,7 +45,6 @@ buildPythonPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/rncp";
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Cryptography-based networking stack for wide-area networks";
diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix
index ce050584c31a..6a44c859e5f7 100644
--- a/pkgs/development/python-modules/rpds-py/default.nix
+++ b/pkgs/development/python-modules/rpds-py/default.nix
@@ -12,18 +12,18 @@
 
 buildPythonPackage rec {
   pname = "rpds-py";
-  version = "0.25.0";
+  version = "0.28.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "rpds_py";
     inherit version;
-    hash = "sha256-TZdmG/WEjdnl633tSA3sz50yzizVALiKJqy/e9KGSYU=";
+    hash = "sha256-q9TfIEhaCYPiyjNKIWJJthhtbjwWJ+EGZRlD29t5Guo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-0wMmhiUjXY5DaA43l7kBKE7IX1UoEFZBJ8xnafVlU60=";
+    hash = "sha256-mhFAV3KTVIUG/hU524cyeLv3sELv8wMtx820kPWeftE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 2183e41fef23..9e5e8e1e3948 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -47,7 +47,6 @@ buildPythonPackage rec {
     redisTestHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
index 924ae5018220..8602efb9ca32 100644
--- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "ruamel-yaml-clib";
-  version = "0.2.12";
+  version = "0.2.14";
   pyproject = true;
 
   src = fetchhg {
     url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
     rev = version;
-    hash = "sha256-VKiNt2WJttVjMR0z4bvdSYKOZqycRONCSPQacAy5PYo=";
+    hash = "sha256-fy+nzq/L3OKGujf6ExDowdxTWDnZGzVnDxL2e5t0Xcs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index 88939784ccef..4e7cc9b1b801 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "ruamel-yaml";
-  version = "0.18.14";
+  version = "0.18.16";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ruamel.yaml";
     inherit version;
-    hash = "sha256-cie3aq7DZN8Vk2cw7799crMMC3mx1Xi7uOPcstgfUrc=";
+    hash = "sha256-puWHUS88mYsiJdaKofNREcKfrRSu1WGibnP6tynsXlo=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index 1aae2aafb6f9..b4425990e528 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   __structuredAttrs = true;
 
   pname = "scikit-learn";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,16 +34,16 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "scikit_learn";
     inherit version;
-    hash = "sha256-JLPx6XakZlqnTuD8qsK4/Mxq53yOB6sl2jum0ykrmAI=";
+    hash = "sha256-IOnkns0TBZjxyjih2FCQ4aYAFHucAvpvFdactT2Wj9o=";
   };
 
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=3.0.10,<3.2.0" "Cython>=3.0.10"
+
     substituteInPlace meson.build --replace-fail \
       "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \
       "'${version}',"
-    substituteInPlace pyproject.toml \
-      --replace-fail "numpy>=2,<2.3.0" numpy \
-      --replace-fail "scipy>=1.8.0,<1.16.0" scipy
   '';
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 7526dc01c6ba..c5b1f9d3a3f6 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -106,6 +106,7 @@ buildPythonPackage {
   # that override globally the `numpy` attribute to point to `numpy_1`.
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace-fail "Cython>=3.0.8,<3.2.0" "Cython>=3.0.8" \
       --replace-fail "numpy>=2.0.0,<2.6" numpy
   '';
 
diff --git a/pkgs/development/python-modules/scspell/default.nix b/pkgs/development/python-modules/scspell/default.nix
index b2ab97e7c88e..4d85c77e9a92 100644
--- a/pkgs/development/python-modules/scspell/default.nix
+++ b/pkgs/development/python-modules/scspell/default.nix
@@ -31,8 +31,6 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  versionCheckProgramArg = "--version";
-
   pythonImportsCheck = [ "scspell" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 8e1c429a260f..94fc196b980c 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -67,14 +67,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.43.0";
+  version = "2.44.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = version;
-    hash = "sha256-ua/ojnyKZXnc1li65EMmPzhmY2Pu8B7A/NXlBzzPyRQ=";
+    hash = "sha256-i2rd4JFcGYToWMJeOuHaCKnwKtC/LFrpnWCf1taGqhc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index d7ff9f54ee3c..a4f2997eac7c 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchPypi,
   maturin,
@@ -11,8 +12,10 @@
   setuptools,
   setuptools-rust,
   setuptools-scm,
+  replaceVars,
+  python,
+  targetPackages,
 }:
-
 buildPythonPackage rec {
   pname = "setuptools-rust";
   version = "1.12.0";
@@ -40,6 +43,23 @@ buildPythonPackage rec {
 
   doCheck = false;
 
+  # integrate the setup hook to set up the build environment for cross compilation
+  # this hook is automatically propagated to consumers using setuptools-rust as build-system
+  #
+  # Only include the setup hook if python.pythonOnTargetForTarget is not empty.
+  # python.pythonOnTargetForTarget is not always available, for example in
+  # pkgsLLVM.python3.pythonOnTargetForTarget. cross build with pkgsLLVM should not be affected.
+  setupHook =
+    if python.pythonOnTargetForTarget == { } then
+      null
+    else
+      replaceVars ./setuptools-rust-hook.sh {
+        pyLibDir = "${python.pythonOnTargetForTarget}/lib/${python.pythonOnTargetForTarget.libPrefix}";
+        cargoBuildTarget = stdenv.targetPlatform.rust.rustcTargetSpec;
+        cargoLinkerVar = stdenv.targetPlatform.rust.cargoEnvVarTarget;
+        targetLinker = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc";
+      };
+
   passthru.tests = {
     pyo3 = maturin.tests.pyo3.override {
       format = "setuptools";
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/python-modules/setuptools-rust/setuptools-rust-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh
rename to pkgs/development/python-modules/setuptools-rust/setuptools-rust-hook.sh
diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix
index 482218520a27..0f762f5b0b36 100644
--- a/pkgs/development/python-modules/sphinx-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "sphinx-autoapi";
-  version = "3.6.0";
+  version = "3.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "readthedocs";
     repo = "sphinx-autoapi";
     tag = "v${version}";
-    hash = "sha256-pDfGNpDyrU4q48ZHKqfN8OrxKICfIhac2qMJDB1iE0I=";
+    hash = "sha256-dafrvrTl4bVBBaAhTCIPVrSA1pdNlbT5Rou3T//fmKQ=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index c18b168e12a3..dd4a5debced6 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "sphinx-autodoc-typehints";
-  version = "3.4.0";
+  version = "3.5.2";
 in
 
 buildPythonPackage {
@@ -20,7 +20,7 @@ buildPythonPackage {
   src = fetchPypi {
     pname = "sphinx_autodoc_typehints";
     inherit version;
-    hash = "sha256-oknrcmSdBbS4fUKgykIln1UEmg/xVTk0FGP1nkslasU=";
+    hash = "sha256-X81KPreqiUJMHi4yvtymbtw4NnVpyRaagPSz6TQXH9s=";
   };
 
   pythonRelaxDeps = [ "sphinx" ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 19f4810b86f4..99dc8cc3bb06 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -37,6 +37,7 @@
   pytestCheckHook,
   pytest-xdist,
   typing-extensions,
+  writableTmpDirAsHomeHook,
 
   # reverse dependencies to test
   breathe,
@@ -97,11 +98,19 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-xdist
     typing-extensions
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
+  disabledTestPaths = lib.optionals isPyPy [
+    # internals are asserted which are sightly different in PyPy
+    "tests/test_extensions/test_ext_autodoc.py"
+    "tests/test_extensions/test_ext_autodoc_autoclass.py"
+    "tests/test_extensions/test_ext_autodoc_autofunction.py"
+    "tests/test_extensions/test_ext_autodoc_automodule.py"
+    "tests/test_extensions/test_ext_autodoc_preserve_defaults.py"
+    "tests/test_util/test_util_inspect.py"
+    "tests/test_util/test_util_typing.py"
+  ];
 
   disabledTests = [
     # requires network access
@@ -124,8 +133,6 @@ buildPythonPackage rec {
     "test_document_toc_only"
     # Assertion error
     "test_gettext_literalblock_additional"
-    # requires cython_0, but fails miserably on 3.11
-    "test_cython"
     # Could not fetch remote image: http://localhost:7777/sphinx.png
     "test_copy_images"
     # ModuleNotFoundError: No module named 'fish_licence.halibut'
@@ -138,22 +145,20 @@ buildPythonPackage rec {
     "test_load_mappings_cache_update"
     "test_load_mappings_cache_revert_update"
   ]
-  ++ lib.optionals (pythonAtLeast "3.12") [
-    # https://github.com/sphinx-doc/sphinx/issues/12430
-    "test_autodoc_type_aliases"
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    "test_autodoc_special_members"
+    "test_is_invalid_builtin_class"
+    "test_autosummary_generate_content_for_module_imported_members"
   ]
   ++ lib.optionals isPyPy [
     # PyPy has not __builtins__ which get asserted
     # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous
     "test_autosummary_generate_content_for_module"
     "test_autosummary_generate_content_for_module_skipped"
-    # internals are asserted which are sightly different in PyPy
-    "test_autodoc_inherited_members_None"
-    "test_automethod_for_builtin"
-    "test_builtin_function"
-    "test_isattributedescriptor"
-    "test_methoddescriptor"
-    "test_partialfunction"
+    # Struct vs struct.Struct
+    "test_restify"
+    "test_stringify_annotation"
+    "test_stringify_type_union_operator"
   ];
 
   passthru.tests = {
diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix
index dd9625a6b2f3..177711a41367 100644
--- a/pkgs/development/python-modules/spsdk/default.nix
+++ b/pkgs/development/python-modules/spsdk/default.nix
@@ -132,7 +132,6 @@ buildPythonPackage rec {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # Missing rotk private key
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 9c55660d9f66..cc4c819b85d7 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "2.0.44";
+  version = "2.0.45";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-XjmSMgFOMYzJ5IR7tDImj37mM7qhiesKsaBerfzxL4g=";
+    hash = "sha256-ZAiRR456KkSdXkCiy+TXjdeOJwrLlmVxJfl1x8/XHIs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 84d8df135054..8ddfa6df9c67 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -66,7 +66,6 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ]
   ++ lib.concatAttrValues optional-dependencies;
-  versionCheckProgramArg = "--version";
 
   disabledTestPaths = [
     # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index b7c735ba12ec..eefb85904013 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -28,16 +28,14 @@
 
 buildPythonPackage rec {
   pname = "starlette";
-  version = "0.47.2";
+  version = "0.50.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "encode";
     repo = "starlette";
     tag = version;
-    hash = "sha256-FseSZrLWuNaLro2iLMcfiCrbx2Gz8+aEmLaSk/+PgN4=";
+    hash = "sha256-8REOizYQQkyLZwV4/yRiNGmGV07V0NNky7gtiAdWa7o=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix
index b9df2fc2bfda..176abf758267 100644
--- a/pkgs/development/python-modules/tabulate/default.nix
+++ b/pkgs/development/python-modules/tabulate/default.nix
@@ -35,6 +35,11 @@ buildPythonPackage rec {
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
+  # Tests against stdlib behavior which changed in https://github.com/python/cpython/pull/139070
+  disabledTests = [
+    "test_wrap_multiword_non_wide"
+  ];
+
   meta = {
     description = "Pretty-print tabular data";
     mainProgram = "tabulate";
diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix
index 605c370659ac..9b4a0f981248 100644
--- a/pkgs/development/python-modules/tenacity/default.nix
+++ b/pkgs/development/python-modules/tenacity/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
@@ -22,6 +23,18 @@ buildPythonPackage rec {
     hash = "sha256-EWnTdsKX5944jRi0SBdg1Hiw6Zp3fK06nIblVvS2l8s=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/jd/tenacity/commit/eed7d785e667df145c0e3eeddff59af64e4e860d.patch";
+      includes = [
+        "tenacity/__init__.py"
+        "tests/test_asyncio.py"
+        "tests/test_issue_478.py"
+      ];
+      hash = "sha256-TMhBjRmG7pBP3iKq83RQzkV9yO2TEcA+3mo9cz6daxs=";
+    })
+  ];
+
   build-system = [ setuptools-scm ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 8a80140b10d3..8eab37f2a674 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.21";
+  version = "3.1.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-wyI6lsMPMbRINs2hQ9Pn2YtruA/VilAgjKbTptTfyfg=";
+    hash = "sha256-+hrBKYO1y0gCJw9odWbUNA7t4DXuSj4Lwr189vO82fM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index 09ff9cdfe8a9..3c4d65d2bf83 100644
--- a/pkgs/development/python-modules/tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -69,7 +69,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md";
diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock
index cde04e361bb0..5073ae5c848c 100644
--- a/pkgs/development/python-modules/tiktoken/Cargo.lock
+++ b/pkgs/development/python-modules/tiktoken/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bit-set"
@@ -34,21 +34,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bstr"
-version = "1.11.3"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
  "regex-automata",
  "serde",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
 [[package]]
 name = "fancy-regex"
 version = "0.13.0"
@@ -68,21 +62,24 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -101,26 +98,25 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -134,19 +130,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -154,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -166,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.6"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -179,18 +174,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -200,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -211,30 +206,45 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[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",
@@ -243,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -254,13 +264,13 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "tiktoken"
-version = "0.9.0"
+version = "0.12.0"
 dependencies = [
  "bstr",
  "fancy-regex",
@@ -271,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix
index 049ba55b32b4..79f4b359716b 100644
--- a/pkgs/development/python-modules/tiktoken/default.nix
+++ b/pkgs/development/python-modules/tiktoken/default.nix
@@ -16,10 +16,10 @@
 }:
 let
   pname = "tiktoken";
-  version = "0.9.0";
+  version = "0.12.0";
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0Cpcpqk44EkOH/lXvEjIsHjIjLg5d74WJbH9iqx5LF0=";
+    hash = "sha256-sYun7isJOGOXj8sU90s3B83I1NTTg2hTzn7GB3ITmTE=";
   };
   postPatch = ''
     cp ${./Cargo.lock} Cargo.lock
@@ -48,7 +48,7 @@ buildPythonPackage {
       src
       postPatch
       ;
-    hash = "sha256-MfTTRbSM+KgrYrWHYlJkGDc1qn3oulalDJM+huTaJ0g=";
+    hash = "sha256-daIKasW/lwYwIqMs3KvCDJWAoMn1CkPRpNqhl1jKpYY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 47b4c3e35439..0d2c114d7895 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -70,7 +70,6 @@ buildPythonPackage rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/toggl";
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     "integration"
diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
index 050c44c6fe8f..2325976d499f 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -8,23 +8,26 @@
 
 buildPythonPackage rec {
   pname = "toolz";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LIbj2aBHmKxVZ5O87YOIFilqLwhQF2ZOSZXLQKEEegI=";
+    hash = "sha256-J6XHcNBowRDZ7ZMj8k8VQ+g7LzAKaHt4kcGm1Wtpe1s=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools-git-versioning >=2.0",' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  build-system = [
+    setuptools
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # https://github.com/pytoolz/toolz/issues/577
-    "test_inspect_wrapped_property"
-  ];
-
   meta = {
     homepage = "https://github.com/pytoolz/toolz";
     changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}";
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index a3db28de640c..ea2ba29af13b 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "tornado";
-  version = "6.5.1";
+  version = "6.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tornadoweb";
     repo = "tornado";
     tag = "v${version}";
-    hash = "sha256-CtmIjPKxKC0T8PGQW1wIAJm/+XxMzZXVZyZxV56sZME=";
+    hash = "sha256-jy/HnMY459yZX3HW9V61/ZSSanCJEZakBU/2pocGc/s=";
   };
 
   build-system = [ setuptools ];
@@ -38,14 +38,6 @@ buildPythonPackage rec {
     # additional tests that have extra dependencies, run slowly, or produce more output than a simple pass/fail
     # https://github.com/tornadoweb/tornado/blob/v6.2.0/maint/test/README
     "maint/test"
-
-    # AttributeError: 'TestIOStreamWebMixin' object has no attribute 'io_loop'
-    "tornado/test/iostream_test.py"
-  ];
-
-  disabledTests = [
-    # Exception: did not get expected log message
-    "test_unix_socket_bad_request"
   ];
 
   pythonImportsCheck = [ "tornado" ];
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 702a53d16b25..8d14f48a2268 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -5,10 +5,7 @@
   pythonOlder,
   packaging,
   pluggy,
-  py,
-  six,
   virtualenv,
-  toml,
   tomli,
   filelock,
   hatchling,
@@ -20,31 +17,27 @@
   cachetools,
   testers,
   tox,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "tox";
-  version = "4.28.4";
-  format = "pyproject";
+  version = "4.32.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "tox";
     tag = version;
-    hash = "sha256-EKJsFf4LvfDi3OL6iNhKEBl5zlpdLET9RkfHEP7E9xU=";
+    hash = "sha256-n2tKjT0t8bm6iatukKKcGw0PC+5EJrQEABMIAumRaqE=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "packaging>=22" "packaging"
-  '';
-
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cachetools
     chardet
     colorama
@@ -52,13 +45,13 @@ buildPythonPackage rec {
     packaging
     platformdirs
     pluggy
-    py
     pyproject-api
-    six
-    toml
     virtualenv
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+    typing-extensions
+  ];
 
   doCheck = false; # infinite recursion via devpi-client
 
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index d04f2c2b46ea..2c9e1c759c67 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -54,6 +54,16 @@ buildPythonPackage rec {
       url = "https://github.com/tpm2-software/tpm2-pytss/commit/afdee627d0639eb05711a2191f2f76e460793da9.patch?full_index=1";
       hash = "sha256-Y6drcBg4gnbSvnCGw69b42Q/QfLI3u56BGRUEkpdB0M=";
     })
+    # Fix build with gcc15 by using c99 for preprocessing
+    # The first patch is needed to apply the second; it doesn't affect us
+    (fetchpatch {
+      url = "https://github.com/tpm2-software/tpm2-pytss/commit/55d28b259f1a68f60c937ea8be7815685d32757f.patch";
+      hash = "sha256-sGxUyQ2W2Jl9ROSt1w0E0dVTgFPAmYWlNgcpHcTVv90=";
+    })
+    (fetchpatch {
+      url = "https://github.com/tpm2-software/tpm2-pytss/commit/61d00b4dcca131b3f03f674ceabf4260bdbd6a61.patch";
+      hash = "sha256-0dwfyW0Fi5FkzYnaMOb2ua9O6eyCnMgJqT09tTT56vY=";
+    })
   ]
   ++ lib.optionals isCross [
     # pytss will regenerate files from headers of tpm2-tss.
diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
index 09a4e2d944ac..086c2590a8ad 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
+  pythonAtLeast,
 
   # build-system
   hatchling,
@@ -16,16 +16,16 @@
 buildPythonPackage rec {
   pname = "traitlets";
   version = "5.14.3";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ntBXnTUCyUtLNzKsEgN1zalvkjEUUihH3ks7uYuWtrc=";
+  src = fetchFromGitHub {
+    owner = "ipython";
+    repo = "traitlets";
+    tag = "v${version}";
+    hash = "sha256-lWtgzXW1ffzl1jkFaq99X0dU8agulUMHaghsYKX+8Dk=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     argcomplete
@@ -36,6 +36,11 @@ buildPythonPackage rec {
   disabledTests = [
     # https://github.com/ipython/traitlets/issues/902
     "test_complete_custom_completers"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    # https://github.com/ipython/traitlets/issues/925
+    "test_complete_simple_app"
+    "test_complete_subcommands_subapp1"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 24bac8624a52..67d769273cad 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -36,7 +36,7 @@ let
 in
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.31.0";
+  version = "0.32.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "python-trio";
     repo = "trio";
     tag = "v${version}";
-    hash = "sha256-cl1GstWVHDD3nWx835k2hnswt/+AnoTLXjxVIfLP6Es=";
+    hash = "sha256-kZKP5TFg9M+NCx9V9B0qNbGiwZtBPtgVKgZYjX5w1ok=";
   };
 
   build-system = [ setuptools ];
@@ -63,13 +63,15 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     astor
-    jedi
     pyopenssl
     pytestCheckHook
     pytest-trio'
     pyyaml
     trustme
-  ];
+  ]
+  # jedi has no compatibility with python 3.14 yet
+  # https://github.com/davidhalter/jedi/issues/2064
+  ++ lib.optional (pythonOlder "3.14") jedi;
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index 2b5ec73544c3..a13f3db23913 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -10,13 +10,13 @@
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2025.9.11.17";
+    version = "2025.11.14.15";
     pyproject = true;
 
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-kxyphBpenJQIvCrme1DSis+FvvViGbVoYIdt0fLQJN0=";
+      hash = "sha256-a2D0nUC72JW8YdjcQU/C8ihtcOty7SNUjbjPlPYoBMo=";
     };
 
     postPatch = ''
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 4078baca698a..35cfabc35dc1 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -5,6 +5,7 @@
   pythonAtLeast,
   pythonOlder,
   fetchPypi,
+  fetchpatch,
   python,
 
   # build-system
@@ -56,9 +57,7 @@
 buildPythonPackage rec {
   pname = "twisted";
   version = "25.5.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -66,15 +65,30 @@ buildPythonPackage rec {
     hash = "sha256-HesnI1jLa+Hj6PxvnIs2946w+nwiM9Lb4R7G/uBOoxY=";
   };
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/twisted/twisted/pull/12508
+      url = "https://github.com/twisted/twisted/commit/ef6160aa2595adfba0c71da6db65b7a7252f23e9.patch";
+      hash = "sha256-zHkEWT0lvWf86RlkzU5Wx6R5ear04cfpxB7wjgdpw5c=";
+    })
+    # https://github.com/twisted/twisted/pull/12511
+    ./python314-urljoin-compat.patch
+    (fetchpatch {
+      # https://github.com/twisted/twisted/pull/12551
+      url = "https://github.com/twisted/twisted/commit/b1173fa307a9752eedd63890113eb610c3cca4a0.patch";
+      hash = "sha256-DWEygdo1b8uQOeFLy0/zcRNuuKJdSsF7cQM7RH04Puw=";
+    })
+  ];
+
   __darwinAllowLocalNetworking = true;
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-fancy-pypi-readme
     incremental
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     automat
     constantly
diff --git a/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch b/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch
new file mode 100644
index 000000000000..dbae3bf605fa
--- /dev/null
+++ b/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/src/twisted/web/client.py b/src/twisted/web/client.py
+index d3cd11fb84..5f18965759 100644
+--- a/src/twisted/web/client.py
++++ b/src/twisted/web/client.py
+@@ -220,7 +220,7 @@ def _urljoin(base, url):
+     """
+     base, baseFrag = urldefrag(base)
+     url, urlFrag = urldefrag(urljoin(base, url))
+-    return urljoin(url, b"#" + (urlFrag or baseFrag))
++    return urljoin(url, b"#" + (urlFrag or baseFrag)).strip(b"#")
+ 
+ 
+ def _makeGetterFactory(url, factoryFactory, contextFactory=None, *args, **kwargs):
diff --git a/pkgs/development/python-modules/typer-slim/default.nix b/pkgs/development/python-modules/typer-slim/default.nix
new file mode 100644
index 000000000000..55c736320c78
--- /dev/null
+++ b/pkgs/development/python-modules/typer-slim/default.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  pdm-backend,
+
+  # dependencies
+  click,
+  typing-extensions,
+
+  # optional-dependencies
+  rich,
+  shellingham,
+
+  # tests
+  pytest-xdist,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  procps,
+}:
+
+buildPythonPackage rec {
+  pname = "typer-slim";
+  version = "0.19.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fastapi";
+    repo = "typer";
+    tag = version;
+    hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44=";
+  };
+
+  postPatch = ''
+    for f in $(find tests -type f -print); do
+      # replace `sys.executable -m coverage run` with `sys.executable`
+      sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
+    done
+  '';
+
+  env.TIANGOLO_BUILD_PACKAGE = "typer-slim";
+
+  build-system = [ pdm-backend ];
+
+  dependencies = [
+    click
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    standard = [
+      rich
+      shellingham
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytest-xdist
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ lib.concatAttrValues optional-dependencies
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    procps
+  ];
+
+  disabledTests = [
+    "test_scripts"
+    # Likely related to https://github.com/sarugaku/shellingham/issues/35
+    # fails also on Linux
+    "test_show_completion"
+    "test_install_completion"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    "test_install_completion"
+  ];
+
+  pythonImportsCheck = [ "typer" ];
+
+  meta = {
+    description = "Library for building CLI applications";
+    homepage = "https://typer.tiangolo.com/";
+    changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ winpat ];
+  };
+}
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index e8f4a22ca4fd..6e1daa7b91e0 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -1,97 +1,20 @@
 {
   lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  pdm-backend,
-
-  # dependencies
-  click,
-  typing-extensions,
-
-  # optional-dependencies
-  rich,
-  shellingham,
-
-  # tests
-  pytest-xdist,
-  pytestCheckHook,
-  writableTmpDirAsHomeHook,
-  procps,
-
-  # typer or typer-slim
-  package ? "typer",
+  mkPythonMetaPackage,
+  typer-slim,
 }:
 
-buildPythonPackage rec {
-  pname = package;
-  version = "0.19.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "fastapi";
-    repo = "typer";
-    tag = version;
-    hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44=";
-  };
-
-  postPatch = ''
-    for f in $(find tests -type f -print); do
-      # replace `sys.executable -m coverage run` with `sys.executable`
-      sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
-    done
-  '';
-
-  env.TIANGOLO_BUILD_PACKAGE = package;
-
-  build-system = [ pdm-backend ];
-
-  dependencies = [
-    click
-    typing-extensions
-  ]
-  # typer includes the standard optional by default
-  # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72
-  ++ lib.optionals (package == "typer") optional-dependencies.standard;
-
-  optional-dependencies = {
-    standard = [
-      rich
-      shellingham
-    ];
-  };
-
-  doCheck = package == "typer"; # tests expect standard dependencies
-
-  nativeCheckInputs = [
-    pytest-xdist
-    pytestCheckHook
-    writableTmpDirAsHomeHook
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    procps
-  ];
-
-  disabledTests = [
-    "test_scripts"
-    # Likely related to https://github.com/sarugaku/shellingham/issues/35
-    # fails also on Linux
-    "test_show_completion"
-    "test_install_completion"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-    "test_install_completion"
-  ];
-
-  pythonImportsCheck = [ "typer" ];
-
+mkPythonMetaPackage {
+  pname = "typer";
+  inherit (typer-slim) version optional-dependencies;
+  dependencies = [ typer-slim ] ++ typer-slim.optional-dependencies.standard;
   meta = {
-    description = "Library for building CLI applications";
-    homepage = "https://typer.tiangolo.com/";
-    changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ winpat ];
+    inherit (typer-slim.meta)
+      changelog
+      description
+      homepage
+      license
+      maintainers
+      ;
   };
 }
diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix
index 5d5e70f73108..16c8e8cba07e 100644
--- a/pkgs/development/python-modules/typing-inspect/default.nix
+++ b/pkgs/development/python-modules/typing-inspect/default.nix
@@ -1,35 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   typing-extensions,
   mypy-extensions,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "typing-inspect";
-  version = "0.9.0";
+  version = "0.9.0-unstable-2025-10-20";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit version;
-    pname = "typing_inspect";
-    hash = "sha256-sj/EL/b272lU5IUsH7USzdGNvqAxNPkfhWqVzMlGH3g=";
+  src = fetchFromGitHub {
+    owner = "ilevkivskyi";
+    repo = "typing_inspect";
+    rev = "58c98c084ebeb45ee51935506ed1cc3449105fa9";
+    hash = "sha256-uGGtV32TGckoM3JALNu2OjIE+gmzJc7VMJlQeKJVFd8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     typing-extensions
     mypy-extensions
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # https://github.com/ilevkivskyi/typing_inspect/issues/84
-    "test_typed_dict_typing_extension"
-  ];
-
   pythonImportsCheck = [ "typing_inspect" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 66fd09da6dab..47f511788994 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -60,7 +60,6 @@ buildPythonPackage rec {
     versionCheckHook
   ]
   ++ lib.concatAttrValues optional-dependencies;
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "ufmt" ];
 
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index 5b130b5ffea9..d03fa46dab17 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
     hash = "sha256-YapujmwTlmUfTQwHsuh01V+jqsBbTd0Q9adGNiE8Go0=";
   };
 
+  patches = [
+    (fetchpatch {
+      # python 3.14 compat
+      url = "https://github.com/lmfit/uncertainties/commit/633da70494ae6570cc69a910e1f6231538acf374.patch";
+      hash = "sha256-P1LiIqA2p58bjupJaf18A6YxBeu+PNpueHACry24OwQ=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index b8404d98e988..30ab03edc694 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -9,27 +9,34 @@
   hatch-vcs,
 
   # optional-dependencies
+  backports-zstd,
   brotli,
   brotlicffi,
+  h2,
   pysocks,
-  zstandard,
 
   # tests
+  httpx,
+  pyopenssl,
   pytestCheckHook,
+  pytest-socket,
   pytest-timeout,
+  quart,
+  quart-trio,
   tornado,
+  trio,
   trustme,
 }:
 
 let
   self = buildPythonPackage rec {
     pname = "urllib3";
-    version = "2.5.0";
+    version = "2.6.0";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-P8R3M8fkGdS8P2s9wrT4kLt0OQajDVa6Slv6S7/5J2A=";
+      hash = "sha256-y5vO9aSzRdXaXRRdw+MINPWOgBiCjLxyTTC0y31NSfE=";
     };
 
     build-system = [
@@ -39,23 +46,34 @@ let
 
     postPatch = ''
       substituteInPlace pyproject.toml \
-        --replace-fail ', "setuptools-scm>=8,<9"' ""
+        --replace-fail ', "setuptools-scm>=8,<10"' ""
     '';
 
     optional-dependencies = {
       brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
+      h2 = [ h2 ];
       socks = [ pysocks ];
-      zstd = [ zstandard ];
+      zstd = [ backports-zstd ];
     };
 
     nativeCheckInputs = [
+      httpx
+      pyopenssl
+      pytest-socket
       pytest-timeout
       pytestCheckHook
+      quart
+      quart-trio
       tornado
+      trio
       trustme
     ]
     ++ lib.concatAttrValues optional-dependencies;
 
+    disabledTestMarks = [
+      "requires_network"
+    ];
+
     # Tests in urllib3 are mostly timeout-based instead of event-based and
     # are therefore inherently flaky. On your own machine, the tests will
     # typically build fine, but on a loaded cluster such as Hydra random
diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix
index e9111bd69b13..02db3b5064ae 100644
--- a/pkgs/development/python-modules/uv-build/default.nix
+++ b/pkgs/development/python-modules/uv-build/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "uv-build";
-  version = "0.9.7";
+  version = "0.9.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-I0Oe6vaH7iQh+Ubp5RIk8Ol6Ni7OPu8HKX0fqLdewyk=";
+    hash = "sha256-i9vdpHA9EfXmw5fhK1tTZG0T2zOlDbjPCGBIizvQzZw=";
   };
 
   nativeBuildInputs = [
@@ -26,13 +26,13 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-K/RP7EA0VAAI8TGx+VwfKPmyT6+x4p3kekuoMZ0/egc=";
+    hash = "sha256-RZkIjHQElqrj+UAz+q6w1CYW3E5/YW9uy2E5KpKvw+w=";
   };
 
   buildAndTestSubdir = "crates/uv-build";
 
   # $src/.github/workflows/build-binaries.yml#L139
-  maturinBuildFlags = [ "--profile=minimal-size" ];
+  maturinBuildProfile = "minimal-size";
 
   pythonImportsCheck = [ "uv_build" ];
 
diff --git a/pkgs/development/python-modules/uvicorn-worker/default.nix b/pkgs/development/python-modules/uvicorn-worker/default.nix
index 320dee57a853..28a680bc4ea3 100644
--- a/pkgs/development/python-modules/uvicorn-worker/default.nix
+++ b/pkgs/development/python-modules/uvicorn-worker/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "uvicorn-worker";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kludex";
     repo = "uvicorn-worker";
     tag = version;
-    hash = "sha256-a5L4H1Bym5Dx9/pGL/Vz6ZO699t/1Wmc1ExIb0t/ISc=";
+    hash = "sha256-qfk3lkHwuGbRWj4D65EontmEgKtk7ILq6gZCrxcrrJU=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index d9ff8740716b..7735b19c1402 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -18,16 +18,14 @@
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.35.0";
-  disabled = pythonOlder "3.8";
-
+  version = "0.38.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = "uvicorn";
     tag = version;
-    hash = "sha256-6tuLL0KMggujYI97HSSBHjiLrePwEkxFHjq2HWl8kqE=";
+    hash = "sha256-A0YpFA/Oug5a37+33ac8++lh30jzRl48IhC8pflZ0S0=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index ed4c643c2245..31bbc7a7f2d7 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   buildPythonPackage,
+  pythonAtLeast,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   cython,
@@ -79,6 +79,10 @@ buildPythonPackage rec {
     "tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename"
     # Broken: https://github.com/NixOS/nixpkgs/issues/160904
     "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonAtLeast "3.14") [
+    # https://github.com/MagicStack/uvloop/issues/709
+    "tests/test_process.py::TestAsyncio_AIO_Process::test_cancel_post_init"
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index df7a53cac07f..31d094589845 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -1,12 +1,14 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  fetchpatch,
+  setuptools,
   pytest-httpbin,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   six,
+  urllib3,
   yarl,
   wrapt,
 }:
@@ -14,20 +16,31 @@
 buildPythonPackage rec {
   pname = "vcrpy";
   version = "7.0.0";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-F2ORrQQl7d4WgMWyBzjqPcf7lCUgpI0pk0SAUJhrOlA=";
+  src = fetchFromGitHub {
+    owner = "kevin1024";
+    repo = "vcrpy";
+    tag = "v${version}";
+    hash = "sha256-uKVPU1DU0GcpRqPzPMSNTLLVetZeQjUMC9vcaGwy0Yk=";
   };
 
-  propagatedBuildInputs = [
+  patches = [
+    (fetchpatch {
+      # python 3.14 compat
+      url = "https://github.com/kevin1024/vcrpy/commit/558c7fc625e66775da11ee406001f300e6188fb2.patch";
+      hash = "sha256-keShvz8zwqkenEtQ+NAnGKwSLYGbtXfpfMP8Zje2p+o=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     pyyaml
     six
-    yarl
+    urllib3
     wrapt
+    yarl
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 7d77263711a9..ca1667b4ca65 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -3,29 +3,28 @@
   buildPythonPackage,
   pythonOlder,
   isPyPy,
-  cython,
   distlib,
-  fetchPypi,
+  fetchFromGitHub,
   filelock,
   flaky,
   hatch-vcs,
   hatchling,
   platformdirs,
-  pytest-freezegun,
   pytest-mock,
-  pytest-timeout,
   pytestCheckHook,
   time-machine,
 }:
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.33.1";
+  version = "20.35.4";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-G0RHjZ4mGz+4uqXnSgyjvA4F8hqjYWe/nL+FDlQnZbg=";
+  src = fetchFromGitHub {
+    owner = "pypa";
+    repo = "virtualenv";
+    tag = version;
+    hash = "sha256-0PWIYU1/zXiOBUV/45rJsJwVlcqHeac68nRM2tvEPHo=";
   };
 
   build-system = [
@@ -40,34 +39,21 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    cython
     flaky
-    pytest-freezegun
     pytest-mock
-    pytest-timeout
     pytestCheckHook
   ]
   ++ lib.optionals (!isPyPy) [ time-machine ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTestPaths = [
     # Ignore tests which require network access
     "tests/unit/create/test_creator.py"
-    "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
+    "tests/unit/create/via_global_ref/test_build_c_ext.py"
   ];
 
   disabledTests = [
     # Network access
-    "test_create_no_seed"
     "test_seed_link_via_app_data"
-    # Permission Error
-    "test_bad_exe_py_info_no_raise"
-    # https://github.com/pypa/virtualenv/issues/2933
-    # https://github.com/pypa/virtualenv/issues/2939
-    "test_py_info_cache_invalidation_on_py_info_change"
   ]
   ++ lib.optionals (pythonOlder "3.11") [ "test_help" ]
   ++ lib.optionals isPyPy [
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 9e81d3601b94..0cf349f2f859 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -102,7 +102,6 @@ let
     nativeInstallCheckInputs = [
       versionCheckHook
     ];
-    versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
     meta = {
@@ -133,7 +132,6 @@ let
     nativeInstallCheckInputs = [
       versionCheckHook
     ];
-    versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
     checkFlags =
diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix
index b6dcbfd889e6..0a85d55898a0 100644
--- a/pkgs/development/python-modules/watchfiles/default.nix
+++ b/pkgs/development/python-modules/watchfiles/default.nix
@@ -15,19 +15,19 @@
 
 buildPythonPackage rec {
   pname = "watchfiles";
-  version = "1.0.5";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = "watchfiles";
     tag = "v${version}";
-    hash = "sha256-a6SHqYRNMGXNkVvwj9RpLj449dAQtWXO44v1ko5suaw=";
+    hash = "sha256-UlQnCYSNU9H4x31KenSfYExGun94ekrOCwajORemSco=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src version;
-    hash = "sha256-2RMWxeOjitbEqer9+ETpMX9WxHEiPzVmEv7LpSiaRVg=";
+    hash = "sha256-6sxtH7KrwAWukPjLSMAebguPmeAHbC7YHOn1QiRPigs=";
   };
 
   nativeBuildInputs = [
@@ -51,7 +51,6 @@ buildPythonPackage rec {
     pytestCheckHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   preCheck = ''
     rm -rf watchfiles
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 47c6a12e51fb..2e34422404f8 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -76,7 +76,6 @@ buildPythonPackage rec {
     versionCheckHook
     writableTmpDirAsHomeHook
   ];
-  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # needs the Ahem font (fails on macOS)
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 012d46b52a06..5b501200dc82 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -2,27 +2,52 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonOlder,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependenices
   numpy,
   packaging,
   pandas,
+
+  # optional-dependencies
+  bottleneck,
+  cartopy,
+  cftime,
+  dask,
+  fsspec,
+  h5netcdf,
+  matplotlib,
+  netcdf4,
+  numba,
+  numbagg,
+  opt-einsum,
+  pooch,
+  scipy,
+  seaborn,
+  sparse,
+  zarr,
+
+  # tests
+  pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
-  setuptools,
-  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "2025.07.1";
+  version = "2025.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "pydata";
     repo = "xarray";
     tag = "v${version}";
-    hash = "sha256-UvBRGYZFkjxUYT+S4By+7xQZW6h0usQ26iFeJvWcxo0=";
+    hash = "sha256-7MTZ/0BbJb3mg2FHvtsV+v4TsgoxD0Tpco7J4DgT/hY=";
   };
 
   postPatch = ''
@@ -41,7 +66,38 @@ buildPythonPackage rec {
     pandas
   ];
 
+  optional-dependencies = lib.fix (self: {
+    accel = [
+      bottleneck
+      # flox
+      numba
+      numbagg
+      opt-einsum
+      scipy
+    ];
+    io = [
+      netcdf4
+      h5netcdf
+      # pydap
+      scipy
+      zarr
+      fsspec
+      cftime
+      pooch
+    ];
+    etc = [ sparse ];
+    parallel = [ dask ] ++ dask.optional-dependencies.complete;
+    viz = [
+      cartopy
+      matplotlib
+      # nc-time-axis
+      seaborn
+    ];
+    complete = with self; accel ++ io ++ etc ++ parallel ++ viz;
+  });
+
   nativeCheckInputs = [
+    pytest-asyncio
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index 76aa9530071d..ad246ee27365 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -52,7 +52,6 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "yamlfix" ];
 
diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix
index a9d2eefb9371..8946bcc4b3ea 100644
--- a/pkgs/development/python-modules/zenoh/default.nix
+++ b/pkgs/development/python-modules/zenoh/default.nix
@@ -9,19 +9,19 @@
 
 buildPythonPackage rec {
   pname = "zenoh";
-  version = "1.4.0"; # nixpkgs-update: no auto update
+  version = "1.6.2"; # nixpkgs-update: no auto update
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-python";
     rev = version;
-    hash = "sha256-X9AUjuJYA8j41JVS+ZLRYcQUzSRoGwmkNIH0UK5+QoU=";
+    hash = "sha256-GGqZGtHSCaPeO6wFFBxPjdjhsIdcgI1RJ4mZbGq4uzc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src pname version;
-    hash = "sha256-Z6Wtor/aAdO1JUUafFEo9RdI7OXmsAD5MMtMUF6CZEg=";
+    hash = "sha256-2Hieow0+GzcNQmvqsJd+5bpE9RWUDbaBR9jah+O4GtI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index ed00f0677ca1..49baf1a63efa 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -18,18 +18,21 @@
 
 buildPythonPackage rec {
   pname = "zodb";
-  version = "6.0.1";
+  version = "6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zodb";
     tag = version;
-    hash = "sha256-2OK1ezHFEpOMOrpB8Nzf/6+4AlV3S7p11dQHkeMqhoo=";
+    hash = "sha256-O6mu4RWi5qNcPyIgre5+bk4ZGZOZdG1vIdc8HqbfcaQ=";
   };
 
-  # remove broken test
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+
+    # remove broken test
     rm -vf src/ZODB/tests/testdocumentation.py
   '';
 
diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix
index 39403aa09ddf..d78bf62bb4e4 100644
--- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix
+++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix
@@ -8,19 +8,19 @@
 
 buildPythonPackage rec {
   pname = "zope-cachedescriptors";
-  version = "5.1";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.cachedescriptors";
     tag = version;
-    hash = "sha256-2cb8XosPCAV2BfMisCN9mr0KIu5xcsLPIcPkmpeVT+k=";
+    hash = "sha256-PlezUzuO4P/BOVT6Ll8dYIKssC/glmVd8SCM0afgNC0=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix
index 81f90593b528..4db532448b8c 100644
--- a/pkgs/development/python-modules/zope-component/default.nix
+++ b/pkgs/development/python-modules/zope-component/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   zope-event,
   zope-hookable,
@@ -17,15 +17,21 @@
 
 buildPythonPackage rec {
   pname = "zope-component";
-  version = "6.0";
+  version = "7.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "zope.component";
-    inherit version;
-    hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY=";
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "zope.component";
+    tag = version;
+    hash = "sha256-3Hl2sm2M0we+fpdt4GSjAStLSAJ1c4Za1vfm9Bj8z8s=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -35,6 +41,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
+    hook = [ ];
     persistentregistry = [ persistent ];
     security = [
       zope-location
diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix
index e56ebb23371d..fad73639a875 100644
--- a/pkgs/development/python-modules/zope-configuration/default.nix
+++ b/pkgs/development/python-modules/zope-configuration/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "zope-configuration";
-  version = "6.0";
+  version = "7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.configuration";
     tag = version;
-    hash = "sha256-dkEVIHaXk/oP4uYYzI1hgSnPZXBMDjDu97zmOXnj9NA=";
+    hash = "sha256-G87VAEqMxF5Y3LuDJnDcOox5+ngJuRhUGSj9K8c3mYY=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools < 74" "setuptools"
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix
index f53485b5462a..e5f867ec3e90 100644
--- a/pkgs/development/python-modules/zope-contenttype/default.nix
+++ b/pkgs/development/python-modules/zope-contenttype/default.nix
@@ -8,19 +8,19 @@
 
 buildPythonPackage rec {
   pname = "zope-contenttype";
-  version = "5.2";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.contenttype";
     tag = version;
-    hash = "sha256-mY6LlJn44hUfXpxEa99U6FNcsV9xJbR5w/iIS6hG+m4=";
+    hash = "sha256-fEbFFc6/R/fv9q9diKVcEPH12hVt/kbyGyNXqM8xzWM=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix
index d92b4b1ebc1a..453542bbec60 100644
--- a/pkgs/development/python-modules/zope-copy/default.nix
+++ b/pkgs/development/python-modules/zope-copy/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "zope-copy";
-  version = "5.0";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.copy";
     tag = version;
-    hash = "sha256-uQUvfZGrMvtClXa8tLKZFYehbcBIRx7WQnumUrdQjIk=";
+    hash = "sha256-hYeLUSwAq5rK4TRngvNQGR4Fdimb2k5dHtFdptMVqPo=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools < 74" "setuptools"
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix
index 7f79f55b32b9..0fbd5e147763 100644
--- a/pkgs/development/python-modules/zope-deferredimport/default.nix
+++ b/pkgs/development/python-modules/zope-deferredimport/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   zope-proxy,
   unittestCheckHook,
@@ -9,15 +9,21 @@
 
 buildPythonPackage rec {
   pname = "zope-deferredimport";
-  version = "5.0";
+  version = "6.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "zope.deferredimport";
-    inherit version;
-    hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM=";
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "zope.deferredimport";
+    tag = version;
+    hash = "sha256-7Q8+Cew5987+CjUOxqpwMFXWdw+/B28tOEXRYC0SRyI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [ zope-proxy ];
diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix
index d2f6adc39c59..fe3010399a01 100644
--- a/pkgs/development/python-modules/zope-deprecation/default.nix
+++ b/pkgs/development/python-modules/zope-deprecation/default.nix
@@ -3,31 +3,37 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  pytestCheckHook,
+  zope-testrunner,
 }:
 
 buildPythonPackage rec {
   pname = "zope-deprecation";
-  version = "5.1";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.deprecation";
     tag = version;
-    hash = "sha256-5gqZuO3fGXkQl493QrvK7gl77mDteUp7tpo4DhSRI+o=";
+    hash = "sha256-N/+RtilRY/8NfhUjd/Y4T6dmZHt6PW4ofP1UE8Aj1e8=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" "setuptools"
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ zope-testrunner ];
 
-  enabledTestPaths = [ "src/zope/deprecation/tests.py" ];
+  checkPhase = ''
+    runHook preCheck
+
+    zope-testrunner --test-path=src
+
+    runHook postCheck
+  '';
 
   pythonImportsCheck = [ "zope.deprecation" ];
 
diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix
index 242aa87aa2ab..121e4e642bc7 100644
--- a/pkgs/development/python-modules/zope-dottedname/default.nix
+++ b/pkgs/development/python-modules/zope-dottedname/default.nix
@@ -1,22 +1,28 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "zope-dottedname";
-  version = "6.0";
+  version = "7.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "zope.dottedname";
-    inherit version;
-    hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI=";
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "zope.dottedname";
+    tag = version;
+    hash = "sha256-bWURUr+BCQsMNBYqJD2+YPdfA+FWrJuBGypQ/c8w6kA=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix
index ee9ea2639f02..61c26a939355 100644
--- a/pkgs/development/python-modules/zope-event/default.nix
+++ b/pkgs/development/python-modules/zope-event/default.nix
@@ -8,16 +8,21 @@
 
 buildPythonPackage rec {
   pname = "zope-event";
-  version = "5.0";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.event";
     tag = version;
-    hash = "sha256-85jXSrploTcskdOBI84KGGf9Bno41ZTtT/TrbgmTxiA=";
+    hash = "sha256-1ZdhJwxzYsMT2s+z4MLR71cLFzIEmwE0KFilwg7BQ1E=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "zope.event" ];
diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix
index 8141e1a90165..96f7aaf9ae26 100644
--- a/pkgs/development/python-modules/zope-exceptions/default.nix
+++ b/pkgs/development/python-modules/zope-exceptions/default.nix
@@ -2,31 +2,32 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   zope-interface,
 }:
 
 buildPythonPackage rec {
   pname = "zope-exceptions";
-  version = "5.2";
+  version = "6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.exceptions";
     tag = version;
-    hash = "sha256-jbzUUB6ifTfxiGEiyAmsDoDLyRVuZPgIsN8mCNJkv4Q=";
+    hash = "sha256-LLKS/O1sfrHRfEgbb3GO+/hBtIC9CvfNjorqiKTgujo=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [
     setuptools
   ];
 
   dependencies = [
-    setuptools
     zope-interface
   ];
 
diff --git a/pkgs/development/python-modules/zope-filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix
index bd5fcb23d63e..72757227cd69 100644
--- a/pkgs/development/python-modules/zope-filerepresentation/default.nix
+++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix
@@ -10,19 +10,19 @@
 
 buildPythonPackage rec {
   pname = "zope-filerepresentation";
-  version = "6.1";
+  version = "7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.filerepresentation";
     tag = version;
-    hash = "sha256-6J4munk2yyZ6e9rpU2Op+Gbf0OXGI6GpHjmpUZVRjsY=";
+    hash = "sha256-VWi00b7m+aKwkg/Gfzo5fJWMqdMqgowBpkqsYcEO2gY=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix
index bcc3adaa2b32..e0454193f299 100644
--- a/pkgs/development/python-modules/zope-hookable/default.nix
+++ b/pkgs/development/python-modules/zope-hookable/default.nix
@@ -8,19 +8,19 @@
 
 buildPythonPackage rec {
   pname = "zope-hookable";
-  version = "7.0";
+  version = "8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.hookable";
     tag = version;
-    hash = "sha256-qJJc646VSdNKors6Au4UAGvm7seFbvjEfpdqf//vJNE=";
+    hash = "sha256-5ps/H9bL2oN9IHxXzpWw/9uMLhwV+OpQ26kXlsP4hgw=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<74" "setuptools"
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix
index ff6c15ac9746..f236aae772a3 100644
--- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix
+++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix
@@ -3,32 +3,25 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  zope-testrunner,
   unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "zope-i18nmessageid";
-  version = "7.0";
+  version = "8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.i18nmessageid";
     tag = version;
-    hash = "sha256-rdTs1pNMKpPAR2CewXdg1KmI61Sw5r62OobYlJHsUaQ=";
+    hash = "sha256-lMHmKWwR9D9HW+paV1mDVAirOe0wBD8VrJ67NZoROtg=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<74" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
     unittestCheckHook
-    zope-testrunner
   ];
 
   unittestFlagsArray = [ "src/zope/i18nmessageid" ];
diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix
index 3c5f5b0c478f..59f156489e38 100644
--- a/pkgs/development/python-modules/zope-interface/default.nix
+++ b/pkgs/development/python-modules/zope-interface/default.nix
@@ -7,21 +7,16 @@
 
 buildPythonPackage rec {
   pname = "zope-interface";
-  version = "7.2";
+  version = "8.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.interface";
     tag = version;
-    hash = "sha256-WrS/YHkEmV1G/Scg0xpyu2uFVWTWnEpajqNDvGioVgc=";
+    hash = "sha256-IYtfd9mJLcwk3FGPWlD5PbrKdIwDQf1Thn6fWFa5Rpo=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools < 74" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "zope.interface" ];
@@ -31,8 +26,8 @@ buildPythonPackage rec {
   pythonNamespaces = [ "zope" ];
 
   meta = {
-    changelog = "https://github.com/zopefoundation/zope.interface/blob/${version}/CHANGES.rst";
-    description = "Zope.Interface";
+    changelog = "https://github.com/zopefoundation/zope.interface/blob/${src.tag}/CHANGES.rst";
+    description = "Implementation of object interfaces, a mechanism for labeling objects as conforming to a given API or contract";
     homepage = "https://github.com/zopefoundation/zope.interface";
     license = lib.licenses.zpl21;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix
index 6baee99659d9..10e880d4a1fe 100644
--- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix
+++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "zope-lifecycleevent";
-  version = "5.1";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.lifecycleevent";
     tag = version;
-    hash = "sha256-vTonbZSeQxnLA6y1wAnBpobEKAs+gaAYN25dx5Fla9k=";
+    hash = "sha256-HgxOUseRYc+mkwESUDqauoH2D2E4PL8XxM1C0FC35w8=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-location/default.nix b/pkgs/development/python-modules/zope-location/default.nix
index 8b4ff8bf7e88..c4d05a2e06ce 100644
--- a/pkgs/development/python-modules/zope-location/default.nix
+++ b/pkgs/development/python-modules/zope-location/default.nix
@@ -8,21 +8,27 @@
   zope-schema,
   zope-component,
   zope-configuration,
+  zope-copy,
   unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "zope-location";
-  version = "5.0";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.location";
     tag = version;
-    hash = "sha256-C8tQ4qqzkQx+iU+Pm3iCEchtqOZT/qcYFSzJWzqlhnI=";
+    hash = "sha256-s7HZda+U87P62elX/KbDp2o9zAplgFVmnedDI/uq2sk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -34,18 +40,13 @@ buildPythonPackage rec {
   optional-dependencies = {
     zcml = [ zope-configuration ];
     component = [ zope-component ];
+    copy = [ zope-copy ];
   };
 
   pythonImportsCheck = [ "zope.location" ];
 
   nativeCheckInputs = [ unittestCheckHook ];
 
-  # prevent cirtular import
-  preCheck = ''
-    rm src/zope/location/tests/test_configure.py
-    rm src/zope/location/tests/test_pickling.py
-  '';
-
   unittestFlagsArray = [ "src/zope/location/tests" ];
 
   pythonNamespaces = [ "zope" ];
diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix
index b480cdd9396e..71f559e4423c 100644
--- a/pkgs/development/python-modules/zope-proxy/default.nix
+++ b/pkgs/development/python-modules/zope-proxy/default.nix
@@ -8,21 +8,16 @@
 
 buildPythonPackage rec {
   pname = "zope-proxy";
-  version = "6.1";
+  version = "7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.proxy";
     tag = version;
-    hash = "sha256-RgkUojCAfwAGv8Jek2Ucg0KMtPviwXjuiO70iisParM=";
+    hash = "sha256-1u9Yn6j8tBMmAZmb/0L/lZUE/yC0OP8K825QBixxKQM=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<74" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [ zope-interface ];
diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix
index 739e55795ced..dc72078d66b8 100644
--- a/pkgs/development/python-modules/zope-schema/default.nix
+++ b/pkgs/development/python-modules/zope-schema/default.nix
@@ -11,16 +11,21 @@
 
 buildPythonPackage rec {
   pname = "zope-schema";
-  version = "7.0.1";
+  version = "8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.schema";
     tag = version;
-    hash = "sha256-aUjlSgMfoKQdE0ta8jxNjh+L7OKkfOVvUWnvhx+QRsI=";
+    hash = "sha256-qZ7OWpDTBV/wT3FZBUhe6D4olCTBaYkilj+JSwjHKOU=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix
index 515709589bc2..85af161d7004 100644
--- a/pkgs/development/python-modules/zope-security/default.nix
+++ b/pkgs/development/python-modules/zope-security/default.nix
@@ -19,22 +19,25 @@
 
 buildPythonPackage rec {
   pname = "zope-security";
-  version = "7.3";
+  version = "8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.security";
     tag = version;
-    hash = "sha256-p+9pCcBsCJY/V6vraVZHMr5VwYHFe217AbRVoSnDphs=";
+    hash = "sha256-qik1tuH0w0W21Md6YXc5csCbMrFifxaJvGgi2nB4FrI=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<74" "setuptools"
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    zope-proxy
+  ];
 
   dependencies = [
     zope-component
diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix
index 1077201a61bd..8632f12c9a71 100644
--- a/pkgs/development/python-modules/zope-size/default.nix
+++ b/pkgs/development/python-modules/zope-size/default.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "zope-size";
-  version = "5.1";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.size";
     tag = version;
-    hash = "sha256-9r7l3RgE9gvxJ2I5rFvNn/XIztecXW3GseGeM3MzfTU=";
+    hash = "sha256-jjI9NvfxnIWZrqDEpZ6FDlhDWZoqEUBliiyh+5PxOAg=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
@@ -35,14 +35,22 @@ buildPythonPackage rec {
     zope-interface
   ];
 
+  optional-dependencies = {
+    zcml = [
+      zope-component
+      zope-configuration
+      zope-security
+    ]
+    ++ zope-component.optional-dependencies.zcml
+    ++ zope-security.optional-dependencies.zcml;
+  };
+
   pythonImportsCheck = [ "zope.size" ];
 
   nativeCheckInputs = [
     unittestCheckHook
-    zope-component
-    zope-configuration
-    zope-security
-  ];
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
 
   unittestFlagsArray = [ "src/zope/size" ];
 
diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix
index 7e5c17e2e2c5..c1598c60ecab 100644
--- a/pkgs/development/python-modules/zope-testbrowser/default.nix
+++ b/pkgs/development/python-modules/zope-testbrowser/default.nix
@@ -11,6 +11,7 @@
   beautifulsoup4,
   soupsieve,
   wsgiproxy2,
+  legacy-cgi,
   mock,
   zope-testing,
   zope-testrunner,
@@ -19,17 +20,20 @@
 
 buildPythonPackage rec {
   pname = "zope-testbrowser";
-  version = "7.0.1";
+  version = "8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.testbrowser";
     tag = version;
-    hash = "sha256-GxSH3JBuQ3B4CeHzr58FEYv0gsTlUhlO/0CCHcTdOfg=";
+    hash = "sha256-CcNlK7EKYng0GKYTZ2U2slkyQ9wTqwzOXGHt9S5p3L0=";
   };
 
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+
     # remove test that requires network access
     substituteInPlace src/zope/testbrowser/tests/test_doctests.py \
       --replace-fail "suite.addTests(wire)" ""
@@ -47,6 +51,7 @@ buildPythonPackage rec {
     beautifulsoup4
     soupsieve
     wsgiproxy2
+    legacy-cgi
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix
index e95da7af7d88..4966f8e5224e 100644
--- a/pkgs/development/python-modules/zope-testing/default.nix
+++ b/pkgs/development/python-modules/zope-testing/default.nix
@@ -9,19 +9,19 @@
 
 buildPythonPackage rec {
   pname = "zope-testing";
-  version = "5.1";
+  version = "6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.testing";
     tag = version;
-    hash = "sha256-G9RfRsXSzQ92HeBF5dRTI+1XEz1HM3DuB0ypZ61uHfw=";
+    hash = "sha256-px1+lS1U0lmmQrXJuxFTsX3N8e2mj5Yhckfis5++EX8=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix
index 85ef9af02889..6947177911c6 100644
--- a/pkgs/development/python-modules/zope-testrunner/default.nix
+++ b/pkgs/development/python-modules/zope-testrunner/default.nix
@@ -9,19 +9,19 @@
 
 buildPythonPackage rec {
   pname = "zope-testrunner";
-  version = "6.6.1";
+  version = "8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.testrunner";
     tag = version;
-    hash = "sha256-cvZXQzbIUBq99P0FYSydG1tLNBMFTTvuMvqWGaNFhJc=";
+    hash = "sha256-MqlS/VkLAv9M1WtJ6t2nPMZPH+Cz5wfy2VhtCx/Fwmw=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<74" "setuptools"
+      --replace-fail "setuptools ==" "setuptools >="
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix
index 8d7445a50e97..e1b96aecfe28 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/pkgs/development/r-modules/wrapper.nix
@@ -11,6 +11,11 @@ symlinkJoin {
   preferLocalBuild = true;
   allowSubstitutes = false;
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   buildInputs = [ R ] ++ recommendedPackages ++ packages;
   paths = [ R ];
 
@@ -24,6 +29,8 @@ symlinkJoin {
       makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \
         --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
     done
+
+    ln -s ${R.man} $man
   '';
 
   # Make the list of recommended R packages accessible to other packages such as rpy2
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index 63da17d84e4d..c4ee2ce75d10 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -359,6 +359,14 @@ overrideLlvmPackagesRocm (s: {
             url = "https://github.com/llvm/llvm-project/commit/816fde1cbb700ebcc8b3df81fb93d675c04c12cd.patch";
             relative = "clang";
           })
+          (fetchpatch {
+            # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()"
+            # Fix errors with gcc15
+            # https://github.com/ROCm/composable_kernel/issues/2887
+            hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg=";
+            url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch";
+            relative = "clang";
+          })
         ]
         ++ old.patches
         ++ [
diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
index 94b520cf4049..809a094e2752 100644
--- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix
@@ -79,6 +79,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch";
       hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns=";
     })
+    # Fix build with gcc15
+    (fetchpatch {
+      # [PATCH] rocr:Add missing cstdint include
+      url = "https://github.com/ROCm/ROCR-Runtime/commit/5cc61b714d5b59ed5405639a37a582d839e6ebe9.patch";
+      hash = "sha256-IPxDShpoFB0PjCG+zwFbnW9IBTCG3G2o9sfITGs+bN4=";
+    })
     # This causes a circular dependency, aqlprofile relies on hsa-runtime64
     # which is part of rocm-runtime
     # Worked around by having rocprofiler load aqlprofile directly
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 2d6714b55688..d02c0cd49257 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -101,5 +101,6 @@ runCommand basicEnv.name cmdArgs ''
         lib.optionalString (basicEnv.gemType == "git" || basicEnv.gemType == "url") "bundler/"
       }gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \;
     done
+    compressManPages "''${!outputMan}"
   ''}
 ''
diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix
index 5033f56d18f1..42f38f449283 100644
--- a/pkgs/development/tools/analysis/clazy/default.nix
+++ b/pkgs/development/tools/analysis/clazy/default.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 8929ff08c0a9..795db4d57dd5 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -35,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
   # TODO: stdenv’s setup.sh should be aware of patch directories. It’s very
   # convenient to keep them in a separate directory but we can defer listing the
   # directory until derivation realization to avoid unnecessary Nix evaluations.
-  patches = lib.filesystem.listFilesRecursive ./patches;
+  patches =
+    lib.filesystem.listFilesRecursive ./patches
+    ++ lib.optionals stdenv.hostPlatform.isMusl (lib.filesystem.listFilesRecursive ./musl-patches);
 
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch b/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch
new file mode 100644
index 000000000000..f37b7a49e341
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch
@@ -0,0 +1,50 @@
+From 776f707b5bb67d4c0c15f981b5a1b6d7f3a9cebc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Mar 2025 14:24:57 -0700
+Subject: [PATCH 4/5] Fix signatures for getenv/getopt
+
+GCC-15 complains about missing parameters, this gets found
+out when using non-glibc ( e.g. musl ) C library
+
+Fixes
+lib/fnmatch.c:124:14: error: conflicting types for 'getenv'; have 'char *(void)'
+|   124 | extern char *getenv ();
+|       |              ^~~~~~
+
+src/getopt.c: Define parameters of getenv() and getopt().
+src/getopt.h: Ditto.
+---
+Link: https://lists.gnu.org/archive/html/bug-make/2025-03/msg00032.html
+ src/getopt.c | 2 +-
+ src/getopt.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/getopt.c b/src/getopt.c
+index 7a792de8..76251ccb 100644
+--- a/src/getopt.c
++++ b/src/getopt.c
+@@ -202,7 +202,7 @@ static char *posixly_correct;
+    whose names are inconsistent.  */
+ 
+ #ifndef getenv
+-extern char *getenv ();
++extern char *getenv (const char *);
+ #endif
+ 
+ static char *
+diff --git a/src/getopt.h b/src/getopt.h
+index df18ceeb..d8bb2263 100644
+--- a/src/getopt.h
++++ b/src/getopt.h
+@@ -102,7 +102,7 @@ struct option
+    errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+ #else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
++extern int getopt (int,  char * const*, const char *);
+ #endif /* __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ 		        const struct option *longopts, int *longind);
+-- 
+2.51.2
+
diff --git a/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch b/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch
new file mode 100644
index 000000000000..c594ba27c2a9
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch
@@ -0,0 +1,34 @@
+From a4169ae60a7cb2c2bc788daa2c91441cc807acbc Mon Sep 17 00:00:00 2001
+From: Yureka <yuka@yuka.dev>
+Date: Mon, 22 Dec 2025 20:53:31 +0100
+Subject: [PATCH 5/5] Fix signatures for getenv/getopt
+
+As the previous commit, this fixes GCC-15 complaining about mismatching
+definitions with non-glibc (musl) C library.
+
+Fixes
+lib/fnmatch.c:124:14: error: conflicting types for 'getenv'; have 'char *(void)'
+|   124 | extern char *getenv ();
+|       |              ^~~~~~
+
+lib/fnmatch.c: Define parameters of getenv()
+---
+ lib/fnmatch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fnmatch.c b/lib/fnmatch.c
+index 01da376b..cb1c856b 100644
+--- a/lib/fnmatch.c
++++ b/lib/fnmatch.c
+@@ -121,7 +121,7 @@ USA.  */
+    whose names are inconsistent.  */
+ 
+ # if !defined _LIBC && !defined getenv
+-extern char *getenv ();
++extern char *getenv (const char *);
+ # endif
+ 
+ # ifndef errno
+-- 
+2.51.2
+
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index b2e6ef8bab50..d4d8981b3171 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/luarocks";
-  versionCheckProgramArg = "--version";
 
   # unpack hook for src.rock and rockspec files
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix
index bbd7bef633ef..5e60898c76dc 100644
--- a/pkgs/development/tools/misc/sqitch/default.nix
+++ b/pkgs/development/tools/misc/sqitch/default.nix
@@ -3,7 +3,6 @@
   lib,
   perlPackages,
   makeWrapper,
-  shortenPerlShebang,
   mysqlSupport ? false,
   postgresqlSupport ? false,
   sqliteSupport ? false,
@@ -25,7 +24,7 @@ stdenv.mkDerivation {
   pname = "sqitch";
   version = sqitch.version;
 
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+  nativeBuildInputs = [ makeWrapper ];
 
   src = sqitch;
   dontBuild = true;
@@ -39,9 +38,6 @@ stdenv.mkDerivation {
         ln -s ${sqitch}/$d $out/$d
       fi
     done
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang $out/bin/sqitch
   '';
   dontStrip = true;
   postFixup = ''
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 49f1bf8c8018..00dd5a5811a5 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -38,6 +38,7 @@ let
     optional
     optionals
     optionalString
+    versionAtLeast
     versionOlder
     ;
   crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
@@ -52,7 +53,12 @@ stdenv.mkDerivation {
     inherit hash;
   };
 
-  patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
+  patches =
+    patches
+    ++ optional (
+      interactive && versionAtLeast version "7.2"
+    ) ./fix-test-suite-failures-with-perl-5.42.patch
+    ++ optional crossBuildTools ./cross-tools-flags.patch;
 
   postPatch = ''
     patchShebangs tp/maintain/regenerate_commands_perl_info.pl
diff --git a/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch b/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch
deleted file mode 100644
index 60f2e63b7ce0..000000000000
--- a/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-
-Patch by Vitezslav Crhonek <vcrhonek@redhat.com>
-Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide
-
-diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
---- texinfo-6.8/gnulib/lib/cdefs.h.orig	2021-03-11 19:57:53.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/cdefs.h	2021-07-19 12:26:46.985176475 +0200
-@@ -321,15 +321,15 @@
- 
- /* The nonnull function attribute marks pointer parameters that
-    must not be NULL.  */
--#ifndef __attribute_nonnull__
-+#ifndef __nonnull
- # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
--#  define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
-+#  define __nonnull(params) __attribute__ ((__nonnull__ params))
- # else
--#  define __attribute_nonnull__(params)
-+#  define __nonnull(params)
- # endif
--#endif
--#ifndef __nonnull
--# define __nonnull(params) __attribute_nonnull__ (params)
-+#elif !defined __GLIBC__
-+# undef __nonnull
-+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
- #endif
- 
- /* If fortification mode, we warn about unused results of certain
-diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
---- texinfo-6.8/gnulib/lib/libc-config.h.orig	2021-03-11 19:57:54.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/libc-config.h	2021-07-19 12:27:58.810590975 +0200
-@@ -33,9 +33,9 @@
- #include <config.h>
- 
- /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
--   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 and
--   DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
--   Elsewhere it is harmless.  */
-+   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 it
-+   includes <sys/cdefs.h> which defines __nonnull.  Elsewhere it
-+   is harmless.  */
- #include <errno.h>
- 
- /* From glibc <errno.h>.  */
-diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
---- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig	2021-03-11 19:57:54.000000000 +0100
-+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c	2021-07-19 12:24:46.878419397 +0200
-@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
- 
- /* Initialize a dynamic array object.  This must be called before any
-    use of the object.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static void
- DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
- {
-@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
- }
- 
- /* Deallocate the dynamic array and its elements.  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
- {
-@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
- }
- 
- /* Return true if the dynamic array is in an error state.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline bool
- DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
- {
-@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
- 
- /* Mark the dynamic array as failed.  All elements are deallocated as
-    a side effect.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static void
- DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
- {
-@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
- 
- /* Return the number of elements which have been added to the dynamic
-    array.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline size_t
- DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
- {
-@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
- 
- /* Return a pointer to the array element at INDEX.  Terminate the
-    process if INDEX is out of bounds.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
- {
-@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
- /* Return a pointer to the first array element, if any.  For a
-    zero-length array, the pointer can be NULL even though the dynamic
-    array has not entered the failure state.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
- {
-@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
- /* Return a pointer one element past the last array element.  For a
-    zero-length array, the pointer can be NULL even though the dynamic
-    array has not entered the failure state.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline DYNARRAY_ELEMENT *
- DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
- {
-@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
- /* Add ITEM at the end of the array, enlarging it by one element.
-    Mark *LIST as failed if the dynamic array allocation size cannot be
-    increased.  */
--__attribute_nonnull__ ((1))
-+__nonnull ((1))
- static inline void
- DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
- {
-@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
- /* Allocate a place for a new element in *LIST and return a pointer to
-    it.  The pointer can be NULL if the dynamic array cannot be
-    enlarged due to a memory allocation failure.  */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
- static
- /* Avoid inlining with the larger initialization code.  */
- #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
-@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
-    existing size, new elements are added (which can be initialized).
-    Otherwise, the list is truncated, and elements are freed.  Return
-    false on memory allocation failure (and mark *LIST as failed).  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static bool
- DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
- {
-@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
- }
- 
- /* Remove the last element of LIST if it is present.  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
- {
-@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
- 
- /* Remove all elements from the list.  The elements are freed, but the
-    list itself is not.  */
--__attribute_maybe_unused__ __attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __nonnull ((1))
- static void
- DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
- {
-@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
-    stored in *RESULT if LIST refers to an empty list.  On success, the
-    pointer in *RESULT is heap-allocated and must be deallocated using
-    free.  */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1, 2))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
- static bool
- DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
-                           DYNARRAY_FINAL_TYPE *result)
-@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
-    have a sentinel at the end).  If LENGTHP is not NULL, the array
-    length is written to *LENGTHP.  *LIST is re-initialized and can be
-    reused.  */
--__attribute_maybe_unused__ __attribute_warn_unused_result__
--__attribute_nonnull__ ((1))
-+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
- static DYNARRAY_ELEMENT *
- DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
- {
diff --git a/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch b/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch
new file mode 100644
index 000000000000..59f89e16db27
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch
@@ -0,0 +1,41 @@
+>From 1af3c9b91625e4d115ea979c45a75752b872c10f Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sat, 13 Sep 2025 08:57:55 +0100
+Subject: [PATCH] Fix test suite failures with Perl 5.42
+
+The precedence issues here were flagged by new diagnostics in Perl 5.42,
+and the resulting warnings caused test failures.
+---
+ tp/Texinfo/Convert/Converter.pm | 2 +-
+ tp/Texinfo/Convert/LaTeX.pm     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
+index 5e14a9e..89e623b 100644
+--- a/tp/Texinfo/Convert/Converter.pm
++++ b/tp/Texinfo/Convert/Converter.pm
+@@ -386,7 +386,7 @@ sub output_tree($$)
+ 
+   my $fh;
+   my $encoded_output_file;
+-  if (! $output_file eq '') {
++  if ($output_file ne '') {
+     my $path_encoding;
+     ($encoded_output_file, $path_encoding)
+       = $self->encoded_output_file_name($output_file);
+diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
+index ae947d1..f4ba076 100644
+--- a/tp/Texinfo/Convert/LaTeX.pm
++++ b/tp/Texinfo/Convert/LaTeX.pm
+@@ -1085,7 +1085,7 @@ sub output($$)
+ 
+   my $fh;
+   my $encoded_output_file;
+-  if (! $output_file eq '') {
++  if ($output_file ne '') {
+     my $path_encoding;
+     ($encoded_output_file, $path_encoding)
+       = $self->encoded_output_file_name($output_file);
+-- 
+2.51.0
+
diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix
index b385c25fe3d2..c7c49d788643 100644
--- a/pkgs/development/tools/misc/texinfo/packages.nix
+++ b/pkgs/development/tools/misc/texinfo/packages.nix
@@ -65,11 +65,6 @@ let
   };
 in
 {
-  texinfo6 = buildTexinfo {
-    version = "6.8";
-    hash = "sha256-jrdT7Si8oh+PVsGhgDYq7XiSKb1i//WL+DaOm+tZ/sQ=";
-    patches = [ ./fix-glibc-2.34.patch ];
-  };
   texinfo7 = buildTexinfo {
     version = "7.2";
     hash = "sha256-AynXeI++8RP6gsuAiJyhl6NEzg33ZG/gAJdMXXFDY6Y=";
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 06d66898f801..61516c342af2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -135,10 +135,19 @@ rustPlatform.buildRustPackage (final: {
     })
   ];
 
-  postPatch = lib.optionalString webUISupport ''
-    substituteInPlace cli/loader/src/lib.rs \
-        --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";'
-  '';
+  postPatch =
+    lib.optionalString webUISupport ''
+      substituteInPlace cli/loader/src/lib.rs \
+          --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";'
+    ''
+    # when building on static platforms:
+    # 1. remove the `libtree-sitter.$(SOEXT)` step from `all`
+    # 2. remove references to shared object files in the Makefile
+    + lib.optionalString stdenv.hostPlatform.isStatic ''
+      substituteInPlace ./Makefile \
+          --replace-fail 'all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc' 'all: libtree-sitter.a tree-sitter.pc'
+      sed -i '/^install:/,/^[^[:space:]]/ { /$(SOEXT/d; }' ./Makefile
+    '';
 
   # Compile web assembly with emscripten. The --debug flag prevents us from
   # minifying the JavaScript; passing it allows us to side-step more Node
@@ -151,8 +160,8 @@ rustPlatform.buildRustPackage (final: {
 
   postInstall = ''
     PREFIX=$out make install
-    ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}
-    ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}
+    ${lib.optionalString (!enableShared) "rm -f $out/lib/*.so{,.*}"}
+    ${lib.optionalString (!enableStatic) "rm -f $out/lib/*.a"}
   ''
   + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd tree-sitter \
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 2e591408ff0b..ac45ac728c40 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -554,12 +554,9 @@
   };
 
   razor = {
-    version = "0-unstable-2016-07-08";
-    url = "github:tree-sitter/tree-sitter-razor/60edbd8e798e416f5226a746396efa6a8614fa9b";
-    hash = "sha256-UVzs4z1Aa/Wvpwck4wrApijTEOrc53h867M32m2yutE=";
-    # Source repo is marked as archived (no update for 9 hears) and does not
-    # compile with current tree-sitter toolchain.
-    meta.broken = true;
+    version = "0-unstable-2025-02-17";
+    url = "github:tris203/tree-sitter-razor/fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
+    hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
   };
 
   regex = {
diff --git a/pkgs/development/web/nodejs/sab-test-32bit.patch b/pkgs/development/web/nodejs/sab-test-32bit.patch
new file mode 100644
index 000000000000..c90e36b1df6c
--- /dev/null
+++ b/pkgs/development/web/nodejs/sab-test-32bit.patch
@@ -0,0 +1,27 @@
+diff --git a/test/parallel/test-internal-util-construct-sab.js b/test/parallel/test-internal-util-construct-sab.js
+index 5ff9b09f8e7d36..403b59809e47d2 100644
+--- a/test/parallel/test-internal-util-construct-sab.js
++++ b/test/parallel/test-internal-util-construct-sab.js
+@@ -3,16 +3,20 @@
+ 
+ require('../common');
+ const assert = require('assert');
++const { kMaxLength } = require('buffer');
+ const { isSharedArrayBuffer } = require('util/types');
+ const { constructSharedArrayBuffer } = require('internal/util');
+ 
+ // We're testing that we can construct a SAB even when the global is not exposed.
+ assert.strictEqual(typeof SharedArrayBuffer, 'undefined');
+ 
+-for (const length of [undefined, 0, 1, 2 ** 32]) {
++for (const length of [undefined, 0, 1, 2 ** 16]) {
+   assert(isSharedArrayBuffer(constructSharedArrayBuffer(length)));
+ }
+ 
+-for (const length of [-1, Number.MAX_SAFE_INTEGER + 1, 2 ** 64]) {
++// Specifically test the following cases:
++// - out-of-range allocation requests should not crash the process
++// - no int64 overflow
++for (const length of [-1, kMaxLength + 1, 2 ** 64]) {
+   assert.throws(() => constructSharedArrayBuffer(length), RangeError);
+ }
diff --git a/pkgs/development/web/nodejs/v24-32bit.patch b/pkgs/development/web/nodejs/v24-32bit.patch
new file mode 100644
index 000000000000..f73a77c49d48
--- /dev/null
+++ b/pkgs/development/web/nodejs/v24-32bit.patch
@@ -0,0 +1,26 @@
+diff --git a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
+index ee6fe95a603..58d091a0dc7 100644
+--- a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
++++ b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
+@@ -637,7 +637,9 @@ class Int64LoweringReducer : public Next {
+       result = __ Word32CountLeadingZeros(high);
+     }
+ 
+-    return __ Tuple<Word32, Word32>(result, __ Word32Constant(0));
++    // patched for arm build. see https://github.com/nodejs/node/issues/58458
++    V<Word32> result_ = result;
++    return __ Tuple(result_, __ Word32Constant(0));
+   }
+ 
+   V<Word32Pair> LowerCtz(V<Word32Pair> input) {
+@@ -650,7 +652,9 @@ class Int64LoweringReducer : public Next {
+       result = __ Word32CountTrailingZeros(low);
+     }
+ 
+-    return __ Tuple<Word32, Word32>(result, __ Word32Constant(0));
++    // patched for arm build. see https://github.com/nodejs/node/issues/58458
++    V<Word32> result_ = result;
++    return __ Tuple(result_, __ Word32Constant(0));
+   }
+ 
+   V<Word32Pair> LowerPopCount(V<Word32Pair> input) {
\ No newline at end of file
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 4a2068abc0eb..09ce2e3e28af 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -67,5 +67,11 @@ buildNodejs {
         hash = "sha256-BBBShQwU20TSY8GtPehQ9i3AH4ZKUGIr8O0bRsgrpNo=";
         revert = true;
       })
+    ]
+    ++ lib.optionals stdenv.is32bit [
+      # see: https://github.com/nodejs/node/issues/58458
+      ./v24-32bit.patch
+      # see: https://github.com/nodejs/node/issues/61025
+      ./sab-test-32bit.patch
     ];
 }
diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index 66e3fb2a9c6b..4ce10dfdd235 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -122,9 +122,6 @@ let
 
       shopt -s extglob
 
-      mkdir -p "$out/lib"
-      cp -r packages/playwright/node_modules "$out/lib/node_modules"
-
       mkdir -p "$out/lib/node_modules/playwright"
       cp -r packages/playwright/!(bundles|src|node_modules|.*) "$out/lib/node_modules/playwright"
 
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index e260175e7af8..f690f2a09ceb 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -82,6 +82,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e.patch";
       hash = "sha256-L35ybnTKPO+HVP/7ZYzWM2mA+s1RAywhofSuzpy/6sc=";
     })
+
+    (fetchpatch {
+      name = "fix-GCC-15-due-to-missing-CRTP-usage.patch";
+      url = "https://github.com/OpenTTD/OpenTTD/commit/db36e61807955c896267d6585de0577efd30465d.patch";
+      hash = "sha256-wJqboBuB+gcn1UPoTlym9IaL7tXtdKEp/E474vG5rYk=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 733aa6288957..9bd6351bd2b1 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -45,6 +45,10 @@
 stdenv.mkDerivation rec {
   pname = "lilypond";
   version = "2.24.4";
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchzip {
     url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index ed2917b369a6..95bb75318e05 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -7,7 +7,12 @@
 }:
 
 lib.appendToName "with-fonts" (symlinkJoin {
-  inherit (lilypond) meta name version;
+  inherit (lilypond)
+    pname
+    outputs
+    version
+    meta
+    ;
 
   paths = [ lilypond ] ++ openlilylib-fonts.all;
 
@@ -15,7 +20,9 @@ lib.appendToName "with-fonts" (symlinkJoin {
 
   postBuild = ''
     for p in $out/bin/*; do
-        wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
+      wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
     done
+
+    ln -s ${lilypond.man} $man
   '';
 })
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index f8e39971851d..611571f016d8 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -185,7 +185,6 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix
index c99bd7e9ddc9..e2b10dc5df6c 100644
--- a/pkgs/os-specific/linux/freeipa/default.nix
+++ b/pkgs/os-specific/linux/freeipa/default.nix
@@ -171,7 +171,6 @@ stdenv.mkDerivation rec {
     versionCheckHook
   ];
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   meta = {
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 86c256760210..9d0befcd7330 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   makeFlags = [
     "PREFIX=$(out)"
-    "-C src"
+    "--directory=src"
   ];
 
   passthru.tests = {
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
 
   # outputs = [ "out" "dev" ];
 
+  __structuredAttrs = true;
+
   meta = {
     description = "Library for loading eBPF programs and reading and manipulating eBPF objects from user-space";
     homepage = "https://github.com/libbpf/libbpf";
diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix
index 19e62bd4a2f7..2081ba8eacc2 100644
--- a/pkgs/os-specific/linux/lvm2/2_03.nix
+++ b/pkgs/os-specific/linux/lvm2/2_03.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "2.03.35";
-  hash = "sha256-6/KLNCdTXitavZmRzYObYWIqDb+4yG3w968fadyqg3E=";
+  version = "2.03.37";
+  hash = "sha256-sCZWzDmi+GpwLEMtqw0DF+EhEfyp1iOhjxucP4e4ggA=";
 }
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index b55d436ffcc4..d9fd4c131d68 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -143,8 +143,6 @@ stdenv.mkDerivation rec {
       }
     ))
     ./fix-stdio-usage.patch
-    # https://gitlab.com/lvmteam/lvm2/-/merge_requests/33
-    ./fix-manpage-reproducibility.patch
   ];
 
   doCheck = false; # requires root
diff --git a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch
deleted file mode 100644
index 1e687f3630cc..000000000000
--- a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 950f219ed287358df8c128f7e22989177a8de47c
-Author: Arnout Engelen <arnout@bzzt.net>
-Date:   Mon Aug 25 15:55:44 2025 +0200
-
-    man: simplify vmautoactivation(7)
-    
-    Previously this was hard-coded to: "Autoactivation commands use a number
-    of temp files in /run/lvm (with the expectation that /run is cleared
-    between boots.)"
-    
-    Since c1bfc8737f08bf7558b2d788e9756f895cd9eaaa it was made more generic,
-    but on some systems this logic leads to "Autoactivation commands use a
-    number of temp files in /run/lvm (with the expectation that /var/run
-    is cleared between boots)." which I'd say adds more confusion than it
-    solves.
-
-diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main
-index e55943b29..9d429055c 100644
---- a/man/lvmautoactivation.7_main
-+++ b/man/lvmautoactivation.7_main
-@@ -175,9 +175,7 @@ is reserved for udev output.)
- .
- Autoactivation commands use a number of temp files in
- .I #DEFAULT_RUN_DIR#
--(with the expectation that
--.I #DEFAULT_PID_DIR#
--is cleared between boots).
-+(with the expectation that it is cleared between boots).
- .
- .TP
- .B pvs_online
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index be125ae38862..92eb4968f95d 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -27,12 +27,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.5";
+  version = "1.1.6";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz";
-    hash = "sha256-Ha8Q8yLhT9kKAXU4qvLANNfMHrHMQY3tR0RdcU6haNQ=";
+    hash = "sha256-NykxvahVazEGNqL5AgrccQ+bq2b0fv4M6Qv/gArCUww=";
   };
 
   patches = [
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index 30ae0ba4543d..b6823f0dc433 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)";
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index af643a8b6a67..1d1f61f7f612 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 179240bf4f78..18d106265f79 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -88,6 +88,7 @@ let
     miele = getComponentDeps "cloud";
     mjpeg = getComponentDeps "camera";
     mobile_app = getComponentDeps "frontend";
+    mopeka = getComponentDeps "switchbot";
     motioneye = getComponentDeps "camera";
     mqtt = getComponentDeps "camera";
     nest = getComponentDeps "camera" ++ [
@@ -200,6 +201,13 @@ let
       # intent fixture mismatch
       "test_error_no_device_on_floor"
     ];
+    homewizard = [
+      # Messages don't match expected due to a change in Homewizard's outputs
+      "test_identify_button"
+      "test_number_entities"
+      "test_select_request_error"
+      "test_switch_entities"
+    ];
     sensor = [
       # Failed: Translation not found for sensor
       "test_validate_unit_change_convertible"
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 3295bdbb68d6..290bb4e1a1e0 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,7 +1,7 @@
 {
   newScope,
   lib,
-  python3,
+  python312,
 }:
 
 let
@@ -13,7 +13,7 @@ let
     {
       callPackage = newScope self;
 
-      python3 = callPackage ./python.nix { inherit python3; };
+      python3 = callPackage ./python.nix { python3 = python312; };
 
       hyperkitty = callPackage ./hyperkitty.nix { };
 
diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index ffa3b18ea88b..c8fd7159f717 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -26,6 +26,8 @@ lib.fix (
             [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce
             [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291
           */
+          # https://gitlab.com/mailman/hyperkitty/-/merge_requests/681
+          django = super.django_4;
 
           django-allauth = super.django-allauth.overrideAttrs (
             new:
diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix
index ef1b07ef775a..71dfb8b81406 100644
--- a/pkgs/servers/mail/public-inbox/default.nix
+++ b/pkgs/servers/mail/public-inbox/default.nix
@@ -39,7 +39,6 @@
   PlackMiddlewareReverseProxy,
   PlackTestExternalServer,
   Xapian,
-  TestSimple13,
   TimeDate,
   URI,
   XMLTreePP,
@@ -145,7 +144,6 @@ buildPerlPackage rec {
     xapian
     EmailMIME
     PlackTestExternalServer
-    TestSimple13
     XMLTreePP
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h b/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h
deleted file mode 100644
index b012570ae133..000000000000
--- a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h
+++ /dev/null
@@ -1,1409 +0,0 @@
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2007-2008 Red Hat, Inc.
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file dri_interface.h
- *
- * This file contains all the types and functions that define the interface
- * between a DRI driver and driver loader.  Currently, the most common driver
- * loader is the XFree86 libGL.so.  However, other loaders do exist, and in
- * the future the server-side libglx.a will also be a loader.
- * 
- * \author Kevin E. Martin <kevin@precisioninsight.com>
- * \author Ian Romanick <idr@us.ibm.com>
- * \author Kristian Høgsberg <krh@redhat.com>
- */
-
-#ifndef DRI_INTERFACE_H
-#define DRI_INTERFACE_H
-
-/* For archs with no drm.h */
-#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__)
-#ifndef __NOT_HAVE_DRM_H
-#define __NOT_HAVE_DRM_H
-#endif
-#endif
-
-#ifndef __NOT_HAVE_DRM_H
-#include <drm.h>
-#else
-typedef unsigned int drm_context_t;
-typedef unsigned int drm_drawable_t;
-typedef struct drm_clip_rect drm_clip_rect_t;
-#endif
-
-/**
- * \name DRI interface structures
- *
- * The following structures define the interface between the GLX client
- * side library and the DRI (direct rendering infrastructure).
- */
-/*@{*/
-typedef struct __DRIdisplayRec		__DRIdisplay;
-typedef struct __DRIscreenRec		__DRIscreen;
-typedef struct __DRIcontextRec		__DRIcontext;
-typedef struct __DRIdrawableRec		__DRIdrawable;
-typedef struct __DRIconfigRec		__DRIconfig;
-typedef struct __DRIframebufferRec	__DRIframebuffer;
-typedef struct __DRIversionRec		__DRIversion;
-
-typedef struct __DRIcoreExtensionRec		__DRIcoreExtension;
-typedef struct __DRIextensionRec		__DRIextension;
-typedef struct __DRIcopySubBufferExtensionRec	__DRIcopySubBufferExtension;
-typedef struct __DRIswapControlExtensionRec	__DRIswapControlExtension;
-typedef struct __DRIframeTrackingExtensionRec	__DRIframeTrackingExtension;
-typedef struct __DRImediaStreamCounterExtensionRec	__DRImediaStreamCounterExtension;
-typedef struct __DRItexOffsetExtensionRec	__DRItexOffsetExtension;
-typedef struct __DRItexBufferExtensionRec	__DRItexBufferExtension;
-typedef struct __DRIlegacyExtensionRec		__DRIlegacyExtension;
-typedef struct __DRIswrastExtensionRec		__DRIswrastExtension;
-typedef struct __DRIbufferRec			__DRIbuffer;
-typedef struct __DRIdri2ExtensionRec		__DRIdri2Extension;
-typedef struct __DRIdri2LoaderExtensionRec	__DRIdri2LoaderExtension;
-typedef struct __DRI2flushExtensionRec	__DRI2flushExtension;
-typedef struct __DRI2throttleExtensionRec	__DRI2throttleExtension;
-
-
-typedef struct __DRIimageLoaderExtensionRec     __DRIimageLoaderExtension;
-typedef struct __DRIimageDriverExtensionRec     __DRIimageDriverExtension;
-
-/*@}*/
-
-
-/**
- * Extension struct.  Drivers 'inherit' from this struct by embedding
- * it as the first element in the extension struct.
- *
- * We never break API in for a DRI extension.  If we need to change
- * the way things work in a non-backwards compatible manner, we
- * introduce a new extension.  During a transition period, we can
- * leave both the old and the new extension in the driver, which
- * allows us to move to the new interface without having to update the
- * loader(s) in lock step.
- *
- * However, we can add entry points to an extension over time as long
- * as we don't break the old ones.  As we add entry points to an
- * extension, we increase the version number.  The corresponding
- * #define can be used to guard code that accesses the new entry
- * points at compile time and the version field in the extension
- * struct can be used at run-time to determine how to use the
- * extension.
- */
-struct __DRIextensionRec {
-    const char *name;
-    int version;
-};
-
-/**
- * The first set of extension are the screen extensions, returned by
- * __DRIcore::getExtensions().  This entry point will return a list of
- * extensions and the loader can use the ones it knows about by
- * casting them to more specific extensions and advertising any GLX
- * extensions the DRI extensions enables.
- */
-
-/**
- * Used by drivers to indicate support for setting the read drawable.
- */
-#define __DRI_READ_DRAWABLE "DRI_ReadDrawable"
-#define __DRI_READ_DRAWABLE_VERSION 1
-
-/**
- * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension.
- */
-#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer"
-#define __DRI_COPY_SUB_BUFFER_VERSION 1
-struct __DRIcopySubBufferExtensionRec {
-    __DRIextension base;
-    void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h);
-};
-
-/**
- * Used by drivers that implement the GLX_SGI_swap_control or
- * GLX_MESA_swap_control extension.
- */
-#define __DRI_SWAP_CONTROL "DRI_SwapControl"
-#define __DRI_SWAP_CONTROL_VERSION 1
-struct __DRIswapControlExtensionRec {
-    __DRIextension base;
-    void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval);
-    unsigned int (*getSwapInterval)(__DRIdrawable *drawable);
-};
-
-/**
- * Used by drivers that implement the GLX_MESA_swap_frame_usage extension.
- */
-#define __DRI_FRAME_TRACKING "DRI_FrameTracking"
-#define __DRI_FRAME_TRACKING_VERSION 1
-struct __DRIframeTrackingExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Enable or disable frame usage tracking.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable);
-
-    /**
-     * Retrieve frame usage information.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*queryFrameTracking)(__DRIdrawable *drawable,
-			      int64_t * sbc, int64_t * missedFrames,
-			      float * lastMissedUsage, float * usage);
-};
-
-
-/**
- * Used by drivers that implement the GLX_SGI_video_sync extension.
- */
-#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter"
-#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1
-struct __DRImediaStreamCounterExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Wait for the MSC to equal target_msc, or, if that has already passed,
-     * the next time (MSC % divisor) is equal to remainder.  If divisor is
-     * zero, the function will return as soon as MSC is greater than or equal
-     * to target_msc.
-     */
-    int (*waitForMSC)(__DRIdrawable *drawable,
-		      int64_t target_msc, int64_t divisor, int64_t remainder,
-		      int64_t * msc, int64_t * sbc);
-
-    /**
-     * Get the number of vertical refreshes since some point in time before
-     * this function was first called (i.e., system start up).
-     */
-    int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable,
-			  int64_t *msc);
-};
-
-
-#define __DRI_TEX_OFFSET "DRI_TexOffset"
-#define __DRI_TEX_OFFSET_VERSION 1
-struct __DRItexOffsetExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Method to override base texture image with a driver specific 'offset'.
-     * The depth passed in allows e.g. to ignore the alpha channel of texture
-     * images where the non-alpha components don't occupy a whole texel.
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.
-     */
-    void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname,
-			 unsigned long long offset, GLint depth, GLuint pitch);
-};
-
-
-/* Valid values for format in the setTexBuffer2 function below.  These
- * values match the GLX tokens for compatibility reasons, but we
- * define them here since the DRI interface can't depend on GLX. */
-#define __DRI_TEXTURE_FORMAT_NONE        0x20D8
-#define __DRI_TEXTURE_FORMAT_RGB         0x20D9
-#define __DRI_TEXTURE_FORMAT_RGBA        0x20DA
-
-#define __DRI_TEX_BUFFER "DRI_TexBuffer"
-#define __DRI_TEX_BUFFER_VERSION 2
-struct __DRItexBufferExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Method to override base texture image with the contents of a
-     * __DRIdrawable. 
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.  Deprecated in favor of
-     * setTexBuffer2 in version 2 of this interface
-     */
-    void (*setTexBuffer)(__DRIcontext *pDRICtx,
-			 GLint target,
-			 __DRIdrawable *pDraw);
-
-    /**
-     * Method to override base texture image with the contents of a
-     * __DRIdrawable, including the required texture format attribute.
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.
-     */
-    void (*setTexBuffer2)(__DRIcontext *pDRICtx,
-			  GLint target,
-			  GLint format,
-			  __DRIdrawable *pDraw);
-    /**
-     * Method to release texture buffer in case some special platform
-     * need this.
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.
-     */
-    void (*releaseTexBuffer)(__DRIcontext *pDRICtx,
-			GLint target,
-			__DRIdrawable *pDraw);
-};
-
-/**
- * Used by drivers that implement DRI2
- */
-#define __DRI2_FLUSH "DRI2_Flush"
-#define __DRI2_FLUSH_VERSION 4
-
-#define __DRI2_FLUSH_DRAWABLE (1 << 0) /* the drawable should be flushed. */
-#define __DRI2_FLUSH_CONTEXT  (1 << 1) /* glFlush should be called */
-
-enum __DRI2throttleReason {
-   __DRI2_THROTTLE_SWAPBUFFER,
-   __DRI2_THROTTLE_COPYSUBBUFFER,
-   __DRI2_THROTTLE_FLUSHFRONT
-};
-
-struct __DRI2flushExtensionRec {
-    __DRIextension base;
-    void (*flush)(__DRIdrawable *drawable);
-
-    /**
-     * Ask the driver to call getBuffers/getBuffersWithFormat before
-     * it starts rendering again.
-     *
-     * \param drawable the drawable to invalidate
-     *
-     * \since 3
-     */
-    void (*invalidate)(__DRIdrawable *drawable);
-
-    /**
-     * This function reduces the number of flushes in the driver by combining
-     * several operations into one call.
-     *
-     * It can:
-     * - throttle
-     * - flush a drawable
-     * - flush a context
-     *
-     * \param context           the context
-     * \param drawable          the drawable to flush
-     * \param flags             a combination of _DRI2_FLUSH_xxx flags
-     * \param throttle_reason   the reason for throttling, 0 = no throttling
-     *
-     * \since 4
-     */
-    void (*flush_with_flags)(__DRIcontext *ctx,
-                             __DRIdrawable *drawable,
-                             unsigned flags,
-                             enum __DRI2throttleReason throttle_reason);
-};
-
-
-/**
- * Extension that the driver uses to request
- * throttle callbacks.
- */
-
-#define __DRI2_THROTTLE "DRI2_Throttle"
-#define __DRI2_THROTTLE_VERSION 1
-
-struct __DRI2throttleExtensionRec {
-   __DRIextension base;
-   void (*throttle)(__DRIcontext *ctx,
-		    __DRIdrawable *drawable,
-		    enum __DRI2throttleReason reason);
-};
-
-/*@}*/
-
-/**
- * The following extensions describe loader features that the DRI
- * driver can make use of.  Some of these are mandatory, such as the
- * getDrawableInfo extension for DRI and the DRI Loader extensions for
- * DRI2, while others are optional, and if present allow the driver to
- * expose certain features.  The loader pass in a NULL terminated
- * array of these extensions to the driver in the createNewScreen
- * constructor.
- */
-
-typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension;
-typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension;
-typedef struct __DRIdamageExtensionRec __DRIdamageExtension;
-typedef struct __DRIloaderExtensionRec __DRIloaderExtension;
-typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension;
-
-
-/**
- * Callback to getDrawableInfo protocol
- */
-#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo"
-#define __DRI_GET_DRAWABLE_INFO_VERSION 1
-struct __DRIgetDrawableInfoExtensionRec {
-    __DRIextension base;
-
-    /**
-     * This function is used to get information about the position, size, and
-     * clip rects of a drawable.
-     */
-    GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable,
-	unsigned int * index, unsigned int * stamp,
-        int * x, int * y, int * width, int * height,
-        int * numClipRects, drm_clip_rect_t ** pClipRects,
-        int * backX, int * backY,
-	int * numBackClipRects, drm_clip_rect_t ** pBackClipRects,
-	void *loaderPrivate);
-};
-
-/**
- * Callback to get system time for media stream counter extensions.
- */
-#define __DRI_SYSTEM_TIME "DRI_SystemTime"
-#define __DRI_SYSTEM_TIME_VERSION 1
-struct __DRIsystemTimeExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Get the 64-bit unadjusted system time (UST).
-     */
-    int (*getUST)(int64_t * ust);
-
-    /**
-     * Get the media stream counter (MSC) rate.
-     * 
-     * Matching the definition in GLX_OML_sync_control, this function returns
-     * the rate of the "media stream counter".  In practical terms, this is
-     * the frame refresh rate of the display.
-     */
-    GLboolean (*getMSCRate)(__DRIdrawable *draw,
-			    int32_t * numerator, int32_t * denominator,
-			    void *loaderPrivate);
-};
-
-/**
- * Damage reporting
- */
-#define __DRI_DAMAGE "DRI_Damage"
-#define __DRI_DAMAGE_VERSION 1
-struct __DRIdamageExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Reports areas of the given drawable which have been modified by the
-     * driver.
-     *
-     * \param drawable which the drawing was done to.
-     * \param rects rectangles affected, with the drawable origin as the
-     *	      origin.
-     * \param x X offset of the drawable within the screen (used in the
-     *	      front_buffer case)
-     * \param y Y offset of the drawable within the screen.
-     * \param front_buffer boolean flag for whether the drawing to the
-     * 	      drawable was actually done directly to the front buffer (instead
-     *	      of backing storage, for example)
-     * \param loaderPrivate the data passed in at createNewDrawable time
-     */
-    void (*reportDamage)(__DRIdrawable *draw,
-			 int x, int y,
-			 drm_clip_rect_t *rects, int num_rects,
-			 GLboolean front_buffer,
-			 void *loaderPrivate);
-};
-
-#define __DRI_SWRAST_IMAGE_OP_DRAW	1
-#define __DRI_SWRAST_IMAGE_OP_CLEAR	2
-#define __DRI_SWRAST_IMAGE_OP_SWAP	3
-
-/**
- * SWRast Loader extension.
- */
-#define __DRI_SWRAST_LOADER "DRI_SWRastLoader"
-#define __DRI_SWRAST_LOADER_VERSION 1
-struct __DRIswrastLoaderExtensionRec {
-    __DRIextension base;
-
-    /*
-     * Drawable position and size
-     */
-    void (*getDrawableInfo)(__DRIdrawable *drawable,
-			    int *x, int *y, int *width, int *height,
-			    void *loaderPrivate);
-
-    /**
-     * Put image to drawable
-     */
-    void (*putImage)(__DRIdrawable *drawable, int op,
-		     int x, int y, int width, int height,
-		     char *data, void *loaderPrivate);
-
-    /**
-     * Get image from readable
-     */
-    void (*getImage)(__DRIdrawable *readable,
-		     int x, int y, int width, int height,
-		     char *data, void *loaderPrivate);
-};
-
-/**
- * Invalidate loader extension.  The presence of this extension
- * indicates to the DRI driver that the loader will call invalidate in
- * the __DRI2_FLUSH extension, whenever the needs to query for new
- * buffers.  This means that the DRI driver can drop the polling in
- * glViewport().
- *
- * The extension doesn't provide any functionality, it's only use to
- * indicate to the driver that it can use the new semantics.  A DRI
- * driver can use this to switch between the different semantics or
- * just refuse to initialize if this extension isn't present.
- */
-#define __DRI_USE_INVALIDATE "DRI_UseInvalidate"
-#define __DRI_USE_INVALIDATE_VERSION 1
-
-typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension;
-struct __DRIuseInvalidateExtensionRec {
-   __DRIextension base;
-};
-
-/**
- * The remaining extensions describe driver extensions, immediately
- * available interfaces provided by the driver.  To start using the
- * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for
- * the extension you need in the array.
- */
-#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"
-
-/**
- * This symbol replaces the __DRI_DRIVER_EXTENSIONS symbol, and will be
- * suffixed by "_drivername", allowing multiple drivers to be built into one
- * library, and also giving the driver the chance to return a variable driver
- * extensions struct depending on the driver name being loaded or any other
- * system state.
- *
- * The function prototype is:
- *
- * const __DRIextension **__driDriverGetExtensions_drivername(void);
- */
-#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions"
-
-/**
- * Tokens for __DRIconfig attribs.  A number of attributes defined by
- * GLX or EGL standards are not in the table, as they must be provided
- * by the loader.  For example, FBConfig ID or visual ID, drawable type.
- */
-
-#define __DRI_ATTRIB_BUFFER_SIZE		 1
-#define __DRI_ATTRIB_LEVEL			 2
-#define __DRI_ATTRIB_RED_SIZE			 3
-#define __DRI_ATTRIB_GREEN_SIZE			 4
-#define __DRI_ATTRIB_BLUE_SIZE			 5
-#define __DRI_ATTRIB_LUMINANCE_SIZE		 6
-#define __DRI_ATTRIB_ALPHA_SIZE			 7
-#define __DRI_ATTRIB_ALPHA_MASK_SIZE		 8
-#define __DRI_ATTRIB_DEPTH_SIZE			 9
-#define __DRI_ATTRIB_STENCIL_SIZE		10
-#define __DRI_ATTRIB_ACCUM_RED_SIZE		11
-#define __DRI_ATTRIB_ACCUM_GREEN_SIZE		12
-#define __DRI_ATTRIB_ACCUM_BLUE_SIZE		13
-#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE		14
-#define __DRI_ATTRIB_SAMPLE_BUFFERS		15
-#define __DRI_ATTRIB_SAMPLES			16
-#define __DRI_ATTRIB_RENDER_TYPE		17
-#define __DRI_ATTRIB_CONFIG_CAVEAT		18
-#define __DRI_ATTRIB_CONFORMANT			19
-#define __DRI_ATTRIB_DOUBLE_BUFFER		20
-#define __DRI_ATTRIB_STEREO			21
-#define __DRI_ATTRIB_AUX_BUFFERS		22
-#define __DRI_ATTRIB_TRANSPARENT_TYPE		23
-#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE	24
-#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE	25
-#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE	26
-#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE	27
-#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE	28
-#define __DRI_ATTRIB_FLOAT_MODE			29
-#define __DRI_ATTRIB_RED_MASK			30
-#define __DRI_ATTRIB_GREEN_MASK			31
-#define __DRI_ATTRIB_BLUE_MASK			32
-#define __DRI_ATTRIB_ALPHA_MASK			33
-#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH		34
-#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT		35
-#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS		36
-#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH	37
-#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT	38
-#define __DRI_ATTRIB_VISUAL_SELECT_GROUP	39
-#define __DRI_ATTRIB_SWAP_METHOD		40
-#define __DRI_ATTRIB_MAX_SWAP_INTERVAL		41
-#define __DRI_ATTRIB_MIN_SWAP_INTERVAL		42
-#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB	43
-#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA	44
-#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE	45
-#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	46
-#define __DRI_ATTRIB_YINVERTED			47
-#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48
-
-/* __DRI_ATTRIB_RENDER_TYPE */
-#define __DRI_ATTRIB_RGBA_BIT			0x01	
-#define __DRI_ATTRIB_COLOR_INDEX_BIT		0x02
-#define __DRI_ATTRIB_LUMINANCE_BIT		0x04
-#define __DRI_ATTRIB_FLOAT_BIT			0x08
-#define __DRI_ATTRIB_UNSIGNED_FLOAT_BIT		0x10
-
-/* __DRI_ATTRIB_CONFIG_CAVEAT */
-#define __DRI_ATTRIB_SLOW_BIT			0x01
-#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG	0x02
-
-/* __DRI_ATTRIB_TRANSPARENT_TYPE */
-#define __DRI_ATTRIB_TRANSPARENT_RGB		0x00
-#define __DRI_ATTRIB_TRANSPARENT_INDEX		0x01
-
-/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	 */
-#define __DRI_ATTRIB_TEXTURE_1D_BIT		0x01
-#define __DRI_ATTRIB_TEXTURE_2D_BIT		0x02
-#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT	0x04
-
-/**
- * This extension defines the core DRI functionality.
- */
-#define __DRI_CORE "DRI_Core"
-#define __DRI_CORE_VERSION 1
-
-struct __DRIcoreExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen, int fd,
-				    unsigned int sarea_handle,
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driverConfigs,
-				    void *loaderPrivate);
-
-    void (*destroyScreen)(__DRIscreen *screen);
-
-    const __DRIextension **(*getExtensions)(__DRIscreen *screen);
-
-    int (*getConfigAttrib)(const __DRIconfig *config,
-			   unsigned int attrib,
-			   unsigned int *value);
-
-    int (*indexConfigAttrib)(const __DRIconfig *config, int index,
-			     unsigned int *attrib, unsigned int *value);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					unsigned int drawable_id,
-					unsigned int head,
-					void *loaderPrivate);
-
-    void (*destroyDrawable)(__DRIdrawable *drawable);
-
-    void (*swapBuffers)(__DRIdrawable *drawable);
-
-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-				      const __DRIconfig *config,
-				      __DRIcontext *shared,
-				      void *loaderPrivate);
-
-    int (*copyContext)(__DRIcontext *dest,
-		       __DRIcontext *src,
-		       unsigned long mask);
-
-    void (*destroyContext)(__DRIcontext *context);
-
-    int (*bindContext)(__DRIcontext *ctx,
-		       __DRIdrawable *pdraw,
-		       __DRIdrawable *pread);
-
-    int (*unbindContext)(__DRIcontext *ctx);
-};
-
-/**
- * Stored version of some component (i.e., server-side DRI module, kernel-side
- * DRM, etc.).
- * 
- * \todo
- * There are several data structures that explicitly store a major version,
- * minor version, and patch level.  These structures should be modified to
- * have a \c __DRIversionRec instead.
- */
-struct __DRIversionRec {
-    int    major;        /**< Major version number. */
-    int    minor;        /**< Minor version number. */
-    int    patch;        /**< Patch-level. */
-};
-
-/**
- * Framebuffer information record.  Used by libGL to communicate information
- * about the framebuffer to the driver's \c __driCreateNewScreen function.
- * 
- * In XFree86, most of this information is derrived from data returned by
- * calling \c XF86DRIGetDeviceInfo.
- *
- * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen
- *     __driUtilCreateNewScreen CallCreateNewScreen
- *
- * \bug This structure could be better named.
- */
-struct __DRIframebufferRec {
-    unsigned char *base;    /**< Framebuffer base address in the CPU's
-			     * address space.  This value is calculated by
-			     * calling \c drmMap on the framebuffer handle
-			     * returned by \c XF86DRIGetDeviceInfo (or a
-			     * similar function).
-			     */
-    int size;               /**< Framebuffer size, in bytes. */
-    int stride;             /**< Number of bytes from one line to the next. */
-    int width;              /**< Pixel width of the framebuffer. */
-    int height;             /**< Pixel height of the framebuffer. */
-    int dev_priv_size;      /**< Size of the driver's dev-priv structure. */
-    void *dev_priv;         /**< Pointer to the driver's dev-priv structure. */
-};
-
-
-/**
- * This extension provides alternative screen, drawable and context
- * constructors for legacy DRI functionality.  This is used in
- * conjunction with the core extension.
- */
-#define __DRI_LEGACY "DRI_Legacy"
-#define __DRI_LEGACY_VERSION 1
-
-struct __DRIlegacyExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen,
-				    const __DRIversion *ddx_version,
-				    const __DRIversion *dri_version,
-				    const __DRIversion *drm_version,
-				    const __DRIframebuffer *frame_buffer,
-				    void *pSAREA, int fd, 
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driver_configs,
-				    void *loaderPrivate);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					drm_drawable_t hwDrawable,
-					int renderType, const int *attrs,
-					void *loaderPrivate);
-
-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-				      const __DRIconfig *config,
-				      int render_type,
-				      __DRIcontext *shared,
-				      drm_context_t hwContext,
-				      void *loaderPrivate);
-};
-
-/**
- * This extension provides alternative screen, drawable and context
- * constructors for swrast DRI functionality.  This is used in
- * conjunction with the core extension.
- */
-#define __DRI_SWRAST "DRI_SWRast"
-#define __DRI_SWRAST_VERSION 4
-
-struct __DRIswrastExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen,
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driver_configs,
-				    void *loaderPrivate);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					void *loaderPrivate);
-
-   /* Since version 2 */
-   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
-                                           int api,
-                                           const __DRIconfig *config,
-                                           __DRIcontext *shared,
-                                           void *data);
-
-   /**
-    * Create a context for a particular API with a set of attributes
-    *
-    * \since version 3
-    *
-    * \sa __DRIdri2ExtensionRec::createContextAttribs
-    */
-   __DRIcontext *(*createContextAttribs)(__DRIscreen *screen,
-					 int api,
-					 const __DRIconfig *config,
-					 __DRIcontext *shared,
-					 unsigned num_attribs,
-					 const uint32_t *attribs,
-					 unsigned *error,
-					 void *loaderPrivate);
-
-   /**
-    * createNewScreen() with the driver extensions passed in.
-    *
-    * \since version 4
-    */
-   __DRIscreen *(*createNewScreen2)(int screen,
-                                    const __DRIextension **loader_extensions,
-                                    const __DRIextension **driver_extensions,
-                                    const __DRIconfig ***driver_configs,
-                                    void *loaderPrivate);
-
-};
-
-/** Common DRI function definitions, shared among DRI2 and Image extensions
- */
-
-typedef __DRIscreen *
-(*__DRIcreateNewScreen2Func)(int screen, int fd,
-                             const __DRIextension **extensions,
-                             const __DRIextension **driver_extensions,
-                             const __DRIconfig ***driver_configs,
-                             void *loaderPrivate);
-
-typedef __DRIdrawable *
-(*__DRIcreateNewDrawableFunc)(__DRIscreen *screen,
-                              const __DRIconfig *config,
-                              void *loaderPrivate);
-
-typedef __DRIcontext *
-(*__DRIcreateContextAttribsFunc)(__DRIscreen *screen,
-                                 int api,
-                                 const __DRIconfig *config,
-                                 __DRIcontext *shared,
-                                 unsigned num_attribs,
-                                 const uint32_t *attribs,
-                                 unsigned *error,
-                                 void *loaderPrivate);
-
-typedef unsigned int
-(*__DRIgetAPIMaskFunc)(__DRIscreen *screen);
-
-/**
- * DRI2 Loader extension.
- */
-#define __DRI_BUFFER_FRONT_LEFT		0
-#define __DRI_BUFFER_BACK_LEFT		1
-#define __DRI_BUFFER_FRONT_RIGHT	2
-#define __DRI_BUFFER_BACK_RIGHT		3
-#define __DRI_BUFFER_DEPTH		4
-#define __DRI_BUFFER_STENCIL		5
-#define __DRI_BUFFER_ACCUM		6
-#define __DRI_BUFFER_FAKE_FRONT_LEFT	7
-#define __DRI_BUFFER_FAKE_FRONT_RIGHT	8
-#define __DRI_BUFFER_DEPTH_STENCIL	9  /**< Only available with DRI2 1.1 */
-#define __DRI_BUFFER_HIZ		10
-
-/* Inofficial and for internal use. Increase when adding a new buffer token. */
-#define __DRI_BUFFER_COUNT		11
-
-struct __DRIbufferRec {
-    unsigned int attachment;
-    unsigned int name;
-    unsigned int pitch;
-    unsigned int cpp;
-    unsigned int flags;
-};
-
-#define __DRI_DRI2_LOADER "DRI_DRI2Loader"
-#define __DRI_DRI2_LOADER_VERSION 3
-struct __DRIdri2LoaderExtensionRec {
-    __DRIextension base;
-
-    __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable,
-			       int *width, int *height,
-			       unsigned int *attachments, int count,
-			       int *out_count, void *loaderPrivate);
-
-    /**
-     * Flush pending front-buffer rendering
-     *
-     * Any rendering that has been performed to the
-     * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the
-     * \c __DRI_BUFFER_FRONT_LEFT.
-     *
-     * \param driDrawable    Drawable whose front-buffer is to be flushed
-     * \param loaderPrivate  Loader's private data that was previously passed
-     *                       into __DRIdri2ExtensionRec::createNewDrawable
-     */
-    void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);
-
-
-    /**
-     * Get list of buffers from the server
-     *
-     * Gets a list of buffer for the specified set of attachments.  Unlike
-     * \c ::getBuffers, this function takes a list of attachments paired with
-     * opaque \c unsigned \c int value describing the format of the buffer.
-     * It is the responsibility of the caller to know what the service that
-     * allocates the buffers will expect to receive for the format.
-     *
-     * \param driDrawable    Drawable whose buffers are being queried.
-     * \param width          Output where the width of the buffers is stored.
-     * \param height         Output where the height of the buffers is stored.
-     * \param attachments    List of pairs of attachment ID and opaque format
-     *                       requested for the drawable.
-     * \param count          Number of attachment / format pairs stored in
-     *                       \c attachments.
-     * \param loaderPrivate  Loader's private data that was previously passed
-     *                       into __DRIdri2ExtensionRec::createNewDrawable.
-     */
-    __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable,
-					 int *width, int *height,
-					 unsigned int *attachments, int count,
-					 int *out_count, void *loaderPrivate);
-};
-
-/**
- * This extension provides alternative screen, drawable and context
- * constructors for DRI2.
- */
-#define __DRI_DRI2 "DRI_DRI2"
-#define __DRI_DRI2_VERSION 4
-
-#define __DRI_API_OPENGL	0	/**< OpenGL compatibility profile */
-#define __DRI_API_GLES		1	/**< OpenGL ES 1.x */
-#define __DRI_API_GLES2		2	/**< OpenGL ES 2.x */
-#define __DRI_API_OPENGL_CORE	3	/**< OpenGL 3.2+ core profile */
-#define __DRI_API_GLES3		4	/**< OpenGL ES 3.x */
-
-#define __DRI_CTX_ATTRIB_MAJOR_VERSION		0
-#define __DRI_CTX_ATTRIB_MINOR_VERSION		1
-#define __DRI_CTX_ATTRIB_FLAGS			2
-
-/**
- * \requires __DRI2_ROBUSTNESS.
- */
-#define __DRI_CTX_ATTRIB_RESET_STRATEGY		3
-
-#define __DRI_CTX_FLAG_DEBUG			0x00000001
-#define __DRI_CTX_FLAG_FORWARD_COMPATIBLE	0x00000002
-
-/**
- * \requires __DRI2_ROBUSTNESS.
- */
-#define __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS	0x00000004
-
-/**
- * \name Context reset strategies.
- */
-/*@{*/
-#define __DRI_CTX_RESET_NO_NOTIFICATION		0
-#define __DRI_CTX_RESET_LOSE_CONTEXT		1
-/*@}*/
-
-/**
- * \name Reasons that __DRIdri2Extension::createContextAttribs might fail
- */
-/*@{*/
-/** Success! */
-#define __DRI_CTX_ERROR_SUCCESS			0
-
-/** Memory allocation failure */
-#define __DRI_CTX_ERROR_NO_MEMORY		1
-
-/** Client requested an API (e.g., OpenGL ES 2.0) that the driver can't do. */
-#define __DRI_CTX_ERROR_BAD_API			2
-
-/** Client requested an API version that the driver can't do. */
-#define __DRI_CTX_ERROR_BAD_VERSION		3
-
-/** Client requested a flag or combination of flags the driver can't do. */
-#define __DRI_CTX_ERROR_BAD_FLAG		4
-
-/** Client requested an attribute the driver doesn't understand. */
-#define __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE	5
-
-/** Client requested a flag the driver doesn't understand. */
-#define __DRI_CTX_ERROR_UNKNOWN_FLAG		6
-/*@}*/
-
-struct __DRIdri2ExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen, int fd,
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driver_configs,
-				    void *loaderPrivate);
-
-   __DRIcreateNewDrawableFunc   createNewDrawable;
-   __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-                                     const __DRIconfig *config,
-                                     __DRIcontext *shared,
-                                     void *loaderPrivate);
-
-   /* Since version 2 */
-   __DRIgetAPIMaskFunc          getAPIMask;
-
-   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
-					   int api,
-					   const __DRIconfig *config,
-					   __DRIcontext *shared,
-					   void *data);
-
-   __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen,
-				  unsigned int attachment,
-				  unsigned int format,
-				  int width,
-				  int height);
-   void (*releaseBuffer)(__DRIscreen *screen,
-			 __DRIbuffer *buffer);
-
-   /**
-    * Create a context for a particular API with a set of attributes
-    *
-    * \since version 3
-    *
-    * \sa __DRIswrastExtensionRec::createContextAttribs
-    */
-   __DRIcreateContextAttribsFunc        createContextAttribs;
-
-   /**
-    * createNewScreen with the driver's extension list passed in.
-    *
-    * \since version 4
-    */
-   __DRIcreateNewScreen2Func            createNewScreen2;
-};
-
-
-/**
- * This extension provides functionality to enable various EGLImage
- * extensions.
- */
-#define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 8
-
-/**
- * These formats correspond to the similarly named MESA_FORMAT_*
- * tokens, except in the native endian of the CPU.  For example, on
- * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to
- * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian.
- *
- * __DRI_IMAGE_FORMAT_NONE is for images that aren't directly usable
- * by the driver (YUV planar formats) but serve as a base image for
- * creating sub-images for the different planes within the image.
- *
- * R8, GR88 and NONE should not be used with createImageFormName or
- * createImage, and are returned by query from sub images created with
- * createImageFromNames (NONE, see above) and fromPlane (R8 & GR88).
- */
-#define __DRI_IMAGE_FORMAT_RGB565       0x1001
-#define __DRI_IMAGE_FORMAT_XRGB8888     0x1002
-#define __DRI_IMAGE_FORMAT_ARGB8888     0x1003
-#define __DRI_IMAGE_FORMAT_ABGR8888     0x1004
-#define __DRI_IMAGE_FORMAT_XBGR8888     0x1005
-#define __DRI_IMAGE_FORMAT_R8           0x1006 /* Since version 5 */
-#define __DRI_IMAGE_FORMAT_GR88         0x1007
-#define __DRI_IMAGE_FORMAT_NONE         0x1008
-#define __DRI_IMAGE_FORMAT_XRGB2101010  0x1009
-#define __DRI_IMAGE_FORMAT_ARGB2101010  0x100a
-#define __DRI_IMAGE_FORMAT_SARGB8       0x100b
-
-#define __DRI_IMAGE_USE_SHARE		0x0001
-#define __DRI_IMAGE_USE_SCANOUT		0x0002
-#define __DRI_IMAGE_USE_CURSOR		0x0004 /* Depricated */
-#define __DRI_IMAGE_USE_LINEAR		0x0008
-
-
-/**
- * Four CC formats that matches with WL_DRM_FORMAT_* from wayland_drm.h
- * and GBM_FORMAT_* from gbm.h, used with createImageFromNames.
- *
- * \since 5
- */
-
-#define __DRI_IMAGE_FOURCC_RGB565	0x36314752
-#define __DRI_IMAGE_FOURCC_ARGB8888	0x34325241
-#define __DRI_IMAGE_FOURCC_XRGB8888	0x34325258
-#define __DRI_IMAGE_FOURCC_ABGR8888	0x34324241
-#define __DRI_IMAGE_FOURCC_XBGR8888	0x34324258
-#define __DRI_IMAGE_FOURCC_YUV410	0x39565559
-#define __DRI_IMAGE_FOURCC_YUV411	0x31315559
-#define __DRI_IMAGE_FOURCC_YUV420	0x32315559
-#define __DRI_IMAGE_FOURCC_YUV422	0x36315559
-#define __DRI_IMAGE_FOURCC_YUV444	0x34325559
-#define __DRI_IMAGE_FOURCC_NV12		0x3231564e
-#define __DRI_IMAGE_FOURCC_NV16		0x3631564e
-#define __DRI_IMAGE_FOURCC_YUYV		0x56595559
-
-
-/**
- * Queryable on images created by createImageFromNames.
- *
- * RGB and RGBA are may be usable directly as images but its still
- * recommended to call fromPlanar with plane == 0.
- *
- * Y_U_V, Y_UV and Y_XUXV all requires call to fromPlanar to create
- * usable sub-images, sampling from images return raw YUV data and
- * color conversion needs to be done in the shader.
- *
- * \since 5
- */
-
-#define __DRI_IMAGE_COMPONENTS_RGB	0x3001
-#define __DRI_IMAGE_COMPONENTS_RGBA	0x3002
-#define __DRI_IMAGE_COMPONENTS_Y_U_V	0x3003
-#define __DRI_IMAGE_COMPONENTS_Y_UV	0x3004
-#define __DRI_IMAGE_COMPONENTS_Y_XUXV	0x3005
-
-
-/**
- * queryImage attributes
- */
-
-#define __DRI_IMAGE_ATTRIB_STRIDE	0x2000
-#define __DRI_IMAGE_ATTRIB_HANDLE	0x2001
-#define __DRI_IMAGE_ATTRIB_NAME		0x2002
-#define __DRI_IMAGE_ATTRIB_FORMAT	0x2003 /* available in versions 3+ */
-#define __DRI_IMAGE_ATTRIB_WIDTH	0x2004 /* available in versions 4+ */
-#define __DRI_IMAGE_ATTRIB_HEIGHT	0x2005
-#define __DRI_IMAGE_ATTRIB_COMPONENTS	0x2006 /* available in versions 5+ */
-#define __DRI_IMAGE_ATTRIB_FD           0x2007 /* available in versions
-                                                * 7+. Each query will return a
-                                                * new fd. */
-
-enum __DRIYUVColorSpace {
-   __DRI_YUV_COLOR_SPACE_UNDEFINED = 0,
-   __DRI_YUV_COLOR_SPACE_ITU_REC601 = 0x327F,
-   __DRI_YUV_COLOR_SPACE_ITU_REC709 = 0x3280,
-   __DRI_YUV_COLOR_SPACE_ITU_REC2020 = 0x3281
-};
-
-enum __DRISampleRange {
-   __DRI_YUV_RANGE_UNDEFINED = 0,
-   __DRI_YUV_FULL_RANGE = 0x3282,
-   __DRI_YUV_NARROW_RANGE = 0x3283
-};
-
-enum __DRIChromaSiting {
-   __DRI_YUV_CHROMA_SITING_UNDEFINED = 0,
-   __DRI_YUV_CHROMA_SITING_0 = 0x3284,
-   __DRI_YUV_CHROMA_SITING_0_5 = 0x3285
-};
-
-/**
- * \name Reasons that __DRIimageExtensionRec::createImageFromTexture might fail
- */
-/*@{*/
-/** Success! */
-#define __DRI_IMAGE_ERROR_SUCCESS       0
-
-/** Memory allocation failure */
-#define __DRI_IMAGE_ERROR_BAD_ALLOC     1
-
-/** Client requested an invalid attribute for a texture object  */
-#define __DRI_IMAGE_ERROR_BAD_MATCH     2
-
-/** Client requested an invalid texture object */
-#define __DRI_IMAGE_ERROR_BAD_PARAMETER 3
-/*@}*/
-
-typedef struct __DRIimageRec          __DRIimage;
-typedef struct __DRIimageExtensionRec __DRIimageExtension;
-struct __DRIimageExtensionRec {
-    __DRIextension base;
-
-    __DRIimage *(*createImageFromName)(__DRIscreen *screen,
-				       int width, int height, int format,
-				       int name, int pitch,
-				       void *loaderPrivate);
-
-    __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context,
-					       int renderbuffer,
-					       void *loaderPrivate);
-
-    void (*destroyImage)(__DRIimage *image);
-
-    __DRIimage *(*createImage)(__DRIscreen *screen,
-			       int width, int height, int format,
-			       unsigned int use,
-			       void *loaderPrivate);
-
-   GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value);
-
-   /**
-    * The new __DRIimage will share the content with the old one, see dup(2).
-    */
-   __DRIimage *(*dupImage)(__DRIimage *image, void *loaderPrivate);
-
-   /**
-    * Validate that a __DRIimage can be used a certain way.
-    *
-    * \since 2
-    */
-   GLboolean (*validateUsage)(__DRIimage *image, unsigned int use);
-
-   /**
-    * Unlike createImageFromName __DRI_IMAGE_FORMAT is not but instead
-    * __DRI_IMAGE_FOURCC and strides are in bytes not pixels. Stride is
-    * also per block and not per pixel (for non-RGB, see gallium blocks).
-    *
-    * \since 5
-    */
-   __DRIimage *(*createImageFromNames)(__DRIscreen *screen,
-                                       int width, int height, int fourcc,
-                                       int *names, int num_names,
-                                       int *strides, int *offsets,
-                                       void *loaderPrivate);
-
-   /**
-    * Create an image out of a sub-region of a parent image.  This
-    * entry point lets us create individual __DRIimages for different
-    * planes in a planar buffer (typically yuv), for example.  While a
-    * sub-image shares the underlying buffer object with the parent
-    * image and other sibling sub-images, the life times of parent and
-    * sub-images are not dependent.  Destroying the parent or a
-    * sub-image doesn't affect other images.  The underlying buffer
-    * object is free when no __DRIimage remains that references it.
-    *
-    * Sub-images may overlap, but rendering to overlapping sub-images
-    * is undefined.
-    *
-    * \since 5
-    */
-    __DRIimage *(*fromPlanar)(__DRIimage *image, int plane,
-                              void *loaderPrivate);
-
-    /**
-     * Create image from texture.
-     *
-     * \since 6
-     */
-   __DRIimage *(*createImageFromTexture)(__DRIcontext *context,
-                                         int target,
-                                         unsigned texture,
-                                         int depth,
-                                         int level,
-                                         unsigned *error,
-                                         void *loaderPrivate);
-   /**
-    * Like createImageFromNames, but takes a prime fd instead.
-    *
-    * \since 7
-    */
-   __DRIimage *(*createImageFromFds)(__DRIscreen *screen,
-                                     int width, int height, int fourcc,
-                                     int *fds, int num_fds,
-                                     int *strides, int *offsets,
-                                     void *loaderPrivate);
-
-   /**
-    * Like createImageFromFds, but takes additional attributes.
-    *
-    * For EGL_EXT_image_dma_buf_import.
-    *
-    * \since 8
-    */
-   __DRIimage *(*createImageFromDmaBufs)(__DRIscreen *screen,
-                                         int width, int height, int fourcc,
-                                         int *fds, int num_fds,
-                                         int *strides, int *offsets,
-                                         enum __DRIYUVColorSpace color_space,
-                                         enum __DRISampleRange sample_range,
-                                         enum __DRIChromaSiting horiz_siting,
-                                         enum __DRIChromaSiting vert_siting,
-                                         unsigned *error,
-                                         void *loaderPrivate);
-};
-
-
-/**
- * This extension must be implemented by the loader and passed to the
- * driver at screen creation time.  The EGLImage entry points in the
- * various client APIs take opaque EGLImage handles and use this
- * extension to map them to a __DRIimage.  At version 1, this
- * extensions allows mapping EGLImage pointers to __DRIimage pointers,
- * but future versions could support other EGLImage-like, opaque types
- * with new lookup functions.
- */
-#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP"
-#define __DRI_IMAGE_LOOKUP_VERSION 1
-
-typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension;
-struct __DRIimageLookupExtensionRec {
-    __DRIextension base;
-
-    __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image,
-				  void *loaderPrivate);
-};
-
-/**
- * This extension allows for common DRI2 options
- */
-#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY"
-#define __DRI2_CONFIG_QUERY_VERSION 1
-
-typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension;
-struct __DRI2configQueryExtensionRec {
-   __DRIextension base;
-
-   int (*configQueryb)(__DRIscreen *screen, const char *var, GLboolean *val);
-   int (*configQueryi)(__DRIscreen *screen, const char *var, GLint *val);
-   int (*configQueryf)(__DRIscreen *screen, const char *var, GLfloat *val);
-};
-
-/**
- * Robust context driver extension.
- *
- * Existence of this extension means the driver can accept the
- * \c __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS flag and the
- * \c __DRI_CTX_ATTRIB_RESET_STRATEGY attribute in
- * \c __DRIdri2ExtensionRec::createContextAttribs.
- */
-#define __DRI2_ROBUSTNESS "DRI_Robustness"
-#define __DRI2_ROBUSTNESS_VERSION 1
-
-typedef struct __DRIrobustnessExtensionRec __DRIrobustnessExtension;
-struct __DRIrobustnessExtensionRec {
-   __DRIextension base;
-};
-
-/**
- * DRI config options extension.
- *
- * This extension provides the XML string containing driver options for use by
- * the loader in supporting the driconf application.
- */
-#define __DRI_CONFIG_OPTIONS "DRI_ConfigOptions"
-#define __DRI_CONFIG_OPTIONS_VERSION 1
-
-typedef struct __DRIconfigOptionsExtensionRec {
-   __DRIextension base;
-   const char *xml;
-} __DRIconfigOptionsExtension;
-
-/**
- * This extension provides a driver vtable to a set of common driver helper
- * functions (driCoreExtension, driDRI2Extension) within the driver
- * implementation, as opposed to having to pass them through a global
- * variable.
- *
- * It is not intended to be public API to the actual loader, and the vtable
- * layout may change at any time.
- */
-#define __DRI_DRIVER_VTABLE "DRI_DriverVtable"
-#define __DRI_DRIVER_VTABLE_VERSION 1
-
-typedef struct __DRIDriverVtableExtensionRec {
-    __DRIextension base;
-    const struct __DriverAPIRec *vtable;
-} __DRIDriverVtableExtension;
-
-/**
- * Query renderer driver extension
- *
- * This allows the window system layer (either EGL or GLX) to query aspects of
- * hardware and driver support without creating a context.
- */
-#define __DRI2_RENDERER_QUERY "DRI_RENDERER_QUERY"
-#define __DRI2_RENDERER_QUERY_VERSION 1
-
-#define __DRI2_RENDERER_VENDOR_ID                             0x0000
-#define __DRI2_RENDERER_DEVICE_ID                             0x0001
-#define __DRI2_RENDERER_VERSION                               0x0002
-#define __DRI2_RENDERER_ACCELERATED                           0x0003
-#define __DRI2_RENDERER_VIDEO_MEMORY                          0x0004
-#define __DRI2_RENDERER_UNIFIED_MEMORY_ARCHITECTURE           0x0005
-#define __DRI2_RENDERER_PREFERRED_PROFILE                     0x0006
-#define __DRI2_RENDERER_OPENGL_CORE_PROFILE_VERSION           0x0007
-#define __DRI2_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION  0x0008
-#define __DRI2_RENDERER_OPENGL_ES_PROFILE_VERSION             0x0009
-#define __DRI2_RENDERER_OPENGL_ES2_PROFILE_VERSION            0x000a
-
-typedef struct __DRI2rendererQueryExtensionRec __DRI2rendererQueryExtension;
-struct __DRI2rendererQueryExtensionRec {
-   __DRIextension base;
-
-   int (*queryInteger)(__DRIscreen *screen, int attribute, unsigned int *val);
-   int (*queryString)(__DRIscreen *screen, int attribute, const char **val);
-};
-
-/**
- * Image Loader extension. Drivers use this to allocate color buffers
- */
-
-enum __DRIimageBufferMask {
-   __DRI_IMAGE_BUFFER_BACK = (1 << 0),
-   __DRI_IMAGE_BUFFER_FRONT = (1 << 1)
-};
-
-struct __DRIimageList {
-   uint32_t image_mask;
-   __DRIimage *back;
-   __DRIimage *front;
-};
-
-#define __DRI_IMAGE_LOADER "DRI_IMAGE_LOADER"
-#define __DRI_IMAGE_LOADER_VERSION 1
-
-struct __DRIimageLoaderExtensionRec {
-    __DRIextension base;
-
-   /**
-    * Allocate color buffers.
-    *
-    * \param driDrawable
-    * \param width              Width of allocated buffers
-    * \param height             Height of allocated buffers
-    * \param format             one of __DRI_IMAGE_FORMAT_*
-    * \param stamp              Address of variable to be updated when
-    *                           getBuffers must be called again
-    * \param loaderPrivate      The loaderPrivate for driDrawable
-    * \param buffer_mask        Set of buffers to allocate
-    * \param buffers            Returned buffers
-    */
-   int (*getBuffers)(__DRIdrawable *driDrawable,
-                     unsigned int format,
-                     uint32_t *stamp,
-                     void *loaderPrivate,
-                     uint32_t buffer_mask,
-                     struct __DRIimageList *buffers);
-
-    /**
-     * Flush pending front-buffer rendering
-     *
-     * Any rendering that has been performed to the
-     * fake front will be flushed to the front
-     *
-     * \param driDrawable    Drawable whose front-buffer is to be flushed
-     * \param loaderPrivate  Loader's private data that was previously passed
-     *                       into __DRIdri2ExtensionRec::createNewDrawable
-     */
-    void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);
-};
-
-/**
- * DRI extension.
- */
-
-#define __DRI_IMAGE_DRIVER           "DRI_IMAGE_DRIVER"
-#define __DRI_IMAGE_DRIVER_VERSION   1
-
-struct __DRIimageDriverExtensionRec {
-   __DRIextension               base;
-
-   /* Common DRI functions, shared with DRI2 */
-   __DRIcreateNewScreen2Func            createNewScreen2;
-   __DRIcreateNewDrawableFunc           createNewDrawable;
-   __DRIcreateContextAttribsFunc        createContextAttribs;
-   __DRIgetAPIMaskFunc                  getAPIMask;
-};
-
-#endif
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4f983ac010d6..86da7494d554 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -144,6 +144,7 @@
   xorg-cf-files,
   xorg-docs,
   xorgproto,
+  xorg-server,
   xorg-sgml-doctools,
   xprop,
   xrandr,
@@ -154,6 +155,7 @@
   xsm,
   xstdcmap,
   xtrans,
+  xvfb,
   xvinfo,
   xwininfo,
   xwud,
@@ -228,6 +230,7 @@ self: with self; {
     xsm
     xstdcmap
     xtrans
+    xvfb
     xvinfo
     xwininfo
     xwud
@@ -318,6 +321,7 @@ self: with self; {
   xcursorthemes = xcursor-themes;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
+  xorgserver = xorg-server;
   xorgsgmldoctools = xorg-sgml-doctools;
 
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
@@ -2343,11 +2347,11 @@ self: with self; {
     }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "xkbcomp";
-      version = "1.4.7";
+      version = "1.5.0";
       builder = ./builder.sh;
       src = fetchurl {
-        url = "mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz";
-        sha256 = "0xqzz209m9i43jbyrf2lh4xdbyhzzzn9mis2f2c32kplwla82a0a";
+        url = "mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz";
+        sha256 = "0q3092w42w9wyfr5zf3ymkmzlqr24z6kz6ypkinxnxh7c0k1zhra";
       };
       hardeningDisable = [
         "bindnow"
@@ -2490,64 +2494,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xorgserver = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      openssl,
-      libX11,
-      libXau,
-      libxcb,
-      xcbutil,
-      xcbutilwm,
-      xcbutilimage,
-      xcbutilkeysyms,
-      xcbutilrenderutil,
-      libXdmcp,
-      libXfixes,
-      libxkbfile,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xorg-server";
-      version = "21.1.20";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz";
-        sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc=";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        openssl
-        libX11
-        libXau
-        libxcb
-        xcbutil
-        xcbutilwm
-        xcbutilimage
-        xcbutilkeysyms
-        xcbutilrenderutil
-        libXdmcp
-        libXfixes
-        libxkbfile
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xorg-server" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xpr = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch b/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch
deleted file mode 100644
index 3675292f9c99..000000000000
--- a/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
----
- hw/xfree86/Makefile.am | 1 -
- hw/xfree86/Makefile.in | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index 9aeaea1..dcca3b8 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
-@@ -100,7 +100,6 @@ EXTRA_DIST = xorgconf.cpp
- 
- # Without logdir, X will post an error on the terminal and will not start
- install-data-local:
--	$(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
- if CYGWIN
- 	$(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
- endif
-diff --git a/hw/xfree86/Makefile.in b/hw/xfree86/Makefile.in
-index c4fceee..74da8f1 100644
---- a/hw/xfree86/Makefile.in
-+++ b/hw/xfree86/Makefile.in
-@@ -1161,7 +1161,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local \
- 
- # Without logdir, X will post an error on the terminal and will not start
- install-data-local:
--	$(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
- @CYGWIN_TRUE@	$(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
- 
- install-exec-hook:
--- 
-2.25.4
-
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index e0eaa35c4ce5..158a0f96bb46 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -76,6 +76,7 @@ $pcMap{"xinerama"} = "libXinerama";
 $pcMap{"xkbfile"} = "libxkbfile";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
+$pcMap{"xorg-server"} = "xorgserver";
 $pcMap{"xp"} = "libXp";
 $pcMap{"xpm"} = "libXpm";
 $pcMap{"xpresent"} = "libXpresent";
@@ -475,6 +476,7 @@ print OUT <<EOF;
   xorg-cf-files,
   xorg-docs,
   xorgproto,
+  xorg-server,
   xorg-sgml-doctools,
   xprop,
   xrandr,
@@ -485,6 +487,7 @@ print OUT <<EOF;
   xsm,
   xstdcmap,
   xtrans,
+  xvfb,
   xvinfo,
   xwininfo,
   xwud,
@@ -559,6 +562,7 @@ self: with self; {
     xsm
     xstdcmap
     xtrans
+    xvfb
     xvinfo
     xwininfo
     xwud
@@ -649,6 +653,7 @@ self: with self; {
   xcursorthemes = xcursor-themes;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
+  xorgserver = xorg-server;
   xorgsgmldoctools = xorg-sgml-doctools;
 
 EOF
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 76d0b9fccf9c..84ab6265f0f8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -338,248 +338,6 @@ self: super:
       postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts);
     });
 
-  xorgserver = super.xorgserver.overrideAttrs (
-    attrs_passed:
-    let
-      attrs = attrs_passed // {
-        buildInputs = attrs_passed.buildInputs ++ lib.optional (libdrm != null) libdrm.dev;
-        postPatch = ''
-          for i in dri3/*.c
-          do
-            sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i
-          done
-        '';
-        meta = attrs_passed.meta // {
-          mainProgram = "X";
-        };
-      };
-    in
-    attrs
-    // (
-      let
-        version = lib.getVersion attrs;
-        commonBuildInputs = attrs.buildInputs ++ [
-          xorg.xtrans
-          xorg.libxcvt
-        ];
-        commonPropagatedBuildInputs = [
-          dbus
-          libGL
-          libGLU
-          xorg.libXext
-          xorg.libXfont
-          xorg.libXfont2
-          libepoxy
-          libunwind
-          xorg.libxshmfence
-          xorg.pixman
-          xorg.xorgproto
-          zlib
-        ];
-        # XQuartz requires two compilations: the first to get X / XQuartz,
-        # and the second to get Xvfb, Xnest, etc.
-        darwinOtherX = xorg.xorgserver.overrideAttrs (oldAttrs: {
-          configureFlags = oldAttrs.configureFlags ++ [
-            "--disable-xquartz"
-            "--enable-xorg"
-            "--enable-xvfb"
-            "--enable-xnest"
-            "--enable-kdrive"
-          ];
-          postInstall = ":"; # prevent infinite recursion
-        });
-
-        fpgit =
-          commit: sha256: name:
-          fetchpatch (
-            {
-              url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/${commit}.diff";
-              inherit sha256;
-            }
-            // lib.optionalAttrs (name != null) {
-              name = name + ".patch";
-            }
-          );
-      in
-      if (!isDarwin) then
-        {
-          outputs = [
-            "out"
-            "dev"
-          ];
-          patches = [
-            # The build process tries to create the specified logdir when building.
-            #
-            # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
-            ./dont-create-logdir-during-build.patch
-          ];
-          buildInputs = commonBuildInputs ++ [
-            libdrm
-            libgbm
-            mesa-gl-headers
-            dri-pkgconfig-stub
-          ];
-          propagatedBuildInputs =
-            attrs.propagatedBuildInputs or [ ]
-            ++ [ xorg.libpciaccess ]
-            ++ commonPropagatedBuildInputs
-            ++ lib.optionals stdenv.hostPlatform.isLinux [
-              udev
-            ];
-          depsBuildBuild = [ buildPackages.stdenv.cc ];
-          prePatch = lib.optionalString stdenv.hostPlatform.isMusl ''
-            export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
-          '';
-          configureFlags = [
-            "--enable-kdrive" # not built by default
-            "--enable-xephyr"
-            "--enable-xcsecurity" # enable SECURITY extension
-            "--with-default-font-path="
-            # there were only paths containing "${prefix}",
-            # and there are no fonts in this package anyway
-            "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
-            "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
-            "--with-xkb-output=$out/share/X11/xkb/compiled"
-            "--with-log-dir=/var/log"
-            "--enable-glamor"
-            "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise
-          ]
-          ++ lib.optionals stdenv.hostPlatform.isMusl [
-            "--disable-tls"
-          ];
-
-          env.NIX_CFLAGS_COMPILE = toString [
-            # Needed with GCC 12
-            "-Wno-error=array-bounds"
-          ];
-
-          postInstall = ''
-            rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
-            ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
-              cd "$dev"
-              for f in include/xorg/*.h; do
-                sed "1i#line 1 \"${attrs.pname}-${attrs.version}/$f\"" -i "$f"
-              done
-            )
-          '';
-          passthru = attrs.passthru // {
-            inherit version; # needed by virtualbox guest additions
-          };
-        }
-      else
-        {
-          nativeBuildInputs = attrs.nativeBuildInputs ++ [
-            autoreconfHook
-            bootstrap_cmds
-            xorg.utilmacros
-            xorg.fontutil
-          ];
-          buildInputs = commonBuildInputs ++ [
-            bootstrap_cmds
-            automake
-            autoconf
-            mesa
-          ];
-          propagatedBuildInputs = commonPropagatedBuildInputs ++ [
-            xorg.libAppleWM
-            xorg.xorgproto
-          ];
-
-          patches = [
-            # XQuartz patchset
-            (fetchpatch {
-              url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
-              sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
-              name = "use-cppflags-not-cflags.patch";
-            })
-            (fetchpatch {
-              url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch";
-              sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg";
-              name = "use-old-mitrapezoids-and-mitriangles-routines.patch";
-            })
-            (fetchpatch {
-              url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch";
-              sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i";
-              name = "revert-fb-changes-1.patch";
-            })
-            (fetchpatch {
-              url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch";
-              sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396";
-              name = "revert-fb-changes-2.patch";
-            })
-            ./darwin/bundle_main.patch
-            ./darwin/stub.patch
-          ];
-
-          postPatch = attrs.postPatch + ''
-            substituteInPlace hw/xquartz/mach-startup/stub.c \
-              --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
-          '';
-
-          configureFlags = [
-            # note: --enable-xquartz is auto
-            "CPPFLAGS=-I${./darwin/dri}"
-            "--disable-libunwind" # libunwind on darwin is missing unw_strerror
-            "--disable-glamor"
-            "--with-default-font-path="
-            "--with-apple-application-name=XQuartz"
-            "--with-apple-applications-dir=\${out}/Applications"
-            "--with-bundle-id-prefix=org.nixos.xquartz"
-            "--with-sha1=CommonCrypto"
-            "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
-            "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
-            "--with-xkb-output=$out/share/X11/xkb/compiled"
-            "--without-dtrace" # requires Command Line Tools for Xcode
-          ];
-          preConfigure = ''
-            mkdir -p $out/Applications
-            export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
-          '';
-          postInstall = ''
-            rm -fr $out/share/X11/xkb/compiled
-
-            cp -rT ${darwinOtherX}/bin $out/bin
-            rm -f $out/bin/X
-            ln -s Xquartz $out/bin/X
-
-            cp ${darwinOtherX}/share/man -rT $out/share/man
-          '';
-          passthru = attrs.passthru // {
-            inherit version;
-          };
-        }
-    )
-  );
-
-  # xvfb is used by a bunch of things to run tests
-  # so try to reduce its reverse closure
-  xvfb = super.xorgserver.overrideAttrs (old: {
-    configureFlags = [
-      "--enable-xvfb"
-      "--disable-xorg"
-      "--disable-xquartz"
-      "--disable-xwayland"
-      "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
-      "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
-      "--with-xkb-output=$out/share/X11/xkb/compiled"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      "--without-dtrace"
-    ];
-
-    buildInputs = old.buildInputs ++ [
-      dri-pkgconfig-stub
-      libdrm
-      libGL
-      mesa-gl-headers
-      xorg.pixman
-      xorg.libXfont2
-      xorg.xtrans
-      xorg.libxcvt
-      xorg.libxshmfence
-    ];
-  });
-
   xclock = addMainProgram super.xclock { };
 
   xinit =
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 6477442a08e7..7a8740cb389e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -3,7 +3,7 @@ mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz
 mirror://xorg/individual/app/xinput-1.6.4.tar.xz
-mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz
+mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz
 mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz
 mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
@@ -55,4 +55,3 @@ mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 015872e3b2f7..64d02ed4ff68 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -107,12 +107,9 @@ lib.warnIf (withDocs != null)
       }"
     ]
     ++ lib.optionals stdenv.hostPlatform.isCygwin [
-      "--without-libintl-prefix"
-      "--without-libiconv-prefix"
-      "--with-installed-readline"
       "bash_cv_dev_stdin=present"
       "bash_cv_dev_fd=standard"
-      "bash_cv_termcap_lib=libncurses"
+      "gt_cv_func_printf_posix=yes"
     ]
     ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [
       "--disable-nls"
@@ -136,15 +133,10 @@ lib.warnIf (withDocs != null)
 
     enableParallelBuilding = true;
 
-    makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [
-      "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a"
-      "SHOBJ_LIBS=-lbash"
-    ];
-
     doCheck = false; # Can't be enabled by default due to dependency cycle, use passthru.tests.withChecks instead
 
     postInstall = ''
-      ln -s bash "$out/bin/sh"
+      ln -s bash${stdenv.hostPlatform.extensions.executable} "$out/bin/sh"
       rm -f $out/lib/bash/Makefile.inc
     '';
 
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index f051ae6c7d44..7f20b3b5de93 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1760,6 +1760,25 @@ runPhase() {
     fi
 }
 
+definePhases() {
+    # only defines phases if it is not already defined
+    if [ -z "${phases[*]:-}" ]; then
+        phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \
+            configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \
+            ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \
+            ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}"
+    fi
+}
+
+printPhases() {
+    definePhases
+    # one phase per line, to make it easy to consume with tools like xargs
+    # explicitly uses the same splitting as genericBuild
+    local phase
+    for phase in ${phases[*]}; do
+        printf '%s\n' "$phase"
+    done
+}
 
 genericBuild() {
     # variable used by our gzip wrapper to add -n.
@@ -1775,12 +1794,7 @@ genericBuild() {
         return
     fi
 
-    if [ -z "${phases[*]:-}" ]; then
-        phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \
-            configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \
-            ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \
-            ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}";
-    fi
+    definePhases
 
     # The use of ${phases[*]} gives the correct behavior both with and
     # without structured attrs.  This relies on the fact that each
diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix
index c1a96e66013c..3493721ba5da 100644
--- a/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix
@@ -1,25 +1,21 @@
+# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
+# $ ./refresh-tarballs.bash --targets=aarch64-unknown-linux-musl
 #
-# Files came from this Hydra build:
-#
-#   https://hydra.nixos.org/build/246470544
-#
-# …which used nixpkgs revision dd5621df6dcb90122b50da5ec31c411a0de3e538
-# to instantiate:
-#
-#   /nix/store/g480ass2vjmakaq03z7k2j95xnxh206a-stdenv-bootstrap-tools.drv
-#
-# …and then built:
-#
-#   /nix/store/95lm0y33dayag4542s8bi83s31bw68dr-stdenv-bootstrap-tools
-#
+# Metadata:
+# - nixpkgs revision: 8c29968b3a942f2903f90797f9623737c215737c
+# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.aarch64-unknown-linux-musl.build/latest
+# - resolved hydra build: https://hydra.nixos.org/build/315356516
+# - instantiated derivation: /nix/store/zd9i77gp51l3chdkfyqhffzfnmbmf02y-stdenv-bootstrap-tools.drv
+# - output directory: /nix/store/c3qpy1mlcrqklpak5lkgdy0l0kbsndl1-stdenv-bootstrap-tools
+# - build time: Mon, 01 Dec 2025 18:29:46 +0000
 {
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/bootstrap-tools.tar.xz";
+    hash = "sha256-nw/PFVwYZG9oPuQSf760VSwKzHKKZA3r+XqDr8HLytg=";
+  };
   busybox = import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/dd5621df6dcb90122b50da5ec31c411a0de3e538/busybox";
-    sha256 = "sha256-WuOaun7U5enbOy8SuuCo6G1fbGwsO16jhy/oM8K0lAs=";
+    url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/busybox";
+    hash = "sha256-ASctUeTLD/TC6aZHX9xuRsmlacwCDxt9zsb/gy6Ia1g=";
     executable = true;
   };
-  bootstrapTools = import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/dd5621df6dcb90122b50da5ec31c411a0de3e538/bootstrap-tools.tar.xz";
-    hash = "sha256-ZY9IMOmx1VOn6uoFDpdJbTnPX59TEkrVCzWNtjQ8/QE=";
-  };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix
index 283b12b0d578..fb9f4827b298 100644
--- a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix
@@ -2,20 +2,20 @@
 # $ ./refresh-tarballs.bash --targets=x86_64-unknown-linux-musl
 #
 # Metadata:
-# - nixpkgs revision: 125cefd4cf8f857e5ff1aceaef9230ba578a033d
+# - nixpkgs revision: 8c29968b3a942f2903f90797f9623737c215737c
 # - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-unknown-linux-musl.build/latest
-# - resolved hydra build: https://hydra.nixos.org/build/247890807
-# - instantiated derivation: /nix/store/gqri9n85rsf2983r6m8lkz0h69k4n7xi-stdenv-bootstrap-tools.drv
-# - output directory: /nix/store/b0x0qcbf1gsp50jzw52sbbgdp3jlwcjf-stdenv-bootstrap-tools
-# - build time: Fri, 26 Jan 2024 22:09:22 +0000
+# - resolved hydra build: https://hydra.nixos.org/build/315356522
+# - instantiated derivation: /nix/store/783rl6mlrc2wpp9apclcvc8x7vwi842s-stdenv-bootstrap-tools.drv
+# - output directory: /nix/store/f881dxkvjal4vflnznfbz7g6pn4q0c56-stdenv-bootstrap-tools
+# - build time: Mon, 01 Dec 2025 18:29:47 +0000
 {
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz";
-    hash = "sha256-t0W2MR7UwtPyYEGcRo9UOuXfaP4uUZKZXEmYGcBOuOA=";
+    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/bootstrap-tools.tar.xz";
+    hash = "sha256-WwA4q0JNEdnSAhTwcPGIrwuOha33T0aRG7tR/YgA7L4=";
   };
   busybox = import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox";
-    hash = "sha256-0U2r3EU61oqhs+oyzFABIFTCVqXOWSP0qEtnyHwjzm0=";
+    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/busybox";
+    hash = "sha256-XJTiB2U3KkP31G5s68Ho7wQY5yz72CZkLSarR+56zKw=";
     executable = true;
   };
 }
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index d9f968c84300..6a1507df734d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -47,21 +47,10 @@ rec {
     '';
   };
 
-  bootGCC =
-    (pkgs.gcc.cc.override {
-      enableLTO = false;
-      isl = null;
-    }).overrideAttrs
-      (old: {
-        patches = old.patches or [ ] ++ [
-          (pkgs.fetchpatch {
-            # c++tools: Don't check --enable-default-pie.
-            # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found
-            url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch";
-            hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds=";
-          })
-        ];
-      });
+  bootGCC = pkgs.gcc.cc.override {
+    enableLTO = false;
+    isl = null;
+  };
 
   bootBinutils = pkgs.binutils.bintools.override {
     withAllTargets = false;
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index c11f93df0f5b..6a8297fea01f 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -9,6 +9,9 @@
 }:
 
 let
+  # tests can be based on builtins.derivation and bootstrapTools directly to minimize rebuilds
+  # see test 'make-symlinks-relative' in ./hooks.nix as an example.
+  bootstrapTools = stdenv.bootstrapTools;
   # early enough not to rebuild gcc but late enough to have patchelf
   earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages or pkgs;
   earlierPkgs =
@@ -240,7 +243,7 @@ in
     import ./hooks.nix {
       stdenv = bootStdenv;
       pkgs = earlyPkgs;
-      inherit lib;
+      inherit bootstrapTools lib;
     }
   );
 
@@ -499,7 +502,7 @@ in
       import ./hooks.nix {
         stdenv = bootStdenvStructuredAttrsByDefault;
         pkgs = earlyPkgs;
-        inherit lib;
+        inherit bootstrapTools lib;
       }
     );
 
diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix
index aa138040d50f..70daaf5d403e 100644
--- a/pkgs/test/stdenv/hooks.nix
+++ b/pkgs/test/stdenv/hooks.nix
@@ -1,4 +1,5 @@
 {
+  bootstrapTools,
   stdenv,
   pkgs,
   lib,
@@ -28,36 +29,65 @@
         [[ -e $out/share/man/small-man.1.gz ]]
       '';
     };
-  make-symlinks-relative = stdenv.mkDerivation {
-    name = "test-make-symlinks-relative";
-    outputs = [
-      "out"
-      "man"
-    ];
-    buildCommand = ''
-      mkdir -p $out/{bar,baz}
-      mkdir -p $man/share/{x,y}
-      source1="$out/bar/foo"
-      destination1="$out/baz/foo"
-      source2="$man/share/x/file1"
-      destination2="$man/share/y/file2"
-      echo foo > $source1
-      echo foo > $source2
-      ln -s $source1 $destination1
-      ln -s $source2 $destination2
-      echo "symlink before patching: $(readlink $destination1)"
-      echo "symlink before patching: $(readlink $destination2)"
+  # test based on bootstrapTools to minimize rebuilds
+  make-symlinks-relative =
+    (derivation {
+      name = "test-make-symlinks-relative";
+      system = stdenv.system;
+      builder = "${bootstrapTools}/bin/bash";
+      initialPath = "${bootstrapTools}";
+      outputs = [
+        "out"
+        "out2"
+      ];
+      args = [
+        "-c"
+        ''
+          set -euo pipefail
+          . ${../../stdenv/generic/setup.sh}
+          . ${../../build-support/setup-hooks/make-symlinks-relative.sh}
 
-      _makeSymlinksRelativeInAllOutputs
+          mkdir -p $out $out2
 
-      echo "symlink after patching: $(readlink $destination1)"
-      ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
-      ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
-      echo "symlink after patching: $(readlink $destination2)"
-      ([[ -e $destination2 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1)
-      ([[ $(readlink $destination2) == "../x/file1" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1)
-    '';
-  };
+          # create symlink targets
+          touch $out/target $out2/target
+
+          # link within out
+          ln -s $out/target $out/linkToOut
+
+          # link across different outputs
+          ln -s $out2/target $out/linkToOut2
+
+          # broken link
+          ln -s $out/does-not-exist $out/brokenLink
+
+          # call hook
+          _makeSymlinksRelative
+
+          # verify link within out became relative
+          echo "readlink linkToOut: $(readlink $out/linkToOut)"
+          if test "$(readlink $out/linkToOut)" != 'target'; then
+            echo "Expected relative link, got: $(readlink $out/linkToOut)"
+            exit 1
+          fi
+
+          # verify link across outputs is still absolute
+          if test "$(readlink $out/linkToOut2)" != "$out2/target"; then
+            echo "Expected absolute link, got: $(readlink $out/linkToOut2)"
+            exit 1
+          fi
+
+          # verify broken link was made relative
+          if test "$(readlink $out/brokenLink)" != 'does-not-exist'; then
+            echo "Expected relative broken link, got: $(readlink $out/brokenLink)"
+            exit 1
+          fi
+        ''
+      ];
+    })
+    // {
+      meta = { };
+    };
   move-docs = stdenv.mkDerivation {
     name = "test-move-docs";
     buildCommand = ''
diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix
index 3d8d76c2b886..8eab77a847cb 100644
--- a/pkgs/tools/misc/pgbadger/default.nix
+++ b/pkgs/tools/misc/pgbadger/default.nix
@@ -7,8 +7,6 @@
   nix-update-script,
   pgbadger,
   PodMarkdown,
-  shortenPerlShebang,
-  stdenv,
   testers,
   TextCSV_XS,
   which,
@@ -29,13 +27,6 @@ buildPerlPackage rec {
     patchShebangs ./pgbadger
   '';
 
-  # pgbadger has too many `-Idir` flags on its shebang line on Darwin,
-  # causing the build to fail when trying to generate the documentation.
-  # Rewrite the -I flags in `use lib` form.
-  preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shortenPerlShebang ./pgbadger
-  '';
-
   outputs = [ "out" ];
 
   PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}";
@@ -46,8 +37,6 @@ buildPerlPackage rec {
     TextCSV_XS
   ];
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ];
-
   nativeCheckInputs = [
     bzip2
     which
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 1ebc5179bad7..bafb82fa5090 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -72,9 +72,35 @@ stdenv.mkDerivation (finalAttrs: {
     # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
     ./dont_create_privsep_path.patch
 
+    # See discussion in https://github.com/NixOS/nixpkgs/issues/466049 and
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/openssh/-/issues/23
+    (fetchpatch {
+      name = "pkcs11-fetchkey-error-to-debug.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/607f337637f2077b34a9f6f96fc24237255fe175.patch";
+      hunks = [ "2-" ];
+      hash = "sha256-rdvKL6/rwrdhGKlcmdy6fxVgJgaaRsmngX0KkShXAhQ=";
+    })
+    (fetchpatch {
+      name = "pkcs11-fix-pinentry.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/434ba7684054c0637ce8f2486aaacafe65d9b8aa.patch";
+      # only applies to Makefile.in (which doesn't have a date header) so no hunks= needed
+      hash = "sha256-3JQ3IJurngXclORrfC2Bx7xvmGA6w2nIh+eZ0zd0bLY=";
+    })
+
     # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and
     # https://github.com/openssh/openssh-portable/pull/602
-    ./fix_pkcs11_tests.patch
+    (fetchpatch {
+      name = "pkcs11-tests-allow-module-path.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/5e7c3f33b2693b668ecfbac84b85f2c0c84410c2.patch";
+      hunks = [ "2-" ];
+      hash = "sha256-mGpRGXurg8K9Wp8qoojG5MQ+3sZW2XKy2z0RDXLHaEc=";
+    })
+    (fetchpatch {
+      name = "ssh-agent-tests-increase-timeout.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/1fdc3c61194819c16063dc430eeb84b81bf42dcf.patch";
+      hunks = [ "2-" ];
+      hash = "sha256-b9YCOav32kY5VEvIG3W1fyD87HaQxof6Zwq9Oo+/Lac=";
+    })
   ]
   ++ extraPatches;
 
diff --git a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch
deleted file mode 100644
index c4459c8ee0e1..000000000000
--- a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 642218d8dd1ec79fa0c8db491fd46faa3ab026f7 Mon Sep 17 00:00:00 2001
-From: Morgan Jones <me@numin.it>
-Date: Tue, 21 Oct 2025 01:15:55 -0700
-Subject: [PATCH 1/2] test-exec: use -P for allowed PKCS#11 library when
- starting agent
-
-If we just loaded a PKCS#11 library, we should allow it so the
-regression test can run.
-
-Fixes: https://github.com/NixOS/nixpkgs/issues/453782
----
- regress/test-exec.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/regress/test-exec.sh b/regress/test-exec.sh
-index 5b0c91f3faa..30b3da8709d 100644
---- a/regress/test-exec.sh
-+++ b/regress/test-exec.sh
-@@ -1023,6 +1023,9 @@ p11_ssh_add() {
- 
- start_ssh_agent() {
- 	EXTRA_AGENT_ARGS="$1"
-+	if [ "$PKCS11_OK" = "yes" ]; then
-+		EXTRA_AGENT_ARGS="${EXTRA_AGENT_ARGS} -P${TEST_SSH_PKCS11}"
-+	fi
- 	SSH_AUTH_SOCK="$OBJ/agent.sock"
- 	export SSH_AUTH_SOCK
- 	rm -f $SSH_AUTH_SOCK $OBJ/agent.log
-
-From 5ae735db7d81b38ee059d63a4011291cb4456aef Mon Sep 17 00:00:00 2001
-From: Morgan Jones <me@numin.it>
-Date: Tue, 21 Oct 2025 01:50:23 -0700
-Subject: [PATCH 2/2] test-exec: give more time for ssh-agent to start
-
----
- regress/test-exec.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/regress/test-exec.sh b/regress/test-exec.sh
-index 30b3da8709d..56a7653b386 100644
---- a/regress/test-exec.sh
-+++ b/regress/test-exec.sh
-@@ -1034,7 +1034,7 @@ start_ssh_agent() {
- 	    > $OBJ/agent.log 2>&1 &
- 	AGENT_PID=$!
- 	trap "kill $AGENT_PID" EXIT
--	for x in 0 1 2 3 4 ; do
-+	for x in $(seq 15); do
- 		# Give it a chance to start
- 		${SSHADD} -l > /dev/null 2>&1
- 		r=$?
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index a681ff46aef8..3a39749b5a1c 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -44,8 +44,14 @@ stdenv.mkDerivation rec {
 
   # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under
   # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow and test-sigaction fail.
+  # Disable all gnulib tests when building on Darwin due to test-nl_langinfo-mt failure
+  # known by upstream https://www.mail-archive.com/bug-gnulib@gnu.org/msg50806.html
   postPatch =
-    if
+    if stdenv.buildPlatform.isDarwin then
+      ''
+        sed -i 's:gnulib-tests::g' Makefile.in
+      ''
+    else if
       ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32))
     then
       ''
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index b0f1cbc803c9..aab61444b524 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -38,8 +38,9 @@ stdenv.mkDerivation {
   # Some gnulib tests fail
   # - on Musl: https://github.com/NixOS/nixpkgs/pull/228714
   # - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330
+  # - when building on Darwin (cross-compilation): test-nl_langinfo-mt fails
   postPatch =
-    if stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then
+    if stdenv.hostPlatform.isMusl || stdenv.buildPlatform.isDarwin then
       ''
         sed -i 's:gnulib-tests::g' Makefile.in
       ''
@@ -79,6 +80,11 @@ stdenv.mkDerivation {
     export MKDIR_P="mkdir -p"
   '';
 
+  configureFlags =
+    # Work around build failure caused by the gnulib workaround for
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after GCC 15
+    lib.optional stdenv.hostPlatform.isCygwin "gl_cv_clean_version_stddef=yes";
+
   enableParallelBuilding = true;
 
   # Fix reference to sh in bootstrap-tools, and invoke grep via
@@ -92,7 +98,7 @@ stdenv.mkDerivation {
     chmod +x $out/bin/egrep $out/bin/fgrep
   '';
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isMinGW {
+  env = lib.optionalAttrs (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) {
     NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
   };
 
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 48b22d07c144..40f1596302fe 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -43,7 +43,6 @@
   woff2,
   xxHash,
   makeWrapper,
-  shortenPerlShebang,
   useFixedHashes,
   asymptote,
   biber-ms,
@@ -177,6 +176,7 @@ let
       "--disable-texlive" # do not build the texlive (TeX Live scripts) package
       "--disable-linked-scripts" # do not install the linked scripts
       "-C" # use configure cache to speed up
+      "CFLAGS=-std=gnu17" # fix build with gcc15
     ]
     ++ withSystemLibs [
       # see "from TL tree" vs. "Using installed"  in configure output
@@ -585,6 +585,18 @@ rec {
       "--with-ttfautohint"
     ];
 
+    # GCC15 compataiblity patches
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/mgieseki/dvisvgm/commit/ebf66e3f59edf89e9d2b4fb7973b859e185eb034.patch";
+        hash = "sha256-5dppK9saWOuIH4Pmv7Zk9vrRc81oK8qKZqkwCuOQhaY=";
+      })
+      (fetchpatch {
+        url = "https://github.com/mgieseki/dvisvgm/commit/dcb5940dff7ca3084330119a4ff1472cd52ef6de.patch";
+        hash = "sha256-rGTFeeLaWIon4O16x1wFxb3Wr020HdUR3BgrqB5r864=";
+      })
+    ];
+
     # PDF handling requires mutool (from mupdf) since Ghostscript 10.01
     postPatch = ''
       substituteInPlace src/PDFHandler.cpp \
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5267491438bc..181e875e7708 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1618,6 +1618,7 @@ mapAliases {
   tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
   tewi-font = throw "'tewi-font' has been removed because it was removed from upstream"; # Added 2025-12-18
   texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
+  texinfo6 = throw "'texinfo6' has been removed in favor of the latest version"; # Added 2025-12-17
   textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
   tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintenance"; # Added 2025-06-03
   tf2pulumi = throw "'tf2pulumi' has been removed because upstream removed the repo. Consider using https://github.com/pulumi/pulumi-converter-terraform instead"; # Added 2025-12-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d3932081892..9efad87a869d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2386,7 +2386,6 @@ with pkgs;
       pslSupport = true;
       zstdSupport = true;
       http3Support = true;
-      c-aresSupport = true;
     }
     // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
       brotliSupport = true;
@@ -3075,8 +3074,8 @@ with pkgs;
 
   nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
 
-  nodejs = nodejs_22;
-  nodejs-slim = nodejs-slim_22;
+  nodejs = nodejs_24;
+  nodejs-slim = nodejs-slim_24;
 
   nodejs_20 = callPackage ../development/web/nodejs/v20.nix { };
   nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; };
@@ -4254,7 +4253,7 @@ with pkgs;
   gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
   glow-lang = pkgs.gerbilPackages-unstable.glow-lang;
 
-  default-gcc-version = 14;
+  default-gcc-version = 15;
   gcc = pkgs.${"gcc${toString default-gcc-version}"};
   gccFun = callPackage ../development/compilers/gcc;
   gcc-unwrapped = gcc.cc;
@@ -5054,7 +5053,6 @@ with pkgs;
 
   inherit (rustPackages)
     cargo
-    cargo-auditable
     cargo-auditable-cargo-wrapper
     clippy
     rustc
@@ -5354,15 +5352,6 @@ with pkgs;
     xeus-cling
     ;
 
-  clojure = callPackage ../development/interpreters/clojure {
-    # set this to an LTS version of java
-    # Be careful if you remove this, out-of-tree consumers expect to
-    # be able to override `jdk`.
-    jdk = jdk21;
-  };
-
-  clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
-
   dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall;
 
   dhall-bash = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-bash;
@@ -5632,9 +5621,9 @@ with pkgs;
   python27Packages = python27.pkgs;
   python310Packages = python310.pkgs;
   python311Packages = python311.pkgs;
-  python312Packages = recurseIntoAttrs python312.pkgs;
+  python312Packages = python312.pkgs;
   python313Packages = recurseIntoAttrs python313.pkgs;
-  python314Packages = python314.pkgs;
+  python314Packages = recurseIntoAttrs python314.pkgs;
   python315Packages = python315.pkgs;
   pypyPackages = pypy.pkgs;
   pypy2Packages = pypy2.pkgs;
@@ -6538,7 +6527,6 @@ with pkgs;
 
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)
-    texinfo6
     texinfo7
     ;
   texinfo = texinfo7;
@@ -7105,8 +7093,6 @@ with pkgs;
     autoconf = buildPackages.autoconf269;
   };
 
-  gpgme = callPackage ../development/libraries/gpgme { };
-
   grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
 
   glib = callPackage ../by-name/gl/glib/package.nix (
@@ -8688,13 +8674,12 @@ with pkgs;
   ### DEVELOPMENT / PERL MODULES
 
   perlInterpreters = import ../development/interpreters/perl { inherit callPackage; };
-  inherit (perlInterpreters) perl538 perl540;
+  inherit (perlInterpreters) perl5;
 
-  perl538Packages = recurseIntoAttrs perl538.pkgs;
-  perl540Packages = recurseIntoAttrs perl540.pkgs;
+  perl5Packages = recurseIntoAttrs perl5.pkgs;
 
-  perl = perl540;
-  perlPackages = perl540Packages;
+  perl = perl5;
+  perlPackages = perl5Packages;
 
   ack = perlPackages.ack;
 
@@ -10757,6 +10742,7 @@ with pkgs;
 
   gimp2 = callPackage ../applications/graphics/gimp/2.0 {
     lcms = lcms2;
+    stdenv = if stdenv.cc.isGNU then gcc14Stdenv else stdenv;
   };
 
   gimp2-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {
@@ -12068,7 +12054,7 @@ with pkgs;
 
   buildTypstPackage = callPackage ../build-support/build-typst-package.nix { };
 
-  typstPackages = typst.packages;
+  typstPackages = recurseIntoAttrs typst.packages;
 
   ueberzug = with python3Packages; toPythonApplication ueberzug;
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5488c550455b..ed0ebb923fcf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -20,7 +20,6 @@
   fetchFromGitHub,
   fetchFromGitLab,
   perl,
-  shortenPerlShebang,
   nixosTests,
 }:
 
@@ -66,19 +65,22 @@ with self;
     args:
     buildPerlPackage (
       {
+        # In case of cross-compilation, generated ./Build have host perl shebang, not build one
+        # so run it with build perl explicitly
         buildPhase = ''
           runHook preBuild
-          perl Build.PL --prefix=$out; ./Build build
+          perl Build.PL --prefix=$out;
+          perl ./Build build
           runHook postBuild
         '';
         installPhase = ''
           runHook preInstall
-          ./Build install
+          perl ./Build install
           runHook postInstall
         '';
         checkPhase = ''
           runHook preCheck
-          ./Build test
+          perl ./Build test
           runHook postCheck
         '';
       }
@@ -126,11 +128,7 @@ with self;
       "man"
     ];
 
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [ FileNext ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/ack
-    '';
 
     # tests fails on nixos and hydra because of different purity issues
     doCheck = false;
@@ -1217,10 +1215,6 @@ with self;
         --replace-fail http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org
     '';
     propagatedBuildInputs = [ IOSocketSSL ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/cpanm
-    '';
     meta = {
       description = "Get, unpack, build and install modules from CPAN";
       homepage = "https://github.com/miyagawa/cpanminus";
@@ -1258,10 +1252,6 @@ with self;
       ParallelPipes
       locallib
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/cpm
-    '';
     meta = {
       description = "Fast CPAN module installer";
       homepage = "https://github.com/skaji/cpm";
@@ -1308,7 +1298,6 @@ with self;
       TextLayout
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
 
     # Delete tests that fail when version env var is set, see
     # https://github.com/ChordPro/chordpro/issues/293
@@ -1317,7 +1306,6 @@ with self;
     '';
 
     postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/chordpro
       rm $out/bin/wxchordpro # Wx not supported on darwin
     '';
     meta = {
@@ -1873,10 +1861,10 @@ with self;
 
   AudioScan = buildPerlPackage {
     pname = "Audio-Scan";
-    version = "1.10";
+    version = "1.11";
     src = fetchurl {
-      url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.0/CPAN/Audio-Scan-1.10.tar.gz";
-      hash = "sha256-Vqi/rnYKijmaWYwTFTyj88aMoDB2cCSHxHeR1bkfqSk=";
+      url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.1/CPAN/Audio-Scan-1.11.tar.gz";
+      hash = "sha256-G+0qaqP2c1w/UKuOmRawq/qKZjsWvZUzTAl5C6H6bUI=";
     };
     buildInputs = [
       pkgs.zlib
@@ -2582,6 +2570,15 @@ with self;
       url = "mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz";
       hash = "sha256-PG2qZx/s+8Nfkqk4W1Y9ZfUN/Gvci0gF+e9GwNA1qSY=";
     };
+    patches = [
+      # Fix build with gcc15
+      # https://rt.cpan.org/Public/Bug/Display.html?id=165142
+      (fetchpatch {
+        name = "perl-bitvector-fix-bool-detection.patch";
+        url = "https://src.fedoraproject.org/rpms/perl-Bit-Vector/raw/fe339c95e0da8a130c5bba5a975d37230178b59d/f/0001-Fix-bool-detection.patch";
+        hash = "sha256-zC4/RMKhdFNEwNIorzuU76p8P/Lwgv1pF6Oi4MX4M1o=";
+      })
+    ];
     propagatedBuildInputs = [ CarpClan ];
     meta = {
       description = "Efficient bit vector, set of integers and 'big int' math library";
@@ -2595,10 +2592,10 @@ with self;
 
   BKeywords = buildPerlPackage {
     pname = "B-Keywords";
-    version = "1.27";
+    version = "1.28";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.27.tar.gz";
-      hash = "sha256-7xC5CF5nTqpBfMt9aS+2zZj3u2feKhJ+ujRX2K5YfP8=";
+      url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.28.tar.gz";
+      hash = "sha256-nn62dpWSlIfGGq8trouvndoa2HYCu1oJTxB0SxJ2Xj4=";
     };
     meta = {
       description = "Lists of reserved barewords and symbol names";
@@ -2731,63 +2728,6 @@ with self;
     };
   };
 
-  BSON = buildPerlPackage {
-    pname = "BSON";
-    version = "1.12.2";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz";
-      hash = "sha256-9GEsDDVDEHQbmattJkUSJoIxUMonEJsbORIy1c/dpts=";
-    };
-    buildInputs = [
-      JSONMaybeXS
-      PathTiny
-      TestDeep
-      TestFatal
-    ];
-    propagatedBuildInputs = [
-      CryptURandom
-      Moo
-      TieIxHash
-      boolean
-      namespaceclean
-    ];
-    meta = {
-      description = "BSON serialization and deserialization (EOL)";
-      homepage = "https://github.com/mongodb-labs/mongo-perl-bson";
-      license = with lib.licenses; [ asl20 ];
-    };
-  };
-
-  BSONXS = buildPerlPackage {
-    pname = "BSON-XS";
-    version = "0.8.4";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz";
-      hash = "sha256-KPfTOP14tvnJpggL6d4/XLI9iIuW6/b8v6zp8pZq6/k=";
-    };
-    buildInputs = [
-      ConfigAutoConf
-      JSONMaybeXS
-      PathTiny
-      TestDeep
-      TestFatal
-      TieIxHash
-    ];
-    propagatedBuildInputs = [
-      BSON
-      boolean
-      JSONXS
-      JSONPP
-      CpanelJSONXS
-    ];
-    meta = {
-      description = "XS implementation of MongoDB's BSON serialization (EOL)";
-      homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs";
-      license = with lib.licenses; [ asl20 ];
-      platforms = lib.platforms.linux; # configure phase fails with "ld: unknown option: -mmacosx-version-min=10.12"
-    };
-  };
-
   BUtils = buildPerlPackage {
     pname = "B-Utils";
     version = "0.27";
@@ -2797,6 +2737,10 @@ with self;
     };
     propagatedBuildInputs = [ TaskWeaken ];
     buildInputs = [ ExtUtilsDepends ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/utils/40walk.t
+    '';
     meta = {
       description = "Helper functions for op tree manipulation";
       homepage = "https://search.cpan.org/dist/B-Utils";
@@ -3382,7 +3326,6 @@ with self;
     buildInputs = [
       ModuleBuildTiny
       TestLongString
-      TestSimple13
       TestWWWMechanize
       TestWWWMechanizeCatalyst
     ];
@@ -3803,7 +3746,6 @@ with self;
     buildInputs = [
       CatalystRuntime
       TestLongString
-      TestSimple13
       TestWWWMechanize
       TestWWWMechanizeCatalyst
     ];
@@ -4177,7 +4119,6 @@ with self;
     buildInputs = [
       CatalystRuntime
       TestLongString
-      TestSimple13
       TestWWWMechanize
       TestWWWMechanizeCatalyst
       TextCSV
@@ -4440,6 +4381,11 @@ with self;
       TestWarn
     ];
     propagatedBuildInputs = [ HTMLParser ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/rt-84767.t
+      rm t/param_list_context.t
+    '';
     meta = {
       description = "Handle Common Gateway Interface requests and responses";
       homepage = "https://metacpan.org/module/CGI";
@@ -5295,6 +5241,12 @@ with self;
       url = "mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz";
       hash = "sha256-3JoR4Nq1bcIg3qjJT+PEfbXn3Xwe0E3IF4qlu3v7vM4=";
     };
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/10_Class_Throwable_test.t
+      rm t/20_Class_Throwable_subException_test.t
+      rm t/35_Class_Throwable_sub_class_test.t
+    '';
     meta = {
       description = "Minimal lightweight exception class";
       license = with lib.licenses; [
@@ -6437,7 +6389,6 @@ with self;
     };
     buildInputs = [
       TestException
-      TestSimple13
     ];
     meta = {
       description = "Run code after a subroutine call, preserving the context the subroutine would have seen if it were the last statement in the caller";
@@ -6494,6 +6445,15 @@ with self;
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz";
       hash = "sha256-GSjkgDNUDhHr9VBpht0QGveNJCHSEPllmSI7FdUXFMY=";
     };
+    patches = [
+      # Fix build with gcc15
+      # https://rt.cpan.org/Public/Bug/Display.html?id=158609
+      (fetchpatch {
+        name = "perl-coro-c23.patch";
+        url = "https://src.fedoraproject.org/rpms/perl-Coro/raw/7099f289e10ec5d4d5dbbabe6267257588417693/f/Coro-6.57-c23.patch";
+        hash = "sha256-BnVE+E8taPfmAN+bsKK3AvesVrwi52GWUMa6TFJw3KY=";
+      })
+    ];
     propagatedBuildInputs = [
       AnyEvent
       Guard
@@ -6633,14 +6593,10 @@ with self;
       url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz";
       hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU=";
     };
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [
       FileHomeDir
       LWPProtocolHttps
     ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/minicpan
-    '';
 
     meta = {
       description = "Create a minimal mirror of CPAN";
@@ -7105,7 +7061,6 @@ with self;
       url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz";
       hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM=";
     };
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [
       Clone
       DateTime
@@ -7120,9 +7075,6 @@ with self;
       TextUnidecode
       TypeTiny
     ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/hsxkpasswd
-    '';
 
     meta = {
       description = "Secure memorable password generator";
@@ -7315,7 +7267,6 @@ with self;
     buildInputs = [
       ModuleBuildTiny
       TestFatal
-      TestSimple13
     ];
     propagatedBuildInputs = [
       CaptureTiny
@@ -7575,10 +7526,6 @@ with self;
       LWP
     ];
 
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/pgplet
-    '';
     doCheck = false; # test fails with 'No random source available!'
 
     meta = {
@@ -9908,6 +9855,16 @@ with self;
       hash = "sha256-jZANTA50nzchh1KmZh+w01V6sfzMjeo4TLWHw4LeIZs=";
     };
 
+    patches = [
+      # Fix build with gcc15
+      # https://github.com/bucardo/dbdpg/pull/148
+      (fetchpatch {
+        name = "perl-dbdpg-fix-c23-compliance.patch";
+        url = "https://github.com/bucardo/dbdpg/commit/8da04f9169d017469e3a12f08322e6bd88e8f239.patch";
+        hash = "sha256-MpVpaZoRgN1ABk6F6hFZvo9IkQJX2frHDygOTa0wics=";
+      })
+    ];
+
     buildInputs = [ pkgs.postgresql ];
     propagatedBuildInputs = [ DBI ];
 
@@ -10049,7 +10006,6 @@ with self;
     };
     buildInputs = [
       DBIxClass
-      TestSimple13
     ];
     propagatedBuildInputs = [
       DBDSQLite
@@ -10218,6 +10174,10 @@ with self;
       SafeIsa
       TextBrew
     ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/ResultSet/Errors.t
+    '';
     meta = {
       description = "Simplify the common case stuff for DBIx::Class";
       homepage = "https://github.com/frioux/DBIx-Class-Helpers";
@@ -10603,10 +10563,6 @@ with self;
       CaptureTiny
       TestDifferences
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/*
-    '';
     meta = {
       description = "Powerful fast feature-rich Perl source code profiler";
       homepage = "https://code.google.com/p/perl-devel-nytprof";
@@ -10669,7 +10625,6 @@ with self;
       namespaceclean
     ];
     buildInputs = [
-      TestSimple13
       TestWarnings
     ];
     meta = {
@@ -10697,10 +10652,10 @@ with self;
 
   DevelSize = buildPerlPackage {
     pname = "Devel-Size";
-    version = "0.84";
+    version = "0.85";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.84.tar.gz";
-      hash = "sha256-2y5NZfaI2/WSc7XoIQGsPxpm9mWvsFlNzhaLhlCk0OQ=";
+      url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.85.tar.gz";
+      hash = "sha256-KS+YsT7dGqSlROOlzx2fLXAZ91xzZNLo+oo16lRR5z4=";
     };
     meta = {
       description = "Perl extension for finding the memory usage of Perl variables";
@@ -11031,10 +10986,6 @@ with self;
       TermUI
       YAMLTiny
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/dzil
-    '';
     doCheck = false;
     meta = {
       description = "Distribution builder; installer not included";
@@ -11892,13 +11843,9 @@ with self;
       Throwable
       TryTiny
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     postPatch = ''
       patchShebangs --build util
     '';
-    preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang util/sendmail
-    '';
     meta = {
       description = "Library for sending email";
       homepage = "https://github.com/rjbs/Email-Sender";
@@ -12261,10 +12208,10 @@ with self;
 
   Error = buildPerlModule {
     pname = "Error";
-    version = "0.17029";
+    version = "0.17030";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz";
-      hash = "sha256-GiP3kTAyrtbUtoMhNzo4mcpmWQ9HJzkaCR7BnJW/etw=";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17030.tar.gz";
+      hash = "sha256-NNOCJ2wPsNazg1W5TJajCxLYNNVmLrU/CI7iXj5xKSQ=";
     };
     meta = {
       description = "Error/exception handling in an OO-ish way";
@@ -12282,6 +12229,13 @@ with self;
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.34.tar.gz";
       hash = "sha256-EhFoPc57Z3H0q3EMwVNxK913umFXoTKU0LtzSR/QZWA=";
     };
+    patches = [
+      (fetchpatch {
+        name = "EV-4.34-perl-5.42.patch";
+        url = "https://free.nchc.org.tw/gentoo-portage/dev-perl/EV/files/EV-4.34-perl-5.42.patch";
+        hash = "sha256-GiQ89pk3EZ3b6oxB7jDTY5C62qqKsZUjJ4Ag2JVwGFw=";
+      })
+    ];
     buildInputs = [ CanaryStability ];
     propagatedBuildInputs = [ commonsense ];
     meta = {
@@ -14399,6 +14353,10 @@ with self;
       DirSelf
       TestFatal
     ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/eating_strict_error.t
+    '';
     meta = {
       description = "Define functions and methods with parameter lists (\"subroutine signatures\")";
       license = with lib.licenses; [
@@ -14462,10 +14420,10 @@ with self;
 
   FutureAsyncAwait = buildPerlModule {
     pname = "Future-AsyncAwait";
-    version = "0.66";
+    version = "0.70";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.66.tar.gz";
-      hash = "sha256-xqD03kYr8yS1usoXddGZ7DJGo1jBPbm2Ssv82+bl7CE=";
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.70.tar.gz";
+      hash = "sha256-hCiZBJyXf7IyaoCWkmRB5XvsqRK7K0kY1c4JDfTUprc=";
     };
     buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [
@@ -14795,10 +14753,6 @@ with self;
       url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004007.tar.gz";
       hash = "sha256-2pe/dnKAlbO27nHaGfC/GUMBsvRd9HietU23Tt0hCjs=";
     };
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/git-autofixup
-    '';
     meta = {
       description = "Create fixup commits for topic branches";
       license = with lib.licenses; [ artistic2 ];
@@ -15328,6 +15282,11 @@ with self;
       url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz";
       hash = "sha256-ScRDdDsu7+EadoACck9/akxI78lP8806VZ+357aTyWc=";
     };
+
+    env = lib.optionalAttrs stdenv.cc.isGNU {
+      NIX_CFLAGS_COMPILE = "-std=gnu17";
+    };
+
     patches = [
       # Fix incompatible function pointer conversion (assigning `GdkNativeWindow` to `guint32`).
       ../development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch
@@ -15577,16 +15536,12 @@ with self;
       TermSk
       namespaceclean
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     patches = [
       ../development/perl-modules/Hailo-fix-test-gld.patch
     ];
     postPatch = ''
       patchShebangs bin
     '';
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/hailo
-    '';
     meta = {
       description = "Pluggable Markov engine analogous to MegaHAL";
       homepage = "https://github.com/hailo/hailo";
@@ -15606,7 +15561,6 @@ with self;
       hash = "sha256-vJpKo47JjwqYKJ41q/mhfC8qMjmiIJoymADglwqi4MU=";
     };
     propagatedBuildInputs = [ HashMerge ];
-    buildInputs = [ TestSimple13 ];
 
     meta = {
       description = "Return difference between two hashes as a hash";
@@ -16692,25 +16646,6 @@ with self;
     };
   };
 
-  HTTPHeaderParserXS = buildPerlPackage {
-    pname = "HTTP-HeaderParser-XS";
-    version = "0.20";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz";
-      hash = "sha256-qeAP/7PYmRoUqq/dxh1tFoxP8U4xSuPbstTaMAjXRu8=";
-    };
-    meta = {
-      description = "XS extension for processing HTTP headers";
-      license = with lib.licenses; [
-        artistic1
-        gpl1Plus
-      ];
-      broken =
-        stdenv.hostPlatform.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080)
-        || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin
-    };
-  };
-
   HTTPHeadersFast = buildPerlModule {
     pname = "HTTP-Headers-Fast";
     version = "0.22";
@@ -17302,10 +17237,6 @@ with self;
     };
     buildInputs = [ CanaryStability ];
     propagatedBuildInputs = [ commonsense ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/treescan
-    '';
     meta = {
       description = "Asynchronous/Advanced Input/Output";
       license = with lib.licenses; [
@@ -17489,7 +17420,6 @@ with self;
     ];
     buildInputs = [
       ModuleBuildTiny
-      TestSimple13
     ];
     meta = {
       description = "Functions for working with IO::Handle like objects";
@@ -18448,8 +18378,7 @@ with self;
     ];
     nativeBuildInputs = [
       pkgs.makeWrapper
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+    ];
     makeMakerFlags = [
       "TEXMF=\${tex}"
       "NOMKTEXLSR"
@@ -18457,11 +18386,6 @@ with self;
     # shebangs need to be patched before executables are copied to $out
     preBuild = ''
       patchShebangs bin/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for file in bin/*; do
-        shortenPerlShebang "$file"
-      done
     '';
     postInstall = ''
       for file in latexmlc latexmlmath latexmlpost ; do
@@ -20841,22 +20765,23 @@ with self;
 
   MathPari = buildPerlPackage rec {
     pname = "Math-Pari";
-    version = "2.030523";
+    version = "2.030528";
     nativeBuildInputs = [ pkgs.unzip ];
-    pariversion = "2.1.7";
+    pariversion = "2.3.5";
     pari_tgz = fetchurl {
-      url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.1/pari-${pariversion}.tgz";
-      hash = "sha256-kULyza8wg8iWLxpcK7Dp/okV99lJDAMxKsI2HH6hVfo=";
+      url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.3/pari-${pariversion}.tar.gz";
+      hash = "sha256-R92uGvc7RHZmDSqJM4SDlJBnqX/7h1jILoGJ36TInYg=";
     };
+
     # Workaround build failure on -fno-common toolchains:
     #   ld: libPARI/libPARI.a(compat.o):(.bss+0x8): multiple definition of
     #   `overflow'; Pari.o:(.bss+0x80): first defined here
     env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=implicit-int -Wno-error=implicit-function-declaration";
-    preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz";
-    makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tgz" ];
+    preConfigure = "cp ${pari_tgz} pari-${pariversion}.tar.gz";
+    makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tar.gz" ];
     src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030518.zip";
-      hash = "sha256-3DiVWpaQvmuvqN4lJiEjd8Psn+jaXsAiY6nK+UtYu5E=";
+      url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030528.tar.gz";
+      hash = "sha256-Z/dNIWxpY1qxxuo+J84ZdQqUorVgrnKIuy1s9xT85sg=";
     };
     meta = {
       description = "Perl interface to PARI";
@@ -22023,6 +21948,10 @@ with self;
       TestDeep
       TestNoWarnings
     ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/20_parse_self.t
+    '';
     meta = {
       description = "Find out what modules are used";
       license = with lib.licenses; [
@@ -22948,47 +22877,6 @@ with self;
     };
   };
 
-  MongoDB = buildPerlPackage {
-    pname = "MongoDB";
-    version = "2.2.2";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz";
-      hash = "sha256-IBk1+S2slPOcNd5zZh6LJSQ55JbyKGV9uF/5MlfDJo8=";
-    };
-    buildInputs = [
-      JSONMaybeXS
-      PathTiny
-      TestDeep
-      TestFatal
-      TimeMoment
-    ];
-    propagatedBuildInputs = [
-      AuthenSASLSASLprep
-      AuthenSCRAM
-      BSON
-      IOSocketSSL
-      NetSSLeay
-      ClassXSAccessor
-      BSONXS
-      TypeTinyXS
-      MozillaCA
-      Moo
-      NetDNS
-      SafeIsa
-      SubQuote
-      TieIxHash
-      TypeTiny
-      UUIDURandom
-      boolean
-      namespaceclean
-    ];
-    meta = {
-      description = "Official MongoDB Driver for Perl (EOL)";
-      homepage = "https://github.com/mongodb-labs/mongo-perl-driver";
-      license = with lib.licenses; [ asl20 ];
-    };
-  };
-
   MonitoringPlugin = buildPerlPackage {
     pname = "Monitoring-Plugin";
     version = "0.40";
@@ -24142,7 +24030,6 @@ with self;
     buildInputs = [
       ModuleBuildTiny
       TestFatal
-      TestSimple13
       TestTableDriven
     ];
     propagatedBuildInputs = [
@@ -24295,7 +24182,6 @@ with self;
       MooseXRoleParameterized
       TestFatal
       TestRequires
-      TestSimple13
     ];
     propagatedBuildInputs = [
       Moose
@@ -24394,7 +24280,6 @@ with self;
     buildInputs = [
       ModuleBuildTiny
       TestFatal
-      TestSimple13
     ];
     propagatedBuildInputs = [
       DateTime
@@ -24420,7 +24305,6 @@ with self;
     buildInputs = [
       ModuleBuildTiny
       TestFatal
-      TestSimple13
     ];
     propagatedBuildInputs = [
       DateTimeXEasy
@@ -24667,10 +24551,10 @@ with self;
 
   Mouse = buildPerlModule {
     pname = "Mouse";
-    version = "2.5.10";
+    version = "2.5.11";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz";
-      hash = "sha256-zo3COUYVOkZ/8JdlFn7iWQ9cUCEg9IotlEFzPzmqMu4=";
+      url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.11.tar.gz";
+      hash = "sha256-4qDQkwGQwhpES5YHk6ouNp7yih3QuPNIKXlfhqGRWVY=";
     };
     buildInputs = [
       ModuleBuildXSUtil
@@ -24785,6 +24669,9 @@ with self;
       substituteInPlace Makefile.PL \
         --replace-fail '`which pkg-config`' "'$PKG_CONFIG'"
     '';
+    patches = [
+      ../development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch
+    ];
     doCheck = false; # The main test performs network access
     nativeBuildInputs = [ pkgs.pkg-config ];
     propagatedBuildInputs = [ pkgs.libdiscid ];
@@ -25062,6 +24949,12 @@ with self;
       url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.991.tar.gz";
       hash = "sha256-+3r4umSUjRo/MdgJ13EFImiA8GmYrH8Rn4JITmijI9M=";
     };
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/rustyconover/net-amazon-s3/commit/233cb0f2812c4f71b4fecd4058dbf34fe8d6824d.patch";
+        hash = "sha256-lVx1CoAFY37KIkDdl2Inqb16aZ9D0lXt475/7LyjOLM=";
+      })
+    ];
     buildInputs = [
       TestDeep
       TestException
@@ -26565,10 +26458,10 @@ with self;
 
   ObjectPad = buildPerlModule {
     pname = "Object-Pad";
-    version = "0.809";
+    version = "0.821";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.809.tar.gz";
-      hash = "sha256-EpUKZkwGB+o/ynSA82XfVNF0YpH0XrsO2AkXt0+xXvU=";
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.821.tar.gz";
+      hash = "sha256-tdUF+PoWLg5r4q5YsPM0SUxPeRs6BA8va4kBTwSEUgw=";
     };
     buildInputs = [
       Test2Suite
@@ -27628,21 +27521,11 @@ with self;
 
   PDL = buildPerlPackage {
     pname = "PDL";
-    version = "2.025";
+    version = "2.100";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.025.tar.gz";
-      hash = "sha256-G1oWfq0ndy2V2tJ/jrfQlRnSkVbu1TxvwUQVGUtaitY=";
+      url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.100.tar.gz";
+      hash = "sha256-iqpu35AlWj0LTQBH1icOESS/HhrNJBSATocxC2s5vkA=";
     };
-    patchPhase = ''
-      substituteInPlace perldl.conf \
-        --replace 'POSIX_THREADS_LIBS => undef' 'POSIX_THREADS_LIBS => "-L${pkgs.glibc.dev}/lib"' \
-        --replace 'POSIX_THREADS_INC  => undef' 'POSIX_THREADS_INC  => "-I${pkgs.glibc.dev}/include"' \
-        --replace 'WITH_MINUIT => undef' 'WITH_MINUIT => 0' \
-        --replace 'WITH_SLATEC => undef' 'WITH_SLATEC => 0' \
-        --replace 'WITH_HDF => undef' 'WITH_HDF => 0' \
-        --replace 'WITH_GD => undef' 'WITH_GD => 0' \
-        --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0'
-    '';
 
     # FIXME: Why are these libraries in `nativeBuildInputs`?
     nativeBuildInputs = with pkgs; [
@@ -27759,7 +27642,6 @@ with self;
       hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs=";
     };
     buildInputs = [ TestDeep ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [
       BKeywords
       ConfigTiny
@@ -27777,8 +27659,10 @@ with self;
       Readonly
       StringFormat
     ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/perlcritic
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/20_policy_require_tidy_code.t
+      rm t/03_pragmas.t
     '';
     meta = {
       description = "Critique Perl source code for best-practices";
@@ -27793,18 +27677,18 @@ with self;
 
   PerlCriticCommunity = buildPerlModule {
     pname = "Perl-Critic-Community";
-    version = "1.0.3";
+    version = "1.0.4";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.3.tar.gz";
-      hash = "sha256-Ed3bt5F5/mIp8zPKOS+U/firXNmJzJfZk1IaidXEetU=";
+      url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.4.tar.gz";
+      hash = "sha256-OzFiTqDPQ5K49Dl6UpUVJIgUohZml/GkU9WKtvES0gk=";
     };
     buildInputs = [ ModuleBuildTiny ];
     propagatedBuildInputs = [
       PPI
       PathTiny
       PerlCritic
+      PerlCriticPolicyPliceaseProhibitArrayAssignAref
       PerlCriticPolicyVariablesProhibitLoopOnHash
-      PerlCriticPulp
     ];
     meta = {
       description = "Community-inspired Perl::Critic policies";
@@ -27832,6 +27716,21 @@ with self;
     };
   };
 
+  PerlCriticPolicyPliceaseProhibitArrayAssignAref = buildPerlPackage {
+    pname = "Perl-Critic-Policy-Plicease-ProhibitArrayAssignAref";
+    version = "100.00";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PL/PLICEASE/Perl-Critic-Policy-Plicease-ProhibitArrayAssignAref-100.00.tar.gz";
+      hash = "sha256-2LcyMNK4vyuAEE/Ap1jHSLn/N7CL+Buqc/jXCeIM/r4=";
+    };
+    propagatedBuildInputs = [ PerlCritic ];
+    meta = {
+      homepage = "https://metacpan.org/pod/Perl::Critic::Policy::Plicease::ProhibitArrayAssignAref";
+      description = "Don't assign an anonymous arrayref to an array";
+      license = lib.licenses.gpl3Plus;
+    };
+  };
+
   PerlCriticPolicyVariablesProhibitLoopOnHash = buildPerlPackage {
     pname = "Perl-Critic-Policy-Variables-ProhibitLoopOnHash";
     version = "0.008";
@@ -28087,10 +27986,10 @@ with self;
 
   PerlTidy = buildPerlPackage {
     pname = "Perl-Tidy";
-    version = "20230912";
+    version = "20250711";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20230912.tar.gz";
-      hash = "sha256-DFeIjyBvmHd34WZA5yV0qgp3eEZxn44+0EE8NTJfVUA=";
+      url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20250711.tar.gz";
+      hash = "sha256-NHqpC8773itZDa9I04fvH9m3pzqZawQCafEatvuLpEg=";
     };
     meta = {
       description = "Indent and reformat perl scripts";
@@ -28479,9 +28378,9 @@ with self;
       PodMarkdown
       URI
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/pls
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/02document-new.t
     '';
     meta = {
       description = "Perl Language Server";
@@ -28603,10 +28502,12 @@ with self;
       TaskWeaken
     ];
 
-    # Remove test that fails due to unexpected shebang after
-    # patchShebang.
-    preCheck = "rm t/03_document.t";
-
+    preCheck = "
+      # Remove test that fails due to unexpected shebang after patchShebang.
+      rm t/03_document.t
+      # Remove tests with hardcoded line numbers.
+      rm t/29_logical_filename.t
+    ";
     meta = {
       description = "Parse, Analyze and Manipulate Perl (without perl)";
       homepage = "https://github.com/Perl-Critic/PPI";
@@ -29182,6 +29083,10 @@ with self;
       url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.75.tar.gz";
       hash = "sha256-82O1dOxmCvbtvT5dTJ/8UVodRsvxx8ytmkbO0oh5wiE=";
     };
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/pod/podchkenc.t
+    '';
     meta = {
       description = "Verifies POD documentation contents for compliance with the POD format specifications";
       license = with lib.licenses; [
@@ -29292,6 +29197,10 @@ with self;
     };
     propagatedBuildInputs = [ MixinLinewise ];
     buildInputs = [ TestDeep ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/non-pod.t
+    '';
     meta = {
       description = "Read a POD document as a series of trivial events";
       homepage = "https://github.com/rjbs/Pod-Eventual";
@@ -29720,10 +29629,6 @@ with self;
       url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz";
       hash = "sha256-TxOa01+q8t4GI9wLsd2J+lpDHlSL/sh97hlM8OJcyX0=";
     };
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/rainbarf
-    '';
     meta = {
       description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)";
       homepage = "https://github.com/creaktive/rainbarf";
@@ -30171,6 +30076,10 @@ with self;
       AnyEvent
       DataSExpression
     ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/06.query.t
+    '';
     meta = {
       description = "Asynchronous Remote Procedure Stack";
       license = with lib.licenses; [
@@ -31194,13 +31103,6 @@ with self;
       patchShebangs script
     '';
 
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      for file in $out/bin/*; do
-        shortenPerlShebang $file
-      done
-    '';
-
     meta = {
       description = "SQL DDL transformations and more";
       license = with lib.licenses; [
@@ -31288,7 +31190,6 @@ with self;
       TestRequires
       TestTCP
     ];
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [
       DataDump
       HTTPParserXS
@@ -31297,9 +31198,6 @@ with self;
       NetServerSSPrefork
       IOSocketINET6
     ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/starman
-    '';
 
     doCheck = false; # binds to various TCP ports
     meta = {
@@ -31329,10 +31227,10 @@ with self;
 
   StatisticsCaseResampling = buildPerlPackage {
     pname = "Statistics-CaseResampling";
-    version = "0.15";
+    version = "0.17";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz";
-      hash = "sha256-hRxDvW8Q0yKJUipQxqIJw7JGz9PrVmdz5oYe2gSkkIc=";
+      url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.17.tar.gz";
+      hash = "sha256-buZtDu2BiC7E+kj//hY6BP2YxNVqwejNwUqfg70YObw=";
     };
     meta = {
       description = "Efficient resampling and calculation of medians with confidence intervals";
@@ -31862,7 +31760,6 @@ with self;
     };
     buildInputs = [
       TestException
-      TestSimple13
       TestTableDriven
     ];
     propagatedBuildInputs = [
@@ -32026,6 +31923,11 @@ with self;
       url = "mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz";
       hash = "sha256-Bo0nIIZRTdHoQrakCxvtuv7mOQDlsIiQ72cAA53vrW8=";
     };
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/04codelocation-pureperl.t
+      rm t/04codelocation.t
+    '';
     meta = {
       description = "Retrieve names of code references";
       license = with lib.licenses; [
@@ -32280,6 +32182,10 @@ with self;
       url = "mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz";
       hash = "sha256-VbZh3SL5zpub5afgo/UomsAM0lTCHj2GAyiaVlrm3DI=";
     };
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/10use.t
+    '';
     meta = {
       description = "Additional utils for Perl symbols manipulation";
       license = with lib.licenses; [
@@ -32331,10 +32237,10 @@ with self;
 
   SyntaxKeywordTry = buildPerlModule {
     pname = "Syntax-Keyword-Try";
-    version = "0.29";
+    version = "0.30";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.29.tar.gz";
-      hash = "sha256-zDIHGdNgjaqVFHQ6Q9rCvpnLjM2Ymx/vooUpDLHVnY8=";
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.30.tar.gz";
+      hash = "sha256-8Gjwuccf/4/vbYqentaVHLelK5djIr2VUYHMXnsX5pI=";
     };
     buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [ XSParseKeyword ];
@@ -33368,7 +33274,6 @@ with self;
       IPCRun3
       Test2Suite
     ];
-    propagatedBuildInputs = [ TestSimple13 ];
     meta = {
       description = "Fail if tests warn";
       homepage = "https://metacpan.org/release/Test2-Plugin-NoWarnings";
@@ -33388,7 +33293,6 @@ with self;
       ScopeGuard
       SubInfo
       TermTable
-      TestSimple13
     ];
     meta = {
       description = "Distribution with a rich set of tools built upon the Test2 framework";
@@ -33501,6 +33405,10 @@ with self;
       hash = "sha256-/NzkHVcnOIFYGt9oCiCmrfUaTDt+McP2mGb7kQk3AoA=";
     };
     propagatedBuildInputs = [ LogTrace ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/Test-Assertions.t
+    '';
     meta = {
       description = "Simple set of building blocks for both unit and runtime testing";
       license = with lib.licenses; [ gpl2Only ];
@@ -33596,6 +33504,14 @@ with self;
       ModuleRuntime
       TryTiny
     ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/runtests_die.t
+      rm t/runtests_die_empty.t
+      rm t/runtests_die_nearlyempty.t
+      rm t/runtests_result.t
+      rm t/todo.t
+    '';
     meta = {
       description = "Easily create test classes in an xUnit/JUnit style";
       license = with lib.licenses; [
@@ -33921,6 +33837,10 @@ with self;
       hash = "sha256-FWsT8Hdk92bYtFpDco8kOa+Bo1EmJUON6reDt4g+tTM=";
     };
     propagatedBuildInputs = [ SubUplevel ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/return.t
+    '';
     meta = {
       description = "Test exception-based code";
       license = with lib.licenses; [
@@ -34302,6 +34222,11 @@ with self;
       url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz";
       hash = "sha256-d31k0pOPXqWGMA7vl+8D6stD1MGFPJw7EJHrMxFGeXA=";
     };
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/09_info_more.t
+      rm t/11_logfp.t
+    '';
     meta = {
       description = "Traces memory leaks";
       homepage = "https://metacpan.org/release/Test-LeakTrace";
@@ -34319,6 +34244,10 @@ with self;
       url = "mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz";
       hash = "sha256-rCtPDZWJmvGhoex4TLdAsrkCVqvuEcg+eykRA+ye1zU=";
     };
+    preCheck = ''
+      # Remove impure test
+      rm t/gens.t
+    '';
     meta = {
       description = "Easy, automatic, specification-based tests";
       license = with lib.licenses; [
@@ -34583,6 +34512,10 @@ with self;
       url = "mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz";
       hash = "sha256-j/51/5tpNSSIcn3Kc9uR+KoUtZ8voQTrdxfA1xpfGzM=";
     };
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/02-bad-source.t
+    '';
     meta = {
       description = "Check your source for encoding misbehavior";
       homepage = "https://github.com/creaktive/Test-Mojibake";
@@ -34795,6 +34728,13 @@ with self;
       TextDiff
     ];
     buildInputs = [ TestPerlCritic ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/perltidy.t
+      rm t/list_files.t
+      rm t/exclude_files.t
+      rm t/exclude_perltidy.t
+    '';
     meta = {
       description = "Check that all your files are tidy";
       homepage = "https://metacpan.org/release/Test-PerlTidy";
@@ -35192,13 +35132,15 @@ with self;
       url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.29.tar.gz";
       hash = "sha256-iS5+bB6nsWcQkJlCz1wL2rcO7i79SqnBbqlS4rkPiVA=";
     };
-
     buildInputs = [ Test2Suite ];
-
     propagatedBuildInputs = [
       CaptureTiny
       ProbePerl
     ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/test_script__script_compiles.t
+    '';
     meta = {
       description = "Basic cross-platform tests for scripts";
       license = with lib.licenses; [
@@ -35246,22 +35188,6 @@ with self;
     };
   };
 
-  TestSimple13 = buildPerlPackage {
-    pname = "Test-Simple";
-    version = "1.302195";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz";
-      hash = "sha256-s5C7I1kuC5Rsla27PDCxG8Y0ooayhHvmEa2SnFfjmmw=";
-    };
-    meta = {
-      description = "Basic utilities for writing tests";
-      license = with lib.licenses; [
-        artistic1
-        gpl1Plus
-      ];
-    };
-  };
-
   TestSnapshot = buildPerlPackage {
     pname = "Test-Snapshot";
     version = "0.06";
@@ -35479,6 +35405,9 @@ with self;
       hash = "sha256-mMoy5/L16om4v7mgYJl389FT4kLi5RcFEmy5VPGga1c=";
     };
     propagatedBuildInputs = [ SubUplevel ];
+    # Tests fail because they hardcode line numbers which have been shifted due to the inclusion of
+    # libraries.
+    doCheck = false;
     meta = {
       description = "Perl extension to test methods for warnings";
       license = with lib.licenses; [
@@ -35642,6 +35571,10 @@ with self;
       hash = "sha256-36phHnFGrZyXabW89oiUmXa4Ny3354ekC5M6FI2JIDk=";
     };
     propagatedBuildInputs = [ XMLLibXML ];
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/simple.t
+    '';
     meta = {
       description = "Test XML and HTML content and structure with XPath expressions";
       license = with lib.licenses; [
@@ -35739,15 +35672,15 @@ with self;
 
   TextBibTeX = buildPerlModule {
     pname = "Text-BibTeX";
-    version = "0.89";
+    version = "0.91";
     buildInputs = [
       CaptureTiny
       ConfigAutoConf
       ExtUtilsLibBuilder
     ];
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz";
-      hash = "sha256-iKeOvwiOx1AvQBxaKxOMhiz1RYU0t3MiO786r0EiQZY=";
+      url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.91.tar.gz";
+      hash = "sha256-PwETz4/nHcdIRjbcjipYFjfsvMgtC+KbvUbQvz+M2zc=";
     };
     # libbtparse.so: cannot open shared object file
     patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ];
@@ -36112,15 +36045,11 @@ with self;
       url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz";
       hash = "sha256-wZHG1ezrjLdcBWUZI2BmLSAtcWutB6IzxLMppChNxxs=";
     };
-    nativeBuildInputs = [ shortenPerlShebang ];
     nativeCheckInputs = [
       ListMoreUtils
       TestDifferences
       TestException
     ];
-    postInstall = ''
-      shortenPerlShebang $out/bin/Markdown.pl
-    '';
     meta = {
       description = "Convert Markdown syntax to (X)HTML";
       license = with lib.licenses; [ bsd3 ];
@@ -36487,9 +36416,11 @@ with self;
       url = "mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.015.tar.gz";
       hash = "sha256-4Y3RWCcuTsmTnh37M8dDGrTnXGtAsoDDi16AT9pHGlQ=";
     };
-
     buildInputs = [ ModuleBuildTiny ];
-
+    preCheck = ''
+      # Remove tests with hardcoded line numbers.
+      rm t/03_warned.t
+    '';
     meta = {
       description = "Detects unused variables in perl modules";
       homepage = "https://github.com/houseabsolute/p5-Test-Vars";
@@ -37141,6 +37072,7 @@ with self;
       NIX_CFLAGS_COMPILE = toString [
         "-Wno-error=implicit-int"
         "-Wno-error=incompatible-pointer-types"
+        "-std=gnu17"
       ];
     };
     doCheck = false; # Expects working X11.
@@ -37805,10 +37737,10 @@ with self;
 
   VariableMagic = buildPerlPackage {
     pname = "Variable-Magic";
-    version = "0.63";
+    version = "0.64";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.63.tar.gz";
-      hash = "sha256-ukCDssMf8mlPI3EzPVVMgmqvJLTZjQPki1tKQ6Kg5nk=";
+      url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.64.tar.gz";
+      hash = "sha256-n3hTJJyeo7TfkvtreQwDpgaA/AKfRMi/mJTczwGVFr0=";
     };
     meta = {
       description = "Associate user-defined magic to variables from Perl";
@@ -38316,11 +38248,20 @@ with self;
 
   X11XCB = buildPerlPackage {
     pname = "X11-XCB";
-    version = "0.20";
+    version = "0.24";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.20.tar.gz";
-      hash = "sha256-rVY5Yd4gIlVOdZHvXLjZY0ngxzdxIYXkeFBViMZ6L9I=";
+      url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.24.tar.gz";
+      hash = "sha256-eIUZZzpDxHUecwYaiCG2WPyV8G1cGcnx3rtgX7ILoEU=";
     };
+    patches = [
+      # Fix "undefined symbol: xcb_composite_unredirect_window"
+      (fetchpatch {
+        url = "https://github.com/zhmylove/X11-XCB/commit/b78e33f7cdf8141b085a4f8773adda6c4a4870c3.patch";
+        hash = "sha256-r1X/tGCALZOS35fNx/9udznNvLxC73o7M2U1MVqXcf0=";
+        revert = true;
+        excludes = [ "lib/X11/XCB.pm" ];
+      })
+    ];
     env.AUTOMATED_TESTING = false;
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [
@@ -38440,11 +38381,7 @@ with self;
       url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz";
       hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0=";
     };
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [ LWP ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/download-entities.pl
-    '';
     meta = {
       description = "Mapping of XML entities to Unicode";
       license = with lib.licenses; [
@@ -38530,14 +38467,10 @@ with self;
       url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz";
       hash = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8=";
     };
-    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
     propagatedBuildInputs = [
       XMLSAX
       XMLSAXWriter
     ];
-    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      shortenPerlShebang $out/bin/xmlsort
-    '';
     meta = {
       description = "SAX filter for sorting elements in XML";
       license = with lib.licenses; [
@@ -39055,7 +38988,6 @@ with self;
     buildInputs = [
       ExtUtilsDepends
       TestFatal
-      TestSimple13
     ];
     meta = {
       description = "Opaque, extensible XS pointer backed objects using sv_magic";
@@ -39090,10 +39022,10 @@ with self;
 
   XSParseSublike = buildPerlModule {
     pname = "XS-Parse-Sublike";
-    version = "0.29";
+    version = "0.37";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.29.tar.gz";
-      hash = "sha256-UnX1w457gFe6cuzRzAcpO26TOadzdA51pse+lSAfHjw=";
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.37.tar.gz";
+      hash = "sha256-c2UoyIjqe2phkQEeXVp4JOw4pWIFB95u9F5LxuHPDak=";
     };
     buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [ FileShareDir ];
@@ -39176,6 +39108,7 @@ with self;
       url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.36.tar.gz";
       hash = "sha256-Tc2dmzsM48ZaL/K5tMb/+LZJ/fJDv9fhiJVDvs25GlI=";
     };
+    env.NIX_CFLAGS_COMPILE = "-std=gnu11";
     meta = {
       description = "Fast, lightweight YAML loader and dumper";
       homepage = "https://github.com/toddr/YAML-Syck";
@@ -39564,7 +39497,11 @@ with self;
   SubExporterUtil = self.SubExporter;
   version = self.Version;
 
-  Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
-  pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
+  BSON = throw "BSON has been removed"; # 2025-09-12
+  BSONXS = throw "BSONXS has been removed"; # 2025-09-12
   GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11
+  Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
+  MongoDB = throw "MongoDB has been removed"; # 2025-09-12
+  pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
+  HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08
 }
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 6d7646476f0c..3faeeac9e10f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -444,6 +444,7 @@ mapAliases {
   sentry-sdk_2 = throw "'sentry-sdk_2' has been renamed to/replaced by 'sentry-sdk'"; # Converted to throw 2025-10-29
   setuptools_dso = throw "'setuptools_dso' has been renamed to/replaced by 'setuptools-dso'"; # Converted to throw 2025-10-29
   setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2025-10-29
+  setuptoolsRustBuildHook = lib.warn "setuptoolsRustBuildHook is deprecated. Instead, include 'setuptools-rust' via 'build-system'" setuptools-rust; # added 2025-12-07
   setuptoolsTrial = throw "'setuptoolsTrial' has been renamed to/replaced by 'setuptools-trial'"; # Converted to throw 2025-10-29
   sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29
   shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed39d0590b69..3d37154edde5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -726,6 +726,8 @@ self: super: with self; {
 
   annexremote = callPackage ../development/python-modules/annexremote { };
 
+  annotated-doc = callPackage ../development/python-modules/annotated-doc { };
+
   annotated-types = callPackage ../development/python-modules/annotated-types { };
 
   annotatedyaml = callPackage ../development/python-modules/annotatedyaml { };
@@ -3979,7 +3981,7 @@ self: super: with self; {
   dj-static = callPackage ../development/python-modules/dj-static { };
 
   # LTS with mainsteam support
-  django = self.django_4;
+  django = self.django_5;
 
   django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };
 
@@ -4131,7 +4133,7 @@ self: super: with self; {
 
   django-ipware = callPackage ../development/python-modules/django-ipware { };
 
-  django-jinja = callPackage ../development/python-modules/django-jinja2 { };
+  django-jinja = callPackage ../development/python-modules/django-jinja { };
 
   django-jquery-js = callPackage ../development/python-modules/django-jquery-js { };
 
@@ -10998,7 +11000,9 @@ self: super: with self; {
 
   numbagg = callPackage ../development/python-modules/numbagg { };
 
-  numcodecs = callPackage ../development/python-modules/numcodecs { };
+  numcodecs = callPackage ../development/python-modules/numcodecs {
+    inherit (pkgs) zstd;
+  };
 
   numdifftools = callPackage ../development/python-modules/numdifftools { };
 
@@ -16045,6 +16049,8 @@ self: super: with self; {
 
   quart-schema = callPackage ../development/python-modules/quart-schema { };
 
+  quart-trio = callPackage ../development/python-modules/quart-trio { };
+
   quaternion = callPackage ../development/python-modules/quaternion { };
 
   qudida = callPackage ../development/python-modules/qudida { };
@@ -19419,7 +19425,7 @@ self: super: with self; {
 
   typer-shell = callPackage ../development/python-modules/typer-shell { };
 
-  typer-slim = self.typer.override { package = "typer-slim"; };
+  typer-slim = callPackage ../development/python-modules/typer-slim { };
 
   types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { };
 
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 73baf1bc0cc0..c6e9bab6d11d 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -76,7 +76,7 @@ makeScopeWithSplicing' {
 
         futuresql = callPackage ../development/libraries/futuresql { };
 
-        qgpgme = callPackage ../development/libraries/gpgme { };
+        qgpgme = callPackage ../development/libraries/qgpgme { };
 
         grantlee = callPackage ../development/libraries/grantlee/5 { };
 
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index c13b2585c3fc..42d87e0f4d62 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -87,7 +87,7 @@ makeScopeWithSplicing' {
       };
       qcoro = callPackage ../development/libraries/qcoro { };
       qcustomplot = callPackage ../development/libraries/qcustomplot { };
-      qgpgme = callPackage ../development/libraries/gpgme { };
+      qgpgme = callPackage ../development/libraries/qgpgme { };
       qhotkey = callPackage ../development/libraries/qhotkey { };
       qmlbox2d = callPackage ../development/libraries/qmlbox2d { };
       packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };