From 1109cc1a416659de71fa2fedfcdbfc404f545254 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 21 May 2025 12:42:07 +0200
Subject: [PATCH 01/47] python313Packages.asyncinotify: 4.2.0 -> 4.2.1

Diff: https://github.com/absperf/asyncinotify/compare/refs/tags/v4.2.0...refs/tags/v4.2.1

Changelog: https://github.com/absperf/asyncinotify/releases/tag/v4.2.1
---
 pkgs/development/python-modules/asyncinotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix
index 5855175d28b8..8be4b38815f1 100644
--- a/pkgs/development/python-modules/asyncinotify/default.nix
+++ b/pkgs/development/python-modules/asyncinotify/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "asyncinotify";
-  version = "4.2.0";
+  version = "4.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "absperf";
     repo = "asyncinotify";
     tag = "v${version}";
-    hash = "sha256-RHzjUoVhDxI7kYD5HWkb0f8X6BjjTTCAvSvASPy6FGk=";
+    hash = "sha256-X7R35LyrJaGJ70Houenpag0IMbqdsh+Sg9wMdzZmGfk=";
   };
 
   build-system = [ flit-core ];

From d85a0bbe79b3fb5661369b76735eac51ff8ddd79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Aug 2025 00:43:49 +0200
Subject: [PATCH 02/47] nixos/rspamd: add and use package option

---
 nixos/modules/services/mail/rspamd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 6795de0c868c..5b09cfb217fb 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -304,8 +304,8 @@ in
   options = {
 
     services.rspamd = {
-
       enable = mkEnableOption "rspamd, the Rapid spam filtering system";
+      package = lib.mkPackageOption pkgs "rspamd" { };
 
       debug = mkOption {
         type = types.bool;
@@ -458,7 +458,7 @@ in
     };
 
     # Allow users to run 'rspamc' and 'rspamadm'.
-    environment.systemPackages = [ pkgs.rspamd ];
+    environment.systemPackages = [ cfg.package ];
 
     users.users.${cfg.user} = {
       description = "rspamd daemon";
@@ -480,7 +480,7 @@ in
       restartTriggers = [ rspamdDir ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f";
+        ExecStart = "${cfg.package}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f";
         Restart = "always";
 
         User = "${cfg.user}";

From dde48aff8993a9ae5f08a311eb871ad1ef3ffb6e Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 26 Aug 2025 10:55:54 +0800
Subject: [PATCH 03/47] temporal-cli: tweak update script

---
 pkgs/by-name/te/temporal-cli/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix
index f2d4c63c15af..ea43d1df4d01 100644
--- a/pkgs/by-name/te/temporal-cli/package.nix
+++ b/pkgs/by-name/te/temporal-cli/package.nix
@@ -56,7 +56,12 @@ buildGoModule (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^v(\\d+\\.\\d+\\.\\d+)$"
+    ];
+  };
 
   meta = {
     description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";

From 7d6f95d252d6238d423ae5a96e53aa76d83dd7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 27 Aug 2025 15:59:28 +0200
Subject: [PATCH 04/47] python3Packages.feedgenerator: 2.2.0 -> 2.2.1

---
 pkgs/development/python-modules/feedgenerator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index 0f79decf5377..0ae83f0514d9 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "feedgenerator";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KXb2zMWYmpZyAto0PqFFwhrtq74ANccIjWS6CqlyWmA=";
+    hash = "sha256-DqqVXx8Ly1uHrBla90Dwb/n/9KQO0wuKfGu+uyZNTdE=";
   };
 
   build-system = [ hatchling ];

From 27489d44efd7eb685773901b047f84486eeae777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 12:15:33 +0000
Subject: [PATCH 05/47] postgresqlPackages.pg_net: 0.19.5 -> 0.19.7

---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 7c006b68b24f..7682d8f2119a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.19.5";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cpi2iASi1QJoED0Qs1dANqg/BNZTsz5S+pw8iYyW03Y=";
+    hash = "sha256-HQiFD8vhox7SmjJIDyVnnwt8DCENKABIZTMfTjGElwU=";
   };
 
   buildInputs = [ curl ];

From 0c83469d75d62a1a0185d7744ff1f8b05be9bb7e Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Mon, 11 Aug 2025 16:00:00 +0200
Subject: [PATCH 06/47] humility: don't build xtask

---
 pkgs/by-name/hu/humility/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix
index ce6ac688a24b..4a33c1058933 100644
--- a/pkgs/by-name/hu/humility/package.nix
+++ b/pkgs/by-name/hu/humility/package.nix
@@ -30,6 +30,9 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-GZkHPoDKiqTVwRAWXXbELXC1I/KRO+9sshY8/rGbA4A=";
 
+  # Prevent building and installing xtask, as it's a developer utility not intended for the end user
+  cargoBuildFlags = [ "-p humility-cli" ];
+
   meta = with lib; {
     description = "Debugger for Hubris";
     mainProgram = "humility";

From 3f96e3106d92372a2c508b341523e42d1d6285c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 18:50:27 +0000
Subject: [PATCH 07/47] python3Packages.langchain-google-genai: 2.1.9 -> 2.1.10

---
 .../python-modules/langchain-google-genai/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index 37f2485556ba..b28f462f0359 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-google-genai";
-  version = "2.1.9";
+  version = "2.1.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-google";
     tag = "libs/genai/v${version}";
-    hash = "sha256-9jXiX4WDx5YY39MytuzAWGuDzLkGmtq95ShAIW3zH0U=";
+    hash = "sha256-kqII8RG1ep+n5CqKLY1v7Mc+zJh6kl1rAjMmkomfeqM=";
   };
 
   sourceRoot = "${src.name}/libs/genai";

From 937980a2ebd83e0b540d8d76dd77f2ee4b0a09d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 23:33:40 +0000
Subject: [PATCH 08/47] fake-gcs-server: 1.52.2 -> 1.52.3

---
 pkgs/by-name/fa/fake-gcs-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fa/fake-gcs-server/package.nix b/pkgs/by-name/fa/fake-gcs-server/package.nix
index 5f5f0db8825a..bc2214ec2972 100644
--- a/pkgs/by-name/fa/fake-gcs-server/package.nix
+++ b/pkgs/by-name/fa/fake-gcs-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fake-gcs-server";
-  version = "1.52.2";
+  version = "1.52.3";
 
   src = fetchFromGitHub {
     owner = "fsouza";
     repo = "fake-gcs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sidMCbJAK3bRGJyyFIUn7e5y0z4O72JWCICHf4JL4yo=";
+    hash = "sha256-XoHG0dm565RRke3me/WDy1TRLrSlecy4b3xuYPvOcoo=";
   };
 
-  vendorHash = "sha256-oTJ4DCsDazo58ozsAKI0BG7rxfF8oeiIl6vQpRng+LM=";
+  vendorHash = "sha256-FMDpQSwLrLaiy5HzdragOmgvLBDax5VDN0DZLzQyhts=";
 
   # Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason.
   #

From 5052d3e0ebe804185f74fa2a42a1fffc73a7ad61 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Sat, 30 Aug 2025 09:55:17 +0800
Subject: [PATCH 09/47] voxelands: drop

The upstream project has not been updated for years, the package has no maintainer, it has not been upgraded to the latest version, and no users can be found for it on GitHub.
---
 pkgs/by-name/vo/voxelands/package.nix | 76 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 2 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 pkgs/by-name/vo/voxelands/package.nix

diff --git a/pkgs/by-name/vo/voxelands/package.nix b/pkgs/by-name/vo/voxelands/package.nix
deleted file mode 100644
index 19f2e4c22c60..000000000000
--- a/pkgs/by-name/vo/voxelands/package.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  bzip2,
-  cmake,
-  expat,
-  freetype,
-  irrlicht,
-  libICE,
-  libGL,
-  libGLU,
-  libSM,
-  libX11,
-  libXext,
-  libXxf86vm,
-  libjpeg,
-  libpng,
-  libvorbis,
-  openal,
-  pkg-config,
-  sqlite,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "voxelands";
-  version = "1704.00";
-
-  src = fetchFromGitLab {
-    owner = "voxelands";
-    repo = "voxelands";
-    rev = version;
-    sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0";
-  };
-
-  cmakeFlags = [
-    "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
-    "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG"
-    "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    # has to go before others to override transitive libpng-1.6
-    libpng
-
-    bzip2
-    expat
-    freetype
-    irrlicht
-    libICE
-    libGL
-    libGLU
-    libSM
-    libX11
-    libXext
-    libXxf86vm
-    libjpeg
-    libvorbis
-    openal
-    sqlite
-  ];
-
-  meta = with lib; {
-    homepage = "https://voxelands.net/";
-    description = "Infinite-world block sandbox game based on Minetest";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    broken = stdenv.hostPlatform.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'"
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 58e7cf890438..f8e06f745ebf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2406,6 +2406,7 @@ mapAliases {
   vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
   void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
+  voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
   vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
   vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18

From 1d2e4fa691f25683de88e690315343b9527cfa45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 03:57:23 +0000
Subject: [PATCH 10/47] python3Packages.google-genai: 1.31.0 -> 1.32.0

---
 pkgs/development/python-modules/google-genai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index d685b595b474..d64129bda44c 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.31.0";
+  version = "1.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-pzW0SYLlj7XjJSEqCY3uSYZI8asn451LANpcpr/lxI4=";
+    hash = "sha256-vUYv5nsiG6/bNUQvzPfn+dWaeyelQvgd12d/DdkdqKs=";
   };
 
   build-system = [

From 2f680b87418f88cefd9ac549c4c8577046227dd1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 23 Jul 2025 00:41:53 +0200
Subject: [PATCH 11/47] python3Packages.jax[lib]: 0.6.2 -> 0.7.0

Diff: https://github.com/jax-ml/jax/compare/jax-v0.6.2...jax-v0.7.0

Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.7.0
---
 .../jax-cuda12-pjrt/default.nix               |  4 +--
 .../jax-cuda12-plugin/default.nix             | 22 ++++--------
 .../python-modules/jax/default.nix            | 12 +++++--
 .../development/python-modules/jaxlib/bin.nix | 36 ++++++-------------
 .../python-modules/jaxlib/prefetch.sh         |  2 +-
 5 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index a12bf301fc19..76d23a8c6bba 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -50,8 +50,8 @@ buildPythonPackage rec {
       .${stdenv.hostPlatform.system};
     hash =
       {
-        x86_64-linux = "sha256-jNnq15SOosd4pQj+9dEVnot6v0/MxwN8P+Hb/NlQEtw=";
-        aarch64-linux = "sha256-IvrwINLo98oeKRVjMkH333Z4tzxwePXwsvETJIM3994=";
+        x86_64-linux = "sha256-dCzCYNaXdxy4gwhDmHSKAH0jMoaqP+X8FSp0wHPVmiQ=";
+        aarch64-linux = "sha256-3Oaxz+f0R0lCW66iKpAnQjuvsaUmnhPzB4XP0bLimGI=";
       }
       .${stdenv.hostPlatform.system};
   };
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index 4416b1829a52..eecf5b25de85 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -36,45 +36,35 @@ let
 
   # upstream does not distribute jax-cuda12-plugin 0.4.38 binaries for aarch64-linux
   srcs = {
-    "3.10-x86_64-linux" = getSrcFromPypi {
-      platform = "manylinux2014_x86_64";
-      dist = "cp310";
-      hash = "sha256-F1H4iYkmmzzbDf5PewcqZEIUmBjJvJjDo5XIrK+RCnk=";
-    };
-    "3.10-aarch64-linux" = getSrcFromPypi {
-      platform = "manylinux2014_aarch64";
-      dist = "cp310";
-      hash = "sha256-vFw6ddBVGbTTJuRmnQ960P4PCs+HX5MT2RN0jMylqeo=";
-    };
     "3.11-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp311";
-      hash = "sha256-CJbLswjZUpHiBc2J0lQCne46HfQ9ZumDEzGpr9LSeHA=";
+      hash = "sha256-2MmZTNYm4vFQmhZOXgfBIiIN3QptiDRvika9U8tePhk=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp311";
-      hash = "sha256-LNjieaWaOLoMl4qDHhOt627p5Fcvujh8eXW6OtU13Tg=";
+      hash = "sha256-JlpL8jjASPmJKeDa2XZCRtEkl73Yz98uIng6adc8xj4=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp312";
-      hash = "sha256-/r0Jn5cNNQ64+losmi+0sOp7PWqJ3xSWZj7fp6/lkOU=";
+      hash = "sha256-q37GQziSIY8lvdWi0TddqQh+mB36CYJ6x/NzzNu/LE0=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp312";
-      hash = "sha256-bJsALROx/LlANxPu3Th2oietH/vfs4EbH5+Jr0wlpfc=";
+      hash = "sha256-2UJ4q5a2ImQ3Ns3tt3eHA9MPL2T6SXrZ9bo13QyhBGQ=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux2014_x86_64";
       dist = "cp313";
-      hash = "sha256-20xhA8kS2M0a35TDTTE7tHYMp/AciXynzWLmXyeZQZk=";
+      hash = "sha256-v94NtxSyrV/p6GwfbS5gx9TZgNAVAphYIIgoq82CdM8=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp313";
-      hash = "sha256-dz76i1WoN0BsVh8O8CFE3akBkYEZN2DsVBnuyd0rmqw=";
+      hash = "sha256-5Nz+GFcW+0WsHti4kSIJbG2Tm0NRNxAzobz/JU3Rejg=";
     };
   };
 in
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index bb28c4f4aea1..9ecf5853e574 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
   pname = "jax";
-  version = "0.6.2";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${version}";
-    hash = "sha256-MTgpwpJWxULCiZhDG+MFpOp8ZHoj1ZDmOD05OaGfXhM=";
+    hash = "sha256-CWtzT5c2Rzf2C0yaF9z2Y+uV3TdZC/h4AQf8t+U8o7o=";
   };
 
   build-system = [ setuptools ];
@@ -103,6 +103,14 @@ buildPythonPackage rec {
     "tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch"
     "tests/shape_poly_test.py::ShapePolyTest"
     "tests/tree_util_test.py::TreeTest"
+
+    # Mostly AssertionError on numerical tests failing since 0.7.0
+    # https://github.com/jax-ml/jax/issues/31428
+    "tests/export_back_compat_test.py"
+    "tests/lax_numpy_test.py"
+    "tests/lax_scipy_test.py"
+    "tests/lax_test.py"
+    "tests/linalg_test.py"
   ];
 
   # Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index cd1b44384b99..0d13280e1bf0 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.6.2";
+  version = "0.7.0";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -46,68 +46,52 @@ let
         };
     in
     {
-      "3.10-x86_64-linux" = getSrcFromPypi {
-        platform = "manylinux2014_x86_64";
-        dist = "cp310";
-        hash = "sha256-wIeg62+39vj1TVb0cwMo395QQN07Xd+oEOfCjqcQK0I=";
-      };
-      "3.10-aarch64-linux" = getSrcFromPypi {
-        platform = "manylinux2014_aarch64";
-        dist = "cp310";
-        hash = "sha256-QgXQmM6O+19/4v5QmLrmA2CU3I2IKfXg4NepsVUyYzY=";
-      };
-      "3.10-aarch64-darwin" = getSrcFromPypi {
-        platform = "macosx_11_0_arm64";
-        dist = "cp310";
-        hash = "sha256-2kYBsrXcjCPWr7KT6s+5rsTh0YccsvKcWhUdED5zsPg=";
-      };
-
       "3.11-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp311";
-        hash = "sha256-M11+NRXOeLUqQQE29Gqkp+oU0OfWQPNOHhN0CVVK0Kw=";
+        hash = "sha256-B0oCVmTPQ5tZZdzKryDEqubMlV3d106FNCVoq6QN2kc=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp311";
-        hash = "sha256-Eern4FvFp5h12jYySvue3dS66u8qA4bK9tTzcgua7yg=";
+        hash = "sha256-nfW6TIcSxVXs8y6yV0OR9kPlyg7KyiF4CEuMS/gktDM=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-ogj/YcWBKNMGu05a0IWL0rCWDywcEK1CxUj3SmDAAg4=";
+        hash = "sha256-/8tLHj4BIQb0OzBtcND2o2JigkoyT4n38ivyiGf76Bw=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp312";
-        hash = "sha256-8d0JtIGpPB1MdQAT9Gf3QZRJO6e9KfzU0c7BbjohT2U=";
+        hash = "sha256-U0+zJyuQ4sf47ZpCKaabXlwZsC+hRRbMxe750B8khUY=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp312";
-        hash = "sha256-h+wtycPtmrk27shTUWDF+9LISZSFWfHF2qdfY/q+WUI=";
+        hash = "sha256-AFITtty9ILC9ZVgLdAJVlQFQtInhpTBvZdjkn5EUq4U=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-NNimhKi+lJ3YfdSsyXEBtBBqDcmtFR7IkdoHIxmle5k=";
+        hash = "sha256-vpBV41zmvePpCfVbTLbttxR9CsLbCM+YbVw0EJhq+l0=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux2014_x86_64";
         dist = "cp313";
-        hash = "sha256-+UFj8UyP07qTrhS2Maus8UywMbugtZE4hpmEtNEDdfg=";
+        hash = "sha256-3zFmSlPBOpJjvKDow54DgKDMrgscElN232OkgNnLIIc=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp313";
-        hash = "sha256-cEmIN8r1OL1Fj/aFjIv9QE24IBWrqPZjZwGX+pkA/wI=";
+        hash = "sha256-W3OTyGlKF+1SLpVT4GeR3Xa0eJs0SNCF0O1P+613ouc=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-v/Z7GIEzzh8BEcexY6wyH9ZGtZ7SIepIkGPi4PhcuWc=";
+        hash = "sha256-Oo8ynwVNLggJPNWkr5MozOEsO1+rS9peLFza3GO17S0=";
       };
     };
 in
diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh
index d90cb0e97ff9..269d7823c78a 100755
--- a/pkgs/development/python-modules/jaxlib/prefetch.sh
+++ b/pkgs/development/python-modules/jaxlib/prefetch.sh
@@ -10,7 +10,7 @@ prefetch() {
     echo
 }
 
-for py in "310" "311" "312" "313"; do
+for py in "311" "312" "313"; do
     prefetch "$py" "x86_64-linux" "jaxlib-bin"
     prefetch "$py" "aarch64-linux" "jaxlib-bin"
     prefetch "$py" "aarch64-darwin" "jaxlib-bin"

From 9a0a4c077ebb4cf41cc2249685693fc3f3cf48a9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 23 Jul 2025 15:10:17 +0200
Subject: [PATCH 12/47] python3Packages.tensorflow-probability: patch to fix
 jax 0.7.0 compatibility

---
 .../tensorflow-probability/default.nix              | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 06989acddfe6..9e23f1c0e5a2 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch2,
 
   # bazel wheel
   buildBazelPackage,
@@ -52,6 +53,18 @@ let
       rev = "refs/tags/v${version}";
       hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc=";
     };
+
+    patches = [
+      # AttributeError: jax.interpreters.xla.pytype_aval_mappings was deprecated in JAX v0.5.0 and
+      # removed in JAX v0.7.0. jax.core.pytype_aval_mappings can be used as a replacement in most cases.
+      # TODO: remove when updating to the next release
+      (fetchpatch2 {
+        name = "future-proof-reference-to-deprecated-pytype_aval_mappings";
+        url = "https://github.com/tensorflow/probability/commit/135080b6b1ac5724fc1731b0a9ca6f2010b1aea5.patch";
+        hash = "sha256-27yWIw5pI86KcUz0TsYwRFyLDoeiqmxgsRMBXaauzVw=";
+      })
+    ];
+
     nativeBuildInputs = [
       absl-py
       # needed to create the output wheel in installPhase

From 317bd97b9b990f700e18fb54be6e0119d848f1a9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 24 Jul 2025 09:58:19 +0200
Subject: [PATCH 13/47] python3Packages.chex: remove unused input pythonOlder

---
 pkgs/development/python-modules/chex/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix
index 2318bc14e71e..8ec1a28dd608 100644
--- a/pkgs/development/python-modules/chex/default.nix
+++ b/pkgs/development/python-modules/chex/default.nix
@@ -18,7 +18,6 @@
   cloudpickle,
   dm-tree,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {

From c2bead39eecc15f8cc6f6159f0ed9e8e2967e769 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 18 Aug 2025 10:37:43 +0200
Subject: [PATCH 14/47] python3Packages.blackjax: skip failing test

https://github.com/blackjax-devs/blackjax/issues/795
---
 pkgs/development/python-modules/blackjax/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index 1a0b0da52e03..e10d406aed7f 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -75,10 +75,12 @@ buildPythonPackage rec {
     "test_nuts__without_device"
     "test_nuts__without_jit"
     "test_smc_waste_free__with_jit"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+
     # Numerical test (AssertionError)
+    # First report, when the failure was only happening on aarch64-linux:
     # https://github.com/blackjax-devs/blackjax/issues/668
+    # Second report, when the test started happening on x86_64-linux too after Jax was updated to 0.7.0
+    # https://github.com/blackjax-devs/blackjax/issues/795
     "test_chees_adaptation"
   ];
 

From 649223979fd35c128985fc0c56f7c468026c4892 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Sat, 30 Aug 2025 11:09:38 +0000
Subject: [PATCH 15/47] helmsman: move to finalAttrs

---
 pkgs/by-name/he/helmsman/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index b932bc721dfb..84d6e8435377 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "helmsman";
   version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "Praqma";
     repo = "helmsman";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-As0YjqMdPCgIzYWB1Wf3R11mwj6CglWZdvCRzlHDvkw=";
   };
 
@@ -31,4 +31,4 @@ buildGoModule rec {
       sarcasticadmin
     ];
   };
