From b6aaee785bb3cf5d6aa4fb38775070ad1cef89b1 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 29 Apr 2026 12:44:44 +0100
Subject: [PATCH 001/120] nixos/firefly-iii: don't run as nginx group

Additionally, don't hard-code nginx user/group in module.
---
 nixos/modules/services/web-apps/firefly-iii.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix
index 8c88dcf1a561..8348baec6279 100644
--- a/nixos/modules/services/web-apps/firefly-iii.nix
+++ b/nixos/modules/services/web-apps/firefly-iii.nix
@@ -93,11 +93,12 @@ in
 
     group = lib.mkOption {
       type = lib.types.str;
-      default = if cfg.enableNginx then "nginx" else defaultGroup;
-      defaultText = "If `services.firefly-iii.enableNginx` is true then `nginx` else ${defaultGroup}";
+      default = defaultGroup;
       description = ''
-        Group under which firefly-iii runs. It is best to set this to the group
-        of whatever webserver is being used as the frontend.
+        Group under which firefly-iii runs.
+        While this also changes which group has access to the phpfpm socket,
+        changing {option}`services.firefly-iii.poolConfig."listen.group"`
+        is preferred.
       '';
     };
 
@@ -151,6 +152,9 @@ in
       default = { };
       defaultText = ''
         {
+          "listen.mode" = "0660";
+          "listen.owner" = if config.services.firefly-iii.enableNginx then config.services.nginx.user else config.services.firefly-iii.user;
+          "listen.group" = if config.services.firefly-iii.enableNginx then config.services.nginx.group else config.services.firefly-iii.group;
           "pm" = "dynamic";
           "pm.max_children" = 32;
           "pm.start_servers" = 2;
@@ -295,8 +299,8 @@ in
       '';
       settings = {
         "listen.mode" = lib.mkDefault "0660";
-        "listen.owner" = lib.mkDefault user;
-        "listen.group" = lib.mkDefault group;
+        "listen.owner" = lib.mkDefault (if cfg.enableNginx then config.services.nginx.user else user);
+        "listen.group" = lib.mkDefault (if cfg.enableNginx then config.services.nginx.group else group);
         "pm" = lib.mkDefault "dynamic";
         "pm.max_children" = lib.mkDefault 32;
         "pm.start_servers" = lib.mkDefault 2;

From 238c297cadf52b7969e276da1b48d43bfc06c878 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 29 Apr 2026 12:44:49 +0100
Subject: [PATCH 002/120] nixos/firefly-iii-data-importer: don't run as nginx
 group

Additionally, don't hard-code nginx user/group in module.
---
 .../web-apps/firefly-iii-data-importer.nix     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/firefly-iii-data-importer.nix b/nixos/modules/services/web-apps/firefly-iii-data-importer.nix
index e62d0d1de40e..5aca08767930 100644
--- a/nixos/modules/services/web-apps/firefly-iii-data-importer.nix
+++ b/nixos/modules/services/web-apps/firefly-iii-data-importer.nix
@@ -84,11 +84,12 @@ in
 
     group = lib.mkOption {
       type = lib.types.str;
-      default = if cfg.enableNginx then "nginx" else defaultGroup;
-      defaultText = "If `services.firefly-iii-data-importer.enableNginx` is true then `nginx` else ${defaultGroup}";
+      default = defaultGroup;
       description = ''
-        Group under which firefly-iii-data-importer runs. It is best to set this to the group
-        of whatever webserver is being used as the frontend.
+        Group under which firefly-iii-data-importer runs.
+        While this also changes which group has access to the phpfpm socket,
+        changing {option}`services.firefly-iii-data-importer.poolConfig."listen.group"`
+        is preferred.
       '';
     };
 
@@ -149,6 +150,9 @@ in
       default = { };
       defaultText = lib.literalExpression ''
         {
+          "listen.mode" = "0660";
+          "listen.owner" = if config.services.firefly-iii-data-importer.enableNginx then config.services.nginx.user else config.services.firefly-iii-data-importer.user;
+          "listen.group" = if config.services.firefly-iii-data-importer.enableNginx then config.services.nginx.group else config.services.firefly-iii-data-importer.group;
           "pm" = "dynamic";
           "pm.max_children" = 32;
           "pm.start_servers" = 2;
@@ -201,9 +205,9 @@ in
         log_errors = on
       '';
       settings = {
-        "listen.mode" = "0660";
-        "listen.owner" = user;
-        "listen.group" = group;
+        "listen.mode" = lib.mkDefault "0660";
+        "listen.owner" = lib.mkDefault (if cfg.enableNginx then config.services.nginx.user else user);
+        "listen.group" = lib.mkDefault (if cfg.enableNginx then config.services.nginx.group else group);
         "pm" = lib.mkDefault "dynamic";
         "pm.max_children" = lib.mkDefault 32;
         "pm.start_servers" = lib.mkDefault 2;

From c67f5063bec404eddd396e9185c059b324eac3b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jul 2026 14:07:03 +0000
Subject: [PATCH 003/120] libcava: 0.10.7 -> 1.0.0

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

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index 985c4283fee2..9701501818d9 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.7";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-zkyj1vBzHtoypX4Bxdh1Vmwh967DKKxN751v79hzmgQ=";
+    hash = "sha256-0r5aAmTs+FcmS501tNYKxG9H+Pq6i32BDRBEjWW6M74=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

From 5beab3e7aabf88c7164806fc85e272a25dc7c56b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Aug 2026 20:15:40 +0000
Subject: [PATCH 004/120] rmapi: 0.0.34 -> 0.0.35

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

diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 27d86cea7ae8..dadb37fa5fda 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "rmapi";
-  version = "0.0.34";
+  version = "0.0.35";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmapi";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-g7KFLa+VBkubzdrgMFDVvAuscw41nyfHd7DWvh3S+NU=";
+    sha256 = "sha256-mRJH0fQ8e4igR7IwcJdvUhrZDXvpTt/Dac7Pc9p7ITw=";
   };
 
   vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc=";

From f1669dc4c1757ac37968cce383b2b85b1d51074a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Aug 2026 00:36:52 +0000
Subject: [PATCH 005/120] omegat: 6.0.1 -> 6.1.1

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

diff --git a/pkgs/by-name/om/omegat/package.nix b/pkgs/by-name/om/omegat/package.nix
index 10493a4ed183..d3bc3cfd4e25 100644
--- a/pkgs/by-name/om/omegat/package.nix
+++ b/pkgs/by-name/om/omegat/package.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation {
-  version = "6.0.1";
+  version = "6.1.1";
   pname = "omegat";
 
   src = fetchurl {
     # their zip has repeated files or something, so no fetchzip
-    url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.1/OmegaT_6.0.1_Without_JRE.zip";
-    sha256 = "sha256-Rj50bzT8k7+GWb0p/ma+zy+PzkF7tB6iV4F4UVAImJg=";
+    url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.1.1/OmegaT_6.1.1_Without_JRE.zip";
+    sha256 = "sha256-apnR+GeHs+ySARtH2LvYR9hfRuznC0xqrWN8WOtq9uk=";
   };
 
   nativeBuildInputs = [

From 76c27ad51316ca11df98d908001b457f1921f9e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Sep 2026 00:57:04 +0000
Subject: [PATCH 006/120] fuzzel: 1.14.1 -> 1.15.0

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

diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix
index 5daea3dd9a1c..9572f617521a 100644
--- a/pkgs/by-name/fu/fuzzel/package.nix
+++ b/pkgs/by-name/fu/fuzzel/package.nix
@@ -28,13 +28,13 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fuzzel";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchFromCodeberg {
     owner = "dnkl";
     repo = "fuzzel";
     rev = finalAttrs.version;
-    hash = "sha256-VhUYNi0/NTrx84KxBgPP1bE2sN1HXqtayg4oY7BLZK4=";
+    hash = "sha256-krlBdIu/WhIep5YyhkGiq0csb/Z2bf6sQWTxqOP1j14=";
   };
 
   depsBuildBuild = [

From 2d6e0e36140a7c55515fda106618abbd94747b19 Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 18:28:46 -0700
Subject: [PATCH 007/120] perlPackages.TimeParseDate: 2015.103 -> 2026.033

---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 07c3ae530694..dee690fcbb2d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -37283,12 +37283,12 @@ with self;
     };
   };
 
-  TimeParseDate = buildPerlPackage {
+  TimeParseDate = buildPerlPackage rec {
     pname = "Time-ParseDate";
-    version = "2015.103";
+    version = "2026.033";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz";
-      hash = "sha256-LBoGI1v4EYE8qsnqqdqnGvdYZnzfewgstZhjIg/K7tE=";
+      url = "mirror://cpan/authors/id/B/BP/BPS/Time-ParseDate-${version}.tar.gz";
+      hash = "sha256-hGXIFGvRKdO+SkArReG5+cMG9CsPWKHlB7vb1lPyU7c=";
     };
     doCheck = false;
     meta = {

From e189d73b239ea0ec11a0a3a09c5640651170de6f Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 18:36:13 -0700
Subject: [PATCH 008/120] perlPackages.DBIxSearchBuilder: 1.82 -> 1.85

---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dee690fcbb2d..8ecea10f4a39 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10492,12 +10492,12 @@ with self;
     };
   };
 
-  DBIxSearchBuilder = buildPerlPackage {
+  DBIxSearchBuilder = buildPerlPackage rec {
     pname = "DBIx-SearchBuilder";
-    version = "1.82";
+    version = "1.85";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.82.tar.gz";
-      hash = "sha256-3IDX5PRVdt4/2Ui2slD+3FAM/QCrzTC2qLLXeJV2uPE=";
+      url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-${version}.tar.gz";
+      hash = "sha256-5iqwesIdGH5QRGkuSq2BaexO8u980ehxTrREoWpwOPc=";
     };
     buildInputs = [ DBDSQLite ];
     propagatedBuildInputs = [

From 18d09b3367fd61b32a5f22e4399d784ef6013fbc Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 19:39:39 -0700
Subject: [PATCH 009/120] perlPackages.Badger: init at 0.16

---
 pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8ecea10f4a39..e3be55c0989b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2305,6 +2305,26 @@ with self;
     };
   };
 
+  Badger = buildPerlPackage rec {
+    pname = "Badger";
+    version = "0.16";
+
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AB/ABW/Badger-${version}.tar.gz";
+      hash = "sha256-tL6Z4I3evcvalYONiqGvEgrB7OB71dszM1+7PzLDqqc=";
+    };
+
+    meta = {
+      changelog = "https://metacpan.org/dist/Badger/changes";
+      description = "Perl Application Programming Toolkit";
+      homepage = "https://github.com/abw/Badger";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   BarcodeZBar = buildPerlPackage {
     pname = "Barcode-ZBar";
     version = "0.04pre";

From f7ef75ecd699c555832235965c2d1e2ce23ee3e9 Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 19:40:07 -0700
Subject: [PATCH 010/120] perlPackages.HTMLQuery: init at 0.09

---
 pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e3be55c0989b..bd24663bb1b3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16373,6 +16373,31 @@ with self;
     };
   };
 
+  HTMLQuery = buildPerlPackage rec {
+    pname = "HTML-Query";
+    version = "0.09";
+
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KA/KAMELKEV/HTML-Query-${version}.tar.gz";
+      hash = "sha256-HZocn4rE8YmmOi3JWDg7Y0kf2/Ap7gZYoJtVqu+vMIk=";
+    };
+
+    propagatedBuildInputs = with perlPackages; [
+      Badger
+      HTMLTree
+    ];
+
+    meta = {
+      changelog = "https://metacpan.org/dist/HTML-Query/changes";
+      description = "jQuery-like selection queries for HTML::Element";
+      homepage = "https://metacpan.org/pod/HTML::Query";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   HTMLQuoted = buildPerlPackage {
     pname = "HTML-Quoted";
     version = "0.04";

From 09177fb04f18ef5f2318b4c59a4871fc2d621ce0 Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 19:41:04 -0700
Subject: [PATCH 011/120] perlPackages.CSSInliner: init at 4027

---
 pkgs/top-level/perl-packages.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bd24663bb1b3..c9d38b42d64f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7968,6 +7968,35 @@ with self;
     };
   };
 
+  CSSInliner = buildPerlPackage rec {
+    pname = "CSS-Inliner";
+    version = "4027";
+
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KA/KAMELKEV/CSS-Inliner-${version}.tar.gz";
+      hash = "sha256-Gg8EvQmdctFcI0PTRcSsF/b7B7gPCeLckGtMIv4jKYo=";
+    };
+
+    buildInputs = with perlPackages; [
+      TestLWPUserAgent
+    ];
+
+    propagatedBuildInputs = with perlPackages; [
+      HTMLQuery
+      HTMLTree
+    ];
+
+    meta = {
+      changelog = "https://github.com/kamelkev/CSS-Inliner/blob/${version}/ChangeLog";
+      description = "Library for converting CSS <style> blocks to inline styles";
+      homepage = "https://github.com/kamelkev/CSS-Inliner";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   CSSMinifier = buildPerlPackage {
     pname = "CSS-Minifier";
     version = "0.01";

From 4cd2dc343c42dd357f0ea78ccac326da10296954 Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 19:49:07 -0700
Subject: [PATCH 012/120] perlPackage.HashMergeExtra: init at 0.06

---
 pkgs/top-level/perl-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c9d38b42d64f..ef2da7556ba4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15838,6 +15838,30 @@ with self;
     };
   };
 
+  HashMergeExtra = buildPerlPackage rec {
+    pname = "Hash-Merge-Extra";
+    version = "0.06";
+
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIXAS/Hash-Merge-Extra-${version}.tar.gz";
+      hash = "sha256-5q8ro1eubr1T2BBHeAClyN8ZJD8y/ZSs3OkBM43KtFE=";
+    };
+
+    propagatedBuildInputs = with perlPackages; [
+      HashMerge
+    ];
+
+    meta = {
+      changelog = "https://github.com/mr-mixas/Hash-Merge-Extra.pm/blob/v${version}/Changes";
+      description = "Collection of extra behaviors for Hash::Merge";
+      homepage = "https://metacpan.org/pod/Hash::Merge::Extra";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   HashMergeSimple = buildPerlPackage {
     pname = "Hash-Merge-Simple";
     version = "0.051";

From 6fc9f6b0ece4e8189d8ad9813532c96cf6ee053d Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Fri, 28 Aug 2026 18:24:02 -0700
Subject: [PATCH 013/120] rt: 5.0.8 -> 6.0.3

Diff: https://github.com/bestpractical/rt/compare/rt-5.0.8...rt-6.0.3
---
 pkgs/by-name/rt/rt/package.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix
index 9ea0019a6532..ee42a992c2fc 100644
--- a/pkgs/by-name/rt/rt/package.nix
+++ b/pkgs/by-name/rt/rt/package.nix
@@ -4,7 +4,6 @@
   autoreconfHook,
   buildEnv,
   fetchFromGitHub,
-  fetchpatch,
   perl,
   perlPackages,
   makeWrapper,
@@ -14,24 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rt";
-  version = "5.0.8";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     repo = "rt";
     rev = "rt-${finalAttrs.version}";
     owner = "bestpractical";
-    hash = "sha256-4/iC1PjLgLAp7XWTafe8HW3bTkDWWQxtSEIOs8wluzE=";
+    hash = "sha256-wmYBeHb/aGKzbDD7mbSMpz0eEZHRq+Jr5+hDK0Hl9+s=";
   };
 
   patches = [
     ./dont-check-users_groups.patch # needed for "make testdeps" to work in the build
     ./override-generated.patch
-    # Fix "Wide character in subroutine entry" crash on every request
-    # merged upstream
-    (fetchpatch {
-      url = "https://github.com/bestpractical/rt/commit/f8f03dd6e69dfbf4eb71e3ded0f793af4721a06d.patch";
-      hash = "sha256-Mk8ve8n5tgyyHT7RAt2o+QnUlcYNOu95lNjku6VgXS0=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -50,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
           BusinessHours
           CGIEmulatePSGI
           CGIPSGI
+          CSSInliner
           CSSMinifierXS
           CSSSquish
           ConvertColor
@@ -65,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
           DateExtract
           DateManip
           DateTimeFormatNatural
+          DateTimeSet
           DevelGlobalDestruction
           EmailAddress
           EmailAddressList
@@ -78,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
           GDGraph
           GnuPGInterface
           GraphViz2
+          HashMerge
+          HashMergeExtra
           HTMLFormatExternal
           HTMLFormatTextWithLinks
           HTMLFormatTextWithLinksAndTables
@@ -87,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
           HTMLQuoted
           HTMLRewriteAttributes
           HTMLScrubber
+          Imager
           IPCRun
           IPCRun3
           JSON

From ed5b2d6e7720e9ac1cf5b3243288937871388c6a Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 5 Sep 2026 18:04:49 +0200
Subject: [PATCH 014/120] various: adopt packages by freedesktop team

---
 pkgs/by-name/fo/font-util/package.nix     | 2 +-
 pkgs/by-name/fp/fprintd/package.nix       | 2 +-
 pkgs/by-name/li/libfprint/package.nix     | 2 +-
 pkgs/by-name/li/libglvnd/package.nix      | 2 +-
 pkgs/by-name/li/libslirp/package.nix      | 2 +-
 pkgs/by-name/us/usbredir/package.nix      | 2 +-
 pkgs/by-name/vi/virglrenderer/package.nix | 2 +-
 pkgs/by-name/xd/xdg-utils/package.nix     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fo/font-util/package.nix b/pkgs/by-name/fo/font-util/package.nix
index 7c83cf5cdca1..7c18cef426ba 100644
--- a/pkgs/by-name/fo/font-util/package.nix
+++ b/pkgs/by-name/fo/font-util/package.nix
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
       # or its an older version that the one on spdx
       unicodeTOU
     ];
-    maintainers = [ ];
     pkgConfigModules = [ "fontutil" ];
     platforms = lib.platforms.unix;
+    teams = [ lib.teams.freedesktop ];
   };
 })
diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix
index 9ec44c877d76..57316a80bb94 100644
--- a/pkgs/by-name/fp/fprintd/package.nix
+++ b/pkgs/by-name/fp/fprintd/package.nix
@@ -119,6 +119,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    teams = [ lib.teams.freedesktop ];
   };
 })
diff --git a/pkgs/by-name/li/libfprint/package.nix b/pkgs/by-name/li/libfprint/package.nix
index ea1a79b01ca2..04f2c31fb938 100644
--- a/pkgs/by-name/li/libfprint/package.nix
+++ b/pkgs/by-name/li/libfprint/package.nix
@@ -95,6 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library designed to make it easy to add support for consumer fingerprint readers";
     license = lib.licenses.lgpl21Only;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    teams = [ lib.teams.freedesktop ];
   };
 })
diff --git a/pkgs/by-name/li/libglvnd/package.nix b/pkgs/by-name/li/libglvnd/package.nix
index 2b0cacfce200..ca44fa89cf7d 100644
--- a/pkgs/by-name/li/libglvnd/package.nix
+++ b/pkgs/by-name/li/libglvnd/package.nix
@@ -112,6 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212
     badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
-    maintainers = [ ];
+    teams = [ lib.teams.freedesktop ];
   };
 })
diff --git a/pkgs/by-name/li/libslirp/package.nix b/pkgs/by-name/li/libslirp/package.nix
index a7984b9e5b66..2ab732529544 100644
--- a/pkgs/by-name/li/libslirp/package.nix
+++ b/pkgs/by-name/li/libslirp/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "General purpose TCP-IP emulator";
     homepage = "https://gitlab.freedesktop.org/slirp/libslirp";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
     platforms = lib.platforms.unix;
+    teams = [ lib.teams.freedesktop ];
   };
 })
diff --git a/pkgs/by-name/us/usbredir/package.nix b/pkgs/by-name/us/usbredir/package.nix
index 7f5287369a23..2208c464d6ea 100644
--- a/pkgs/by-name/us/usbredir/package.nix
+++ b/pkgs/by-name/us/usbredir/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     mainProgram = "usbredirect";
     homepage = "https://www.spice-space.org/usbredir.html";
     license = lib.licenses.lgpl21Plus;
-    maintainers = [ ];
     platforms = lib.platforms.unix;
+    teams = [ lib.teams.freedesktop ];
   };
 }
diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix
index 8d06840fb8ae..34baba6b2676 100644
--- a/pkgs/by-name/vi/virglrenderer/package.nix
+++ b/pkgs/by-name/vi/virglrenderer/package.nix
@@ -94,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Virtual 3D GPU for use inside QEMU virtual machines";
     homepage = "https://docs.mesa3d.org/drivers/virgl";
     license = lib.licenses.mit;
-    maintainers = [ ];
     mainProgram = "virgl_test_server";
     platforms = lib.platforms.unix;
+    teams = [ lib.teams.freedesktop ];
   };
 })
diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix
index 9e29b0c5a41e..6741bf8bafae 100644
--- a/pkgs/by-name/xd/xdg-utils/package.nix
+++ b/pkgs/by-name/xd/xdg-utils/package.nix
@@ -367,7 +367,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/";
     description = "Set of command line tools that assist applications with a variety of desktop integration tasks";
     license = lib.licenses.mit;
-    maintainers = [ ];
     platforms = lib.platforms.all;
+    teams = [ lib.teams.freedesktop ];
   };
 })

From 7ee67608dd2c0c8ef3e703d826cbc532d4dff108 Mon Sep 17 00:00:00 2001
From: Xesxen <wouter@xesxen.nl>
Date: Mon, 7 Sep 2026 17:39:51 +0200
Subject: [PATCH 015/120] perlPackages: Add CBORXS

---
 pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index accdc8a80717..0677fbc79dff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4409,6 +4409,25 @@ with self;
     };
   };
 
