From ac189ae632b31e8dda3b3fb9fde91dc4414db793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolf=20Schr=C3=B6der?= <rolf.schroeder@limbus-medtec.com>
Date: Tue, 23 Sep 2025 12:14:43 +0200
Subject: [PATCH 01/62] igv: 2.17.4 -> 2.19.6

---
 pkgs/by-name/ig/igv/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ig/igv/package.nix b/pkgs/by-name/ig/igv/package.nix
index a6ea26e64824..40bb0b375c5c 100644
--- a/pkgs/by-name/ig/igv/package.nix
+++ b/pkgs/by-name/ig/igv/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  jdk17,
+  jdk21,
   testers,
   wrapGAppsHook3,
   igv,
@@ -10,10 +10,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.17.4";
+  version = "2.19.6";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
-    sha256 = "sha256-LF/rwm/XlLHAJjiAlQVTmx5l+5Np2b5rPjoCdN/qERU=";
+    sha256 = "sha256-hemTOCNBfigpvlFStBbxGGLpORYPfh6vn1pyE8hKWHw=";
   };
 
   installPhase = ''
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
     cp -Rv * $out/share/
 
     sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh
-    sed -i 's#\bjava\b#${jdk17}/bin/java#g' $out/share/igv.sh
+    sed -i 's#\bjava\b#${jdk21}/bin/java#g' $out/share/igv.sh
 
     sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools
-    sed -i 's#\bjava\b#${jdk17}/bin/java#g' $out/share/igvtools
+    sed -i 's#\bjava\b#${jdk21}/bin/java#g' $out/share/igvtools
 
     ln -s $out/share/igv.sh $out/bin/igv
     ln -s $out/share/igvtools $out/bin/igvtools

From 54129996e69e17c865cac118bf32dfed74de9d7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 12:04:58 +0000
Subject: [PATCH 02/62] python3Packages.copykitten: 1.2.3 -> 2.0.0

---
 pkgs/development/python-modules/copykitten/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/copykitten/default.nix b/pkgs/development/python-modules/copykitten/default.nix