-}
+})

From fa56da1bbdbc462c0e4f176065b9fc2390086280 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Sat, 30 Aug 2025 11:09:58 +0000
Subject: [PATCH 16/47] helmsman: repo owner changed

---
 pkgs/by-name/he/helmsman/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index 84d6e8435377..74dc6b3897f7 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "4.0.1";
 
   src = fetchFromGitHub {
-    owner = "Praqma";
+    owner = "mkubaczyk";
     repo = "helmsman";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-As0YjqMdPCgIzYWB1Wf3R11mwj6CglWZdvCRzlHDvkw=";

From 8057a1d1c06f0c692a9979cf158dfd4a29ec40fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 11:55:22 +0000
Subject: [PATCH 17/47] libretro.ppsspp: 0-unstable-2025-08-19 ->
 0-unstable-2025-08-30

---
 pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 32cf3dbc34c3..5394356c4928 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-08-19";
+  version = "0-unstable-2025-08-30";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "e526986da2b491763e2d715741f1babeef68f1a6";
-    hash = "sha256-aPYsgb/nO9RzSGL+evMiCoYz3+08HC83An3rMoCWWMw=";
+    rev = "b9a3e939711e007cce6af5930603122c0df91f20";
+    hash = "sha256-eEJeH7tfuIVrlkqGwsoe6RkY7tOEIyUbHSM8xGyZL4o=";
     fetchSubmodules = true;
   };
 

From 605c55e623cb2bd9efb4417a6cc3074e936ee22b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 17:33:59 +0000
Subject: [PATCH 18/47] gefyra: 2.3.1 -> 2.3.2

---
 pkgs/by-name/ge/gefyra/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix
index 1f3125f822a9..10d328ab96cb 100644
--- a/pkgs/by-name/ge/gefyra/package.nix
+++ b/pkgs/by-name/ge/gefyra/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gefyra";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchzip {
     url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
-    hash = "sha256-piF/h2g9NeLbSVC5YjfcN1Hq+LWXe+Ib3LolA/vOZdw=";
+    hash = "sha256-p75lJMg5U/cuoOMK+Vf76XhSu1oCKXTPokPCJphuwUw=";
     stripRoot = false;
   };
 

From c28e4efd6a8ffc46345aec29ecd2ad5a28041691 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 30 Aug 2025 20:07:28 +0200
Subject: [PATCH 19/47] claude-code: 1.0.96 -> 1.0.98

Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

- Settings: /doctor now validates permission rule syntax and suggests corrections (1.0.97)
- Additional improvements and bug fixes for version 1.0.98
---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 7cae438e5af9..5430f4df97b4 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.96"
+        "@anthropic-ai/claude-code": "^1.0.98"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.96",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.96.tgz",
-      "integrity": "sha512-xnxhYzuh6PYlMcw56REMQiGMW20WaLLOvG8L8TObq70zhNKs3dro7nhYwHRe1c2ubTr20oIJK0aSkyD2BpO8nA==",
+      "version": "1.0.98",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.98.tgz",
+      "integrity": "sha512-IV193Eh8STdRcN3VkNcojPIlLnQPch+doBVrDSEV1rPPePISy7pzHFZL0Eg7zIPj9gHkHV1D2s0RMMwzVXJThA==",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index cdc0f9c59807..21cfe04287fa 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.96";
+  version = "1.0.98";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-w3KT+dZbrcrwnOl9ByZ43nuSN9ON078kCqxF7fIZ7AA=";
+    hash = "sha256-Dkaj97FuRp6LmZgsmzKRX9PKp7bzvUj7rUD3b/5CxtU=";
   };
 
-  npmDepsHash = "sha256-qjg3gUmqlPfngnWRfADZlAK89aOoKtCkQkCXKjVPNFk=";
+  npmDepsHash = "sha256-rcULDhcHZm16LKzceIu6gRH/Q1HBCpIJFfZRMVkhiiQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From e56577c6ea9c5140b53b1b605982caf9eab022b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 18:09:17 +0000
Subject: [PATCH 20/47] dotter: 0.13.3 -> 0.13.4

---
 pkgs/by-name/do/dotter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix
index 0608d94c871f..caf02fcebf88 100644
--- a/pkgs/by-name/do/dotter/package.nix
+++ b/pkgs/by-name/do/dotter/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dotter";
-  version = "0.13.3";
+  version = "0.13.4";
 
   src = fetchFromGitHub {
     owner = "SuperCuber";
     repo = "dotter";
     rev = "v${version}";
-    hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk=";
+    hash = "sha256-cxabaCxbwP2YbnG2XfmVJWFTw9LGO0D1dlLy6fuux+M=";
   };
 
-  cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs=";
+  cargoHash = "sha256-KLU+4CYqTKEH8wuvinVS0Zs+nFgOer2ho8LXnLDNVKY=";
 
   nativeCheckInputs = [
     which

From f2849b3234c0e8bb90797cc78e1488922c698576 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 30 Aug 2025 21:24:21 +0200
Subject: [PATCH 21/47] jjui: 0.9.2 -> 0.9.3

Changelog: https://github.com/idursun/jjui/releases/tag/v0.9.3
Diff: https://github.com/idursun/jjui/compare/v0.9.2...v0.9.3
---
 pkgs/by-name/jj/jjui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 88b1ee75e373..0ce7c97a9796 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "jjui";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8jLQ9KLMMz4y7pXA9wlHbGN4cxRAYVPy6oRKLHCU4SM=";
+    hash = "sha256-UkgQ3uxWPwLQiNhcZReFifLPD8h+xmH798ckTtia/+4=";
   };
 
-  vendorHash = "sha256-2rlfR5HLFJyLVSRiUGTCwQDFWRBt4jmL6sdZcq7blaE=";
+  vendorHash = "sha256-VfzvGzh/ZYHI5LDuhwOwb4nEOVesBu0kxRF6Q/ISPww=";
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 

From 5949a98219ff780571fa53055d5cb3ab5ed88540 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 19:41:29 +0000
Subject: [PATCH 22/47] metacubexd: 1.190.1 -> 1.192.0

---
 pkgs/by-name/me/metacubexd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index e418b940a7de..7c04d30ffe5f 100644
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "metacubexd";
-  version = "1.190.1";
+  version = "1.192.0";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "metacubexd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oXyPT47rq1hadaUmQPqtvOwemMOE0z19zjWQbfxIyLw=";
+    hash = "sha256-OZLwKckwiw0FPJYOLgj9bXEm6xq9SmDrDZNQhM0r7dc=";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-Ufm0I5ZjSHzmMRGpX7Y8VYspSszCR7AjdWc1c9fjdPQ=";
+    hash = "sha256-v+wuYGK0WEgrPNBLuLnoO/uDEk6AqJTlNJZHTpEb4mc=";
   };
 
   buildPhase = ''

From 352643aea12c2866862b06a134f2924da4c4a1e8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 18 Aug 2025 14:55:29 +0200
Subject: [PATCH 23/47] python3Packages.distrax: fetch upstream patches to fix
 jax 0.7.0 compatibility

---
 .../python-modules/distrax/default.nix        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix
index 014167bf2aea..e7b6257d141d 100644
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
+  fetchpatch2,
   chex,
   jaxlib,
   numpy,