+  CBORXS = buildPerlPackage {
+    pname = "CBOR-XS";
+    version = "1.87";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/CBOR-XS-1.87.tar.gz";
+      hash = "sha256-6sFecwqvYS7dnt9x5qqVRlNhG65aEEO5YK/1qbHlcf8=";
+    };
+    buildInputs = [
+      CanaryStability
+      TaskWeaken
+    ];
+    propagatedBuildInputs = [
+      TypesSerialiser
+      commonsense
+    ];
+    meta = {
+    };
+  };
+
   CDDB_get = buildPerlPackage {
     pname = "CDDB_get";
     version = "2.28";

From 136723a252098508138cbdf4d1f67bcf0ea3b41c Mon Sep 17 00:00:00 2001
From: Xesxen <wouter@xesxen.nl>
Date: Mon, 7 Sep 2026 17:40:17 +0200
Subject: [PATCH 016/120] perlPackages.ZonemasterCLI: 8.0.1 -> 8.0.2

---
 pkgs/top-level/perl-packages.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0677fbc79dff..272f155044e7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -39639,11 +39639,18 @@ with self;
 
   ZonemasterCLI = buildPerlPackage {
     pname = "Zonemaster-CLI";
-    version = "8.0.1";
+    version = "8.0.2";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v8.0.1.tar.gz";
-      hash = "sha256-QLUza9M72r/q1W+uhG5pn6YWz7dDJQ0rIq3NyDVUtjU=";
+      url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v8.0.2.tar.gz";
+      hash = "sha256-Y9XorsQS7NFjaxv+/maPQM3hlPdo7ODDZWkQZJkgxgU=";
     };
+    postPatch = ''
+      # 8.0.2 removed the fixture packets in t/usage.normal.data. This breaks in Nix's isolated environment.
+      substituteInPlace t/usage.t \
+        --replace-fail \
+          'qr{NOTICE .* WARNING .* ERROR}msx' \
+          'qr{NOTICE .* WARNING}msx'
+    '';
     buildInputs = [
       JSONValidator
       TestDifferences
@@ -39652,9 +39659,8 @@ with self;
     ];
     propagatedBuildInputs = [
       JSONXS
-      MooseXGetopt
       NetIPXS
-      TextReflow
+      Readonly
       TryTiny
       ZonemasterEngine
       ZonemasterLDNS

From 523e0b60a950aa663f3f5da26a303c326d83051f Mon Sep 17 00:00:00 2001
From: Xesxen <wouter@xesxen.nl>
Date: Mon, 7 Sep 2026 17:41:30 +0200
Subject: [PATCH 017/120] perlPackages.ZonemasterEngine: 8.1.1 -> 9.0.0

---
 pkgs/top-level/perl-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 272f155044e7..7867bf80b696 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -39680,10 +39680,10 @@ with self;
 
   ZonemasterEngine = buildPerlPackage {
     pname = "Zonemaster-Engine";
-    version = "8.1.1";
+    version = "9.0.0";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v8.1.1.tar.gz";
-      hash = "sha256-QlQQ+saL++8A1MW9dqMRzDNH6cydyQl9HB3cXanudGI=";
+      url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v9.0.0.tar.gz";
+      hash = "sha256-9J07VHNQF3AQA/9VeaVjcIZbZyB3wu/yoDDUT0HJgFU=";
     };
     buildInputs = [
       LocalePO
@@ -39696,6 +39696,7 @@ with self;
       TestPod
     ];
     propagatedBuildInputs = [
+      CBORXS
       ClassAccessor
       Clone
       EmailValid
@@ -39711,13 +39712,12 @@ with self;
       NetIPXS
       Readonly
       TextCSV
-      ZonemasterLDNS
       YAMLLibYAML
+      ZonemasterLDNS
       libintl-perl
     ];
-
     meta = {
-      description = "Tool to check the quality of a DNS zone";
+      description = "A tool to check the quality of a DNS zone";
       license = lib.licenses.bsd3;
     };
   };

From 2a4c30d54ec74249d7b2d6f86aabb7fc59d08014 Mon Sep 17 00:00:00 2001
From: Xesxen <wouter@xesxen.nl>
Date: Mon, 7 Sep 2026 17:42:54 +0200
Subject: [PATCH 018/120] perlPackages.ZonemasterLDNS: 5.0.2 -> 5.1.0

---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7867bf80b696..ee060b745689 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -39724,10 +39724,10 @@ with self;
 
   ZonemasterLDNS = buildPerlPackage {
     pname = "Zonemaster-LDNS";
-    version = "5.0.2";
+    version = "5.1.0";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-5.0.2.tar.gz";
-      hash = "sha256-IP1f+7SgnQ1vv9BjkBoSsa7rv9k3KoXOLUVcmkwJqYY=";
+      url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-5.1.0.tar.gz";
+      hash = "sha256-R8zYw/Zm051R/DZp+PSZetQeIfydTkD4G3VYw7FeT88=";
     };
     env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include";
     env.NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2";
@@ -39741,9 +39741,10 @@ with self;
       MIMEBase32
       ModuleInstall
       ModuleInstallXSUtil
-      TestFatal
       TestDifferences
       TestException
+      TestFatal
+      TestNoWarnings
       pkgs.ldns
       pkgs.libidn2
       pkgs.openssl

From 4d6c87838b7b7efe6071adc5433905b4aaeda323 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Thu, 10 Sep 2026 21:55:44 -0600
Subject: [PATCH 019/120] flatten-references-graph: add license

---
 pkgs/by-name/fl/flatten-references-graph/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fl/flatten-references-graph/package.nix b/pkgs/by-name/fl/flatten-references-graph/package.nix
index 0a0ef73f1dda..a99093464653 100644
--- a/pkgs/by-name/fl/flatten-references-graph/package.nix
+++ b/pkgs/by-name/fl/flatten-references-graph/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   callPackage,
   nix-gitignore,
   python3Packages,
@@ -34,4 +35,6 @@ pythonPackages.buildPythonApplication {
   passthru = {
     dev-shell = callPackage ./dev-shell.nix { };
   };
+
+  meta.license = lib.licenses.mit;
 }

From ecd1fc16d56b44e6da9e930ef55dc7e5310c1e71 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 23:08:32 +0200
Subject: [PATCH 020/120] riotx: init at 1.15.0

---
 pkgs/by-name/ri/riotx/package.nix | 68 +++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 pkgs/by-name/ri/riotx/package.nix

diff --git a/pkgs/by-name/ri/riotx/package.nix b/pkgs/by-name/ri/riotx/package.nix
new file mode 100644
index 000000000000..9d8a6f8a73b0
--- /dev/null
+++ b/pkgs/by-name/ri/riotx/package.nix
@@ -0,0 +1,68 @@
+{
+  coreutils,
+  fetchzip,
+  findutils,
+  gnused,
+  installShellFiles,
+  jre_headless,
+  lib,
+  makeWrapper,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "riotx";
+  version = "1.15.0";
+
+  src = fetchzip {
+    url = "https://github.com/redis/riotx-dist/releases/download/v${finalAttrs.version}/riotx-${finalAttrs.version}.zip";
+    hash = "sha256-CozuLIkWrRX/b8a+LvEF3r/CwO8JnmLzTsxy5USIU9U=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
+
+  buildInputs = [ jre_headless ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp bin/riotx $out/bin
+    cp -r lib $out
+
+    wrapProgram $out/bin/riotx \
+      --set JAVA_HOME "${jre_headless}" \
+      --set PATH ${
+        lib.makeBinPath [
+          coreutils
+          findutils
+          gnused
+        ]
+      }
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd riotx \
+        --bash <($out/bin/riotx generate-completion bash) \
+        --zsh <($out/bin/riotx generate-completion zsh)
+  '';
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  meta = {
+    changelog = "https://github.com/redis/riotx-dist/releases/tag/v${finalAttrs.version}";
+    description = "Data integration tool for Redis Cloud and Redis Software";
+    homepage = "https://redis.github.io/riotx";
+    license = lib.licenses.unfree;
+    mainProgram = "riotx";
+    platforms = lib.platforms.unix;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    teams = [ lib.teams.redis ];
+  };
+})

From 3ee01aa617cb24e0bb0b04b942883aac71e70c07 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 23:11:17 +0200
Subject: [PATCH 021/120] riot-redis: drop

---
 pkgs/by-name/ri/riot-redis/package.nix | 44 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/ri/riot-redis/package.nix

diff --git a/pkgs/by-name/ri/riot-redis/package.nix b/pkgs/by-name/ri/riot-redis/package.nix
deleted file mode 100644
index 221237b60d78..000000000000
--- a/pkgs/by-name/ri/riot-redis/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  jre_headless,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "riot-redis";
-  version = "2.19.0";
-
-  src = fetchzip {
-    url = "https://github.com/redis-developer/riot/releases/download/v${finalAttrs.version}/riot-redis-${finalAttrs.version}.zip";
-    sha256 = "sha256-q2ZqFVdjg5HSH4kiwoC1W+a8VgHNxBgNeMaw5n97isc=";
-  };
-
-  buildInputs = [ jre_headless ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp bin/riot-redis $out/bin
-    cp -R lib $out
-    chmod +x $out/bin/*
-
-    wrapProgram $out/bin/riot-redis \
-      --set JAVA_HOME "${jre_headless}"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://github.com/redis-developer/riot";
-    description = "Get data in and out of Redis";
-    mainProgram = "riot-redis";
-    license = lib.licenses.asl20;
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    maintainers = with lib.maintainers; [ wesnel ];
-    teams = [ lib.teams.redis ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 19b65f801709..975162b22e48 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1954,6 +1954,7 @@ mapAliases {
   rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
   rigsofrods = throw "'rigsofrods' has been renamed to/replaced by 'rigsofrods-bin'"; # Converted to throw 2025-10-27
   rili = throw "'rili' has been dropped in favor of its maintained fork 'li-ri'"; # Added 2026-01-03
+  riot-redis = throw "'riot-redis' has been removed in favor of its successor 'riotx'"; # Added 2026-06-07
   rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   rke2_1_30 = throw "'rke2_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-11-04
   rke2_1_31 = throw "'rke2_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08

From 6b9764ec5af727db0c9da92c57742b79d7a3cd6a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Tue, 15 Sep 2026 13:36:26 +0900
Subject: [PATCH 022/120] nixos/tests/speechd: init

This test ensures that the speechd module evals correctly behind its
`mkIf` guard, and verifies that configuration is picked up correctly.

It unfortunately does not test integration with other systems like
pipewire, but the test is better than nothing in it's current state.
---
 nixos/tests/all-tests.nix           |  1 +
 nixos/tests/speechd.nix             | 49 +++++++++++++++++++++++++++++
 pkgs/by-name/sp/speechd/package.nix |  3 ++
 3 files changed, 53 insertions(+)
 create mode 100644 nixos/tests/speechd.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a02c12f93e92..15774caa00e9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1717,6 +1717,7 @@ in
   sonic-server = runTest ./sonic-server.nix;
   spacecookie = runTest ./spacecookie.nix;
   spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark { };
+  speechd = runTest ./speechd.nix;
   speedtest-tracker = runTest ./speedtest-tracker.nix;
   spiped = runTest ./spiped.nix;
   spire = runTest ./spire.nix;
diff --git a/nixos/tests/speechd.nix b/nixos/tests/speechd.nix
new file mode 100644
index 000000000000..4988b24b3732
--- /dev/null
+++ b/nixos/tests/speechd.nix
@@ -0,0 +1,49 @@
+{ lib, ... }:
+{
+  name = "speechd";
+  meta.maintainers = [ lib.maintainers.h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      imports = [ ./common/user-account.nix ];
+
+      environment.systemPackages = [ pkgs.speechd ];
+
+      # Without a real sound card, libao (speech-dispatcher's audio backend)
+      # fails to open any device. libao's built-in "null" driver always succeeds.
+      environment.etc."libao.conf".text = ''
+        default_driver=null
+      '';
+
+      services.speechd = {
+        enable = true;
+        config = ''
+          AddModule "testmodule" "sd_generic" "testmodule.conf"
+          DefaultModule "testmodule"
+        '';
+        modules.testmodule = ''
+          AddVoice "en" "male1" "testmodule_voice"
+          GenericLanguage "en" "en"
+          GenericExecuteSynth "echo \'$DATA\' >> /tmp/speechd-spoken.txt"
+        '';
+      };
+    };
+
+  testScript =
+    { nodes, ... }:
+    let
+      user = nodes.machine.users.users.alice;
+      uid = toString user.uid;
+      aliceRun = command: "su - ${user.name} -c 'XDG_RUNTIME_DIR=/run/user/${uid} ${command}'";
+    in
+    ''
+      machine.wait_for_unit("multi-user.target")
+      machine.succeed("loginctl enable-linger ${user.name}")
+      machine.wait_for_unit("user@${uid}.service")
+      machine.wait_for_unit("speech-dispatcher.socket", "${user.name}")
+
+      machine.succeed("${aliceRun "spd-say 'hello'"}")
+      machine.wait_until_succeeds("grep -q 'hello' /tmp/speechd-spoken.txt")
+    '';
+}
diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix
index e63b5db36d92..644004c68325 100644
--- a/pkgs/by-name/sp/speechd/package.nix
+++ b/pkgs/by-name/sp/speechd/package.nix
@@ -33,6 +33,7 @@
   withPico ? true,
   picotts,
   libsOnly ? false,
+  nixosTests,
 }:
 
 let
@@ -152,6 +153,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  passthru.tests.nixos = nixosTests.speechd;
+
   meta = {
     description =
       "Common interface to speech synthesis" + lib.optionalString libsOnly " - client libraries only";

From f2d9ef8e9d1d31fbca1e5a34e082ce70ac7bd3cc Mon Sep 17 00:00:00 2001
From: mcnesium <git@mcnesium.com>
Date: Thu, 17 Sep 2026 09:11:26 +0200
Subject: [PATCH 023/120] fosrl-newt: 1.16.0 -> 1.17.0

Diff: https://github.com/fosrl/newt/compare/1.16.0...1.17.0

Changelog: https://github.com/fosrl/newt/releases/tag/1.17.0
---
 pkgs/by-name/fo/fosrl-newt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 2b100f305620..9aa722a140ea 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "newt";
-  version = "1.16.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = finalAttrs.version;
-    hash = "sha256-Ehmo7RUbZDZhBYAmaheh6IT01rhDj3LsQrXbaYQpSxg=";
+    hash = "sha256-lwDywGs1Wh5jl9xwEd7KvXqEkLw7gCas44SbHtKx8Ps=";
   };
 
-  vendorHash = "sha256-JhNBJhj5YX3Wurv7r/JDu6YtHizOMLk+NCob7ISx+3c=";
+  vendorHash = "sha256-VOXZWcPnBSc8EKYLKhsrQTHSjXvpaEYoewYLCxJ8Nk8=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From f1ecb0388c12036d7749f90124ea04fe69fcd092 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Thu, 17 Sep 2026 12:44:49 -0700
Subject: [PATCH 024/120] rssguard: fix

Closes #563621
---
 pkgs/by-name/rs/rssguard/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix
index 481135aeb245..05d08dd9b9a8 100644
--- a/pkgs/by-name/rs/rssguard/package.nix
+++ b/pkgs/by-name/rs/rssguard/package.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
   ];
 
+  # This string must have quotes around Release or the package will break!
+  # See https://github.com/NixOS/nixpkgs/issues/563621
+  cmakeBuildType = "\"Release\"";
+
   dontWrapGApps = true;
 
   preFixup = ''

From b78402617e9939967316edd8a3db90f740f52798 Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Fri, 18 Sep 2026 01:28:44 +0200
Subject: [PATCH 025/120] netboxPlugins.netbox-wdm: init at 0.2.2

---
 .../ne/netbox/plugins/netbox-wdm/package.nix  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/ne/netbox/plugins/netbox-wdm/package.nix

diff --git a/pkgs/by-name/ne/netbox/plugins/netbox-wdm/package.nix b/pkgs/by-name/ne/netbox/plugins/netbox-wdm/package.nix
new file mode 100644
index 000000000000..640e2672a5bb
--- /dev/null
+++ b/pkgs/by-name/ne/netbox/plugins/netbox-wdm/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  python,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "netbox-wdm";
+  version = "0.2.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jsenecal";
+    repo = "netbox-wdm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wSW9nLqUIt+L4f8wlqX+Ox7rLnlqzRfQKpf44k+PhKE=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_wdm" ];
+
+  passthru.pluginName = "netbox_wdm";
+
+  meta = {
+    description = "NetBox plugin for WDM wavelength management, ITU channel plans, ROADM editing, and wavelength service tracking";
+    homepage = "https://jsenecal.github.io/netbox-wdm/";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ felbinger ];
+    platforms = lib.platforms.linux;
+  };
+})

From 7ed778d36c7bd5e506ad02bf34d80362ef7a17d9 Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Fri, 18 Sep 2026 01:30:59 +0200
Subject: [PATCH 026/120] netboxPlugins.netbox-fms: init at 0.3.0

---
 .../ne/netbox/plugins/netbox-fms/package.nix  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/ne/netbox/plugins/netbox-fms/package.nix

diff --git a/pkgs/by-name/ne/netbox/plugins/netbox-fms/package.nix b/pkgs/by-name/ne/netbox/plugins/netbox-fms/package.nix
new file mode 100644
index 000000000000..a8c59234ad30
--- /dev/null
+++ b/pkgs/by-name/ne/netbox/plugins/netbox-fms/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  python,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "netbox-fms";
+  version = "0.3.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jsenecal";
+    repo = "netbox-fms";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5RPcJFxwQYJWUipHU05gp7zovWPnviWHlkqCHEs16tw=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_fms" ];
+
+  passthru.pluginName = "netbox_fms";
+
+  meta = {
+    description = "NetBox plugin for Fiber Management System: fiber cable management, splice planning, and circuit provisioning";
+    homepage = "https://jsenecal.github.io/netbox-fms/";
+    changelog = "https://jsenecal.github.io/netbox-fms/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ felbinger ];
+    platforms = lib.platforms.linux;
+  };
+})

From 2cc00253cb626086155c5eb0c5c0615a6b24bef6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Sep 2026 02:53:20 +0000
Subject: [PATCH 027/120] proxmark3: 4.21128 -> 4.23346

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

diff --git a/pkgs/by-name/pr/proxmark3/package.nix b/pkgs/by-name/pr/proxmark3/package.nix
index 868e5796ddeb..b5dc7d338c39 100644
--- a/pkgs/by-name/pr/proxmark3/package.nix
+++ b/pkgs/by-name/pr/proxmark3/package.nix
@@ -30,13 +30,13 @@
 assert withBlueshark -> stdenv.hostPlatform.isLinux;
 stdenv.mkDerivation (finalAttrs: {
   pname = "proxmark3";
-  version = "4.21128";
+  version = "4.23346";
 
   src = fetchFromGitHub {
     owner = "RfidResearchGroup";
     repo = "proxmark3";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KlSYbYEdLVsQCbRilqolGewH5ra9QXOHVgYk34aCous=";
+    hash = "sha256-/YQHqy/GBHoa0yLQsPlUIPlAI+CNNuXaMYFmnYYDURU=";
   };
 
   postPatch = ''

From c23ea5f1dbd7318dccc168e64c8f5e977bebd16f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Sep 2026 11:20:02 +0000
Subject: [PATCH 028/120] jetbrains.idea: 2026.2.2 -> 2026.2.3

---
 .../applications/editors/jetbrains/ides/idea.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix
index e05763ecf08e..de0ecd11c74c 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/applications/editors/jetbrains/ides/idea.nix
@@ -17,16 +17,16 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.2.2.tar.gz";
-      hash = "sha256-8cxTKaet86s72IhnRBA/fTvPHKEuaZdi7Nm//lczX4s=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.2.3.tar.gz";
+      hash = "sha256-aHUciuTUlAclHNGX33lfvtkbb9yF0QxzxGSameSWqzc=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.2.2-aarch64.tar.gz";
-      hash = "sha256-BLq6b7EDSuv7+G6LVRhsgYuT27vhMQEpdXGP9/cHQPU=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.2.3-aarch64.tar.gz";
+      hash = "sha256-hzKG3WQGlxojEYJ+3WbFYGDDRVgqSmsXdOOSUYOwLsU=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.2.2-aarch64.dmg";
-      hash = "sha256-9KRfRRAIyGzk6TQtWTH9ichVP506tugBLadTPp/lwkk=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.2.3-aarch64.dmg";
+      hash = "sha256-qsPNxthEG5QFJHP+43qWeSQqNvSfYP3ObM6qPnrUbjM=";
     };
   };
   # update-script-end: urls
@@ -41,8 +41,8 @@ jetbrains.mkJetBrainsProduct {
   productShort = "IDEA";
 
   # update-script-start: version
-  version = "2026.2.2";
-  buildNumber = "262.10315.125";
+  version = "2026.2.3";
+  buildNumber = "262.10968.63";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From a055eebe54c7ab2119c971360f8145ac54a1c707 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Sat, 19 Sep 2026 11:59:06 +0200
Subject: [PATCH 029/120] ninjabrain-bot: force swing look&feel

NBB struggles to launch and crashes at random when using the nixpkgs
openjdk, which seems to be caused by the GTK look&feel. Forcing it to
default to `MetalLookAndFeel` avoids those issues.
---
 pkgs/by-name/ni/ninjabrain-bot/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ni/ninjabrain-bot/package.nix b/pkgs/by-name/ni/ninjabrain-bot/package.nix
index bb822425ef98..f42129de5cd1 100644
--- a/pkgs/by-name/ni/ninjabrain-bot/package.nix
+++ b/pkgs/by-name/ni/ninjabrain-bot/package.nix
@@ -65,6 +65,7 @@ maven.buildMavenPackage (finalAttrs: {
     makeWrapperArgs=(
       --add-flags "-Dawt.useSystemAAFontSettings=on"
       --add-flags "-Dswing.aatext=true"
+      --add-flags "-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel"
       --add-flags "-jar $out/share/java/ninjabrain-bot.jar"
     )
 

From 88ae0c566f8997a3d2ff37b5aa02acad08211bbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Sep 2026 21:18:09 +0000
Subject: [PATCH 030/120] jellyfin-tui: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index ffbaf54fb7aa..5ec11430eaf1 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jellyfin-tui";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "dhonus";
     repo = "jellyfin-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZdcAPN+APEnkQbPdLpcQd/fdQnEP6peQ+xdZI5sskSM=";
+    hash = "sha256-+ACqw95a761H6ye8dwZDhKIUQbAy80n+43wLysYgr8k=";
   };
 
-  cargoHash = "sha256-mri4PhYcUTWWKLl39sDhLUsFQFGLUAvDlhKNcj9gTFU=";
+  cargoHash = "sha256-ZY/wBrziKoYkY+uGdxK/JTWpQmvT3xORf9U4Fhx1Jwo=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From f9bfe3dda0ddcfa82fbfd4c0b515f065a84e4ed1 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 20 Sep 2026 21:21:52 +0200
Subject: [PATCH 031/120] {lomiri,lomiri-qt6}.lomiri-download-manager: 0.3.2 ->
 0.3.3

---
 .../lomiri/services/lomiri-download-manager/default.nix     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 2742499463ca..7eabcdf5e495 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -15,6 +15,7 @@
   graphviz,
   gtest,
   libapparmor,
+  libcap,
   lomiri-api,
   pkg-config,
   python3,
@@ -32,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
     tag = finalAttrs.version;
-    hash = "sha256-FJcc8Y+AFAxiTj7JGLAlDkviEwMBpsDjuibJP6hgVNY=";
+    hash = "sha256-2hQ7HBDFgezFLed7It9vNfKTCrWCaLFxhYeFM4pBuEs=";
   };
 
   outputs = [
@@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake-extras
     glog
     libapparmor
+    libcap
     lomiri-api
     qtbase
     qtdeclarative

From b710828986fb80cf696bfeeae7b221668b46b4a7 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:49:38 -0300
Subject: [PATCH 032/120] djvu2pdf: drop

---
 pkgs/by-name/dj/djvu2pdf/package.nix | 44 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/dj/djvu2pdf/package.nix

diff --git a/pkgs/by-name/dj/djvu2pdf/package.nix b/pkgs/by-name/dj/djvu2pdf/package.nix
deleted file mode 100644
index 9d15d9a77fb7..000000000000
--- a/pkgs/by-name/dj/djvu2pdf/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  makeWrapper,
-  fetchurl,
-  djvulibre,
-  ghostscript,
-  which,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  version = "0.9.2";
-  pname = "djvu2pdf";
-
-  src = fetchurl {
-    url = "https://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${finalAttrs.version}.tar.gz";
-    sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -p djvu2pdf $out/bin
-    wrapProgram $out/bin/djvu2pdf --prefix PATH : ${
-      lib.makeBinPath [
-        ghostscript
-        djvulibre
-        which
-      ]
-    }
-
-    mkdir -p $out/man/man1
-    cp -p djvu2pdf.1.gz $out/man/man1
-  '';
-
-  meta = {
-    description = "Convert DjVu files to PDF files";
-    homepage = "https://0x2a.at/site/projects/djvu2pdf/";
-    license = lib.licenses.gpl1Only;
-    platforms = lib.platforms.all;
-    mainProgram = "djvu2pdf";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a3122d2a50de..44575272597b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -698,6 +698,7 @@ mapAliases {
   disk-inventory-x = throw "disk-inventory-x has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
   DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14
   djmount = throw "'djmount' has been removed as it is no longer maintained"; # Added 2026-05-19
+  djvu2pdf = throw "'djvu2pdf' has been removed as it was unmaintained"; # Added 2026-09-20
   dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
   dleyna-core = throw "'dleyna-core' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
   dleyna-renderer = throw "'dleyna-renderer' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27

From 8aea7c492e97e8b1bb66f1359e90595c84662924 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 21 Sep 2026 10:15:10 +0200
Subject: [PATCH 033/120] firefoxpwa-unwrapped: switch to finalAttrs

---
 pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
index 29438dd2bf95..ff4c55693236 100644
--- a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
@@ -14,26 +14,26 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "firefoxpwa-unwrapped";
   version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-T3VtyPmPz9u4sS9tgQxyks2w7VFLuyTjThDYFapiPOc=";
   };
 
-  sourceRoot = "${src.name}/native";
+  sourceRoot = "${finalAttrs.src.name}/native";
   buildFeatures = [ "immutable-runtime" ];
 
   cargoHash = "sha256-Uxi/ujhtRK8TbRZTj7cQB9P7hD5Qao7K2rqeNXWLhXQ=";
 
   preConfigure = ''
-    sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
-    sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock
-    sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.sys.mjs
+    sed -i 's;version = "0.0.0";version = "${finalAttrs.version}";' Cargo.toml
+    sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${finalAttrs.version}";' Cargo.lock
+    sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${finalAttrs.version}\';' userchrome/profile/chrome/pwa/chrome.sys.mjs
   '';
 
   nativeBuildInputs = [
@@ -137,7 +137,7 @@ rustPlatform.buildRustPackage rec {
       possible for the extension to detect and use it.
     '';
     homepage = "https://pwasforfirefox.filips.si/";
-    changelog = "https://github.com/filips123/PWAsForFirefox/releases/tag/v${version}";
+    changelog = "https://github.com/filips123/PWAsForFirefox/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
@@ -146,4 +146,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "firefoxpwa";
   };
-}
+})

From 72de51ae86ed8648b739e8f0633e5ead27b7fa52 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 21 Sep 2026 10:21:33 +0200
Subject: [PATCH 034/120] firefoxpwa-unwrapped: 2.19.0 -> 2.20.0

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

diff --git a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
index ff4c55693236..ceec2b951ac8 100644
--- a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "firefoxpwa-unwrapped";
-  version = "2.19.0";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T3VtyPmPz9u4sS9tgQxyks2w7VFLuyTjThDYFapiPOc=";
+    hash = "sha256-4Gbwfx/Gv21dvCEeS6HE1zHflD7xABRX3rAJdHWIsHU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/native";

From f3b8087fe987c5dbf8ebdd08004d0945a2482b28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 07:41:27 +0000
Subject: [PATCH 035/120] lazysql: 0.5.7 -> 0.5.9

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

diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index b27867a4a1d2..fd4472b113c0 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.5.7";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-5JGSpA4tAV6/f9y58PfjGOamxRYyCKKZXecRzpvq4E0=";
+    hash = "sha256-A9arRNJXJGbb1xuSknTVhNNe+KGxFdtv4Qhpe9stRF8=";
   };
 
-  vendorHash = "sha256-FyvPTqvlNtU3Yud5Pq9CRLG0xg4LIXb9CDEBvigGow8=";
+  vendorHash = "sha256-g2gXH0PzleT77ycLosflk7gyHL59mFtDD/6ImWtGg7o=";
 
   ldflags = [
     "-X main.version=${version}"

From b34df3bee65c5b0080983beceb9b87265cb262f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 08:39:53 +0000
Subject: [PATCH 036/120] starc: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/by-name/st/starc/package.nix b/pkgs/by-name/st/starc/package.nix
index f50f6ce56403..83a7a6cbd317 100644
--- a/pkgs/by-name/st/starc/package.nix
+++ b/pkgs/by-name/st/starc/package.nix
@@ -6,11 +6,11 @@
 }:
 appimageTools.wrapType2 (finalAttrs: {
   pname = "starc";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "https://github.com/story-apps/starc/releases/download/v${finalAttrs.version}/starc-setup.AppImage";
-    hash = "sha256-7uwc4gD+AlbYGMffaWj3v2Zt2x6P5edPXY3BsznBNdQ=";
+    hash = "sha256-ZNd69E70yTFOQGBAZuOJqKlzGS+0xSsAP2uh1EWb6B8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 99a40c8f438c72465281045413c2a0bb4487512a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 10:28:35 +0000
Subject: [PATCH 037/120] sublime-merge: 2125 -> 2132

---
 .../version-management/sublime-merge/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
index 394226938c61..19f5c279748b 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -5,9 +5,9 @@ let
 in
 {
   sublime-merge = common {
-    buildVersion = "2125";
-    aarch64sha256 = "Zs4VKbFKkw4KRViX/QGVtVo4hluJ3HVen39Vq3Xz3KI=";
-    x64sha256 = "0Zlv4nZMb2FDUG5KLkHTXJjdRzTa3TuNL54yacFVR/c=";
+    buildVersion = "2132";
+    aarch64sha256 = "70KdQ9lqkhFSfWU9fkhuawJpEkj6bkeU+XlLJIGKK54=";
+    x64sha256 = "As7Nj3vrEE6JmN/oZ8e4EzhY+qLpPYja7/FJUjDRs9g=";
   } { };
 
   sublime-merge-dev = common {

From a5fec04c193eb9f1c5e7e9fb0496b2f480ad80bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 16:19:34 +0000
Subject: [PATCH 038/120] pihole-ftl: 6.7 -> 6.7.1

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

diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix
index 44e2a4d836a3..b8ab451e56e0 100644
--- a/pkgs/by-name/pi/pihole-ftl/package.nix
+++ b/pkgs/by-name/pi/pihole-ftl/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pihole-ftl";
-  version = "6.7";
+  version = "6.7.1";
 
   src = fetchFromGitHub {
     owner = "pi-hole";
     repo = "FTL";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vViQ9ZAhajIfCQvOtKjMO2wj8CRt/1h/dzHHFevbbFU=";
+    hash = "sha256-TP4HFgZKAbrLaMeIkY4MKAAs86cAALXbgPwd8oc0BrA=";
   };
 
   nativeBuildInputs = [

From ef9271ab9b091adffc7db2701906c120dca726b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 17:02:34 +0000
Subject: [PATCH 039/120] python3Packages.emoji: 2.15.0 -> 2.16.0

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

diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index 9c2efc8220bd..dfd10d11fcc0 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "2.15.0";
+  version = "2.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "carpedm20";
     repo = "emoji";
     tag = "v${version}";
-    hash = "sha256-YHf5UIxbdBS4JEPrD4BWE+wzYkzAboMpGmuMbOgR7s0=";
+    hash = "sha256-sDQ4KE9J7/0hlmXxyploRYGkIzj3YIFrxzq7yA5NFp0=";
   };
 
   build-system = [ setuptools ];

From 25e798fb9327298e095dc2bc685dd57ad005dde4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 17:17:30 +0000
Subject: [PATCH 040/120] hk: 1.58.1 -> 2.0.1

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

diff --git a/pkgs/by-name/hk/hk/package.nix b/pkgs/by-name/hk/hk/package.nix
index 1a9cbd24d44a..6f1bbe5b0bc4 100644
--- a/pkgs/by-name/hk/hk/package.nix
+++ b/pkgs/by-name/hk/hk/package.nix
@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hk";
-  version = "1.58.1";
+  version = "2.0.1";
 
   __structuredAttrs = true;
 
@@ -23,10 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "jdx";
     repo = "hk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XSZy4dbKPDRkGc8BrVCz8H0STb64uJEoJBQ5lwiwsv4=";
+    hash = "sha256-Rfl4Ssps+2PUcwj01+srDFPjMq78ec4XWmhgMlbq7iM=";
   };
 
-  cargoHash = "sha256-WQ/ICFoRuZBEXGaLbScnwBv4s6AhdtgoUSxoYwmQT0c=";
+  cargoHash = "sha256-P6RV8R1hRPkBX0iAfNEiFAuVdcUfg3PpsZ1YB7s2B3E=";
 
   nativeBuildInputs = [
     installShellFiles

From 0903c89a5113dedafe5449982493efb217b32d02 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Mon, 25 May 2026 20:10:53 +0800
Subject: [PATCH 041/120] python3Packages.mlx{,-bin,-metal}: add Darwin wheel
 packaging

---
 .../python-modules/mlx-metal/default.nix      | 33 +++++++
 pkgs/development/python-modules/mlx/bin.nix   | 88 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +
 3 files changed, 125 insertions(+)
 create mode 100644 pkgs/development/python-modules/mlx-metal/default.nix
 create mode 100644 pkgs/development/python-modules/mlx/bin.nix

diff --git a/pkgs/development/python-modules/mlx-metal/default.nix b/pkgs/development/python-modules/mlx-metal/default.nix
new file mode 100644
index 000000000000..7ffcf69d3e41
--- /dev/null
+++ b/pkgs/development/python-modules/mlx-metal/default.nix
@@ -0,0 +1,33 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+}:
+
+buildPythonPackage rec {
+  pname = "mlx-metal";
+  version = "0.31.2";
+  format = "wheel";
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "mlx_metal";
+    inherit version;
+    format = "wheel";
+    dist = "py3";
+    python = "py3";
+    abi = "none";
+    platform = "macosx_14_0_arm64";
+    hash = "sha256-slOFvO4Y/BlAkiVbi1O5o9hInrZQ5ZFg8bV6rdB6otw=";
+  };
+
+  meta = {
+    description = "Prebuilt Metal runtime for MLX";
+    homepage = "https://github.com/ml-explore/mlx";
+    changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kinnrai ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [ "aarch64-darwin" ];
+  };
+}
diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
new file mode 100644
index 000000000000..d22bed2696e5
--- /dev/null
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -0,0 +1,88 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  mlx-metal,
+  python,
+  runCommand,
+  stdenv,
+}:
+
+let
+  version = "0.31.2";
+  inherit (python) pythonVersion;
+
+  getSrcFromPypi =
+    {
+      platform,
+      dist,
+      hash,
+    }:
+    fetchPypi {
+      pname = "mlx";
+      inherit
+        version
+        platform
+        dist
+        hash
+        ;
+      format = "wheel";
+      python = dist;
+      abi = dist;
+    };
+
+  srcs = {
+    "3.13-aarch64-darwin" = getSrcFromPypi {
+      platform = "macosx_14_0_arm64";
+      dist = "cp313";
+      hash = "sha256-Gz+w3alVsNVSzle91vQrMwmrIbBn5AWH1oSEQ9MH6R8=";
+    };
+    "3.14-aarch64-darwin" = getSrcFromPypi {
+      platform = "macosx_14_0_arm64";
+      dist = "cp314";
+      hash = "sha256-oTyc4jw97vaqWgkxXnlT4aXcMR6FH6Fvx0yB+yUJwLk=";
+    };
+  };
+in
+buildPythonPackage (finalAttrs: {
+  pname = "mlx";
+  inherit version;
+  format = "wheel";
+  __structuredAttrs = true;
+
+  disabled = !(srcs ? "${pythonVersion}-${stdenv.hostPlatform.system}");
+
+  src =
+    srcs."${pythonVersion}-${stdenv.hostPlatform.system}"
+      or (throw "mlx-bin is only supported on Python ${builtins.concatStringsSep ", " (builtins.attrNames srcs)}");
+
+  dependencies = [ mlx-metal ];
+
+  postInstall = ''
+    # The Python wheel expects libmlx.dylib and mlx.metallib to live under
+    # mlx/lib next to the extension module, but those files are shipped by the
+    # separate mlx-metal wheel.
+    ln -s ${mlx-metal}/${python.sitePackages}/mlx/lib $out/${python.sitePackages}/mlx/lib
+  '';
+
+  pythonImportsCheck = [ "mlx" ];
+
+  passthru.tests.linkedMetalRuntime =
+    runCommand "python${python.pythonVersion}-mlx-bin-linked-metal-runtime" { }
+      ''
+        test -L ${finalAttrs.finalPackage}/${python.sitePackages}/mlx/lib
+        test -e ${finalAttrs.finalPackage}/${python.sitePackages}/mlx/lib/libmlx.dylib
+        test -e ${finalAttrs.finalPackage}/${python.sitePackages}/mlx/lib/mlx.metallib
+        touch $out
+      '';
+
+  meta = {
+    description = "Prebuilt MLX wheel for Apple silicon with Metal runtime";
+    homepage = "https://github.com/ml-explore/mlx";
+    changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kinnrai ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [ "aarch64-darwin" ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 33447fd4ffaa..39101bcecc79 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11070,8 +11070,12 @@ self: super: with self; {
 
   mlx = callPackage ../development/python-modules/mlx { };
 
+  mlx-bin = callPackage ../development/python-modules/mlx/bin.nix { };
+
   mlx-lm = callPackage ../development/python-modules/mlx-lm { };
 
+  mlx-metal = callPackage ../development/python-modules/mlx-metal { };
+
   mlx-vlm = callPackage ../development/python-modules/mlx-vlm { };
 
   mlxtend = callPackage ../development/python-modules/mlxtend { };

From f9273e0e9e1e9f72baf370960067213bc9a822f7 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 22 Sep 2026 16:50:45 +0800
Subject: [PATCH 042/120] python3Packages.mlx-{bin,metal}: share wheel release
 metadata

---
 pkgs/development/python-modules/mlx/bin.nix   | 22 +++++++------------
 .../{mlx-metal/default.nix => mlx/metal.nix}  |  8 ++++---
 .../python-modules/mlx/wheel-sources.nix      | 21 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +-
 4 files changed, 35 insertions(+), 18 deletions(-)
 rename pkgs/development/python-modules/{mlx-metal/default.nix => mlx/metal.nix} (83%)
 create mode 100644 pkgs/development/python-modules/mlx/wheel-sources.nix

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index d22bed2696e5..edae305ea3ff 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -9,7 +9,8 @@
 }:
 
 let
-  version = "0.31.2";
+  wheelSources = import ./wheel-sources.nix;
+  inherit (wheelSources) version;
   inherit (python) pythonVersion;
 
   getSrcFromPypi =
@@ -31,18 +32,7 @@ let
       abi = dist;
     };
 
-  srcs = {
-    "3.13-aarch64-darwin" = getSrcFromPypi {
-      platform = "macosx_14_0_arm64";
-      dist = "cp313";
-      hash = "sha256-Gz+w3alVsNVSzle91vQrMwmrIbBn5AWH1oSEQ9MH6R8=";
-    };
-    "3.14-aarch64-darwin" = getSrcFromPypi {
-      platform = "macosx_14_0_arm64";
-      dist = "cp314";
-      hash = "sha256-oTyc4jw97vaqWgkxXnlT4aXcMR6FH6Fvx0yB+yUJwLk=";
-    };
-  };
+  srcs = lib.mapAttrs (_: source: getSrcFromPypi source) wheelSources.mlx;
 in
 buildPythonPackage (finalAttrs: {
   pname = "mlx";
@@ -56,7 +46,11 @@ buildPythonPackage (finalAttrs: {
     srcs."${pythonVersion}-${stdenv.hostPlatform.system}"
       or (throw "mlx-bin is only supported on Python ${builtins.concatStringsSep ", " (builtins.attrNames srcs)}");
 
-  dependencies = [ mlx-metal ];
+  # Upstream pins the Metal runtime to the same release as the Python wheel.
+  dependencies =
+    assert lib.assertMsg (mlx-metal.version == finalAttrs.version)
+      "mlx-bin ${finalAttrs.version} requires mlx-metal ${finalAttrs.version}, but got ${mlx-metal.version}";
+    [ mlx-metal ];
 
   postInstall = ''
     # The Python wheel expects libmlx.dylib and mlx.metallib to live under
diff --git a/pkgs/development/python-modules/mlx-metal/default.nix b/pkgs/development/python-modules/mlx/metal.nix
similarity index 83%
rename from pkgs/development/python-modules/mlx-metal/default.nix
rename to pkgs/development/python-modules/mlx/metal.nix
index 7ffcf69d3e41..c641bd5d6b9c 100644
--- a/pkgs/development/python-modules/mlx-metal/default.nix
+++ b/pkgs/development/python-modules/mlx/metal.nix
@@ -4,9 +4,12 @@
   lib,
 }:
 
+let
+  wheelSources = import ./wheel-sources.nix;
+in
 buildPythonPackage rec {
   pname = "mlx-metal";
-  version = "0.31.2";
+  inherit (wheelSources) version;
   format = "wheel";
   __structuredAttrs = true;
 
@@ -17,8 +20,7 @@ buildPythonPackage rec {
     dist = "py3";
     python = "py3";
     abi = "none";
-    platform = "macosx_14_0_arm64";
-    hash = "sha256-slOFvO4Y/BlAkiVbi1O5o9hInrZQ5ZFg8bV6rdB6otw=";
+    inherit (wheelSources.mlx-metal) platform hash;
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/mlx/wheel-sources.nix b/pkgs/development/python-modules/mlx/wheel-sources.nix
new file mode 100644
index 000000000000..8babf817c2ef
--- /dev/null
+++ b/pkgs/development/python-modules/mlx/wheel-sources.nix
@@ -0,0 +1,21 @@
+{
+  version = "0.31.2";
+
+  mlx = {
+    "3.13-aarch64-darwin" = {
+      platform = "macosx_14_0_arm64";
+      dist = "cp313";
+      hash = "sha256-Gz+w3alVsNVSzle91vQrMwmrIbBn5AWH1oSEQ9MH6R8=";
+    };
+    "3.14-aarch64-darwin" = {
+      platform = "macosx_14_0_arm64";
+      dist = "cp314";
+      hash = "sha256-oTyc4jw97vaqWgkxXnlT4aXcMR6FH6Fvx0yB+yUJwLk=";
+    };
+  };
+
+  mlx-metal = {
+    platform = "macosx_14_0_arm64";
+    hash = "sha256-slOFvO4Y/BlAkiVbi1O5o9hInrZQ5ZFg8bV6rdB6otw=";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39101bcecc79..839c42f9e490 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11074,7 +11074,7 @@ self: super: with self; {
 
   mlx-lm = callPackage ../development/python-modules/mlx-lm { };
 
-  mlx-metal = callPackage ../development/python-modules/mlx-metal { };
+  mlx-metal = callPackage ../development/python-modules/mlx/metal.nix { };
 
   mlx-vlm = callPackage ../development/python-modules/mlx-vlm { };
 

From 88763a385ac7c4c4cd2889bc544c1f397e412f98 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 22 Sep 2026 19:52:05 +0800
Subject: [PATCH 043/120] python3Packages.mlx{,-bin}: share example tests and
 test Metal runtime

---
 pkgs/development/python-modules/mlx/bin.nix   | 21 +++++----
 .../python-modules/mlx/default.nix            | 26 ++---------
 pkgs/development/python-modules/mlx/tests.nix | 44 +++++++++++++++++++
 .../python-modules/mlx/wheel-sources.nix      |  2 +
 4 files changed, 62 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/python-modules/mlx/tests.nix

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index edae305ea3ff..4b2408b4eb92 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -1,10 +1,11 @@
 {
   buildPythonPackage,
+  callPackage,
+  fetchFromGitHub,
   fetchPypi,
   lib,
   mlx-metal,
   python,
-  runCommand,
   stdenv,
 }:
 
@@ -61,14 +62,16 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "mlx" ];
 
-  passthru.tests.linkedMetalRuntime =
-    runCommand "python${python.pythonVersion}-mlx-bin-linked-metal-runtime" { }
-      ''
-        test -L ${finalAttrs.finalPackage}/${python.sitePackages}/mlx/lib
-        test -e ${finalAttrs.finalPackage}/${python.sitePackages}/mlx/lib/libmlx.dylib
-        test -e ${finalAttrs.finalPackage}/${python.sitePackages}/mlx/lib/mlx.metallib
-        touch $out
-      '';
+  passthru.tests = callPackage ./tests.nix {
+    mlx = finalAttrs.finalPackage;
+    metalSupport = true;
+    src = fetchFromGitHub {
+      owner = "ml-explore";
+      repo = "mlx";
+      tag = "v${finalAttrs.version}";
+      hash = wheelSources.testSourceHash;
+    };
+  };
 
   meta = {
     description = "Prebuilt MLX wheel for Apple silicon with Metal runtime";
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index d780dad3b28a..d43d963b347d 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -23,13 +23,10 @@
   openblas,
 
   # tests
+  callPackage,
   numpy,
   pytestCheckHook,
   python,
-  runCommand,
-
-  # passthru
-  mlx,
 }:
 
 let
@@ -151,24 +148,9 @@ buildPythonPackage (finalAttrs: {
   passthru = {
     inherit gguf-tools;
 
-    tests = {
-      mlxTest =
-        runCommand "run-mlx-examples"
-          {
-            buildInputs = [ mlx ];
-            nativeBuildInputs = [ python ];
-          }
-          ''
-            cp ${finalAttrs.src}/examples/python/logistic_regression.py .
-            ${python.interpreter} logistic_regression.py
-            rm logistic_regression.py
-
-            cp ${finalAttrs.src}/examples/python/linear_regression.py .
-            ${python.interpreter} linear_regression.py
-            rm linear_regression.py
-
-            touch $out
-          '';
+    tests = callPackage ./tests.nix {
+      mlx = finalAttrs.finalPackage;
+      inherit (finalAttrs) src;
     };
 
     updateScript = lib.getExe (writeShellApplication {
diff --git a/pkgs/development/python-modules/mlx/tests.nix b/pkgs/development/python-modules/mlx/tests.nix
new file mode 100644
index 000000000000..9f1268d74069
--- /dev/null
+++ b/pkgs/development/python-modules/mlx/tests.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  mlx,
+  python,
+  runCommand,
+  src,
+  metalSupport ? false,
+}:
+
+{
+  mlxTest =
+    runCommand "run-mlx${lib.optionalString metalSupport "-bin"}-examples"
+      (
+        {
+          buildInputs = [ mlx ];
+          nativeBuildInputs = [ python ];
+        }
+        // lib.optionalAttrs metalSupport {
+          # Access to the Metal device requires running outside the sandbox.
+          __noChroot = true;
+        }
+      )
+      (
+        lib.optionalString metalSupport ''
+          ${python.interpreter} -c 'import mlx.core as mx; assert mx.metal.is_available(), "Metal is unavailable"'
+        ''
+        + ''
+          cp ${src}/examples/python/logistic_regression.py .
+          ${python.interpreter} logistic_regression.py
+          rm logistic_regression.py
+
+          cp ${src}/examples/python/linear_regression.py .
+          ${python.interpreter} linear_regression.py
+          rm linear_regression.py
+
+          cp ${src}/benchmarks/python/batch_matmul_bench.py .
+          cp ${src}/benchmarks/python/time_utils.py .
+          ${python.interpreter} batch_matmul_bench.py ${lib.optionalString metalSupport "--gpu"}
+          rm batch_matmul_bench.py time_utils.py
+
+          touch $out
+        ''
+      );
+}
diff --git a/pkgs/development/python-modules/mlx/wheel-sources.nix b/pkgs/development/python-modules/mlx/wheel-sources.nix
index 8babf817c2ef..c86f6024d2a3 100644
--- a/pkgs/development/python-modules/mlx/wheel-sources.nix
+++ b/pkgs/development/python-modules/mlx/wheel-sources.nix
@@ -1,5 +1,7 @@
 {
   version = "0.31.2";
+  # Hash of the upstream source used for examples and benchmarks matching the wheel version.
+  testSourceHash = "sha256-0Oxacz61WGWZrpWw+fMQjEQfwOx1l1L2d0kWl54/LrQ=";
 
   mlx = {
     "3.13-aarch64-darwin" = {

From f8b2bde3c5900c57165cf1de55472a13026cdc10 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 22 Sep 2026 21:26:04 +0800
Subject: [PATCH 044/120] python3Packages.mlx-{bin,metal}: add coordinated
 update script

---
 pkgs/development/python-modules/mlx/bin.nix   | 15 ++++++++---
 pkgs/development/python-modules/mlx/metal.nix |  3 +++
 .../python-modules/mlx/update-wheels.nix      | 27 +++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/mlx/update-wheels.nix

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index 4b2408b4eb92..e998ba830cea 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -62,10 +62,11 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "mlx" ];
 
-  passthru.tests = callPackage ./tests.nix {
-    mlx = finalAttrs.finalPackage;
-    metalSupport = true;
-    src = fetchFromGitHub {
+  passthru.updateScript = callPackage ./update-wheels.nix { };
+
+  passthru.srcs = srcs // {
+    metal = mlx-metal.src;
+    testSource = fetchFromGitHub {
       owner = "ml-explore";
       repo = "mlx";
       tag = "v${finalAttrs.version}";
@@ -73,6 +74,12 @@ buildPythonPackage (finalAttrs: {
     };
   };
 
+  passthru.tests = callPackage ./tests.nix {
+    mlx = finalAttrs.finalPackage;
+    metalSupport = true;
+    src = finalAttrs.passthru.srcs.testSource;
+  };
+
   meta = {
     description = "Prebuilt MLX wheel for Apple silicon with Metal runtime";
     homepage = "https://github.com/ml-explore/mlx";
diff --git a/pkgs/development/python-modules/mlx/metal.nix b/pkgs/development/python-modules/mlx/metal.nix
index c641bd5d6b9c..0b687e1af09d 100644
--- a/pkgs/development/python-modules/mlx/metal.nix
+++ b/pkgs/development/python-modules/mlx/metal.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  callPackage,
   fetchPypi,
   lib,
 }:
@@ -23,6 +24,8 @@ buildPythonPackage rec {
     inherit (wheelSources.mlx-metal) platform hash;
   };
 
+  passthru.updateScript = callPackage ./update-wheels.nix { };
+
   meta = {
     description = "Prebuilt Metal runtime for MLX";
     homepage = "https://github.com/ml-explore/mlx";
diff --git a/pkgs/development/python-modules/mlx/update-wheels.nix b/pkgs/development/python-modules/mlx/update-wheels.nix
new file mode 100644
index 000000000000..8b322438c8b0
--- /dev/null
+++ b/pkgs/development/python-modules/mlx/update-wheels.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  nix-update-script,
+}:
+
+nix-update-script {
+  # Both packages update the same release and all of its sources.
+  attrPath = "python3Packages.mlx-bin";
+  extraArgs = [
+    "--url=mirror://pypi/m/mlx/"
+    "--override-filename=pkgs/development/python-modules/mlx/wheel-sources.nix"
+    "--no-src"
+  ]
+  ++
+    lib.concatMap
+      (name: [
+        "--subpackage"
+        ''srcs."${name}"''
+      ])
+      (
+        builtins.attrNames (import ./wheel-sources.nix).mlx
+        ++ [
+          "metal"
+          "testSource"
+        ]
+      );
+}

From d33463b40505ddde0edde1461e1429967f2aabad Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 22 Sep 2026 23:02:26 +0800
Subject: [PATCH 045/120] python3Packages.mlx-{bin,metal}: add booxter as
 maintainer

---
 pkgs/development/python-modules/mlx/bin.nix   | 5 ++++-
 pkgs/development/python-modules/mlx/metal.nix | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index e998ba830cea..6e117b831c89 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -85,7 +85,10 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/ml-explore/mlx";
     changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ kinnrai ];
+    maintainers = with lib.maintainers; [
+      booxter
+      kinnrai
+    ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [ "aarch64-darwin" ];
   };
diff --git a/pkgs/development/python-modules/mlx/metal.nix b/pkgs/development/python-modules/mlx/metal.nix
index 0b687e1af09d..297b1220bf06 100644
--- a/pkgs/development/python-modules/mlx/metal.nix
+++ b/pkgs/development/python-modules/mlx/metal.nix
@@ -31,7 +31,10 @@ buildPythonPackage rec {
     homepage = "https://github.com/ml-explore/mlx";
     changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ kinnrai ];
+    maintainers = with lib.maintainers; [
+      booxter
+      kinnrai
+    ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [ "aarch64-darwin" ];
   };

From 053ac1708470993794cb01e4f2866530f45261dc Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Wed, 23 Sep 2026 01:46:52 +0800
Subject: [PATCH 046/120] python3Packages.mlx-metal: add macOS wheel variants

---
 pkgs/development/python-modules/mlx/bin.nix   | 12 ++++----
 pkgs/development/python-modules/mlx/metal.nix | 28 ++++++++++++-------
 .../python-modules/mlx/update-wheels.nix      | 24 ++++++++--------
 .../python-modules/mlx/wheel-sources.nix      | 15 ++++++++--
 pkgs/top-level/python-packages.nix            |  4 +++
 5 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index 6e117b831c89..6f95e064d93b 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -13,6 +13,7 @@ let
   wheelSources = import ./wheel-sources.nix;
   inherit (wheelSources) version;
   inherit (python) pythonVersion;
+  sourceKey = "${pythonVersion}-${stdenv.hostPlatform.system}";
 
   getSrcFromPypi =
     {
@@ -41,11 +42,9 @@ buildPythonPackage (finalAttrs: {
   format = "wheel";
   __structuredAttrs = true;
 
-  disabled = !(srcs ? "${pythonVersion}-${stdenv.hostPlatform.system}");
+  disabled = !(srcs ? ${sourceKey});
 
-  src =
-    srcs."${pythonVersion}-${stdenv.hostPlatform.system}"
-      or (throw "mlx-bin is only supported on Python ${builtins.concatStringsSep ", " (builtins.attrNames srcs)}");
+  src = srcs.${sourceKey} or (throw "mlx-bin: unsupported Python version or system: ${sourceKey}");
 
   # Upstream pins the Metal runtime to the same release as the Python wheel.
   dependencies =
@@ -64,8 +63,9 @@ buildPythonPackage (finalAttrs: {
 
   passthru.updateScript = callPackage ./update-wheels.nix { };
 
-  passthru.srcs = srcs // {
-    metal = mlx-metal.src;
+  passthru.srcs = {
+    mlx = srcs;
+    mlx-metal = mlx-metal.srcs;
     testSource = fetchFromGitHub {
       owner = "ml-explore";
       repo = "mlx";
diff --git a/pkgs/development/python-modules/mlx/metal.nix b/pkgs/development/python-modules/mlx/metal.nix
index 297b1220bf06..80fadb9db1ac 100644
--- a/pkgs/development/python-modules/mlx/metal.nix
+++ b/pkgs/development/python-modules/mlx/metal.nix
@@ -3,10 +3,23 @@
   callPackage,
   fetchPypi,
   lib,
+  macosVariant ? "14",
 }:
 
 let
   wheelSources = import ./wheel-sources.nix;
+  srcs = lib.mapAttrs (
+    _: source:
+    fetchPypi {
+      pname = "mlx_metal";
+      inherit (wheelSources) version;
+      format = "wheel";
+      dist = "py3";
+      python = "py3";
+      abi = "none";
+      inherit (source) platform hash;
+    }
+  ) wheelSources.mlx-metal;
 in
 buildPythonPackage rec {
   pname = "mlx-metal";
@@ -14,17 +27,12 @@ buildPythonPackage rec {
   format = "wheel";
   __structuredAttrs = true;
 
-  src = fetchPypi {
-    pname = "mlx_metal";
-    inherit version;
-    format = "wheel";
-    dist = "py3";
-    python = "py3";
-    abi = "none";
-    inherit (wheelSources.mlx-metal) platform hash;
-  };
+  src = srcs.${macosVariant} or (throw "mlx-metal: unsupported macOS wheel variant ${macosVariant}");
 
-  passthru.updateScript = callPackage ./update-wheels.nix { };
+  passthru = {
+    inherit macosVariant srcs;
+    updateScript = callPackage ./update-wheels.nix { };
+  };
 
   meta = {
     description = "Prebuilt Metal runtime for MLX";
diff --git a/pkgs/development/python-modules/mlx/update-wheels.nix b/pkgs/development/python-modules/mlx/update-wheels.nix
index 8b322438c8b0..638aba5515c6 100644
--- a/pkgs/development/python-modules/mlx/update-wheels.nix
+++ b/pkgs/development/python-modules/mlx/update-wheels.nix
@@ -3,6 +3,13 @@
   nix-update-script,
 }:
 
+let
+  wheelSources = import ./wheel-sources.nix;
+  subpackages =
+    map (name: ''srcs.mlx."${name}"'') (builtins.attrNames wheelSources.mlx)
+    ++ map (name: ''srcs.mlx-metal."${name}"'') (builtins.attrNames wheelSources.mlx-metal)
+    ++ [ "srcs.testSource" ];
+in
 nix-update-script {
   # Both packages update the same release and all of its sources.
   attrPath = "python3Packages.mlx-bin";
@@ -11,17 +18,8 @@ nix-update-script {
     "--override-filename=pkgs/development/python-modules/mlx/wheel-sources.nix"
     "--no-src"
   ]
-  ++
-    lib.concatMap
-      (name: [
-        "--subpackage"
-        ''srcs."${name}"''
-      ])
-      (
-        builtins.attrNames (import ./wheel-sources.nix).mlx
-        ++ [
-          "metal"
-          "testSource"
-        ]
-      );
+  ++ lib.concatMap (path: [
+    "--subpackage"
+    path
+  ]) subpackages;
 }
diff --git a/pkgs/development/python-modules/mlx/wheel-sources.nix b/pkgs/development/python-modules/mlx/wheel-sources.nix
index c86f6024d2a3..fbca810f4e0d 100644
--- a/pkgs/development/python-modules/mlx/wheel-sources.nix
+++ b/pkgs/development/python-modules/mlx/wheel-sources.nix
@@ -17,7 +17,18 @@
   };
 
   mlx-metal = {
-    platform = "macosx_14_0_arm64";
-    hash = "sha256-slOFvO4Y/BlAkiVbi1O5o9hInrZQ5ZFg8bV6rdB6otw=";
+    "14" = {
+      platform = "macosx_14_0_arm64";
+      hash = "sha256-slOFvO4Y/BlAkiVbi1O5o9hInrZQ5ZFg8bV6rdB6otw=";
+    };
+    "15" = {
+      platform = "macosx_15_0_arm64";
+      hash = "sha256-6dTl/ObKEKh6DjiFl/mVGa1ZTQnmdHCLUxK9i9T1mX0=";
+    };
+    # Includes NAX kernels for supported GPUs running macOS 26.2 or newer.
+    "26" = {
+      platform = "macosx_26_0_arm64";
+      hash = "sha256-hP+2DuUD8D62hPX7Fo1c/zHioWt/J8FzHq92Yr1um0Y=";
+    };
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 839c42f9e490..a18899dda415 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11076,6 +11076,10 @@ self: super: with self; {
 
   mlx-metal = callPackage ../development/python-modules/mlx/metal.nix { };
 
+  mlx-metal-macos15 = self.mlx-metal.override { macosVariant = "15"; };
+
+  mlx-metal-macos26 = self.mlx-metal.override { macosVariant = "26"; };
+
   mlx-vlm = callPackage ../development/python-modules/mlx-vlm { };
 
   mlxtend = callPackage ../development/python-modules/mlxtend { };

From 63185e59e36b89c3a712bedd6cf09ff2c82b040e Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Wed, 23 Sep 2026 04:56:55 +0800
Subject: [PATCH 047/120] python3Packages.mlx-{bin,metal}: 0.31.2 -> 0.32.0

---
 .../python-modules/mlx/wheel-sources.nix           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mlx/wheel-sources.nix b/pkgs/development/python-modules/mlx/wheel-sources.nix
index fbca810f4e0d..6392b0cdb2a7 100644
--- a/pkgs/development/python-modules/mlx/wheel-sources.nix
+++ b/pkgs/development/python-modules/mlx/wheel-sources.nix
@@ -1,34 +1,34 @@
 {
-  version = "0.31.2";
+  version = "0.32.0";
   # Hash of the upstream source used for examples and benchmarks matching the wheel version.
-  testSourceHash = "sha256-0Oxacz61WGWZrpWw+fMQjEQfwOx1l1L2d0kWl54/LrQ=";
+  testSourceHash = "sha256-yHpTyRf9FOPbdyDWSM7b6VC72STnUpgCMLbDxLbdaqs=";
 
   mlx = {
     "3.13-aarch64-darwin" = {
       platform = "macosx_14_0_arm64";
       dist = "cp313";
-      hash = "sha256-Gz+w3alVsNVSzle91vQrMwmrIbBn5AWH1oSEQ9MH6R8=";
+      hash = "sha256-q7eG7h6WOHWb6CWDIi/H0JxWUO+QrSt8XafRkxqGdtw=";
     };
     "3.14-aarch64-darwin" = {
       platform = "macosx_14_0_arm64";
       dist = "cp314";
-      hash = "sha256-oTyc4jw97vaqWgkxXnlT4aXcMR6FH6Fvx0yB+yUJwLk=";
+      hash = "sha256-LuebH4wsKjKa/JXs59zgvnmNQ/PedxpjcNK5+XArvZo=";
     };
   };
 
   mlx-metal = {
     "14" = {
       platform = "macosx_14_0_arm64";
-      hash = "sha256-slOFvO4Y/BlAkiVbi1O5o9hInrZQ5ZFg8bV6rdB6otw=";
+      hash = "sha256-W2SyCsJLDEAfSJ3gHoIJ7cTTchJSAfGTFObznjhTIqo=";
     };
     "15" = {
       platform = "macosx_15_0_arm64";
-      hash = "sha256-6dTl/ObKEKh6DjiFl/mVGa1ZTQnmdHCLUxK9i9T1mX0=";
+      hash = "sha256-G9lKHOWwOgyJh3Gj51nwEkMAxqtRVRJ5BqHVCx8/zxk=";
     };
     # Includes NAX kernels for supported GPUs running macOS 26.2 or newer.
     "26" = {
       platform = "macosx_26_0_arm64";
-      hash = "sha256-hP+2DuUD8D62hPX7Fo1c/zHioWt/J8FzHq92Yr1um0Y=";
+      hash = "sha256-OvdqSY2EgE9mEZgASZ+dFD19/7CHig3Q18KEblhWX9c=";
     };
   };
 }

From 82963a64602639b2a947665df154bd3558310323 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 21:45:42 +0000
Subject: [PATCH 048/120] redis: 8.10.1 -> 8.10.2

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

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index f99f790cd016..89dc58763bd0 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "8.10.1";
+  version = "8.10.2";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis";
     tag = finalAttrs.version;
-    hash = "sha256-fGLuOuiM3VHj70qlSpb2s25RYD8gFARrqwAhW6CIHXE=";
+    hash = "sha256-lje8tQPxIgOt8xOlSySmD2ZNcLOvIGIQMbdmQiFrj1k=";
   };
 
   patches = [

From e8ca43496528cd31b8b29e418065b327ce7eda59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Sep 2026 23:00:17 +0000
Subject: [PATCH 049/120] python3Packages.salib: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/salib/default.nix b/pkgs/development/python-modules/salib/default.nix
index 6f5c1052725f..95786a0d418a 100644
--- a/pkgs/development/python-modules/salib/default.nix
+++ b/pkgs/development/python-modules/salib/default.nix
@@ -14,12 +14,12 @@
 let
   finalAttrs = {
     pname = "salib";
-    version = "1.5.2";
+    version = "1.6.0";
     pyproject = true;
 
     src = fetchPypi {
       inherit (finalAttrs) pname version;
-      hash = "sha256-qO7txOh88HD370ULds3s0SDR5cYCqcNYVex3d1kflJ8=";
+      hash = "sha256-Ei0lgWE3pQtelyogbecRiWHiAqb7CSLZ7IdP1J/bv18=";
     };
 
     build-system = [

From bcbd63163541a6f90dd464f2470ea42f8168d3e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 03:12:22 +0000
Subject: [PATCH 050/120] rsop: 0.11.0 -> 0.11.3

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

diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix
index f062afb9c244..e8954bdf26cb 100644
--- a/pkgs/by-name/rs/rsop/package.nix
+++ b/pkgs/by-name/rs/rsop/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rsop";
-  version = "0.11.0";
+  version = "0.11.3";
 
   src = fetchFromCodeberg {
     owner = "heiko";
     repo = "rsop";
     rev = "rsop/v${finalAttrs.version}";
-    hash = "sha256-vZW4L3hm2vRRoLcxU631jiNrbk+w0hDaL4VXIrtP2aY=";
+    hash = "sha256-RqrHJuqgO+m6bWjDcjDaiAgnIJoyUEPxGG/VWQOc8KM=";
   };
 
-  cargoHash = "sha256-qrurMKwSs0w2D6KPto7tpsuLGuAJ9drKhdmIAbEaD9M=";
+  cargoHash = "sha256-mWjPIsir3h/OOHqAaEd64s+2CrowlmXpNa9U9LGKpuA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From c88d06b868f83b94d1f9b2bb2a087fa817b9fcf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 07:30:14 +0000
Subject: [PATCH 051/120] hermitcli: 0.52.3 -> 0.53.0

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

diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 29e8ddbea1df..427e11f4d987 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hermit";
-  version = "0.52.3";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     rev = "v${finalAttrs.version}";
     owner = "cashapp";
     repo = "hermit";
-    hash = "sha256-bcTj0JR2sAfTPBi5z0s2ZCWu16HYr51JD1qMhA8extE=";
+    hash = "sha256-yhKvRgrX4pN21kXUU0qZGnenVtWlT3tnsKWZ4Iu8wb0=";
   };
 
-  vendorHash = "sha256-+UIWiP+CvRJQhTS2hMWrb3gB8kEN6fa6xIaYBNUxHOs=";
+  vendorHash = "sha256-2sj1Tc+3icoOPKq1hcOxSjKarxQ7Vvvvx9iAWWrb3Xo=";
 
   subPackages = [ "cmd/hermit" ];
 

From 735d15ae8316f724daf6f733d79268c2fb95d71d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 08:10:10 +0000
Subject: [PATCH 052/120] v2rayn: 7.25.1 -> 7.25.2

---
 pkgs/by-name/v2/v2rayn/deps.json   | 4 ++--
 pkgs/by-name/v2/v2rayn/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index 5436b89721b5..a58e5f453f73 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -191,8 +191,8 @@
   },
   {
     "pname": "NLog",
-    "version": "6.2.0",
-    "hash": "sha256-0xxH2xUXDGaWfeH+Dk1VeZfj65NSKtxTzw8Xau4NeUU="
+    "version": "6.2.1",
+    "hash": "sha256-xKUn24ZEhMugwRTl8nbaPzjCBtElQXyZr7pBknwUkWc="
   },
   {
     "pname": "QRCoder",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 24fbd79b4a96..1262b67b64aa 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -26,13 +26,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "v2rayn";
-  version = "7.25.1";
+  version = "7.25.2";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = finalAttrs.version;
-    hash = "sha256-JdlqCkj6AKn7RtuA1Q0TreusG10pXsMopIF1mOcLgEc=";
+    hash = "sha256-iiTBEAEcTUDHFjaytuGxZfvDOKeccieDSWnHZU7u5to=";
     fetchSubmodules = true;
   };
 

From e74ccdfe92da130850b0e25d9478802507bd8ffe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 09:41:54 +0000
Subject: [PATCH 053/120] ares-cli: 3.2.5 -> 3.2.6

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

diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix
index aa8a5da00777..3ec4664b2428 100644
--- a/pkgs/by-name/ar/ares-cli/package.nix
+++ b/pkgs/by-name/ar/ares-cli/package.nix
@@ -8,18 +8,18 @@
 
 buildNpmPackage rec {
   pname = "ares-cli";
-  version = "3.2.5";
+  version = "3.2.6";
   src = fetchFromGitHub {
     owner = "webos-tools";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-NWTDAgMGX+dPOIM8B7clx9sAYdWh+3VciWjTu1Qc39M=";
+    hash = "sha256-ziOZb+kzsAge6OxB/Vsaj04duZfeuezZFet2HdXPA58=";
   };
 
   nodejs = nodejs_22;
 
   dontNpmBuild = true;
-  npmDepsHash = "sha256-9nksCIrEltYdV5CeNUfIMgh5oMvzuelfOwdgzVoq1LE=";
+  npmDepsHash = "sha256-k8PRP1liSbJze2SHkmvUBqcGuAusnudwgj6ANMu32A8=";
 
   passthru.updateScript = nix-update-script { };
 

From e7f25cd54920891935284092a7c1fdfcdd7f47f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 10:03:22 +0000
Subject: [PATCH 054/120] p2pool: 4.18 -> 4.18.1

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

diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix
index 1d01c585057d..c165924b3a0c 100644
--- a/pkgs/by-name/p2/p2pool/package.nix
+++ b/pkgs/by-name/p2/p2pool/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "p2pool";
-  version = "4.18";
+  version = "4.18.1";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nmh6XY7fP/qddzVyb1yiJ5dcOxZctCjodi5uf3M3NfM=";
+    hash = "sha256-4YMcQS+94seDI0abUGmNalhqA+08Gu5VYuxKYokbVuQ=";
     fetchSubmodules = true;
   };
 

From 9b64d34b4da3c55e4a0706efa02270111a8bda2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 10:08:22 +0000
Subject: [PATCH 055/120] rofimoji: 6.8.0 -> 6.9.0

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

diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix
index e8bb4c034612..1e98e3c793d6 100644
--- a/pkgs/by-name/ro/rofimoji/package.nix
+++ b/pkgs/by-name/ro/rofimoji/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "rofimoji";
-  version = "6.8.0";
+  version = "6.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fdw";
     repo = "rofimoji";
     tag = finalAttrs.version;
-    hash = "sha256-KOWj/u5JxgHiUf/hPBu+PfPgSRd/HVivU3F8oWqzIv4=";
+    hash = "sha256-NmMJL08FMrSlKcmyuX6qeRILmqk5++C5WUwIiJiHcdI=";
   };
 
   nativeBuildInputs = [

From 8f7d3bb62bd0df39a68fa10a326e51de77bcc605 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Wed, 23 Sep 2026 18:35:11 +0800
Subject: [PATCH 056/120] codexbar: 0.45.1 -> 0.65.0

Changelog: https://github.com/steipete/CodexBar/releases/tag/v0.65.0
Diff: https://github.com/steipete/CodexBar/compare/v0.45.1...v0.65.0
---
 pkgs/by-name/co/codexbar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix
index 46cabe91cf6d..360d75bcaeda 100644
--- a/pkgs/by-name/co/codexbar/package.nix
+++ b/pkgs/by-name/co/codexbar/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "codexbar";
-  version = "0.45.1";
+  version = "0.65.0";
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchurl {
     url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip";
-    hash = "sha256-N/DfZw1H42R0rsyCWzsfrI6DAgCnmCvSgqeODoXQta0=";
+    hash = "sha256-z4/RfA+1T0h1+qiwndnexwXUIPRn8g01zZP3TMzlOLQ=";
   };
 
   sourceRoot = ".";

From b030b884ceaafa7511e00d31e07665438284722f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 11:59:00 +0000
Subject: [PATCH 057/120] komari-agent: 1.2.60 -> 1.5.11

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

diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix
index fbb2ac54aca0..c96cea2574fa 100644
--- a/pkgs/by-name/ko/komari-agent/package.nix
+++ b/pkgs/by-name/ko/komari-agent/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "komari-agent";
-  version = "1.2.60";
+  version = "1.5.11";
 
   src = fetchFromGitHub {
     owner = "komari-monitor";
     repo = "komari-agent";
     tag = finalAttrs.version;
-    hash = "sha256-SsM/RbwdWmKty+6ueL4J9auKcPkRMNX59Imko3oPOiQ=";
+    hash = "sha256-1jemWrMcdJ4RIhcRyxmFahLQZ34Q1QSQLgO6BoHhOGw=";
   };
 
   vendorHash = "sha256-teKx9u7M2ZQdd7G3xSCqhwjcHRzBzKeBViSl62TRg+g=";

From 14a327b33c3943c93bdf3fac0ef0cc9ed2172cce Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 23 Sep 2026 11:30:09 -0500
Subject: [PATCH 058/120] sketchybar-app-font: 2.0.86 -> 3.0.1

---
 pkgs/by-name/sk/sketchybar-app-font/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index a33d24d8e531..8b91d3cb8fbc 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sketchybar-app-font";
-  version = "2.0.86";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "kvndrsslr";
     repo = "sketchybar-app-font";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H1QPAhhODBjE+rK1FhrtK/oyMtmhHYYHHQUd+10QK7A=";
+    hash = "sha256-fKo44hqg94d8WjN3RyzP/HIjuWDvtR8KFFtTQVDw68s=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From 428bcb1fbe9328d5e484dc6e450a06696f7a7b14 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 23 Sep 2026 22:12:32 +0200
Subject: [PATCH 059/120] nixos/systemd/network: use upstream default for
 privacy extensions

Privacy extensions were previously enabled through a udev rule, which
was then ported to networkd in [1]. But because networkd ships with
IPv6PrivacyExtensions=no by default[2], the udev rule used to get
overruled when the interface was managed through networkd.

The migration thereforce introduced a serious undocumented behavior
change by enabling IPv6 privacy extensions for all links managed by
networkd.

[1] https://github.com/nixos/nixpkgs/commit/bb954cddf529ba4d37c5c675cde34e116699031f
[2] https://www.freedesktop.org/software/systemd/man/latest/systemd.network.html#IPv6PrivacyExtensions=
---
 nixos/modules/system/boot/networkd.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 4a22d6585eb9..8168f0bf7762 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -2497,11 +2497,6 @@ let
   networkdOptions = {
     networkConfig = mkOption {
       default = { };
-      defaultText = lib.literalExpression ''
-        {
-          IPv6PrivacyExtensions = true;
-        }
-      '';
       example = {
         SpeedMeter = true;
         ManageForeignRoutingPolicyRules = false;
@@ -4001,10 +3996,7 @@ let
       };
 
       config = {
-        networkConfig = {
-          IPv6PrivacyExtensions = lib.mkOptionDefault true;
-        }
-        // optionalAttrs (config.routeTables != { }) {
+        networkConfig = optionalAttrs (config.routeTables != { }) {
           RouteTable = mapAttrsToList (name: number: "${name}:${toString number}") config.routeTables;
         };
       };

From 7278ed3e4560aa39b95f1acd8aacafa4559efc6b Mon Sep 17 00:00:00 2001
From: M-Schwab <matthewschwab256@gmail.com>
Date: Wed, 23 Sep 2026 14:18:43 -0700
Subject: [PATCH 060/120] claude-code: 2.1.280 -> 2.1.281

https://github.com/anthropics/claude-code/blob/v2.1.281/CHANGELOG.md

Assisted-by: opencode + Qwen3.8-Flash-Next
---
 pkgs/by-name/cl/claude-code/manifest.zst.json | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.zst.json b/pkgs/by-name/cl/claude-code/manifest.zst.json
index bf3dbd2b56af..d7c4c6b3d738 100644
--- a/pkgs/by-name/cl/claude-code/manifest.zst.json
+++ b/pkgs/by-name/cl/claude-code/manifest.zst.json
@@ -1,62 +1,61 @@
 {
-  "version": "2.1.280",
+  "version": "2.1.281",
   "manifestSignatureEnforcement": "flag",
-  "commit": "80abbfe7d7232280011ff01a21ae3338f4c6e372",
-  "modsCommit": "8187baaaafb3a9ada02d3d6fb4e8d68587aef6b0",
-  "buildDate": "2026-09-21T20:56:45Z",
+  "commit": "3e320108de6831eb996e9a3f7795152073cc0d0c",
+  "modsCommit": "56f36532530f88b572854538d685fcf781141e8c",
+  "buildDate": "2026-09-23T02:34:19Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude.zst",
-      "checksum": "214fafd9d60bc0397cb68747b765ab752be4b53303c176ad885c4cafbe30826f",
-      "size": 72900982,
+      "checksum": "056662a4e3a5ca37770730a59345d1b5796ef65444c32b97d236651ab68f3fa1",
+      "size": 74110572,
       "bundle": {
-        "checksum": "5882f558c44d569dd35047588143a536711d4e415bebf94da1543a25e5bc5898",
-        "size": 72903461
+        "checksum": "01c192d55a6fa8fcc84557bbd913dfb43ae65f15c39bd1fba9161fc4ff7de175",
+        "size": 74115578
       }
     },
     "darwin-x64": {
       "binary": "claude.zst",
-      "checksum": "2b5ca074d02ea5dd507db0a90ba55847e297061ca3e987ddc49ea89ae0ff2e7e",
-      "size": 77008555,
+      "checksum": "085dd9952999c742cf262d0fed571c3bcd749d5127eb7dd455bc5be0948c7b9d",
+      "size": 78229557,
       "bundle": {
-        "checksum": "bf78bfd5af2400f39d21378198f689c3856d7a11aeb9919b012f27143e946cbf",
-        "size": 77013965
+        "checksum": "05e821e3c9f1178b603c6f7fcb3e05b1a038f885cb55eed42ad8df9bbfc7fdad",
+        "size": 78233701
       }
     },
     "linux-arm64": {
       "binary": "claude.zst",
-      "checksum": "6a01f30418f35122a672ccf74bed64aba5119ad47c71548a3b447cc9fec48c81",
-      "size": 82030081
+      "checksum": "7583b65585561c714e18caca45e0e0fb9bdba6d7ed6ee5d5171834d5c657aea6",
+      "size": 83227605
     },
     "linux-x64": {
       "binary": "claude.zst",
-      "checksum": "27910e2ae704d8f2e8024897d8fdf1e7710807baf4f6982c0e3797c058315384",
-      "size": 82761570
+      "checksum": "4ffb9f6baada4d88bbd8c586773efd0605c524c7a31cc3833eeda229717a7b25",
+      "size": 83964259
     },
     "linux-arm64-musl": {
       "binary": "claude.zst",
-      "checksum": "32dbe8a94da9689791688e0febfb88c39897ad67f055853e7ae1b6d11c4b4e39",
-      "size": 80444179
+      "checksum": "b5400b7f787e78f6c206c1adf70c65b5b6835f2899b61edfa83a117be92111d5",
+      "size": 81645720
     },
     "linux-x64-musl": {
       "binary": "claude.zst",
-      "checksum": "2b2e206987e357997bf5c06baf697379b5980a7cc6f1462ca70a6757ece58890",
-      "size": 81193598
+      "checksum": "3921fd07a12e93f858c8b706eca0e4d7b12af14f4af5378d3b87254b4231def5",
+      "size": 82393109
     },
     "win32-x64": {
       "binary": "claude.exe.zst",
-      "checksum": "cb50dbe5b595b52925d753b10d5907748a4137e7f0bff84d03ea60cd9a28eaf9",
-      "size": 85069447
+      "checksum": "62f544612ca7e31cdc197bdf8651abcc529bd716964d2517e101177c6b94c70a",
+      "size": 86264937
     },
     "win32-arm64": {
       "binary": "claude.exe.zst",
-      "checksum": "705dccf9d924d471e32efa19157283da2cdd0b8cfc71d7e0a9e3ec4d13ac381b",
-      "size": 81530251
+      "checksum": "41b632497a440de03904c03483d000b4004b908a5f3eb71f139de6dbd40cd685",
+      "size": 82711371
     }
   },
   "sdkCompat": {
     "testedWrapperVersions": [
-      "0.3.240",
       "0.3.241",
       "0.3.242",
       "0.3.243",
@@ -85,7 +84,8 @@
       "0.3.275",
       "0.3.276",
       "0.3.277",
-      "0.3.278"
+      "0.3.278",
+      "0.3.280"
     ],
     "harnessSchema": 1
   }

From fec68c61bc534cd79dd55d32efb316c3058a1ce1 Mon Sep 17 00:00:00 2001
From: M-Schwab <matthewschwab256@gmail.com>
Date: Wed, 23 Sep 2026 22:33:24 +0000
Subject: [PATCH 061/120] vscode-extensions.anthropic.claude-code: 2.1.280 ->
 2.1.281

https://github.com/anthropics/claude-code/blob/v2.1.281/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 5.5)
---
 .../vscode/extensions/anthropic.claude-code/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 a675e3b375c2..e0e20ba34234 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-iq0u498LpvJU3l5gQzp4sqgcj/JvDki79WftHFfWp3o=";
+          hash = "sha256-pXzLJ/1g33JUorADMf0EzvI7DY2kbAZSnkttPY5ekOs=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-fjDbAo9LtB/xG67pW/jOYICcAmeOLpV/WIWOlM9UDUc=";
+          hash = "sha256-CEKNRiYs8Grko5nVGSanAgj5WmLC7hnMBC9OXElrmoQ=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-5MZ9XLtkL/dD2xX4XtgXHIfR1Gu0kkaEyCvnJEXcxQo=";
+          hash = "sha256-eu+5zAGdzFsx/PeAgCj60ppP0CMQEsZGaVlR+8OfFbQ=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.280";
+      version = "2.1.281";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From b3ec0b576274679d46bf551f8d94188a6f9eabf7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 23:58:19 +0000
Subject: [PATCH 062/120] fmd-server: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/fm/fmd-server/package.nix b/pkgs/by-name/fm/fmd-server/package.nix
index 32b1c46d4a24..8dca6506a7a1 100644
--- a/pkgs/by-name/fm/fmd-server/package.nix
+++ b/pkgs/by-name/fm/fmd-server/package.nix
@@ -17,12 +17,12 @@ buildGoModule (
   in
   {
     pname = "fmd-server";
-    version = "0.16.0";
+    version = "0.17.0";
     src = fetchFromGitLab {
       owner = "fmd-foss";
       repo = "fmd-server";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-1agmYDK+YDG7uH5aTpqbEM5apA+/wOMKh4Ez7bbcag4=";
+      hash = "sha256-drZQj5tp0cHvrc+T1ESBHNNt0VoHhS9O93LIwjw2eCc=";
     };
 
     pnpmDeps = fetchPnpmDeps {
@@ -30,10 +30,10 @@ buildGoModule (
       pnpm = pnpm_11;
       sourceRoot = "${finalAttrs.src.name}/${ui.pnpmRoot}";
       fetcherVersion = 4;
-      hash = "sha256-Jyfe0g0H0VxMSMG/CX8HsLQkLVEc3XESn4i8fsaySqs=";
+      hash = "sha256-L6O1xsRw3ZwWg+83hC5n3a83RzSh9u0289gUHzfubJE=";
     };
 
-    vendorHash = "sha256-YU+jkRMwXXyYm6BwBcsFxVLwgGuu322comuoMbP/OT8=";
+    vendorHash = "sha256-fTteh+h4PqiISrqSjEK59jBog+tOu7Yzql8nYRK7q74=";
 
     preBuild = ''
       cp -r ${ui}/${ui.distRoot} web/

From 04d964df09caf58310d4b1c57edfb37adcc92fe7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 22 Sep 2026 19:27:52 -0400
Subject: [PATCH 063/120] matrix-authentication-service: 1.24.0 -> 1.25.1

Diff: https://github.com/element-hq/matrix-authentication-service/compare/v1.24.0...v1.25.1

Changelog: https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.25.1
---
 .../matrix-authentication-service/package.nix | 17 +++++++++----
 .../remove-runtime.patch                      | 25 +++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ma/matrix-authentication-service/remove-runtime.patch

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 1030f3947e8a..2db3feb73d02 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -23,22 +23,29 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "1.24.0";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LWGnfM7os9GT6fa/Vk1wAEp9m1L5rEL7tSPmgEKMNfQ=";
+    hash = "sha256-crgPUarH69AEbrRtBBHg4CeYXdSupxeEcjgh17bCdIk=";
   };
 
-  cargoHash = "sha256-jAJuRwhc+0IAikLyqctHuCQcS61iNj7iKWHJdRAqsAk=";
+  patches = [ ./remove-runtime.patch ];
+
+  cargoHash = "sha256-Y7IlfHRkn5a5+IOa0R1OA3sDVF+5NxiYsZnREWYNAyo=";
 
   pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      patches
+      ;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-DxEjMhYqZGbnobQ/F0WFXq7qaxSkWDcoZ0kmWJsdxEQ=";
+    hash = "sha256-nF0e88a4SJtZOZAc62sGp192GjM/gJJ7r5NbrCgJ1es=";
   };
 
   pnpmRoot = "frontend";
diff --git a/pkgs/by-name/ma/matrix-authentication-service/remove-runtime.patch b/pkgs/by-name/ma/matrix-authentication-service/remove-runtime.patch
new file mode 100644
index 000000000000..5fec4d945b30
--- /dev/null
+++ b/pkgs/by-name/ma/matrix-authentication-service/remove-runtime.patch
@@ -0,0 +1,25 @@
+diff --git a/package.json b/package.json
+--- a/package.json
++++ b/package.json
+@@ -5,8 +5 @@
+-  "devEngines": {
+-    "runtime": {
+-      "name": "node",
+-      "version": "24.15.0",
+-      "onFail": "download"
+-    }
+-  },
+   "devDependencies": {
+diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
+@@ -14,9 +14,6 @@ importers:
+       '@localazy/cli':
+         specifier: ^2.0.11
+         version: 2.0.11
+-      node:
+-        specifier: runtime:24.15.0
+-        version: runtime:24.15.0
+       semver:
+         specifier: ^7.8.5
+         version: 7.8.5

From 14cd96495de0b12e2e01b6b0142ef99d8f30c5c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Sep 2026 00:47:48 +0000
Subject: [PATCH 064/120] xepub: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/xe/xepub/package.nix b/pkgs/by-name/xe/xepub/package.nix
index 050933651aa2..4b80e98b6bf7 100644
--- a/pkgs/by-name/xe/xepub/package.nix
+++ b/pkgs/by-name/xe/xepub/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xepub";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "xapp-project";
     repo = "xepub";
     tag = finalAttrs.version;
-    hash = "sha256-kEhGBY6WyE+mpZn10Ll3GO+sCPwdGXbHqaziA9y7wZY=";
+    hash = "sha256-OPCX5989u+CuDJjPOPgkhrmU8k4/HQV8Ge01q+go2Qk=";
   };
 
   strictDeps = true;

From f634a6af1b560a0816289ac0590667911429415e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Sep 2026 09:26:45 +0000
Subject: [PATCH 065/120] python3Packages.social-auth-core: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix
index b63471608479..9884905b1a1c 100644
--- a/pkgs/development/python-modules/social-auth-core/default.nix
+++ b/pkgs/development/python-modules/social-auth-core/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "social-auth-core";
-  version = "5.1.0";
+  version = "5.1.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     owner = "python-social-auth";
     repo = "social-core";
     tag = finalAttrs.version;
-    hash = "sha256-1cpVyKi/MLaABzWZiCW5yNEq49Md0NCZ+0zWUvbjlss=";
+    hash = "sha256-OqABpMD0CbU++j5IXev71WDNrFNbKlknieXKPhEhatI=";
   };
 
   build-system = [ setuptools ];

From a53ff87675386313a25a752499e15f5cf1f54fc4 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Thu, 24 Sep 2026 05:27:55 -0700
Subject: [PATCH 066/120] t3code: 0.0.40 -> 0.0.42

---
 pkgs/by-name/t3/t3code/unwrapped.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/t3/t3code/unwrapped.nix b/pkgs/by-name/t3/t3code/unwrapped.nix
index 3625ca8b46cb..7c25a8ddb8b1 100644
--- a/pkgs/by-name/t3/t3code/unwrapped.nix
+++ b/pkgs/by-name/t3/t3code/unwrapped.nix
@@ -1,7 +1,7 @@
 {
   cctools,
   copyDesktopItems,
-  electron_43,
+  electron_44,
   fetchFromGitHub,
   installShellFiles,
   lib,
@@ -14,6 +14,7 @@
   nodejs,
   pkg-config,
   python3,
+  spdx-license-list-data,
   stdenv,
   writeDarwinBundle,
   xcbuild,
@@ -28,7 +29,7 @@ stdenv.mkDerivation (
   finalAttrs:
   let
     appName = "T3 Code (Alpha)";
-    electron = electron_43;
+    electron = electron_44;
     pnpm = pnpm_11;
     desktopIcon =
       if stdenv.hostPlatform.isDarwin then
@@ -39,7 +40,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "t3code-unwrapped";
-    version = "0.0.40";
+    version = "0.0.42";
     strictDeps = true;
     __structuredAttrs = true;
 
@@ -47,13 +48,17 @@ stdenv.mkDerivation (
       owner = "pingdotgg";
       repo = "t3code";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-J8kXpfMfm03/DDAiWXJuANwUNDshhiUn7Lf9tV42Xfw=";
+      hash = "sha256-YV86WqqpGQwjeovXB0IoE3f/o4IUC5DDVdBEdT4xzjc=";
     };
 
     postPatch = ''
       substituteInPlace apps/web/vite.config.ts \
         --replace-fail 'const host = explicitHost || "localhost";' \
                        'const host = explicitHost || "127.0.0.1";'
+
+      mkdir -p .generated/third-party-licenses/spdx/v3.28.0
+      cp ${spdx-license-list-data.json}/json/details/*.json \
+        .generated/third-party-licenses/spdx/v3.28.0
     '';
 
     nativeBuildInputs = [
@@ -100,7 +105,7 @@ stdenv.mkDerivation (
         ;
 
       fetcherVersion = 4;
-      hash = "sha256-+UsoURSM4VP+CgF1fWROBEB85EuH+iJJM/xDPFigCKk=";
+      hash = "sha256-gEY2em9pNTC1EuVX0V3L/Wu1apZ+BKBXxALEcPQ/pwA=";
     };
 
     preBuild = ''

From eb1fa06acd864b7f08338d7cc6622d05f61e1314 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 24 Sep 2026 17:52:09 +0200
Subject: [PATCH 067/120] SDL_mixer: remove vendor dir

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

diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
index 2aa368ceab19..0dac3693bd51 100644
--- a/pkgs/by-name/sd/SDL_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL_mixer/package.nix
@@ -34,6 +34,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FwDwUPLzuOlokKP91w8dF/BJPG2rFIlgn5kR6Tka0ws=";
   };
 
+  # Upstream does an okay job bumping these vendor dependencies, and we don't use them in nix anyways.
+  # However, we want to be sure to not accidentally use these,
+  # e.g. with automatic feature detection, so just remove them.
+  postPatch = ''
+    rm -rf external/*
+  '';
+
   nativeBuildInputs = [
     pkg-config
     # upstream configure is pre-built expecting FHS compliance:

From 66b94cee23aefca67ae29362f2f291a54e7f5da8 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 24 Sep 2026 17:57:11 +0200
Subject: [PATCH 068/120] SDL_mixer: enable mikmod

I guess this is basically #80817

Upstream has mikmod in their vendor dir and boasts additional format
support in their README. SDL_sound already uses libmikmod,
so this isn't such a strange dependency to have here.
---
 pkgs/by-name/sd/SDL_mixer/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
index 0dac3693bd51..a9c65e7dd003 100644
--- a/pkgs/by-name/sd/SDL_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL_mixer/package.nix
@@ -8,6 +8,7 @@
   libvorbis,
   pkg-config,
   libmpg123,
+  libmikmod,
   flac,
   autoreconfHook,
   stdenv,
@@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     # ./configure: line 5346: /usr/bin/file: No such file or directory
     autoreconfHook
     SDL # for sdl.m4
+    libmikmod # for libmikmod-config
   ];
 
   buildInputs = [
@@ -57,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     libmpg123
     flac
+    libmikmod
   ];
 
   configureFlags = [

From 8605b98d45b9f904574c9885d9727cebb208083e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:40:17 -0500
Subject: [PATCH 069/120] vimPlugins: update on 2026-09-24

---
 .../editors/vim/plugins/generated.nix         | 126 +++++++++---------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 417e97f57595..3d7e0b587481 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -461,12 +461,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-09-20";
+    version = "0-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "b73cf982d16ff69e528d2ab269482f11c0825f64";
-      hash = "sha256-RqfC4ZceON7BTRsjdw4HYxQkOQg3XD4TTHNDy7rquMM=";
+      rev = "12dd0de1f15d598db2cc0d075f4f0d13a3290d4d";
+      hash = "sha256-CwAbTCSjMb85sSNNEFu0Cm09qj55WzNsw/01Yi1itKo=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -1625,12 +1625,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "0-unstable-2026-09-13";
+    version = "0-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "44fc7a0d7ad878f90b04ffe8fa58c99c19007509";
-      hash = "sha256-Wb0fSya++a64lPIVtcdQjX9wkLfCEtq5uq6KG8jHvPY=";
+      rev = "feefc7e2a7bc7c2d814be1cc4b37ed599c52dad1";
+      hash = "sha256-U45ShqydwxkUbaIbRt0ERzCK65UYFlwLTdaL0jIz0QA=";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1751,7 +1751,7 @@ final: prev: {
 
   black-metal-theme-neovim = buildVimPlugin {
     pname = "black-metal-theme-neovim";
-    version = "2.0";
+    version = "2.1.0";
     src = fetchFromGitHub {
       owner = "metalelf0";
       repo = "black-metal-theme-neovim";
@@ -3513,12 +3513,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-09-19";
+    version = "0.0.82-unstable-2026-09-22";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "85709b90d7d3fa6962609b6adadac9f7b2067819";
-      hash = "sha256-MWCpHBXmlle96So8Tlc3+i9du+FCH4IRE2VwHaQFXjk=";
+      rev = "f5910295483bfbe8b58e6f2002e9ae280e5b700e";
+      hash = "sha256-fXxJRSEfj/o/43fd+iADJl7ARYOZd01iLbSYnFHG1Sc=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -4130,7 +4130,7 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "3.1.8";
+    version = "3.1.10";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
@@ -4228,12 +4228,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-09-19";
+    version = "0-unstable-2026-09-22";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "ed3778bb812961c60290ab6521eb2a90abeae4cf";
-      hash = "sha256-6JqW/vpN8MmWkNIJizmmcSF+he/RaIpn284Gk7Lx1jw=";
+      rev = "0cdbf99893729c5ffa74064382efc53364d7045d";
+      hash = "sha256-cAIZQcBVqTyaPW2+hH8kZRyTu8M1RQzLjLnHI4moICg=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -4945,12 +4945,12 @@ final: prev: {
     pname = "deoplete-github";
     version = "0-unstable-2018-03-04";
     src = fetchFromGitHub {
-      owner = "SevereOverfl0w";
+      owner = "dkarvik";
       repo = "deoplete-github";
       rev = "8e30256e50b3914a7e57ea4d5976b6a499fb936f";
       hash = "sha256-9ZU9DgMkBPIu/vy01TZqLWdOvpnzmfUwa/oEErEtwYY=";
     };
-    meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/";
+    meta.homepage = "https://github.com/dkarvik/deoplete-github/";
     meta.license = unfree;
     meta.hydraPlatforms = [ ];
   };
@@ -6683,7 +6683,7 @@ final: prev: {
 
   git-dev-nvim = buildVimPlugin {
     pname = "git-dev.nvim";
-    version = "0.11.1";
+    version = "0.11.2";
     src = fetchFromGitHub {
       owner = "moyiz";
       repo = "git-dev.nvim";
@@ -6781,11 +6781,11 @@ final: prev: {
 
   gitlab-vim = buildVimPlugin {
     pname = "gitlab.vim";
-    version = "1.1.0-unstable-2026-08-24";
+    version = "1.1.0-unstable-2026-09-21";
     src = fetchgit {
       url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
-      rev = "0cc64de832d79da7f2a53b111d7209a726fc33c8";
-      hash = "sha256-3YeU4TJ01pp70nm8Xl4xp07mADIZu1maNmbogbLl+Mw=";
+      rev = "185263ed2fc125b377f0825736b32702943bad43";
+      hash = "sha256-T4O2tCefTnA4gzIlIhK1RXAj/OFlYUWbdCJsVLdDODY=";
     };
     meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
     meta.license = unfree;
@@ -7003,12 +7003,12 @@ final: prev: {
 
   gruber-darker-nvim = buildVimPlugin {
     pname = "gruber-darker.nvim";
-    version = "0-unstable-2026-09-05";
+    version = "0-unstable-2026-09-23";
     src = fetchFromGitHub {
       owner = "blazkowolf";
       repo = "gruber-darker.nvim";
-      rev = "50fa4e583099729fcaaadc73a5afb74f7a91a625";
-      hash = "sha256-TgLuVBTnZnX+siZoE3Vzt5qtxP5Ab3VZUbjOOEQa7E8=";
+      rev = "35cb97959ef01f7193c94c404c13ddb3d4346654";
+      hash = "sha256-mlezA4AMPv9fW0rHcGWBIYswPFNnob7NDX5TyC3fSCM=";
     };
     meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8489,7 +8489,7 @@ final: prev: {
 
   kitty-scrollback-nvim = buildVimPlugin {
     pname = "kitty-scrollback.nvim";
-    version = "9.2.1";
+    version = "9.3.1";
     src = fetchFromGitHub {
       owner = "mikesmithgh";
       repo = "kitty-scrollback.nvim";
@@ -9244,12 +9244,12 @@ final: prev: {
 
   llm-nvim = buildVimPlugin {
     pname = "llm.nvim";
-    version = "0-unstable-2026-09-17";
+    version = "0-unstable-2026-09-23";
     src = fetchFromGitHub {
       owner = "huggingface";
       repo = "llm.nvim";
-      rev = "c7fdccf643758a19b472a034822eb204f8981155";
-      hash = "sha256-23gONtsP6CLsSbS68a8DAqDs5jLW4Q7qzwc75bOTEOs=";
+      rev = "fba54982924b701600f34dba0ce643de1514b698";
+      hash = "sha256-Pj64ZWjJnf1Y/ZfqrtowHRkJzSrjvSGIwt7Fpx4kWRE=";
     };
     meta.homepage = "https://github.com/huggingface/llm.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11218,12 +11218,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-09-20";
+    version = "1.4.0-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "a469ca99c14c1d19f908d1ce61fe8aa26bfdfb30";
-      hash = "sha256-fscYezkV5k1aa2d12XhYxKTggmD1vjKQGdumLtEESa8=";
+      rev = "03fad132dfb3f8a61b55b4731ee62d6fa7db9f2f";
+      hash = "sha256-JVprbeJUCAIXMw8vS5CW5qz0jR2DL5G/Fc9nYEfdUcM=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11682,7 +11682,7 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "0.38.4";
+    version = "0.39.0";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
@@ -12283,7 +12283,7 @@ final: prev: {
 
   no-neck-pain-nvim = buildVimPlugin {
     pname = "no-neck-pain.nvim";
-    version = "3.0.0";
+    version = "3.0.1";
     src = fetchFromGitHub {
       owner = "shortcuts";
       repo = "no-neck-pain.nvim";
@@ -12437,7 +12437,7 @@ final: prev: {
 
   numb-nvim = buildVimPlugin {
     pname = "numb.nvim";
-    version = "1.2.0";
+    version = "1.2.1";
     src = fetchFromGitHub {
       owner = "nacro90";
       repo = "numb.nvim";
@@ -13355,7 +13355,7 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2.11.0";
+    version = "2.12.0";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
@@ -14769,7 +14769,7 @@ final: prev: {
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2.14.6";
+    version = "2.14.7";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
@@ -15387,7 +15387,7 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "6.3.1-1";
+    version = "6.4.0-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
@@ -15779,12 +15779,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "0-unstable-2026-09-18";
+    version = "0-unstable-2026-09-23";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "8bcf893eb3871bc87b42adffe2fb9b0b7dc9d328";
-      hash = "sha256-FjlWKAB8w4FQE9zOLJ00S5906AhOh0Wl5bWj49GudGM=";
+      rev = "684b3484796ea44595bebbfddee4fa4dbfc90939";
+      hash = "sha256-AYYzm0JwklBxZNO+pNdKOcPvWQa4y24SIlblzAlGs9E=";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16858,12 +16858,12 @@ final: prev: {
 
   spring-boot-nvim = buildVimPlugin {
     pname = "spring-boot.nvim";
-    version = "0-unstable-2026-09-01";
+    version = "0-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "JavaHello";
       repo = "spring-boot.nvim";
-      rev = "eea95b752bceb6ca410b3e2d87a1a02d08bd61a6";
-      hash = "sha256-GYer7azYjYWGMTzNDLxHshGYJCl+2zi2+78LjHsuaUc=";
+      rev = "9880be48170a21d97444b1eba75853fd3bad33c3";
+      hash = "sha256-+zgi9Jhh5f3kPr5VC2KZ3x7OEXdTao5gQM48y5NlGo4=";
     };
     meta.homepage = "https://github.com/JavaHello/spring-boot.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -18207,12 +18207,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "1.0.0-unstable-2026-09-13";
+    version = "1.0.0-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "72c8e25efea5b7911863a0c4380bb1e014f3e41a";
-      hash = "sha256-Y7zUq8poJFwfkaUEYFXjDpVRbzRdlD8VUqC+ER9GPnI=";
+      rev = "7df9050dc4fa07efcdaf4046b2d746a9f39b0a5b";
+      hash = "sha256-8KL8OKA7iib0L1jfVMhkR8VHbgk+AMTJDRJj1dAjpXY=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18221,12 +18221,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "01-unstable-2026-09-13";
+    version = "01-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "4242c2e29728af4d00fea05b094992747ad99a17";
-      hash = "sha256-w1JZrHJeTuasHOVGIdhV4GIKP4GzVhATykYVFrmpHPc=";
+      rev = "57f981abc891b9adaa69cdc43d590f569bd5ec18";
+      hash = "sha256-TESqcY8VNmi/ONSqcILNPHvGVRfXMxttFDIvwKB+doU=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.license = unfree;
@@ -18249,12 +18249,12 @@ final: prev: {
 
   tiny-code-action-nvim = buildVimPlugin {
     pname = "tiny-code-action.nvim";
-    version = "0-unstable-2026-04-25";
+    version = "0-unstable-2026-09-22";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-code-action.nvim";
-      rev = "0d040ed81f7953118b81cd12681fcdfcac069803";
-      hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA=";
+      rev = "91a9c32228e9a7761d241023d9ebb9d11d8fb10d";
+      hash = "sha256-PLGomUsZt5KPabBtl1xof83sOxI7bv7DkHKjOnf8+/Q=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-code-action.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18517,12 +18517,12 @@ final: prev: {
 
   treesj = buildVimPlugin {
     pname = "treesj";
-    version = "0-unstable-2026-05-28";
+    version = "0-unstable-2026-09-23";
     src = fetchFromGitHub {
       owner = "Wansmer";
       repo = "treesj";
-      rev = "79aedb401bbdc7e4202f7881eab5f6feb2105b0a";
-      hash = "sha256-MoR46Z3ghEfsVaB8D3tE154DRdg/2iT2l54PICgC/X4=";
+      rev = "9f349ba62c524f065d6f43254d731ddf8319b9bf";
+      hash = "sha256-8U+TKUyRBZ2o7Ue3ibUEkSSlNZEzaWH6o3LtKetDeIk=";
     };
     meta.homepage = "https://github.com/Wansmer/treesj/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -23379,12 +23379,12 @@ final: prev: {
 
   vim-pets = buildVimPlugin {
     pname = "vim-pets";
-    version = "0-unstable-2026-08-01";
+    version = "0-unstable-2026-09-21";
     src = fetchFromGitHub {
       owner = "MeF0504";
       repo = "vim-pets";
-      rev = "461b3530341c00334b1bc75f64b35baff09910c4";
-      hash = "sha256-Zp/cpdwxWzbRVxrkkIdpB+tLgM2JJLA/mm+c1+oqM3M=";
+      rev = "270aaaae963390650658ac7cce7cfce32d09b6d2";
+      hash = "sha256-AE+j8gZx5P70qW26abyWvui5YhToTyc1iFHCz0L76eU=";
     };
     meta.homepage = "https://github.com/MeF0504/vim-pets/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -26206,12 +26206,12 @@ final: prev: {
 
   yanky-nvim = buildVimPlugin {
     pname = "yanky.nvim";
-    version = "2.0.0-unstable-2026-07-22";
+    version = "2.0.0-unstable-2026-09-21";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "yanky.nvim";
-      rev = "dd6689fdda85f66cab7d9b1a1664625f3be0920d";
-      hash = "sha256-2uNKHtFfIokuZ8AcPP5LXuStxPzQGP2Jcq04DsYM9s4=";
+      rev = "4b4ddd196526fd3d6fd091d931810f9743e936d3";
+      hash = "sha256-UcW2WSMz21gfE6u0ZNYsFhHipbwxK5XxTjg+ZtginEE=";
     };
     meta.homepage = "https://github.com/gbprod/yanky.nvim/";
     meta.license = getLicenseFromSpdxId "WTFPL";
@@ -26348,12 +26348,12 @@ final: prev: {
 
   zen-nvim = buildVimPlugin {
     pname = "zen.nvim";
-    version = "0-unstable-2026-09-12";
+    version = "0-unstable-2026-09-24";
     src = fetchFromGitHub {
       owner = "sand4rt";
       repo = "zen.nvim";
-      rev = "5fd4b1cc12b91930d1a55d9b98ef01ed963a0b46";
-      hash = "sha256-xO+Xn3FR27Ib8aU7Of1LCpeEjOeg0PJVg29yTH2br3o=";
+      rev = "48b408bcd8229c340360afe1edf14ebeb324e005";
+      hash = "sha256-Zk8M4rXHfBbt4iSoDkdaIPo7K6xQ1fyclayPcHIOszU=";
     };
     meta.homepage = "https://github.com/sand4rt/zen.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";

From 8aee0dabf7d4d75f393e3c70216c60d2d0eefb8f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:24 -0500
Subject: [PATCH 070/120] vimPlugins.black-metal-theme-neovim: 2.0 -> 2.1.0

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 3d7e0b587481..e35a916d14ed 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1755,8 +1755,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "metalelf0";
       repo = "black-metal-theme-neovim";
-      tag = "2.0";
-      hash = "sha256-z+qJfvCIV5WEAvKIkttDKpfBDt1xDBkTYLk2EoZbnj8=";
+      tag = "v2.1.0";
+      hash = "sha256-rVZPpbakoC6AoSPi8adKoY5aYGO/syjpwGTrsXm3Yag=";
     };
     meta.homepage = "https://github.com/metalelf0/black-metal-theme-neovim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";

From 72caf7ff40e541b87565e8353eccf3d89b7d030e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:24 -0500
Subject: [PATCH 071/120] vimPlugins.copilot-lua: 3.1.8 -> 3.1.10

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e35a916d14ed..e53cb6f4a2ea 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -4134,8 +4134,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      tag = "v3.1.8";
-      hash = "sha256-qqunTfZsgYEMiDnXaji6eyfBSbhmhFuAnh93UR7oimE=";
+      tag = "v3.1.10";
+      hash = "sha256-zL2yBu52mnMEj52tutE1aa++O75CAYGr9uHafDH8Qv0=";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.license = getLicenseFromSpdxId "MIT";

From 15b3623e2eaf8c9bdffaf9876a01ca1c6e26bc67 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:24 -0500
Subject: [PATCH 072/120] vimPlugins.git-dev-nvim: 0.11.1 -> 0.11.2

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e53cb6f4a2ea..ae5f26d70066 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6687,8 +6687,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "moyiz";
       repo = "git-dev.nvim";
-      tag = "v0.11.1";
-      hash = "sha256-pDz0IRlnnVHQ5G3Ga8I2wF8jDcF3hiyvMo5s5fwcV88=";
+      tag = "v0.11.2";
+      hash = "sha256-locfBfG9LYjxK1toQyqvuB/dP62jsRmz0S/qfVZbZNU=";
     };
     meta.homepage = "https://github.com/moyiz/git-dev.nvim/";
     meta.license = getLicenseFromSpdxId "BSD-3-Clause";

From 285a9a9328150068bdf649dd820f48011445b4d2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:25 -0500
Subject: [PATCH 073/120] vimPlugins.kitty-scrollback-nvim: 9.2.1 -> 9.3.1

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index ae5f26d70066..70c09177eae3 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8493,8 +8493,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "mikesmithgh";
       repo = "kitty-scrollback.nvim";
-      tag = "v9.2.1";
-      hash = "sha256-8IkvoJ8nTlP5WCqMpJqUhBsz7OYB/Mlp1lH5TJRpvOE=";
+      tag = "v9.3.1";
+      hash = "sha256-d3QGc4243XrzRpVgj0D137+x/r8VzjYdDJrElp/yv4I=";
     };
     meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";

From cdff5ef5fe2eac8dfa29b17e37802f130e09e13f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:25 -0500
Subject: [PATCH 074/120] vimPlugins.neotest-java: 0.38.4 -> 0.39.0

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 70c09177eae3..f283d5d11247 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11686,8 +11686,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      tag = "v0.38.4";
-      hash = "sha256-yXS54cs+Q+zJ4rUMbhwgRTMLNZUptfVWusj2muumyIo=";
+      tag = "v0.39.0";
+      hash = "sha256-FByGkU2pig8b9w59812B7o7IgSFnEjeDM7shRzAaoi8=";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.license = getLicenseFromSpdxId "MIT";

From 9cab09fa98bfdb66a1c934cf22ebc4e331d03fc0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:25 -0500
Subject: [PATCH 075/120] vimPlugins.no-neck-pain-nvim: 3.0.0 -> 3.0.1

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index f283d5d11247..e7cb5c95b4c2 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12287,8 +12287,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "shortcuts";
       repo = "no-neck-pain.nvim";
-      tag = "v3.0.0";
-      hash = "sha256-8YxDFzSZmcqF1yUbUwVacLZF2JnSb4Z3b630x22YOtw=";
+      tag = "v3.0.1";
+      hash = "sha256-RUCBdraqR1M9iYIXR8Rwp/9jj2gSPSzucAUJi5aYEUU=";
     };
     meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";

From 8846603d5907c04c05866e729c97c4350f9b22ec Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:25 -0500
Subject: [PATCH 076/120] vimPlugins.numb-nvim: 1.2.0 -> 1.2.1

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e7cb5c95b4c2..bb99a3145f1a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12441,8 +12441,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "nacro90";
       repo = "numb.nvim";
-      tag = "v1.2.0";
-      hash = "sha256-MRpfVTwlWZl9eKMiLg7eSMeKyhnxSNI3ZJ/TOzW43B0=";
+      tag = "v1.2.1";
+      hash = "sha256-HlMAZhrM+HnMDwBqXhEjD26y0hkWq6orNDDuUMO0KGM=";
     };
     meta.homepage = "https://github.com/nacro90/numb.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";

From c18f83868e562e798080ac27dd5f55d589181509 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:26 -0500
Subject: [PATCH 077/120] vimPlugins.nvim-lspconfig: 2.11.0 -> 2.12.0

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index bb99a3145f1a..caa0ddf3b940 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13359,8 +13359,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      tag = "v2.11.0";
-      hash = "sha256-d1vDEfiNSo9ccSPqTHEFqXVFCPhp/0ZozTzcyLiJrGg=";
+      tag = "v2.12.0";
+      hash = "sha256-FPk6fSdp13byZBp4pAPng1WefLEGoeauNcw62s/+i2Y=";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";

From a20b9487ab85539afdeed856d17e412b50d14304 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:26 -0500
Subject: [PATCH 078/120] vimPlugins.otter-nvim: 2.14.6 -> 2.14.7

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index caa0ddf3b940..a23fe9b4528a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -14773,8 +14773,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      tag = "v2.14.6";
-      hash = "sha256-hfyZ9eG6dMbDzPtQ8wIrx4B3la2VQqnZuXS2eG9gaFU=";
+      tag = "v2.14.7";
+      hash = "sha256-IlchxTOuuIXAP9fwU8HzQrtjWaAm9Y4oQFGYunYpWgc=";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";

From e144c62d10bf83e1ebca2f4f6addd63ecfba355d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:51:26 -0500
Subject: [PATCH 079/120] vimPlugins.project-nvim: 6.3.1-1 -> 6.4.0-1

---
 pkgs/applications/editors/vim/plugins/generated.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index a23fe9b4528a..87cd750901e0 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -15391,8 +15391,8 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v6.3.1-1";
-      hash = "sha256-Z1m4SpTpLEp7aOgmbAQlsjCuM3JgVnRfBh2vhef2ghY=";
+      tag = "v6.4.0-1";
+      hash = "sha256-YpLFIn1Kz/WwbGlJLt9urbOyVSwvjeZlr/aRnWW4o8g=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";

From 45cde886631306c768aa1b7ac2295d3c42d247e6 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Sep 2026 11:42:53 -0500
Subject: [PATCH 080/120] vimPlugins: resolve github repository redirects

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index c34c4406e0eb..772ea9f1a312 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -351,7 +351,7 @@ https://github.com/Shougo/deol.nvim/,,
 https://github.com/deoplete-plugins/deoplete-clang/,,
 https://github.com/deoplete-plugins/deoplete-dictionary/,,
 https://github.com/ponko2/deoplete-fish/,,
-https://github.com/SevereOverfl0w/deoplete-github/,,
+https://github.com/dkarvik/deoplete-github/,,
 https://github.com/deoplete-plugins/deoplete-go/,,
 https://github.com/Inazuma110/deoplete-greek/,,
 https://github.com/deoplete-plugins/deoplete-jedi/,,

From 200368994de282bb40678a2005cb2e5798a5342c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Sep 2026 21:03:18 +0000
Subject: [PATCH 081/120] octavePackages.datatypes: 1.4.0 -> 1.4.3

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

diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix
index 3f711faf74bc..ab2aee17dffc 100644
--- a/pkgs/development/octave-modules/datatypes/default.nix
+++ b/pkgs/development/octave-modules/datatypes/default.nix
@@ -10,13 +10,13 @@
 
 buildOctavePackage rec {
   pname = "datatypes";
-  version = "1.4.0";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "pr0m1th3as";
     repo = "datatypes";
     tag = "release-${version}";
-    sha256 = "sha256-aKY8SDCZHSkIlA4M6iAmXkl8kP+CANedNnvJOjgw+7U=";
+    sha256 = "sha256-JnaKAALySoLm8YkFaIVSmWMq+pncYPttMIS0L3jY7vc=";
   };
 
   nativeOctavePkgTestInputs = [

From df4f27425ed1019cb3a99a50cce1f9abf25a338d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Sep 2026 22:04:25 +0000
Subject: [PATCH 082/120] stash-clipboard: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/by-name/st/stash-clipboard/package.nix b/pkgs/by-name/st/stash-clipboard/package.nix
index fafeb8ffabed..56ef825025d3 100644
--- a/pkgs/by-name/st/stash-clipboard/package.nix
+++ b/pkgs/by-name/st/stash-clipboard/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stash-clipboard";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "NotAShelf";
     repo = "stash";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vB3fyaq8ca+y0ct0RQhFTZAVG/vgYXOd9kPocky/wmM=";
+    hash = "sha256-HnKYO6TSX3RNkC2DDBgb6brX8bFrKw4kg0RBwZXZMDI=";
   };
 
-  cargoHash = "sha256-m5ra/XCWogrY3edfQfrvKFHKP7mEWWRNJPYC/phPeDA=";
+  cargoHash = "sha256-PP/jh6AJPmjg93zSN0E8QLE+bN77edAV/dHxdtPy9+4=";
 
   __structuredAttrs = true;
 

From 74f63d84b75d8b0449b507d1211563ea53a41e18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Sep 2026 23:32:29 +0000
Subject: [PATCH 083/120] python3Packages.morecantile: 7.0.3 -> 7.1.0

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

diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index 0193e3e7f34f..a67487929857 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "morecantile";
-  version = "7.0.3";
+  version = "7.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "developmentseed";
     repo = "morecantile";
     tag = version;
-    hash = "sha256-Hx4duNbTuRfOmNBLN9J6/6URe57aPc8+3SJA7rbW5zs=";
+    hash = "sha256-RH8eO8KhxPtsD3ohOErwUpV9VFZUXlJ2fctQiUOc6L4=";
   };
 
   build-system = [ hatchling ];

From f2e33f7ac29e8af6cd8524d9be1117d1f22a7756 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 25 Sep 2026 02:26:09 +0200
Subject: [PATCH 084/120] incus: 7.4.0 -> 7.5.1

Changelog: https://github.com/lxc/incus/releases/tag/v7.5.1
---
 pkgs/by-name/in/incus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index ba73221152a9..a6ca1f8765ec 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-9q4YrumeCb8u0O6e0Ftisb33s2dz/DOdUO3JD05W8K0=";
-  version = "7.4.0";
-  vendorHash = "sha256-zplmn+JH/zEaQgo2xa5wzc6rCIb5tLIVlM1vYJpw9zQ=";
+  hash = "sha256-Kqz1fF/0jvqOtYqYSPI37M5vmqNrpfdZx2isbLcJTJg=";
+  version = "7.5.1";
+  vendorHash = "sha256-erg2ull2Dvw4lXIcjDyS/HVObqYUIh7k4GUsTJ61giY=";
   patches = fetchpatch2: [ ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"

From 5b371946df0f00f57c78c9cee133cc96a01ee55a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 01:53:40 +0000
Subject: [PATCH 085/120] grafanaPlugins.marcusolsson-json-datasource: 1.4.1 ->
 1.4.2

---
 .../grafana/plugins/marcusolsson-json-datasource/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix
index 395d9ec19509..07313bae509d 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-json-datasource";
-  version = "1.4.1";
-  zipHash = "sha256-tLjb3ZTK26Cb3CQ1qSRTtmbdzYD4S+vzI2OopogsY0M=";
+  version = "1.4.2";
+  zipHash = "sha256-cYFMHE9d8MCbxmCaVu0HZvLbCgOpK/6PLvbzynt+/QQ=";
   meta = {
     description = "Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana";
     license = lib.licenses.asl20;

From bbc3e3ca5e6d155982691d0bc6e1eca5c37fb90a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 04:01:30 +0000
Subject: [PATCH 086/120] orbiton: 2.74.4 -> 2.74.5

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

diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index e18d3c0e47ab..55d5ea1689f7 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "orbiton";
-  version = "2.74.4";
+  version = "2.74.5";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
     tag = "v${version}";
-    hash = "sha256-LwwHwi1NyKqyzJou4sh+gM2NxNdYvpBN2Zx8SIOHX40=";
+    hash = "sha256-kR73i/0YHn8Kwu/5tkLm9/xBlU3Z1CVNayMiZ+qNp/A=";
   };
 
   vendorHash = null;

From dacd1ca0f4f343c2473578c29c9d7896a722f968 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 05:36:39 +0000
Subject: [PATCH 087/120] diamond: 2.2.7 -> 2.2.8

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

diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix
index a08c358a03d2..3de7240b3a0a 100644
--- a/pkgs/by-name/di/diamond/package.nix
+++ b/pkgs/by-name/di/diamond/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "diamond";
-  version = "2.2.7";
+  version = "2.2.8";
 
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bWJIcQJR2BQED8YGnDSWIO+UehWThgJwHv7hGuT99D8=";
+    hash = "sha256-Z1+CJyKBRjTDVDAJ3uWPQd9KLIc03JNIoTTUuzHMB5U=";
   };
 
   nativeBuildInputs = [ cmake ];

From d6eb78b15919b91fee3caa18446bcda0fb01f187 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 08:35:57 +0000
Subject: [PATCH 088/120] umbriel: 0-unstable-2026-09-13 ->
 0-unstable-2026-09-25

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

diff --git a/pkgs/by-name/um/umbriel/package.nix b/pkgs/by-name/um/umbriel/package.nix
index ff357a012b71..8070fade2d7b 100644
--- a/pkgs/by-name/um/umbriel/package.nix
+++ b/pkgs/by-name/um/umbriel/package.nix
@@ -30,7 +30,7 @@
 }:
 stdenv.mkDerivation {
   pname = "umbriel";
-  version = "0-unstable-2026-09-13";
+  version = "0-unstable-2026-09-25";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
     owner = "noctalia-dev";
     repo = "umbriel";
     # No tagged releases yet
-    rev = "11c0c99b85c5aa579224cf0d2302f4f7356ac5c4";
-    hash = "sha256-Ot18ZKFwRSPzyXhSkDhLOI8nAXfeoFPuB04Jk5DkzV4=";
+    rev = "834607334f9bb13a22b1e2a53bf47cfbfa5be7dd";
+    hash = "sha256-2xnCu7VEW4OywjVW9dwYLQg0Gl4aDNKKrJnX8eGH/rY=";
   };
 
   nativeBuildInputs = [

From 68e711f9142f10117c9f515c86514a19651ba37a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 08:37:36 +0000
Subject: [PATCH 089/120] xdg-desktop-portal-umbriel: 0-unstable-2026-09-07 ->
 0-unstable-2026-09-24

---
 pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix
index 2fbfa6b4c7e2..ef689e02c0dd 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix
@@ -21,7 +21,7 @@
 }:
 stdenv.mkDerivation {
   pname = "xdg-desktop-portal-umbriel";
-  version = "0-unstable-2026-09-07";
+  version = "0-unstable-2026-09-24";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
     owner = "noctalia-dev";
     repo = "xdg-desktop-portal-umbriel";
     # No tagged releases yet
-    rev = "d7a1bc386c2a6dfaecaa953165f9f373735c9ee0";
-    hash = "sha256-x2D1TiCn0rTwbA8darNxthxOWOCoZLwefptsUM7587I=";
+    rev = "ee380d66984a45310ef48a283ad806ebab752788";
+    hash = "sha256-NIjks+J3+GcAUWZxWiFLl/rtNYl/VrlIZOm1PMAO4Ss=";
   };
 
   nativeBuildInputs = [

From 66508672fc69f346f769baabad1b913527943342 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 25 Sep 2026 11:31:07 +0200
Subject: [PATCH 090/120] phpExtensions.mongodb: 2.5.2 -> 2.5.3

https://github.com/mongodb/mongo-php-driver/releases/tag/2.5.3
---
 pkgs/development/php-packages/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index 21547f3df5ce..59aa5193a49b 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -15,13 +15,13 @@
 
 buildPecl rec {
   pname = "mongodb";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-php-driver";
     rev = version;
-    hash = "sha256-VZ4PxZpCKoXJkoUPAEVpI4FEunfHzcai2POc4fqX9yo=";
+    hash = "sha256-zhF1YF/jZpXS0PfVwZ2uDluHY8HTqWhXVa0J1TGo5aA=";
     fetchSubmodules = true;
   };
 

From 5b14b4641d1011f65fc7f5eed29779e8b80c60dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 10:35:55 +0000
Subject: [PATCH 091/120] sshwifty: 0.4.10-beta-release -> 0.4.11-beta-release

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

diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix
index 03e82e15a5bd..66f07c4cf29c 100644
--- a/pkgs/by-name/ss/sshwifty/package.nix
+++ b/pkgs/by-name/ss/sshwifty/package.nix
@@ -13,13 +13,13 @@
 # so let's build using the latest Go available in nixpkgs.
 buildGoLatestModule (finalAttrs: {
   pname = "sshwifty";
-  version = "0.4.10-beta-release";
+  version = "0.4.11-beta-release";
 
   src = fetchFromGitHub {
     owner = "nirui";
     repo = "sshwifty";
     tag = finalAttrs.version;
-    hash = "sha256-6Yxwz4AXyUKz9FredI3c1HpjptaV2X0iXY+z8Lev1xg=";
+    hash = "sha256-Vb2G7zV6RrAgwpxpnbEVwo1TRatlilHgH1g19uVwAKs=";
   };
 
   nativeBuildInputs = [
@@ -34,10 +34,10 @@ buildGoLatestModule (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-GYcqCYQ/l21q1vvIkl9np+1ko5woD004OFXiW4jSkZc=";
+    hash = "sha256-NnRQStZooSS87GyeRc7gls/9EMPdndr/OkHFFHt46HQ=";
   };
 
-  vendorHash = "sha256-O3oEbTGJWWWTQSadctcBy0lpNzovw7SCT9/7moJOs0g=";
+  vendorHash = "sha256-C60bf9QjY/37zSjSfwhBgtN2lqd4d8TBJqZYtBOCHug=";
 
   preBuild = ''
     # Generate static pages

From 936fbcaf48d55707e3833e3ecff3bc3672158f71 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 25 Sep 2026 12:56:08 +0200
Subject: [PATCH 092/120] libcava: add myself to maintainers

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

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index 985c4283fee2..94a02204c439 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   cava,
   fetchFromGitHub,
   nix-update-script,
@@ -34,5 +35,6 @@ cava.overrideAttrs (old: rec {
   meta = old.meta // {
     homepage = "https://github.com/LukashonakV/cava";
     description = "Fork of CAVA to build it as a shared library";
+    maintainers = old.meta.maintainers ++ [ lib.maintainers.PerchunPak ];
   };
 })

From 55c8d9546d28bef8b5a6a9c784783535e56d5022 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 25 Sep 2026 19:45:16 +0800
Subject: [PATCH 093/120] codex: 0.156.1 -> 0.157.0

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

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 00624c6ced4e..74b6c397d282 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -29,18 +29,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.156.1";
+  version = "0.157.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-H53f57hmnyCtn5yPxtBe/A92qyQyzQBeU/vK2qSBrvI=";
+    hash = "sha256-/f/k77vnFjPfnnf+X2E7rY2FxUR1xAcJZiPTv9Q8JVI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-W87rX/W2J1pwqNrihX+Rj6DfagoZYuB6C+l/S4BhyJM=";
+  cargoHash = "sha256-Mp4chq9QuQB19FrOZBhmUtPrDoEpZZna79+MZs9rGUo=";
 
   __structuredAttrs = true;
 

From e843e0315e6d8b3e09bd3d91f97e4cbaca70068e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 25 Sep 2026 13:50:32 +0200
Subject: [PATCH 094/120] 
 home-assistant-custom-lovelace-modules.weather-radar-card: 3.9.0 -> 3.10.0

Diff: https://github.com/jpettitt/weather-radar-card/compare/v3.9.0...v3.10.0

Changelog: https://github.com/jpettitt/weather-radar-card/blob/refs/tags/v3.10.0/CHANGELOG.md
---
 .../custom-lovelace-modules/weather-radar-card/package.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
index 7c4ce72bc0d5..c4cb21726a6b 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "weather-radar-card";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "jpettitt";
     repo = "weather-radar-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NvxkVEuXrVO95qR7YBU1WSdZXTlHsOkVB39ZGwis/lw=";
+    hash = "sha256-UzmCHEVbg9Ulj4wZabe7XyM4Ao7VPKjRgQe6cxPrLKM=";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDepsFetcherVersion = 2;
   npmFlags = [ "--legacy-peer-deps" ];
-  npmDepsHash = "sha256-/PU0e4A5RH7g5jE0+Ai2y4MvOa6D2+7G+wcsv18orYk=";
+  npmDepsHash = "sha256-BUBEMG6GXULUx7nKws9oDmqdr4IW+FQt/1ChskE3aZg=";
 
   installPhase = ''
     runHook preInstall

From d0e302d6c7a03b095b1c637dd6c1ed9c0a4b7ba7 Mon Sep 17 00:00:00 2001
From: Martin Fischer <martin@push-f.com>
Date: Sun, 28 Jun 2026 10:33:41 +0200
Subject: [PATCH 095/120] nixos/printers: fix empty value handling in
 ensurePrinters

E.g. this configuration:

    hardware.printers.ensurePrinters = [
      {
        name = "test";
        deviceUri = "ipp://somewhere";
        location = "";
        model = "everywhere";
      }
    ];

Resulted in the following command being generated:

    /nix/store/...-cups-2.4.19/bin/lpadmin -L -meverywhere -ptest -vipp://somewhere -E

Note the missing '' after -L which then caused /etc/cups/printers.conf to contain:

    Info test
    Location -meverywhere
    DeviceURI ipp://somewhere

This bug was introduced in 1f4c50ab8116b151fb9a007b2dbf46decd7a1483 with the
change from the (now deprecated) toGNUCommandLineShell to toCommandLineShellGNU.

Assisted-by: pi (OpenAI gpt-5.5)
---
 nixos/modules/hardware/printers.nix | 12 +++++++++---
 nixos/tests/printing.nix            |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
index f24ca2c358f4..ce63a9a98980 100644
--- a/nixos/modules/hardware/printers.nix
+++ b/nixos/modules/hardware/printers.nix
@@ -298,6 +298,14 @@ in
           lpadmin =
             args:
             let
+              toLpadminArgs =
+                # Not using toCommandLineShellGNU since it omits empty strings for short options.
+                lib.cli.toCommandLineShell (optionName: {
+                  option = "-${optionName}";
+                  sep = null;
+                  explicitBool = false;
+                });
+
               # -d, -p and -x are subcommands that must be specified at the start.
               argsDpx = lib.intersectAttrs {
                 d = true;
@@ -310,9 +318,7 @@ in
                 "x"
               ];
             in
-            "lpadmin ${lib.cli.toCommandLineShellGNU { } argsDpx} ${
-              lib.cli.toCommandLineShellGNU { } argsWoDpx
-            }";
+            "lpadmin ${toLpadminArgs argsDpx} ${toLpadminArgs argsWoDpx}";
 
         in
         ''
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 1a66bc179773..b03982434fb1 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -55,6 +55,7 @@ in
         {
           name = "DeskjetRemote";
           deviceUri = "ipp://server/printers/DeskjetLocal";
+          location = "";
           model = "drv:///sample.drv/deskjet.ppd";
         }
         {
@@ -95,6 +96,10 @@ in
 
     client.wait_until_succeeds("journalctl -u cups.service --grep 'CUPS provisioning complete'")
 
+    with subtest("Empty printer options are handled correctly"):
+        client.wait_for_file("/etc/cups/printers.conf")
+        client.fail("grep -F 'Location -mdrv://' /etc/cups/printers.conf")
+
     with subtest("UNIX socket is used for connections"):
         assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
 

From f59162fa374a4f7bfccd705fdc760c5ac8175708 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 25 Sep 2026 14:19:21 +0200
Subject: [PATCH 096/120] dejavu_fontsEnv: drop

It really just contains a single symlink pointing $out/share to ${dejavu_fonts}/share

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/de/dejavu_fontsEnv/package.nix | 9 ---------
 pkgs/top-level/aliases.nix                  | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 pkgs/by-name/de/dejavu_fontsEnv/package.nix

diff --git a/pkgs/by-name/de/dejavu_fontsEnv/package.nix b/pkgs/by-name/de/dejavu_fontsEnv/package.nix
deleted file mode 100644
index 2e215d31f691..000000000000
--- a/pkgs/by-name/de/dejavu_fontsEnv/package.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  buildEnv,
-  dejavu_fonts,
-}:
-
-buildEnv {
-  inherit (dejavu_fonts) pname version;
-  paths = [ dejavu_fonts.out ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ca4ea516f18d..561545e6b042 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -690,6 +690,7 @@ mapAliases {
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   defuddle-cli = warnAlias "defuddle-cli has been renamed to/replaced by 'defuddle'" defuddle; # Added 2026-04-16
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
+  dejavu_fontsEnv = throw "'dejavu_fontsEnv' has been removed as its content is identical to 'dejavu_fonts'."; # Added 2026-09-25
   deltachat-cursed = throw "'deltachat-cursed' has been renamed to/replaced by 'arcanechat-tui'"; # Converted to throw 2025-10-27
   deltatouch = throw "'deltatouch' has been removed as it depended on qt5 webengine which reached EOL"; # Added 2026-04-25
   desktop-postflop = throw "'desktop-postflop' has been removed as it has been unmaintained upstream since October 2023 and depended on webkitgtk 4.0"; # Added 2026-06-07

From 22e3c0fd0bc85c83ca23fc3fa59a64e7a65747e5 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 25 Sep 2026 14:44:56 +0200
Subject: [PATCH 097/120] vimPlugins.vim-markdown-composer:
 0-unstable-2022-06-14 -> 0-unstable-2025-10-23

---
 .../vim-markdown-composer/default.nix             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
index cb3b57d80379..72a28cfb4ee6 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix
@@ -1,24 +1,24 @@
 {
+  lib,
   fetchFromGitHub,
   nix-update-script,
   rustPlatform,
   vimUtils,
 }:
 let
-  version = "0-unstable-2022-06-14";
+  version = "0-unstable-2025-10-23";
   src = fetchFromGitHub {
     owner = "euclio";
     repo = "vim-markdown-composer";
-    rev = "e6f99bc20cfcb277c63041b1f766e6d5940bcc76";
-    sha256 = "0ljv8cvca8nk91g67mnzip81say04b1wbj9bzcgzy8m6qkz1r2h3";
-    fetchSubmodules = true;
+    rev = "4f53f1c6e41c8fb916c50b50e18284d923f0f3cd";
+    sha256 = "sha256-QODj8J2d2Qo8/B0rv5HthSidZcBgY11oNKwT8jCO6kI=";
   };
 
   vim-markdown-composer-bin = rustPlatform.buildRustPackage {
     pname = "vim-markdown-composer-bin";
     inherit src version;
 
-    cargoHash = "sha256-xzlEIaDEYDbxJ6YqzF+lSHcB9O+brClw026YI1YeNUc=";
+    cargoHash = "sha256-/wkXbd4cEOEVhWW5KzMavay7a4XI1deonjn0QCP6z7I=";
     # tests require network access
     doCheck = false;
   };
@@ -45,8 +45,9 @@ vimUtils.buildVimPlugin {
   };
 
   meta = {
+    description = "(Neo)vim plugin for asynchronous Markdown previews";
     homepage = "https://github.com/euclio/vim-markdown-composer/";
-    # rust build error
-    broken = true;
+    # https://github.com/euclio/vim-markdown-composer/blob/4f53f1c6e41c8fb916c50b50e18284d923f0f3cd/doc/markdown-composer.txt#L4
+    license = lib.licenses.mit;
   };
 }

From 9182d285a79db96be42c9fc3f83b49176dc693af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 12:55:56 +0000
Subject: [PATCH 098/120] wayvnc: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix
index f1c23c892be8..081d1eb471ee 100644
--- a/pkgs/by-name/wa/wayvnc/package.nix
+++ b/pkgs/by-name/wa/wayvnc/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayvnc";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = "wayvnc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XVu+sj7O6usFXljkGvQHU9KARjW9jYhFltgbY900TyA=";
+    hash = "sha256-mx5PjNsRfgF2jm+VEHcJsHl2h1UzXtcucO8o/OnROMk=";
   };
 
   strictDeps = true;

From 7e0ba38bdd82069fbd56107a1e70256a46df32b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 25 Sep 2026 15:05:39 +0200
Subject: [PATCH 099/120] 
 home-assistant-custom-lovelace-modules.tankerkoenig-card: 1.8.1 -> 1.8.2

Diff: https://github.com/timmaurice/lovelace-tankerkoenig-card/compare/1.8.1...1.8.2

Changelog: https://github.com/timmaurice/lovelace-tankerkoenig-card/releases/tag/1.8.2
---
 .../custom-lovelace-modules/tankerkoenig-card/package.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix
index 1104824556af..ba9c48ee6e6b 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/tankerkoenig-card/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "tankerkoenig-card";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "timmaurice";
     repo = "lovelace-tankerkoenig-card";
     tag = finalAttrs.version;
-    hash = "sha256-QTfg9hlbfbT8rRkc6QB/GDzMZI5e1irKBheYj/GLEB8=";
+    hash = "sha256-GMX6kIyoZN26NCgqPTj44TC3Yo+zTcmSm5ToakgIojA=";
   };
 
-  npmDepsHash = "sha256-9ndSxbaDuuMlBnMzW0SihYMU9MVvbSX7AaR63+H+cVQ=";
+  npmDepsHash = "sha256-OrEQjE2XMcumCyfdKKMkFWO1vgOytVjsguTuU6AkZr0=";
 
   installPhase = ''
     runHook preInstall

From ce68722dfd524df58f126df6cbcf6349f3ed4e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20K=C3=B6pcke?= <hello@capypara.de>
Date: Tue, 11 Aug 2026 08:32:07 +0200
Subject: [PATCH 100/120] jetbrains.*: move to by-name

---
 doc/release-notes/rl-2611.section.md          |  7 +++
 .../editors/jetbrains/default.nix             | 62 +++++++++++--------
 .../editors/jetbrains/plugins/tests.nix       | 24 +++++--
 pkgs/applications/editors/jetbrains/readme.md | 28 ++++++++-
 .../editors/jetbrains/updater/updateInfo.json | 22 +++----
 .../cl/clion/package.nix}                     |  0
 .../da/datagrip/package.nix}                  |  0
 .../da/dataspell/package.nix}                 |  0
 .../go/goland/package.nix}                    |  0
 .../intellij-idea-oss/maven_artefacts.json}   |  0
 .../in/intellij-idea-oss/package.nix}         |  4 +-
 .../in/intellij-idea/package.nix}             |  2 +-
 .../je/jetbrains-gateway/package.nix}         |  0
 .../je/jetbrains-mps/package.nix}             |  0
 .../ph/phpstorm/package.nix}                  |  0
 .../py/pycharm-oss/maven_artefacts.json}      |  0
 .../py/pycharm-oss/package.nix}               |  2 +-
 .../py/pycharm/package.nix}                   |  0
 .../ri/rider/package.nix}                     |  0
 .../ru/ruby-mine/package.nix}                 |  0
 .../ru/rust-rover/package.nix}                |  0
 .../we/webstorm/package.nix}                  |  0
 22 files changed, 101 insertions(+), 50 deletions(-)
 rename pkgs/{applications/editors/jetbrains/ides/clion.nix => by-name/cl/clion/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/datagrip.nix => by-name/da/datagrip/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/dataspell.nix => by-name/da/dataspell/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/goland.nix => by-name/go/goland/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/source/idea_maven_artefacts.json => by-name/in/intellij-idea-oss/maven_artefacts.json} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/idea-oss.nix => by-name/in/intellij-idea-oss/package.nix} (97%)
 rename pkgs/{applications/editors/jetbrains/ides/idea.nix => by-name/in/intellij-idea/package.nix} (98%)
 rename pkgs/{applications/editors/jetbrains/ides/gateway.nix => by-name/je/jetbrains-gateway/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/mps.nix => by-name/je/jetbrains-mps/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/phpstorm.nix => by-name/ph/phpstorm/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/source/pycharm_maven_artefacts.json => by-name/py/pycharm-oss/maven_artefacts.json} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/pycharm-oss.nix => by-name/py/pycharm-oss/package.nix} (98%)
 rename pkgs/{applications/editors/jetbrains/ides/pycharm.nix => by-name/py/pycharm/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/rider.nix => by-name/ri/rider/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/ruby-mine.nix => by-name/ru/ruby-mine/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/rust-rover.nix => by-name/ru/rust-rover/package.nix} (100%)
 rename pkgs/{applications/editors/jetbrains/ides/webstorm.nix => by-name/we/webstorm/package.nix} (100%)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index c0c0229254d5..ea817d1b158f 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -136,6 +136,13 @@
   Additionally, the kernel module tree used inside the VM has been split out of the `kernel` argument into a new `kernelModules` argument (defaulting to `kernel`).
   Callers that overrode `kernel` with a module tree (e.g. from `pkgs.aggregateModules`) to make extra modules available must now pass it via `kernelModules` instead, keeping `kernel` pointing at a bootable kernel derivation.
 
+- The JetBrains IDEs have all been moved to the top-level:
+  - `jetbrains.idea` and `jetbrains.idea-oss` have been renamed to `intellij-idea` and `intellij-idea-oss` respectively.
+  - `jetbrains.mps` has been renamed to `jetbrains-mps`.
+  - `jetbrains.gateway` has been renamed to `jetbrains-gateway`.
+  - All other IDEs have directly moved to the top-level with no prefix  (e.g. `jetbrains.pycharm` -> `pycharm`).
+  - `jetbrains.plugins` remains unchanged for now.
+
 - The ARMv5 Linux kernel build now uses a standard configuration and generates a standard compressed image instead of the deprecated legacy U‐Boot image format.
   `lib.systems.{examples,platforms}.{sheevaplug,pogoplug4}` have been unified into `lib.systems.examples.armv5tel-multiplatform`.
   Note that there is no official support for ARMv5 and it is not possible to build even a simple NixOS configuration out of the box.
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f9fd6cdb2a5b..5204da5ade3b 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,9 +1,25 @@
 {
   # keep-sorted start
   callPackage,
+  clion,
   config,
+  datagrip,
+  dataspell,
+  goland,
+  intellij-idea,
+  intellij-idea-oss,
+  jetbrains,
+  jetbrains-gateway,
+  jetbrains-mps,
   lib,
+  phpstorm,
+  pycharm,
+  pycharm-oss,
+  rider,
+  ruby-mine,
+  rust-rover,
   stdenv,
+  webstorm,
   # keep-sorted end
 
   vmopts ? null,
@@ -19,48 +35,40 @@
   cythonDebugSpeedupsHook = callPackage ./hooks/cython-debug-speedups.nix { };
   sharedLibsHook = callPackage ./hooks/shared-libs.nix { };
 
-  # Sorted alphabetically. Deprecated products and aliases are at the very end.
-  clion = callPackage ./ides/clion.nix { };
-  datagrip = callPackage ./ides/datagrip.nix { };
-  dataspell = callPackage ./ides/dataspell.nix { };
-  gateway = callPackage ./ides/gateway.nix { };
-  goland = callPackage ./ides/goland.nix { };
-  idea = callPackage ./ides/idea.nix { };
-  idea-oss = callPackage ./ides/idea-oss.nix { };
-  mps = callPackage ./ides/mps.nix { };
-  phpstorm = callPackage ./ides/phpstorm.nix { };
-  pycharm = callPackage ./ides/pycharm.nix { };
-  pycharm-oss = callPackage ./ides/pycharm-oss.nix { };
-  rider = callPackage ./ides/rider.nix { };
-  ruby-mine = callPackage ./ides/ruby-mine.nix { };
-  rust-rover = callPackage ./ides/rust-rover.nix { };
-  webstorm = callPackage ./ides/webstorm.nix { };
-
   # Plugins
   plugins = callPackage ./plugins { };
 }
 
 // lib.optionalAttrs config.allowAliases {
+  # These now all live in by-name.
+  # This is managed by the maintainers/scripts/remove-old-aliases.py script, please run it to update these,
+  # but make sure the warning/throw text says "'jetbrains.xyz' has been..." (add the jetbrains prefix).
+  # Also update the names in the old aliases at the bottom then!
+  clion = clion; # Added 2026-08-15
+  datagrip = datagrip; # Added 2026-08-15
+  dataspell = dataspell; # Added 2026-08-15
+  gateway = jetbrains-gateway; # Added 2026-08-15
+  goland = goland; # Added 2026-08-15
+  idea = intellij-idea; # Added 2026-08-15
+  idea-oss = intellij-idea-oss; # Added 2026-08-15
+  mps = jetbrains-mps; # Added 2026-08-15
+  phpstorm = phpstorm; # Added 2026-08-15
+  pycharm = pycharm; # Added 2026-08-15
+  pycharm-oss = pycharm-oss; # Added 2026-08-15
+  rider = rider; # Added 2026-08-15
+  ruby-mine = ruby-mine; # Added 2026-08-15
+  rust-rover = rust-rover; # Added 2026-08-15
+  webstorm = webstorm; # Added 2026-08-15
 
   # Deprecated products and aliases.
-
   aqua = throw "jetbrains.aqua: Aqua has been removed as it has been discontinued by JetBrains";
-
   idea-community = throw "jetbrains.idea-community: IntelliJ IDEA Community has been removed as it has been discontinued by JetBrains. Either switch to 'jetbrains.idea-oss' or 'jetbrains.idea'. See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/";
-
   idea-community-bin = throw "jetbrains.idea-community-bin: IntelliJ IDEA Community has been removed as it has been discontinued by JetBrains. Either switch to 'jetbrains.idea-oss' or 'jetbrains.idea'. See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/";
-
   idea-community-src = throw "jetbrains.idea-community-src: IntelliJ IDEA Community has been removed as it has been discontinued by JetBrains. Either switch to 'jetbrains.idea-oss' or 'jetbrains.idea'. See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/";
-
   idea-ultimate = throw "'jetbrains.idea-ultimate' has been renamed to/replaced by 'jetbrains.idea'";
-
   pycharm-community = throw "jetbrains.pycharm-community: PyCharm Community has been removed as it has been discontinued by JetBrains. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025";
-
   pycharm-community-bin = throw "jetbrains.pycharm-community-bin: PyCharm Community has been removed as it has been discontinued by JetBrains. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025";
-
   pycharm-community-src = throw "jetbrains.pycharm-community-src: PyCharm Community has been removed as it has been discontinued by JetBrains. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025";
-
   pycharm-professional = throw "'jetbrains.pycharm-professional' has been renamed to/replaced by 'jetbrains.pycharm'";
-
   writerside = throw "jetbrains.writerside: Writerside has been removed as it has been discontinued by JetBrains";
 }
diff --git a/pkgs/applications/editors/jetbrains/plugins/tests.nix b/pkgs/applications/editors/jetbrains/plugins/tests.nix
index 3e015a4b1c2f..16a3468b8873 100644
--- a/pkgs/applications/editors/jetbrains/plugins/tests.nix
+++ b/pkgs/applications/editors/jetbrains/plugins/tests.nix
@@ -1,11 +1,26 @@
 {
   # keep-sorted start
+  clion,
+  datagrip,
+  dataspell,
   fetchurl,
   fetchzip,
+  goland,
+  intellij-idea,
+  intellij-idea-oss,
   jetbrains,
+  jetbrains-gateway,
+  jetbrains-mps,
   lib,
+  phpstorm,
+  pycharm,
+  pycharm-oss,
+  rider,
+  ruby-mine,
   runCommand,
+  rust-rover,
   symlinkJoin,
+  webstorm,
   # keep-sorted end
 
   # If not set, all IDEs are tested.
@@ -15,17 +30,16 @@
 let
   ides =
     if ide == null then
-      with jetbrains;
       [
         # keep-sorted start
         clion
         datagrip
         dataspell
-        gateway
         goland
-        idea
-        idea-oss
-        mps
+        intellij-idea
+        intellij-idea-oss
+        jetbrains-gateway
+        jetbrains-mps
         phpstorm
         pycharm
         pycharm-oss
diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md
index eaa95a8c90ed..87a07e3c7df3 100644
--- a/pkgs/applications/editors/jetbrains/readme.md
+++ b/pkgs/applications/editors/jetbrains/readme.md
@@ -1,13 +1,35 @@
 This directory contains the build expressions needed to build any of the JetBrains IDEs.
 The jdk is in `pkgs/development/compilers/jetbrains-jdk`.
 
+## IDE packages
+
+The IDEs live in by-name/:
+
+| IDE Name                       | Package Location                              |
+|--------------------------------|-----------------------------------------------|
+| Clion                          | pkgs/by-name/cl/clion/package.nix             |
+| DataGrip                       | pkgs/by-name/da/datagrip/package.nix          |
+| DataSpell                      | pkgs/by-name/da/dataspell/package.nix         |
+| Gateway                        | pkgs/by-name/je/jetbrains-gateway/package.nix |
+| Goland                         | pkgs/by-name/go/goland/package.nix            |
+| IntelliJ IDEA                  | pkgs/by-name/in/intellij-idea/package.nix     |
+| IntelliJ IDEA (Open Source)    | pkgs/by-name/in/intellij-idea-oss/package.nix |
+| MPS                            | pkgs/by-name/je/jetbrains-mps/package.nix     |
+| PhpStorm                       | pkgs/by-name/ph/phpstorm/package.nix          |
+| PyCharm                        | pkgs/by-name/py/pycharm/package.nix           |
+| PyCharm (Open Source)          | pkgs/by-name/py/pycharm-oss/package.nix       |
+| Rider                          | pkgs/by-name/ri/rider/package.nix             |
+| RubyMine                       | pkgs/by-name/ru/ruby-mine/package.nix         |
+| RustRover                      | pkgs/by-name/ru/rust-rover/package.nix        |
+| WebStorm                       | pkgs/by-name/we/webstorm/package.nix          |
+
 ## Tests:
 - To test the build process of every IDE (as well as the process for adding plugins), build `jetbrains.plugins.tests.empty`.
 - To test that plugins are correctly stored in the plugins directory, build `jetbrains.plugins.tests.stored-correctly`.
 
 ## How to use plugins:
  - Pass your IDE package and a list of plugin packages to `jetbrains.plugins.addPlugins`.
-   E.g. `pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea [ ideavim ]`
+   E.g. `pkgs.jetbrains.plugins.addPlugins pkgs.intellij-idea [ ideavim ]`
  - The list has to contain drvs giving the directory contents of the plugin or a single `.jar` (executable).
 
 Nixpkgs does not package JetBrains plugins, however you can use third-party sources, such as
@@ -51,9 +73,9 @@ To keep things simple, the update script will search for the following markers a
 Any comments or other manual changes between these markers will be removed when the script runs.
 
 ## How to add an IDE:
- - Add a new derivation in `ides/`
+ - Add a new derivation in `/pkgs/by-name/...`
  - Add an entry to the URL templates in `updater/updateInfo.json`
- - Add it to `default.nix`
+ - Add it to the table at the top ("IDE packages")
 
 ### TODO:
  - get rid of remaining `overrideAttrs` in IDE drvs:
diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
index 41f9f5b8ddd1..67c1d746eebc 100644
--- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json
+++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json
@@ -23,14 +23,6 @@
       "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg"
     }
   },
-  "gateway": {
-    "channel": "GW-RELEASE-licensing-RELEASE",
-    "urls": {
-      "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg"
-    }
-  },
   "goland": {
     "channel": "GO-RELEASE-licensing-RELEASE",
     "urls": {
@@ -39,7 +31,7 @@
       "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg"
     }
   },
-  "idea": {
+  "intellij-idea": {
     "channel": "IU-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
@@ -47,11 +39,19 @@
       "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg"
     }
   },
-  "idea-oss": {
+  "intellij-dea-oss": {
     "channel": "IU-RELEASE-licensing-RELEASE",
     "urls": {}
   },
-  "mps": {
+  "jetbrains-gateway": {
+    "channel": "GW-RELEASE-licensing-RELEASE",
+    "urls": {
+      "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
+      "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
+      "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg"
+    }
+  },
+  "jetbrains-mps": {
     "channel": "MPS-RELEASE-licensing-RELEASE",
     "urls": {
       "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/by-name/cl/clion/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/clion.nix
rename to pkgs/by-name/cl/clion/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/by-name/da/datagrip/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/datagrip.nix
rename to pkgs/by-name/da/datagrip/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/by-name/da/dataspell/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/dataspell.nix
rename to pkgs/by-name/da/dataspell/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/by-name/go/goland/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/goland.nix
rename to pkgs/by-name/go/goland/package.nix
diff --git a/pkgs/applications/editors/jetbrains/source/idea_maven_artefacts.json b/pkgs/by-name/in/intellij-idea-oss/maven_artefacts.json
similarity index 100%
rename from pkgs/applications/editors/jetbrains/source/idea_maven_artefacts.json
rename to pkgs/by-name/in/intellij-idea-oss/maven_artefacts.json
diff --git a/pkgs/applications/editors/jetbrains/ides/idea-oss.nix b/pkgs/by-name/in/intellij-idea-oss/package.nix
similarity index 97%
rename from pkgs/applications/editors/jetbrains/ides/idea-oss.nix
rename to pkgs/by-name/in/intellij-idea-oss/package.nix
index 70f5da2a517e..8f038f3dd699 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea-oss.nix
+++ b/pkgs/by-name/in/intellij-idea-oss/package.nix
@@ -18,7 +18,7 @@ let
     androidHash = "sha256-uvoDTv/7RlyxRp1d9v2tN9IJkv9d1QEkZpp23hae84k=";
     jpsHash = "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk=";
     restarterHash = "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=";
-    mvnDeps = ../source/idea_maven_artefacts.json;
+    mvnDeps = ./maven_artefacts.json;
     repositories = [
       "repo1.maven.org/maven2"
       "packages.jetbrains.team/maven/p/ij/intellij-dependencies"
@@ -50,7 +50,7 @@ jetbrains.mkJetBrainsProduct {
   # the jdk is bundled on Darwin.
   jdk = if lib.meta.availableOn stdenv.hostPlatform jetbrains.jdk then jetbrains.jdk else null;
 
-  pname = "idea-oss";
+  pname = "intellij-idea-oss";
 
   wmClass = "jetbrains-idea-ce";
   product = "IntelliJ IDEA Open Source";
diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/by-name/in/intellij-idea/package.nix
similarity index 98%
rename from pkgs/applications/editors/jetbrains/ides/idea.nix
rename to pkgs/by-name/in/intellij-idea/package.nix
index de0ecd11c74c..21ddf6d8b2ab 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/by-name/in/intellij-idea/package.nix
@@ -34,7 +34,7 @@ in
 jetbrains.mkJetBrainsProduct {
   inherit jetbrains-libdbm fsnotifier;
 
-  pname = "idea";
+  pname = "intellij-idea";
 
   wmClass = "jetbrains-idea";
   product = "IntelliJ IDEA";
diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/by-name/je/jetbrains-gateway/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/gateway.nix
rename to pkgs/by-name/je/jetbrains-gateway/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/by-name/je/jetbrains-mps/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/mps.nix
rename to pkgs/by-name/je/jetbrains-mps/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/by-name/ph/phpstorm/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/phpstorm.nix
rename to pkgs/by-name/ph/phpstorm/package.nix
diff --git a/pkgs/applications/editors/jetbrains/source/pycharm_maven_artefacts.json b/pkgs/by-name/py/pycharm-oss/maven_artefacts.json
similarity index 100%
rename from pkgs/applications/editors/jetbrains/source/pycharm_maven_artefacts.json
rename to pkgs/by-name/py/pycharm-oss/maven_artefacts.json
diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix b/pkgs/by-name/py/pycharm-oss/package.nix
similarity index 98%
rename from pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix
rename to pkgs/by-name/py/pycharm-oss/package.nix
index bb7cc1b93f0b..798f9a24069f 100644
--- a/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix
+++ b/pkgs/by-name/py/pycharm-oss/package.nix
@@ -17,7 +17,7 @@ let
     androidHash = "sha256-FA/6ry1M7+RISJL+2SR9QkDvAGJAkXhFMh9YoOEU5nk=";
     jpsHash = "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk=";
     restarterHash = "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=";
-    mvnDeps = ../source/pycharm_maven_artefacts.json;
+    mvnDeps = ./maven_artefacts.json;
     repositories = [
       "repo1.maven.org/maven2"
       "packages.jetbrains.team/maven/p/ij/intellij-dependencies"
diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/by-name/py/pycharm/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/pycharm.nix
rename to pkgs/by-name/py/pycharm/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/by-name/ri/rider/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/rider.nix
rename to pkgs/by-name/ri/rider/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/by-name/ru/ruby-mine/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
rename to pkgs/by-name/ru/ruby-mine/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/by-name/ru/rust-rover/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/rust-rover.nix
rename to pkgs/by-name/ru/rust-rover/package.nix
diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/by-name/we/webstorm/package.nix
similarity index 100%
rename from pkgs/applications/editors/jetbrains/ides/webstorm.nix
rename to pkgs/by-name/we/webstorm/package.nix

From a1e1d94d1cc00a63fbd882faf8db2b869a338f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20K=C3=B6pcke?= <hello@capypara.de>
Date: Tue, 11 Aug 2026 08:32:12 +0200
Subject: [PATCH 101/120] jetbrains.*: updater: update for by-name migration

---
 .../updater/jetbrains_nix_updater/config.py   |  2 +
 .../updater/jetbrains_nix_updater/ides.py     | 48 ++++++++-----------
 .../jetbrains_nix_updater/update_src.py       | 20 ++++----
 .../updater/jetbrains_nix_updater/util.py     |  5 ++
 .../editors/jetbrains/updater/main.py         |  7 ++-
 5 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py
index d2c202c13fcf..0b12e261742b 100644
--- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py
+++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py
@@ -24,6 +24,7 @@ class UpdaterConfig:
     no_bin: bool
     no_src: bool
     no_maven_deps: bool
+    dry_run: bool
 
     def __init__(self, argparse_result):
         self.nixpkgs_root = (
@@ -47,3 +48,4 @@ class UpdaterConfig:
         self.no_bin = argparse_result.no_bin
         self.no_src = argparse_result.no_src
         self.no_maven_deps = argparse_result.no_maven_deps
+        self.dry_run = argparse_result.dry_run
diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py
index bbe68b3a7d2f..4abfdde4c8d4 100644
--- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py
+++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py
@@ -22,43 +22,33 @@ class Ide:
     update_info: UpdateInfo | None
 
 
-def is_source_ide(drv_path: Path):
-    assert " " not in str(drv_path)
-    try:
-        return (
-            run_command(
-                [
-                    "nix-instantiate",
-                    "--eval",
-                    "-E",
-                    f'builtins.hasAttr "mkJetBrainsSource" (builtins.functionArgs (import {drv_path}))',
-                ]
-            )
-            == "true"
-        )
-    except CalledProcessError as ex:
-        print(f"Failed to eval {drv_path}: {ex.stderr}", file=sys.stderr)
-        exit(1)
+def by_name_path(ide_name: str, nixpkgs_root: Path) -> Path:
+    by_name_stem = ide_name[0:2]
+    return nixpkgs_root / "pkgs" / "by-name" / by_name_stem / ide_name
 
 
-def get_single_ide(update_info: dict[str, UpdateInfo], jb_root: Path, name: str) -> Ide:
-    drv_path = jb_root / "ides" / f"{name}.nix"
+def is_source_ide(ide_name: str):
+    return ide_name.endswith("-oss")
+
+
+def get_single_ide(update_info: dict[str, UpdateInfo], nixpkgs_root: Path, name: str) -> Ide:
+    drv_path = by_name_path(name, nixpkgs_root) / "package.nix"
     if not drv_path.exists():
         raise Exception(f"IDE not found at {drv_path}")
     return Ide(
         name=name,
         drv_path=drv_path,
-        is_source=is_source_ide(drv_path),
+        is_source=is_source_ide(name),
         update_info=update_info.get(name),
     )
 
 
-def get_all_ides(update_info: dict[str, UpdateInfo], jb_root: Path) -> Iterable[Ide]:
-    for file in sorted((jb_root / "ides").iterdir()):
-        if file.suffix == ".nix":
-            yield Ide(
-                name=file.stem,
-                drv_path=file,
-                is_source=is_source_ide(file),
-                update_info=update_info.get(file.stem),
-            )
+def get_all_ides(update_info: dict[str, UpdateInfo], nixpkgs_root: Path) -> Iterable[Ide]:
+    for name, update_info in update_info.items():
+        drv_path = by_name_path(name, nixpkgs_root) / "package.nix"
+        yield Ide(
+            name=name,
+            drv_path=drv_path,
+            is_source=is_source_ide(name),
+            update_info=update_info,
+        )
diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py
index f761a51034a3..205f9d5d8c6d 100644
--- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py
+++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py
@@ -1,3 +1,4 @@
+import os.path
 import sys
 
 import json
@@ -8,7 +9,7 @@ from subprocess import CalledProcessError
 
 from jetbrains_nix_updater.config import UpdaterConfig
 from jetbrains_nix_updater.fetcher import VersionInfo
-from jetbrains_nix_updater.ides import Ide
+from jetbrains_nix_updater.ides import Ide, by_name_path
 from jetbrains_nix_updater.update_src_maven import (
     get_maven_deps_for_ide,
     ensure_is_list,
@@ -148,10 +149,6 @@ def generate_jps_hash(config: UpdaterConfig, root_path: Path) -> str:
     )
 
 
-def maven_out_path(jb_root: Path, name: str) -> Path:
-    return jb_root / "source" / f"{name}_maven_artefacts.json"
-
-
 def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig) -> bool:
     variant = ide.name.removesuffix("-oss")
     try:
@@ -194,7 +191,7 @@ def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig) -> bool:
                         androidHash = "{android_hash}";
                         jpsHash = "{jps_hash}";
                         restarterHash = "{restarter_hash}";
-                        mvnDeps = ../source/{variant}_maven_artefacts.json;
+                        mvnDeps = ./maven_artefacts.json;
                         repositories = [
                             {repositories_nix}
                         ];
@@ -213,7 +210,12 @@ def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig) -> bool:
     if not config.no_maven_deps:
         print("[*] Collecting maven hashes")
         maven_hashes = get_maven_deps_for_ide(config, ide)
-        with open(maven_out_path(config.jetbrains_root, variant), "w") as f:
-            json.dump(maven_hashes, f, indent=4)
-            f.write("\n")
+        maven_out_path = by_name_path(ide.name, config.nixpkgs_root) / "maven_artefacts.json"
+        if config.dry_run:
+            assert maven_out_path.parent.exists()
+            print(f"[D] --dry-run: {maven_out_path} not modified", file=sys.stderr)
+        else:
+            with open(maven_out_path, "w") as f:
+                json.dump(maven_hashes, f, indent=4)
+                f.write("\n")
     return True
diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py
index 69a23a5a7263..c3bdcc226dcd 100644
--- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py
+++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py
@@ -1,3 +1,4 @@
+import sys
 from typing import Iterable
 
 import subprocess
@@ -45,6 +46,10 @@ def replace_blocks(
     with open(file, "r") as f:
         lines = f.readlines()
 
+    if config.dry_run:
+        print(f"[D] --dry-run: {file} not modified", file=sys.stderr)
+        return
+
     for name, block in blocks:
         old_lines = lines
         lines = []
diff --git a/pkgs/applications/editors/jetbrains/updater/main.py b/pkgs/applications/editors/jetbrains/updater/main.py
index 7a0ca904d396..4d8a0a9cd7ef 100755
--- a/pkgs/applications/editors/jetbrains/updater/main.py
+++ b/pkgs/applications/editors/jetbrains/updater/main.py
@@ -34,6 +34,9 @@ def main():
         action="store_true",
         help="do not update maven dependencies for source IDEs",
     )
+    parser.add_argument(
+        "--dry-run", action="store_true", help="do not change any files"
+    )
     parser.add_argument(
         "--old-version",
         type=str,
@@ -50,9 +53,9 @@ def main():
     version_fetcher = VersionFetcher()
 
     ides_to_run_for = (
-        [get_single_ide(update_info, config.jetbrains_root, config.ide)]
+        [get_single_ide(update_info, config.nixpkgs_root, config.ide)]
         if config.ide is not None
-        else list(get_all_ides(update_info, config.jetbrains_root))
+        else list(get_all_ides(update_info, config.nixpkgs_root))
     )
 
     print(f"[.] found IDEs to update: {', '.join(ide.name for ide in ides_to_run_for)}")

From 6edfbffddbc03aa2ff9471991d0de297b42af1dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 13:49:38 +0000
Subject: [PATCH 102/120] neatvnc: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
index a04d3e9cda22..f66c8092d7f8 100644
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neatvnc";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = "neatvnc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZQdx3NvoFh+lubF1tglYBeEBb4XpD5I1mN3ufibD+uA=";
+    hash = "sha256-nXb8ETCWjpRgpDmgJxLdjJun2S6xXGgbOslJleHi/Do=";
   };
 
   strictDeps = true;

From ef0dcabe30f61015d7a19e8a380d038b3dcccfca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 13:56:58 +0000
Subject: [PATCH 103/120] manifold: 3.5.3 -> 3.5.4

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

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index fb002a3f0ec6..8c7a9e98d4c1 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "manifold";
-  version = "3.5.3";
+  version = "3.5.4";
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-slJDQ1yiveQiLeLAbsToWfRvRkPHNjUpCbVjTB0YR+4=";
+    hash = "sha256-O9ciIM5so9WiooNw3BfLTg6u7KPTV0vTbWVec/y0crQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From c0f05ce4c09845b3ec1457aa80391398af6cf595 Mon Sep 17 00:00:00 2001
From: Austin Eschweiler <austin.eschweiler@gmail.com>
Date: Fri, 25 Sep 2026 08:57:03 -0500
Subject: [PATCH 104/120] immich-kiosk: 0.42.0 -> 0.44.1

---
 pkgs/by-name/im/immich-kiosk/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix
index 60df98bad5f6..388f23a3aaca 100644
--- a/pkgs/by-name/im/immich-kiosk/package.nix
+++ b/pkgs/by-name/im/immich-kiosk/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo127Module,
   fetchFromGitHub,
   nodejs,
   fetchNpmDeps,
@@ -8,30 +8,30 @@
   go-task,
 }:
 
-buildGoModule rec {
+buildGo127Module rec {
   pname = "immich-kiosk";
-  version = "0.42.0";
+  version = "0.44.1";
 
   src = fetchFromGitHub {
     owner = "damongolding";
     repo = "immich-kiosk";
     tag = "v${version}";
-    hash = "sha256-NgNVTVU7WlOBiaLXviTUYAq3PSLQuCKICP3rO/2U61Y=";
+    hash = "sha256-IJPJ5c6mlsvx3gDkzk3okTxWJENDv5Rsok3vO+rrwvI=";
   };
 
   postPatch = ''
     # Delete vendor directory to regenerate it consistently across platforms
     rm -rf vendor
     # immich-kiosk bumps go at a faster cadence than nixpkgs
-    sed -i -E 's/^go 1\.26\.[0-9]+$/go 1.26/' go.mod
+    sed -i -E 's/^go 1\.27\.[0-9]+$/go 1.27/' go.mod
   '';
-  vendorHash = "sha256-E+IS0/GxTpasiyKBj6oN9Jb3R4fzXZJ4v8bVkxlHWIk=";
+  vendorHash = "sha256-pAixcJ577ioezOn1qiSFCUYcMiOgNy+S2ZKT9wNy2Yg=";
   proxyVendor = true;
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/frontend";
-    hash = "sha256-Tebhu7qdn7DHTwEBeN2htZJuhYfPE15NyUskIxrfqls=";
+    hash = "sha256-mhqhc+imdMb/w1U3cZS55P3WEWKxPvfTe4CHPZSVoOs=";
   };
   # Frontend is in a subdirectory
   npmRoot = "frontend";

From a93b717637ea2fcd646fb1963de93a4e1cc27ef2 Mon Sep 17 00:00:00 2001
From: Merikei <73759842+Merikei@users.noreply.github.com>
Date: Fri, 27 Mar 2026 17:45:39 +0000
Subject: [PATCH 105/120] =?UTF-8?q?inkscape-extensions.applytransforms:=20?=
 =?UTF-8?q?0-unstable-2021-05-11=20=E2=86=92=200-unstable-2024-12-19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/Klowner/inkscape-applytransforms/compare/5b3ed4af0fb66e399e686fc2b649b56db84f6042...979f98dfe199d25ceecff68a86684b941e703e18
---
 .../inkscape/extensions/applytransforms/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
index 7902306d7b57..552380d664a5 100644
--- a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation {
   pname = "inkscape-applytransforms";
-  version = "0-unstable-2021-05-11";
+  version = "0-unstable-2024-12-19";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Klowner";
     repo = "inkscape-applytransforms";
-    rev = "5b3ed4af0fb66e399e686fc2b649b56db84f6042";
-    hash = "sha256-XWwkuw+Um/cflRWjIeIgQUxJLrk2DLDmx7K+pMWvIlI=";
+    rev = "979f98dfe199d25ceecff68a86684b941e703e18";
+    hash = "sha256-vRhNsHx5QkJPQgeToh4GRKD7EpMwLnN8QhrAP0WWTjU=";
   };
 
   nativeCheckInputs = [

From d651009a6cab5b336af1f95b845c92524f85cda9 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Fri, 25 Sep 2026 10:19:02 -0400
Subject: [PATCH 106/120] navidrome: 0.64.1 -> 0.64.2

changelog: https://github.com/navidrome/navidrome/releases/tag/v0.64.2
---
 pkgs/by-name/na/navidrome/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index ce5653b2e7b1..47095b0a9066 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -20,16 +20,16 @@
 
 buildGo127Module (finalAttrs: {
   pname = "navidrome";
-  version = "0.64.1";
+  version = "0.64.2";
 
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zjg5JwpzcDe8LFvF/soE4IrsdpkNpO7psAoQrHlKCVI=";
+    hash = "sha256-6667wi23YSPdF/LL5k7VmYEAM5rxQYjqlvAtg5vJzj4=";
   };
 
-  vendorHash = "sha256-vndJx4BcXQCJewKCv3TvSrxG6sCykfBvkOQK/kVQIPk=";
+  vendorHash = "sha256-/3NhF/OHDxWrciN5GdROiO1yhjjdm5F5ntW7h6tzFGc=";
 
   npmRoot = "ui";
 

From 51bb03ed0a756d3a9c7e1d20c331239f8f1dde74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 14:22:56 +0000
Subject: [PATCH 107/120] zashboard: 3.26.0 -> 3.29.1

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

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index a2acf3f9015e..ed8550592dac 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "zashboard";
-  version = "3.26.0";
+  version = "3.29.1";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-28TPqsg294XUvKnOIUru9ReQQ78II4B0HuaI581XT4I=";
+    hash = "sha256-qV2ohqYErfhnKvPhmeuVb54QHz0FTwbUGRyT2Xhyj+o=";
   };
 
   npmDeps = null;
@@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-W+aEqsrkqQPhWXBM911ztP9JgnFswPHLesf0yIpGATo=";
+    hash = "sha256-rnEAOpiO5Q2MlP7qoEORmbxRJYsbf7LonRzb7a1CeGQ=";
   };
 
   nativeBuildInputs = [ pnpm ];

From affa9f4181a3c4de9fb96ee0709bbf3c1927c595 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 14:23:23 +0000
Subject: [PATCH 108/120] porxie: 0.3.4 -> 0.3.5

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

diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix
index 782bb71f1c59..faf99855690c 100644
--- a/pkgs/by-name/po/porxie/package.nix
+++ b/pkgs/by-name/po/porxie/package.nix
@@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "porxie";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromCodeberg {
     owner = "Blooym";
     repo = "porxie";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jj8NLmaYVVBNpojq3cTuNXYEgBAxQ6wcPH2sLSB5cbo=";
+    hash = "sha256-q1nb4JVmqGQ2HcjoQBZTymKmWInS80EFxrSo2IzwqVc=";
   };
-  cargoHash = "sha256-ZXNbZtqMayiVc7BOmmeRyN/Z5pKJRHJmgclaCLyVhYc=";
+  cargoHash = "sha256-WrxG3GaAwVb/2Za+ExSt12POSGZUyPfXZAgPYyZb6rA=";
 
   buildInputs = [ rust-jemalloc-sys ];
 

From 78d38f3929749faa168a99eb008a0f7e600eaae2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 14:30:37 +0000
Subject: [PATCH 109/120] python3Packages.victron-mqtt: 2026.9.5 -> 2026.9.10

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

diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index a12b906e5240..4ba6a242c886 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.9.5";
+  version = "2026.9.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GOWQbWzGfvQ373ozyxRMAKpceB9x4V73iSu735M/tp0=";
+    hash = "sha256-6pXfKH8tUZgKweSAREzdyzNTCGaEngHiOrZ/N8lxfKk=";
   };
 
   build-system = [

From 917c91fbf5f298669bbced83d0368d3eb1a210cd Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 25 Sep 2026 16:10:01 +0100
Subject: [PATCH 110/120] immich-cli: enable __structuredAttrs and strictDeps

---
 pkgs/by-name/im/immich-cli/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index a719db4480ea..3213aa412cf0 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -4,6 +4,7 @@
   jq,
   nodejs,
   makeWrapper,
+  runtimeShellPackage,
   stdenv,
   versionCheckHook,
   pnpmConfigHook,
@@ -12,6 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "immich-cli";
   inherit (immich) version src pnpmDeps;
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   nativeBuildInputs = [
     jq
     makeWrapper
@@ -20,6 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
     immich.pnpm
   ];
 
+  buildInputs = [
+    runtimeShellPackage
+  ];
+
   buildPhase = ''
     runHook preBuild
 

From fd188c7891a85684665388879f5d6db62ae63163 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 25 Sep 2026 16:10:29 +0100
Subject: [PATCH 111/120] immich-machine-learning: enable __structuredAttrs

---
 pkgs/by-name/im/immich-machine-learning/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index 4241d2c79460..d2cd023d0a81 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -16,6 +16,8 @@ python.pkgs.buildPythonApplication rec {
   src = "${immich.src}/machine-learning";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   pythonRelaxDeps = [
     "onnx"
   ];

From 885c7ab6581f0c3f31c7d8d42f901acf3c70ae20 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 25 Sep 2026 16:11:13 +0100
Subject: [PATCH 112/120] immich: enable __structuredAttrs and strictDeps

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

diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index ff0c14592a5a..13a0e5f955da 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -33,6 +33,7 @@
   pango,
   perl,
   pixman,
+  runtimeShellPackage,
   vips,
   buildPackages,
 }:
@@ -111,6 +112,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
   version = "3.2.2";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
@@ -157,6 +161,8 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     # Required for sharp
     vips
+    # Required for some packages in node_modules
+    runtimeShellPackage
   ];
 
   env.SHARP_FORCE_GLOBAL_LIBVIPS = 1;

From 07f0d85e7d8ecdcc448b9aff2ec0d310a4591af2 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Sat, 26 Sep 2026 00:07:40 +0800
Subject: [PATCH 113/120] python3Packages.mlx-metal: add missing license

---
 pkgs/development/python-modules/mlx/metal.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mlx/metal.nix b/pkgs/development/python-modules/mlx/metal.nix
index 80fadb9db1ac..8c53acb0fc6b 100644
--- a/pkgs/development/python-modules/mlx/metal.nix
+++ b/pkgs/development/python-modules/mlx/metal.nix
@@ -38,7 +38,10 @@ buildPythonPackage rec {
     description = "Prebuilt Metal runtime for MLX";
     homepage = "https://github.com/ml-explore/mlx";
     changelog = "https://github.com/ml-explore/mlx/releases/tag/v${version}";
-    license = lib.licenses.mit;
+    license = with lib.licenses; [
+      mit
+      asl20 # Bundled metal-cpp headers
+    ];
     maintainers = with lib.maintainers; [
       booxter
       kinnrai

From 47bdbbda4fb1ea123feb4cc36c623f9a05ec2a69 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Sat, 26 Sep 2026 00:09:49 +0800
Subject: [PATCH 114/120] python3Packages.mlx-bin: symlink mlx-metal include
 and share directories

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

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index 6f95e064d93b..8e48a1411eea 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -53,10 +53,10 @@ buildPythonPackage (finalAttrs: {
     [ mlx-metal ];
 
   postInstall = ''
-    # The Python wheel expects libmlx.dylib and mlx.metallib to live under
-    # mlx/lib next to the extension module, but those files are shipped by the
-    # separate mlx-metal wheel.
+    # Nix installs the wheels separately, but MLX expects their files in the same package directory.
     ln -s ${mlx-metal}/${python.sitePackages}/mlx/lib $out/${python.sitePackages}/mlx/lib
+    ln -s ${mlx-metal}/${python.sitePackages}/mlx/include $out/${python.sitePackages}/mlx/include
+    ln -s ${mlx-metal}/${python.sitePackages}/mlx/share $out/${python.sitePackages}/mlx/share
   '';
 
   pythonImportsCheck = [ "mlx" ];

From d347ac79db8d907323f376858a93a00c96b5cfb8 Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Tue, 22 Sep 2026 14:26:19 +0000
Subject: [PATCH 115/120] git-bug: 0.10.1 -> 0.11.0

https://github.com/git-bug/git-bug/releases/tag/v0.11.0
---
 pkgs/by-name/gi/git-bug/package.nix | 94 ++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/gi/git-bug/package.nix b/pkgs/by-name/gi/git-bug/package.nix
index a426932eb317..6488329ca83b 100644
--- a/pkgs/by-name/gi/git-bug/package.nix
+++ b/pkgs/by-name/gi/git-bug/package.nix
@@ -1,30 +1,103 @@
 {
   lib,
   buildGoModule,
+  stdenvNoCC,
   fetchFromGitHub,
   gitMinimal,
   installShellFiles,
+  pnpm_10,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  fetchPnpmDeps,
+  nodejs,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildGoModule (finalAttrs: {
   pname = "git-bug";
-  version = "0.10.1";
+  version = "0.11.0";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "git-bug";
     repo = "git-bug";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-iLYhVv6QMZStuNtxvvIylFSVb1zLfC58NU2QJChFfug=";
+    hash = "sha256-lyQy6P929SQcmXZ1GI+5MtXoYD0b0xr69X9/y+1xCUs=";
   };
 
-  vendorHash = "sha256-qztAkP+CHhryhfv1uKHEpDutofMwHGun7Vr30BHWAOE=";
+  webui = stdenvNoCC.mkDerivation {
+    inherit (finalAttrs) version src;
+    pname = "${finalAttrs.pname}-webui";
 
-  nativeBuildInputs = [ installShellFiles ];
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs)
+        pname
+        version
+        src
+        ;
+      inherit pnpm;
+
+      sourceRoot = "${finalAttrs.src.name}/webui";
+      fetcherVersion = 4;
+      hash = "sha256-CQC+VWv9HwEiDQlS7t03k8zkqQLMGG7sX8qL3boFlhQ=";
+    };
+
+    nativeBuildInputs = [
+      pnpm
+      nodejs
+      pnpmConfigHook
+      pnpmBuildHook
+    ];
+
+    pnpmRoot = "webui";
+
+    installPhase = ''
+      runHook preInstall
+
+      cp -r webui/ $out
+
+      runHook postInstall
+    '';
+  };
+
+  vendorHash = "sha256-TwAgpdlitF3O68wA+jyagifrLSRG7WCCZvJ1XJjP/pI=";
+
+  overrideModAttrs = _: {
+    # prevent `go mod vendor` from finding Go stuff in webui's node_modules
+    preBuild = "";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
 
   nativeCheckInputs = [
     gitMinimal
   ];
 
+  excludedPackages = [
+    "./webui/node_modules"
+    "cmd"
+    "doc"
+    "completion"
+  ];
+
+  tags = [
+    "webui"
+  ];
+
+  ldflags = [
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  preBuild = ''
+    rm -rf webui
+    cp -r ${finalAttrs.webui} webui
+    CC="$CC_FOR_BUILD" LD="$CC_FOR_BUILD" GOOS= GOARCH= go generate
+  '';
+
   checkFlags =
     let
       integrationTests = [
@@ -40,16 +113,7 @@ buildGoModule (finalAttrs: {
       "-skip=^${lib.concatStringsSep "$|^" integrationTests}$"
     ];
 
-  excludedPackages = [
-    "doc"
-    "misc"
-  ];
-
-  ldflags = [
-    "-X github.com/git-bug/git-bug/commands.GitCommit=v${finalAttrs.version}"
-    "-X github.com/git-bug/git-bug/commands.GitLastTag=${finalAttrs.version}"
-    "-X github.com/git-bug/git-bug/commands.GitExactTag=${finalAttrs.version}"
-  ];
+  __darwinAllowLocalNetworking = true;
 
   postInstall = ''
     installShellCompletion \

From 22eff44fd844dccc8be0126a396e2eff5e28961c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 16:26:29 +0000
Subject: [PATCH 116/120] python3Packages.victron-vrm: 0.1.12 -> 0.1.13

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

diff --git a/pkgs/development/python-modules/victron-vrm/default.nix b/pkgs/development/python-modules/victron-vrm/default.nix
index 737df70ea7b9..a3c30070d344 100644
--- a/pkgs/development/python-modules/victron-vrm/default.nix
+++ b/pkgs/development/python-modules/victron-vrm/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "victron-vrm";
-  version = "0.1.12";
+  version = "0.1.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KSoft-Si";
     repo = "vrm-client";
     tag = "v${version}";
-    hash = "sha256-In4yL5e6DZkP/8JeM1FhoMuhsqQ6uZE3fFLyfnLzgZQ=";
+    hash = "sha256-bkQeIlTXy0970+tw7BRK8tllaCulOlsbEmMWa8jR2S8=";
   };
 
   build-system = [ hatchling ];

From 9c6dcc005d0ead1b4f3d8249f1c282d01baf410b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 26 Aug 2026 11:47:37 +0200
Subject: [PATCH 117/120] cups-bjnp: set license to gpl2Only

source: https://sourceforge.net/p/cups-bjnp/code/HEAD/tree/trunk/COPYING
---
 pkgs/by-name/cu/cups-bjnp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cu/cups-bjnp/package.nix b/pkgs/by-name/cu/cups-bjnp/package.nix
index 6a751adf7fdd..7ec11010d588 100644
--- a/pkgs/by-name/cu/cups-bjnp/package.nix
+++ b/pkgs/by-name/cu/cups-bjnp/package.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "http://cups-bjnp.sourceforge.net";
     platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
   };
 })

From 2437d8ff7a1c7ad734886df841ec18e96695b977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 15:59:36 +0000
Subject: [PATCH 118/120] chirp: 0.4.0-unstable-2026-05-18 ->
 0.4.0-unstable-2026-09-25

---
 pkgs/by-name/ch/chirp/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 2720445f0630..82b630badff7 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -7,18 +7,19 @@
   python3Packages,
   unstableGitUpdater,
   wrapGAppsHook3,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2026-05-18";
+  version = "0.4.0-unstable-2026-09-25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "36add258760361a7922c80e919d598cefa414f3c";
-    hash = "sha256-Kjpradtp0sEWjAzoXvhiVJ9eY0TliGSOvdHFAKcDm9Q=";
+    rev = "67f5e10f229769023f83c707b8152355b6d90819";
+    hash = "sha256-g4otWAm8E+9/CZjO/tuUm2oH+LU00wGsaDfaCwS9egw=";
   };
 
   nativeBuildInputs = [
@@ -48,6 +49,7 @@ python3Packages.buildPythonApplication {
     pytest-xdist
     ddt
     pyyaml
+    writableTmpDirAsHomeHook
   ];
 
   postPatch = ''
@@ -59,10 +61,6 @@ python3Packages.buildPythonApplication {
     make -C chirp/locale
   '';
 
-  preCheck = ''
-    export HOME="$TMPDIR"
-  '';
-
   # many upstream test failures
   doCheck = false;
 

From 2a0e6aa44020b3d1e0a0423271b19a8901db57a6 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Fri, 25 Sep 2026 14:23:24 +0100
Subject: [PATCH 119/120] maintainer-list: Update maintainer list for @shymega

- Add email, matrix ID, and GPG keys.

Assisted-by: Claude <noreply@anthropic.com>
---
 maintainers/maintainer-list.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2c763bbf13a4..62396a9fb848 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26777,6 +26777,9 @@
     name = "Dom Rodriguez";
     github = "shymega";
     githubId = 1334592;
+    email = "shymega@shymega.org.uk";
+    matrix = "@dom:rodriguez.org.uk";
+    keys = [ { fingerprint = "EB0D 45E6 D0DC 1BA1 A2B5  FC24 72DC F123 1E54 BD43"; } ];
   };
   siddarthkay = {
     email = "siddarthkay@gmail.com";

From 79b4a3dc4da624d7632c981b321b7a374706df9b Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Sat, 26 Sep 2026 01:22:28 +0800
Subject: [PATCH 120/120] python3Packages.mlx{,-bin}: exclude callPackage
 helpers from tests

---
 pkgs/development/python-modules/mlx/bin.nix     | 11 ++++++-----
 pkgs/development/python-modules/mlx/default.nix |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/mlx/bin.nix b/pkgs/development/python-modules/mlx/bin.nix
index 8e48a1411eea..de087cb705ee 100644
--- a/pkgs/development/python-modules/mlx/bin.nix
+++ b/pkgs/development/python-modules/mlx/bin.nix
@@ -74,11 +74,12 @@ buildPythonPackage (finalAttrs: {
     };
   };
 
-  passthru.tests = callPackage ./tests.nix {
-    mlx = finalAttrs.finalPackage;
-    metalSupport = true;
-    src = finalAttrs.passthru.srcs.testSource;
-  };
+  passthru.tests.mlxTest =
+    (callPackage ./tests.nix {
+      mlx = finalAttrs.finalPackage;
+      metalSupport = true;
+      src = finalAttrs.passthru.srcs.testSource;
+    }).mlxTest;
 
   meta = {
     description = "Prebuilt MLX wheel for Apple silicon with Metal runtime";
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index d43d963b347d..ee9a3195b4a8 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -148,10 +148,11 @@ buildPythonPackage (finalAttrs: {
   passthru = {
     inherit gguf-tools;
 
-    tests = callPackage ./tests.nix {
-      mlx = finalAttrs.finalPackage;
-      inherit (finalAttrs) src;
-    };
+    tests.mlxTest =
+      (callPackage ./tests.nix {
+        mlx = finalAttrs.finalPackage;
+        inherit (finalAttrs) src;
+      }).mlxTest;
 
     updateScript = lib.getExe (writeShellApplication {
       name = "mlx-update";