From 5970f4d5370277c26d3cd9c36571a6249af0d58b Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Tue, 8 Jul 2025 17:59:15 -0300
Subject: [PATCH 01/91] nixos/opentabletdriver: refactor

---
 nixos/modules/hardware/opentabletdriver.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix
index d74e9b8e4dce..592c2575e9a4 100644
--- a/nixos/modules/hardware/opentabletdriver.nix
+++ b/nixos/modules/hardware/opentabletdriver.nix
@@ -53,18 +53,16 @@ in
 
     boot.blacklistedKernelModules = cfg.blacklistedKernelModules;
 
-    systemd.user.services.opentabletdriver =
-      with pkgs;
-      lib.mkIf cfg.daemon.enable {
-        description = "Open source, cross-platform, user-mode tablet driver";
-        wantedBy = [ "graphical-session.target" ];
-        partOf = [ "graphical-session.target" ];
+    systemd.user.services.opentabletdriver = lib.mkIf cfg.daemon.enable {
+      description = "Open source, cross-platform, user-mode tablet driver";
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
 
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${cfg.package}/bin/otd-daemon";
-          Restart = "on-failure";
-        };
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = lib.getExe' cfg.package "otd-daemon";
+        Restart = "on-failure";
       };
+    };
   };
 }

From 620f813ef4019c5f409f0e4ede7d08ccdf5a3c0f Mon Sep 17 00:00:00 2001
From: Philipp <1329940+pstn@users.noreply.github.com>
Date: Mon, 4 Aug 2025 09:57:06 +0200
Subject: [PATCH 02/91] nixos/services.mysql: Fix restart on-abnormal

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 nixos/modules/services/databases/mysql.nix        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 4f51b1e520e6..989fc053aebb 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -111,6 +111,8 @@
 
 - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
 
+- The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
+
 - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
 
 - `netbox-manage` script created by the `netbox` module no longer uses `sudo -u netbox` internally. It can be run as root and will change it's user to `netbox` using `runuser`
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 28fac48844fa..3d65823c73d8 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -691,7 +691,7 @@ in
       serviceConfig = lib.mkMerge [
         {
           Type = if hasNotify then "notify" else "simple";
-          Restart = "on-abort";
+          Restart = "on-abnormal";
           RestartSec = "5s";
 
           # User and group

From 2ed47db6241182825bff3067504c673cdd4280e4 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 12 Sep 2025 21:01:25 +1000
Subject: [PATCH 03/91] ruby_3_5: init at preview1

Release: https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/
---
 pkgs/development/interpreters/ruby/default.nix | 7 +++++++
 pkgs/top-level/all-packages.nix                | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 007d5cb0e524..264490d0c796 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -432,4 +432,11 @@ in
     hash = "sha256-HYjYontEL93kqgbcmehrC78LKIlj2EMxEt1frHmP1e4=";
     cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
   };
+
+  ruby_3_5 = generic {
+    version = rubyVersion "3" "5" "0" "preview1";
+    hash = "sha256-7PCcfrkC6Rza+cxVPNAMypuEiz/A4UKXhQ+asIzdRvA=";
+    cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a73e735c627..a6daa6580ec2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6252,6 +6252,7 @@ with pkgs;
     ruby_3_2
     ruby_3_3
     ruby_3_4
+    ruby_3_5
     ;
 
   ruby = ruby_3_3;
@@ -6261,6 +6262,7 @@ with pkgs;
   rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;
   rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
   rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
+  rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems;
 
   samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
 

From 7081d2acc6c9d0af6647a13247917ff8811daba4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Sep 2025 03:30:14 +0000
Subject: [PATCH 04/91] mmctl: 10.5.10 -> 10.5.11

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

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 374af784b297..2447cb920604 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,8 +19,8 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.10";
-    srcHash = "sha256-fQqUoSo8saERRfgx4OT26VQktejzYPPqBIL2OA0PQy0=";
+    version = "10.5.11";
+    srcHash = "sha256-2XX6SNWlu+2Kh0rJodp0Ipzu8/gdjygCxeD2BVYDcTc=";
     vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''

From 64b9054b4e61d9611392bd5cc4f3c40956a8a802 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:12:28 +0000
Subject: [PATCH 05/91] aaphoto: drop unnecessary `rec` and inline pname in doc
 path

- `rec` is not needed since no self-references remain in the derivation.
- Use literal `aaphoto` in `$out/share/doc` instead of `${pname}` for clarity
and to avoid unnecessary indirection.
---
 pkgs/by-name/aa/aaphoto/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aa/aaphoto/package.nix b/pkgs/by-name/aa/aaphoto/package.nix
index 1f32649b6d2a..c79507711dae 100644
--- a/pkgs/by-name/aa/aaphoto/package.nix
+++ b/pkgs/by-name/aa/aaphoto/package.nix
@@ -9,7 +9,7 @@
   llvmPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "aaphoto";
   version = "0.45";
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/${pname}
+    install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/aaphoto
   '';
 
   meta = {

From e3fdcb342d0e83bf20628a7ead5b5d9fb1aec50b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:15:32 +0000
Subject: [PATCH 06/91] acpi: use finalAttrs and modernize fetchurl

- Switch from `rec` to `finalAttrs` for clearer scope hygiene.
- Inline `finalAttrs.version` and literal `acpi` in the source URL.
- Replace deprecated `sha256` with `hash`.
---
 pkgs/by-name/ac/acpi/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ac/acpi/package.nix b/pkgs/by-name/ac/acpi/package.nix
index 4f4583a3d14b..d6fbf82ec640 100644
--- a/pkgs/by-name/ac/acpi/package.nix
+++ b/pkgs/by-name/ac/acpi/package.nix
@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "acpi";
   version = "1.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";
+    url = "mirror://sourceforge/acpiclient/${finalAttrs.version}/acpi-${finalAttrs.version}.tar.gz";
+    hash = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";
   };
 
   meta = {
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ ];
   };
-}
+})

From 9c9958d0058fba00e85ddf5c77e5660390e0c374 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:23:17 +0000
Subject: [PATCH 07/91] zammad: clean up meta and rubyEnv naming

- Use explicit "zammad-gems-${version}" for rubyEnv instead of relying on pname
  for clarity and reproducibility.
- Drop `with lib;` in meta, qualify attributes explicitly:
  - `license = lib.licenses.agpl3Plus;`
  - `maintainers = with lib.maintainers; [...]`
- Improves scope hygiene and consistency with Nixpkgs conventions.
---
 pkgs/by-name/za/zammad/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index f929e7ef5201..e50fc166d5f6 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -37,7 +37,7 @@ let
   };
 
   rubyEnv = bundlerEnv {
-    name = "${pname}-gems-${version}";
+    name = "zammad-gems-${version}";
     inherit version;
 
     # Which ruby version to select:
@@ -127,15 +127,15 @@ stdenvNoCC.mkDerivation {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Web-based, open source user support/ticketing solution";
     homepage = "https://zammad.org";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       taeer
       netali
     ];

From 87bc6308d377a64259903b1db6dd19c15c10c0d8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:31:09 +0000
Subject: [PATCH 08/91] zap: refactor derivation for scope hygiene and
 consistency

- Switch to `stdenv.mkDerivation (finalAttrs: { ... })` form
  for better attribute scoping.
- Replace `${version}` with `${finalAttrs.version}` in `src.url`.
- Use `hash` instead of deprecated `sha256`.
- Inline pname in paths (`share/zap`, `bin/zap`) instead of string
  interpolation for clarity.
- Reference `${finalAttrs.version_tag}` in wrapper script.
- Qualify meta attributes explicitly:
  - `license = lib.licenses.asl20;`
  - `platforms = lib.platforms.linux;`
  - `maintainers = with lib.maintainers; [...]`

Improves reproducibility, scope hygiene, and alignment with
current Nixpkgs conventions.
---
 pkgs/by-name/za/zap/package.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/za/zap/package.nix b/pkgs/by-name/za/zap/package.nix
index 3e5e23c2c8b7..5dbf70e3a184 100644
--- a/pkgs/by-name/za/zap/package.nix
+++ b/pkgs/by-name/za/zap/package.nix
@@ -8,12 +8,12 @@
   runtimeShell,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zap";
   version = "2.16.1";
   src = fetchurl {
-    url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz";
-    sha256 = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE=";
+    url = "https://github.com/zaproxy/zaproxy/releases/download/v${finalAttrs.version}/ZAP_${finalAttrs.version}_Linux.tar.gz";
+    hash = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE=";
   };
 
   desktopItems = [
@@ -44,35 +44,35 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/{bin,share}
 
-    cp -pR . "$out/share/${pname}/"
+    cp -pR . "$out/share/zap/"
 
-    cat >> "$out/bin/${pname}" << EOF
+    cat >> "$out/bin/zap" << EOF
     #!${runtimeShell}
     export PATH="${lib.makeBinPath [ jre ]}:\$PATH"
     export JAVA_HOME='${jre}'
     if ! [ -f "\$HOME/.ZAP/config.xml" ];then
       mkdir -p "\$HOME/.ZAP"
-      head -n 2 $out/share/${pname}/xml/config.xml > "\$HOME/.ZAP/config.xml"
-      echo "<version>${version_tag}</version>" >> "\$HOME/.ZAP/config.xml"
-      tail -n +3 $out/share/${pname}/xml/config.xml >> "\$HOME/.ZAP/config.xml"
+      head -n 2 $out/share/zap/xml/config.xml > "\$HOME/.ZAP/config.xml"
+      echo "<version>${finalAttrs.version_tag}</version>" >> "\$HOME/.ZAP/config.xml"
+      tail -n +3 $out/share/zap/xml/config.xml >> "\$HOME/.ZAP/config.xml"
     fi
-    exec "$out/share/${pname}/zap.sh"  "\$@"
+    exec "$out/share/zap/zap.sh"  "\$@"
     EOF
 
-    chmod u+x  "$out/bin/${pname}"
+    chmod u+x  "$out/bin/zap"
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.zaproxy.org/";
     description = "Java application for web penetration testing";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       mog
       rafael
     ];
-    platforms = platforms.linux;
-    license = licenses.asl20;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.asl20;
     mainProgram = "zap";
   };
-}
+})

From 245d2ce76708443126d0f107632e8ca2e57d3cbb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:33:48 +0000
Subject: [PATCH 09/91] yubikey-touch-detector: clean up source and meta
 attributes

- Use `tag = version;` instead of `rev = version;` in `fetchFromGitHub`
  for clarity and correctness.
- Inline pname in install paths (`share/doc/yubikey-touch-detector`,
  `share/licenses/yubikey-touch-detector`) instead of string interpolation.
- Drop `with lib;` in `meta`, qualify attributes explicitly:
  - `maintainers = with lib.maintainers; [...]`
  - `license = lib.licenses.isc;`
  - `platforms = lib.platforms.linux;`

Improves scope hygiene, reproducibility, and consistency with
current Nixpkgs conventions.
---
 pkgs/by-name/yu/yubikey-touch-detector/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/yu/yubikey-touch-detector/package.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
index 560de6887dad..fdd20ad21f90 100644
--- a/pkgs/by-name/yu/yubikey-touch-detector/package.nix
+++ b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maximbaz";
     repo = "yubikey-touch-detector";
-    rev = version;
+    tag = version;
     hash = "sha256-aHR/y8rAKS+dMvRdB3oAmOiI7hTA6qlF4Z05OjwYOO4=";
   };
   vendorHash = "sha256-oHEcpu3QvcVC/YCtGtP7nNT9++BSU8BPT5pf8NdLrOo=";
@@ -33,9 +33,9 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    install -Dm444 -t $out/share/doc/${pname} *.{md,example}
+    install -Dm444 -t $out/share/doc/yubikey-touch-detector *.{md,example}
 
-    install -Dm444 -t $out/share/licenses/${pname} LICENSE
+    install -Dm444 -t $out/share/licenses/yubikey-touch-detector LICENSE
 
     install -Dm444 -t $out/share/icons/hicolor/128x128/apps yubikey-touch-detector.png
 
@@ -48,12 +48,12 @@ buildGoModule rec {
     installManPage yubikey-touch-detector.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to detect when your YubiKey is waiting for a touch";
     homepage = "https://github.com/maximbaz/yubikey-touch-detector";
-    maintainers = with maintainers; [ sumnerevans ];
-    license = licenses.isc;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ sumnerevans ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
     mainProgram = "yubikey-touch-detector";
   };
 }

From 900624bd79a9950f1151657972eceb28efac376a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:35:32 +0000
Subject: [PATCH 10/91] yuicompressor: refactor derivation for scope hygiene

- Switch to `stdenv.mkDerivation (finalAttrs: { ... })` form
  for explicit attribute scoping.
- Replace `${version}` and `${pname}` in `src.url` with
  `${finalAttrs.version}` and inline name for clarity.
- Drop `with lib;` in `meta`, qualify attributes explicitly:
  - `sourceProvenance = with lib.sourceTypes; [...]`
  - `license = lib.licenses.bsd3;`
  - `maintainers = with lib.maintainers; [...]`
  - `platforms = lib.platforms.all;`

Improves scope hygiene, reproducibility, and consistency
with current Nixpkgs conventions.
---
 pkgs/by-name/yu/yuicompressor/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/yu/yuicompressor/package.nix b/pkgs/by-name/yu/yuicompressor/package.nix
index a2d32b65fd50..1d0b8d2efb8f 100644
--- a/pkgs/by-name/yu/yuicompressor/package.nix
+++ b/pkgs/by-name/yu/yuicompressor/package.nix
@@ -6,12 +6,12 @@
   jre,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yuicompressor";
   version = "2.4.8";
 
   src = fetchurl {
-    url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
+    url = "https://github.com/yui/yuicompressor/releases/download/v${finalAttrs.version}/yuicompressor-${finalAttrs.version}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "JavaScript and CSS minifier";
     mainProgram = "yuicompressor";
     homepage = "http://yui.github.io/yuicompressor/";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms = platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jwiegley ];
+    platforms = lib.platforms.all;
   };
-}
+})

From ea21ca27d0fa46f8cb837308c854987021154ebf Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:41:39 +0000
Subject: [PATCH 11/91] _1password-cli: inline mainProgram in install and
 checks

- Replace `${pname}` reference in error message with explicit
  `"1password-cli"` for clarity.
- Inline `op` instead of `${mainProgram}` in:
  - `installPhase` binary installation
  - shell completion installation
  - `versionCheckProgram`
- Ensures consistency, avoids unnecessary indirection, and
  makes the derivation easier to read and maintain.
---
 pkgs/by-name/_1/_1password-cli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index 819fa08e298b..4feb2ae02138 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     if (builtins.elem system platforms) then
       sources.${system}
     else