@@ -26,13 +26,28 @@ buildPythonPackage rec {
 
   patches = [
     # TODO: remove at the next release (already on master)
-    (fetchpatch {
+    (fetchpatch2 {
       name = "fix-jax-0.6.0-compat";
       url = "https://github.com/google-deepmind/distrax/commit/c02708ac46518fac00ab2945311e0f2ee32c672c.patch";
       hash = "sha256-hFNXKoA1b5I6dzhwTRXp/SnkHv89GI6tYwlnBBHwG78=";
     })
+    # https://github.com/google-deepmind/distrax/pull/289
+    (fetchpatch2 {
+      name = "fix-jax-0.7.0-compat";
+      url = "https://github.com/google-deepmind/distrax/commit/7fc5bd7efff4a7144d175199159f115c3e68a3cf.patch";
+      hash = "sha256-TiD72YIb6ajpaCO1yOGl/+JCuaikQ879Zcpaf2wzMq4=";
+    })
   ];
 
+  # TODO: remove at the next release (already on master)
+  # https://github.com/google-deepmind/distrax/pull/293
+  postPatch = ''
+    substituteInPlace distrax/_src/utils/transformations.py \
+      --replace-fail \
+        "jax.experimental.pjit.pjit_p" \
+        "jex.core.primitives.jit_p"
+  '';
+
   dependencies = [
     chex
     jaxlib

From 4d76031c93248f7974356376a66103268b5ffefc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 20 Aug 2025 22:54:11 +0200
Subject: [PATCH 24/47] python3Packages.jax[lib]: 0.7.0 -> 0.7.1

Diff: https://github.com/jax-ml/jax/compare/jax-v0.7.0...jax-v0.7.1

Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.7.1
---
 .../jax-cuda12-pjrt/default.nix               |  6 ++---
 .../jax-cuda12-plugin/default.nix             | 18 ++++++-------
 .../python-modules/jax/default.nix            |  4 +--
 .../development/python-modules/jaxlib/bin.nix | 26 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index 76d23a8c6bba..932b8804dbc7 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -44,14 +44,14 @@ buildPythonPackage rec {
     dist = "py3";
     platform =
       {
-        x86_64-linux = "manylinux2014_x86_64";
+        x86_64-linux = "manylinux_2_27_x86_64";
         aarch64-linux = "manylinux2014_aarch64";
       }
       .${stdenv.hostPlatform.system};
     hash =
       {
-        x86_64-linux = "sha256-dCzCYNaXdxy4gwhDmHSKAH0jMoaqP+X8FSp0wHPVmiQ=";
-        aarch64-linux = "sha256-3Oaxz+f0R0lCW66iKpAnQjuvsaUmnhPzB4XP0bLimGI=";
+        x86_64-linux = "sha256-quPn80WASloSKaxxSMvRNEUMgWGYu7/4WnYiGC7H9ko=";
+        aarch64-linux = "sha256-f8QFBJYN5W4jL5MmMKJ1fs8/hzZlsTmDF9Jfa3RF1WA=";
       }
       .${stdenv.hostPlatform.system};
   };
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index eecf5b25de85..ef02e58218ea 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -37,34 +37,34 @@ let
   # upstream does not distribute jax-cuda12-plugin 0.4.38 binaries for aarch64-linux
   srcs = {
     "3.11-x86_64-linux" = getSrcFromPypi {
-      platform = "manylinux2014_x86_64";
+      platform = "manylinux_2_27_x86_64";
       dist = "cp311";
-      hash = "sha256-2MmZTNYm4vFQmhZOXgfBIiIN3QptiDRvika9U8tePhk=";
+      hash = "sha256-Yw9aGxuorpSsC0K8N1IeGXBcmlRURWV5+NKY5FC2/tw=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp311";
-      hash = "sha256-JlpL8jjASPmJKeDa2XZCRtEkl73Yz98uIng6adc8xj4=";
+      hash = "sha256-iAQd0J4Bm4JnTZ9xZ7eWtIy1so3pVHLBosA2OxZtS/Y=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
-      platform = "manylinux2014_x86_64";
+      platform = "manylinux_2_27_x86_64";
       dist = "cp312";
-      hash = "sha256-q37GQziSIY8lvdWi0TddqQh+mB36CYJ6x/NzzNu/LE0=";
+      hash = "sha256-LPPm/mNDtbV2TTWJPON16z5qhZBIty3I9wCv7CFai6Y=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp312";
-      hash = "sha256-2UJ4q5a2ImQ3Ns3tt3eHA9MPL2T6SXrZ9bo13QyhBGQ=";
+      hash = "sha256-M9ZGYPYVg1pg4M+Z656KMuz/1dIGYTV/RZEqHYFkMPE=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
-      platform = "manylinux2014_x86_64";
+      platform = "manylinux_2_27_x86_64";
       dist = "cp313";
-      hash = "sha256-v94NtxSyrV/p6GwfbS5gx9TZgNAVAphYIIgoq82CdM8=";
+      hash = "sha256-dDC8RnptxbvBhvgcq5L0GhJy9aodFkbBu/rqkleD2oU=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux2014_aarch64";
       dist = "cp313";
-      hash = "sha256-5Nz+GFcW+0WsHti4kSIJbG2Tm0NRNxAzobz/JU3Rejg=";
+      hash = "sha256-w8IAegYZmwlYMZdsamZcEvylWs1+yEq0SI4a5Y7stJQ=";
     };
   };
 in
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index 9ecf5853e574..5d8e8798eb6a 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
   pname = "jax";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${version}";
-    hash = "sha256-CWtzT5c2Rzf2C0yaF9z2Y+uV3TdZC/h4AQf8t+U8o7o=";
+    hash = "sha256-k3yuWs+SOxrDXysVWCFR3wliATtro+aDdDXfFVtOTBo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 0d13280e1bf0..c97c1202cc8d 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.7.0";
+  version = "0.7.1";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -47,51 +47,51 @@ let
     in
     {
       "3.11-x86_64-linux" = getSrcFromPypi {
-        platform = "manylinux2014_x86_64";
+        platform = "manylinux_2_27_x86_64";
         dist = "cp311";
-        hash = "sha256-B0oCVmTPQ5tZZdzKryDEqubMlV3d106FNCVoq6QN2kc=";
+        hash = "sha256-6vX2j1O/TcuTtlElOFR2Z2JViOTzzK7vBIeI/RjYwNU=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp311";
-        hash = "sha256-nfW6TIcSxVXs8y6yV0OR9kPlyg7KyiF4CEuMS/gktDM=";
+        hash = "sha256-n7GJw7OUcMQ5T/yxi3HkfP/Fv4Xo/LHjNpJoaww+BN0=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-/8tLHj4BIQb0OzBtcND2o2JigkoyT4n38ivyiGf76Bw=";
+        hash = "sha256-PzLD5MFntzJ8NC6C09+EB5cU6gtDcYvocdA5mZZws8k=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
-        platform = "manylinux2014_x86_64";
+        platform = "manylinux_2_27_x86_64";
         dist = "cp312";
-        hash = "sha256-U0+zJyuQ4sf47ZpCKaabXlwZsC+hRRbMxe750B8khUY=";
+        hash = "sha256-dKvTE1eX+CRA3TcRo1y6FsQw0bumVHS4W7cOQXM6Uuk=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp312";
-        hash = "sha256-AFITtty9ILC9ZVgLdAJVlQFQtInhpTBvZdjkn5EUq4U=";
+        hash = "sha256-8PH1KVa4wlGKsACk09jCG+d34dR/kmugNkDjkQYaQe4=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-vpBV41zmvePpCfVbTLbttxR9CsLbCM+YbVw0EJhq+l0=";
+        hash = "sha256-EnwHxydwPl1Z+E9lUWm+yEn0Qi5S+FRjSc7MMKihPh0=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
-        platform = "manylinux2014_x86_64";
+        platform = "manylinux_2_27_x86_64";
         dist = "cp313";
-        hash = "sha256-3zFmSlPBOpJjvKDow54DgKDMrgscElN232OkgNnLIIc=";
+        hash = "sha256-s1D1Gahu/1pLHuAUx/qjZYX0fz1jeH0fPpvf/pzEGmY=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux2014_aarch64";
         dist = "cp313";
-        hash = "sha256-W3OTyGlKF+1SLpVT4GeR3Xa0eJs0SNCF0O1P+613ouc=";
+        hash = "sha256-zmobpgGXZIcMJ1B6yhjlJpmK061L6i3WHhnQSZw7iwQ=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-Oo8ynwVNLggJPNWkr5MozOEsO1+rS9peLFza3GO17S0=";
+        hash = "sha256-Kic3nl7Sl2WYDvMtTXf1fdDh3ZZYA6xnRVQESsI80+w=";
       };
     };
 in

From 7d5f6f69f8b7e287f2644ef2da2f0987c883e850 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 30 Aug 2025 11:15:32 +0200
Subject: [PATCH 25/47] python3Packages.equinox: backport patches to fix with
 jax 0.7.0

https://github.com/patrick-kidger/equinox/pull/1086
https://github.com/patrick-kidger/equinox/pull/1082
---
 .../python-modules/equinox/default.nix        | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index 67b924287e3d..b56147a10b5b 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   hatchling,
@@ -32,12 +33,31 @@ buildPythonPackage rec {
     hash = "sha256-zXgAuFGWKHShKodi9swnWIry4VU9s4pBhBRoK5KzaL0=";
   };
 
+  patches = [
+    # The following two patches have been merged upstream and should be removed when updating to the next release
+    # They fix the incompatibilities with jax>=0.7.0
+
+    # https://github.com/patrick-kidger/equinox/pull/1086
+    (fetchpatch2 {
+      name = "remove-deprecated-batching-NotMapped";
+      url = "https://github.com/patrick-kidger/equinox/commit/6a6a441ced2fe64191a087752f1c2e71a6ce39f1.patch";
+      hash = "sha256-tzHFjMI3gAIh5MPkdbmzsky/oFjDEbOIkPGQMQ+gcQQ=";
+    })
+
+    # https://github.com/patrick-kidger/equinox/pull/1082
+    (fetchpatch2 {
+      name = "allow-creating-weak-references-to-flatten";
+      url = "https://github.com/patrick-kidger/equinox/commit/62b3c94ad56bdb63524702b320e977d2d93dbe72.patch";
+      hash = "sha256-c1FKCnC3/okuP2VJV4h7sPRYQeYJZSdzEG5ETL2M35k=";
+    })
+  ];
+
   # Relax speed constraints on tests that can fail on busy builders
   postPatch = ''
     substituteInPlace tests/test_while_loop.py \
       --replace-fail "speed < 0.1" "speed < 0.5" \
       --replace-fail "speed < 0.5" "speed < 1" \
-      --replace-fail "speed < 1" "speed < 4" \
+      --replace-fail "speed < 1" "speed < 20"
   '';
 
   build-system = [ hatchling ];

From ea8ae9fea18b21a967441868aa058031e2c6ff4b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 30 Aug 2025 14:46:17 +0200
Subject: [PATCH 26/47] python3Packages.keras: skip failing tests

https://github.com/keras-team/keras/issues/21629
---
 .../python-modules/keras/default.nix          | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index bdfd593816ea..93f8a3a14784 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -93,6 +93,84 @@ buildPythonPackage rec {
 
     # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects
     "test_reloading_default_saved_model"
+
+    # E       AssertionError:
+    # E       - float32
+    # E       + float64
+    "test_angle_bool"
+    "test_angle_int16"
+    "test_angle_int32"
+    "test_angle_int8"
+    "test_angle_uint16"
+    "test_angle_uint32"
+    "test_angle_uint8"
+    "test_bartlett_bfloat16"
+    "test_bartlett_bool"
+    "test_bartlett_float16"
+    "test_bartlett_float32"
+    "test_bartlett_float64"
+    "test_bartlett_int16"
+    "test_bartlett_int32"
+    "test_bartlett_int64"
+    "test_bartlett_int8"
+    "test_bartlett_none"
+    "test_bartlett_uint16"
+    "test_bartlett_uint32"
+    "test_bartlett_uint8"
+    "test_blackman_bfloat16"
+    "test_blackman_bool"
+    "test_blackman_float16"
+    "test_blackman_float32"
+    "test_blackman_float64"
+    "test_blackman_int16"
+    "test_blackman_int32"
+    "test_blackman_int64"
+    "test_blackman_int8"
+    "test_blackman_none"
+    "test_blackman_uint16"
+    "test_blackman_uint32"
+    "test_blackman_uint8"
+    "test_eye_none"
+    "test_hamming_bfloat16"
+    "test_hamming_bool"
+    "test_hamming_float16"
+    "test_hamming_float32"
+    "test_hamming_float64"
+    "test_hamming_int16"
+    "test_hamming_int32"
+    "test_hamming_int64"
+    "test_hamming_int8"
+    "test_hamming_none"
+    "test_hamming_uint16"
+    "test_hamming_uint32"
+    "test_hamming_uint8"
+    "test_hanning_bfloat16"
+    "test_hanning_bool"
+    "test_hanning_float16"
+    "test_hanning_float32"
+    "test_hanning_float64"
+    "test_hanning_int16"
+    "test_hanning_int32"
+    "test_hanning_int64"
+    "test_hanning_int8"
+    "test_hanning_none"
+    "test_hanning_uint16"
+    "test_hanning_uint32"
+    "test_hanning_uint8"
+    "test_identity_none"
+    "test_kaiser_bfloat16"
+    "test_kaiser_bool"
+    "test_kaiser_float16"
+    "test_kaiser_float32"
+    "test_kaiser_float64"
+    "test_kaiser_int16"
+    "test_kaiser_int32"
+    "test_kaiser_int64"
+    "test_kaiser_int8"
+    "test_kaiser_none"
+    "test_kaiser_uint16"
+    "test_kaiser_uint32"
+    "test_kaiser_uint8"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # Hangs forever

From 4cfbd1dcc35226abe6202770d4d5bd55de50d683 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 30 Aug 2025 15:09:42 +0200
Subject: [PATCH 27/47] python3Packages.optimistix: disable failing test

https://github.com/patrick-kidger/optimistix/issues/160
---
 pkgs/development/python-modules/optimistix/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix
index c859fab8aac0..c46ddfa1daf8 100644
--- a/pkgs/development/python-modules/optimistix/default.nix
+++ b/pkgs/development/python-modules/optimistix/default.nix
@@ -59,6 +59,12 @@ buildPythonPackage rec {
     "-Wignore::DeprecationWarning"
   ];
 
+  disabledTests = [
+    # assert Array(False, dtype=bool)
+    # +  where Array(False, dtype=bool) = tree_allclose(Array(0.12993518, dtype=float64), Array(0., dtype=float64, weak_type=True), atol=0.0001, rtol=0.0001)
+    "test_least_squares"
+  ];
+
   meta = {
     description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox";
     homepage = "https://github.com/patrick-kidger/optimistix";

From 72d4845900d19624c597f19f4aff2f8a39ac9a84 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 30 Aug 2025 23:59:59 +0400
Subject: [PATCH 28/47] mpich: fix build

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b61cf0936cf0..2e7cded280ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8566,6 +8566,7 @@ with pkgs;
   msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;
 
   mpich = callPackage ../development/libraries/mpich {
+    automake = automake116x;
     ch4backend = libfabric;
   };
 

From 6b1069c0d4a3b7856c3547029c01018f21b380b3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:24:31 -0500
Subject: [PATCH 29/47] vimPlugins: fix meta shadowing

Currently shadows entire `meta` from `generated.nix`.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/overrides.nix         | 152 ++++++++++--------
 1 file changed, 88 insertions(+), 64 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index aaaf7e3c9491..4942fbca8e09 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -277,18 +277,18 @@ in
     nvimSkipModules = [ "bufferline.utils" ];
   };
 
-  barbecue-nvim = super.barbecue-nvim.overrideAttrs {
+  barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: {
     dependencies = with self; [
       nvim-lspconfig
       nvim-navic
     ];
-    meta = {
+    meta = old.meta // {
       description = "VS Code like winbar for Neovim";
       homepage = "https://github.com/utilyre/barbecue.nvim";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ lightquantum ];
     };
-  };
+  });
 
   base46 = super.base46.overrideAttrs {
     dependencies = [ self.nvchad-ui ];
@@ -335,13 +335,13 @@ in
     dependencies = [ self.blink-cmp ];
   };
 
-  blink-cmp-words = super.blink-cmp-words.overrideAttrs {
+  blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: {
     dependencies = [ self.blink-cmp ];
-    meta = {
+    meta = old.meta // {
       description = "Offline word and synonym completion provider for Neovim";
       maintainers = with lib.maintainers; [ m3l6h ];
     };
-  };
+  });
 
   bluloco-nvim = super.bluloco-nvim.overrideAttrs {
     dependencies = [ self.lush-nvim ];
@@ -352,9 +352,11 @@ in
     nvimSkipModules = [ "bufferline.commands" ];
   };
 
-  bufresize-nvim = super.bufresize-nvim.overrideAttrs {
-    meta.license = lib.licenses.mit;
-  };
+  bufresize-nvim = super.bufresize-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   catppuccin-nvim = super.catppuccin-nvim.overrideAttrs {
     nvimSkipModules = [
@@ -1012,17 +1014,17 @@ in
     dependencies = [ self.nvim-yarp ];
   };
 
-  demicolon-nvim = super.demicolon-nvim.overrideAttrs {
+  demicolon-nvim = super.demicolon-nvim.overrideAttrs (old: {
     dependencies = with self; [
       nvim-treesitter
       nvim-treesitter-textobjects
     ];
-    meta = {
+    meta = old.meta // {
       description = "Overloaded ; and , keys in Neovim";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ m3l6h ];
     };
-  };
+  });
 
   denops-vim = super.denops-vim.overrideAttrs {
     postPatch = ''
@@ -1048,16 +1050,16 @@ in
     '';
   };
 
-  deoplete-khard = super.deoplete-khard.overrideAttrs {
+  deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
     dependencies = [ self.deoplete-nvim ];
     passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
-    meta = {
+    meta = old.meta // {
       description = "Address-completion for khard via deoplete";
       homepage = "https://github.com/nicoe/deoplete-khard";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ jorsn ];
     };
-  };
+  });
 
   devdocs-nvim = super.devdocs-nvim.overrideAttrs {
     nvimSkipModules = [
@@ -1184,13 +1186,13 @@ in
     ];
   };
 