index 53922dc8f298..d1893e67e969 100644
--- a/pkgs/development/python-modules/copykitten/default.nix
+++ b/pkgs/development/python-modules/copykitten/default.nix
@@ -8,19 +8,19 @@
 
 buildPythonPackage rec {
   pname = "copykitten";
-  version = "1.2.3";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Klavionik";
     repo = "copykitten";
     tag = "v${version}";
-    hash = "sha256-S4IPVhYk/o15LQK1AB8VpdrHwIwTZyvmI2+e27/vDLs=";
+    hash = "sha256-hjkRVX2+CuLyQw8/1cHRf84qbxPxAnDxCm5gVwdhecs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-kWhZzX/OI+05rvVFD+lOFvpKbNH/gMROFufcCzYDyko=";
+    hash = "sha256-Ujed/3vckHMkYaQ1Euj+KaPG4yeERS7HBbl5SzvbOWE=";
   };
 
   build-system = [

From ff945666f574e320e1cdd808878d2b8097a41509 Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Wed, 8 Oct 2025 10:54:37 +0400
Subject: [PATCH 03/62] globalprotect-openconnect: Fix build failure

CMake versions < 3.5 are no longer supported. Nominally pick the 3.16 as
the baseline as it is the highest version supported by the sub-projects.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
---
 .../networking/globalprotect-openconnect/default.nix   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix
index a80f06768022..fdc1814cd920 100644
--- a/pkgs/tools/networking/globalprotect-openconnect/default.nix
+++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.16")
+  ];
+
   buildInputs = [
     openconnect
     qtwebsockets
@@ -33,9 +37,11 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace GPService/gpservice.h \
-      --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect;
+      --replace-fail /usr/local/bin/openconnect ${openconnect}/bin/openconnect;
     substituteInPlace GPService/CMakeLists.txt \
-      --replace /etc/gpservice $out/etc/gpservice;
+      --replace-fail /etc/gpservice $out/etc/gpservice;
+    # Force minimum CMake version to 3.16 to avoid policy warnings
+    find . -name "CMakeLists.txt" -exec sed -i 's/cmake_minimum_required(VERSION [^)]*)/cmake_minimum_required(VERSION 3.16)/g' {} \;
   '';
 
   meta = with lib; {

From e082182f013f2364dfd50d30a1d6674500af2478 Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Wed, 8 Oct 2025 21:20:00 +1100
Subject: [PATCH 04/62] rclone-browser: fix build against CMake >= 3.5

---
 pkgs/applications/networking/sync/rclone/browser.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 272445a04753..3b6be7da5e6b 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
+  cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
+
   buildInputs = [ qtbase ];
 
   meta = with lib; {

From fe9c50a981240746b37b1d2966b4c06576278ee0 Mon Sep 17 00:00:00 2001
From: GiggleSquid <jack.connors@protonmail.com>
Date: Wed, 8 Oct 2025 05:31:19 +0100
Subject: [PATCH 05/62] libraspberrypi: 0-unstable-2022-06-16 ->
 0-unstable-2024-12-23

---
 pkgs/by-name/li/libraspberrypi/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libraspberrypi/package.nix b/pkgs/by-name/li/libraspberrypi/package.nix
index 29d689d746f2..636126e9d986 100644
--- a/pkgs/by-name/li/libraspberrypi/package.nix
+++ b/pkgs/by-name/li/libraspberrypi/package.nix
@@ -8,24 +8,26 @@
 
 stdenv.mkDerivation {
   pname = "libraspberrypi";
-  version = "0-unstable-2022-06-16";
+  version = "0-unstable-2024-12-23";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "userland";
-    rev = "54fd97ae4066a10b6b02089bc769ceed328737e0";
-    hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw==";
+    rev = "a54a0dbb2b8dcf9bafdddfc9a9374fb51d97e976";
+    hash = "sha256-Edca6nkykdXKFF5MGq6LeKirMLHTZBCbFWvHTNHMWJ4=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
+
   cmakeFlags = [
     # -DARM64=ON disables all targets that only build on 32-bit ARM; this allows
     # the package to build on aarch64 and other architectures
     "-DARM64=${if stdenv.hostPlatform.isAarch32 then "OFF" else "ON"}"
     "-DVMCS_INSTALL_PREFIX=${placeholder "out"}"
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
   ];
 
   meta = with lib; {

From 4d04fe539d724edbe3ef9c5ac86ba8cd68a99e25 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Wed, 8 Oct 2025 17:47:07 +0200
Subject: [PATCH 06/62] weylus: unstable-2025-02-24 -> unstable-2025-10-08

---
 pkgs/by-name/we/weylus/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix
index 421cde0774d3..5b7b214afecf 100644
--- a/pkgs/by-name/we/weylus/package.nix
+++ b/pkgs/by-name/we/weylus/package.nix
@@ -25,13 +25,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "weylus";
-  version = "unstable-2025-02-24";
+  version = "unstable-2025-10-08";
 
   src = fetchFromGitHub {
     owner = "H-M-H";
     repo = "weylus";
-    rev = "5202806798ccca67c24da52ba51ee50b973b7089";
-    sha256 = "sha256-lx1ZVp5DkQiL9/vw6PAZ34Lge+K8dfEVh6vLnCUNf7M=";
+    rev = "56e29ecbde3a4aba994a9df047b5398feb447c1b";
+    hash = "sha256-dHdgWrygSXqKf9fpYRVDj+Ql97Or/kjBfN/mECy2ipc=";
   };
 
   buildInputs = [
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage {
     libtool
   ];
 
-  cargoHash = "sha256-dLhlYOrLjoBSRGDJB0qTEIb+oGnp9X+ADHddpYITdl8=";
+  cargoHash = "sha256-Mx8/zMG36qztbFYgqC7SB75bf8T0NkYQA+2Hs9/pnjk=";
 
   cargoBuildFlags = [ "--features=ffmpeg-system" ];
   cargoTestFlags = [ "--features=ffmpeg-system" ];

From f761238905f9560a3c57706b62056b6bd975028e Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Tue, 23 Sep 2025 17:25:13 +1000
Subject: [PATCH 07/62] maintainers: add auscyber to maintainers

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 500b13917dc6..5763c28f1782 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2487,6 +2487,12 @@
     githubId = 574938;
     name = "Jonathan Glines";
   };
+  auscyber = {
+    email = "ivyp@outlook.com.au";
+    github = "auscyber";
+    name = "Ivy Pierlot";
+    githubId = 12080502;
+  };
   austin-artificial = {
     email = "austin.platt@artificial.io";
     github = "austin-artificial";

From 981279cac2c2ea19919dfb588d4261839aaf6acb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 15:19:41 +0000
Subject: [PATCH 08/62] vue-language-server: 3.0.7 -> 3.1.1

---
 pkgs/by-name/vu/vue-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 59b45da99668..a3118cef43b7 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -9,19 +9,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.0.7";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oiQUEUBOZrTB7BhRmc4HEGTpbOGGSCiTlO/Cn0sBNtU=";
+    hash = "sha256-/dTNfQdgDFJ8m7t8QnTghE5CGgVm0eGSriocFiEgoCw=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-BKiTGANch9phNN+zVpPzA+E4MtpM/G3yLiEQObtKLmI=";
+    hash = "sha256-BBhTx5pAM+7MlMig11fjodJ2YL1SP+zvdI0JSCLv5lo=";
   };
 
   nativeBuildInputs = [

From 0e60fbda1323ab4c9197eb56661c90894216b89e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 18:29:54 +0000
Subject: [PATCH 09/62] xpointerbarrier: 23.08 -> 25.08

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

diff --git a/pkgs/by-name/xp/xpointerbarrier/package.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix
index 425018ceb1b1..0344102d319c 100644
--- a/pkgs/by-name/xp/xpointerbarrier/package.nix
+++ b/pkgs/by-name/xp/xpointerbarrier/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpointerbarrier";
-  version = "23.08";
+  version = "25.08";
 
   src = fetchurl {
     url = "https://www.uninformativ.de/git/xpointerbarrier/archives/xpointerbarrier-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-d0PcZ4z8JgN4ncPUGeJZwIV5vB7M0Jo7o1/L6mrJtUc=";
+    hash = "sha256-63IYvTBrxT6WJwL5Ai9vFFro2j8IvUXvMy3IArYqbDw=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 8fbadfa7a4e8864d8dfcaccb667137b92fcc22a3 Mon Sep 17 00:00:00 2001
From: Curtis Chin Jen Sem <curtis.chinjensem@scrive.com>
Date: Fri, 10 Oct 2025 09:24:05 +0200
Subject: [PATCH 10/62] haskellPackages.hpqtypes: fix passing libpq as lib

---
 .../configuration-hackage2nix/broken.yaml         |  1 -
 .../transitive-broken.yaml                        |  6 ------
 .../haskell-modules/configuration-nix.nix         | 15 +++++++++++++++
 .../haskell-modules/hackage-packages.nix          |  8 --------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index e2c5b85c0483..858fdec167ff 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -2947,7 +2947,6 @@ broken-packages:
   - hpio # failure in job https://hydra.nixos.org/build/233215789 at 2023-09-02
   - hplaylist # failure in job https://hydra.nixos.org/build/233219978 at 2023-09-02
   - hpodder # failure in job https://hydra.nixos.org/build/233207276 at 2023-09-02
-  - hpqtypes # failure in job https://hydra.nixos.org/build/233256283 at 2023-09-02
   - hps-kmeans # failure in job https://hydra.nixos.org/build/233207461 at 2023-09-02
   - hPushover # failure in job https://hydra.nixos.org/build/233215804 at 2023-09-02
   - hpygments # failure in job https://hydra.nixos.org/build/233258827 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index c90f169b77bd..eee71d4e9164 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -578,8 +578,6 @@ dont-distribute-packages:
  - constraint-manip
  - constraint-reflection
  - constructible
- - consumers
- - consumers-metrics-prometheus
  - container
  - containers-accelerate
  - content-store
@@ -1620,8 +1618,6 @@ dont-distribute-packages:
  - hplayground
  - HPlot
  - HPong
- - hpqtypes-effectful
- - hpqtypes-extras
  - hprotoc
  - hprotoc-fork
  - hps
@@ -2113,9 +2109,7 @@ dont-distribute-packages:
  - local-search
  - localize
  - locked-poll
- - log
  - log-effect-syslog
- - log-postgres
  - log-utils
  - log4hs
  - logging-effect-extra
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index fef271f1fbea..afed42ac48a0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -352,6 +352,21 @@ builtins.intersectAttrs super {
   gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2;
   gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager;
 
+  hpqtypes = overrideCabal (drv: {
+    preCheck = ''
+      export postgresqlTestUserOptions="LOGIN SUPERUSER"
+      export PGDATABASE=hpqtypes
+    '';
+    testToolDepends = drv.testToolDepends or [ ] ++ [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ];
+    testTargets = [
+      "hpqtypes-tests"
+      "--test-option=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
+    ];
+  }) (super.hpqtypes.override { libpq = pkgs.libpq; });
+
   shelly = overrideCabal (drv: {
     # /usr/bin/env is unavailable in the sandbox
     preCheck = drv.preCheck or "" + ''
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 179d884b041d..7f055e85f69f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -159675,7 +159675,6 @@ self: {
       ];
       description = "Concurrent PostgreSQL data consumers";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -159713,7 +159712,6 @@ self: {
       ];
       description = "Prometheus metrics for the consumers library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -342693,8 +342691,6 @@ self: {
       ];
       description = "Haskell bindings to libpqtypes";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { inherit (pkgs) libpq; };
 
@@ -342732,7 +342728,6 @@ self: {
       ];
       description = "Adaptation of the hpqtypes library for the effectful ecosystem";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -342795,7 +342790,6 @@ self: {
       ];
       description = "Extra utilities for hpqtypes library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -426174,7 +426168,6 @@ self: {
       ];
       description = "Structured logging solution with multiple backends";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -426471,7 +426464,6 @@ self: {
       ];
       description = "Structured logging solution (PostgreSQL back end)";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 

From edb0512407198c09e03c81d74830bdb87af563e5 Mon Sep 17 00:00:00 2001
From: Curtis Chin Jen Sem <curtis.chinjensem@scrive.com>
Date: Fri, 10 Oct 2025 11:39:26 +0200
Subject: [PATCH 11/62] haskellPackages.hpqtypes-extras: run tests with pg hook

---
 .../haskell-modules/configuration-nix.nix          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index afed42ac48a0..55e392f7a724 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -352,6 +352,20 @@ builtins.intersectAttrs super {
   gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2;
   gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager;
 
+  hpqtypes-extras = overrideCabal (drv: {
+    preCheck = ''
+      export postgresqlTestUserOptions="LOGIN SUPERUSER"
+      export PGDATABASE=hpqtypes-extras
+    '';
+    testToolDepends = drv.testToolDepends or [ ] ++ [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ];
+    testTargets = [
+      "hpqtypes-extras-tests"
+      "--test-option=--connection-string=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
+    ];
+  }) super.hpqtypes-extras;
   hpqtypes = overrideCabal (drv: {
     preCheck = ''
       export postgresqlTestUserOptions="LOGIN SUPERUSER"

From 4a87fd5a1e2cc4bbf32b197127c04cebe9cb164c Mon Sep 17 00:00:00 2001
From: Curtis Chin Jen Sem <curtis.chinjensem@scrive.com>
Date: Fri, 10 Oct 2025 11:39:48 +0200
Subject: [PATCH 12/62] haskellPackages.consumers: run tests with pg hook

---
 .../haskell-modules/configuration-nix.nix     | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 55e392f7a724..a3c79a69d473 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -352,34 +352,54 @@ builtins.intersectAttrs super {
   gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2;
   gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager;
 
-  hpqtypes-extras = overrideCabal (drv: {
-    preCheck = ''
-      export postgresqlTestUserOptions="LOGIN SUPERUSER"
-      export PGDATABASE=hpqtypes-extras
-    '';
-    testToolDepends = drv.testToolDepends or [ ] ++ [
-      pkgs.postgresql
-      pkgs.postgresqlTestHook
-    ];
-    testTargets = [
-      "hpqtypes-extras-tests"
-      "--test-option=--connection-string=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
-    ];
-  }) super.hpqtypes-extras;
-  hpqtypes = overrideCabal (drv: {
-    preCheck = ''
-      export postgresqlTestUserOptions="LOGIN SUPERUSER"
-      export PGDATABASE=hpqtypes
-    '';
-    testToolDepends = drv.testToolDepends or [ ] ++ [
-      pkgs.postgresql
-      pkgs.postgresqlTestHook
-    ];
-    testTargets = [
-      "hpqtypes-tests"
-      "--test-option=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
-    ];
-  }) (super.hpqtypes.override { libpq = pkgs.libpq; });
+  consumers = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
+    overrideCabal (drv: {
+      preCheck = ''
+        export postgresqlTestUserOptions="LOGIN SUPERUSER"
+        export PGDATABASE=consumers
+      '';
+      testToolDepends = drv.testToolDepends or [ ] ++ [
+        pkgs.postgresql
+        pkgs.postgresqlTestHook
+      ];
+      testTargets = [
+        "consumers-test"
+        "--test-option=--connection-string=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
+      ];
+    }) super.consumers
+  );
+  hpqtypes-extras = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
+    overrideCabal (drv: {
+      preCheck = ''
+        export postgresqlTestUserOptions="LOGIN SUPERUSER"
+        export PGDATABASE=hpqtypes-extras
+      '';
+      testToolDepends = drv.testToolDepends or [ ] ++ [
+        pkgs.postgresql
+        pkgs.postgresqlTestHook
+      ];
+      testTargets = [
+        "hpqtypes-extras-tests"
+        "--test-option=--connection-string=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
+      ];
+    }) super.hpqtypes-extras
+  );
+  hpqtypes = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
+    overrideCabal (drv: {
+      preCheck = ''
+        export postgresqlTestUserOptions="LOGIN SUPERUSER"
+        export PGDATABASE=hpqtypes
+      '';
+      testToolDepends = drv.testToolDepends or [ ] ++ [
+        pkgs.postgresql
+        pkgs.postgresqlTestHook
+      ];
+      testTargets = [
+        "hpqtypes-tests"
+        "--test-option=\"host=$PGHOST user=$PGUSER dbname=$PGDATABASE\""
+      ];
+    }) (super.hpqtypes.override { libpq = pkgs.libpq; })
+  );
 
   shelly = overrideCabal (drv: {
     # /usr/bin/env is unavailable in the sandbox

From f90cdd76a9a004fe110c615dffab2ae68f08b31e Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Wed, 8 Oct 2025 07:04:02 -0500
Subject: [PATCH 13/62] openjk: 0-unstable-2024-04-07 -> 0-unstable-2025-10-09

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

diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix
index 5a13942c017d..eb21e40db584 100644
--- a/pkgs/by-name/op/openjk/package.nix
+++ b/pkgs/by-name/op/openjk/package.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "openjk";
-  version = "0-unstable-2024-04-07";
+  version = "0-unstable-2025-10-09";
 
   src = fetchFromGitHub {
     owner = "JACoders";
     repo = "OpenJK";
-    rev = "2815211a87ccb8de1b0ee090d429a63f47e0ac7a";
-    hash = "sha256-F3JF6jFgyMinIZ7dZAJ0ugGrJFianh2b6dX5A4iEnns=";
+    rev = "d1cb662f07dfa4c1999edfb5c1a86fd1c6285372";
+    hash = "sha256-XTGe/V4FnQSQA9fY6MmpECs1f2PPk+yTZkAL93UoH/I=";
   };
 
   dontAddPrefix = true;

From 4fe1162044b8ba25f2535eaa37f3a27a52c77bb3 Mon Sep 17 00:00:00 2001
From: Curtis Chin Jen Sem <curtis.chinjensem@scrive.com>
Date: Fri, 10 Oct 2025 15:13:19 +0200
Subject: [PATCH 14/62] haskellPackages.hpqtypes-effectful: unbreak

---
 .../haskell-modules/configuration-nix.nix     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a3c79a69d473..a79397f701b1 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -352,6 +352,7 @@ builtins.intersectAttrs super {
   gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2;
   gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager;
 
+  # These require postgres and pass the connection string manually via the CLI in tests.
   consumers = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
     overrideCabal (drv: {
       preCheck = ''
@@ -400,6 +401,26 @@ builtins.intersectAttrs super {
       ];
     }) (super.hpqtypes.override { libpq = pkgs.libpq; })
   );
+  hpqtypes-effectful = dontCheckIf pkgs.postgresqlTestHook.meta.broken (
+    overrideCabal
+      (drv: {
+        preCheck = ''
+          export postgresqlTestUserOptions="LOGIN SUPERUSER"
+          export PGDATABASE=hpqtypes-effectful
+        '';
+        testToolDepends = drv.testToolDepends or [ ] ++ [
+          pkgs.postgresql
+          pkgs.postgresqlTestHook
+        ];
+      })
+      (
+        super.hpqtypes-effectful.overrideAttrs (drv: {
+          postgresqlTestSetupPost = ''
+            export DATABASE_URL="host=$PGHOST user=$PGUSER dbname=$PGDATABASE"
+          '';
+        })
+      )
+  );
 
   shelly = overrideCabal (drv: {
     # /usr/bin/env is unavailable in the sandbox

From 6e416f8cc293e6913a4c7597ebc2207d753fc301 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 12 Oct 2025 19:09:09 +0200
Subject: [PATCH 15/62] nixos/nextcloud: drop httpd configuration from manual

Closes #243203

This hasn't changed in years because nobody maintains it. Considering
the amount of updates in the meantime to the nginx configuration, I'm
pretty sure that this doesn't work anymore.

I think it's OK to keep the part about how to really disable nginx, but
that's it.

The reason this also closes #243203 is that config in the manual saw
zero maintenance and I don't expect that to change. This should really
be maintained by interested people in a community wiki.
---
 nixos/modules/services/web-apps/nextcloud.md | 53 +-------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md
index 72cae63c8b22..e142630d8b98 100644
--- a/nixos/modules/services/web-apps/nextcloud.md
+++ b/nixos/modules/services/web-apps/nextcloud.md
@@ -232,58 +232,7 @@ By default, `nginx` is used as reverse-proxy for `nextcloud`.
 However, it's possible to use e.g. `httpd` by explicitly disabling
 `nginx` using [](#opt-services.nginx.enable) and fixing the
 settings `listen.owner` &amp; `listen.group` in the
-[corresponding `phpfpm` pool](#opt-services.phpfpm.pools).
-
-An exemplary configuration may look like this:
-```nix
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  services.nginx.enable = false;
-  services.nextcloud = {
-    enable = true;
-    hostName = "localhost";
-
-    # further, required options
-  };
-  services.phpfpm.pools.nextcloud.settings = {
-    "listen.owner" = config.services.httpd.user;
-    "listen.group" = config.services.httpd.group;
-  };
-  services.httpd = {
-    enable = true;
-    adminAddr = "webmaster@localhost";
-    extraModules = [ "proxy_fcgi" ];
-    virtualHosts."localhost" = {
-      documentRoot = config.services.nextcloud.package;
-      extraConfig = ''
-        <Directory "${config.services.nextcloud.package}">
-          <FilesMatch "\.php$">
-            <If "-f %{REQUEST_FILENAME}">
-              SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/"
-            </If>
-          </FilesMatch>
-          <IfModule mod_rewrite.c>
-            RewriteEngine On
-            RewriteBase /
-            RewriteRule ^index\.php$ - [L]
-            RewriteCond %{REQUEST_FILENAME} !-f
-            RewriteCond %{REQUEST_FILENAME} !-d
-            RewriteRule . /index.php [L]
-          </IfModule>
-          DirectoryIndex index.php
-          Require all granted
-          Options +FollowSymLinks
-        </Directory>
-      '';
-    };
-  };
-}
-```
+[`phpfpm` pool `nextcloud`](#opt-services.phpfpm.pools).
 
 ## Installing Apps and PHP extensions {#installing-apps-php-extensions-nextcloud}
 

From 82e895c6e39a46f8d550d0019c45ab87a872ca64 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 12 Oct 2025 19:24:56 +0200
Subject: [PATCH 16/62] nixos/release-notes: add notes about Nextcloud

Use the same template as every year to guide people through the upgrade.

Also, put the stuff into the NixOS release notes: the only deployment
way for the package that we truly support is via the module. I think
this shows again what a remarkably bad idea this separation is IMHO.
---
 doc/release-notes/rl-2511.section.md              | 6 ------
 nixos/doc/manual/release-notes/rl-2511.section.md | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index c1e01105f417..2c32eb82e32b 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -191,8 +191,6 @@
   of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
   make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration.
 
-- `pkgs.nextcloud30` has been removed since it's out of support upstream.
-
 - `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade.
 
 - `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.
@@ -328,7 +326,3 @@
   See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
 
 - `cloudflare-ddns`: Added package cloudflare-ddns.
-
-- `nextcloud32`: Added for the Nextcloud 32 major release.
-
-  See https://nextcloud.com/blog/nextcloud-hub25-autumn/ for more details on the new major version.
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 6f1c79dac79d..13e67bfe3244 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -304,6 +304,13 @@
 
 - `services.clamsmtp` is unmaintained and was removed from Nixpkgs.
 
+- The latest available version of Nextcloud is v32 (available as `pkgs.nextcloud32`). The installation logic is as follows:
+  - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
+  - If [`system.stateVersion`](#opt-system.stateVersion) is >=25.05, `pkgs.nextcloud32` will be installed by default.
+  - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.11, `pkgs.nextcloud31` will be installed by default.
+  - `nextcloud30` is EOL and was thus removed.
+  - Please note that an upgrade from v30 (or older) to v32 directly is not possible. Please upgrade to `nextcloud31` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud30;`](#opt-services.nextcloud.package).
+
 - `services.eris-server` was removed from Nixpkgs due to a hostile upstream.
 
 - `prosody` gained a config check option named `services.prosody.checkConfig` which runs `prosodyctl check config` and is turned on by default.

From ddb91270715c1b8d709374de01455fa3a229d2d1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 12 Oct 2025 19:26:07 +0200
Subject: [PATCH 17/62] nixos/nextcloud: remove ancient stateVersion conditions

---
 nixos/modules/services/web-apps/nextcloud.nix |  4 ---
 pkgs/top-level/aliases.nix                    | 36 -------------------
 2 files changed, 40 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index da5e02e27479..87e69c402e10 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1070,10 +1070,6 @@ in
               nextcloud defined in an overlay, please set `services.nextcloud.package` to
               `pkgs.nextcloud`.
             ''
-          else if lib.versionOlder stateVersion "24.05" then
-            pkgs.nextcloud27
-          else if lib.versionOlder stateVersion "24.11" then
-            pkgs.nextcloud29
           else if lib.versionOlder stateVersion "25.05" then
             pkgs.nextcloud30
           else if lib.versionOlder stateVersion "25.11" then
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bead703c539d..4fe5e72327d5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1850,42 +1850,6 @@ mapAliases {
     first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions!
   ''; # Added 2025-09-25
   nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
-  nextcloud29 = throw ''
-    Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
-    by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring
-
-        services.nextcloud.package = pkgs.nextcloud30;
-
-    in your NixOS config.
-
-    WARNING: if you were on Nextcloud 28 you have to upgrade to Nextcloud 29
-    first on 24.11 because Nextcloud doesn't support upgrades across multiple major versions!
-  ''; # Added 2025-04-11
-  nextcloud29Packages = throw "Nextcloud 29 is EOL!"; # Added 2025-04-11
-  nextcloud28 = throw ''
-    Nextcloud v28 has been removed from `nixpkgs` as the support for is dropped
-    by upstream in 2025-01. Please upgrade to at least Nextcloud v29 by declaring
-
-        services.nextcloud.package = pkgs.nextcloud29;
-
-    in your NixOS config.
-
-    WARNING: if you were on Nextcloud 27 you have to upgrade to Nextcloud 28
-    first on 24.11 because Nextcloud doesn't support upgrades across multiple major versions!
-  ''; # Added 2025-01-19
-  nextcloud28Packages = throw "Nextcloud 28 is EOL!"; # Added 2025-01-19
-  nextcloud27 = throw ''
-    Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped
-    by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring
-
-        services.nextcloud.package = pkgs.nextcloud28;
-
-    in your NixOS config.
-
-    WARNING: if you were on Nextcloud 26 you have to upgrade to Nextcloud 27
-    first on 24.05 because Nextcloud doesn't support upgrades across multiple major versions!
-  ''; # Added 2024-06-25
-  nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25
   nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28
   nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
   nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07

From e33e1eb73e801861d8e607256634c1f9884dc4ba Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 12 Oct 2025 19:47:59 +0200
Subject: [PATCH 18/62] postgresqlPackages.age: fix src tag

---
 pkgs/servers/sql/postgresql/ext/age.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index ff441a8851da..9a9de1d57aad 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -26,9 +26,7 @@ postgresqlBuildExtension (finalAttrs: {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "age";
-    tag = "PG${lib.versions.major postgresql.version}/v${
-      builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
-    }";
+    tag = "PG${lib.versions.major postgresql.version}/v${finalAttrs.version}";
     hash =
       hashes.${lib.versions.major postgresql.version}
       or (throw "Source for Age is not available for ${postgresql.version}");

From 080ca37e694a05217862958ad3d5e82b7d40ed6c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 12 Oct 2025 19:52:39 +0000
Subject: [PATCH 19/62] scs: 3.2.8 -> 3.2.9

Diff: https://github.com/cvxgrp/scs/compare/3.2.8...3.2.9

Changelog: https://github.com/cvxgrp/scs/releases/tag/3.2.9
---
 pkgs/by-name/sc/scs/package.nix                 | 4 ++--
 pkgs/development/python-modules/scs/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix
index a870e973f4aa..907dc200d2ae 100644
--- a/pkgs/by-name/sc/scs/package.nix
+++ b/pkgs/by-name/sc/scs/package.nix
@@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "scs";
-  version = "3.2.8";
+  version = "3.2.9";
 
   src = fetchFromGitHub {
     owner = "cvxgrp";
     repo = "scs";
     tag = finalAttrs.version;
-    hash = "sha256-BPVuihxLUuBbavKVhgdo1MdzkkDq2Nm/EYiAY/jwiqU=";
+    hash = "sha256-/PJKZvYYPHGuByIf70oa2U53fY2W46/lp+OXXBM1vTU=";
   };
 
   # Actually link and add libgfortran to the rpath
diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
index e6fe0b20db9f..e42ba01767db 100644
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     repo = "scs-python";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-Dv0LDY6JFFq/dpcDsnU+ErnHJ8RDpaNhrRjEwY31Szk=";
+    hash = "sha256-MC63xCZxJsHOiarMsQYtXljTV8xdIfJHzkUG5mV63NA=";
   };
 
   postPatch = ''

From e57e09e2b5e235b596d860f8426a50ae80352543 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 21:39:46 +0000
Subject: [PATCH 20/62] python3Packages.sensorpro-ble: 0.7.1 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix
index dec2a5b5a5ef..a8ec40c07de0 100644
--- a/pkgs/development/python-modules/sensorpro-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpro-ble/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "sensorpro-ble";
-  version = "0.7.1";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "sensorpro-ble";
     tag = "v${version}";
-    hash = "sha256-/brgy3B/Hqgu1M4xmjciXJx25btN/iFgjT0TgTdij2o=";
+    hash = "sha256-DsISsczQCGtLc15VJrZvggDZDmYNuEKkabrAHcDZmWE=";
   };
 
   build-system = [ poetry-core ];

From b01bfc078dd6ff827debaa9383cf6b64c0393ad0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 22:28:32 +0000
Subject: [PATCH 21/62] python3Packages.tilt-ble: 0.3.1 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix
index 11800b5d649b..ea8c448304f7 100644
--- a/pkgs/development/python-modules/tilt-ble/default.nix
+++ b/pkgs/development/python-modules/tilt-ble/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "tilt-ble";
-  version = "0.3.1";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "tilt-ble";
     tag = "v${version}";
-    hash = "sha256-sT8tMsA9w3HwM/wPsqKTgHWvhf83zxQ5P/bQHlqolH4=";
+    hash = "sha256-u40xpjwxOdM7FUIPQG9g8q86cZHv21HCxbtnvAAgfgU=";
   };
 
   build-system = [ poetry-core ];

From 4a883e81805c5471681781ccbf10a85ae5ed42e1 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Tue, 23 Sep 2025 17:25:42 +1000
Subject: [PATCH 22/62] karabiner-dk: init at 6.3.0

Co-authored-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/ka/karabiner-dk/package.nix | 59 ++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/ka/karabiner-dk/package.nix

diff --git a/pkgs/by-name/ka/karabiner-dk/package.nix b/pkgs/by-name/ka/karabiner-dk/package.nix
new file mode 100644
index 000000000000..1b2deda61d05
--- /dev/null
+++ b/pkgs/by-name/ka/karabiner-dk/package.nix
@@ -0,0 +1,59 @@
+{
+  libarchive,
+  xar,
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  common-updater-scripts,
+  writeShellScript,
+  curl,
+  jq,
+  driver-version ? null,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "karabiner-dk";
+  sourceVersion = "6.3.0";
+  version = lib.defaultTo finalAttrs.sourceVersion driver-version;
+
+  src = fetchFromGitHub {
+    owner = "pqrs-org";
+    repo = "Karabiner-DriverKit-VirtualHIDDevice";
+    tag = "v${finalAttrs.sourceVersion}";
+    hash = "sha256-nLu//qG3RzrEDWvNmSJH7YmgVgiTiYTg5FaliiEtdpo=";
+  };
+
+  nativeBuildInputs = [
+    libarchive
+    xar
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+    xar -xf $src/dist/Karabiner-DriverKit-VirtualHIDDevice-${finalAttrs.version}.pkg
+    zcat Payload | bsdcpio -i
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -R ./Applications ./Library $out
+    runHook postInstall
+  '';
+  dontFixup = true;
+
+  passthru.updateScript = writeShellScript "karabiner-dk" ''
+    NEW_VERSION=$(${lib.getExe curl} --silent https://api.github.com/repos/pqrs-org/Karabiner-DriverKit-VirtualHIDDevice/releases/latest $${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} | ${lib.getExe jq} '.tag_name | ltrimstr("v")' --raw-output)
+    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --ignore-same-version --version-key="sourceVersion";
+  '';
+
+  meta = {
+    changelog = "https://github.com/pqrs-org/Karabiner-DriverKit-VirtualHIDDevice/releases/tag/${finalAttrs.src.tag}";
+    description = "Virtual keyboard and virtual mouse using DriverKit on macOS";
+    homepage = "https://karabiner-elements.pqrs.org/";
+    maintainers = with lib.maintainers; [ auscyber ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})

From 704930cc5754ff6d7c63b484a4933d5c3aad9576 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Tue, 23 Sep 2025 17:52:37 +1000
Subject: [PATCH 23/62] karabiner-elements: fix notarization for driver

---
 pkgs/by-name/ka/karabiner-elements/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ka/karabiner-elements/package.nix b/pkgs/by-name/ka/karabiner-elements/package.nix
index 1377ccd15a08..19b9727940e4 100644
--- a/pkgs/by-name/ka/karabiner-elements/package.nix
+++ b/pkgs/by-name/ka/karabiner-elements/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  cpio,
+  libarchive,
   xar,
   undmg,
   nix-update-script,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    cpio
+    libarchive
     xar
     undmg
   ];
@@ -32,9 +32,9 @@ stdenv.mkDerivation (finalAttrs: {
     undmg $src
     xar -xf Karabiner-Elements.pkg
     cd Installer.pkg
-    zcat Payload | cpio -i
+    zcat Payload | bsdcpio -i
     cd ../Karabiner-DriverKit-VirtualHIDDevice.pkg
-    zcat Payload | cpio -i
+    zcat Payload | bsdcpio -i
     cd ..
   '';
 
@@ -49,13 +49,17 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out $driver
     cp -R Installer.pkg/Applications Installer.pkg/Library $out
     cp -R Karabiner-DriverKit-VirtualHIDDevice.pkg/Applications Karabiner-DriverKit-VirtualHIDDevice.pkg/Library $driver
 
     cp "$out/Library/Application Support/org.pqrs/Karabiner-Elements/package-version" "$out/Library/Application Support/org.pqrs/Karabiner-Elements/version"
+    runHook postInstall
   '';
 
+  dontFixup = true; # notarization breaks if fixup is enabled
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -63,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Powerful utility for keyboard customization on macOS Ventura (13) or later";
     homepage = "https://karabiner-elements.pqrs.org/";
     license = lib.licenses.unlicense;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ auscyber ];
     platforms = lib.platforms.darwin;
   };
 })

From fdd5c1635857215ba4dbd555d6b9e72ad063ebe5 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Tue, 23 Sep 2025 17:53:00 +1000
Subject: [PATCH 24/62] kanata: add darwinDriver output

---
 pkgs/by-name/ka/kanata/package.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 509fc4cd0a21..5fdc17192d90 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -4,20 +4,22 @@
   apple-sdk_13,
   darwinMinVersionHook,
   rustPlatform,
+  karabiner-dk,
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
   writeShellScriptBin,
   withCmd ? false,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kanata";
   version = "1.9.0";
+  darwinDriverVersion = "5.0.0"; # needs to be updated if karabiner-driverkit changes
 
   src = fetchFromGitHub {
     owner = "jtroo";
     repo = "kanata";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-xxAIwiwCQugDXpWga9bQ9ZGfem46rwDlmf64dX/tw7g=";
   };
 
@@ -47,14 +49,22 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     updateScript = nix-update-script { };
+    darwinDriver = lib.optional stdenv.hostPlatform.isDarwin (
+      karabiner-dk.override {
+        driver-version = finalAttrs.darwinDriverVersion;
+      }
+    );
   };
 
   meta = with lib; {
     description = "Tool to improve keyboard comfort and usability with advanced customization";
     homepage = "https://github.com/jtroo/kanata";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ linj ];
+    maintainers = with maintainers; [
+      linj
+      auscyber
+    ];
     platforms = platforms.unix;
     mainProgram = "kanata";
   };
-}
+})

From 8dfe5d494eb092a5f6196e6cbed776ce9ef4c9e1 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Thu, 25 Sep 2025 10:40:11 +1000
Subject: [PATCH 25/62] kanata: added update script darwinDriverVersion

---
 pkgs/by-name/ka/kanata/package.nix | 34 +++++++++++++++++++++++-------
 pkgs/by-name/ka/kanata/update.sh   |  8 +++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/ka/kanata/update.sh

diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 5fdc17192d90..6b5fd10ceb63 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -1,20 +1,24 @@
 {
   stdenv,
   lib,
+  gnused,
   apple-sdk_13,
   darwinMinVersionHook,
   rustPlatform,
   karabiner-dk,
   fetchFromGitHub,
   versionCheckHook,
-  nix-update-script,
+  common-updater-scripts,
+  yq,
+  curl,
+  jq,
+  writeShellApplication,
   writeShellScriptBin,
   withCmd ? false,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kanata";
   version = "1.9.0";
-  darwinDriverVersion = "5.0.0"; # needs to be updated if karabiner-driverkit changes
 
   src = fetchFromGitHub {
     owner = "jtroo";
@@ -48,12 +52,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = nix-update-script { };
-    darwinDriver = lib.optional stdenv.hostPlatform.isDarwin (
-      karabiner-dk.override {
-        driver-version = finalAttrs.darwinDriverVersion;
-      }
-    );
+    darwinDriverVersion = "5.0.0"; # needs to be updated if karabiner-driverkit changes
+    updateScript = lib.getExe (writeShellApplication {
+      name = "update-script-kanata";
+      runtimeInputs = [
+        curl
+        gnused
+        yq
+        jq
+        common-updater-scripts
+      ];
+      text = builtins.readFile ./update.sh;
+    });
+
+    darwinDriver =
+      if stdenv.hostPlatform.isDarwin then
+        (karabiner-dk.override {
+          driver-version = finalAttrs.passthru.darwinDriverVersion;
+        })
+      else
+        null;
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ka/kanata/update.sh b/pkgs/by-name/ka/kanata/update.sh
new file mode 100644
index 000000000000..bc78070bb66b
--- /dev/null
+++ b/pkgs/by-name/ka/kanata/update.sh
@@ -0,0 +1,8 @@
+NEW_VERSION="$(curl --silent https://api.github.com/repos/jtroo/kanata/releases/latest  ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""}  | jq '.tag_name | ltrimstr("v")' --raw-output)"
+update-source-version "kanata" "$NEW_VERSION" --ignore-same-version
+karabinerDriverCrateVersion="$(curl -L "https://raw.githubusercontent.com/jtroo/kanata/refs/tags/v$NEW_VERSION/Cargo.lock" | tomlq | jq --raw-output '.package[] | select(.name |  test("karabiner-driverkit")) |.version')"
+newKarabinerDkVersion="$(curl -L "https://crates.io/api/v1/crates/karabiner-driverkit/$karabinerDriverCrateVersion/download" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)"
+importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)"
+oldDarwinVersion=$(nix-instantiate --eval -E "with $importTree; kanata.passthru.darwinDriverVersion" | tr -d '"')
+nixFile=$(nix-instantiate --eval --strict -A "kanata.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+sed -i "$nixFile" -re "s|\"$oldDarwinVersion\"|\"$newKarabinerDkVersion\"|"

From 308a224f9c1ec17d009bd36ae8e36235ea10fde9 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Thu, 2 Oct 2025 11:59:40 +1000
Subject: [PATCH 26/62] haskellPackages.kmonad: add darwinDriver

---
 pkgs/development/haskell-modules/configuration-nix.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index fef271f1fbea..07e1f2b1c04b 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1865,7 +1865,12 @@ builtins.intersectAttrs super {
   kmonad = lib.pipe super.kmonad [
     enableSeparateBinOutput
     (overrideCabal (drv: {
-      passthru = lib.recursiveUpdate drv.passthru or { } { tests.nixos = pkgs.nixosTests.kmonad; };
+      passthru = lib.recursiveUpdate drv.passthru or { } {
+        darwinDriver = pkgs.karabiner-dk.override {
+          driver-version = "5.0.0";
+        };
+        tests.nixos = pkgs.nixosTests.kmonad;
+      };
     }))
   ];
 

From 2db6f4e8a8cfe3e751c2744b749e723f9aa3aa9c Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Thu, 9 Oct 2025 13:16:36 +1100
Subject: [PATCH 27/62] haskellPackages.kmonad: add auscyber as maintainer

---
 .../haskell-modules/configuration-hackage2nix/main.yaml         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index a44decc86752..977e75c6aa59 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -196,6 +196,8 @@ package-maintainers:
     - hevm
   athas:
     - futhark
+  auscyber:
+    - kmonad
   bdesham:
     - pinboard-notes-backup
   berberman:

From 50ceb9241aafb60c0fb405f567fbb32b7d17b655 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Oct 2025 09:02:00 +0200
Subject: [PATCH 28/62] python313Packages.tilt-ble: modernize

---
 pkgs/development/python-modules/tilt-ble/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix
index ea8c448304f7..116153fc3cbf 100644
--- a/pkgs/development/python-modules/tilt-ble/default.nix
+++ b/pkgs/development/python-modules/tilt-ble/default.nix
@@ -7,7 +7,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "tilt-ble";
@@ -43,7 +40,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for Tilt BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/tilt-ble";
-    changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/v${version}";
+    changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 4130914dfb0cb7b7e7b797d2a1ed9fdff17d1fa0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Oct 2025 09:02:48 +0200
Subject: [PATCH 29/62] python313Packages.sensorpro-ble: remove disabled

Removed dependency on pythonOlder for version check.
---
 pkgs/development/python-modules/sensorpro-ble/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix
index a8ec40c07de0..028c78b11b39 100644
--- a/pkgs/development/python-modules/sensorpro-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpro-ble/default.nix
@@ -7,7 +7,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "sensorpro-ble";

From 7558faa72ec790b031491c0b331ae6060c49f4e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 07:09:48 +0000
Subject: [PATCH 30/62] vscode-extensions.catppuccin.catppuccin-vsc-icons:
 1.24.0 -> 1.26.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 82fdab6cd0eb..9a962cd3935f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -885,8 +885,8 @@ let
           mktplcRef = {
             name = "catppuccin-vsc-icons";
             publisher = "catppuccin";
-            version = "1.24.0";
-            hash = "sha256-2M7N4Ccw9FAaMmG36hGHi6i0i1qR+uPCSgXELAA03Xk=";
+            version = "1.26.0";
+            hash = "sha256-V1ZhNtCouo0EDrblvoZsiMy7BPPSGdOn5SoZl4kA/z0=";
           };
           meta = {
             changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog";

From 2ac870b95e5bc60a53d2b3380a664bf069102ecd Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Mon, 13 Oct 2025 09:16:01 +0200
Subject: [PATCH 31/62] freetube: 0.23.9 -> 0.23.10

Changelog:
https://github.com/FreeTubeApp/FreeTube/releases/tag/v0.23.10-beta
Diff:
https://github.com/FreeTubeApp/FreeTube/compare/v0.23.9-beta...v0.23.10-beta
---
 pkgs/by-name/fr/freetube/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index 9998e5b4fb14..341113e98271 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.23.9";
+  version = "0.23.10";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-KTVGmYlDOqugTbC4YQcoTUW+Ja9y1H6mwULrMkZVI0Y=";
+    hash = "sha256-Q2CRqp8vdbfORwjNC5Fxx5bRk24VHObrSVTz/loKH5Y=";
   };
 
   # Darwin requires writable Electron dist
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-CnOxWA36D9x+p/Xx6sE865MSyTgPt054SX+ASr9K7zI=";
+    hash = "sha256-sM9CkDnATSEUf/uuUyT4JuRmjzwa1WzIyNYEw69MPtU=";
   };
 
   nativeBuildInputs = [

From 60a1fab1e92a35698ceb2d273cc50c20ae7ab5ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 07:32:24 +0000
Subject: [PATCH 32/62] fosrl-olm: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix
index f27e7d50aed8..61d7c56dc058 100644
--- a/pkgs/by-name/fo/fosrl-olm/package.nix
+++ b/pkgs/by-name/fo/fosrl-olm/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "olm";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "olm";
     tag = version;
-    hash = "sha256-Lv04rPZUz2thSs6/CgIj16YNKgRzeb4M4uGKGhAS4Kc=";
+    hash = "sha256-Uh6II/YUZs36FsfhdunKz3l7Cvs0PEt87oFQFEEfVIY=";
   };
 
-  vendorHash = "sha256-4j7l1vvorcdbHE4XXOUH2MaOSIwS70l8w7ZBmp3a/XQ=";
+  vendorHash = "sha256-ycTqoP2mVYwoTj5vKvKmfbjHWElGzjbv+6oxibMTuaM=";
 
   ldflags = [
     "-s"

From 4dc17c928dc4bc1a39c8f052d50fb80bed463612 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 13 Oct 2025 09:40:29 +0200
Subject: [PATCH 33/62] postgresqlPackages.age: fix evaling of meta

In cases where src was a throw, meta failed to eval fixing this by not referencing src in meta.
---
 pkgs/servers/sql/postgresql/ext/age.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index 9a9de1d57aad..82b403081873 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -74,7 +74,7 @@ postgresqlBuildExtension (finalAttrs: {
     broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes);
     description = "Graph database extension for PostgreSQL";
     homepage = "https://age.apache.org/";
-    changelog = "https://github.com/apache/age/raw/v${finalAttrs.src.rev}/RELEASE";
+    changelog = "https://github.com/apache/age/raw/PG${lib.versions.major postgresql.version}/v${finalAttrs.version}/RELEASE";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.asl20;

From 01238f33ac76d13e8b45fce3f995886c478de395 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 12 Oct 2025 19:51:01 +0200
Subject: [PATCH 34/62] postgresql{16,17}Packages.age: 1.5.0-rc0 -> 1.6.0-rc0

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

diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index 82b403081873..0a72416bef29 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -11,9 +11,10 @@
 
 let
   hashes = {
-    # Issue tracking PostgreSQL 17 support: https://github.com/apache/age/issues/2111
-    # "17" = "";
-    "16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw=";
+    # Issue tracking PostgreSQL 18 support: https://github.com/apache/age/issues/2164
+    # "18" = "";
+    "17" = "sha256-gqoAhVqQaDhe5CIcTc//1HonQLP1zoBIGuCQuXsJy+A=";
+    "16" = "sha256-iukdi2c3CukGvjuTojybFFAZBlAw8GEfzFPr2qJuwTA=";
     "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM=";
     "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E=";
     "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw=";
@@ -21,7 +22,7 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "age";
-  version = "1.5.0-rc0";
+  version = if lib.versionAtLeast postgresql.version "16" then "1.6.0-rc0" else "1.5.0-rc0";
 
   src = fetchFromGitHub {
     owner = "apache";

From aeafd2929e46ff7876b93a1eb1c17a6b2a8b7088 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 8 Oct 2025 14:28:52 +0200
Subject: [PATCH 35/62] teeworlds: fix for CMake v4

Co-authored-by: Luflosi <15217907+Luflosi@users.noreply.github.com>
---
 pkgs/by-name/te/teeworlds/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix
index 2ed6cf0fb744..373e85eaa889 100644
--- a/pkgs/by-name/te/teeworlds/package.nix
+++ b/pkgs/by-name/te/teeworlds/package.nix
@@ -40,6 +40,12 @@ stdenv.mkDerivation rec {
       url = "https://salsa.debian.org/games-team/teeworlds/-/raw/a6c4b23c1ce73466e6d89bccbede70e61e8c9cba/debian/patches/CVE-2021-43518.patch";
       hash = "sha256-2MmsucaaYjqLgMww1492gNmHmvBJm/NED+VV5pZDnBY=";
     })
+    # Fix for CMake v4
+    # ref. https://github.com/teeworlds/teeworlds/pull/2821 merged upstream
+    (fetchpatch {
+      url = "https://github.com/teeworlds/teeworlds/commit/23f33517b4b0621253862b559f6ed0cd0146bae2.patch";
+      hash = "sha256-RZvq/my7N68Kea26WuzLmyaTNOm5eZL5Gw9SGYpTeoQ=";
+    })
   ];
 
   postPatch = ''

From 5f26a661af69d3ba5414f519f902cb070bfa9b6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 08:01:48 +0000
Subject: [PATCH 36/62] smpmgr: 0.13.2 -> 0.14.0

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

diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix
index 8b9800cbe0e1..d5f5cd9df9df 100644
--- a/pkgs/by-name/sm/smpmgr/package.nix
+++ b/pkgs/by-name/sm/smpmgr/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "smpmgr";
-  version = "0.13.2";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpmgr";
     tag = version;
-    hash = "sha256-0yb6PNrC6+u/iX/5xVvXq5gdLF7Hol8VOsmY22Ka8B8=";
+    hash = "sha256-u69gREyOjQEh5C9XncEXZHvt/wU+WKeGA9/kC0hw4Q0=";
   };
 
   build-system = with python3Packages; [

From b8758c3592598dbd7acefc495c4cf31e510d7be3 Mon Sep 17 00:00:00 2001
From: 0xb10c <b10c@b10c.me>
Date: Mon, 22 Sep 2025 09:37:47 +0200
Subject: [PATCH 37/62] bitcoind: 29.1 -> 30.0

https://groups.google.com/g/bitcoindev/c/44rT5evWVxI

- `db48` is dropped as "legacy" wallet support using db48 has been removed
- `capnnproto` is added for the multiprocess functionallity
- `libsForQt5` -> `qt6Packages` as the GUI is now using Qt6
---
 pkgs/applications/blockchains/bitcoin/default.nix | 15 ++++++---------
 pkgs/top-level/all-packages.nix                   |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 2a1b52daceb7..a2a9889007a0 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -12,10 +12,10 @@
   libevent,
   zeromq,
   zlib,
-  db48,
   sqlite,
   qrencode,
   libsystemtap,
+  capnproto,
   qtbase ? null,
   qttools ? null,
   python3,
@@ -45,14 +45,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = if withGui then "bitcoin" else "bitcoind";
-  version = "29.1";
+  version = "30.0";
 
   src = fetchurl {
     urls = [
       "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"
     ];
     # hash retrieved from signed SHA256SUMS
-    sha256 = "067f624ae273b0d85a1554ffd7c098923351a647204e67034df6cc1dfacfa06b";
+    sha256 = "9b472a4d51dfed9aa9d0ded2cb8c7bcb9267f8439a23a98f36eb509c1a5e6974";
   };
 
   nativeBuildInputs = [
@@ -71,11 +71,10 @@ stdenv.mkDerivation (finalAttrs: {
     libevent
     zeromq
     zlib
+    capnproto
   ]
   ++ lib.optionals enableTracing [ libsystemtap ]
   ++ lib.optionals withWallet [ sqlite ]
-  # building with db48 (for legacy descriptor wallet support) is broken on Darwin
-  ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ]
   ++ lib.optionals withGui [
     qrencode
     qtbase
@@ -93,12 +92,12 @@ stdenv.mkDerivation (finalAttrs: {
 
       checksums = fetchurl {
         url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-teQ02vm875Isks9sBC2HV3Zo78W+UkXGH9zgyNhOnQs=";
+        hash = "sha256-v/b1wTOreKifpWkIrUEJsGaSo7LFs4pn7YgBN88dO9o=";
       };
 
       signatures = fetchurl {
         url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-hyk57QyGJnrjuuGRmvfOhVAx9Nru93e8bfah5fSVcmg=";
+        hash = "sha256-MK37HyHAqp/vWLjKm/3HF0LkTXtKQwqz6cL4hY2YUPU=";
       };
 
       verifyBuilderKeys =
@@ -151,8 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "BUILD_BENCH" false)
     (lib.cmakeBool "WITH_ZMQ" true)
-    # building with db48 (for legacy wallet support) is broken on Darwin
-    (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin))
     (lib.cmakeBool "WITH_USDT" enableTracing)
   ]
   ++ lib.optionals (!finalAttrs.doCheck) [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4396829efcb..e1d6effc221a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13500,7 +13500,7 @@ with pkgs;
     withGui = false;
   };
 
-  bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
+  bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin {
     withGui = true;
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From 6e34173083e67da18bf3d12ec33d348d676c8c5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 08:32:05 +0000
Subject: [PATCH 38/62] home-manager: 0-unstable-2025-09-26 ->
 0-unstable-2025-10-12

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

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 056625fc182f..cd9fa500ef1b 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-09-26";
+  version = "0-unstable-2025-10-12";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "497e2bfa8a45bebe9788e2aa13e766e6a96677cd";
-    hash = "sha256-i4vGfcRJpLIWjWzXPzsyhP4cCPJu1bzoY0eMGxRK5SI=";
+    rev = "e121f3773fa596ecaba5b22e518936a632d72a90";
+    hash = "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=";
   };
 
   nativeBuildInputs = [

From d4d2689fc05595eaaceebb41ad17c95d03b992f2 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 10 Oct 2025 20:44:06 +0800
Subject: [PATCH 39/62] claude-code-router: init at 1.0.59

---
 .../by-name/cl/claude-code-router/package.nix | 115 ++++++++++++++++++
 .../cl/claude-code-router/pnpm-lock.patch     |  90 ++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100644 pkgs/by-name/cl/claude-code-router/package.nix
 create mode 100644 pkgs/by-name/cl/claude-code-router/pnpm-lock.patch

diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix
new file mode 100644
index 000000000000..435a85ea4cb5
--- /dev/null
+++ b/pkgs/by-name/cl/claude-code-router/package.nix
@@ -0,0 +1,115 @@
+{
+  buildNpmPackage,
+  esbuild,
+  fetchFromGitHub,
+  lib,
+  makeBinaryWrapper,
+  nodejs_24,
+  pnpm_9,
+  versionCheckHook,
+}:
+let
+  buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_24; };
+in
+buildNpmPackage' (finalAttrs: {
+  pname = "claude-code-router";
+  version = "1.0.59";
+
+  src = fetchFromGitHub {
+    owner = "musistudio";
+    repo = "claude-code-router";
+    rev = "4617d66492cf37539d9567044f6ffec7844af2ee";
+    hash = "sha256-LC1JIOLaNLYNIIDofgFj+is4mwLjRjD3aAOt/nHRUmo=";
+  };
+
+  patches = [
+    # pnpm install --fix-lockfile --lockfile-only
+    ./pnpm-lock.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace src/cli.ts \
+      --replace-fail '"node"' '"${lib.getExe nodejs_24}"'
+  '';
+
+  npmDeps = null;
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs) pname src patches;
+    fetcherVersion = 2;
+    hash = "sha256-aPAY7JhzzYQero8f0/w3jtf5IwpDnoZCXGQKzRbj9aU=";
+  };
+
+  nativeBuildInputs = [
+    esbuild
+    makeBinaryWrapper
+    pnpm_9.configHook
+  ];
+
+  npmConfigHook = pnpm_9.configHook;
+
+  buildPhase = ''
+    runHook preBuild
+
+    esbuild src/cli.ts --bundle --platform=node --outfile=dist/cli.js
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/claude-code-router/dist
+    cp dist/cli.js $out/lib/claude-code-router/dist/
+    cp node_modules/tiktoken/tiktoken_bg.wasm $out/lib/claude-code-router/dist/
+    cp ${finalAttrs.passthru.ui}/index.html $out/lib/claude-code-router/dist/
+
+    mkdir -p $out/bin
+    makeBinaryWrapper ${lib.getExe nodejs_24} $out/bin/ccr \
+      --add-flags "$out/lib/claude-code-router/dist/cli.js"
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-v";
+
+  passthru.ui = buildNpmPackage' (finalAttrs': {
+    pname = finalAttrs.pname + "-ui";
+    inherit (finalAttrs) version src;
+
+    sourceRoot = "${finalAttrs'.src.name}/ui";
+
+    npmDeps = null;
+    pnpmDeps = pnpm_9.fetchDeps {
+      inherit (finalAttrs') pname src sourceRoot;
+      fetcherVersion = 2;
+      hash = "sha256-ZjYLUec9EADQmKfju8hMbq0y4f1TDVwjbe3yw8Gh4Ac=";
+    };
+
+    nativeBuildInputs = [
+      pnpm_9.configHook
+    ];
+
+    npmConfigHook = pnpm_9.configHook;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp dist/index.html $out/
+
+      runHook postInstall
+    '';
+  });
+
+  meta = {
+    description = "Tool to route Claude Code requests to different models and customize any request";
+    homepage = "https://github.com/musistudio/claude-code-router";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      prince213
+    ];
+    mainProgram = "ccr";
+  };
+})
diff --git a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch b/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch
new file mode 100644
index 000000000000..b060b630d425
--- /dev/null
+++ b/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch
@@ -0,0 +1,90 @@
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
+@@ -356,6 +356,12 @@
+     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+     engines: {node: '>= 8'}
+ 
++  '@types/mute-stream@0.0.4':
++    resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==}
++
++  '@types/node@22.18.9':
++    resolution: {integrity: sha512-5yBtK0k/q8PjkMXbTfeIEP/XVYnz1R9qZJ3yUicdEW7ppdDJfe+MqXEhpqDL3mtn4Wvs1u0KLEG0RXzCgNpsSg==}
++
+   '@types/node@24.7.0':
+     resolution: {integrity: sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==}
+ 
+@@ -904,6 +910,9 @@
+     resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
+     engines: {node: '>=10'}
+ 
++  safer-buffer@2.1.2:
++    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
++
+   secure-json-parse@4.1.0:
+     resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==}
+ 
+@@ -1026,11 +1035,18 @@
+   tr46@0.0.3:
+     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+ 
++  type-fest@0.21.3:
++    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
++    engines: {node: '>=10'}
++
+   typescript@5.9.3:
+     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+     engines: {node: '>=14.17'}
+     hasBin: true
+ 
++  undici-types@6.21.0:
++    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
++
+   undici-types@7.14.0:
+     resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==}
+ 
+@@ -1253,7 +1269,7 @@
+       '@inquirer/figures': 1.0.13
+       '@inquirer/type': 2.0.0
+       '@types/mute-stream': 0.0.4
+-      '@types/node': 22.18.8
++      '@types/node': 22.18.9
+       '@types/wrap-ansi': 3.0.0
+       ansi-escapes: 4.3.2
+       cli-width: 4.1.0
+@@ -1386,6 +1402,14 @@
+       '@nodelib/fs.scandir': 2.1.5
+       fastq: 1.19.1
+ 
++  '@types/mute-stream@0.0.4':
++    dependencies:
++      '@types/node': 24.7.0
++
++  '@types/node@22.18.9':
++    dependencies:
++      undici-types: 6.21.0
++
+   '@types/node@24.7.0':
+     dependencies:
+       undici-types: 7.14.0
+@@ -1956,6 +1980,8 @@
+ 
+   safe-stable-stringify@2.5.0: {}
+ 
++  safer-buffer@2.1.2: {}
++
+   secure-json-parse@4.1.0: {}
+ 
+   semver@5.7.2: {}
+@@ -2054,8 +2080,12 @@
+ 
+   tr46@0.0.3: {}
+ 
++  type-fest@0.21.3: {}
++
+   typescript@5.9.3: {}
+ 
++  undici-types@6.21.0: {}
++
+   undici-types@7.14.0: {}
+ 
+   undici@7.16.0: {}

From cf2fb58f06bcabc402d0219168b56bd3ec9f0cd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 08:46:17 +0000
Subject: [PATCH 40/62] python3Packages.mcpadapt: 0.1.16 -> 0.1.17

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

diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix
index ba063628092f..52e668a6e2b8 100644
--- a/pkgs/development/python-modules/mcpadapt/default.nix
+++ b/pkgs/development/python-modules/mcpadapt/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "mcpadapt";
-  version = "0.1.16";
+  version = "0.1.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "grll";
     repo = "mcpadapt";
     tag = "v${version}";
-    hash = "sha256-uhphBJ9gab/5i8rTnEzfhCm0caJ756XdGqJeHoHP0tM=";
+    hash = "sha256-pnMtCvspfrKwqhNyCelesBSxuPh9Ruc26pzqfWElvsE=";
   };
 
   build-system = [ hatchling ];

From 87701a60d62d7425489bf561090c29c6ebb8dceb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 08:54:21 +0000
Subject: [PATCH 41/62] mcp-grafana: 0.7.0 -> 0.7.3

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

diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index edee86724af3..28e84b0bc758 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.7.0";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uI8KlmgWcXYQwo2Wwx4NkZ+AyWibpi0VAjFeRLDp/cs=";
+    hash = "sha256-rRrBrSQ0/bOrRkcH5/SBIHVY9u/Ddm4GmxTJUTZM77o=";
   };
 
-  vendorHash = "sha256-W33myluCqCt1QHU+Fpd954Gxvum8ktQ/IZODxaFhk/k=";
+  vendorHash = "sha256-FDwVtI+RQuwNQE8pty+vJXW13ZSG4P9GZkm967LJct8=";
 
   ldflags = [
     "-s"

From dc53b6976a6b4e5e48a968f886cc5462df34651c Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Mon, 13 Oct 2025 10:30:32 +0200
Subject: [PATCH 42/62] audit: disable python on different cpu bits

Python wants the cpu to have the same bit size, otherwise the build
fails with `error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."`
---
 pkgs/by-name/au/audit/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 215cda4ba459..7395ada94e13 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -16,7 +16,9 @@
   gnugrep,
   coreutils,
 
-  enablePython ? !stdenv.hostPlatform.isStatic,
+  enablePython ?
+    !stdenv.hostPlatform.isStatic
+    && stdenv.hostPlatform.parsed.cpu.bits == stdenv.buildPlatform.parsed.cpu.bits,
 
   # passthru
   nix-update-script,

From 503c5f040d761cd757519656365ca0141ec9f5f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 09:19:30 +0000
Subject: [PATCH 43/62] pure-prompt: 1.23.0 -> 1.24.0

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

diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix
index 036dd69c7fc3..889fe0c5a4f4 100644
--- a/pkgs/by-name/pu/pure-prompt/package.nix
+++ b/pkgs/by-name/pu/pure-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pure-prompt";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
     rev = "v${version}";
-    sha256 = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
+    sha256 = "sha256-LfrZUv0UMVyygPd1RAv2EIWEvds2n0iEG8G2q7h5izM=";
   };
 
   strictDeps = true;

From 9f2a1e889131205a64ebf82ae9cf3830e316c391 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 09:30:36 +0000
Subject: [PATCH 44/62] python3Packages.sphinx-last-updated-by-git:
 0.3.8-unstable-2025-08-26 -> 0.3.8

---
 .../python-modules/sphinx-last-updated-by-git/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
index 282fb5031ac1..066abf244999 100644
--- a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
+++ b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
@@ -12,7 +12,7 @@
 }:
 buildPythonPackage rec {
   pname = "sphinx-last-updated-by-git";
-  version = "0.3.8-unstable-2025-08-26";
+  version = "0.3.8";
   pyproject = true;
 
   src = fetchFromGitHub {

From 2eb77edc4b7c9581910cf7dbe03d9b716b4bf2d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 09:33:52 +0000
Subject: [PATCH 45/62] stackit-cli: 0.43.0 -> 0.44.0

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

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index f6605fceeb3b..318c7ef77680 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-HguX19WOiVKoMCYg85ODEzswCsSFvcRCfQnyCt0Tky4=";
+    hash = "sha256-eIh65Xc4TnCX9iNi5tQkfLmnILKXLfmWl8JGASC0c4U=";
   };
 
-  vendorHash = "sha256-mXq96NELJS6ksadE/ImiN8LgYnmR1STQl1INQV+iKUI=";
+  vendorHash = "sha256-2dhc4RpT5ceEBeS/VkuNR9ll7lZ9N/QlkvCCOtVO5XM=";
 
   subPackages = [ "." ];
 

From bcf3d9a08d2e0976d1250fd0a4a5eaa7d8b04188 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 13 Oct 2025 09:40:32 +0000
Subject: [PATCH 46/62] python3Packages.lightgbm: fix dll discovery

---
 pkgs/development/python-modules/lightgbm/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index a1d1b3663c29..c7f154d8a9c8 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -55,6 +55,18 @@ buildPythonPackage rec {
     hash = "sha256-yxxZcg61aTicC6dNFPUjUbVzr0ifIwAyocnzFPi6t/4=";
   };
 
+  # Patch dll search path to fix proper discovery of lib_lightgbm.so
+  #   Exception: Cannot find lightgbm library file in following paths:
+  # /nix/store/...-python3.13-lightgbm-4.6.0/lib/python3.13/site-packages/lib_lightgbm.so
+  # /nix/store/...-python3.13-lightgbm-4.6.0/lib/python3.13/site-packages/lightgbm/bin/lib_lightgbm.so
+  # /nix/store/...-python3.13-lightgbm-4.6.0/lib/python3.13/site-packages/lightgbm/lib/lib_lightgbm.so
+  postPatch = ''
+    substituteInPlace lightgbm/libpath.py \
+      --replace-fail \
+        'curr_path.parents[0] / "lib",' \
+        'curr_path.parents[1] / "lib",'
+  '';
+
   build-system = [
     scikit-build-core
   ];

From 8710252a81aeb02b5cf0d072b9d5d0676ff364a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 09:50:10 +0000
Subject: [PATCH 47/62] vscode-extensions.ms-ceintl.vscode-language-pack-fr:
 1.104.2025091009 -> 1.105.2025100809

---
 .../vscode/extensions/language-packs.nix      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix
index bc4f4d12a55f..050d388b5c6f 100644
--- a/pkgs/applications/editors/vscode/extensions/language-packs.nix
+++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix
@@ -13,7 +13,7 @@ let
   buildVscodeLanguagePack =
     {
       language,
-      version ? "1.104.2025091009",
+      version ? "1.105.2025100809",
       hash,
     }:
     buildVscodeMarketplaceExtension {
@@ -41,71 +41,71 @@ in
   # French
   vscode-language-pack-fr = buildVscodeLanguagePack {
     language = "fr";
-    hash = "sha256-7/TiCJ+PhrUpCLznMpxN10GpCObi4gclYz87vOsU2yI=";
+    hash = "sha256-HFpkXUYz7//5KlKe1NjiT/KBFBar9H5ivpltqGOTHJo=";
   };
   # Italian
   vscode-language-pack-it = buildVscodeLanguagePack {
     language = "it";
-    hash = "sha256-94b/U8yLMlomLx/zi9L/2yOZTb51OIqRgT1Z/xADzG0=";
+    hash = "sha256-YD1jTB9VzWF51QaFPRsEBC1pMkgrs2cl0HFA/PFz3ro=";
   };
   # German
   vscode-language-pack-de = buildVscodeLanguagePack {
     language = "de";
-    hash = "sha256-jUDGqsXZpHeKr+xgSwNYWKJTKs/3axV7o8iv7xlxP9w=";
+    hash = "sha256-hIw0nFdYgcyOuJW8k7HRS0sKc0Gsuh7YWyLwQ3Z1FkU=";
   };
   # Spanish
   vscode-language-pack-es = buildVscodeLanguagePack {
     language = "es";
-    hash = "sha256-hXOdM867rympTOJJh3v8y6B6FIez3+jhQa4kqL2p+98=";
+    hash = "sha256-iO+1Lq/vXkMCGNnj9CovBhLPtbuJtGHSfQnjXypRBcw=";
   };
   # Russian
   vscode-language-pack-ru = buildVscodeLanguagePack {
     language = "ru";
-    hash = "sha256-Qt4V5ro1YvZkSkk2mxB/HLXsI3ewmmKor2ZxsMDAHRg=";
+    hash = "sha256-HxTStM+g/XKJH1twNYMu/V7IM7vBlYF4mfcemV+oOQI=";
   };
   # Chinese (Simplified)
   vscode-language-pack-zh-hans = buildVscodeLanguagePack {
     language = "zh-hans";
-    hash = "sha256-IBXnZNAorbFVu68UOwaGyVBNyPTILYgEZBy6k/EUNjA=";
+    hash = "sha256-nCPu7pEXpM22M+2IMtuPgxzyEF3R6MPm2CVZAccPdAU=";
   };
   # Chinese (Traditional)
   vscode-language-pack-zh-hant = buildVscodeLanguagePack {
     language = "zh-hant";
-    hash = "sha256-iy3+HNkRFwJps/hqQMUjQfWxULewhF+sV1qg8BrMmQo=";
+    hash = "sha256-JKKqrwGn/EMDMot1cIgLpekUVQf4IY+snENeKoE5jYU=";
   };
   # Japanese
   vscode-language-pack-ja = buildVscodeLanguagePack {
     language = "ja";
-    hash = "sha256-wZgMj8mmg8lIxX3JCi2fwS0l3/tSrOWuQpuTsW+J4wg=";
+    hash = "sha256-6OWcr/XnJsOvRFho+P5Z+ppuAC8d08I3s0YWnLhH874=";
   };
   # Korean
   vscode-language-pack-ko = buildVscodeLanguagePack {
     language = "ko";
-    hash = "sha256-5GL95M9y60PjgNL7x/9JthV/g6+okoxT0uwmf/qPvqQ=";
+    hash = "sha256-VqlAaS679KF0ZKlzDT55FIu5GKyzU41y1ptX7t88UHc=";
   };
   # Czech
   vscode-language-pack-cs = buildVscodeLanguagePack {
     language = "cs";
-    hash = "sha256-PzhBxDl2X1LStXMHgqMPzl9v7XJ9VuL/8sCsdJ4mFfA=";
+    hash = "sha256-yFtp+XK7Y2Fi/uYqsh88d3hCRcQJhJOLWvs2pQ05ddo=";
   };
   # Portuguese (Brazil)
   vscode-language-pack-pt-br = buildVscodeLanguagePack {
     language = "pt-BR";
-    hash = "sha256-a8eGCArxLbMdQjpRBtcZJ8xlp9+Mbabiy6/v3/HANTQ=";
+    hash = "sha256-2zM8E832ioa6fqnWzPq+PA/eiEAo8FDNNH/4HJPZIcI=";
   };
   # Turkish
   vscode-language-pack-tr = buildVscodeLanguagePack {
     language = "tr";
-    hash = "sha256-ZE9RXpV+k/7KcKlpE8AwW+3y2tupARhXTnucKfM304I=";
+    hash = "sha256-7ghSb/sQM64wfsRRtS+quAqJEvUdIXAcPCQKJbsDXKc=";
   };
   # Polish
   vscode-language-pack-pl = buildVscodeLanguagePack {
     language = "pl";
-    hash = "sha256-V6E5BsIRIPkZhq3g7F65/ml02HibeZyIs17R4TtJQU0=";
+    hash = "sha256-/joZpsIAY9Ut67wAbzNTraBgBgtjDAeRoq8PUbP3rSc=";
   };
   # Pseudo Language
   vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
     language = "qps-ploc";
-    hash = "sha256-Tzqd6BJDGSxtxbZodWvBS64FIvxOmP5SaB+iAl3kU5w=";
+    hash = "sha256-xERSh5N5Mbyc977ji0n91ra0RV9ZldJKBzc3IWYWYyo=";
   };
 }

From 41f7858f5520effa85dbcd53f21978f1f023cfa3 Mon Sep 17 00:00:00 2001
From: Sunny <sunnybhowmick0310@gmail.com>
Date: Wed, 8 Oct 2025 15:42:04 +0530
Subject: [PATCH 48/62] mgba: fix build with cmake4

---
 pkgs/by-name/mg/mgba/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix
index 3c8c2823445f..100ef2405845 100644
--- a/pkgs/by-name/mg/mgba/package.nix
+++ b/pkgs/by-name/mg/mgba/package.nix
@@ -71,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   cmakeFlags = [
+    # TODO: drop in the next version bump
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
     (lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc)
   ];
 

From a872b8cd611e7936a22a723382362ca04fd3e8d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 10:20:17 +0000
Subject: [PATCH 49/62] vscode-extensions.visualjj.visualjj: 0.16.6 -> 0.17.1

---
 .../vscode/extensions/visualjj.visualjj/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 905dbc56b99c..bcf31ed0bbfc 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-HbaB0WnWNOxooZDuAFbpCZi3EDrqUzDAEPovfN670hk=";
+          hash = "sha256-Jqi9NTrKSweDpZ+YtXeiH77XPRgsKVJXlA4Fds7m8T0=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-K+I36W1y31WG9JNd25L4AbxsIqS6zWrrgQVUAd+BEqY=";
+          hash = "sha256-8inRXcCkKbEm3D6+o5pEyUkkjj+58CgIGufHG5Qsl5Y=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-AMTgCdUwe0ba6tuWj+GEtkcV/x0TCjXNVlrujoQ+Pe4=";
+          hash = "sha256-sTwJVM6XxbT2JAJWqAhMA/GJvP1GOnMfIezj+MMaiJ8=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-x0zki117HMP9M3pNeN4FVIzyIcTJIe3MO0GFsK0J8BY=";
+          hash = "sha256-eJ/hKySxQDEh1hr36BAk0D7K6t4f9qj54T2Fc1Eq1t0=";
         };
       };
     in
     {
       name = "visualjj";
       publisher = "visualjj";
-      version = "0.16.6";
+      version = "0.17.1";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 5a3404c6ded1a868e55ead4baf91e3ff776d136f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolf=20Schr=C3=B6der?= <rolf.schroeder@limbus-medtec.com>
Date: Mon, 13 Oct 2025 12:24:08 +0200
Subject: [PATCH 50/62] igv: add rollf to maintainers

---
 pkgs/by-name/ig/igv/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ig/igv/package.nix b/pkgs/by-name/ig/igv/package.nix
index 40bb0b375c5c..f15fb382ce18 100644
--- a/pkgs/by-name/ig/igv/package.nix
+++ b/pkgs/by-name/ig/igv/package.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
     description = "Visualization tool for interactive exploration of genomic datasets";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimame ];
+    maintainers = [
+      maintainers.mimame
+      maintainers.rollf
+    ];
   };
 }

From abddfae353ae2a41f14346ecee665df279fb0608 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 13 Oct 2025 12:26:17 +0200
Subject: [PATCH 51/62] python312Packages.mypy-boto3-cloudfront: 1.40.23 ->
 1.40.50

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7d3f2579fcfa..37f29fe71b83 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -230,8 +230,8 @@ in
       "sha256-PYL1UEOCyGrRlaG4CiqC9zWHw34bY2hk67hd1DvXmls=";
 
   mypy-boto3-cloudfront =
-    buildMypyBoto3Package "cloudfront" "1.40.23"
-      "sha256-uh7A5QPl5fZsP7AEvN8rZ/pX5l9944/Y0FH3lb6CJWo=";
+    buildMypyBoto3Package "cloudfront" "1.40.50"
+      "sha256-jw169fraZHj0tHiu8ZJTqLu/FrBWVBnePNvtp6V3UUs=";
 
   mypy-boto3-cloudhsm =
     buildMypyBoto3Package "cloudhsm" "1.40.15"

From cdd92d9822da5d609d1f4e24c37cbb27e297f5d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 13 Oct 2025 12:26:46 +0200
Subject: [PATCH 52/62] python312Packages.mypy-boto3-glue: 1.40.46 -> 1.40.50

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 37f29fe71b83..fa5479428f46 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ in
       "sha256-DS2Bb39wrP+k2H2oxkm13WzRyF6cX96P0JgF2OXAdMA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.46"
-      "sha256-WhupCfYxYfqqAnUFw96o2vPmrrj6N+7sZFRyTuBbd70=";
+    buildMypyBoto3Package "glue" "1.40.50"
+      "sha256-1LgvvSs/ZFxrCT/7MhZDATFUI6az5yTAhuc41QQ1kGk=";
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"
       "sha256-KQqyk9PFUttzDrZW7viev8xbumdud05EBdNoxz//hEY=";

From d586d7224f57170e015e02726678102739ff1236 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 13 Oct 2025 12:27:02 +0200
Subject: [PATCH 53/62] python312Packages.mypy-boto3-lambda: 1.40.7 -> 1.40.50

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fa5479428f46..c7dfd88ecb7a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -769,8 +769,8 @@ in
       "sha256-NMF0B6cBjIFJl7CKrwxj89oFJeYnDhpdkmCTJdXa3w0=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.40.7"
-      "sha256-6L7fA6Z/reXbhh/pAt8GMGQpI1Lu1feF90zQ5ZGUjbk=";
+    buildMypyBoto3Package "lambda" "1.40.50"
+      "sha256-pwngrGlAeDqtCP9c+Yx4miFYQLqxfkaMpeIjBa0K6gU=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.40.19"

From b45575d30b4a9b86092209c594c4b91352de5fd7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 13 Oct 2025 12:27:25 +0200
Subject: [PATCH 54/62] python312Packages.mypy-boto3-rds: 1.40.46 -> 1.40.50

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c7dfd88ecb7a..ce5b55425b34 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1085,8 +1085,8 @@ in
       "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.40.46"
-      "sha256-h7+fF67fsQX82i1XcPQcxCvg3qLUKdnsr7V5DqHdod4=";
+    buildMypyBoto3Package "rds" "1.40.50"
+      "sha256-fVUGv36rK1kmb5MmEEnCrCXEYPfgn1g6u4aYBpnDvtU=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.40.0"

From 262f79583d109c9588a55cd01d58ad0aad9235bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 13 Oct 2025 12:27:54 +0200
Subject: [PATCH 55/62] python313Packages.botocore-stubs: 1.40.33 -> 1.40.50

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index bc1d9eb3fb5c..661317a9e5b5 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.33";
+  version = "1.40.50";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-icUa4LKNnXn96MSXz5CN34cs4CfSc31NS6Rz/enNqoI=";
+    hash = "sha256-13Ky066mtORklj/kWy1QTu57w4QvBHzruuVJKzmT4P0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 696a9fc56c023f7b95bcba1cd737915a60b80797 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 10:34:23 +0000
Subject: [PATCH 56/62] nix-search-tv: 2.2.2 -> 2.2.3

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

diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix
index 1a2c29b39aec..483707876830 100644
--- a/pkgs/by-name/ni/nix-search-tv/package.nix
+++ b/pkgs/by-name/ni/nix-search-tv/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nix-search-tv";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "3timeslazy";
     repo = "nix-search-tv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z7Mt//II4pvOJ4hzbgNRErk/MpXzgkGQm7VimXDG/H8=";
+    hash = "sha256-fhXbkH1iqLugr5zkuSgxUYziq5Q4f+QnV5eSag9La8g=";
   };
 
   vendorHash = "sha256-ZuhU1+XzJeiGheYNR4lL7AI5vgWvgp6iuJjMcK8t6Mg=";

From 9dfe063c905cda27ae9d07a1112d6b3a23e15c41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 10:54:49 +0000
Subject: [PATCH 57/62] checkov: 3.2.479 -> 3.2.483

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

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index af0c1a236a68..daf89824c593 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.479";
+  version = "3.2.483";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-FC6Bv01lZHeRuRH6dNv3xoywONV2gHTMkjQT8XUhcro=";
+    hash = "sha256-KkJ0XfPS0vJNcI03pusYLx/nqXFeY4b6+KoT7aCokQI=";
   };
 
   pythonRelaxDeps = [

From 7e2b91eb3b75d2a8857a4cec9da4cb750d48b968 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 8 Oct 2025 19:20:21 +0200
Subject: [PATCH 58/62] apvlv: 0.6.0 -> 0.7.0; fix build with CMake 4

---
 pkgs/by-name/ap/apvlv/package.nix | 81 +++++++++++++++++++------------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix
index de3bc91aeaa9..f2d15f2fd2b0 100644
--- a/pkgs/by-name/ap/apvlv/package.nix
+++ b/pkgs/by-name/ap/apvlv/package.nix
@@ -1,43 +1,56 @@
 {
   cmake,
+  cmark,
   copyDesktopItems,
-  ebook_tools,
+  djvulibre,
   fetchFromGitHub,
+  fetchpatch,
   freetype,
   ghostscript,
-  gtk3,
+  harfbuzz,
   installShellFiles,
   lib,
-  libepoxy,
-  libpthreadstubs,
-  libXdmcp,
-  libxkbcommon,
-  libxml2,
-  libxshmfence,
   man,
-  pcre,
+  mupdf,
   pkg-config,
   poppler,
+  qt6,
+  qt6Packages,
   stdenv,
+  tesseract,
   testers,
-  webkitgtk_4_1,
-  wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apvlv";
 
   # If you change the version, please also update src.rev accordingly
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "naihe2010";
     repo = "apvlv";
-    tag = "v0.6.0-final";
-    hash = "sha256-iKhbLMXk5DpwO2El2yx6DvuK2HStkQVHlkXKwmGVbzM=";
+    tag = "v0.7.0-final";
+    hash = "sha256-PDqH3nROR16q11dHIkC5+jAiRSIIfp52M8o4IT1BaT0=";
   };
 
-  env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+  patches = [
+    # Update minimum CMake version, so it works with CMake 4
+    (fetchpatch {
+      name = "apvlv-cmake-4.patch";
+      url = "https://github.com/naihe2010/apvlv/commit/03b9e74173e1b5cbf4451b71bed066f1b58c9c78.patch";
+      hash = "sha256-OA3Qy+ECUW+Yq1FKiye+y6C01GD1ZLPbdzYK5ofM4Qg=";
+    })
+  ];
+
+  cmakeFlags = [
+    # Off by default on non-Windows
+    "-DAPVLV_WITH_POPPLER=ON"
+    # TODO: apvlv built with libreoffice support segfaults, tried
+    # - libreoffice-unwrapped in buildInputsto
+    # - env.NIX_LDFLAGS = "-L${libreoffice-unwrapped}/lib/libreoffice/program";
+    "-DAPVLV_WITH_OFFICE=OFF"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -46,24 +59,33 @@ stdenv.mkDerivation (finalAttrs: {
     installShellFiles
     man
     pkg-config
-    wrapGAppsHook3
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    ebook_tools
-    freetype
-    gtk3
-    libepoxy
-    libpthreadstubs
-    libXdmcp
-    libxkbcommon
-    libxml2
-    libxshmfence # otherwise warnings in compilation
-    pcre
-    poppler
-    webkitgtk_4_1
+    cmark
+    djvulibre
+    # https://github.com/naihe2010/apvlv/blob/03b9e74173e1b5cbf4451b71bed066f1b58c9c78/src/CMakeLists.txt#L158
+    harfbuzz
+    mupdf
+    qt6Packages.poppler
+    qt6Packages.quazip
+    qt6.qtwebengine
+    tesseract
   ];
 
+  env = {
+    # UTF-8 locale for translation generation
+    LANG = "C.UTF8";
+    # accomodate #include <qt6/poppler-qt6.h>…
+    NIX_CFLAGS_COMPILE = "-I${qt6Packages.poppler.dev}/include/poppler";
+  };
+
+  preBuild = ''
+    mkdir -p ../share/doc/apvlv/translations
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -74,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     # displays pdfStartup.pdf as default pdf entry
     mkdir -p $out/share/doc/apvlv/
     cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
-    cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade
 
     mkdir -p $out/etc
     cp ../apvlvrc.example $out/etc/apvlvrc
@@ -90,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.version = testers.testVersion {
-      command = "${lib.getExe finalAttrs.finalPackage} -v";
+      command = "QT_QPA_PLATFORM=offscreen ${lib.getExe finalAttrs.finalPackage} --version";
       package = finalAttrs.finalPackage;
       version = "${finalAttrs.version}-rel";
     };

From fa6b7ec3d497e2d631b0b3aa52186348d7a94b23 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 4 Oct 2025 11:32:14 +0900
Subject: [PATCH 59/62] pkgs-lib/formats/systemd: make format a function

---
 .../manual/release-notes/rl-2511.section.md    |  2 ++
 .../system/boot/systemd/journald-remote.nix    |  2 +-
 .../system/boot/systemd/journald-upload.nix    |  2 +-
 pkgs/pkgs-lib/formats.nix                      | 18 +++++++++++++++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 7203addaa835..7432221c264c 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -253,6 +253,8 @@
 
 - The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
 
+- Direct use of `pkgs.formats.systemd` has been deprecated, and should now be instantiated with `pkgs.formats.systemd { }` similarly to other items in `pkgs.formats`.
+
 - The Postfix module has been updated and likely requires configuration changes:
   - The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure
     - [services.postfix.settings.main.smtpd_tls_chain_files](#opt-services.postfix.settings.main.smtpd_tls_chain_files) for server certificates,
diff --git a/nixos/modules/system/boot/systemd/journald-remote.nix b/nixos/modules/system/boot/systemd/journald-remote.nix
index 5aeb3c8f1597..89baf421f591 100644
--- a/nixos/modules/system/boot/systemd/journald-remote.nix
+++ b/nixos/modules/system/boot/systemd/journald-remote.nix
@@ -7,7 +7,7 @@
 
 let
   cfg = config.services.journald.remote;
-  format = pkgs.formats.systemd;
+  format = pkgs.formats.systemd { };
 
   cliArgs = lib.cli.toGNUCommandLineShell { } {
     inherit (cfg) output;
diff --git a/nixos/modules/system/boot/systemd/journald-upload.nix b/nixos/modules/system/boot/systemd/journald-upload.nix
index c2437e7aadf8..8cd67918f4f0 100644
--- a/nixos/modules/system/boot/systemd/journald-upload.nix
+++ b/nixos/modules/system/boot/systemd/journald-upload.nix
@@ -7,7 +7,7 @@
 
 let
   cfg = config.services.journald.upload;
-  format = pkgs.formats.systemd;
+  format = pkgs.formats.systemd { };
 in
 {
   meta.maintainers = [ lib.maintainers.raitobezarius ];
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 58eda45da319..eb1855797f3f 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -425,10 +425,22 @@ optionalAttrs allowAliases aliases
     let
       mkValueString = mkValueStringDefault { };
       mkKeyValue = k: v: if v == null then "# ${k} is unset" else "${k} = ${mkValueString v}";
+
+      rawFormat = ini {
+        listsAsDuplicateKeys = true;
+        inherit mkKeyValue;
+      };
     in
-    ini {
-      listsAsDuplicateKeys = true;
-      inherit mkKeyValue;
+    rawFormat
+    // {
+      generate =
+        name: value:
+        lib.warn
+          "Direct use of `pkgs.formats.systemd` has been deprecated, please use `pkgs.formats.systemd { }` instead."
+          rawFormat.generate
+          name
+          value;
+      __functor = self: { }: rawFormat;
     };
 
   keyValue =

From 2f00e84a4bbb5915296563069a7116d482f628ac Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Mon, 13 Oct 2025 13:34:33 +0200
Subject: [PATCH 60/62] nixos/nextcloud-notify_push: remove not required
 mkMerge

---
 .../web-apps/nextcloud-notify_push.nix        | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
index ce4986b2cfa2..bf0e5a2e5989 100644
--- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@@ -159,27 +159,24 @@ in
       "::1" = [ cfgN.hostName ];
     };
 
-    services = lib.mkMerge [
-      {
-        nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
-          proxyPass = "http://unix:${cfg.socketPath}";
-          proxyWebsockets = true;
-          recommendedProxySettings = lib.mkDefault true;
-          extraConfig = # nginx
-            ''
-              # disable in case it was configured on a higher level
-              keepalive_timeout 0;
-              proxy_buffering off;
-            '';
-        };
-      }
-
-      (lib.mkIf cfg.bendDomainToLocalhost {
-        nextcloud.settings.trusted_proxies = [
+    services = {
+      nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
+        proxyPass = "http://unix:${cfg.socketPath}";
+        proxyWebsockets = true;
+        recommendedProxySettings = lib.mkDefault true;
+        extraConfig = # nginx
+          ''
+            # disable in case it was configured on a higher level
+            keepalive_timeout 0;
+            proxy_buffering off;
+          '';
+      };
+      nextcloud = {
+        settings.trusted_proxies = lib.mkIf cfg.bendDomainToLocalhost [
           "127.0.0.1"
           "::1"
         ];
-      })
-    ];
+      };
+    };
   };
 }

From 29a3e7a111401578ef7662f811af35bce76d5019 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Mon, 13 Oct 2025 13:36:01 +0200
Subject: [PATCH 61/62] nixos/nextcloud-notify_push: automatically install
 notify_push nextcloud app

---
 nixos/modules/services/web-apps/nextcloud-notify_push.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
index bf0e5a2e5989..66ad1fdc25ac 100644
--- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@@ -172,6 +172,11 @@ in
           '';
       };
       nextcloud = {
+        extraApps = {
+          inherit (config.services.nextcloud.package.packages.apps)
+            notify_push
+            ;
+        };
         settings.trusted_proxies = lib.mkIf cfg.bendDomainToLocalhost [
           "127.0.0.1"
           "::1"

From 9cd6680a65c7a3450c1a65b70294da724549b798 Mon Sep 17 00:00:00 2001
From: Yureka <gh@yuka.dev>
Date: Mon, 13 Oct 2025 13:45:49 +0200
Subject: [PATCH 62/62] Revert
 "matrix-synapse-plugins.matrix-synapse-s3-storage-provider: 1.5.0 -> 1.6.0"

Version 1.6.0 only works together with matrix-synapse 1.140
---
 .../matrix-synapse-unwrapped/plugins/s3-storage-provider.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
index 92d8bee1050a..20fae6d26a83 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "matrix-synapse-s3-storage-provider";
-  version = "1.6.0";
+  version = "1.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "matrix-org";
     repo = "synapse-s3-storage-provider";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aeacw6Fpv4zFhZI4LdsJiV2pcOAMv3aV5CicnwYRxw8=";
+    hash = "sha256-Nv8NkzOcUDX17N7Lyx/NT1vXztiRNaTYIAWNPHxgxJ4=";
   };
 
   postPatch = ''