-      throw "Source for ${pname} is not available for ${system}";
+      throw "Source for 1password-cli is not available for ${system}";
 
   nativeBuildInputs = [
     installShellFiles
@@ -63,23 +63,23 @@ stdenv.mkDerivation {
 
   installPhase = ''
     runHook preInstall
-    install -D ${mainProgram} $out/bin/${mainProgram}
+    install -D op $out/bin/op
     runHook postInstall
   '';
 
   postInstall = ''
     HOME=$TMPDIR
-    installShellCompletion --cmd ${mainProgram} \
-      --bash <($out/bin/${mainProgram} completion bash) \
-      --fish <($out/bin/${mainProgram} completion fish) \
-      --zsh <($out/bin/${mainProgram} completion zsh)
+    installShellCompletion --cmd op \
+      --bash <($out/bin/op completion bash) \
+      --fish <($out/bin/op completion fish) \
+      --zsh <($out/bin/op completion zsh)
   '';
 
   dontStrip = stdenv.hostPlatform.isDarwin;
 
   doInstallCheck = true;
 
-  versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}";
+  versionCheckProgram = "${builtins.placeholder "out"}/bin/op";
   versionCheckProgramArg = "--version";
 
   passthru = {

From 9c8c32cca1ae37f727045281ceccd645302f0ea6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 15:49:22 +0000
Subject: [PATCH 12/91] _1password-gui: inline pname in desktop file
 installation

- Replace `${pname}` with explicit `1password` in desktop file
  installation and substitution.
- Ensures consistency with upstream naming and avoids unnecessary
  indirection in paths and Exec entries.
---
 pkgs/by-name/_1/_1password-gui/linux.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix
index 6cd427c2aae9..57e3c76dea8b 100644
--- a/pkgs/by-name/_1/_1password-gui/linux.nix
+++ b/pkgs/by-name/_1/_1password-gui/linux.nix
@@ -109,9 +109,9 @@ stdenv.mkDerivation {
       cp -a * $out/share/1password
 
       # Desktop file
-      install -Dt $out/share/applications resources/${pname}.desktop
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace-fail 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
+      install -Dt $out/share/applications resources/1password.desktop
+      substituteInPlace $out/share/applications/1password.desktop \
+        --replace-fail 'Exec=/opt/1Password/1password' 'Exec=1password'
 
     ''
     + (lib.optionalString (polkitPolicyOwners != [ ]) ''

From 28e237f3208ea829aa9c3822fe6151548b6e619d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 17:41:04 +0000
Subject: [PATCH 13/91] zod: modernize package expression and fix pname scoping

- switch `sha256` to `hash` with SRI-style value
- replace interpolated `${pname}` in sub-derivations with explicit names:
  - zod-engine-engine
  - zod-engine-map_editor
  - zod-engine-launcher
  - zod-engine-assets
- drop unnecessary `with lib;` in `meta` and fully qualify attributes
  (`lib.maintainers`, `lib.licenses`, `lib.platforms`)

This improves attribute hygiene, avoids accidental pname shadowing,
and aligns the package with current Nixpkgs conventions.
---
 pkgs/by-name/zo/zod/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix
index 1c8dab9f3a30..2626a6d18a34 100644
--- a/pkgs/by-name/zo/zod/package.nix
+++ b/pkgs/by-name/zo/zod/package.nix
@@ -21,7 +21,7 @@ let
   version = "2011-09-06";
   src = fetchzip {
     url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz";
-    sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h";
+    hash = "sha256-8HQdtr69IUxXcU5mJEShHWfkEK5pfiTRO2Bn6pRJ+wQ=";
   };
   postPatch = ''
     sed '1i#include <ctime>' -i zod_src/common.cpp # gcc12
@@ -50,7 +50,7 @@ let
       hardeningDisable
       NIX_LDFLAGS
       ;
-    pname = "${pname}-engine";
+    pname = "zod-engine-engine";
     enableParallelBuilding = true;
     preBuild = "cd zod_src";
     installPhase = ''
@@ -69,7 +69,7 @@ let
       hardeningDisable
       NIX_LDFLAGS
       ;
-    pname = "${pname}-map_editor";
+    pname = "zod-engine-map_editor";
     enableParallelBuilding = true;
     preBuild = "cd zod_src";
     makeFlags = [ "map_editor" ];
@@ -88,7 +88,7 @@ let
       zod_engine
       zod_map_editor
       ;
-    pname = "${pname}-launcher";
+    pname = "zod-engine-launcher";
     # This is necessary because the zod_launcher has terrible fixed-width window
     # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4
     # 2,3,4 look acceptable on my 4k monitor and 1 is unreadable.
@@ -109,7 +109,7 @@ let
       install -m755 zod_launcher $out/bin
     '';
   };
-  zod_assets = runCommandLocal "${pname}-assets" { } ''
+  zod_assets = runCommandLocal "zod-engine-assets" { } ''
     mkdir -p $out/usr/lib/commander-zod{,blank_maps}
     cp -r ${src}/assets $out/usr/lib/commander-zod/assets
     for i in ${src}/*.map ${src}/*.txt; do
@@ -128,11 +128,11 @@ symlinkJoin {
     zod_map_editor
     zod_assets
   ];
-  meta = with lib; {
+  meta = {
     description = "Multiplayer remake of ZED";
     homepage = "https://zod.sourceforge.net/";
-    maintainers = with maintainers; [ zeri ];
-    license = licenses.gpl3Plus; # Says the website
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ zeri ];
+    license = lib.licenses.gpl3Plus; # Says the website
+    platforms = lib.platforms.linux;
   };
 }

From 4a757396d8dc7f5cc65b581fb6f7c595898dc613 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 17:46:50 +0000
Subject: [PATCH 14/91] zookeeper: refactor to use finalAttrs

- wrap derivation in `stdenv.mkDerivation (finalAttrs: { ... })`
- replace `${pname}`/`${version}` with `${finalAttrs.version}` in `src` URL
- update `meta.changelog` to interpolate `finalAttrs.version`

This removes reliance on `rec` and ensures attribute references are
scoped through `finalAttrs`, improving clarity and consistency with
current Nixpkgs conventions.
---
 pkgs/by-name/zo/zookeeper/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix
index f2f20529a3a5..75ed804993b9 100644
--- a/pkgs/by-name/zo/zookeeper/package.nix
+++ b/pkgs/by-name/zo/zookeeper/package.nix
@@ -13,12 +13,12 @@ let
   # https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_requiredSoftware
   jre = jdk11_headless;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zookeeper";
   version = "3.9.3";
 
   src = fetchurl {
-    url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
+    url = "mirror://apache/zookeeper/zookeeper-${finalAttrs.version}/apache-zookeeper-${finalAttrs.version}-bin.tar.gz";
     hash = "sha512-1E2HDBaRZi778ai68YWckBuCDcX/Fjs26BvrJ7b7880xtfHwdWl+2q9tPnpMsMyS+STc/2SylO8T1TVYm9rxQw==";
   };
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://zookeeper.apache.org";
     description = "Apache Zookeeper";
-    changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html";
+    changelog = "https://zookeeper.apache.org/doc/r${finalAttrs.version}/releasenotes.html";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       nathan-gs
@@ -62,4 +62,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
-}
+})

From eb2768b312aa4d1cb3c8029345f5c474391f96ad Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 18:22:27 +0000
Subject: [PATCH 15/91] znapzend: fix CPAN src URL and qualify meta attributes

- hardcode `Mojo-Log-Clearable` in CPAN fetch URL instead of interpolating pname
- drop `with lib;` in `meta` and fully qualify attributes:
  - `lib.licenses.gpl3`
  - `lib.maintainers`
  - `lib.platforms.all`

This improves reproducibility of the CPAN dependency fetch and aligns
the package with current Nixpkgs style for attribute qualification.
---
 pkgs/by-name/zn/znapzend/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/zn/znapzend/package.nix b/pkgs/by-name/zn/znapzend/package.nix
index 3c8d4c8566f9..43ec11adbd5d 100644
--- a/pkgs/by-name/zn/znapzend/package.nix
+++ b/pkgs/by-name/zn/znapzend/package.nix
@@ -15,7 +15,7 @@ let
     pname = "Mojo-Log-Clearable";
     version = "1.001";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DB/DBOOK/${pname}-${version}.tar.gz";
+      url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-Log-Clearable-${version}.tar.gz";
       hash = "sha256-guBqKdWemc4mC/xp77Wd7qeV2iRqY4wrQ5NRsHtsCnI=";
     };
     buildInputs = with perl.pkgs; [ ModuleBuildTiny ];
@@ -70,14 +70,14 @@ stdenv.mkDerivation (finalAttrs: {
     $out/bin/znapzend --version
   '';
 
-  meta = with lib; {
+  meta = {
     description = "High performance open source ZFS backup with mbuffer and ssh support";
     homepage = "https://www.znapzend.org";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
       otwieracz
       ma27
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 })

From 72750a8f4688e40f02ba29dcf6e0796dcba6b208 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 18:46:08 +0000
Subject: [PATCH 16/91] zile: refactor to use finalAttrs

- wrap derivation in `stdenv.mkDerivation (finalAttrs: { ... })`
- replace `${pname}`/`${version}` with `${finalAttrs.version}` in `src` URL
- update `meta.changelog` to interpolate `finalAttrs.version`
- hardcode pname value in `src` URL

This removes reliance on `rec` and ensures attribute references are
scoped through `finalAttrs`, aligning with current Nixpkgs conventions.
---
 pkgs/by-name/zi/zile/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix
index 8278d2871aff..96162b13aca7 100644
--- a/pkgs/by-name/zi/zile/package.nix
+++ b/pkgs/by-name/zi/zile/package.nix
@@ -12,12 +12,12 @@
   vala,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zile";
   version = "2.6.4";
 
   src = fetchurl {
-    url = "mirror://gnu/zile/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/zile/zile-${finalAttrs.version}.tar.gz";
     hash = "sha256-1dRLhctJBkPQcH4aIYbzoymYwvbquqlIFHm2XK7uV8A=";
   };
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.gnu.org/software/zile/";
-    changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}";
+    changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${finalAttrs.version}";
     description = "Implements Lua Editors";
     longDescription = ''
       GNU Zile is a text editor development kit, so that you can (relatively)
@@ -82,4 +82,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "zile";
   };
-}
+})

From 99fcccafc184e9db3c385c51836c56edb949598b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 19:05:46 +0000
Subject: [PATCH 17/91] zita-ajbridge: refactor to use finalAttrs and modernize
 style

- wrap derivation in `stdenv.mkDerivation (finalAttrs: { ... })`
- replace `${pname}-${version}` in `src` URL with explicit
  `zita-ajbridge-${finalAttrs.version}`
- switch from `sha256` to `hash` with SRI-style value
- drop `with lib;` in `meta` and fully qualify attributes:
  - `lib.licenses.gpl3Plus`
  - `lib.maintainers`
  - `lib.platforms.linux`

This aligns the package with current Nixpkgs conventions, improves
attribute hygiene, and ensures reproducibility.
---
 pkgs/by-name/zi/zita-ajbridge/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/zi/zita-ajbridge/package.nix b/pkgs/by-name/zi/zita-ajbridge/package.nix
index f3b78a8204fd..bc69c540bbdb 100644
--- a/pkgs/by-name/zi/zita-ajbridge/package.nix
+++ b/pkgs/by-name/zi/zita-ajbridge/package.nix
@@ -8,13 +8,13 @@
   zita-resampler,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zita-ajbridge";
   version = "0.8.4";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-vCZONrpNcVw07H3W4xfNHtS7ikZWmA1rIgDi+gEFuzw=";
   };
 
   buildInputs = [
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Connect additional ALSA devices to JACK";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From dcfe6aaa3ea0836ed9a9f22926cd55a8d43eed4f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 23 Sep 2025 20:00:31 +0200
Subject: [PATCH 18/91] maintainers: drop neonfuz

Inactive since 2023, not in the GitHub org.
---
 maintainers/maintainer-list.nix            | 6 ------
 pkgs/by-name/ak/akira-unstable/package.nix | 1 -
 pkgs/by-name/cr/crispy-doom/package.nix    | 1 -
 pkgs/by-name/dw/dwm/package.nix            | 1 -
 pkgs/by-name/eu/eureka-editor/package.nix  | 1 -
 pkgs/by-name/ko/koreader/package.nix       | 1 -
 pkgs/by-name/pi/pinyin-tool/package.nix    | 1 -
 pkgs/by-name/rp/rpcs3/package.nix          | 1 -
 pkgs/by-name/xm/xmenu/package.nix          | 1 -
 pkgs/by-name/ya/yaxg/package.nix           | 1 -
 pkgs/games/papermc/derivation.nix          | 1 -
 11 files changed, 16 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 09ca05897dba..e8b79e579355 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18116,12 +18116,6 @@
     githubId = 50854675;
     name = "Nelson Jeppesen";
   };
-  neonfuz = {
-    email = "neonfuz@gmail.com";
-    github = "neonfuz";
-    githubId = 2590830;
-    name = "Sage Raflik";
-  };
   neosimsim = {
     email = "me@abn.sh";
     github = "neosimsim";
diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix
index c053dd5c2362..c83a3c759b0b 100644
--- a/pkgs/by-name/ak/akira-unstable/package.nix
+++ b/pkgs/by-name/ak/akira-unstable/package.nix
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
       Br1ght0ne
-      neonfuz
     ];
     teams = [ teams.pantheon ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index e2d5632915c5..6a4c79eabecc 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       Gliczy
       keenanweaver
-      neonfuz
     ];
   };
 })
diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix
index 98bcd4190a00..29660cad7c46 100644
--- a/pkgs/by-name/dw/dwm/package.nix
+++ b/pkgs/by-name/dw/dwm/package.nix
@@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
       tags.
     '';
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ neonfuz ];
     platforms = lib.platforms.all;
     mainProgram = "dwm";
   };
diff --git a/pkgs/by-name/eu/eureka-editor/package.nix b/pkgs/by-name/eu/eureka-editor/package.nix
index d098577c7f1d..8ac7d27ee672 100644
--- a/pkgs/by-name/eu/eureka-editor/package.nix
+++ b/pkgs/by-name/eu/eureka-editor/package.nix
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     badPlatforms = platforms.darwin;
-    maintainers = with maintainers; [ neonfuz ];
   };
 }
diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index ec6002b9b74b..257d0dcac4cc 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -138,7 +138,6 @@ stdenv.mkDerivation {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       contrun
-      neonfuz
       liberodark
     ];
   };
diff --git a/pkgs/by-name/pi/pinyin-tool/package.nix b/pkgs/by-name/pi/pinyin-tool/package.nix
index 1fcd8b6945b0..6bff727ac50f 100644
--- a/pkgs/by-name/pi/pinyin-tool/package.nix
+++ b/pkgs/by-name/pi/pinyin-tool/package.nix
@@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "pinyin-tool";
     homepage = "https://github.com/briankung/pinyin-tool";
     license = licenses.mit;
-    maintainers = with maintainers; [ neonfuz ];
   };
 }
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 5d9b5b60ab1b..e0c9abfbc793 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "PS3 emulator/debugger";
     homepage = "https://rpcs3.net/";
     maintainers = with maintainers; [
-      neonfuz
       ilian
     ];
     license = licenses.gpl2Only;
diff --git a/pkgs/by-name/xm/xmenu/package.nix b/pkgs/by-name/xm/xmenu/package.nix
index f18d19f31021..301742c35acb 100644
--- a/pkgs/by-name/xm/xmenu/package.nix
+++ b/pkgs/by-name/xm/xmenu/package.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Menu utility for X";
     homepage = "https://github.com/phillbush/xmenu";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ neonfuz ];
     platforms = lib.platforms.all;
     mainProgram = "xmenu";
   };
diff --git a/pkgs/by-name/ya/yaxg/package.nix b/pkgs/by-name/ya/yaxg/package.nix
index b8a7fbe0b83c..3fcd3762f7a9 100644
--- a/pkgs/by-name/ya/yaxg/package.nix
+++ b/pkgs/by-name/ya/yaxg/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.all;
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ neonfuz ];
     mainProgram = "yaxg";
   };
 }
diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix
index 125052abc754..33171a1ab10e 100644
--- a/pkgs/games/papermc/derivation.nix
+++ b/pkgs/games/papermc/derivation.nix
@@ -56,7 +56,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       aaronjanse
-      neonfuz
       MayNiklas
     ];
     mainProgram = "minecraft-server";

From bd735b64ea9cce0a753bd5d4906accf13228870a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 23 Sep 2025 18:17:51 -0400
Subject: [PATCH 19/91] maintainers: drop PeteE

Inactive on nixpkgs since Oct 2024, and was requested on 6 PRs.

Not an org member.
---
 maintainers/maintainer-list.nix                             | 6 ------
 .../steampipe-packages/steampipe-plugin-azure/default.nix   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50f6211874b6..5a86422f6db4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19993,12 +19993,6 @@
     githubId = 63069986;
     name = "Per Stark";
   };
-  petee = {
-    name = "Pete Erickson";
-    email = "pete.perickson@gmail.com";
-    github = "petee";
-    githubId = 89916;
-  };
   Peter3579 = {
     github = "Peter3579";
     githubId = 170885528;
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
index 06ea9cf01606..5a0e397520ff 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -45,7 +45,7 @@ buildGoModule rec {
     homepage = "https://github.com/turbot/steampipe-plugin-azure";
     license = lib.licenses.apsl20;
     longDescription = "Use SQL to instantly query Azure resources across regions and subscriptions.";
-    maintainers = with lib.maintainers; [ petee ];
+    maintainers = with lib.maintainers; [ ];
     platforms = steampipe.meta.platforms;
   };
 }

From aa334b09dc4efd278dc52a48bc035863bcbf3956 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 26 Sep 2025 13:36:55 +0200
Subject: [PATCH 20/91] octopus: 16.0 -> 16.2

---
 pkgs/by-name/oc/octopus/package.nix               | 11 +++--------
 pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch | 13 -------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch

diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix
index 60eb732a24a7..787f8702ebb3 100644
--- a/pkgs/by-name/oc/octopus/package.nix
+++ b/pkgs/by-name/oc/octopus/package.nix
@@ -31,20 +31,15 @@ assert (blas.isILP64 == arpack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "octopus";
-  version = "16.0";
+  version = "16.2";
 
   src = fetchFromGitLab {
     owner = "octopus-code";
     repo = "octopus";
-    rev = version;
-    hash = "sha256-sByiRTgAntJtSeL4h+49Mi9Rcxw2wK/BvXvsePa77HE=";
+    tag = version;
+    hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
   };
 
-  patches = [
-    # Discover all MPI languages components to avoid scalpack discovery failure
-    ./scalapack-mpi-alias.patch
-  ];
-
   nativeBuildInputs = [
     which
     perl
diff --git a/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch b/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch
deleted file mode 100644
index 8c8253ebf1f3..000000000000
--- a/pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 70d89efb5e..47ba750d7a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -131,7 +131,7 @@ set(Octopus_ext_libs)
- find_package(GSL)
- if (OCTOPUS_MPI)
- 	set(MPI_DETERMINE_LIBRARY_VERSION ON)
--	find_package(MPI 3 COMPONENTS Fortran)
-+	find_package(MPI 3)
- 	# Further set MKL variables
- 	if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel)
- 		set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded")

From 1a86e6aba92976456918c650e8d1f5600c7e8b18 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Fri, 26 Sep 2025 13:13:06 +0200
Subject: [PATCH 21/91] openjdk25: init at 25+36

---
 .../openjdk/25/patches/make-4.4.1.patch       | 25 +++++++++++++++++++
 .../compilers/openjdk/25/source.json          |  6 +++++
 .../development/compilers/openjdk/generic.nix |  8 +++++-
 pkgs/top-level/all-packages.nix               |  9 +++++++
 pkgs/top-level/java-packages.nix              |  1 +
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch
 create mode 100644 pkgs/development/compilers/openjdk/25/source.json

diff --git a/pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch b/pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch
new file mode 100644
index 000000000000..980eed347ce4
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch
@@ -0,0 +1,25 @@
+diff --git a/make/PreInit.gmk b/make/PreInit.gmk
+index 3df44308dd..490d7c24e9 100644
+--- a/make/PreInit.gmk
++++ b/make/PreInit.gmk
+@@ -60,13 +60,19 @@
+ # Extract non-global targets that require a spec file.
+ CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
+ 
++# GNU make-4.4 (and later) include not just single-letter form of the
++# options MAKEFILES but also long for and even some of the arguments.
++# Skip long form and use only short form:
++#     MAKEFLAGS=' --debug=basic -- LOG=trace ...'
++MAKEFLAGS_SINGLE_LETTER := $(firstword -$(MAKEFLAGS))
++
+ # If we have only global targets, or if we are called with -qp (assuming an
+ # external part, e.g. bash completion, is trying to understand our targets),
+ # we will skip SPEC location and the sanity checks.
+ ifeq ($(CALLED_SPEC_TARGETS), )
+   SKIP_SPEC := true
+ endif
+-ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
++ifeq ($(findstring p, $(MAKEFLAGS_SINGLE_LETTER))$(findstring q, $(MAKEFLAGS_SINGLE_LETTER)), pq)
+   SKIP_SPEC := true
+ endif
+ 
diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json
new file mode 100644
index 000000000000..b34a8438ef74
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/25/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=",
+  "owner": "openjdk",
+  "repo": "jdk25u",
+  "rev": "refs/tags/jdk-25+36"
+}
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 24f0e384cb4c..4b0d810ffe86 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -80,6 +80,7 @@
   temurin-bin-21,
   temurin-bin-23,
   temurin-bin-24,
+  temurin-bin-25,
   jdk-bootstrap ?
     {
       "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;
@@ -88,6 +89,7 @@
       "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
       "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
       "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24;
+      "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25;
     }
     .${featureVersion},
 }:
@@ -104,6 +106,7 @@ let
   atLeast21 = lib.versionAtLeast featureVersion "21";
   atLeast23 = lib.versionAtLeast featureVersion "23";
   atLeast24 = lib.versionAtLeast featureVersion "24";
+  atLeast25 = lib.versionAtLeast featureVersion "25";
 
   tagPrefix = if atLeast11 then "jdk-" else "jdk";
   version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;
@@ -217,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
       sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
     })
   ]
-  ++ lib.optionals atLeast11 [
+  ++ lib.optionals (atLeast11 && !atLeast25) [
     # Fix build for gnumake-4.4.1:
     #   https://github.com/openjdk/jdk/pull/12992
     (fetchpatch {
@@ -226,6 +229,9 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
     })
   ]
+  ++ lib.optionals atLeast25 [
+    ./25/patches/make-4.4.1.patch
+  ]
   ++ lib.optionals (!headless && enableGtk) [
     (
       if atLeast17 then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf92b29fefa1..65300938ad04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5290,6 +5290,11 @@ with pkgs;
   jdk24 = openjdk24;
   jdk24_headless = openjdk24_headless;
 
+  openjdk25 = javaPackages.compiler.openjdk25;
+  openjdk25_headless = javaPackages.compiler.openjdk25.headless;
+  jdk25 = openjdk25;
+  jdk25_headless = openjdk25_headless;
+
   # default JDK
   jdk = jdk21;
   jdk_headless = jdk21_headless;
@@ -5316,6 +5321,10 @@ with pkgs;
     jdk = jdk21;
     jdkOnBuild = buildPackages.jdk21;
   };
+  jre25_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+    jdk = jdk25;
+    jdkOnBuild = buildPackages.jdk25;
+  };
   jre_minimal = callPackage ../development/compilers/openjdk/jre.nix {
     jdkOnBuild = buildPackages.jdk;
   };
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 770a29df445e..f0095f5be91b 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -50,6 +50,7 @@ with pkgs;
       openjdk21 = mkOpenjdk "21";
       openjdk23 = mkOpenjdk "23";
       openjdk24 = mkOpenjdk "24";
+      openjdk25 = mkOpenjdk "25";
 
       # Legacy aliases
       openjdk8-bootstrap = temurin-bin.jdk-8;

From a1a0182ae5b158a7019c71c447247e233ed85854 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 13:22:51 +0000
Subject: [PATCH 22/91] opa-envoy-plugin: 1.8.0-envoy -> 1.9.0-envoy

---
 pkgs/by-name/op/opa-envoy-plugin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index faac23a3b05e..03ec4393af1c 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule rec {
   pname = "opa-envoy-plugin";
-  version = "1.8.0-envoy";
+  version = "1.9.0-envoy";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa-envoy-plugin";
     tag = "v${version}";
-    hash = "sha256-tPPF/zCwPShejBZZO1Kw7+jd4BpTU81DeIUxxz9b0RY=";
+    hash = "sha256-Arc0aVDcGZqCrrUrAB9yVXSXzdtOlXEFGZ8pJ578oKk=";
   };
 
   vendorHash = null;

From 78c5ad9fa5c012bc2efc6c1cd955b26e26e6cd6d Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Fri, 26 Sep 2025 13:13:06 +0200
Subject: [PATCH 23/91] openjfx25: init at 25+29

`eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355` has been manually added in deps.json,
as our gradle dependency lockfile generator currently cannot handle platform
specific dependencies like this one.
---
 pkgs/by-name/op/openjfx/25/deps.json          | 145 ++++++++++++++++++
 pkgs/by-name/op/openjfx/25/source.json        |   6 +
 pkgs/by-name/op/openjfx/package.nix           |   2 +
 .../development/compilers/openjdk/generic.nix |   2 +
 pkgs/top-level/all-packages.nix               |   1 +
 5 files changed, 156 insertions(+)
 create mode 100644 pkgs/by-name/op/openjfx/25/deps.json
 create mode 100644 pkgs/by-name/op/openjfx/25/source.json

diff --git a/pkgs/by-name/op/openjfx/25/deps.json b/pkgs/by-name/op/openjfx/25/deps.json
new file mode 100644
index 000000000000..ccf9307c9961
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/25/deps.json
@@ -0,0 +1,145 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://download.eclipse.org": {
+  "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": {
+   "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs="
+  },
+  "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355": {
+   "jar": "sha256-j98ySq5bTxFHbDJKzWMZP+kfUqekWU1jYUJNDyNg9js="
+  }
+ },
+ "https://github.com": {
+  "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": {
+   "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/ibm/icu#icu4j/61.1": {
+   "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=",
+   "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
+  "org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
+   "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
+   "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw="
+  },
+  "org/antlr#ST4/4.1": {
+   "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=",
+   "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw="
+  },
+  "org/antlr#antlr-master/3.5.2": {
+   "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
+  },
+  "org/antlr#antlr-runtime/3.5.2": {
+   "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
+   "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
+  },
+  "org/antlr#antlr4-master/4.7.2": {
+   "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
+  },
+  "org/antlr#antlr4-runtime/4.7.2": {
+   "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
+   "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
+  },
+  "org/antlr#antlr4/4.7.2": {
+   "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E="
+  },
+  "org/antlr#antlr4/4.7.2/complete": {
+   "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache/lucene#lucene-core/7.7.3": {
+   "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=",
+   "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo="
+  },
+  "org/apache/lucene#lucene-grouping/7.7.3": {
+   "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=",
+   "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU="
+  },
+  "org/apache/lucene#lucene-parent/7.7.3": {
+   "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU="
+  },
+  "org/apache/lucene#lucene-queries/7.7.3": {
+   "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=",
+   "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA="
+  },
+  "org/apache/lucene#lucene-queryparser/7.7.3": {
+   "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=",
+   "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI="
+  },
+  "org/apache/lucene#lucene-sandbox/7.7.3": {
+   "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=",
+   "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI="
+  },
+  "org/apache/lucene#lucene-solr-grandparent/7.7.3": {
+   "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/glassfish#javax.json/1.0.4": {
+   "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=",
+   "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ="
+  },
+  "org/glassfish#json/1.0.4": {
+   "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY="
+  },
+  "org/junit#junit-bom/5.12.2": {
+   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
+   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.12.2": {
+   "jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=",
+   "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=",
+   "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.12.2": {
+   "jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=",
+   "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=",
+   "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.12.2": {
+   "jar": "sha256-shn/qUm5CnGqO2wrYGRWuCvKCyCJt0Wcj/RhFW/1mw8=",
+   "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=",
+   "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw="
+  },
+  "org/junit/jupiter#junit-jupiter/5.12.2": {
+   "jar": "sha256-OFSzrUNJBrgn/sR0qg2NqLVunlbV/H8uIPw/EuxL6JQ=",
+   "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=",
+   "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc="
+  },
+  "org/junit/platform#junit-platform-commons/1.12.2": {
+   "jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=",
+   "module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=",
+   "pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc="
+  },
+  "org/junit/platform#junit-platform-engine/1.12.2": {
+   "jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=",
+   "module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=",
+   "pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA="
+  },
+  "org/junit/platform#junit-platform-launcher/1.12.2": {
+   "jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=",
+   "module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=",
+   "pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E="
+  },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ }
+}
diff --git a/pkgs/by-name/op/openjfx/25/source.json b/pkgs/by-name/op/openjfx/25/source.json
new file mode 100644
index 000000000000..1ba71dbdaa6c
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/25/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-O8ogDcM/YYYwFmYqglc48m11lcbjqxeYbjsB6crY1bU=",
+  "owner": "openjdk",
+  "repo": "jfx25u",
+  "rev": "refs/tags/25+29"
+}
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index 04c6006d723d..ca4cab8b6cba 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -37,12 +37,14 @@
   jdk21_headless,
   jdk23_headless,
   jdk24_headless,
+  jdk25_headless,
   jdk-bootstrap ?
     {
       "17" = jdk17_headless;
       "21" = jdk21_headless;
       "23" = jdk23_headless;
       "24" = jdk24_headless;
+      "25" = jdk25_headless;
     }
     .${featureVersion},
 }:
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 4b0d810ffe86..2a9012113690 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -60,12 +60,14 @@
   openjfx21,
   openjfx23,
   openjfx24,
+  openjfx25,
   openjfx_jdk ?
     {
       "17" = openjfx17;
       "21" = openjfx21;
       "23" = openjfx23;
       "24" = openjfx24;
+      "25" = openjfx25;
     }
     .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65300938ad04..c3e584654d40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5254,6 +5254,7 @@ with pkgs;
   openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
   openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
   openjfx24 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "24"; };
+  openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; };
 
   openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
   openjdk8 = javaPackages.compiler.openjdk8;

From 06fa0a1e64215e5cbbcabe77fc84c78a5bb33abf Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Fri, 26 Sep 2025 17:42:23 +0200
Subject: [PATCH 24/91] jre{11,17,21,25,}_minimal: group together in
 all-packages.nix

According to https://github.com/NixOS/nixpkgs/blob/5b751d1b50366c18fc5ef7faa82f5d4d2b75ef47/pkgs/by-name/README.md#recommendation-for-new-packages-with-multiple-versions
---
 pkgs/top-level/all-packages.nix | 47 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3e584654d40..33347561016a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5310,25 +5310,34 @@ with pkgs;
   jre = jdk;
   jre_headless = jdk_headless;
 
-  jre11_minimal = callPackage ../development/compilers/openjdk/jre.nix {
-    jdk = jdk11;
-    jdkOnBuild = buildPackages.jdk11;
-  };
-  jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
-    jdk = jdk17;
-    jdkOnBuild = buildPackages.jdk17;
-  };
-  jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {
-    jdk = jdk21;
-    jdkOnBuild = buildPackages.jdk21;
-  };
-  jre25_minimal = callPackage ../development/compilers/openjdk/jre.nix {
-    jdk = jdk25;
-    jdkOnBuild = buildPackages.jdk25;
-  };
-  jre_minimal = callPackage ../development/compilers/openjdk/jre.nix {
-    jdkOnBuild = buildPackages.jdk;
-  };
+  inherit
+    ({
+      jre11_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+        jdk = jdk11;
+        jdkOnBuild = buildPackages.jdk11;
+      };
+      jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+        jdk = jdk17;
+        jdkOnBuild = buildPackages.jdk17;
+      };
+      jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+        jdk = jdk21;
+        jdkOnBuild = buildPackages.jdk21;
+      };
+      jre25_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+        jdk = jdk25;
+        jdkOnBuild = buildPackages.jdk25;
+      };
+      jre_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+        jdkOnBuild = buildPackages.jdk;
+      };
+    })
+    jre11_minimal
+    jre17_minimal
+    jre21_minimal
+    jre25_minimal
+    jre_minimal
+    ;
 
   openjdk = jdk;
   openjdk_headless = jdk_headless;

From dfc4f5553509e7380d6b60939e65662fa6dc71f6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 26 Sep 2025 22:34:24 +0200
Subject: [PATCH 25/91] octopus: split outputs

---
 pkgs/by-name/oc/octopus/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix
index 787f8702ebb3..ebd65f82b5ba 100644
--- a/pkgs/by-name/oc/octopus/package.nix
+++ b/pkgs/by-name/oc/octopus/package.nix
@@ -40,6 +40,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
   };
 
+  outputs = [
+    "out"
+    "dev"
+    "testsuite"
+  ];
+
   nativeBuildInputs = [
     which
     perl
@@ -73,6 +79,7 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "OCTOPUS_MPI" enableMpi)
     (lib.cmakeBool "OCTOPUS_ScaLAPACK" enableMpi)
     (lib.cmakeBool "OCTOPUS_OpenMP" true)
+    (lib.cmakeBool "OCTOPUS_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ];
 
   nativeCheckInputs = lib.optional.enableMpi mpi;

From a19281a3c4a4fbdd3a2544c9d90f2e325092c373 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 26 Sep 2025 22:25:25 +0200
Subject: [PATCH 26/91] octopus: refactor

* switch to finalAttrs
* remove "with lib" from meta
* fix typo/bug in nativeBuildInputs
* fix checks, target is outdated
---
 pkgs/by-name/oc/octopus/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix
index ebd65f82b5ba..e5018530f519 100644
--- a/pkgs/by-name/oc/octopus/package.nix
+++ b/pkgs/by-name/oc/octopus/package.nix
@@ -29,14 +29,14 @@
 assert (!blas.isILP64) && (!lapack.isILP64);
 assert (blas.isILP64 == arpack.isILP64);
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "octopus";
   version = "16.2";
 
   src = fetchFromGitLab {
     owner = "octopus-code";
     repo = "octopus";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
   };
 
@@ -82,9 +82,8 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "OCTOPUS_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ];
 
-  nativeCheckInputs = lib.optional.enableMpi mpi;
-  doCheck = false;
-  checkTarget = "check-short";
+  nativeCheckInputs = lib.optional enableMpi mpi;
+  doCheck = false; # requires installed data
 
   postPatch = ''
     patchShebangs ./
@@ -94,15 +93,20 @@ stdenv.mkDerivation rec {
     patchShebangs testsuite/oct-run_testsuite.sh
   '';
 
+  postInstall = ''
+    mkdir -p $testsuite
+    moveToOutput share/octopus/testsuite $testsuite
+  '';
+
   enableParallelBuilding = true;
 
   passthru = lib.attrsets.optionalAttrs enableMpi { inherit mpi; };
 
-  meta = with lib; {
+  meta = {
     description = "Real-space time dependent density-functional theory code";
     homepage = "https://octopus-code.org";
-    maintainers = with maintainers; [ markuskowa ];
-    license = with licenses; [
+    maintainers = with lib.maintainers; [ markuskowa ];
+    license = with lib.licenses; [
       gpl2Only
       asl20
       lgpl3Plus
@@ -110,4 +114,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})

From bedd882f54348f7f51522172516150f2e4f5cac1 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Fri, 26 Sep 2025 21:56:31 -0500
Subject: [PATCH 27/91] lmstudio: 0.3.26.6 -> 0.3.27.4

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

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index e84c6b84bb91..abd8342e999c 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.26-6";
-  hash_aarch64-darwin = "sha256-2ss6lMU4vb3m23v1qQWFn4U1p+fZ2mSGVVkKw3ETgXc=";
-  version_x86_64-linux = "0.3.26-6";
-  hash_x86_64-linux = "sha256-UKdopw/sMuXY460KA9Oj8ckANdFDt2VApEsSZ1Gh1Wo=";
+  version_aarch64-darwin = "0.3.27-4";
+  hash_aarch64-darwin = "sha256-KEgUgfYG6yHZzTaKpGiSkyhZcb3W2KTlIhnbQdKpYm0=";
+  version_x86_64-linux = "0.3.27-4";
+  hash_x86_64-linux = "sha256-CU7kfcyo054UvjSar5QB2aGrCPAdh1EMqEJyZkv7Mdk=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From 1f4d19e2860c5d961245229f413521d0f45c3a1c Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Sat, 27 Sep 2025 19:51:33 +0200
Subject: [PATCH 28/91] dcw-gmt: 2.1.2 -> 2.2.0 and switch to github

---
 pkgs/by-name/dc/dcw-gmt/package.nix | 33 +++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/dc/dcw-gmt/package.nix b/pkgs/by-name/dc/dcw-gmt/package.nix
index c99acb2d29ef..c0b17fd92bf0 100644
--- a/pkgs/by-name/dc/dcw-gmt/package.nix
+++ b/pkgs/by-name/dc/dcw-gmt/package.nix
@@ -1,15 +1,18 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dcw-gmt";
-  version = "2.1.2";
-  src = fetchurl {
-    url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk=";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "GenericMappingTools";
+    repo = "dcw-gmt";
+    tag = finalAttrs.version;
+    hash = "sha256-OgFonNbhvzRfQZksnwIbgASbMGnL0bmD4wkXZBl3kIU=";
   };
 
   installPhase = ''
@@ -18,16 +21,20 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    homepage = "https://www.soest.hawaii.edu/pwessel/dcw/";
+    homepage = "https://github.com/GenericMappingTools/dcw-gmt";
     description = "Vector basemap of the world, for use with GMT";
     longDescription = ''
-      DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap
-      of the world, available from the Princeton University Digital Map and
-      Geospatial Information Center. It contains more state boundaries (the
-      largest 8 countries are now represented) than the original data
-      source. Information about DCW can be found on Wikipedia
-      (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is
-      for use by GMT, the Generic Mapping Tools.
+      The Digital Chart of the World is a comprehensive 1:1,000,000 scale vector
+      basemap of the world. The charts were designed to meet the needs of pilots
+      and air crews in medium- and low-altitude en route navigation and to
+      support military operational planning, intelligence briefings, and other
+      needs. For basic background information about DCW, see the [Wikipedia
+      entry](http://en.wikipedia.org/wiki/Digital_Chart_of_the_World).
+
+      DCW-GMT is an enhancement to DCW in a few ways:
+
+      - It contains more state boundaries (the largest 8 countries, Great Britain and Norway are now represented).
+      - The data have been reformatted to save space and are distributed as a single deflated netCDF-4 file.
     '';
     license = licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ tviti ];

From 3e078a1da8d038ce683496b9a82db7445fdd6cbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 03:13:36 +0000
Subject: [PATCH 29/91] python3Packages.langgraph-runtime-inmem: 0.12.0 ->
 0.14.1

---
 .../python-modules/langgraph-runtime-inmem/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
index 8a9c8ec391c3..396046068540 100644
--- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-runtime-inmem";
-  version = "0.12.0";
+  version = "0.14.1";
   pyproject = true;
 
   # Not available in any repository
   src = fetchPypi {
     pname = "langgraph_runtime_inmem";
     inherit version;
-    hash = "sha256-h1YFV8lqb929MjzOIHPI8hahjDCkShr83kevjUWFF8A=";
+    hash = "sha256-OIgTFwx0f8W/oRpF12jtaENWcripe1Tr/6Mx0k+nnLw=";
   };
 
   build-system = [

From f7d6d11e8e8e046faaa6fbc55c2c1312e967cf04 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 28 Sep 2025 18:18:03 +0200
Subject: [PATCH 30/91] workflows/check: don't check github api for owners file

This removes the "owners" check from codeowners-validator. With it, all
tokens and permissions can be removed, because these were only needed to
make these requests.

This solves the problem of codeowners-validator not supporting our new
nested team structure for nixpkgs-maintainers. To make the onboarding of
new teams easier, we moved all teams "under" the nixpkgs-maintainers
team. This makes them inherit the right privileges (triage) for Nixpkgs.

However, this inheritance is not recognized by codeowners-validator,
thus it assumes that these teams don't have access to Nixpkgs. This then
fails the owners check immediately.

Removing the owners check also has a few other advantages:
- This check depends on external state: If a user is renamed or a team
removed, the check will fail. This makes it a bad check for required
status checks or merge queues - the check might fail randomly,
independent of the current PR.
- Running this check in a fork will never work, because the respective
users and teams don't have access to the fork's repo.

Both of this required us to set `continue-on-error: true` most of the
time.
---
 .github/workflows/check.yml | 46 ++++---------------------------------
 .github/workflows/pr.yml    |  4 ----
 .github/workflows/test.yml  |  1 -
 ci/github-script/prepare.js |  1 -
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 15db37f6c99e..dae14977e90f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -12,17 +12,12 @@ on:
       mergedSha:
         required: true
         type: string
-      ownersCanFail:
-        required: true
-        type: boolean
       targetSha:
         required: true
         type: string
     secrets:
       CACHIX_AUTH_TOKEN:
         required: true
-      OWNER_RO_APP_PRIVATE_KEY:
-        required: true
 
 permissions: {}
 
@@ -72,19 +67,8 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
 
-  # For checking code owners, this job depends on a GitHub App with the following permissions:
-  # - Permissions:
-  #   - Repository > Administration: read-only
-  #   - Organization > Members: read-only
-  # - Install App on this repository, setting these variables:
-  #   - OWNER_RO_APP_ID (variable)
-  #   - OWNER_RO_APP_PRIVATE_KEY (secret)
-  #
-  # This should not use the same app as the job to request reviewers, because this job requires
-  # handling untrusted PR input.
   owners:
     runs-on: ubuntu-24.04-arm
-    continue-on-error: ${{ inputs.ownersCanFail }}
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -94,7 +78,6 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
-          target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@a809471b5c7c913aa67bec8f459a11a0decc3fce # v31
 
@@ -107,36 +90,15 @@ jobs:
           pushFilter: -source$
 
       - name: Build codeowners validator
-        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
-
-      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
-        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_RO_APP_ID }}
-          private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
-          permission-administration: read
-          permission-members: read
-
-      - name: Log current API rate limits
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
+        run: nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A codeownersValidator
 
       - name: Validate codeowners
-        if: steps.app-token.outputs.token
         env:
           OWNERS_FILE: nixpkgs/untrusted/ci/OWNERS
-          GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY_PATH: nixpkgs/untrusted
-          OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
+          # Omits "owners", which checks whether GitHub handles exist, but fails with nested team
+          # structures.
+          CHECKS: "duppatterns,files,syntax"
           # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
           EXPERIMENTAL_CHECKS: "avoid-shadowing"
         run: result/bin/codeowners-validator
-
-      - name: Log current API rate limits
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2ff431225502..9f4a2ba4d0b4 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -11,8 +11,6 @@ on:
       OWNER_APP_PRIVATE_KEY:
         # The Test workflow should not actually request reviews from owners.
         required: false
-      OWNER_RO_APP_PRIVATE_KEY:
-        required: true
 
 concurrency:
   group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
@@ -59,13 +57,11 @@ jobs:
       pull-requests: write
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
     with:
       baseBranch: ${{ needs.prepare.outputs.baseBranch }}
       headBranch: ${{ needs.prepare.outputs.headBranch }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
-      ownersCanFail: ${{ !contains(fromJSON(needs.prepare.outputs.touched), 'owners') }}
 
   lint:
     name: Lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e82719ab205f..0806b61c34c9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -98,7 +98,6 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
-      OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
 
   push:
     if: needs.prepare.outputs.push
diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js
index e66a774e981c..7ef825a3ca17 100644
--- a/ci/github-script/prepare.js
+++ b/ci/github-script/prepare.js
@@ -221,7 +221,6 @@ module.exports = async ({ github, context, core, dry }) => {
 
     const touched = []
     if (files.includes('ci/pinned.json')) touched.push('pinned')
-    if (files.includes('ci/OWNERS')) touched.push('owners')
     core.setOutput('touched', touched)
 
     return

From 1692055fdc8ac64cc0c6b3d7f31f518782e3720e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 21:15:19 +0000
Subject: [PATCH 31/91] immich-go: 0.27.0 -> 0.28.0

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

diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix
index 07a84cb71302..fdfb91acc17c 100644
--- a/pkgs/by-name/im/immich-go/package.nix
+++ b/pkgs/by-name/im/immich-go/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule rec {
   pname = "immich-go";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "simulot";
     repo = "immich-go";
     tag = "v${version}";
-    hash = "sha256-TvvoFe7uyuollKTsioIkdcXTDOZqE+hPkZTPk+PNEqQ=";
+    hash = "sha256-H/ch6W9PrVg7MnQ6/QcMhadihjWx5oHlC7z4oZmjyvQ=";
 
     # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
     # The intention here is to write the information into files in the `src`'s
@@ -32,7 +32,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-qJdxpOUB5OPKIz39cqELJorstsagwrJ0W5AKBDlIxzs=";
+  vendorHash = "sha256-EAlslQsLuOp1yrSi0wsNoSqyHnGvLHrf8np4rKrn9yY=";
 
   # options used by upstream:
   # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml

From ca5c0f76fcb1e28b61bf73f6bad8198bfc65cc12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Mar 2025 07:54:23 +0000
Subject: [PATCH 32/91] rasdaemon: 0.8.2 -> 0.8.3

---
 pkgs/by-name/ra/rasdaemon/package.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix
index 27f80748b727..765d6d50e91b 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -1,6 +1,7 @@
 {
   autoreconfHook,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   libtraceevent,
   nix-update-script,
@@ -16,15 +17,24 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rasdaemon";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "mchehab";
     repo = "rasdaemon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-veaqAbSJvoUzkn1OLYY3t3y9Bh8dzuenpLGO2yz/yaM=";
+    hash = "sha256-SpMNkeJkjaWteWsIScRnzNILf+PtVu1sX9e6ctwm3G0=";
   };
 
+  patches = [
+    # https://github.com/mchehab/rasdaemon/pull/212
+    (fetchpatch {
+      name = "fix_buffer_overflow_in_add_event_handler_read.patch";
+      url = "https://github.com/mchehab/rasdaemon/commit/46bed1b6845bcb560d760b4cacea7df67cd6d1fd.patch";
+      hash = "sha256-5T5U2i0i/7MpHzqpPq6mn2ghSUj9O6BzY11VcySgCMo=";
+    })
+  ];
+
   strictDeps = true;
 
   enableParallelBuilding = true;

From 4be62ca52cd604eaef5d5a158939acb34b725179 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Mon, 29 Sep 2025 10:32:03 +0200
Subject: [PATCH 33/91] Revert "python3Packages.catkin-pkg: remove package"

This reverts commit ef5b27d9a9c01927f6604a6aacd412d2d99a1903.

The package is used in https://github.com/lopsided98/nix-ros-overlay.
---
 .../python-modules/catkin-pkg/default.nix     | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/catkin-pkg/default.nix

diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix
new file mode 100644
index 000000000000..c48d1b054b7b
--- /dev/null
+++ b/pkgs/development/python-modules/catkin-pkg/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  docutils,
+  pyparsing,
+  python-dateutil,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "catkin-pkg";
+  version = "1.0.0";
+
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ros-infrastructure";
+    repo = "catkin_pkg";
+    rev = version;
+    hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    docutils
+    pyparsing
+    python-dateutil
+    setuptools
+  ];
+
+  pythonImportsCheck = [ "catkin_pkg" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTestPaths = [ "test/test_flake8.py" ];
+
+  meta = {
+    changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${version}/CHANGELOG.rst";
+    description = "Library for retrieving information about catkin packages";
+    homepage = "http://wiki.ros.org/catkin_pkg";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      adhityaravi
+      bepri
+      dstathis
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f0135c1ca6d..655faae719f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2392,6 +2392,8 @@ self: super: with self; {
     };
   };
 
+  catkin-pkg = callPackage ../development/python-modules/catkin-pkg { };
+
   catppuccin = callPackage ../development/python-modules/catppuccin { };
 
   cattrs = callPackage ../development/python-modules/cattrs { };

From 8c69f8c3a867fb2a86627b79431e1391b4127277 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Mon, 29 Sep 2025 10:40:45 +0200
Subject: [PATCH 34/91] python3Packages.catkin-pkg: Set myself as a maintainer

This was suggested by a former maintainer:
https://github.com/NixOS/nixpkgs/pull/443998#issuecomment-3345661682.
---
 pkgs/development/python-modules/catkin-pkg/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix
index c48d1b054b7b..da3644de735b 100644
--- a/pkgs/development/python-modules/catkin-pkg/default.nix
+++ b/pkgs/development/python-modules/catkin-pkg/default.nix
@@ -43,9 +43,7 @@ buildPythonPackage rec {
     homepage = "http://wiki.ros.org/catkin_pkg";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
-      adhityaravi
-      bepri
-      dstathis
+      wentasah
     ];
   };
 }

From 4a9f9fcdce7b79cb237a4fa0d49ac35835955536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 08:53:25 +0000
Subject: [PATCH 35/91] qgis-ltr: 3.40.10 -> 3.40.11

---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 730888167763..0e7ebfe59e9a 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.40.10";
+  version = "3.40.11";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-3FvHAoVeTwBvFNUxSCSumjiPg1hK3oRS1zMzWLXoSTc=";
+    hash = "sha256-HjdOLG/x8qXTDlMKW6+jBuwi+36rBkBFM1OCe3BcjWY=";
   };
 
   passthru = {

From b1e8ec65f859b081f81868560ba0219df611f3df Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Mon, 29 Sep 2025 10:49:27 +0200
Subject: [PATCH 36/91] python3Packages.catkin-pkg: 1.0.0 -> 1.1.0

Changelog: https://github.com/ros-infrastructure/catkin_pkg/blob/1.1.0/CHANGELOG.rst
---
 pkgs/development/python-modules/catkin-pkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix
index da3644de735b..82e3aeea62ad 100644
--- a/pkgs/development/python-modules/catkin-pkg/default.nix
+++ b/pkgs/development/python-modules/catkin-pkg/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "catkin-pkg";
-  version = "1.0.0";
+  version = "1.1.0";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "ros-infrastructure";
     repo = "catkin_pkg";
     rev = version;
-    hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ=";
+    hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM=";
   };
 
   build-system = [ setuptools ];

From 79d8cf53a08fb436385457a59f496cc031cb4c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 11:02:59 +0000
Subject: [PATCH 37/91] qgis: 3.44.2 -> 3.44.3

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 90ad45152c03..c102d9c23356 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.44.2";
+  version = "3.44.3";
   pname = "qgis-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-ERaox5jqB7E/W0W6NnipHx1qfY2+FTHYf3r2l1KRkC0=";
+    hash = "sha256-g7ZdNLal16b0Fbq492mPpOiNkYc3Bm4c7INWX+2e7H8=";
   };
 
   passthru = {

From fa9ebfa44d828d1ab8f9563790dd9cdfa87d1625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 29 Sep 2025 04:24:46 -0700
Subject: [PATCH 38/91] python3Packages.pyportainer: init at 1.0.1

---
 .../python-modules/pyportainer/default.nix    | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyportainer/default.nix

diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
new file mode 100644
index 000000000000..aa22c41e24fb
--- /dev/null
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -0,0 +1,53 @@
+{
+  aiohttp,
+  aresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  mashumaro,
+  orjson,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  syrupy,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "pyportainer";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "erwindouna";
+    repo = "pyportainer";
+    tag = "v${version}";
+    hash = "sha256-SAHcIP6M4WjWnrRwz4FlsV6rel1vHzH+cGHT8D/PcQk=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    mashumaro
+    orjson
+    yarl
+  ];
+
+  pythonImportsCheck = [ "pyportainer" ];
+
+  nativeCheckInputs = [
+    aresponses
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/erwindouna/pyportainer/releases/tag/${src.tag}";
+    description = "Asynchronous Python client for the Portainer API";
+    homepage = "https://github.com/erwindouna/pyportainer";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb45c286334a..ea5e9d5358a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13805,6 +13805,8 @@ self: super: with self; {
 
   pyporscheconnectapi = callPackage ../development/python-modules/pyporscheconnectapi { };
 
+  pyportainer = callPackage ../development/python-modules/pyportainer { };
+
   pyppeteer = callPackage ../development/python-modules/pyppeteer { };
 
   pyppmd = callPackage ../development/python-modules/pyppmd { };

From 8e858ac9e082064e767226c766f08f712c3ebfcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 13:51:14 +0000
Subject: [PATCH 39/91] sentry-native: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index d1f03e908c9e..1d73caa79429 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = version;
-    hash = "sha256-PEm6Vu5MTT+T28jNnsRkHQo2k3o1ZbHQV8hOo7VKNbQ=";
+    hash = "sha256-1BZtlGeSnop0ti/XhrmDxzZOFwzS6bagcZ4+7tM5zEk=";
   };
 
   nativeBuildInputs = [

From 024b4c9b18d64628a62b9c89466dc2cf4fd61ab5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 14:48:25 +0000
Subject: [PATCH 40/91] msbuild-structured-log-viewer: 2.3.42 -> 2.3.60

---
 pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index 6d9651656416..3b88692c8a6a 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -14,13 +14,13 @@
 }:
 buildDotnetModule (finalAttrs: {
   pname = "msbuild-structured-log-viewer";
-  version = "2.3.42";
+  version = "2.3.60";
 
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-C6fArtGQd6XugbzI2TjTKQj0O6JGFz+kjsBF5pVJpPY=";
+    hash = "sha256-IjiZfsrkaTgqNBPD4Zw9t6DzAlMjnXZgkpFk7pwgsWI=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;

From bf2ca35c92bd8d0be7446e1fce7c8c53a6014e19 Mon Sep 17 00:00:00 2001
From: felissedano <contact@felissedano.com>
Date: Mon, 29 Sep 2025 11:58:35 -0400
Subject: [PATCH 41/91] kopia-ui: fix desktop icon not showing

---
 pkgs/by-name/ko/kopia-ui/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix
index 754bc9e9d1b9..4f9f4bebcbaf 100644
--- a/pkgs/by-name/ko/kopia-ui/package.nix
+++ b/pkgs/by-name/ko/kopia-ui/package.nix
@@ -73,7 +73,7 @@ buildNpmPackage {
       type = "Application";
       desktopName = "KopiaUI";
       comment = "Fast and secure open source backup.";
-      icon = "kopia-ui";
+      icon = "kopia";
       exec = "kopia-ui";
       categories = [ "Utility" ];
     })

From 984fec77aff38e2716e7ed61f14d0bd0da7bf782 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 29 Sep 2025 21:06:47 +0400
Subject: [PATCH 42/91] librttopo: fix cross compilation

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

diff --git a/pkgs/by-name/li/librttopo/package.nix b/pkgs/by-name/li/librttopo/package.nix
index 339f618cd88c..12ea18a9c3a5 100644
--- a/pkgs/by-name/li/librttopo/package.nix
+++ b/pkgs/by-name/li/librttopo/package.nix
@@ -27,11 +27,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     validatePkgConfig
-    geos # for geos-config
   ];
 
   buildInputs = [ geos ];
 
+  configureFlags = [
+    "--with-geosconfig=${lib.getExe' (lib.getDev geos) "geos-config"}"
+  ];
+
   enableParallelBuilding = true;
 
   meta = with lib; {

From d1a7116788d6f9cc3f12490e17f5aa0597908dae Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 29 Sep 2025 21:19:30 +0400
Subject: [PATCH 43/91] libspatialite: fix cross compilation

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

diff --git a/pkgs/by-name/li/libspatialite/package.nix b/pkgs/by-name/li/libspatialite/package.nix
index 483c54c33917..94f860b8895a 100644
--- a/pkgs/by-name/li/libspatialite/package.nix
+++ b/pkgs/by-name/li/libspatialite/package.nix
@@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     validatePkgConfig
-    geos # for geos-config
   ];
 
   buildInputs = [
@@ -62,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
   ];
 
+  configureFlags = [
+    "--with-geosconfig=${lib.getExe' (lib.getDev geos) "geos-config"}"
+  ];
+
   enableParallelBuilding = true;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 1c882889c45ce473888b36a94f8ef0f35d2891fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 29 Sep 2025 10:24:03 -0700
Subject: [PATCH 44/91] python3Packages.irm-kmi-api: init at 1.1.0

---
 .../python-modules/irm-kmi-api/default.nix    | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/irm-kmi-api/default.nix

diff --git a/pkgs/development/python-modules/irm-kmi-api/default.nix b/pkgs/development/python-modules/irm-kmi-api/default.nix
new file mode 100644
index 000000000000..91e32ab59695
--- /dev/null
+++ b/pkgs/development/python-modules/irm-kmi-api/default.nix
@@ -0,0 +1,47 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  freezegun,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+  svgwrite,
+}:
+
+buildPythonPackage rec {
+  pname = "irm-kmi-api";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jdejaegh";
+    repo = "irm-kmi-api";
+    tag = version;
+    hash = "sha256-E8lf2TpeA91mRbxXYCsuum0mJdE5XLXX0l8CKEl5SFw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    svgwrite
+  ];
+
+  pythonImportsCheck = [ "irm_kmi_api" ];
+
+  nativeCheckInputs = [
+    freezegun
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/jdejaegh/irm-kmi-api/releases/tag/${src.tag}";
+    description = "Retrieve data from the Belgian Royal Meteorological Institute";
+    homepage = "https://github.com/jdejaegh/irm-kmi-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb45c286334a..4fae7f7a77aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7261,6 +7261,8 @@ self: super: with self; {
 
   irisclient = callPackage ../development/python-modules/irisclient { };
 
+  irm-kmi-api = callPackage ../development/python-modules/irm-kmi-api { };
+
   isal = callPackage ../development/python-modules/isal { };
 
   isbnlib = callPackage ../development/python-modules/isbnlib { };

From b3d4f012c991ce58f7ecd002d5333264b10f4c7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 29 Sep 2025 20:06:55 +0200
Subject: [PATCH 45/91] python313Packages.e3-core: add missing resolvelib

---
 pkgs/development/python-modules/e3-core/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix
index 3c5f7e79ee60..6645c0fc1fd6 100644
--- a/pkgs/development/python-modules/e3-core/default.nix
+++ b/pkgs/development/python-modules/e3-core/default.nix
@@ -14,6 +14,7 @@
   requests-cache,
   requests-toolbelt,
   requests,
+  resolvelib,
   setuptools,
   stevedore,
   tqdm,
@@ -45,6 +46,7 @@ buildPythonPackage rec {
     requests
     requests-cache
     requests-toolbelt
+    resolvelib
     stevedore
     tqdm
   ]

From d25d7e2f49254a10ccc40c0b968f498ab5628aea Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Mon, 29 Sep 2025 21:08:12 +0300
Subject: [PATCH 46/91] warp-terminal: 0.2025.09.17.08.11.stable_02 ->
 0.2025.09.24.08.11.stable_01

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 38afc7d517e0..ca9fbc62b2f2 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-EPtPjDsSTGsJFRVDM8HtpmcLaPFzbQsph7pyNdXllAU=",
-    "version": "0.2025.09.17.08.11.stable_02"
+    "hash": "sha256-5lSv9/RLHVu9rusUO2MEGDKCEjteNNOiOfhk9f35a78=",
+    "version": "0.2025.09.24.08.11.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-5av17Bcg8ri7+y4H8ZJeUuOkpcNbag+VH6OYVF0JrCQ=",
-    "version": "0.2025.09.17.08.11.stable_02"
+    "hash": "sha256-Ho8xOs9hke5jiM0y4QVsaE9pUfbEc6rjbipxtGRp6Ec=",
+    "version": "0.2025.09.24.08.11.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-QM5abg5hbwvOBioLOdYN1IGCP1y5manRGsnmj+23EmQ=",
-    "version": "0.2025.09.17.08.11.stable_02"
+    "hash": "sha256-rdCKoIf6CFltrkaCfGu1X644mhtPC9Z2u+w4msj6Jr4=",
+    "version": "0.2025.09.24.08.11.stable_01"
   }
 }

From 12a34eade718dbe5e4a617efcc75c1385953bb10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 19:14:59 +0000
Subject: [PATCH 47/91] komodo: 1.19.4 -> 1.19.5

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

diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix
index c5700c3b3e0b..756d3595f4c5 100644
--- a/pkgs/by-name/ko/komodo/package.nix
+++ b/pkgs/by-name/ko/komodo/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "komodo";
-  version = "1.19.4";
+  version = "1.19.5";
 
   src = fetchFromGitHub {
     owner = "moghtech";
     repo = "komodo";
     tag = "v${version}";
-    hash = "sha256-zUfCcd5ptHQZmg6L5M23d7YuLjjFjutNCtxziXMpF/Q=";
+    hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0=";
   };
 
-  cargoHash = "sha256-9bNbTk9kHLgHoYMRU4Le7WtEbrqQKjJVnetsoe0YTqE=";
+  cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ=";
 
   # disable for check. document generation is fail
   # > error: doctest failed, to rerun pass `-p komodo_client --doc`

From 541b119f3b3cddff29f7bf045f1d1f630ec89812 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 19:51:27 +0000
Subject: [PATCH 48/91] liana: 12.0 -> 13.0

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

diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix
index 9de4a75e4ddd..0c8765e211b3 100644
--- a/pkgs/by-name/li/liana/package.nix
+++ b/pkgs/by-name/li/liana/package.nix
@@ -39,16 +39,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "liana";
-  version = "12.0"; # keep in sync with lianad
+  version = "13.0"; # keep in sync with lianad
 
   src = fetchFromGitHub {
     owner = "wizardsardine";
     repo = "liana";
     tag = "v${version}";
-    hash = "sha256-TZUNYr7p4P/++eX9ZNU/d1IurPrkZn/PJmJOsB01VMY=";
+    hash = "sha256-zr9FZZSLPMk2d5vyZqrj12RG4UCdmkyKLjTU7XpgedE=";
   };
 
-  cargoHash = "sha256-Hb5icOKgQiDzFLWwUfkwXcr1vn80QcAr+fKwG37PkYc=";
+  cargoHash = "sha256-uLSlx1WWCcngL1WSP3jOvwFJd/gbz/g9AT6Of9rwEMw=";
 
   nativeBuildInputs = [
     pkg-config

From f5709672df2942486d6b312dc1b77dce6922ff4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 20:37:57 +0000
Subject: [PATCH 49/91] terraform-providers.migadu: 2025.9.18 -> 2025.9.25

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 64b1977814fb..be86f6889de1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -831,13 +831,13 @@
     "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
   },
   "migadu": {
-    "hash": "sha256-G9/xg4wpqPesRg3+iJU6j71eP8iiFBuQNbSOBpvRR50=",
+    "hash": "sha256-XXtDXByaSnnUGLPiwUNTPTHqDOED7IJQsf8b9x0/R8E=",
     "homepage": "https://registry.terraform.io/providers/metio/migadu",
     "owner": "metio",
     "repo": "terraform-provider-migadu",
-    "rev": "2025.9.18",
+    "rev": "2025.9.25",
     "spdx": "0BSD",
-    "vendorHash": "sha256-cmmTZNYnUebEUiRYZ300VqMz0AiuiTYLZyVOozqC8wo="
+    "vendorHash": "sha256-1kequbTeMoCkLGlnr1TtXDj2agMGMugO2+czrt91ZHE="
   },
   "minio": {
     "hash": "sha256-+I1nTNxLVny0pgdMF7vXPC3WxkInSXnbeHcqgrWG55s=",

From 99f2ce1db48a835c159a831a77f953c173d7bfd8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 29 Sep 2025 20:41:06 +0000
Subject: [PATCH 50/91] python3Packages.python-lsp-ruff: 2.2.2 -> 2.3.0

Diff: https://github.com/python-lsp/python-lsp-ruff/compare/v2.2.2...v2.3.0

Changelog: https://github.com/python-lsp/python-lsp-ruff/releases/tag/v2.3.0
---
 .../python-lsp-ruff/default.nix               | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix
index 8c0f66ee40ea..ded4e7073e8b 100644
--- a/pkgs/development/python-modules/python-lsp-ruff/default.nix
+++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix
@@ -18,25 +18,48 @@
 
 buildPythonPackage rec {
   pname = "python-lsp-ruff";
-  version = "2.2.2";
+  version = "2.3.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = "python-lsp-ruff";
     tag = "v${version}";
-    hash = "sha256-czGA/gl7uoWG9UqYUaY9zER79IKfv7ClqgimgyNCAa4=";
+    hash = "sha256-jtfDdZ68AroXlmR+AIVk/b3WpZk78BCtT8TUh4ELZZI=";
   };
 
-  postPatch = ''
-    # ruff binary is used directly, the ruff python package is not needed
-    sed -i '/"ruff>=/d' pyproject.toml
-    sed -i 's|sys.executable, "-m", "ruff"|"${ruff}/bin/ruff"|' pylsp_ruff/plugin.py
-    sed -i -e '/sys.executable/,+2c"${ruff}/bin/ruff",' -e 's|assert "ruff" in call_args|assert "${ruff}/bin/ruff" in call_args|' tests/test_ruff_lint.py
+  postPatch =
+    let
+      ruffBin = lib.getExe ruff;
+    in
+    ''
+      substituteInPlace pylsp_ruff/plugin.py \
+        --replace-fail \
+          "*find_executable(executable)" \
+          '"${ruffBin}"'
+
+      substituteInPlace tests/test_ruff_lint.py \
+        --replace-fail "str(sys.executable)" '"${ruffBin}"' \
+        --replace-fail '"-m",' "" \
+        --replace-fail '"ruff",' "" \
+        --replace-fail \
+          'assert "ruff" in call_args' \
+          'assert "${ruffBin}" in call_args' \
+        --replace-fail \
+          'ruff_executable = ruff_exe.name' \
+          'ruff_executable = "${ruffBin}"' \
+        --replace-fail 'os.chmod(ruff_executable, st.st_mode | stat.S_IEXEC)' ""
+    ''
     # Nix builds everything in /build/ but ruff somehow doesn't run on files in /build/ and outputs empty results.
-    sed -i -e "s|workspace.root_path|'/tmp/'|g" tests/*.py
-  '';
+    + ''
+      substituteInPlace tests/*.py \
+        --replace-fail "workspace.root_path" '"/tmp/"'
+    '';
+
+  pythonRemoveDeps = [
+    # ruff binary is used directly, the ruff python package is not needed
+    "ruff"
+  ];
 
   dependencies = [
     cattrs

From 41c43b7c21427e0a86991ecfbd26383e78f15af9 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Mon, 29 Sep 2025 17:05:50 -0400
Subject: [PATCH 51/91] fltk14: add libdecor to buildInputs

FLTK_USE_SYSTEM_LIBDECOR is set, but it is not adhered to because libdecor is
not provided in the build environment. This causes FLTK to use bundled libdecor,
which causes an unexpected link-time dependency on GTK+3, which causes a lot of
issues.

Fix this by adding libdecor to the build environment.
---
 pkgs/development/libraries/fltk/1.4.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index ff8f8734926b..b6da2c585748 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -41,6 +41,7 @@
   wayland-protocols,
   libxkbcommon,
   wayland-scanner,
+  libdecor,
 
   withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform),
 
@@ -118,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     libxkbcommon
+    libdecor
   ]
   ++ lib.optionals withCairo [
     cairo

From cc9e523ec1c60dd0c978cac075c282f6387a3018 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Mon, 29 Sep 2025 17:04:34 +0200
Subject: [PATCH 52/91] victorialogs: 1.34.0 -> 1.35.0

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

diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix
index bdb6ce7bc597..6cfe8d5b4990 100644
--- a/pkgs/by-name/vi/victorialogs/package.nix
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaLogs";
-  version = "1.34.0";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaLogs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NUfFXssgNtlb8p9B32aMVSzRJxafMrsuxsR38oHAm2M=";
+    hash = "sha256-9g23rtLi/tHIXpfZSHgaIHIGHwQ0eYW5kLtMHqrIlMk=";
   };
 
   vendorHash = null;
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
   postPatch = ''
     # Allow older go versions
     substituteInPlace go.mod \
-      --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
+      --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}"
 
     substituteInPlace vendor/modules.txt \
       --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"

From 305cd3c48c464e09ec7f24730f62833bd19ecdeb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 29 Sep 2025 23:46:36 +0200
Subject: [PATCH 53/91] python313Packages.pymodbus: 3.11.2 -> 3.11.3

Diff: https://github.com/pymodbus-dev/pymodbus/compare/v3.11.2...v3.11.3

Changelog: https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.11.3
---
 pkgs/development/python-modules/pymodbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index 0214eae7ddc0..1be0a2a6731c 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "3.11.2";
+  version = "3.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymodbus-dev";
     repo = "pymodbus";
     tag = "v${version}";
-    hash = "sha256-xfulpF6NrHM+qJZSlTW4Wb0GqYXQytepyB6bjy2eI9Y=";
+    hash = "sha256-2wOeghoi8FSk1II/0rid+ddRq7ceerH7ZeLcb+SSXKY=";
   };
 
   __darwinAllowLocalNetworking = true;

From 5f1045d67c4b42aee4ccd0a5dde4e27be0246252 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 22:20:11 +0000
Subject: [PATCH 54/91] python3Packages.pykka: 4.3.0 -> 4.4.0

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

diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index 1a5930595d73..313303716046 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pykka";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jodal";
     repo = "pykka";
     tag = "v${version}";
-    hash = "sha256-xCvWqWThsi78S9DW4ssz0gezb0RFGlqW2W8oMxkNc+E=";
+    hash = "sha256-OwY8EKCRuc9Tli7Q+rHieqEAYxb7KNBHiPUuycNO8J4=";
   };
 
   build-system = [ hatchling ];

From ff457af6ec34ae5a9ddf5ec9bf55cefa9824155a Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 29 Sep 2025 18:22:43 -0400
Subject: [PATCH 55/91] smfh: 1.1 -> 1.2

Diff: https://github.com/feel-co/smfh/compare/1.1...1.2
---
 pkgs/by-name/sm/smfh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sm/smfh/package.nix b/pkgs/by-name/sm/smfh/package.nix
index d59d42a9221c..b7dae3aa956d 100644
--- a/pkgs/by-name/sm/smfh/package.nix
+++ b/pkgs/by-name/sm/smfh/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "smfh";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "feel-co";
     repo = "smfh";
     tag = finalAttrs.version;
-    hash = "sha256-/9Ww10kYopxfCNNnNDwENTubs7Wzqlw+O6PJAHNOYQw=";
+    hash = "sha256-LxLu578DRp1l3ekybZ+g6zNbvt27rOx7wORP9ch5O2c=";
   };
 
-  cargoHash = "sha256-MpqbmhjNsE1krs7g3zWSXGxzb4G/A+cz/zxD2Jk2HC8=";
+  cargoHash = "sha256-DOE0Bs09TRP7fUqzB0mdylFc1vYsRjcz9chrQG79ajg=";
 
   meta = {
     description = "Sleek Manifest File Handler";

From 4224c1dd5c7726a003446f35686d5c81b9c0e1bc Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Mon, 29 Sep 2025 15:49:59 -0700
Subject: [PATCH 56/91] gradle: remove dependency on EOL jdk23, use jdk11 for
 test

A passthru test of the javaToolchains configuration property was
using jdk23.

There is a requirement that the JDK version for the
test NOT be "the default for any of the gradle versions", so jdk11
is a good choice for the replacement since jdk17 and jdk21 are
currently used and jdk25 will be used in the future.
---
 pkgs/development/tools/build-managers/gradle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index a998bd5becc1..082b55c4c698 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,8 +1,8 @@
 {
   callPackage,
+  jdk11,
   jdk17,
   jdk21,
-  jdk23,
 }:
 
 let
@@ -56,7 +56,7 @@ let
           tests = {
             toolchains =
               let
-                javaVersion = lib.getVersion jdk23;
+                javaVersion = lib.getVersion jdk11;
                 javaMajorVersion = lib.versions.major javaVersion;
               in
               runCommand "detects-toolchains-from-nix-env"
@@ -65,7 +65,7 @@ let
                   nativeBuildInputs = [
                     (gradle.override {
                       javaToolchains = [
-                        jdk23
+                        jdk11
                       ];
                     })
                   ];

From fbd471a3e404efabe1a7c21e68bc0648a2757909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 01:16:21 +0000
Subject: [PATCH 57/91] python3Packages.icoextract: 0.1.5 -> 0.2.0

---
 pkgs/by-name/ic/icoextract/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix
index 0c671cd7658c..e1145478497c 100644
--- a/pkgs/by-name/ic/icoextract/package.nix
+++ b/pkgs/by-name/ic/icoextract/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icoextract";
-  version = "0.1.5";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlu5";
     repo = "icoextract";
     rev = version;
-    hash = "sha256-McVG8966NCEpzc9biawLvUgbQUtterkIud/9GwOeltI=";
+    hash = "sha256-GJCe7oFUidJt21F4NmOXspxZGRQXIjQvFjFhMYsHLjk=";
   };
 
   build-system = with python3Packages; [ setuptools ];
@@ -29,9 +29,6 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "icoextract" ];
 
   postInstall = ''
-    substituteInPlace exe-thumbnailer.thumbnailer \
-      --replace Exec=exe-thumbnailer Exec=$out/bin/exe-thumbnailer
-
     install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers
   '';
 

From 26d641508f962a5bf564f5da0b1f22126f65c714 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 23:07:08 +0000
Subject: [PATCH 58/91] reindeer: 2025.09.15.00 -> 2025.09.29.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index ed7763f7915a..f6c88abdc755 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.09.15.00";
+  version = "2025.09.29.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-fWfN+x3QuXHX/+0UQ1FW6I1bLIZ1s+McXUEesBtc6wQ=";
+    hash = "sha256-vZ4yKyvGvQOiUDV+i6c1pWURYoXBSjGZqTjAB0yDFDw=";
   };
 
-  cargoHash = "sha256-VcB2WxEjn/XbjnZdQE6D6xKuoGMH1SCITU+C4tVnZHw=";
+  cargoHash = "sha256-kNLspdJiJGcl4epqJzemqjP44aXfkzJs1EX9cZwAhE8=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 1e55482f515e1d626392a20eff196d2670cc9908 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 23:24:17 +0000
Subject: [PATCH 59/91] databricks-cli: 0.269.0 -> 0.270.0

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

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 9b4d127eb4d0..4cb2ec023d5c 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.269.0";
+  version = "0.270.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-E9wxDwWBLJYh1DKREfxxJ2kts6Gd52mxjCxjelI9NaM=";
+    hash = "sha256-DCgj2IXGidWET8jCmmmuz9viOjdO89UqloZ5yvnXluk=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-1XQ88nSziZ2+iWrHk4P0wGJo3jR9dGKMsdRZLqG+ouQ=";
+  vendorHash = "sha256-U5H20Csk8EhIqmUBN8DVYA5jta2LoGLs/EYiZbGo6Tc=";
 
   excludedPackages = [
     "bundle/internal"

From 62c27044963829bac8a13cd74941053eb8d12fce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 00:29:48 +0000
Subject: [PATCH 60/91] nsgenbind: 0.8 -> 0.9

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

diff --git a/pkgs/by-name/ns/nsgenbind/package.nix b/pkgs/by-name/ns/nsgenbind/package.nix
index 572228dba46a..fd56a343ac63 100644
--- a/pkgs/by-name/ns/nsgenbind/package.nix
+++ b/pkgs/by-name/ns/nsgenbind/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nsgenbind";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${finalAttrs.version}-src.tar.gz";
-    hash = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
+    hash = "sha256-Iyzg9my8LD7tYoiuJt4sVnu/u8Adiw9vxsHBZJ1LOF0=";
   };
 
   nativeBuildInputs = [

From f6b98ba69e230dbcee7babb50a06dc80b4096ba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 00:29:53 +0000
Subject: [PATCH 61/91] libnspsl: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/by-name/li/libnspsl/package.nix b/pkgs/by-name/li/libnspsl/package.nix
index a8df91f2bb6f..a7905669ef5d 100644
--- a/pkgs/by-name/li/libnspsl/package.nix
+++ b/pkgs/by-name/li/libnspsl/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnspsl";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/libnspsl-${finalAttrs.version}-src.tar.gz";
-    hash = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
+    hash = "sha256-NoTOwy9VXa7UMZk+C/bL2TdPbJCERiN+CJ8LYdaUrIA=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From d546a69bd2494db65ff42600fe15994e0c61d3b6 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 29 Sep 2025 17:51:33 -0700
Subject: [PATCH 62/91] barrier: drop as upstream is unmaintained

barrier has not been maintained since 2022.
deskflow and input-leap are possible alternatives
---
 pkgs/applications/misc/barrier/default.nix | 78 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 pkgs/applications/misc/barrier/default.nix

diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
deleted file mode 100644
index 66d0cc580204..000000000000
--- a/pkgs/applications/misc/barrier/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  cmake,
-  curl,
-  xorg,
-  avahi,
-  qtbase,
-  mkDerivation,
-  openssl,
-  wrapGAppsHook3,
-  avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; },
-  fetchpatch,
-}:
-
-mkDerivation rec {
-  pname = "barrier";
-  version = "2.4.0";
-
-  src = fetchFromGitHub {
-    owner = "debauchee";
-    repo = "barrier";
-    rev = "v${version}";
-    hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    # This patch can be removed when a new version of barrier (greater than 2.4.0)
-    # is released, which will contain this commit.
-    (fetchpatch {
-      name = "add-missing-cstddef-header.patch";
-      url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch";
-      sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk=";
-    })
-  ];
-
-  CXXFLAGS = [
-    # error: 'uint8_t' is not a member of 'std'; did you mean 'wint_t'?
-    "-include cstdint"
-  ];
-
-  buildInputs = [
-    curl
-    xorg.libX11
-    xorg.libXext
-    xorg.libXtst
-    avahiWithLibdnssdCompat
-    qtbase
-  ];
-  nativeBuildInputs = [
-    cmake
-    wrapGAppsHook3
-  ];
-
-  postFixup = ''
-    substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
-  '';
-
-  qtWrapperArgs = [
-    ''--prefix PATH : ${lib.makeBinPath [ openssl ]}''
-  ];
-
-  meta = {
-    description = "Open-source KVM software";
-    longDescription = ''
-      Barrier is KVM software forked from Symless's synergy 1.9 codebase.
-      Synergy was a commercialized reimplementation of the original
-      CosmoSynergy written by Chris Schoeneman.
-    '';
-    homepage = "https://github.com/debauchee/barrier";
-    downloadPage = "https://github.com/debauchee/barrier/releases";
-    license = lib.licenses.gpl2;
-    maintainers = [ lib.maintainers.phryneas ];
-    platforms = lib.platforms.linux;
-    mainProgram = "barrier";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f15badd0e3a6..9d2936915cae 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -507,6 +507,7 @@ mapAliases {
   baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02
   bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
+  barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
   bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
   bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7a82f49c6f7..552685d011bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11006,8 +11006,6 @@ with pkgs;
 
   backintime = backintime-qt;
 
-  barrier = libsForQt5.callPackage ../applications/misc/barrier { };
-
   bespokesynth-with-vst2 = bespokesynth.override {
     enableVST2 = true;
   };

From 4a4eac9669048a4cdcce4904d308d188cf5d98e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 01:14:44 +0000
Subject: [PATCH 63/91] eigenwallet: 3.0.1 -> 3.0.4

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

diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix
index 7d66a8e1179d..1b9cc33da3cc 100644
--- a/pkgs/by-name/ei/eigenwallet/package.nix
+++ b/pkgs/by-name/ei/eigenwallet/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   name = "eigenwallet";
-  version = "3.0.1";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-/yVx/FW+sVYPtpQNl03A3JNe4CbxRbo4OkvY/Kxnw8Y=";
+    hash = "sha256-2BC6ii4mS3lGowqNl5VEAjUXYjXXnQQDNcfAytCTi7M=";
   };
 
   nativeBuildInputs = [

From 868b8a6672ca73266ab80ab9fd130b0d9a1eb148 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 01:55:02 +0000
Subject: [PATCH 64/91] models-dev: 0-unstable-2025-09-26 ->
 0-unstable-2025-09-29

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index e8a9169c3363..db228c21e1cb 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-09-26";
+  version = "0-unstable-2025-09-29";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "ac659a30024a3d2d9729ec4b8572985a78f0d4aa";
-    hash = "sha256-GZ1fIoSp/1gFGbOyuzOY1ufjWfz7py4tLzrpBkRV50Q=";
+    rev = "47a71d06c57055a7c347ff04b3c7cfcaf1fa9462";
+    hash = "sha256-fv6u/Hpmt5KUGSN/P7mrqbWAx7kHsMeIjiLaRUQqG90=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 6d713db4ef9c7c7cf9a4129d8ffb18d969a8ef15 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 30 Sep 2025 00:58:03 +0800
Subject: [PATCH 65/91] libsForQt5.soqt: 2020-12-05-unstable -> 1.6.4

---
 pkgs/development/libraries/soqt/default.nix | 49 ++++++++++++---------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index a02f91e527eb..fd77508db80b 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,43 +1,50 @@
 {
-  fetchFromGitHub,
   lib,
   stdenv,
+  fetchFromGitHub,
+  cmake,
   coin3d,
   qtbase,
-  cmake,
-  pkg-config,
+  testers,
+  wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soqt";
-  version = "2020-12-05-unstable";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "soqt";
-    # rev = "SoQt-${version}";
-    rev = "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d";
-    hash = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-H904mFfrELjB6ZVhypaKJd+pu5y+aVV4foryrsN7IqE=";
     fetchSubmodules = true;
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
     coin3d
     qtbase
   ];
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
   dontWrapQtApps = true;
 
-  meta = with lib; {
-    homepage = "https://github.com/coin3d/soqt";
-    license = licenses.bsd3;
-    description = "Glue between Coin high-level 3D visualization library and Qt";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.linux;
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "soqt" ];
+      package = finalAttrs.finalPackage;
+      nativeBuildInputs = [ wrapQtAppsHook ];
+    };
   };
-}
+
+  meta = {
+    homepage = "https://github.com/coin3d/soqt";
+    license = lib.licenses.bsd3;
+    description = "Glue between Coin high-level 3D visualization library and Qt";
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
+  };
+})

From 2060d3945cb2922aae89cde628e2327532cfafb3 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 30 Sep 2025 07:40:47 +0800
Subject: [PATCH 66/91] python3Packages.pivy: remove unused buildInputs

---
 .../python-modules/pivy/default.nix           | 55 +++++++------------
 pkgs/top-level/python-packages.nix            |  1 -
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 0e66042a1d85..ef81f8d92b13 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -3,10 +3,11 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  pkgs,
-  qtbase,
-  qmake,
+  swig,
+  cmake,
+  coin3d,
   soqt,
+  libGLU,
 }:
 
 buildPythonPackage rec {
@@ -21,54 +22,36 @@ buildPythonPackage rec {
     hash = "sha256-DRA4NTAHg2iB/D1CU9pJEpsZwX9GW3X5gpxbIwP54Ko=";
   };
 
+  # https://github.com/coin3d/pivy/pull/138
+  # FindThreads only works if either C or CXX language is enabled
+  postPatch = ''
+    substituteInPlace distutils_cmake/CMakeLists.txt \
+      --replace-fail 'project(pivy_cmake_setup NONE)' 'project(pivy_cmake_setup CXX)'
+  '';
+
   build-system = [ setuptools ];
 
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs = with pkgs; [
+  nativeBuildInputs = [
     swig
-    qmake
     cmake
   ];
 
-  buildInputs =
-    with pkgs;
-    with xorg;
-    [
-      coin3d
-      soqt
-      qtbase
-      libGLU
-      libGL
-      libXi
-      libXext
-      libSM
-      libICE
-      libX11
-    ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${qtbase.dev}/include/QtCore"
-    "-I${qtbase.dev}/include/QtGui"
-    "-I${qtbase.dev}/include/QtOpenGL"
-    "-I${qtbase.dev}/include/QtWidgets"
+  buildInputs = [
+    coin3d
+    soqt
+    libGLU # dummy buildInput that provides missing header <GL/glu.h>
   ];
 
-  dontUseQmakeConfigure = true;
   dontWrapQtApps = true;
-  doCheck = false;
-
-  postPatch = ''
-    substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \
-      \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}'
-  '';
 
   pythonImportsCheck = [ "pivy" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/coin3d/pivy/";
     description = "Python binding for Coin";
-    license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.bsd0;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 868443a35ce2..58d4be23fc88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11849,7 +11849,6 @@ self: super: with self; {
   piqp = callPackage ../development/python-modules/piqp { };
 
   pivy = callPackage ../development/python-modules/pivy {
-    inherit (pkgs.qt5) qtbase qmake;
     inherit (pkgs.libsForQt5) soqt;
   };
 

From 3e86f234c0ce41646590a0b64fa691c9258c4bc2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 04:09:56 +0000
Subject: [PATCH 67/91] siyuan: 3.3.2 -> 3.3.3

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

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 9c4ad615e723..a06996d3ea64 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-haZwGJKRRAguCbY7C+kBIOq5Cr0lymGbRH90oarYUpE=";
+    hash = "sha256-J3IWPWa4L16kaapMifViFOVRP8OrWIN1F+v4CfPm3y8=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-joLfVa6xi03JmQBIj08dTyDMPn0q2LqwJtfUJRYW+4c=";
+    vendorHash = "sha256-/mB0aQtTOTmaTEEkOIgwIcDDi4quxe5/ttvJJr3cnlQ=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {

From b1d0dfefd8f1dc53803832023f1c1529e8ef8b3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 04:57:54 +0000
Subject: [PATCH 68/91] linuxKernel.kernels.linux_zen: 6.16.7 -> 6.16.9

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index e6e292087f22..41f2039606ca 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.16.7"; # zen
+      version = "6.16.9"; # zen
       suffix = "zen1"; # zen
-      sha256 = "1vca6b30k48ihizlsmrlgzxgfnp0zq7q7x1h728hny2h33pdhni4"; # zen
+      sha256 = "0248xc6smxxrn95w9cjc5r3fsh7dx0mdb6k3f59n3lrnlbyhgld1"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From d0a2c2ed3251310e23d73e4f25b744b3b95c1abe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 05:00:18 +0000
Subject: [PATCH 69/91] python3Packages.google-cloud-dataproc: 5.21.0 -> 5.22.0

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

diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 2457054d95cf..772dd3577cc5 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "5.21.0";
+  version = "5.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_dataproc";
     inherit version;
-    hash = "sha256-LSoMxquZrJVB9z0uIRqFH6TQp18btRsjwk3vyGzWxPo=";
+    hash = "sha256-zkGy0LLTnTqvLckUCRMtNP4n+KpdKtat3fQqz78rW/A=";
   };
 
   build-system = [ setuptools ];

From 2afcc9abe846c1bdbd56ada1f36fe8024c7cdc97 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 30 Sep 2025 06:01:17 +0000
Subject: [PATCH 70/91] bruijn: 0-unstable-2025-09-24 -> 0-unstable-2025-09-28

Diff: https://github.com/marvinborner/bruijn/compare/7d37a689cebcfa81821455ea7779a8052f7e1ab1...31ba54046e33618905fc99e0b079bd3aa2594284
---
 pkgs/by-name/br/bruijn/generated.nix | 4 ++--
 pkgs/by-name/br/bruijn/version.txt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix
index eba1560b1bd5..6dce2ef52efd 100644
--- a/pkgs/by-name/br/bruijn/generated.nix
+++ b/pkgs/by-name/br/bruijn/generated.nix
@@ -24,8 +24,8 @@ mkDerivation {
   pname = "bruijn";
   version = "0.1.0.0";
   src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/7d37a689cebcfa81821455ea7779a8052f7e1ab1.tar.gz";
-    sha256 = "06rjlvwfyc2czc09r5sw9xiajlgpd1cma8qqj7v5af8dc1x1jxx5";
+    url = "https://github.com/marvinborner/bruijn/archive/31ba54046e33618905fc99e0b079bd3aa2594284.tar.gz";
+    sha256 = "11b3i32y36i29haym4agn1pgik20byldihgs2qsi5p7vy17z0a78";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt
index 98475c8a42d8..758d57bf33ac 100644
--- a/pkgs/by-name/br/bruijn/version.txt
+++ b/pkgs/by-name/br/bruijn/version.txt
@@ -1 +1 @@
-0-unstable-2025-09-24
+0-unstable-2025-09-28

From 0460e43b1e2ec542cb8213eec488eecb96458746 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 30 Sep 2025 06:05:12 +0000
Subject: [PATCH 71/91] smtp4dev: 3.10.2 -> 3.10.3

Diff: https://github.com/rnwood/smtp4dev/compare/3.10.2...3.10.3
---
 pkgs/by-name/sm/smtp4dev/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index d2e6ebe89ba0..56b5bdcede9c 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "smtp4dev";
-  version = "3.10.2";
+  version = "3.10.3";
 
   src = fetchFromGitHub {
     owner = "rnwood";
     repo = "smtp4dev";
     tag = finalAttrs.version;
-    hash = "sha256-0j5r5YO1wHg3N/OX81UE2YCqhqIaQuSGZa2uh2y+zqs=";
+    hash = "sha256-bbo4kke0deZQoD08dbUKsLUhjg/z7TaIr5qmU4SETNg=";
   };
 
   patches = [ ./smtp4dev-npm-packages.patch ];

From 742a2ca57e010472f03180069088bf2271859bbd Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 30 Sep 2025 06:03:32 +0000
Subject: [PATCH 72/91] uiua: 0.17.0 -> 0.17.1

Changelog: https://github.com/uiua-lang/uiua/blob/refs/tags/0.17.1/changelog.md
Diff: https://github.com/uiua-lang/uiua/compare/0.17.0...0.17.1
---
 pkgs/by-name/ui/uiua/stable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix
index 242fe9db9d56..69db955f6b81 100644
--- a/pkgs/by-name/ui/uiua/stable.nix
+++ b/pkgs/by-name/ui/uiua/stable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.17.0";
+  version = "0.17.1";
   tag = version;
-  hash = "sha256-mLtWU7eJxDAyUuwsiwLqa9LgJXnTtYHwcnXQOBsmugw=";
-  cargoHash = "sha256-h8HmBfxRKrtARFQ0vll09uEMcYUhW4+8M/Q90EVw3Io=";
+  hash = "sha256-bRazhDhqXnY+nDDWg/unqVuOg9ib3AND0HivFL68Iko=";
+  cargoHash = "sha256-llg/BoiGiD9AT8UTDyTpzrSvEinXbLdT1rQECH2ftdE=";
   updateScript = ./update-stable.sh;
 }

From 585fcb1b95bbd7837275ea5f0744d14dbab2b04f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 30 Sep 2025 06:03:59 +0000
Subject: [PATCH 73/91] uiua-unstable: 0.17.0 -> 0.17.1

Changelog: https://github.com/uiua-lang/uiua/blob/refs/tags/0.17.1/changelog.md
Diff: https://github.com/uiua-lang/uiua/compare/0.17.0...0.17.1
---
 pkgs/by-name/ui/uiua/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index 9b25d9b205fe..5d1daf2287e2 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.17.0";
+  version = "0.17.1";
   tag = version;
-  hash = "sha256-mLtWU7eJxDAyUuwsiwLqa9LgJXnTtYHwcnXQOBsmugw=";
-  cargoHash = "sha256-h8HmBfxRKrtARFQ0vll09uEMcYUhW4+8M/Q90EVw3Io=";
+  hash = "sha256-bRazhDhqXnY+nDDWg/unqVuOg9ib3AND0HivFL68Iko=";
+  cargoHash = "sha256-llg/BoiGiD9AT8UTDyTpzrSvEinXbLdT1rQECH2ftdE=";
   updateScript = ./update-unstable.sh;
 }

From 32630a6931515ee15aaecad70e5711804b933baf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 06:09:57 +0000
Subject: [PATCH 74/91] terraform-providers.signalfx: 9.21.1 -> 9.21.2

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 48eaa86e7284..68f727bb95bb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1219,11 +1219,11 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "signalfx": {
-    "hash": "sha256-cZnG8WohzR4OPBoX9PHdbvsziPfcsR75apXZX8EwtEQ=",
+    "hash": "sha256-Lx7L9S6uw++51LehLJSESJXXjLUhpMP4LRVGme85y6k=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.21.1",
+    "rev": "v9.21.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY="
   },

From dff00dc5d5675ce846d2345faafa124f3b14d37e Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Tue, 30 Sep 2025 08:15:09 +0200
Subject: [PATCH 75/91] python3Packages.catkin-pkg: Address PR review comments

---
 pkgs/development/python-modules/catkin-pkg/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix
index 82e3aeea62ad..5a9e4894eb52 100644
--- a/pkgs/development/python-modules/catkin-pkg/default.nix
+++ b/pkgs/development/python-modules/catkin-pkg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ros-infrastructure";
     repo = "catkin_pkg";
-    rev = version;
+    tag = version;
     hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM=";
   };
 
@@ -28,7 +28,6 @@ buildPythonPackage rec {
     docutils
     pyparsing
     python-dateutil
-    setuptools
   ];
 
   pythonImportsCheck = [ "catkin_pkg" ];
@@ -38,7 +37,7 @@ buildPythonPackage rec {
   disabledTestPaths = [ "test/test_flake8.py" ];
 
   meta = {
-    changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${src.tag}/CHANGELOG.rst";
     description = "Library for retrieving information about catkin packages";
     homepage = "http://wiki.ros.org/catkin_pkg";
     license = lib.licenses.bsd3;

From 749ef6ff1dd1f278965a0d8e8759b90d661ff6ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 29 Sep 2025 13:08:49 +0200
Subject: [PATCH 76/91] python313Packages.airthings-ble: 1.1.0 -> 1.1.1

Diff: https://github.com/vincegio/airthings-ble/compare/1.1.0...1.1.1

Changelog: https://github.com/vincegio/airthings-ble/releases/tag/1.1.1
---
 .../python-modules/airthings-ble/default.nix           | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix
index d85878a9550c..480cf805eafe 100644
--- a/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/pkgs/development/python-modules/airthings-ble/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   async-interrupt,
-  async-timeout,
   bleak,
   bleak-retry-connector,
   buildPythonPackage,
@@ -10,21 +9,18 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "airthings-ble";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "vincegio";
     repo = "airthings-ble";
     tag = version;
-    hash = "sha256-eZjMRely3UxcnjPB6DQDBOKdP+2kFCe/5fchiX+rcEM=";
+    hash = "sha256-fZvmgRQuSrgraj6e3BtsoKyFX38BedqVh6cHsliT9ns=";
   };
 
   build-system = [ poetry-core ];
@@ -46,7 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for Airthings BLE devices";
     homepage = "https://github.com/vincegio/airthings-ble";
-    changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${version}";
+    changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From bfdb3660f459b0e1e1a314959e8fe0838082ca38 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 30 Sep 2025 08:43:16 +0200
Subject: [PATCH 77/91] python313Packages.deep-chainmap: update build-system

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

diff --git a/pkgs/development/python-modules/deep-chainmap/default.nix b/pkgs/development/python-modules/deep-chainmap/default.nix
index 1b12d8bd9d56..5e1c1baeabb2 100644
--- a/pkgs/development/python-modules/deep-chainmap/default.nix
+++ b/pkgs/development/python-modules/deep-chainmap/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  hatchling,
+  flit-core,
 }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     hash = "sha256-Cw6Eiey501mzeigfdwnMuZH28abG4rcoACUGlmkzECA=";
   };
 
-  build-system = [ hatchling ];
+  build-system = [ flit-core ];
 
   # Tests are not published to pypi
   doCheck = false;

From c5980908bcda462c09c65888ac4c4a0ab74dcd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 29 Sep 2025 04:52:19 +0000
Subject: [PATCH 78/91] opentabletdriver: 0.6.5.1 -> 0.6.6.0

---
 pkgs/by-name/op/opentabletdriver/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index 8f0fdcaf5b6e..5856d185d9b2 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -23,13 +23,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "OpenTabletDriver";
-  version = "0.6.5.1";
+  version = "0.6.6.0";
 
   src = fetchFromGitHub {
     owner = "OpenTabletDriver";
     repo = "OpenTabletDriver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PpgqmeQRGZew0+HD4xtbimc25XPEfgW69VfJf+TlYC4=";
+    hash = "sha256-NS/r4FU3dT7UT+R7NryRnU5RfLEN0E6pSqtNDpKMS7U=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -83,9 +83,6 @@ buildDotnetModule (finalAttrs: {
     "OpenTabletDriver.Tests.UpdaterTests.Install_Copies_AppDataFiles"
     # Depends on processor load
     "OpenTabletDriver.Tests.TimerTests.TimerAccuracy"
-    # Can't find Configurations directory, remove after https://github.com/OpenTabletDriver/OpenTabletDriver/pull/3796
-    "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Verify_Configs_With_Schema"
-    "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Are_Linted"
   ];
 
   preBuild = ''

From dc44762f4cd427ebd8fe75466c4f070f8f417331 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 30 Sep 2025 07:43:41 +0800
Subject: [PATCH 79/91] soqt: migrate to qt6 and pkgs/by-name

---
 .../so/soqt/package.nix}                      | 19 +++++++++++--------
 pkgs/top-level/python-packages.nix            |  4 +---
 pkgs/top-level/qt5-packages.nix               |  2 --
 3 files changed, 12 insertions(+), 13 deletions(-)
 rename pkgs/{development/libraries/soqt/default.nix => by-name/so/soqt/package.nix} (70%)

diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/by-name/so/soqt/package.nix
similarity index 70%
rename from pkgs/development/libraries/soqt/default.nix
rename to pkgs/by-name/so/soqt/package.nix
index fd77508db80b..6f9ff22fb1b9 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/by-name/so/soqt/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   cmake,
   coin3d,
-  qtbase,
+  qt6,
   testers,
-  wrapQtAppsHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,17 +27,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [
     coin3d
-    qtbase
+    qt6.qtbase
   ];
 
   dontWrapQtApps = true;
 
-  passthru.tests = {
-    cmake-config = testers.hasCmakeConfigModules {
-      moduleNames = [ "soqt" ];
-      package = finalAttrs.finalPackage;
-      nativeBuildInputs = [ wrapQtAppsHook ];
+  passthru = {
+    tests = {
+      cmake-config = testers.hasCmakeConfigModules {
+        moduleNames = [ "soqt" ];
+        package = finalAttrs.finalPackage;
+        nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+      };
     };
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58d4be23fc88..c149634fde82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11848,9 +11848,7 @@ self: super: with self; {
 
   piqp = callPackage ../development/python-modules/piqp { };
 
-  pivy = callPackage ../development/python-modules/pivy {
-    inherit (pkgs.libsForQt5) soqt;
-  };
+  pivy = callPackage ../development/python-modules/pivy { };
 
   pixcat = callPackage ../development/python-modules/pixcat { };
 
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 6fbf6cfd6db0..c70f900e794b 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -215,8 +215,6 @@ makeScopeWithSplicing' {
           callPackage ../development/libraries/sailfish-access-control-plugin
             { };
 
-        soqt = callPackage ../development/libraries/soqt { };
-
         telepathy = callPackage ../development/libraries/telepathy/qt { };
 
         qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };

From b4999b2274425c73c20e763b719b53013498ae79 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 30 Sep 2025 15:49:47 +0800
Subject: [PATCH 80/91] python3Packages.pivy: switch format to other

---
 .../python-modules/pivy/default.nix           | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index ef81f8d92b13..a817681896aa 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -2,7 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  python,
+  pythonRecompileBytecodeHook,
   swig,
   cmake,
   coin3d,
@@ -13,7 +14,7 @@
 buildPythonPackage rec {
   pname = "pivy";
   version = "0.6.10";
-  pyproject = true;
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "coin3d";
@@ -22,20 +23,10 @@ buildPythonPackage rec {
     hash = "sha256-DRA4NTAHg2iB/D1CU9pJEpsZwX9GW3X5gpxbIwP54Ko=";
   };
 
-  # https://github.com/coin3d/pivy/pull/138
-  # FindThreads only works if either C or CXX language is enabled
-  postPatch = ''
-    substituteInPlace distutils_cmake/CMakeLists.txt \
-      --replace-fail 'project(pivy_cmake_setup NONE)' 'project(pivy_cmake_setup CXX)'
-  '';
-
-  build-system = [ setuptools ];
-
-  dontUseCmakeConfigure = true;
-
   nativeBuildInputs = [
     swig
     cmake
+    pythonRecompileBytecodeHook
   ];
 
   buildInputs = [
@@ -44,6 +35,11 @@ buildPythonPackage rec {
     libGLU # dummy buildInput that provides missing header <GL/glu.h>
   ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "PIVY_USE_QT6" true)
+    (lib.cmakeFeature "PIVY_Python_SITEARCH" "${placeholder "out"}/${python.sitePackages}")
+  ];
+
   dontWrapQtApps = true;
 
   pythonImportsCheck = [ "pivy" ];

From c1c39904a2d678d7dccb71d2056d79025f1bcbfd Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 14 May 2025 23:53:18 -0400
Subject: [PATCH 81/91] micropython: fix cross

---
 .../micropython/fix-cross-compilation.patch   | 31 +++++++++++++
 .../mi/micropython/fix-mpy-cross-path.patch   | 13 ++++++
 pkgs/by-name/mi/micropython/package.nix       | 46 ++++++++++++++++++-
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/mi/micropython/fix-cross-compilation.patch
 create mode 100644 pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch

diff --git a/pkgs/by-name/mi/micropython/fix-cross-compilation.patch b/pkgs/by-name/mi/micropython/fix-cross-compilation.patch
new file mode 100644
index 000000000000..cfbae1de1c3c
--- /dev/null
+++ b/pkgs/by-name/mi/micropython/fix-cross-compilation.patch
@@ -0,0 +1,31 @@
+--- a/ports/unix/Makefile
++++ b/ports/unix/Makefile
+@@ -31,7 +31,7 @@
+ QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h
+ 
+ # OS name, for simple autoconfig
+-UNAME_S := $(shell uname -s)
++UNAME_S := @UNAME_S@
+ 
+ # include py core make definitions
+ include $(TOP)/py/py.mk
+@@ -151,7 +151,7 @@
+ # If the variant enables it, enable modbluetooth.
+ ifeq ($(MICROPY_PY_BLUETOOTH),1)
+ ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+-HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
++HAVE_LIBUSB := $(shell (which @PKG_CONFIG@ > /dev/null && @PKG_CONFIG@ --exists libusb-1.0) 2>/dev/null && echo '1')
+ 
+ # Figure out which BTstack transport to use.
+ ifeq ($(HAVE_LIBUSB),1)
+@@ -180,8 +180,8 @@
+  endif
+ else
+ # Use system version of libffi.
+-LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
+-LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
++LIBFFI_CFLAGS := $(shell @PKG_CONFIG@ --cflags libffi)
++LIBFFI_LDFLAGS := $(shell @PKG_CONFIG@ --libs libffi)
+ endif
+ 
+ ifeq ($(UNAME_S),Linux)
diff --git a/pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch b/pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch
new file mode 100644
index 000000000000..a69b021c7062
--- /dev/null
+++ b/pkgs/by-name/mi/micropython/fix-mpy-cross-path.patch
@@ -0,0 +1,13 @@
+--- a/mpy-cross/mpy_cross/__init__.py
++++ b/mpy-cross/mpy_cross/__init__.py
+@@ -61,6 +61,10 @@
+ def _find_mpy_cross_binary(mpy_cross):
+     if mpy_cross:
+         return mpy_cross
++    # Check for MPY_CROSS environment variable first (for cross-compilation)
++    env_mpy_cross = os.environ.get("MPY_CROSS")
++    if env_mpy_cross:
++        return env_mpy_cross
+     return os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/mpy-cross"))
+ 
+ 
diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index efb64c675551..dadd165c0785 100644
--- a/pkgs/by-name/mi/micropython/package.nix
+++ b/pkgs/by-name/mi/micropython/package.nix
@@ -7,6 +7,7 @@
   python3,
   libffi,
   readline,
+  buildPackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -43,6 +44,33 @@ stdenv.mkDerivation rec {
       extraPrefix = "lib/mbedtls/";
       hash = "sha256-Sllp/iWWEhykMJ3HALw5KzR4ta22120Jcl51JZCkZE0=";
     })
+    ./fix-cross-compilation.patch
+    ./fix-mpy-cross-path.patch
+  ];
+
+  postPatch = ''
+    # Fix cross-compilation by replacing uname and pkg-config
+    substituteInPlace ports/unix/Makefile \
+      --subst-var-by UNAME_S "${
+        {
+          "x86_64-linux" = "Linux";
+          "i686-linux" = "Linux";
+          "aarch64-linux" = "Linux";
+          "armv7l-linux" = "Linux";
+          "armv6l-linux" = "Linux";
+          "riscv64-linux" = "Linux";
+          "powerpc64le-linux" = "Linux";
+          "x86_64-darwin" = "Darwin";
+          "aarch64-darwin" = "Darwin";
+        }
+        .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name
+      }" \
+      --subst-var-by PKG_CONFIG "${stdenv.cc.targetPrefix}pkg-config"
+  '';
+
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+    buildPackages.python3
   ];
 
   nativeBuildInputs = [
@@ -58,8 +86,25 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "-C"
     "ports/unix"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+    # Workaround for false positive gcc warning in mbedtls on aarch64
+    "CFLAGS_EXTRA=-Wno-array-bounds"
   ]; # also builds mpy-cross
 
+  # Build mpy-cross for the build platform first when cross-compiling
+  preBuild = ''
+    # Build mpy-cross for the build platform
+    make -C mpy-cross \
+      CC="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" \
+      CROSS_COMPILE=""
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    # Set MPY_CROSS environment variable for cross-compilation
+    export MPY_CROSS="$PWD/mpy-cross/build/mpy-cross"
+  '';
+
   enableParallelBuilding = true;
 
   doCheck = true;
@@ -87,7 +132,6 @@ stdenv.mkDerivation rec {
     runHook preInstall
     mkdir -p $out/bin
     install -Dm755 ports/unix/build-standard/micropython -t $out/bin
-    install -Dm755 mpy-cross/build/mpy-cross -t $out/bin
     runHook postInstall
   '';
 

From e310400c37146f078faae7ce5842753e1685d6fc Mon Sep 17 00:00:00 2001
From: e1mo <git@e1mo.de>
Date: Tue, 30 Sep 2025 10:54:34 +0200
Subject: [PATCH 82/91] bird-lg: 1.3.8 -> 1.3.11

Changes:
- Return data from available services even if one backend fails ()
- Correctly handle protocol names with dash and/or numbers
- Add multi listen support
---
 pkgs/by-name/bi/bird-lg/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix
index 9a751950ed02..3e65067056d9 100644
--- a/pkgs/by-name/bi/bird-lg/package.nix
+++ b/pkgs/by-name/bi/bird-lg/package.nix
@@ -9,13 +9,13 @@ let
     { modRoot, vendorHash }:
     buildGoModule rec {
       pname = "bird-lg-${modRoot}";
-      version = "1.3.8";
+      version = "1.3.11";
 
       src = fetchFromGitHub {
         owner = "xddxdd";
         repo = "bird-lg-go";
         rev = "v${version}";
-        hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8=";
+        hash = "sha256-C0JC8vLLEk+d6vlrtuW7tHj06K7A3HBjKXZ5Nt+2i4I=";
       };
 
       doDist = false;
@@ -41,12 +41,12 @@ let
 
   bird-lg-frontend = generic {
     modRoot = "frontend";
-    vendorHash = "sha256-luJuIZ0xN8mdtWwTlfEDnAwMgt+Tzxlk2ZIDPIwHpcY=";
+    vendorHash = "sha256-kNysGHtOUtYGHDFDlYNzdkCXGUll105Triy4UR7UP0M=";
   };
 
   bird-lg-proxy = generic {
     modRoot = "proxy";
-    vendorHash = "sha256-OVyfPmLTHV5RFdLgRHEH/GqxuG5MnGt9Koz0DxpSg+4=";
+    vendorHash = "sha256-iosWHHeJyqMPF+Y01+mj70HDKWw0FAZKDpEESAwS/i4=";
   };
 in
 symlinkJoin {

From bd46b307163d8100c40eed20df3cbe3da924af2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 09:28:00 +0000
Subject: [PATCH 83/91] vscode-extensions.betterthantomorrow.calva: 2.0.528 ->
 2.0.536

---
 .../vscode/extensions/betterthantomorrow.calva/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index 97d9470852f3..49ab14ef4ccc 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.528";
-    hash = "sha256-YnY15/I0bJ14J4KDU7AI6Y2lE7SWug/yoH0X+upqKzA=";
+    version = "2.0.536";
+    hash = "sha256-Q6T8Ab8kwOjdFM63SjTNEOgd+a6fL1PRGRredHzwg7U=";
   };
 
   nativeBuildInputs = [

From 4d256032cc83a2eccc3d366f596a7bf69c87f62d Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Tue, 30 Sep 2025 09:20:45 +0000
Subject: [PATCH 84/91] claude-code: 1.0.128 -> 2.0.1

---
 .../extensions/anthropic.claude-code/default.nix       |  4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json          |  4 ++--
 pkgs/by-name/cl/claude-code/package.nix                | 10 +++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 8a0bbf683b4c..3511736331b1 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "1.0.127";
-    hash = "sha256-wR8iBlHUSb0/vEWDqDSzHpbZPHr2Nfzw/xXGccDi+28=";
+    version = "2.0.0";
+    hash = "sha256-vd3ZT8iwmbUCeaHgiDGLzWehOj4j/hMinHiXQytwVz4=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 6932e5d68d38..4c777b7c6946 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "1.0.128",
+  "version": "2.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "1.0.128",
+      "version": "2.0.1",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 8cb4f78f6eac..cbd8df60ec7c 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -2,23 +2,19 @@
   lib,
   buildNpmPackage,
   fetchzip,
-  nodejs_20,
   writableTmpDirAsHomeHook,
   versionCheckHook,
 }:
-
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "1.0.128";
-
-  nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
+  version = "2.0.1";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-dzLGcCgje3FMMS+Ptmxd2JK08y7z9rI0ak5l3Bv1MUk=";
+    hash = "sha256-LUbDPFa0lY74MBU4hvmYVntt6hVZy6UUZFN0iB4Eno8=";
   };
 
-  npmDepsHash = "sha256-Ynoj85a/F9Jv4w2vRDnGqn/G6zkaPesNQNEdqAE5zOo=";
+  npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 613d450411f026ee9b37686338ca33f90bddcb2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 09:48:02 +0000
Subject: [PATCH 85/91] trilium-desktop: 0.98.1 -> 0.99.0

---
 pkgs/by-name/tr/trilium-desktop/package.nix | 10 +++++-----
 pkgs/by-name/tr/trilium-server/package.nix  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index 8404a5c6ae70..700dd21822a5 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "trilium-desktop";
-  version = "0.98.1";
+  version = "0.99.0";
 
   triliumSource = os: arch: hash: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.hash = "sha256-e8duXDIODrU3eYuZvUcOoT8pAquRIOQ1aUtceY49s+s=";
-  aarch64-linux.hash = "sha256-HtNzzlnqApwt04R9W6cby8J/0xuYdUX2kMN4vBNKeiQ=";
-  x86_64-darwin.hash = "sha256-guM1FmDD+J0oBEH+hCzXBkrF0bzvyp5yvCeIO7mGcJg=";
-  aarch64-darwin.hash = "sha256-fHgPbJS4ZraqowkjPdDg0BbPiI+4dk9JpMSDKASl8wE=";
+  x86_64-linux.hash = "sha256-ywZBKjUf0h7D3uRf3POJnaC9DtSJ3b8ucdxarHOzIg8=";
+  aarch64-linux.hash = "sha256-/fXACEZqz0Z8XPPwhQgaUN/23sbBcXmGFA9R1+/Md3E=";
+  x86_64-darwin.hash = "sha256-39Hwwg9l/HNfCAMwPYp/i/i6LbEoByKb5C+51jifz8U=";
+  aarch64-darwin.hash = "sha256-J+1NDd1ZL6/w2ObDDLcIp/MDX6lVAHxJOaOC3BIOoqM=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
index 60bf63bfa01b..c2e55a540071 100644
--- a/pkgs/by-name/tr/trilium-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.98.1";
+  version = "0.99.0";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.hash = "sha256-Ipl9mEDj6Wgzl31WonH4nouCoYs1lLgdxRAJr6I8l9c=";
+  serverSource_x64.hash = "sha256-o3c8j6oi5+Oxo6dUdP6a7Czroc5JpKvdexMEE7BaPC4=";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.hash = "sha256-XssGT2F1Idv7ICuTjJTAUYyors8ml50EXiOTHeA8KOw=";
+  serverSource_arm64.hash = "sha256-QFK5XYdPon3J2lp3k23KNf1dbi213JRILrqq8WT359A=";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then

From 8124bc854805b4b9c73513f5875543488ca1203e Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:03:57 +0000
Subject: [PATCH 86/91] google-chrome: 140.0.7339.185 -> 140.0.7339.207

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

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index c607f35c2cdb..8cb60604b78e 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "140.0.7339.185";
+    version = "140.0.7339.207";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-cPAbDVevr/vtBwLn+bcPmQHNfLrh+Ogw3rDKV5pwB2M=";
+      hash = "sha256-5g0t+EEJJeItjqKiTpp5qE/bkGKkxvOvLaxh5jCDPss=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "140.0.7339.186";
+    version = "140.0.7339.214";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acyk4e3hewde2niid4gmhjus7t7q_140.0.7339.186/GoogleChrome-140.0.7339.186.dmg";
-      hash = "sha256-ygXHbTJ4z7knRzTQG9uEgas7360wHgV9vaYYm0iyGOg=";
+      url = "http://dl.google.com/release2/chrome/mfmmq5vcqbb2jdp3e77lsymylu_140.0.7339.214/GoogleChrome-140.0.7339.214.dmg";
+      hash = "sha256-oTyyTHMs3VhGRXWoVlGXvNvwnOWb1eF7iswfJkl8Pe0=";
     };
 
     dontPatch = true;

From 408c17ab7059cf2c0fd0c125feafe5d0b2405bb1 Mon Sep 17 00:00:00 2001
From: e1mo <git@e1mo.de>
Date: Tue, 30 Sep 2025 12:12:46 +0200
Subject: [PATCH 87/91] nixos/bird-lg: Accept multiple listen addresses

---
 nixos/modules/services/networking/bird-lg.nix | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix
index 5d7b7c30f04c..8b7977c2ae4d 100644
--- a/nixos/modules/services/networking/bird-lg.nix
+++ b/nixos/modules/services/networking/bird-lg.nix
@@ -16,7 +16,7 @@ let
     {
       "--servers" = lib.concatStringsSep "," fe.servers;
       "--domain" = fe.domain;
-      "--listen" = fe.listenAddress;
+      "--listen" = stringOrConcat "," fe.listenAddresses;
       "--proxy-port" = fe.proxyPort;
       "--whois" = fe.whois;
       "--dns-interface" = fe.dnsInterface;
@@ -37,7 +37,7 @@ let
     {
       "--allowed" = lib.concatStringsSep "," px.allowedIPs;
       "--bird" = px.birdSocket;
-      "--listen" = px.listenAddress;
+      "--listen" = stringOrConcat "," px.listenAddresses;
       "--traceroute_bin" = px.traceroute.binary;
       "--traceroute_flags" = lib.concatStringsSep " " px.traceroute.flags;
       "--traceroute_raw" = px.traceroute.rawOutput;
@@ -58,6 +58,17 @@ let
     args: lib.mapAttrsToList (name: value: "${name} " + mkArgValue value) (filterNull args);
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "bird-lg" "frontend" "listenAddress" ]
+      [ "services" "bird-lg" "frontend" "listenAddresses" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "bird-lg" "proxy" "listenAddress" ]
+      [ "services" "bird-lg" "proxy" "listenAddresses" ]
+    )
+  ];
+
   options = {
     services.bird-lg = {
       package = lib.mkPackageOption pkgs "bird-lg" { };
@@ -77,8 +88,8 @@ in
       frontend = {
         enable = lib.mkEnableOption "Bird Looking Glass Frontend Webserver";
 
-        listenAddress = lib.mkOption {
-          type = lib.types.str;
+        listenAddresses = lib.mkOption {
+          type = with lib.types; either str (listOf str);
           default = "127.0.0.1:5000";
           description = "Address to listen on.";
         };
@@ -202,8 +213,8 @@ in
       proxy = {
         enable = lib.mkEnableOption "Bird Looking Glass Proxy";
 
-        listenAddress = lib.mkOption {
-          type = lib.types.str;
+        listenAddresses = lib.mkOption {
+          type = with lib.types; either str (listOf str);
           default = "127.0.0.1:8000";
           description = "Address to listen on.";
         };

From 33748b93c6734e152730c3b002fff3b2fe5ab3e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 10:27:44 +0000
Subject: [PATCH 88/91] golds: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix
index afb45254578d..618952753b36 100644
--- a/pkgs/by-name/go/golds/package.nix
+++ b/pkgs/by-name/go/golds/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "golds";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "go101";
     repo = "golds";
     tag = "v${version}";
-    hash = "sha256-RM9ltqkOByOg1ZUF7ZXZcWTivlUKrNbZYgcFpwRwNUk=";
+    hash = "sha256-6jtBwET3JSSh2DQq9MtLn2YokfK9ODYtYrcfI0W8m5I=";
   };
 
   # nixpkgs is not using the go distpack archive and missing a VERSION file in the source

From 2640597d054cc91025ea85fd8de237f86634c97e Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:09:45 +0000
Subject: [PATCH 89/91] hyprgraphics: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix
index 5534ddcf6f6d..45d2518f7270 100644
--- a/pkgs/by-name/hy/hyprgraphics/package.nix
+++ b/pkgs/by-name/hy/hyprgraphics/package.nix
@@ -12,18 +12,19 @@
   libjxl,
   libspng,
   libwebp,
+  pango,
   pixman,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprgraphics";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprgraphics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=";
+    hash = "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=";
   };
 
   nativeBuildInputs = [
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjxl
     libspng
     libwebp
+    pango
     pixman
   ];
 

From 65bcea47b7b04709bdd8ff90df5e919faa06a837 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 28 Sep 2025 19:41:05 +0200
Subject: [PATCH 90/91] maintainers/README: mention GitHub team creation

We recently introduced a mostly-self-service onboarding workflow for new
GitHub teams, which is as simple as creating the team with the right
parent team.
---
 maintainers/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/README.md b/maintainers/README.md
index 1019c4084224..c6276a606f21 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -157,6 +157,12 @@ If the team lists no specific membership policy, feel free to merge changes to t
 
 *Important:* If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
 
+A corresponding GitHub team can be created by any org member.
+When creating the team it should be created with the `nixpkgs-maintainers` team as parent.
+Once approved, the team will have the right privileges to be pinged and requested for review in Nixpkgs.
+
+> [!TIP]
+> The team name should be as short as possible; because it is nested under the maintainers group, no -maintainers suffix is needed.
 
 # Maintainer scripts
 

From b1bd3ce94dc7f51a709a308085be2c74fd09dfee Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 30 Sep 2025 12:46:28 +0200
Subject: [PATCH 91/91] maintainers/README: use important blockquote

---
 maintainers/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maintainers/README.md b/maintainers/README.md
index c6276a606f21..2cc71698939f 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -155,7 +155,8 @@ When reviewing changes to a team, read the team's scope and the context around t
 In any case, request reviews from the existing team members.
 If the team lists no specific membership policy, feel free to merge changes to the team after giving the existing members a few days to respond.
 
-*Important:* If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
+> [!IMPORTANT]
+> If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
 
 A corresponding GitHub team can be created by any org member.
 When creating the team it should be created with the `nixpkgs-maintainers` team as parent.