-  fcitx-vim = super.fcitx-vim.overrideAttrs {
+  fcitx-vim = super.fcitx-vim.overrideAttrs (old: {
     passthru.python3Dependencies = ps: with ps; [ dbus-python ];
-    meta = {
+    meta = old.meta // {
       description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode";
       license = lib.licenses.mit;
     };
-  };
+  });
 
   flash-nvim = super.flash-nvim.overrideAttrs {
     # Docs require lazyvim
@@ -1563,14 +1565,14 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  jedi-vim = super.jedi-vim.overrideAttrs {
+  jedi-vim = super.jedi-vim.overrideAttrs (old: {
     # checking for python3 support in vim would be neat, too, but nobody else seems to care
     buildInputs = [ python3.pkgs.jedi ];
-    meta = {
+    meta = old.meta // {
       description = "code-completion for python using python-jedi";
       license = lib.licenses.mit;
     };
-  };
+  });
 
   jellybeans-nvim = super.jellybeans-nvim.overrideAttrs {
     dependencies = [ self.lush-nvim ];
@@ -1795,7 +1797,7 @@ in
     dependencies = [ self.litee-nvim ];
   };
 
-  live-preview-nvim = super.live-preview-nvim.overrideAttrs {
+  live-preview-nvim = super.live-preview-nvim.overrideAttrs (old: {
     checkInputs = with self; [
       fzf-lua
       mini-pick
@@ -1808,16 +1810,20 @@ in
       # This file runs tests on require which unfortunately fails as it attempts to require the base plugin. See https://github.com/brianhuster/live-preview.nvim/blob/5890c4f7cb81a432fd5f3b960167757f1b4d4702/lua/livepreview/_spec.lua#L25
       "livepreview._spec"
     ];
-    meta.license = lib.licenses.gpl3Only;
-  };
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
 
   lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
 
-  lspecho-nvim = super.lspecho-nvim.overrideAttrs {
-    meta.license = lib.licenses.mit;
-  };
+  lspecho-nvim = super.lspecho-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   lspsaga-nvim = super.lspsaga-nvim.overrideAttrs {
     # Other modules require setup call first
@@ -2878,11 +2884,13 @@ in
     configurePhase = "cd vim";
   };
 
-  one-nvim = super.one-nvim.overrideAttrs {
+  one-nvim = super.one-nvim.overrideAttrs (old: {
     # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
     # https://github.com/Th3Whit3Wolf/one-nvim/issues/23
-    meta.broken = true;
-  };
+    meta = old.meta // {
+      broken = true;
+    };
+  });
 
   # The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we
   # avoid choosing one of them and leave it to the user
@@ -2991,7 +2999,10 @@ in
 
   perfanno-nvim = super.perfanno-nvim.overrideAttrs (old: {
     dependencies = [ gperf ];
-    meta.maintainers = with lib.maintainers; [ fredeb ];
+
+    meta = old.meta // {
+      maintainers = with lib.maintainers; [ fredeb ];
+    };
   });
 
   persisted-nvim = super.persisted-nvim.overrideAttrs {
@@ -3384,26 +3395,31 @@ in
             os.execv("${svedbackend}/bin/evinceSync.py", sys.argv)
           '';
     in
-    super.sved.overrideAttrs {
+    super.sved.overrideAttrs (old: {
       preferLocalBuild = true;
       postPatch = ''
         rm ftplugin/evinceSync.py
         install -m 544 ${pythonWrapper} ftplugin/evinceSync.py
       '';
-      meta = {
+      meta = old.meta // {
         description = "synctex support between vim/neovim and evince";
       };
-    };
+    });
 
-  syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs {
+  syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs (old: {
     dependencies = [ self.nvim-treesitter ];
-    meta.maintainers = with lib.maintainers; [ callumio ];
-  };
 
-  tardis-nvim = super.tardis-nvim.overrideAttrs {
+    meta = old.meta // {
+      maintainers = with lib.maintainers; [ callumio ];
+    };
+  });
+
+  tardis-nvim = super.tardis-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
-    meta.maintainers = with lib.maintainers; [ fredeb ];
-  };
+    meta = old.meta // {
+      maintainers = with lib.maintainers; [ fredeb ];
+    };
+  });
 
   taskwarrior2 = buildVimPlugin {
     inherit (taskwarrior2) version pname;
@@ -3466,11 +3482,13 @@ in
     nvimSkipModules = "frecency.types";
   };
 
-  telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs {
+  telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: {
     dependencies = [ self.telescope-nvim ];
     buildPhase = "make";
-    meta.platforms = lib.platforms.all;
-  };
+    meta = old.meta // {
+      platforms = lib.platforms.all;
+    };
+  });
 
   telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs {
     dependencies = with self; [
@@ -3500,7 +3518,9 @@ in
         ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static
         ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua
       '';
-    meta.platforms = lib.platforms.all;
+    meta = old.meta // {
+      platforms = lib.platforms.all;
+    };
   });
 
   telescope-git-conflicts-nvim = super.telescope-git-conflicts-nvim.overrideAttrs {
@@ -3748,16 +3768,16 @@ in
     runtimeDeps = [ uv ];
   };
 
-  vCoolor-vim = super.vCoolor-vim.overrideAttrs {
+  vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
     # on linux can use either Zenity or Yad.
     propagatedBuildInputs = [ zenity ];
-    meta = {
+    meta = old.meta // {
       description = "Simple color selector/picker plugin";
       license = lib.licenses.publicDomain;
     };
-  };
+  });
 
-  vimacs = super.vimacs.overrideAttrs {
+  vimacs = super.vimacs.overrideAttrs (old: {
     buildPhase = ''
       substituteInPlace bin/vim \
         --replace-fail '/usr/bin/vim' 'vim' \
@@ -3765,13 +3785,13 @@ in
       # remove unnecessary duplicated bin wrapper script
       rm -r plugin/vimacs
     '';
-    meta = with lib; {
+    meta = old.meta // {
       description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
       homepage = "http://algorithm.com.au/code/vimacs";
-      license = licenses.gpl2Plus;
+      license = lib.licenses.gpl2Plus;
       maintainers = with lib.maintainers; [ millerjason ];
     };
-  };
+  });
 
   vimade = super.vimade.overrideAttrs {
     checkInputs = with self; [
@@ -3782,13 +3802,13 @@ in
     ];
   };
 
-  vimsence = super.vimsence.overrideAttrs {
-    meta = with lib; {
+  vimsence = super.vimsence.overrideAttrs (old: {
+    meta = old.meta // {
       description = "Discord rich presence for Vim";
       homepage = "https://github.com/hugolgst/vimsence";
       maintainers = with lib.maintainers; [ hugolgst ];
     };
-  };
+  });
 
   vimproc-vim = super.vimproc-vim.overrideAttrs {
     buildInputs = [ which ];
@@ -4009,7 +4029,9 @@ in
         ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase
       '';
 
-    meta.platforms = lib.platforms.all;
+    meta = old.meta // {
+      platforms = lib.platforms.all;
+    };
   });
 
   vim-hier = super.vim-hier.overrideAttrs {
@@ -4078,10 +4100,12 @@ in
   vim-tabby = super.vim-tabby.overrideAttrs {
   };
 
-  vim-textobj-entire = super.vim-textobj-entire.overrideAttrs {
+  vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: {
     dependencies = [ self.vim-textobj-user ];
-    meta.maintainers = with lib.maintainers; [ workflow ];
-  };
+    meta = old.meta // {
+      maintainers = with lib.maintainers; [ workflow ];
+    };
+  });
 
   vim-tpipeline = super.vim-tpipeline.overrideAttrs {
     # Requires global variable
@@ -4218,7 +4242,7 @@ in
     ];
   };
 
-  YouCompleteMe = super.YouCompleteMe.overrideAttrs {
+  YouCompleteMe = super.YouCompleteMe.overrideAttrs (old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace-fail "'ycm_path_to_python_interpreter', '''" \
@@ -4228,18 +4252,18 @@ in
       ln -s ${ycmd}/lib/ycmd third_party
     '';
 
-    meta = with lib; {
+    meta = old.meta // {
       description = "Code-completion engine for Vim";
       homepage = "https://github.com/Valloric/YouCompleteMe";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [
+      license = lib.licenses.gpl3;
+      maintainers = with lib.maintainers; [
         marcweber
         jagajaga
         mel
       ];
-      platforms = platforms.unix;
+      platforms = lib.platforms.unix;
     };
-  };
+  });
 
   zenbones-nvim = super.zenbones-nvim.overrideAttrs {
     nvimSkipModules = [

From a251b8a9f2f1f8858408262d060d6270daf0599f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 01:13:28 +0000
Subject: [PATCH 30/47] ladybird: 0-unstable-2025-08-19 ->
 0-unstable-2025-08-29

---
 pkgs/by-name/la/ladybird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 8a53b1a6b7fd..cd1bb274a6ee 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-08-19";
+  version = "0-unstable-2025-08-29";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "658477620afe4c14b936227d1c8307b2dea56267";
-    hash = "sha256-WkEgZP5Ci0mlNDGq++93v4coz36dhp+kXtlKQu1xnVM=";
+    rev = "c3aa8f0c8d3ee28b100260b376c45f2583b49c0d";
+    hash = "sha256-pckHeaGhpFemCIhTL8FeNWVea8itvy3SFYT9oWVPmu4=";
   };
 
   postPatch = ''

From 4956762039eb513231f7c8b62532fa6d14e11715 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:31:56 -0500
Subject: [PATCH 31/47] vimPlugins.meson: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/meson/default.nix        | 10 ++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix    |  7 -------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
new file mode 100644
index 000000000000..53efe4a19200
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
@@ -0,0 +1,10 @@
+{
+  lib,
+  vimUtils,
+  meson,
+}:
+vimUtils.buildVimPlugin {
+  inherit (meson) pname version src;
+  preInstall = "cd data/syntax-highlighting/vim";
+  meta.maintainers = with lib.maintainers; [ vcunat ];
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 4942fbca8e09..85a856694d8b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -33,7 +33,6 @@
   languagetool,
   libgit2,
   llvmPackages,
-  meson,
   neovim-unwrapped,
   nim1,
   nodejs,
@@ -1949,12 +1948,6 @@ in
     checkInputs = [ self.lualine-nvim ];
   };
 
-  meson = buildVimPlugin {
-    inherit (meson) pname version src;
-    preInstall = "cd data/syntax-highlighting/vim";
-    meta.maintainers = with lib.maintainers; [ vcunat ];
-  };
-
   mind-nvim = super.mind-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };

From 689e8e652fb56be0a2a93dd365928afc7dafcecc Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:35:33 -0500
Subject: [PATCH 32/47] vimPlugins.ethersync: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../plugins/non-generated/ethersync/default.nix    | 14 ++++++++++++++
 .../applications/editors/vim/plugins/overrides.nix | 13 -------------
 2 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix
new file mode 100644
index 000000000000..8e6f58e1a105
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix
@@ -0,0 +1,14 @@
+{
+  vimUtils,
+  ethersync,
+}:
+vimUtils.buildVimPlugin rec {
+  inherit (ethersync)
+    pname
+    version
+    src
+    meta
+    ;
+
+  sourceRoot = "${src.name}/nvim-plugin";
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 85a856694d8b..e0aeef5ca345 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -133,8 +133,6 @@
   # search-and-replace.nvim dependencies
   fd,
   sad,
-  # ethersync vim plugin
-  ethersync,
 }:
 self: super:
 let
@@ -1159,17 +1157,6 @@ in
     '';
   };
 
-  ethersync = buildVimPlugin rec {
-    inherit (ethersync)
-      pname
-      version
-      src
-      meta
-      ;
-
-    sourceRoot = "${src.name}/nvim-plugin";
-  };
-
   executor-nvim = super.executor-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
   };

From cfe8e54c1b77b9c3bc8941b2ab7b0b65ed126260 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:35:45 -0500
Subject: [PATCH 33/47] vimPlugins.fzfWrapper: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../plugins/non-generated/fzf-wrapper/default.nix  | 14 ++++++++++++++
 .../applications/editors/vim/plugins/overrides.nix | 13 +------------
 3 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 1adb63ed5d23..0f4054d498e7 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -75,6 +75,7 @@ mapAliases (
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
     fugitive = vim-fugitive;
     floating-nvim = throw "floating.nvim has been removed: abandoned by upstream. Use popup-nvim or nui-nvim"; # Added 2024-11-26
+    fzfWrapper = fzf-wrapper;
     ghc-mod-vim = ghcmod-vim;
     ghcmod = ghcmod-vim;
     gleam-vim = throw "gleam.vim has been removed: its code was merged into vim."; # Added 2025-06-10
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
new file mode 100644
index 000000000000..c22afcf7e9ae
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
@@ -0,0 +1,14 @@
+{
+  vimUtils,
+  fzf,
+}:
+# Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
+# plugin, since part of the fzf vim plugin is included in the main fzf
+# program.
+vimUtils.buildVimPlugin {
+  inherit (fzf) src version;
+  pname = "fzf";
+  postInstall = ''
+    ln -s ${fzf}/bin/fzf $target/bin/fzf
+  '';
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index e0aeef5ca345..3ac1f9d4f6b8 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1320,18 +1320,7 @@ in
   };
 
   fzf-vim = super.fzf-vim.overrideAttrs {
-    dependencies = [ self.fzfWrapper ];
-  };
-
-  # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
-  # plugin, since part of the fzf vim plugin is included in the main fzf
-  # program.
-  fzfWrapper = buildVimPlugin {
-    inherit (fzf) src version;
-    pname = "fzf";
-    postInstall = ''
-      ln -s ${fzf}/bin/fzf $target/bin/fzf
-    '';
+    dependencies = [ self.fzf-wrapper ];
   };
 
   gen-nvim = super.gen-nvim.overrideAttrs {

From a15c556a0ff773819f0acd7b1332fde9fb5a717a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:35:54 -0500
Subject: [PATCH 34/47] vimPlugins.hurl: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/hurl/default.nix        | 11 +++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix   |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix
new file mode 100644
index 000000000000..7bb376ea1f18
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/hurl/default.nix
@@ -0,0 +1,11 @@
+{
+  vimUtils,
+  hurl,
+}:
+vimUtils.buildVimPlugin {
+  pname = "hurl";
+  inherit (hurl) version;
+
+  # https://hurl.dev/
+  src = "${hurl.src}/contrib/vim";
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 3ac1f9d4f6b8..bddaf8417f78 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1474,15 +1474,6 @@ in
     dependencies = [ self.nui-nvim ];
   };
 
-  # https://hurl.dev/
-  hurl = buildVimPlugin {
-    pname = "hurl";
-    version = hurl.version;
-    # dontUnpack = true;
-
-    src = "${hurl.src}/contrib/vim";
-  };
-
   hurl-nvim = super.hurl-nvim.overrideAttrs {
     dependencies = with self; [
       nui-nvim

From 0858bbcc13b8242f8aaaaa42ac1f51981058711e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:39:46 -0500
Subject: [PATCH 35/47] vimPlugins.minsnip-nvim: remove plugin

Upstream repository removed.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/aliases.nix   |  1 +
 pkgs/applications/editors/vim/plugins/overrides.nix | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 0f4054d498e7..660fb8db03c1 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -95,6 +95,7 @@ mapAliases (
     ipython = vim-ipython;
     latex-live-preview = vim-latex-live-preview;
     maktaba = vim-maktaba;
+    minsnip-nvim = throw "the upstream repository got deleted"; # added 2025-08-30
     multiple-cursors = vim-multiple-cursors;
     necoGhc = neco-ghc; # backwards compat, added 2014-10-18
     neocomplete = neocomplete-vim;
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index bddaf8417f78..b6e73c92fa61 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1938,18 +1938,6 @@ in
     vimCommandCheck = "MinimapToggle";
   };
 
-  minsnip-nvim = buildVimPlugin {
-    pname = "minsnip.nvim";
-    version = "2022-01-04";
-    src = fetchFromGitHub {
-      owner = "jose-elias-alvarez";
-      repo = "minsnip.nvim";
-      rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee";
-      sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih";
-    };
-    meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
-  };
-
   minuet-ai-nvim = super.minuet-ai-nvim.overrideAttrs {
     checkInputs = [
       # optional cmp integration

From 648fd98f24f173ae814e34c7eee2eab860a51ef6 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:50:08 -0500
Subject: [PATCH 36/47] vimPlugins.phpactor: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../plugins/non-generated/phpactor/default.nix   | 16 ++++++++++++++++
 .../editors/vim/plugins/overrides.nix            | 14 --------------
 2 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix
new file mode 100644
index 000000000000..107d6ca9c353
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/phpactor/default.nix
@@ -0,0 +1,16 @@
+{
+  vimUtils,
+  phpactor,
+}:
+vimUtils.buildVimPlugin {
+  inherit (phpactor)
+    pname
+    src
+    meta
+    version
+    ;
+  postPatch = ''
+    substituteInPlace plugin/phpactor.vim \
+      --replace-fail "g:phpactorpath = expand('<sfile>:p:h') . '/..'" "g:phpactorpath = '${phpactor}'"
+  '';
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b6e73c92fa61..8cd54cbfcecd 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -40,7 +40,6 @@
   openscad,
   openssh,
   parinfer-rust,
-  phpactor,
   ranger,
   ripgrep,
   skim,
@@ -2969,19 +2968,6 @@ in
     ];
   };
 
-  phpactor = buildVimPlugin {
-    inherit (phpactor)
-      pname
-      src
-      meta
-      version
-      ;
-    postPatch = ''
-      substituteInPlace plugin/phpactor.vim \
-        --replace-fail "g:phpactorpath = expand('<sfile>:p:h') . '/..'" "g:phpactorpath = '${phpactor}'"
-    '';
-  };
-
   plantuml-nvim = super.plantuml-nvim.overrideAttrs {
     dependencies = [ self.LibDeflate-nvim ];
   };

From 4c8aa4257a925e62a8bb81332b56cc29d60610a4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:50:54 -0500
Subject: [PATCH 37/47] vimPlugins.skim: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/non-generated/skim/default.nix   | 9 +++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix      | 7 -------
 2 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix
new file mode 100644
index 000000000000..5fb2fcc5af57
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/skim/default.nix
@@ -0,0 +1,9 @@
+{
+  vimUtils,
+  skim,
+}:
+vimUtils.buildVimPlugin {
+  pname = "skim";
+  inherit (skim) version;
+  src = skim.vim;
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 8cd54cbfcecd..55d387800e86 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -42,7 +42,6 @@
   parinfer-rust,
   ranger,
   ripgrep,
-  skim,
   sqlite,
   sshfs,
   statix,
@@ -3145,12 +3144,6 @@ in
     ];
   };
 
-  skim = buildVimPlugin {
-    pname = "skim";
-    inherit (skim) version;
-    src = skim.vim;
-  };
-
   skim-vim = super.skim-vim.overrideAttrs {
     dependencies = [ self.skim ];
   };

From e90c4fcba7fa3cf4afbe280e0d9368bbae12794b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:51:36 -0500
Subject: [PATCH 38/47] vimPlugins.statix: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../plugins/non-generated/statix/default.nix    | 17 +++++++++++++++++
 .../editors/vim/plugins/overrides.nix           | 15 ---------------
 2 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix
new file mode 100644
index 000000000000..62dd5e9b9bc0
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/statix/default.nix
@@ -0,0 +1,17 @@
+{
+  vimUtils,
+  statix,
+}:
+vimUtils.buildVimPlugin rec {
+  inherit (statix) pname src meta;
+  version = "0.1.0";
+  postPatch = ''
+    # check that version is up to date
+    grep 'pname = "statix-vim"' -A 1 flake.nix \
+      | grep -F 'version = "${version}"'
+
+    cd vim-plugin
+    substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix
+    substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix
+  '';
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 55d387800e86..71b62430e031 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -44,7 +44,6 @@
   ripgrep,
   sqlite,
   sshfs,
-  statix,
   stylish-haskell,
   tabnine,
   taskwarrior2,
@@ -3260,20 +3259,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  statix = buildVimPlugin rec {
-    inherit (statix) pname src meta;
-    version = "0.1.0";
-    postPatch = ''
-      # check that version is up to date
-      grep 'pname = "statix-vim"' -A 1 flake.nix \
-        | grep -F 'version = "${version}"'
-
-      cd vim-plugin
-      substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix
-      substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix
-    '';
-  };
-
   stylish-nvim = super.stylish-nvim.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace-fail xdotool ${xdotool}/bin/xdotool

From cfe364f05574835b226a9099202006c23333728b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:52:50 -0500
Subject: [PATCH 39/47] vimPlugins.taskwarrior2: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/taskwarrior2/default.nix    | 8 ++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix       | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix
new file mode 100644
index 000000000000..0c9deecec1c0
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior2/default.nix
@@ -0,0 +1,8 @@
+{
+  vimUtils,
+  taskwarrior2,
+}:
+vimUtils.buildVimPlugin {
+  inherit (taskwarrior2) version pname;
+  src = "${taskwarrior2.src}/scripts/vim";
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 71b62430e031..533b0eed18ec 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -46,7 +46,6 @@
   sshfs,
   stylish-haskell,
   tabnine,
-  taskwarrior2,
   taskwarrior3,
   tmux,
   tup,
@@ -3332,12 +3331,6 @@ in
       maintainers = with lib.maintainers; [ fredeb ];
     };
   });
-
-  taskwarrior2 = buildVimPlugin {
-    inherit (taskwarrior2) version pname;
-    src = "${taskwarrior2.src}/scripts/vim";
-  };
-
   taskwarrior3 = buildVimPlugin {
     inherit (taskwarrior3) version pname;
     src = "${taskwarrior3.src}/scripts/vim";

From 37ffe2c9d410c1ddb27d78ef9e161b6400685118 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:52:57 -0500
Subject: [PATCH 40/47] vimPlugins.taskwarrior3: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/taskwarrior3/default.nix    | 8 ++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix       | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix
new file mode 100644
index 000000000000..0abec7239e73
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/taskwarrior3/default.nix
@@ -0,0 +1,8 @@
+{
+  vimUtils,
+  taskwarrior3,
+}:
+vimUtils.buildVimPlugin {
+  inherit (taskwarrior3) version pname;
+  src = "${taskwarrior3.src}/scripts/vim";
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 533b0eed18ec..d6f00e994604 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -46,7 +46,6 @@
   sshfs,
   stylish-haskell,
   tabnine,
-  taskwarrior3,
   tmux,
   tup,
   typescript,
@@ -3331,11 +3330,6 @@ in
       maintainers = with lib.maintainers; [ fredeb ];
     };
   });
-  taskwarrior3 = buildVimPlugin {
-    inherit (taskwarrior3) version pname;
-    src = "${taskwarrior3.src}/scripts/vim";
-  };
-
   telekasten-nvim = super.telekasten-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim

From aa88b95202fcfd930a22626bd67385c6ab54d890 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 14:54:07 -0500
Subject: [PATCH 41/47] vimPlugins.tup: move to non-generated

Looks like it was missed in `overrides.nix` when it should be in
non-generated.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/tup/default.nix | 21 +++++++++++++++++++
 .../editors/vim/plugins/overrides.nix         | 19 -----------------
 2 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix
new file mode 100644
index 000000000000..6a92e835a642
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  vimUtils,
+  tup,
+}:
+let
+  # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
+  ftdetect = builtins.toFile "tup.vim" ''
+    au BufNewFile,BufRead Tupfile,*.tup setf tup
+  '';
+in
+vimUtils.buildVimPlugin {
+  inherit (tup) pname version src;
+  preInstall = ''
+    mkdir -p vim-plugin/syntax vim-plugin/ftdetect
+    cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim
+    cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
+    cd vim-plugin
+  '';
+  meta.maintainers = with lib.maintainers; [ enderger ];
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index d6f00e994604..e51deb33832d 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -47,7 +47,6 @@
   stylish-haskell,
   tabnine,
   tmux,
-  tup,
   typescript,
   typescript-language-server,
   vim,
@@ -3587,24 +3586,6 @@ in
     dependencies = [ self.nvim-treesitter ];
   };
 
-  tup =
-    let
-      # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
-      ftdetect = builtins.toFile "tup.vim" ''
-        au BufNewFile,BufRead Tupfile,*.tup setf tup
-      '';
-    in
-    buildVimPlugin {
-      inherit (tup) pname version src;
-      preInstall = ''
-        mkdir -p vim-plugin/syntax vim-plugin/ftdetect
-        cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim
-        cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
-        cd vim-plugin
-      '';
-      meta.maintainers = with lib.maintainers; [ enderger ];
-    };
-
   typescript-nvim = super.typescript-nvim.overrideAttrs {
     checkInputs = [
       # Optional null-ls integration

From c90c292cef0253385a98c6157a853d3854dbdb27 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 30 Aug 2025 15:09:47 -0500
Subject: [PATCH 42/47] vimPlugins: shadow plugin builders in overrides.nix

We want to prevent plugins being added in `overrides.nix`. Shadow the
helper names to throw if someone tries to add them and use them in the
file.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/default.nix   | 1 -
 pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix
index 729129901315..0bf9f74f2ede 100644
--- a/pkgs/applications/editors/vim/plugins/default.nix
+++ b/pkgs/applications/editors/vim/plugins/default.nix
@@ -55,7 +55,6 @@ let
   # If additional modifications to the build process are required,
   # add to ./overrides.nix.
   overrides = callPackage ./overrides.nix {
-    inherit buildVimPlugin;
     inherit llvmPackages;
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index e51deb33832d..6baecc1ec162 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3,7 +3,6 @@
   stdenv,
   # nixpkgs functions
   buildGoModule,
-  buildVimPlugin,
   callPackage,
   fetchFromGitHub,
   fetchpatch,
@@ -131,6 +130,11 @@
 self: super:
 let
   luaPackages = neovim-unwrapped.lua.pkgs;
+
+  # Ensure the vim plugin builders are not used in this file.
+  # If they are used, these stubs will throw.
+  buildVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`";
+  buildNeoVimPlugin = throw "New plugin definitions should be done outside `overrides.nix`";
 in
 {
   corePlugins = symlinkJoin {

From ffde6c3606f31ea9452ff7a31183b9b80d4323d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 23:12:22 +0000
Subject: [PATCH 43/47] python3Packages.disposable-email-domains: 0.0.131 ->
 0.0.132

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index 47a163f942e0..7cc8b795288c 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.131";
+  version = "0.0.132";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-9TlGamU5x3MhZhm4xdCO5a342duXodIu0J2LDH5uOrY=";
+    hash = "sha256-otXbxrFu4Xf0O8OFif/JKsx5wPPtQ6PfwJ/AxtR2SJA=";
   };
 
   build-system = [

From 070e54bf8d4559acf29de588463a0a666a47dcd7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 Aug 2025 01:10:12 +0200
Subject: [PATCH 44/47] python3Packages.django-mptt: 0.17 -> 0.18

https://github.com/django-mptt/django-mptt/compare/0.17...0.18
---
 .../python-modules/django-mptt/default.nix    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index 43d4739fa016..5cd5b63a76dc 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -5,18 +5,21 @@
   hatchling,
   django,
   django-js-asset,
+  model-bakery,
+  pytestCheckHook,
+  pytest-django,
 }:
 
 buildPythonPackage rec {
   pname = "django-mptt";
-  version = "0.17";
+  version = "0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-mptt";
     repo = "django-mptt";
     rev = version;
-    hash = "sha256-fsVGwqlSZcBGXisbxTNGSwiuDOJ3DFV6MnB4h6OxkMA=";
+    hash = "sha256-UJQwjOde0DkG/Pa/pd2htnp4KEn5KwYAo8GP5A7/h+I=";
   };
 
   build-system = [ hatchling ];
@@ -28,8 +31,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mptt" ];
 
-  # No pytest checks, since they depend on model_mommy, which is deprecated
-  doCheck = false;
+  nativeCheckInputs = [
+    model-bakery
+    pytestCheckHook
+    pytest-django
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+    export PYTHONPATH=$(pwd)/tests:$PYTHONPATH
+  '';
 
   meta = with lib; {
     description = "Utilities for implementing a modified pre-order traversal tree in Django";

From c3713cbb4e78536db219301b46c2581b451c0061 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 23:07:53 +0000
Subject: [PATCH 45/47] terraform: 1.13.0 -> 1.13.1

---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index ff20618056de..135096230344 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -194,8 +194,8 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.13.0";
-    hash = "sha256-ZZFwzGCB6IS/SJQJoApC7blDhTqT9aZkeMmPimdcj7Q=";
+    version = "1.13.1";
+    hash = "sha256-PuC2wOEEMFaiR9eyF3yI6PLSkqnT/MWdy6RZo6B9zWM=";
     vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {

From cfc934a91fdc0a38ade9562bc3f7e4f8a60a150f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 31 Aug 2025 01:53:32 +0200
Subject: [PATCH 46/47] postfix-tlspol: 1.8.14 -> 1.8.15

https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.8.15
---
 pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index f938699e8f85..255922c0fcdd 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "postfix-tlspol";
-  version = "1.8.14";
+  version = "1.8.15";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-lfezkGMmdYlstchUWGoofCfJLIHOStaDwR/A5j1EOGc=";
+    hash = "sha256-DqFBXU9b6TOujG464Ww4iAA04NA5j0z9N00F7mbV92Q=";
   };
 
   vendorHash = null;

From 8488f9a28c9c54b33f4c2a27336ad20c38dfe5ae Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 31 Aug 2025 01:53:11 +0200
Subject: [PATCH 47/47] systemd-language-server: fix build

---
 pkgs/by-name/sy/systemd-language-server/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/sy/systemd-language-server/package.nix b/pkgs/by-name/sy/systemd-language-server/package.nix
index d53e998b8e12..c0b4d6587375 100644
--- a/pkgs/by-name/sy/systemd-language-server/package.nix
+++ b/pkgs/by-name/sy/systemd-language-server/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   python3Packages,
   fetchFromGitHub,
   pandoc,
@@ -21,6 +22,9 @@ python3Packages.buildPythonApplication rec {
     poetry-core
   ];
 
+  pythonRelaxDeps = [
+    "lxml"
+  ];
   dependencies = with python3Packages; [
     lxml
     pygls
@@ -33,6 +37,11 @@ python3Packages.buildPythonApplication rec {
     python3Packages.pytestCheckHook
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # TimeoutError
+    "test_hover"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = {