From 4bc0b27427f9da468c40cd91f4ce9bae45faa4a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:41:11 +0000
Subject: [PATCH 001/108] c2fmzq: 0.4.32 -> 0.5.3

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

diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix
index a2453ddfe127..6afaa7b9316b 100644
--- a/pkgs/by-name/c2/c2fmzq/package.nix
+++ b/pkgs/by-name/c2/c2fmzq/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "c2FmZQ";
-  version = "0.4.32";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "c2FmZQ";
     repo = "c2FmZQ";
     rev = "v${version}";
-    hash = "sha256-1FIGA4pmMb4o6H6GmsiSt/UG2PaC6QR3+L9QKhT8sJQ=";
+    hash = "sha256-SBCUOQpV03kZu6nHuwTUd8gyKeK+XAthZ+H7IRYFjdM=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/c2FmZQ";
 
-  vendorHash = "sha256-usMM9YU+xW+6X5W6rCOtXeggK/WCcik0s+4dFAfbozM=";
+  vendorHash = "sha256-jyos/CNQyuatq4KL2nqCPtRuMQLZMB35VECiKQhq4go=";
 
   subPackages = [
     "c2FmZQ-client"

From d53d8718b026fb3717955b862f3c19192ea3f70e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 18:55:56 +0000
Subject: [PATCH 002/108] seq66: 0.99.21 -> 0.99.22

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

diff --git a/pkgs/by-name/se/seq66/package.nix b/pkgs/by-name/se/seq66/package.nix
index 0d0415ba25cb..7930d46011f7 100644
--- a/pkgs/by-name/se/seq66/package.nix
+++ b/pkgs/by-name/se/seq66/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "seq66";
-  version = "0.99.21";
+  version = "0.99.22";
 
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
     tag = finalAttrs.version;
-    hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg=";
+    hash = "sha256-KtbMRRxKh+BuYujzh8kqKAbSN8xWUz/ktkCHBnTRaPw=";
   };
 
   nativeBuildInputs = [

From b46845b934124bd32d72906dcb2962fba08c896a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:58:39 +0000
Subject: [PATCH 003/108] subtitleedit: 4.0.13 -> 4.0.14

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

diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix
index d39573299161..6799d67969a8 100644
--- a/pkgs/by-name/su/subtitleedit/package.nix
+++ b/pkgs/by-name/su/subtitleedit/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "subtitleedit";
-  version = "4.0.13";
+  version = "4.0.14";
 
   src = fetchzip {
     url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${
       lib.replaceStrings [ "." ] [ "" ] version
     }.zip";
-    hash = "sha256-Oo/w+1cEQ3+Xoa9H9VrGCaLFWFI2ajdj9wn3Pk9WEUk=";
+    hash = "sha256-vaANk5xK8a3SQf5Qacxv3wj3HHtro5LLxZviaIKYkdI=";
     stripRoot = false;
   };
 

From 7ef1fbae1af60263555de18e6c4b90981733a28d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Nov 2025 12:28:44 +0000
Subject: [PATCH 004/108] zabbix-agent2-plugin-postgresql: 7.4.1 -> 7.4.5

---
 pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
index 3d35f3b4cb01..f8aff172e508 100644
--- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
+++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
@@ -6,11 +6,11 @@
 
 buildGoModule rec {
   pname = "zabbix-agent2-plugin-postgresql";
-  version = "7.4.1";
+  version = "7.4.5";
 
   src = fetchurl {
     url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
-    hash = "sha256-8Rlg1A6l6I89YoRHMo3s9MRip0LXe2hqiYBliGqEScg=";
+    hash = "sha256-AeQfPA1o5XmRcY9L6p4ZwOTEaq2h+35QuIHBZhxV/2M=";
   };
 
   vendorHash = null;

From 799c5d677dac549c9093b9555ba2f3d46d65ae65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Nov 2025 17:22:42 +0000
Subject: [PATCH 005/108] alfaview: 9.23.2 -> 9.24.1

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

diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index 8db08d541eb0..648f25324ce1 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alfaview";
-  version = "9.23.2";
+  version = "9.24.1";
 
   src = fetchurl {
     url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
-    hash = "sha256-0EGjm/EYozGXDM/IvmopN04kzJfPM+6wjMpJesyW55U=";
+    hash = "sha256-vRo5ZD3yYTWhR6fbc/HFtBBbYuq3cGbxPuDlSt5D8XM=";
   };
 
   nativeBuildInputs = [

From 6460966c736d197deafec9768911f5ce8cc8b3f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Nov 2025 05:42:52 +0000
Subject: [PATCH 006/108] svu: 3.2.4 -> 3.3.0

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

diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix
index 33a7edcff906..5727df95208c 100644
--- a/pkgs/by-name/sv/svu/package.nix
+++ b/pkgs/by-name/sv/svu/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "svu";
-  version = "3.2.4";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "svu";
     rev = "v${version}";
-    sha256 = "sha256-NzhVEChNsUkzGe1/M8gl1K0SD5nAQ/PrYUxGQKQUAtU=";
+    sha256 = "sha256-3Rj+2ROo9TuWc2aZ8kkGeXH+PHjKva6nD7wlXHY/LQg=";
   };
 
-  vendorHash = "sha256-xhNJsARuZZx9nhmTNDMB51VC0QgjZgOYFKLhLf+3b3A=";
+  vendorHash = "sha256-2QznJ28lp/+f4MIbu4Wi5Kx46B7IIHGYGofY7B1OEjo=";
 
   ldflags = [
     "-s"

From 479fcc9c8dc245f9d540a264c0db517dff0715f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Nov 2025 20:55:27 +0000
Subject: [PATCH 007/108] faas-cli: 0.17.8 -> 0.18.0

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

diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix
index e6ad4718a6ea..b64a727c6c83 100644
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@@ -24,13 +24,13 @@ let
 in
 buildGoModule rec {
   pname = "faas-cli";
-  version = "0.17.8";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = version;
-    sha256 = "sha256-gyd9uX5i5nl7x476SGfBwWUL1hTLsPCCdsmwo783x5Q=";
+    sha256 = "sha256-ggDfHqGu17nSxRNZESBLn8MYrvSU+ItQubNdUCAFK1c=";
   };
 
   vendorHash = null;

From 662777d0bd7b7279876f872784bb59b15c5cb9d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Nov 2025 13:59:47 +0000
Subject: [PATCH 008/108] goimports-reviser: 3.10.0 -> 3.11.0

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

diff --git a/pkgs/by-name/go/goimports-reviser/package.nix b/pkgs/by-name/go/goimports-reviser/package.nix
index 4796f3ab7d44..3b6f1f04ea30 100644
--- a/pkgs/by-name/go/goimports-reviser/package.nix
+++ b/pkgs/by-name/go/goimports-reviser/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "goimports-reviser";
-  version = "3.10.0";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "incu6us";
     repo = "goimports-reviser";
     rev = "v${version}";
-    hash = "sha256-cmWzpZv119RkD4mQ+uLVfcjzddgVrxxtkSm8xvymcDo=";
+    hash = "sha256-5v10DmJovyDyfAlgLuO4uCKRDZGIUxGLHFJRHsGmSm4=";
   };
-  vendorHash = "sha256-BAV7vMWRgBZaL2Pya4QiVcY54VIiHT++Dz4ZZ92FGgM=";
+  vendorHash = "sha256-aTPzvqIwjZzEq9LHFdebIgbKMwsBOqLbpEWB7rN7cYY=";
 
   env.CGO_ENABLED = 0;
 

From 821282d4479b885c1c8a8ed0a7ef68c98176e3af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Nov 2025 14:07:28 +0000
Subject: [PATCH 009/108] kapp: 0.64.2 -> 0.65.0

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

diff --git a/pkgs/by-name/ka/kapp/package.nix b/pkgs/by-name/ka/kapp/package.nix
index cd8d895fd631..6023488c1e3b 100644
--- a/pkgs/by-name/ka/kapp/package.nix
+++ b/pkgs/by-name/ka/kapp/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "kapp";
-  version = "0.64.2";
+  version = "0.65.0";
 
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "kapp";
     rev = "v${version}";
-    hash = "sha256-XIbKhJBGw+0TuRakZCBZ1d6MjNPpy252MgCDpPNEo3c=";
+    hash = "sha256-D46QgNzkCNg0GDsaN1GG0yuWbNeioIErYhbgjwMsTWA=";
   };
 
   vendorHash = null;

From fa8e4b25deca40cae0c32712d9dd924ad5c94997 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Dec 2025 15:04:09 +0000
Subject: [PATCH 010/108] ogen: 1.16.0 -> 1.18.0

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

diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix
index d467070f7ec6..e50aae19a36a 100644
--- a/pkgs/by-name/og/ogen/package.nix
+++ b/pkgs/by-name/og/ogen/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ogen";
-  version = "1.16.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "ogen-go";
     repo = "ogen";
     tag = "v${version}";
-    hash = "sha256-rZO6jdOzdayXnEEWxNE9gKkt0coi8pNfq+LT8JC8LiQ=";
+    hash = "sha256-JGGLh/1n9zG6p2/9BgfeUTKGbVuG2QnyVAdrbVvif4A=";
   };
 
-  vendorHash = "sha256-mL3xw0huTyLz33ja59/mJ+R2+KRIFOfKRUPrk5txJtA=";
+  vendorHash = "sha256-j6WSBIPmSfbz+30wVPIbgzgghzLV0b5BYELJP6FuR/4=";
 
   patches = [ ./modify-version-handling.patch ];
 

From b3d587a34c818325c36688f4c55b2306fc740001 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Dec 2025 20:47:58 +0000
Subject: [PATCH 011/108] kubernetes-kcp: 0.28.3 -> 0.29.0

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

diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix
index a42e8b34e71f..cbc0753c9662 100644
--- a/pkgs/by-name/ku/kubernetes-kcp/package.nix
+++ b/pkgs/by-name/ku/kubernetes-kcp/package.nix
@@ -10,15 +10,15 @@
 
 buildGoModule rec {
   pname = "kubernetes-kcp";
-  version = "0.28.3";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "kcp-dev";
     repo = "kcp";
     tag = "v${version}";
-    hash = "sha256-gZMheiMvAUAV3YqWNA1WmOWpV5hEU7GtQzz57F4rX38=";
+    hash = "sha256-rZLav2JOKzG5vW/wyfk7EIkOawsYOmG32OHXxkyyb3Y=";
   };
-  vendorHash = "sha256-w7mC3CJv/UKQe6jOqwzSZSYIu0K/Z4aNUnAcSg6MwG0=";
+  vendorHash = "sha256-IuQzGme+CZqqD1VMO+rumbbc+ziPQaVJCyJNhMdU3jE=";
 
   subPackages = [ "cmd/kcp" ];
 

From a409ab00a3a1cdfd31dbacf6a355cc41d294b813 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Dec 2025 12:28:59 +0000
Subject: [PATCH 012/108] emptty: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix
index a8b0af3646c0..a816fc579ade 100644
--- a/pkgs/by-name/em/emptty/package.nix
+++ b/pkgs/by-name/em/emptty/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "emptty";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "tvrzna";
     repo = "emptty";
     rev = "v${version}";
-    hash = "sha256-AsIt7EI5RkSchhaMGKofOsfPNROhX8f5gDaqZ7Q2394=";
+    hash = "sha256-7RYzj+LcxK9i2RM8NFfKjz2DiD9CjCTNSJe7wVnYzdM=";
   };
 
   buildInputs = [

From 08dd96289a175ff2b94ef419a8fcdceeddeaac7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Dec 2025 12:43:57 +0000
Subject: [PATCH 013/108] ov: 0.45.1 -> 0.50.2

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

diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index cd534d4a0dbc..3d502d7212fc 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "ov";
-  version = "0.45.1";
+  version = "0.50.2";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "ov";
     tag = "v${version}";
-    hash = "sha256-Ptzlz+9mBKSPmogT4PVnimHw/wsQMQpfPo8MX1AocdM=";
+    hash = "sha256-tmGOyafVocbeEfHQcvysBuX/LJO62xRuclQ6Xy+Q1Gs=";
   };
 
-  vendorHash = "sha256-iAwlD6G+80Ci9pGANqbcmVjoRto7FMBSSDKsI6lpv/k=";
+  vendorHash = "sha256-Y+rNTJoSbTccHVPA/TTQGkkYpYr72WB8gqwzWfqPRH0=";
 
   ldflags = [
     "-s"

From 946a234e8f3948c2b96ccd52ee51e354d4833fa2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Dec 2025 07:15:05 +0000
Subject: [PATCH 014/108] go-camo: 2.7.1 -> 2.7.2

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

diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index bb3b0737c665..56a3b332e9ba 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module rec {
   pname = "go-camo";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "cactus";
     repo = "go-camo";
     tag = "v${version}";
-    hash = "sha256-gAlbSUYa3yxEfPzJQHDzM0XJ/ap93qgMnSTg3irtHMw=";
+    hash = "sha256-LP01sPTHDouUmp6iDxdPklunxYKak2vaL0gJZsO3QRM=";
   };
 
-  vendorHash = "sha256-Qv5DFa4XDJw4e6sLbTUN59bRxMUCMXrPZJmCF7OhumY=";
+  vendorHash = "sha256-lFpVlK5/LSRTxVD5Ve6DSACeyLFTJxDM2bDTxcUU73E=";
 
   nativeBuildInputs = [
     installShellFiles

From 0da358808fa771b104164d1968e984d3d1833a17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Dec 2025 08:06:46 +0000
Subject: [PATCH 015/108] prometheus-elasticsearch-exporter: 1.9.0 -> 1.10.0

---
 .../pr/prometheus-elasticsearch-exporter/package.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
index 79f8dca869b6..5dae704afbf1 100644
--- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "elasticsearch_exporter";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "elasticsearch_exporter";
     rev = "v${version}";
-    hash = "sha256-v6Fi5O/87jhFI1h6qWyWb61X+dTjcqS3Fi9/MPQSr8Y=";
+    hash = "sha256-xVDqyYYwzxfFxZ3K2SMFfPoJw47SXS6czsWLC++LOOk=";
   };
 
-  vendorHash = "sha256-NAaVz5AqhfaEiWqBAeQZVWwjMIwX9jEw0oycXq7uLNw=";
+  vendorHash = "sha256-8y0M1b34eJpuHOuXPemhB5kKwBSgU7cMFxOaIZFS/bo=";
 
   meta = {
     description = "Elasticsearch stats exporter for Prometheus";

From b69ceed2c2dde26b75cab83afb3127fb404a9acf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Dec 2025 00:10:13 +0000
Subject: [PATCH 016/108] circleci-cli: 0.1.33721 -> 0.1.34038

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

diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index dc50037dbad2..4bc18bea9b40 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.33721";
+  version = "0.1.34038";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = "circleci-cli";
     rev = "v${version}";
-    sha256 = "sha256-0ZJZ9xVnk/nUf4NnvFmXcM6FHKoh296hfIbMwnQ9CwA=";
+    sha256 = "sha256-kEhAiTcWY+xXX5jFgJZtle0CEwqRT2BHDEM8iSUFRh4=";
   };
 
   vendorHash = "sha256-QMSciB81khHhjd/4Km1YYyTiEFDF75AcNGsmZTLLO5Q=";

From 46a75b05a4605a193a7f48e859a185a5a272b68e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Dec 2025 20:46:44 +0000
Subject: [PATCH 017/108] badger: 4.8.0 -> 4.9.0

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

diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix
index 684269f6ea96..f649e6233a1e 100644
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "badger";
-  version = "4.8.0";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "badger";
     rev = "v${version}";
-    hash = "sha256-LkJp0ixEJcD0mGeafjFoxjekeyep2nbZPXgVcMEofAU=";
+    hash = "sha256-AmDfG4IOpptdH0/Un4V275UTTUXoV1LNKtbSj3O50rs=";
   };
 
-  vendorHash = "sha256-I7N85gdf4Bm/0zTcdFfbpah9veSpOzZcTvd7Ku5Xqpg=";
+  vendorHash = "sha256-+rXXCVH2xuULPzdM0KVPwYht+tu0qyxPjLLaBMWVIuI=";
 
   subPackages = [ "badger" ];
 

From 29a8c5ac660a0556210e614109f22a10e7849703 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 07:51:48 +0000
Subject: [PATCH 018/108] lsh: 1.5.3 -> 1.5.6

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

diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index 00aafe8060ec..59cd0c92946c 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule rec {
   pname = "lsh";
-  version = "1.5.3";
+  version = "1.5.6";
   src = fetchFromGitHub {
     owner = "latitudesh";
     repo = "lsh";
     rev = "v${version}";
-    sha256 = "sha256-W+0yuBfDjHNMEaf+T0FSVMzRyZgkeXrFwsY47ksDD5U=";
+    sha256 = "sha256-FS0Bv645gmkt5J5mtHtQjee57Qj05NefGFYrRCaqDJw=";
   };
-  vendorHash = "sha256-kOGHLrnpVQe8gy827CeP+1f2fy4WpUfWDfaNq/JmXpU=";
+  vendorHash = "sha256-SvbrrunOkJhIB5AlsCY7WrtE+Na/ExEJmVWqfjHNvx4=";
   subPackages = [ "." ];
   meta = {
     changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}";

From 5ba8378c2ae2d7ef255edfe1af185c3e664cc1db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 20:39:01 +0000
Subject: [PATCH 019/108] confd-calico: 3.31.2 -> 3.31.3

---
 pkgs/applications/networking/cluster/calico/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index 8854fa0e1973..07390f2e637f 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.31.2";
+      version = "3.31.3";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-kbyKWvuK68ObFcOh9oYrY0oabRpzaS8lCuq80US9e3M=";
+        hash = "sha256-w+dStKYbytNekl3HxBAek8kS+FC5Aeu7OEU4SIFLURY=";
       };
 
-      vendorHash = "sha256-vBFL9HOV93PLy0NkA6sIPDpwsRRpnhAQxRK1ggSqGAk=";
+      vendorHash = "sha256-J9X7W7UozsxNlXQwXYeDi++KkyjxwtnYvs4EkUq4Vec=";
 
       inherit doCheck subPackages;
 

From 139107d03f897882488b0c2b6e0adfcf8be6ae0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Dec 2025 05:22:25 +0000
Subject: [PATCH 020/108] cni-plugin-flannel: 1.8.0-flannel2 -> 1.9.0-flannel1

---
 pkgs/tools/networking/flannel/plugin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix
index f8ae18521f80..f49cb8bbced7 100644
--- a/pkgs/tools/networking/flannel/plugin.nix
+++ b/pkgs/tools/networking/flannel/plugin.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cni-plugin-flannel";
-  version = "1.8.0-flannel2";
+  version = "1.9.0-flannel1";
 
   src = fetchFromGitHub {
     owner = "flannel-io";
     repo = "cni-plugin";
     rev = "v${version}";
-    sha256 = "sha256-VZT53yhTqpFcVI45dTLyQFNTnpvDyn1g/2yF2KqUALw=";
+    sha256 = "sha256-skYbIU1uqfEiXDEG5N0QVbMH/8X9MIJRH7XoXq5zA7w=";
   };
 
-  vendorHash = "sha256-4nwUUwkEnhzQ0hTL1WtTnAZA8/kVJ4/Gyg9UZQpNkpc=";
+  vendorHash = "sha256-hn4NT/fXu7bremIpYPSva/Od97LiVuHE7+8jgpLMaRs=";
 
   ldflags = [
     "-s"

From 0631c83f192862bc4a07e93385d4e7bf054aa050 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 11:31:17 +0000
Subject: [PATCH 021/108] rancher: 2.12.3 -> 2.13.1

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

diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index a50370754b71..04eb69d63097 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rancher";
-  version = "2.12.3";
+  version = "2.13.1";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-i+l+vs+uD6h0GruvxhkQtb7DYCJ3uysa/rZ8hGmmu7Y=";
+    hash = "sha256-s7nt3A2VO23hN3EplB2Df3JvIqENwikexJXjOFr5BKo=";
   };
 
   env.CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ buildGoModule rec {
     "-static"
   ];
 
-  vendorHash = "sha256-mObfou6JXQ+ZWvxWMpdcC1ymngFJZ8k9I+rCYCFvDg4=";
+  vendorHash = "sha256-YeWy8JPd1YkLkE56ckvpg4Z35F5U9wcKQC1N+diNQsA=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher

From 59c39ff6f2a5d51ccabf70cfd6ee5cd6570ccc79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Dec 2025 05:27:12 +0000
Subject: [PATCH 022/108] weaviate: 1.33.2 -> 1.35.2

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

diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index 9a0c0d05aa66..56c5a4662e09 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.33.2";
+  version = "1.35.2";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-+QchAvIBJcbrwveeGHXFC+96oD5Uy/+lqMV/vxRPzbk=";
+    hash = "sha256-FDDwC9CnnMhwI9iqEEGwklE7lr9vOOCYCJ8X389gw7U=";
   };
 
-  vendorHash = "sha256-KiDU9fw/4vIhI0XbEzUfw+HhopJniVeGhFVJBbLkixU=";
+  vendorHash = "sha256-xcsVJ1H1S/cszR/t6cHUrW0Wtn/c/PV2RQ04qGdMmD0=";
 
   subPackages = [ "cmd/weaviate-server" ];
 

From fba30296bb4f423836fe360ee08baf027ce1aa16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Jan 2026 02:12:24 +0000
Subject: [PATCH 023/108] dcrwallet: 2.0.6 -> 2.1.3

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

diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix
index d6527bce758f..95b05ed83bc8 100644
--- a/pkgs/by-name/dc/dcrwallet/package.nix
+++ b/pkgs/by-name/dc/dcrwallet/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "dcrwallet";
-  version = "2.0.6";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "decred";
     repo = "dcrwallet";
     rev = "release-v${version}";
-    hash = "sha256-MrQrDip8vE0l5XHkx/zIegSZd/AkWq1aFZLUVPdMy50=";
+    hash = "sha256-oB+E2NVz4zlLUWBhdmyGq2jfsMLuF2OpPkBn7/daxDw=";
   };
 
-  vendorHash = "sha256-Ulh6RxK+PvS70mJ7TYiGMzKFsR79+asWuQ5W1FAI23I=";
+  vendorHash = "sha256-P9u+Pxy/TtArhU/fu2nXg6PyyoCm9GPLVRX6twheERQ=";
 
   subPackages = [ "." ];
 

From 0a52f2355821f231d15a17bd9f7dfcabf5804fa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 12:00:32 +0000
Subject: [PATCH 024/108] papermc: 1.21.10-91 -> 1.21.11-69

---
 pkgs/games/papermc/versions.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 81377f8dccd0..d184271e878a 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -92,7 +92,11 @@
         "version": "1.21.9-59"
     },
     "1.21.10": {
-        "hash": "sha256-9tjYDSWmh8xSoCodBMsl8We7OoqCgnGiY74vRK2pEsw=",
-        "version": "1.21.10-91"
+        "hash": "sha256-dOOibDKgncuyE67CehB0Z3OeJ7EtvoKxo+ekt9BZxzA=",
+        "version": "1.21.10-129"
+    },
+    "1.21.11": {
+        "hash": "sha256-zzdPKvnXHfzHU0Pze3IqerywkcV0ExuV47E8b8LLj64=",
+        "version": "1.21.11-69"
     }
 }

From 1bfe2b2c7f1b069fde91fb77302b1b71521594f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Jan 2026 18:49:00 +0000
Subject: [PATCH 025/108] vault: 1.21.1 -> 1.21.2

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

diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index e96b90849581..08b63e1a92b4 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    hash = "sha256-Vkn3l4blbUhT2D1ParNacVwwt/aDQlm12peoHvPNbk4=";
+    hash = "sha256-G/6GroX9lBaUxB5mkd+hz53nNX/eF5DAtHryin3hzgU=";
   };
 
-  vendorHash = "sha256-8IK8M328dXWk+NHjK7d+Zj8ltLQqJOofvLDfDieDFnk=";
+  vendorHash = "sha256-bJdEQkJnUiPI6MSVAsLCqDSsM4zuT5ORJ93jVC+EEAs=";
 
   proxyVendor = true;
 

From 9966c6ef90ed221be549ab606f3f38b8cf22c7f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 21:16:38 +0000
Subject: [PATCH 026/108] pgroll: 0.14.3 -> 0.16.0

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

diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix
index 6e0e7ecd963c..ebf5992bbf88 100644
--- a/pkgs/by-name/pg/pgroll/package.nix
+++ b/pkgs/by-name/pg/pgroll/package.nix
@@ -9,18 +9,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "pgroll";
-  version = "0.14.3";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "xataio";
     repo = "pgroll";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OqBgFeXpvoImoPMKHBCvsPQGhHSBZuNNMLh2/3DPPYo=";
+    hash = "sha256-xl6mJkJbZ+N/HjrUsknC1UFOM9GFtY4UYnabXvTwkAc=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-rQPWL39AD/qCneuRyJHOQCANmDE7pqmwHx+AavJ/3cw=";
+  vendorHash = "sha256-j78c7pROEiJVsE0e0hxbr+0uqOmGcBsK1U0F1upgWIw=";
 
   excludedPackages = [
     "dev"

From 75a17e38b477b82932162f5d767177e8cfb0c8cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Jan 2026 01:52:46 +0000
Subject: [PATCH 027/108] kics: 2.1.17 -> 2.1.19

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

diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix
index 9d5a86cef969..8ae97a980464 100644
--- a/pkgs/by-name/ki/kics/package.nix
+++ b/pkgs/by-name/ki/kics/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kics";
-  version = "2.1.17";
+  version = "2.1.19";
 
   src = fetchFromGitHub {
     owner = "Checkmarx";
     repo = "kics";
     tag = "v${version}";
-    hash = "sha256-GVzzQaf/UO+RyunTILoee7mgPOSbb2n28GY7FUB/BC0=";
+    hash = "sha256-cgB7qq53QMNm36UH5HZEE15iwcjhaB9A/a1gBGSFQ2M=";
   };
 
-  vendorHash = "sha256-yXnVY3LtyaY8SMRXs+FJOTXa8SxBPJ92Znq/wLWZqzo=";
+  vendorHash = "sha256-TlIrCtnJxB9LI+VT9d+cUcGI1tsuDfWwLiNpa8seK+4=";
 
   subPackages = [ "cmd/console" ];
 

From 90e4675a2fa2bea19696799785167249883d70a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Jan 2026 12:10:43 +0000
Subject: [PATCH 028/108] temporal-ui-server: 2.43.3 -> 2.44.1

---
 pkgs/by-name/te/temporal-ui-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix
index 476ef63696e1..38c2db566da5 100644
--- a/pkgs/by-name/te/temporal-ui-server/package.nix
+++ b/pkgs/by-name/te/temporal-ui-server/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-ui-server";
-  version = "2.43.3";
+  version = "2.44.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "ui-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5JE5t8NHVNz1sO03yAw5eytsr55IACFgJRgbRxhx0Sg=";
+    hash = "sha256-iZmyz6E28TN7ooyWCBBwULUOg2ZF6KYziC4omqOc8jw=";
   };
 
   vendorHash = "sha256-yScJo+GEGO2LIAts5WPzS4YjPHZK9wZtPrfRg1b7H2Q=";

From 87b9b616df853fd46a87d119c998d1db72e47e08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Jan 2026 03:22:03 +0000
Subject: [PATCH 029/108] kyverno: 1.15.2 -> 1.16.2

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

diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index 367aa32026af..05c881e4a79c 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "kyverno";
-  version = "1.15.2";
+  version = "1.16.2";
 
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
     rev = "v${version}";
-    hash = "sha256-Mv01ILbWFLypXGl0zCUVa3kdSZGBQH8fAP3txyUArsE=";
+    hash = "sha256-wXoqE3AZ5PQ8nxkJhfGrNdyJBKW8BF0loqqCs6A2Etg=";
   };
 
   ldflags = [
@@ -27,7 +27,7 @@ buildGoModule rec {
     "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
   ];
 
-  vendorHash = "sha256-2qpZEHbBqGZsIizswJYmdJCjgIBhQsnYyHHIS4ZqZYQ=";
+  vendorHash = "sha256-7zonEXXrd5+QaQQcgHwGwj665YB9gBxtE8Yi09SGsPU=";
 
   subPackages = [ "cmd/cli/kubectl-kyverno" ];
 

From b1b5818610a79bfcd27fa1890d61127c82c3e591 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Jan 2026 02:06:33 +0000
Subject: [PATCH 030/108] okta-aws-cli: 2.5.0 -> 2.5.2

---
 pkgs/by-name/ok/okta-aws-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ok/okta-aws-cli/package.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix
index 52a44c2fb257..227f6430ab90 100644
--- a/pkgs/by-name/ok/okta-aws-cli/package.nix
+++ b/pkgs/by-name/ok/okta-aws-cli/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "okta-aws-cli";
-  version = "2.5.0";
+  version = "2.5.2";
 
   subPackages = [ "cmd/okta-aws-cli" ];
 
@@ -14,7 +14,7 @@ buildGoModule rec {
     owner = "okta";
     repo = "okta-aws-cli";
     rev = "v${version}";
-    sha256 = "sha256-IGecHT/JVKsaHG9OtPTOlu+ZCDbnqf1h3s4SI7+8oT8=";
+    sha256 = "sha256-z+bW/cTy63bGEhF7ug2GUXDB+kbTi4WhUEuHPOu5iw4=";
   };
 
   vendorHash = "sha256-MnK0zCwPOTzsPrkULEYwnmIBmVrPiwK2yDr3tqVHHRY=";

From 271a0f8a2d38f0256db516ed236b8ba17641f3ef Mon Sep 17 00:00:00 2001
From: Qiming Chu <cchuqiming@gmail.com>
Date: Thu, 15 Jan 2026 21:18:04 +0800
Subject: [PATCH 031/108] yosys: fix plugin module flags and update environment
 variable

Yosys's handling of plugins changed considerably since 0.56.
This can fix `withPlugins` on current yosys version.

Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
---
 pkgs/by-name/yo/yosys/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix
index c4e06f4131bc..d100823bfa5c 100644
--- a/pkgs/by-name/yo/yosys/package.nix
+++ b/pkgs/by-name/yo/yosys/package.nix
@@ -62,9 +62,13 @@ let
     plugins:
     let
       paths = lib.closePropagation plugins;
+      libExt = stdenv.hostPlatform.extensions.sharedLibrary;
+      pluginPath = "$out/share/yosys/plugins";
       module_flags =
         with builtins;
-        concatStringsSep " " (map (n: "--add-flags -m --add-flags ${n.plugin}") plugins);
+        concatStringsSep " " (
+          map (n: "--add-flags -m --add-flags ${pluginPath}/${n.plugin}${libExt}") plugins
+        );
     in
     lib.appendToName "with-plugins" (symlinkJoin {
       inherit (yosys) name;
@@ -72,7 +76,7 @@ let
       nativeBuildInputs = [ makeWrapper ];
       postBuild = ''
         wrapProgram $out/bin/yosys \
-          --set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \
+          --set YOSYS_PATH $out/share/yosys \
           ${module_flags}
       '';
       meta.mainProgram = "yosys";

From da5502e12e037dd272ee487589410e0d02e0c208 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Jan 2026 21:38:58 +0000
Subject: [PATCH 032/108] cilium-cli: 0.18.8 -> 0.19.0

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

diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index c151b4b6c290..b169e8ba23fc 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.18.8";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "cilium-cli";
     tag = "v${version}";
-    hash = "sha256-6/ECHhPV9rJHcHFVAvkwtlZi96rjhEe2PjEvXtv8OMY=";
+    hash = "sha256-pW+9UN+pWkKCYRTvZxslrPgczOezVnPpDF5XdRHCh+g=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From ae88820a863e68f7c956c2dbd26edc96e6d82853 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Jan 2026 16:42:00 +0000
Subject: [PATCH 033/108] benthos: 4.57.1 -> 4.63.1

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

diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index ff134c25206c..fcbcf37f12ed 100644
--- a/pkgs/by-name/be/benthos/package.nix
+++ b/pkgs/by-name/be/benthos/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "benthos";
-  version = "4.57.1";
+  version = "4.63.1";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-OiXdeoxaik+ynoLSR/fWieLIhcx5Y/G1fY2aTL2yBFM=";
+    hash = "sha256-dcVPTLzRVhyWEkzXfzQKOv7bfjzsxV7odcdPzLP64bQ=";
   };
 
   proxyVendor = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
     "cmd/benthos"
   ];
 
-  vendorHash = "sha256-g1jqVJfpH2EsTYoXMGp0HiUEqKlprgMYqmzecGWKmoo=";
+  vendorHash = "sha256-WMnhjGgkIG+yz2SgKoibWSPdNbET7NxY87v5WtMDl8I=";
 
   #  doCheck = false;
 

From 7ca15283b959e63956b2ed4d1ad24d500d72b712 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 17:59:33 +0000
Subject: [PATCH 034/108] kargo: 1.8.3 -> 1.8.6

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

diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix
index 5b2bc0273ca5..b0e3a460ae67 100644
--- a/pkgs/by-name/ka/kargo/package.nix
+++ b/pkgs/by-name/ka/kargo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "kargo";
-  version = "1.8.3";
+  version = "1.8.6";
 
   src = fetchFromGitHub {
     owner = "akuity";
     repo = "kargo";
     tag = "v${version}";
-    hash = "sha256-82hXZO8NtAH7eGdIwmfqbxqphVEMVNeCyTrvEKJaCZE=";
+    hash = "sha256-sBUgoR3Eqv2OQRnXR9IaB4QcZ+awJb3ah7ySZ0XsaYA=";
   };
 
-  vendorHash = "sha256-H9iRmQ3Xvy1H7ELl7SyJEidmklG74xAlxRPRoaR5PeI=";
+  vendorHash = "sha256-ZB1Eq8xQ/oF5sm750K9yJyBpwCIcCqmFL8FWpNsiXfo=";
 
   subPackages = [ "cmd/cli" ];
 

From 482308d8aad16277e103b8118127c7e96052a466 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Jan 2026 23:02:49 +0000
Subject: [PATCH 035/108] lilypond-unstable: 2.25.29 -> 2.25.32

---
 pkgs/misc/lilypond/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index f8e7c2ecc1d7..2e81140eb681 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -5,10 +5,10 @@
 }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.29";
+  version = "2.25.32";
   src = fetchzip {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-t6EnGCD0QMARK1/yJBjtLFzVaBWiiut8KWrtzmzHgCM=";
+    hash = "sha256-j7Avb9WSy27yQCak3KV7OB24M+T76b/tLcLoINLSEbo=";
   };
 
   passthru.updateScript = {

From 1dfd76ca94790a2e67864d07acdb2efd02588e52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Jan 2026 04:51:35 +0000
Subject: [PATCH 036/108] whisparr: 2.0.0.1282 -> 2.0.0.2151

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

diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 82ee0911960c..5fcd3f16b94d 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -29,16 +29,16 @@ let
     ."${system}" or (throw "Unsupported system: ${system}");
   hash =
     {
-      arm64-linux-hash = "sha256-AGERhD8EiTkaXw7GWVaWPFVuQkclSarNOGMgs+6zxfI=";
-      arm64-osx-hash = "sha256-AUZoAAEmgrb1A7OKLc7QOliGTgctD9MuM9rqNWQ3ySM=";
-      x64-linux-hash = "sha256-ZRbV1nxAIiHUL8DzmlAJRcFOnl5t8+ur3zXhw29mUfk=";
-      x64-osx-hash = "sha256-WfR0x89wQNAiLYX1Dg5AsEuiqHSX9IhhxEOoVuPjRH8=";
+      arm64-linux-hash = "sha256-hFZ27VAIBDW8c7oP+Nl0rj6T2CRbee8Qxf4CzZJmCL8=";
+      arm64-osx-hash = "sha256-oFqnQnbBGAD4x97FANbY091nJrzHRMewalASwgOul8s=";
+      x64-linux-hash = "sha256-ZRgCJf2GGV1B+QgmYh4OfX7nMfRBdN6pIg5pU6Q/KCQ=";
+      x64-osx-hash = "sha256-H5qLdiL4hEkg5g50zzrv1HdZMc6ji69O5GUrpHWkrdo=";
     }
     ."${arch}-${os}-hash";
 in
 stdenv.mkDerivation rec {
   pname = "whisparr";
-  version = "2.0.0.1282";
+  version = "2.0.0.2151";
 
   src = fetchurl {
     name = "${pname}-${arch}-${os}-${version}.tar.gz";

From 112a95219c16eaf7aa38c33a27b6380d3fae7504 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Jan 2026 07:06:13 +0000
Subject: [PATCH 037/108] cadvisor: 0.53.0 -> 0.56.2

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

diff --git a/pkgs/by-name/ca/cadvisor/package.nix b/pkgs/by-name/ca/cadvisor/package.nix
index 1cad30f2dd69..d7376d2ea78c 100644
--- a/pkgs/by-name/ca/cadvisor/package.nix
+++ b/pkgs/by-name/ca/cadvisor/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "cadvisor";
-  version = "0.53.0";
+  version = "0.56.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    hash = "sha256-caGzjv7XhIst3JZA0ri97XqQOO3mI+hwS8WJmLk9f7g=";
+    hash = "sha256-UBQvFlO0pb5mDUrrUTaEsuQcKX7qKQrAMub2knUZWGA=";
   };
 
   modRoot = "./cmd";
 
-  vendorHash = "sha256-xUhHo/kDnjAQLuaeFG1EouC2FWBnFhj1RawlQX7ggVs=";
+  vendorHash = "sha256-JJulf+Wj/bf3l8l0rufcyLlfqefriOzhxCfGUru6+lA=";
 
   ldflags = [
     "-s"

From 21e907f1a6e378285500bbd26f5acf279b28a2f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Jan 2026 04:08:23 +0000
Subject: [PATCH 038/108] zarf: 0.66.0 -> 0.70.1

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

diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index cd8d17743188..451ff6133805 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.66.0";
+  version = "0.70.1";
 
   src = fetchFromGitHub {
     owner = "zarf-dev";
     repo = "zarf";
     tag = "v${version}";
-    hash = "sha256-IveiGWOLEyxt8Dh/gGRv6eENRIQbroy5jkZk9cj6USE=";
+    hash = "sha256-3ucUB6KAIm4dPf/8CysZVwKbWp9QZIeP435Aclyzhfs=";
   };
 
-  vendorHash = "sha256-rW3CDHGYHmrxOdBNKFvWUvrpRJYaxi5XMzOZqiTxhY0=";
+  vendorHash = "sha256-WjnM9G5Dcn0dawghw6NLGUebIGQ7zJ97nMPL3JgqRKM=";
   proxyVendor = true;
 
   nativeBuildInputs = [

From 42b13817ebd62fc93c17d2ca2e66ee746174efff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Jan 2026 23:23:44 +0000
Subject: [PATCH 039/108] mendeley: 2.138.0 -> 2.142.0

---
 pkgs/applications/office/mendeley/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 1e7bdb69e1dc..2189e70503be 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "mendeley";
-  version = "2.138.0";
+  version = "2.142.0";
 
   executableName = "${pname}-reference-manager";
 
   src = fetchurl {
     url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
-    hash = "sha256-OS5VarPvWC3KUIAFEw2QndiNZ2ryj81MxTp1fkvuobE=";
+    hash = "sha256-Ic19MQRzRLmYL2nVFMBvCbloI0AoCm0MVlWJeV4i+Fs=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 01583c5390c8dd324537bb75abd503bcf9aa7fa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 Jan 2026 02:31:13 +0000
Subject: [PATCH 040/108] clusterctl: 1.11.3 -> 1.12.2

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

diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index 18821557d659..395dac262bfc 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.11.3";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-qORhusO2YrjrM4TP+WmAdhXdP9y5IWJcFQy69HhixNc=";
+    hash = "sha256-AaGJhdBTyCxUK+qm++McS6rFlgAdv/7SjQHvaNRn6YU=";
   };
 
-  vendorHash = "sha256-vRY7/SrhsLzh6sM1zaOLVUUn4DxoatScyRlHjVOPJlY=";
+  vendorHash = "sha256-3dh9Y8R4OeUayyqNyrvUcrnSi/4s9x6oMrAADXR5rnw=";
 
   subPackages = [ "cmd/clusterctl" ];
 

From ad524718501f3fcd2ad76fcc189d7326269f5a1e Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 27 Jan 2026 14:56:13 +0100
Subject: [PATCH 041/108] nixos/yggdrasil: Fix test and replace
 activationScript by systemd service

See https://github.com/NixOS/nixpkgs/issues/475305
---
 .../modules/services/networking/yggdrasil.nix |   5 +-
 nixos/tests/yggdrasil.nix                     | 167 ++++++++++--------
 2 files changed, 93 insertions(+), 79 deletions(-)

diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index 5d2dc2b8cd41..d6331eeb3326 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -49,10 +49,7 @@ let
   cleanSettings = lib.filterAttrs (n: v: v != null) baseSettings;
 
   # Generate configuration file from user settings
-  configFile = pkgs.writeTextFile {
-    name = "yggdrasil.conf";
-    text = builtins.toJSON cleanSettings;
-  };
+  configFile = pkgs.writers.writeJSON "yggdrasil.conf" cleanSettings;
 in
 {
   imports = [
diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix
index 01a9c4cf1d8a..5b0762c7f08f 100644
--- a/nixos/tests/yggdrasil.nix
+++ b/nixos/tests/yggdrasil.nix
@@ -1,8 +1,20 @@
 let
+  privateKeys = {
+    alice = ''
+      -----BEGIN PRIVATE KEY-----
+      MC4CAQAwBQYDK2VwBCIEIKhn+eB45M5Y0xDPWs1GItdZ4qId8H4db8OAoqJkiUgN
+      -----END PRIVATE KEY-----
+    '';
+    bob = ''
+      -----BEGIN PRIVATE KEY-----
+      MC4CAQAwBQYDK2VwBCIEIAxKJKzTQCcizpJ37RefSgS4lbSVhkk8Jfuu1gZT2FfW
+      -----END PRIVATE KEY-----
+    '';
+  };
+
   aliceIp6 = "202:b70:9b0b:cf34:f93c:8f18:bbfd:7034";
   aliceKeys = {
     PublicKey = "3e91ec9e861960d86e1ce88051f97c435bdf2859640ab681dfa906eb45ad5182";
-    PrivateKey = "a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a26489480d3e91ec9e861960d86e1ce88051f97c435bdf2859640ab681dfa906eb45ad5182";
   };
   # Frank has a legacy keys.json that should be migrated
   # This is the same key as Alice but in the old hex format
@@ -11,7 +23,7 @@ let
     # The old format stored PrivateKey as 128 hex chars (64 bytes = seed + pubkey)
     # This corresponds to Alice's key
     PrivateKey =
-      "a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a264894809" + aliceKeys.PublicKey;
+      "a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a26489480d" + aliceKeys.PublicKey;
     PublicKey = aliceKeys.PublicKey;
   };
   bobIp6 = "202:a483:73a4:9f2d:a559:4a19:bc9:8458";
@@ -30,7 +42,6 @@ let
       }
     ];
     PublicKey = "2b6f918b6c1a4b54d6bcde86cf74e074fb32ead4ee439b7930df2aa60c825186";
-    PrivateKey = "0c4a24acd3402722ce9277ed179f4a04b895b49586493c25fbaed60653d857d62b6f918b6c1a4b54d6bcde86cf74e074fb32ead4ee439b7930df2aa60c825186";
   };
   danIp6 = bobPrefix + "::2";
 
@@ -69,13 +80,9 @@ in
           settings = {
             Listen = [ "tcp://0.0.0.0:12345" ];
             MulticastInterfaces = [ ];
-          };
-          configFile = toString (
-            pkgs.writeTextFile {
-              name = "yggdrasil-alice-conf";
-              text = builtins.toJSON aliceKeys;
-            }
-          );
+            PrivateKeyPath = "${pkgs.writeText "private" (privateKeys.alice)}";
+          }
+          // aliceKeys;
         };
       };
 
@@ -88,12 +95,9 @@ in
         services.yggdrasil = {
           enable = true;
           openMulticastPort = true;
-          configFile = toString (
-            pkgs.writeTextFile {
-              name = "yggdrasil-bob-conf";
-              text = builtins.toJSON bobConfig;
-            }
-          );
+          settings = bobConfig // {
+            PrivateKeyPath = pkgs.writeText "private" (privateKeys.bob);
+          };
         };
 
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
@@ -158,8 +162,8 @@ in
                 Port = 43210;
               }
             ];
-            openMulticastPort = true;
           };
+          openMulticastPort = true;
           persistentKeys = true;
         };
       };
@@ -194,13 +198,23 @@ in
         networking.firewall.allowedTCPPorts = [ 43212 ];
 
         # Pre-populate the legacy keys.json file before the service starts
-        system.activationScripts.yggdrasil-legacy-keys = ''
-          mkdir -p /var/lib/yggdrasil
-          cat > /var/lib/yggdrasil/keys.json << 'EOF'
-          ${builtins.toJSON frankLegacyKeys}
-          EOF
-          chmod 600 /var/lib/yggdrasil/keys.json
-        '';
+        systemd.services.yggdrasil-legacy-keys = {
+          wantedBy = [ "yggdrasil-persistent-keys.service" ];
+          before = [ "yggdrasil-persistent-keys.service" ];
+
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+
+          script = ''
+            mkdir -p /var/lib/yggdrasil
+            cat > /var/lib/yggdrasil/keys.json << 'EOF'
+            ${builtins.toJSON frankLegacyKeys}
+            EOF
+            chmod 600 /var/lib/yggdrasil/keys.json
+          '';
+        };
 
         services.yggdrasil = {
           enable = true;
@@ -221,68 +235,71 @@ in
       };
   };
 
-  testScript = ''
-    import re
+  testScript =
+    # python
+    ''
+      import re
 
-    # Give Alice a head start so she is ready when Bob calls.
-    alice.start()
-    alice.wait_for_unit("yggdrasil.service")
+      # Give Alice a head start so she is ready when Bob calls.
+      alice.start()
+      alice.wait_for_unit("yggdrasil.service")
 
-    bob.start()
-    carol.start()
-    eve.start()
-    frank.start()
-    bob.wait_for_unit("default.target")
-    carol.wait_for_unit("yggdrasil.service")
+      bob.start()
+      carol.start()
+      eve.start()
+      bob.wait_for_unit("default.target")
+      carol.wait_for_unit("yggdrasil.service")
 
-    # Eve uses persistentKeys - verify the key generation service ran
-    eve.wait_for_unit("yggdrasil-persistent-keys.service")
-    eve.wait_for_unit("yggdrasil.service")
-    eve.succeed("test -f /var/lib/yggdrasil/private.pem")
-    eve.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
+      # Eve uses persistentKeys - verify the key generation service ran
+      eve.wait_for_unit("yggdrasil-persistent-keys.service")
+      eve.wait_for_unit("yggdrasil.service")
+      eve.succeed("test -f /var/lib/yggdrasil/private.pem")
+      eve.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
 
-    # Frank tests migration from legacy keys.json format
-    frank.wait_for_unit("yggdrasil-persistent-keys.service")
-    frank.wait_for_unit("yggdrasil.service")
-    # Verify migration happened: private.pem should exist
-    frank.succeed("test -f /var/lib/yggdrasil/private.pem")
-    frank.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
-    # Legacy file should still exist (not deleted, user should verify and remove)
-    frank.succeed("test -f /var/lib/yggdrasil/keys.json")
+      ip_addr_show = "ip -o -6 addr show dev ygg0 scope global"
+      carol.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
+      carol_ip6 = re.split(" +|/", carol.succeed(ip_addr_show))[3]
 
-    ip_addr_show = "ip -o -6 addr show dev ygg0 scope global"
-    carol.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
-    carol_ip6 = re.split(" +|/", carol.succeed(ip_addr_show))[3]
+      eve.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
+      eve_ip6 = re.split(" +|/", eve.succeed(ip_addr_show))[3]
 
-    eve.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
-    eve_ip6 = re.split(" +|/", eve.succeed(ip_addr_show))[3]
+      # If Alice can talk to Carol, then Bob's outbound peering and Carol's
+      # local peering have succeeded and everybody is connected.
+      alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
+      alice.succeed("ping -c 1 ${bobIp6}")
 
-    # Verify Frank got the expected IP after migration (same key as Alice = same IP)
-    frank.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
-    frank_ip6 = re.split(" +|/", frank.succeed(ip_addr_show))[3]
-    assert frank_ip6 == "${frankIp6}", f"Frank's IP {frank_ip6} doesn't match expected ${frankIp6} after migration"
+      bob.succeed("ping -c 1 ${aliceIp6}")
+      bob.succeed(f"ping -c 1 {carol_ip6}")
 
-    # If Alice can talk to Carol, then Bob's outbound peering and Carol's
-    # local peering have succeeded and everybody is connected.
-    alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
-    alice.succeed("ping -c 1 ${bobIp6}")
+      carol.succeed("ping -c 1 ${aliceIp6}")
+      carol.succeed("ping -c 1 ${bobIp6}")
+      carol.succeed("ping -c 1 ${bobPrefix}::1")
+      carol.succeed("ping -c 8 ${danIp6}")
 
-    bob.succeed("ping -c 1 ${aliceIp6}")
-    bob.succeed(f"ping -c 1 {carol_ip6}")
+      carol.fail("journalctl -u dhcpcd | grep ygg0")
 
-    carol.succeed("ping -c 1 ${aliceIp6}")
-    carol.succeed("ping -c 1 ${bobIp6}")
-    carol.succeed("ping -c 1 ${bobPrefix}::1")
-    carol.succeed("ping -c 8 ${danIp6}")
+      # Eve should be able to communicate with the network via multicast peering
+      eve.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
+      carol.wait_until_succeeds(f"ping -c 1 {eve_ip6}")
 
-    carol.fail("journalctl -u dhcpcd | grep ygg0")
+      alice.wait_for_unit("httpd.service")
+      carol.succeed("curl --fail -g http://[${aliceIp6}]")
+      carol.succeed("curl --fail -g http://[${danIp6}]")
 
-    # Eve should be able to communicate with the network via multicast peering
-    eve.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
-    carol.wait_until_succeeds(f"ping -c 1 {eve_ip6}")
+      with subtest("legacy key migration"):
+        frank.start()
+        # Frank tests migration from legacy keys.json format
+        frank.wait_for_unit("yggdrasil-persistent-keys.service")
+        frank.wait_for_unit("yggdrasil.service")
+        # Verify migration happened: private.pem should exist
+        frank.succeed("test -f /var/lib/yggdrasil/private.pem")
+        frank.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
+        # Legacy file should still exist (not deleted, user should verify and remove)
+        frank.succeed("test -f /var/lib/yggdrasil/keys.json")
 
-    alice.wait_for_unit("httpd.service")
-    carol.succeed("curl --fail -g http://[${aliceIp6}]")
-    carol.succeed("curl --fail -g http://[${danIp6}]")
-  '';
+        # Verify Frank got the expected IP after migration (same key as Alice = same IP)
+        frank.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
+        frank_ip6 = re.split(" +|/", frank.succeed(ip_addr_show))[3]
+        assert frank_ip6 == "${frankIp6}", f"Frank's IP {frank_ip6} doesn't match expected ${frankIp6} after migration"
+    '';
 }

From b8fcbdf1c85a9ef0116e411cab9e4077a34cea21 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Tue, 27 Jan 2026 10:39:26 -0300
Subject: [PATCH 042/108] godot_4_6: fix TLS handshake fail preventing assetlib
 use

Fixes #454608

Upstream: https://github.com/NixOS/nixpkgs/issues/454608
---
 pkgs/development/tools/godot/common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index 5f312cdb6937..662a195f3b0d 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -417,6 +417,14 @@ let
         patches = [
           ./Linux-fix-missing-library-with-builtin_glslang-false.patch
         ]
+        ++ lib.optionals (lib.versionAtLeast version "4.6") [
+          # https://github.com/godotengine/godot/pull/115450
+          (fetchpatch {
+            name = "fix-tls-handshake-fail-preventing-assetlib-use.patch";
+            url = "https://github.com/godotengine/godot/commit/29acd734c71f06268d6ef4715d7df70b14731f48.patch";
+            hash = "sha256-wxkr6jPtutUTG+mYrXoxcDcWIIZghlSJ79XqhFh/0P4=";
+          })
+        ]
         ++ lib.optionals (lib.versionOlder version "4.4") [
           (fetchpatch {
             name = "wayland-header-fix.patch";

From 27cf3fde5cde1e05460b7f35827c8511966d4159 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Jan 2026 03:37:00 +0000
Subject: [PATCH 043/108] datadog-agent: 7.71.2 -> 7.75.0

---
 pkgs/tools/networking/dd-agent/datadog-agent.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d6815111c982..4819d8953ad9 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -23,12 +23,12 @@ let
   owner = "DataDog";
   repo = "datadog-agent";
   goPackagePath = "github.com/${owner}/${repo}";
-  version = "7.71.2";
+  version = "7.75.0";
 
   src = fetchFromGitHub {
     inherit owner repo;
     tag = version;
-    hash = "sha256-WERO2vs0x5w+9L68BucvcuBWF2qoYU6qP7FvCYrnfrc=";
+    hash = "sha256-oj4LFQiaEeSHcSx0Bar4vU7w/8gi0fgBGSAUjaD4SFc=";
   };
   rtloader = stdenv.mkDerivation {
     pname = "datadog-agent-rtloader";
@@ -49,7 +49,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  vendorHash = "sha256-lL31RZqSQy3iqdJ/07pxjeMMFCK9HOX2TI7xvIa2Z3s=";
+  vendorHash = "sha256-5lqWfhMXrYyZkP/MYH/Uvgu0VHaDmYMOmBOc5xExLi4=";
 
   subPackages = [
     "cmd/agent"

From a325eebd210f373d75174792243f40bcbeea9a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 28 Jan 2026 14:15:38 +0100
Subject: [PATCH 044/108] lua-modules: delete unused flake8 file

---
 pkgs/development/lua-modules/updater/.flake8 | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 pkgs/development/lua-modules/updater/.flake8

diff --git a/pkgs/development/lua-modules/updater/.flake8 b/pkgs/development/lua-modules/updater/.flake8
deleted file mode 100644
index 7ad3e937c9a5..000000000000
--- a/pkgs/development/lua-modules/updater/.flake8
+++ /dev/null
@@ -1,8 +0,0 @@
-[flake8]
-# E111 => 4 spaces tabs
-# don't let spaces else it is not recognized
-# E123 buggy
-ignore =
-	E501,E265,E402
-
-max-line-length = 120

From 7be7848a46e0149dfe841ca4c0872f82aadbece2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Wed, 28 Jan 2026 19:28:48 +0000
Subject: [PATCH 045/108] crate2nix: 0.14.1 -> 0.15.0

https://github.com/nix-community/crate2nix/releases/tag/0.15.0

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 pkgs/by-name/cr/crate2nix/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix
index 347bf5eb39b5..762f3bd811b3 100644
--- a/pkgs/by-name/cr/crate2nix/package.nix
+++ b/pkgs/by-name/cr/crate2nix/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "crate2nix";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "crate2nix";
     rev = version;
-    hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=";
+    hash = "sha256-SUuruvw1/moNzCZosHaa60QMTL+L9huWdsCBN6XZIic=";
   };
 
   sourceRoot = "${src.name}/crate2nix";
 
-  cargoHash = "sha256-Du6RAe4Ax3KK90h6pQEtF75Wdniz+IqF2/TXHA9Ytbw=";
+  cargoHash = "sha256-q/nPKNXZ1eJijeTBXA6Uuz235p+Q1uilXY5a/s8btMM=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -42,11 +42,10 @@ rustPlatform.buildRustPackage rec {
         ]
       }
 
-      for shell in bash zsh fish
-      do
-        $out/bin/crate2nix completions -s $shell
-        installShellCompletion crate2nix.$shell || installShellCompletion --$shell _crate2nix
-      done
+    $out/bin/crate2nix completions -s bash
+    $out/bin/crate2nix completions -s zsh
+    $out/bin/crate2nix completions -s fish
+    installShellCompletion --bash crate2nix.bash --zsh _crate2nix --fish crate2nix.fish
   '';
 
   meta = {

From b2cd5d2c3e7974fce5358c95d509b0e189a26ad0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Jan 2026 19:51:08 +0000
Subject: [PATCH 046/108] mieru: 3.21.0 -> 3.27.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index e4ec674222c4..8687ce9a3238 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.21.0";
+  version = "3.27.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-9e2V+WwcBp16DsMf31IzANdMlc/r3KFDYjSCKvKKGwM=";
+    hash = "sha256-rUX3zCnwCw34dujpctTaEH6tmUN2iMraO6awavldiUI=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From 3357e71abf13c319e47d734e999fa8d9cfc92e15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Jan 2026 22:11:50 +0000
Subject: [PATCH 047/108] melange: 0.34.1 -> 0.40.0

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

diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index 7330b799c513..3db132303df1 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "melange";
-  version = "0.34.1";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "melange";
     rev = "v${version}";
-    hash = "sha256-nocfBhoe8iXs/fjKsYgXXdcc8U6vSQtb8wlhzZYRHLE=";
+    hash = "sha256-04e6ncAaMVRIfJ1wV6QpcsgHWeJJcZDvxSV4ceVK5bk=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-nZD4e5l6sB5l6P1eZosTaCJ8cFTTSdOtyDI3/NYrUuA=";
+  vendorHash = "sha256-nJyThLtyQSOFp37Wpqkpqiy8sIh2wRzuZPJ5PT7WT74=";
 
   subPackages = [ "." ];
 

From d3cff21762c7e5ee02d64625ba8e45546bc87904 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Thu, 29 Jan 2026 08:41:10 +0100
Subject: [PATCH 048/108] lix: 2.93.3 -> 2.94.0

---
 pkgs/tools/package-management/lix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 747b76175641..5aaeeacb082b 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -271,7 +271,7 @@ lib.makeExtensible (
 
     latest = self.lix_2_94;
 
-    stable = self.lix_2_93;
+    stable = self.lix_2_94;
 
     # Previously, `nix-eval-jobs` was not packaged here, so we export an
     # attribute with the previously-expected structure for compatibility. This

From a626eb9e465dd1de6884275fd539c1023cd1284e Mon Sep 17 00:00:00 2001
From: NTBBloodbath <bloodbathalchemist@protonmail.com>
Date: Thu, 29 Jan 2026 20:09:00 -0400
Subject: [PATCH 049/108] penpot-desktop: 0.18.1 -> 0.23.0

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

diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix
index c2a9a1d8ae82..d0ef0a17bc81 100644
--- a/pkgs/by-name/pe/penpot-desktop/package.nix
+++ b/pkgs/by-name/pe/penpot-desktop/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNpmPackage,
   copyDesktopItems,
-  electron_37,
+  electron_39,
   fetchFromGitHub,
   jq,
   makeDesktopItem,
@@ -15,17 +15,17 @@ let
   description = "Unofficial desktop application for the open-source design tool, Penpot";
   icon = "penpot";
   nodejs = nodejs_24;
-  electron = electron_37;
+  electron = electron_39;
 in
 buildNpmPackage rec {
   pname = "penpot-desktop";
-  version = "0.18.1";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "author-more";
     repo = "penpot-desktop";
     tag = "v${version}";
-    hash = "sha256-MxkdGifPaakhX/tLHiD7Y6xCe3cZ7ELiAhD7GSmdtvk=";
+    hash = "sha256-2thLD8ECfHZMD3Yw/lQgnCqqEGxCE1AXsHGP9JKof+Q=";
   };
 
   makeCacheWritable = true;
@@ -33,7 +33,7 @@ buildNpmPackage rec {
     "--engine-strict"
     "--legacy-peer-deps"
   ];
-  npmDepsHash = "sha256-zOoED2WKfiDgfWQDgRrr7Gf09GbSFK+8rOsNr8VQpgY=";
+  npmDepsHash = "sha256-uyt9gmmytDwSCnXk9HUBwJoPMcqMt2wLwHHmY2Kx0yk=";
   # Do not run the default build script as it leads to errors caused by the electron-builder configuration
   dontNpmBuild = true;
 

From 9b518473623006615551078141b10a35739bda37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jan 2026 20:40:10 +0000
Subject: [PATCH 050/108] luau-lsp: 1.60.1 -> 1.61.0

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

diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index a604a4d3ac20..7d1cef370770 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau-lsp";
-  version = "1.60.1";
+  version = "1.61.0";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-UoitFmn+1bHhQ2oqt1z50iU0Hx7pS4nact+3C8V8WzE=";
+    hash = "sha256-v3ouLDsJkOc1WsgH39HsPTMxhIYjKfLDY78RWtF6Zrg=";
     fetchSubmodules = true;
   };
 

From c5bba3c28069178bd5ece7580ea3475734dd0531 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 30 Jan 2026 13:56:36 -0800
Subject: [PATCH 051/108] bitcoin: move icon to spec-compliant location

---
 pkgs/applications/blockchains/bitcoin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index d7800982c9a9..b17fd18bdf30 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
     substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin"
-    install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png
+    install -Dm644 share/pixmaps/bitcoin256.png $out/share/icons/hicolor/256x256/apps/bitcoin.png
   '';
 
   cmakeFlags = [

From 92309da37f06f929612b3d81a19971398ea423b9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 30 Jan 2026 14:17:03 -0500
Subject: [PATCH 052/108] opencode: 1.1.41 -> 1.1.45

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 3ed705fb2d34..26300f7fe9f9 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.1.41";
+  version = "1.1.45";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p4mZRJ+BQs790hjCOJ9iXzg3JoCa4lqOdCqDRkoEfWw=";
+    hash = "sha256-H3myfSdOZVizLxAbEIhcEiuM9irtjLZVAr1xLOHJaak=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -68,7 +68,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-bjSPHxPTyzhMOztd7HjUl/lvMZYVk944xPj8ADDn5Y4=";
+    outputHash =
+      if stdenvNoCC.hostPlatform.isDarwin then
+        "sha256-BJmyALnZEiAnC8+bsri5Me1Z0Vtf6A/27e7Eve4IvDo="
+      else
+        "sha256-zkinMkPR1hCBbB5BIuqozQZDpjX4eiFXjM6lpwUx1fM=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From f42538a0ff4ee7326afce61244d4d32c69f4a2b0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 30 Jan 2026 16:17:39 -0500
Subject: [PATCH 053/108] opencode: 1.1.45 -> 1.1.47

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 26300f7fe9f9..73dbbeac5937 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.1.45";
+  version = "1.1.47";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H3myfSdOZVizLxAbEIhcEiuM9irtjLZVAr1xLOHJaak=";
+    hash = "sha256-f6TVxKV9q2yEQ9r9VCTttXLqpOrYdTEKDUJs+MuQJCQ=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 3a42f62278683f6cc70be837ff049a607588c1fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 04:03:44 +0000
Subject: [PATCH 054/108] xcursor-viewer: 0-unstable-2026-01-23 ->
 0-unstable-2026-01-27

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

diff --git a/pkgs/by-name/xc/xcursor-viewer/package.nix b/pkgs/by-name/xc/xcursor-viewer/package.nix
index 0d4236da4139..c19863380f03 100644
--- a/pkgs/by-name/xc/xcursor-viewer/package.nix
+++ b/pkgs/by-name/xc/xcursor-viewer/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "xcursor-viewer";
-  version = "0-unstable-2026-01-23";
+  version = "0-unstable-2026-01-27";
 
   src = fetchFromGitHub {
     owner = "drizt";
     repo = "xcursor-viewer";
-    rev = "c7aad6c662eab1a0907489d44afbc84ea3aa8de6";
-    hash = "sha256-iHnWRcM6UYuhNykH4uiXFmVKnFUiyrLNKtjaAh6ilnw=";
+    rev = "f53e1d261458e84b0f76fb587af560841c413087";
+    hash = "sha256-fWkjcXmtU51AQOTK1nLx7Kw9kQtQhUz9EVtAAVX0WEg=";
   };
 
   nativeBuildInputs = [

From 8955580b50eff56c5d8bf4591f9ea0ea435dc838 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 31 Jan 2026 10:40:04 +0100
Subject: [PATCH 055/108] zoxide: 0.9.8 -> 0.9.9

Changelog: https://github.com/ajeetdsouza/zoxide/releases/tag/v0.9.9
Diff: https://github.com/ajeetdsouza/zoxide/compare/v0.9.8...v0.9.9
---
 pkgs/by-name/zo/zoxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 411b6082b225..1022fed3c33c 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zoxide";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
     tag = "v${version}";
-    hash = "sha256-8hXoC3vyR08hN8MMojnAO7yIskg4FsEm28GtFfh5liI=";
+    hash = "sha256-2scJ5/+A3ZSpIdce5GLYqxjc0so9sVsYiXNULmjMzLY=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
       --replace '"fzf"' '"${fzf}/bin/fzf"'
   '';
 
-  cargoHash = "sha256-Nonid/5Jh0WIQV0G3fpmkW0bql6bvlcNJBMZ+6MTTPQ=";
+  cargoHash = "sha256-4BXZ5NnwY2izzJFkPkECKvpuyFWfZ2CguybDDk0GDU0=";
 
   postInstall = ''
     installManPage man/man*/*

From 451127f1b0712d20b6cc100c08aad94dc90f24d9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 31 Jan 2026 11:30:48 +0000
Subject: [PATCH 056/108] python3Packages.keras: 3.13.1 -> 3.13.2

Diff: https://github.com/keras-team/keras/compare/v3.13.1...v3.13.2

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

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index ccf56f460f61..e07e79fa3460 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "keras";
-  version = "3.13.1";
+  version = "3.13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oFlEgic6M6ZRqDl6RvAbQccW8RIHC4fEGWJyNPidDHM=";
+    hash = "sha256-7s3bJdkS/G/Ydj9txbtGrqGCE3PjjS1ZiuoGOzk+UIg=";
   };
 
   build-system = [

From 3e8d3469b057d218b79aa48da969d8e953576af7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 12:31:05 +0000
Subject: [PATCH 057/108] aide: 0.19.2 -> 0.19.3

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

diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix
index cc60a85853ab..5b5fbee44bc7 100644
--- a/pkgs/by-name/ai/aide/package.nix
+++ b/pkgs/by-name/ai/aide/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aide";
-  version = "0.19.2";
+  version = "0.19.3";
 
   src = fetchurl {
     # We specifically want the tar.gz, so fetchFromGitHub is not suitable here
     url = "https://github.com/aide/aide/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    hash = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
+    hash = "sha256-ZRMXC7W4wigC3Rty8C2KqfQyrvK0RwUi2wPnVSEqP0c=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 5a6814784186a9b9181f0eb5c09005b32d178338 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 14:19:41 +0000
Subject: [PATCH 058/108] terraform-providers.selectel_selectel: 7.4.1 -> 7.5.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ffadba0e1a97..e77df162c95c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1193,11 +1193,11 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "selectel_selectel": {
-    "hash": "sha256-BT8sDYfcEtsvMg1aLi2QRo4wu2V/hkWEk4PKQmN3vtg=",
+    "hash": "sha256-htB1/ptyo+rgAOAt9VZwULU1c3XU1QcKUxxtGFjD3ag=",
     "homepage": "https://registry.terraform.io/providers/selectel/selectel",
     "owner": "selectel",
     "repo": "terraform-provider-selectel",
-    "rev": "v7.4.1",
+    "rev": "v7.5.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-OJlD1P+CUEsLk2xSsQ2QQBvGewYNly1dIJh8kMi+ChE="
   },

From cc040ce2af3d11449f3af43ba58685f1ec9830db Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 Jan 2026 12:54:13 -0800
Subject: [PATCH 059/108] python3Packages.zodb: 6.1 -> 6.2

---
 .../python-modules/zodb/default.nix           | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 49baf1a63efa..2ce8dc96abb3 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -3,49 +3,60 @@
   fetchFromGitHub,
   buildPythonPackage,
   python,
+  pythonAtLeast,
+
+  # build-system
   setuptools,
+
+  # dependencies
+  btrees,
+  persistent,
+  transaction,
+  zc-lockfile,
+  zconfig,
+  zodbpickle,
+  zope-interface,
+
+  # tests
+  manuel,
   zope-testing,
   zope-testrunner,
-  transaction,
-  zope-interface,
-  zodbpickle,
-  zconfig,
-  persistent,
-  zc-lockfile,
-  btrees,
-  manuel,
 }:
 
 buildPythonPackage rec {
   pname = "zodb";
-  version = "6.1";
+  version = "6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zodb";
     tag = version;
-    hash = "sha256-O6mu4RWi5qNcPyIgre5+bk4ZGZOZdG1vIdc8HqbfcaQ=";
+    hash = "sha256-R6qf/9Sr70OsZzes+haT/J6RIz6Wlof/l6rQRl3snHI=";
   };
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools ==" "setuptools >="
-
     # remove broken test
     rm -vf src/ZODB/tests/testdocumentation.py
+  ''
+  + lib.optionalString (pythonAtLeast "3.14") ''
+    # remove broken under python 3.14
+    rm -vf src/ZODB/tests/testConnectionSavepoint.py
+    rm -vf src/ZODB/tests/testMVCCMappingStorage.py
+    rm -vf src/ZODB/tests/testFileStorage.py
+    rm -vf src/ZODB/tests/testblob.py
   '';
 
   build-system = [ setuptools ];
 
   dependencies = [
-    transaction
-    zope-interface
-    zodbpickle
-    zconfig
-    persistent
-    zc-lockfile
     btrees
+    persistent
+    transaction
+    zc-lockfile
+    zconfig
+    zodbpickle
+    zope-interface
   ];
 
   nativeCheckInputs = [
@@ -62,6 +73,7 @@ buildPythonPackage rec {
     description = "Zope Object Database: object database and persistence";
     homepage = "https://zodb-docs.readthedocs.io/";
     changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst";
+    downloadPage = "https://github.com/zopefoundation/ZODB";
     license = lib.licenses.zpl21;
     maintainers = [ ];
   };

From c9c6cde6a77cc0cec6a2400eb23f149de4570af2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 16:19:24 +0000
Subject: [PATCH 060/108] zerofs: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix
index 9f2f3af1ce83..693c80df2169 100644
--- a/pkgs/by-name/ze/zerofs/package.nix
+++ b/pkgs/by-name/ze/zerofs/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zerofs";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Barre";
     repo = "ZeroFS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yCniPXw5CgB1SzkoYMpfgO2H/+l5UzUSgerrgFL1vfk=";
+    hash = "sha256-qfn4Js4/D+/X4nbO08DAxU1tqfTKERUMxU6q3L9RfkY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/zerofs";
 
-  cargoHash = "sha256-/o4WcOJ9kNfh9xzEMhZywUDhGyjv8JKkW8aXqYVpCqE=";
+  cargoHash = "sha256-0sOb+QQRJ1QNs0CofnCZTAPxQ+UsA0R3J02qtJ4pD7w=";
 
   nativeBuildInputs = [ cmake ];
 

From af1942b10a5f67e2e5aa84705fd7354cbe58e44e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 31 Jan 2026 19:38:34 +0200
Subject: [PATCH 061/108] neovim-unwrapped: move overrides to package.nix

---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix              | 5 +----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 85c231626b10..b480f18a3827 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -5,7 +5,8 @@
   cmake,
   gettext,
   libuv,
-  lua,
+  lua5_1,
+  luajit,
   pkg-config,
   unibilium,
   utf8proc,
@@ -25,6 +26,11 @@
   fish ? null,
   python3 ? null,
 }:
+
+let
+  lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
+in
+
 stdenv.mkDerivation (
   finalAttrs:
   let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa357ead5f9b..010fb54865e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11612,10 +11612,7 @@ with pkgs;
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative
   wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
-  wrapNeovim = neovim-unwrapped: makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
-  neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix {
-    lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
-  };
+  wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
 
   neovimUtils = callPackage ../applications/editors/neovim/utils.nix {
     lua = lua5_1;

From 66b01e0e04cd34244eadfc11a26f1c07e7c66a4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 17:43:31 +0000
Subject: [PATCH 062/108] llama-cpp: 7823 -> 7898

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 8298d76cba00..dc23887a4f60 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -78,7 +78,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "7823";
+  version = "7898";
 
   outputs = [
     "out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-3NLIX2bAxaxkpPRMzxWfcEhJDke2q4TWAyWjXIa/Wpk=";
+    hash = "sha256-ST7hhE5lWOm46WS+k9lkHJqVQpz8squwHZWE2/XG6MY=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ [ openssl ];
 
   npmRoot = "tools/server/webui";
-  npmDepsHash = "sha256-m1boNqwMELdpHbV/jYK3hpf2vP1S/KSAf32wVKQGyFo=";
+  npmDepsHash = "sha256-bbv0e3HZmqpFwKELiEFBgoMr72jKbsX20eceH4XjfBA=";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src patches;

From 48ba167cd6042081308a458fa632fba1c6cd4ec2 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 31 Jan 2026 19:37:29 +0200
Subject: [PATCH 063/108] freedv: move overrides to package.nix

---
 pkgs/by-name/fr/freedv/package.nix | 5 +++--
 pkgs/top-level/all-packages.nix    | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index 67c0ea5413d7..f1c3cfb78e42 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -27,6 +27,7 @@
 }:
 
 let
+  codec2' = codec2.override { freedvSupport = true; };
   ebur128Src = fetchFromGitHub {
     owner = "jiixyj";
     repo = "libebur128";
@@ -125,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    codec2
+    codec2'
     libsamplerate
     libsndfile
     lpcnet
@@ -157,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_NATIVE_AUDIO" (with stdenv.hostPlatform; isLinux || isDarwin))
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${codec2.src}/src";
+  env.NIX_CFLAGS_COMPILE = "-I${codec2'.src}/src";
 
   doCheck = false;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa357ead5f9b..257eddeab5bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10285,12 +10285,6 @@ with pkgs;
       inherit buildPythonApplication;
     };
 
-  freedv = callPackage ../by-name/fr/freedv/package.nix {
-    codec2 = codec2.override {
-      freedvSupport = true;
-    };
-  };
-
   inherit
     ({
       freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };

From cb0c03bcd4684165df139335b489b94f826fe1ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 17:45:17 +0000
Subject: [PATCH 064/108] python3Packages.disposable-email-domains: 0.0.156 ->
 0.0.157

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

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index a894c457ef50..e3e6b16aaf7c 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "disposable-email-domains";
-  version = "0.0.156";
+  version = "0.0.157";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit (finalAttrs) version;
-    hash = "sha256-YoZI3nN8BeR/+zPnuJuHeWcoWeHX1mEDGrhhFvpj2/s=";
+    hash = "sha256-TxB+NK9z21vqoyBRdTEHOZaxpg4w6LEtO6rJOkwwyiA=";
   };
 
   build-system = [

From 28da6b6ae7540e073908fd97ddd5bb9c2f47ed1a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 31 Dec 2025 16:55:44 +0200
Subject: [PATCH 065/108] qgit: move to by-name

---
 .../qgit/default.nix => by-name/qg/qgit/package.nix} | 12 +++++-------
 pkgs/top-level/all-packages.nix                      |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{applications/version-management/qgit/default.nix => by-name/qg/qgit/package.nix} (83%)

diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/by-name/qg/qgit/package.nix
similarity index 83%
rename from pkgs/applications/version-management/qgit/default.nix
rename to pkgs/by-name/qg/qgit/package.nix
index cb654c45de32..e01cf9c46780 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/by-name/qg/qgit/package.nix
@@ -3,9 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  qt5compat,
-  wrapQtAppsHook,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qt5compat
+    qt6.qtbase
+    qt6.qt5compat
   ];
 
   meta = {
@@ -37,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       peterhoeg
       markuskowa
     ];
-    inherit (qtbase.meta) platforms;
+    inherit (qt6.qtbase.meta) platforms;
     mainProgram = "qgit";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa357ead5f9b..ab1283ab50c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1180,8 +1180,6 @@ with pkgs;
       ;
   };
 
-  qgit = qt6Packages.callPackage ../applications/version-management/qgit { };
-
   svn-all-fast-export =
     libsForQt5.callPackage ../applications/version-management/svn-all-fast-export
       { };

From 0c9f462c26f494d23ea1a64287da7578d5de3cb6 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 31 Dec 2025 16:59:01 +0200
Subject: [PATCH 066/108] gammaray: move to by-name, modernize

---
 .../ga/gammaray/package.nix}                  | 44 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 17 insertions(+), 29 deletions(-)
 rename pkgs/{development/tools/gammaray/default.nix => by-name/ga/gammaray/package.nix} (70%)

diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/by-name/ga/gammaray/package.nix
similarity index 70%
rename from pkgs/development/tools/gammaray/default.nix
rename to pkgs/by-name/ga/gammaray/package.nix
index 79cf10a11395..5164adb54c2c 100644
--- a/pkgs/development/tools/gammaray/default.nix
+++ b/pkgs/by-name/ga/gammaray/package.nix
@@ -4,51 +4,41 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  qtwayland,
-  qtsvg,
-  qt3d,
-  qtdeclarative,
-  qtconnectivity,
-  qtlocation,
-  qtscxml,
-  qtwebengine,
+  qt6,
   kdePackages,
   wayland,
   elfutils,
   libbfd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gammaray";
   version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "KDAB";
-    repo = pname;
-    tag = "v${version}";
+    repo = finalAttrs.pname;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-CJKb7H77PjPwCGW4fqLSJw1mhSweuFYlDE/7RyVDcT0=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtwayland
-    qtsvg
-    qt3d
-    qtdeclarative
-    qtconnectivity
-    qtlocation
-    qtscxml
-    qtwebengine
+    qt6.qtbase
+    qt6.qtwayland
+    qt6.qtsvg
+    qt6.qt3d
+    qt6.qtdeclarative
+    qt6.qtconnectivity
+    qt6.qtlocation
+    qt6.qtscxml
+    qt6.qtwebengine
     kdePackages.kcoreaddons
     wayland
     elfutils
@@ -63,10 +53,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Software introspection tool for Qt applications developed by KDAB";
     homepage = "https://github.com/KDAB/GammaRay";
-    changelog = "https://github.com/KDAB/GammaRay/releases/tag/${src.tag}";
+    changelog = "https://github.com/KDAB/GammaRay/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ wineee ];
     mainProgram = "gammaray";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab1283ab50c5..095f16d10bb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1516,8 +1516,6 @@ with pkgs;
 
   fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; };
 
-  gammaray = qt6Packages.callPackage ../development/tools/gammaray { };
-
   gams = callPackage ../tools/misc/gams (config.gams or { });
 
   gancioPlugins = recurseIntoAttrs (callPackage ../by-name/ga/gancio/plugins.nix { });

From 695d500a24f7fc7a8b7d6f0511bceaff6893e5cc Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:41:55 +0200
Subject: [PATCH 067/108] maskromtool: move to by-name

---
 .../default.nix => by-name/ma/maskromtool/package.nix}      | 6 ++----
 pkgs/top-level/all-packages.nix                             | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/graphics/maskromtool/default.nix => by-name/ma/maskromtool/package.nix} (92%)

diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/by-name/ma/maskromtool/package.nix
similarity index 92%
rename from pkgs/tools/graphics/maskromtool/default.nix
rename to pkgs/by-name/ma/maskromtool/package.nix
index 94fbfdb61fe0..fc96dfd5603e 100644
--- a/pkgs/tools/graphics/maskromtool/default.nix
+++ b/pkgs/by-name/ma/maskromtool/package.nix
@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
   qt6,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,14 +18,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     qt6.qtcharts
     qt6.qttools
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 095f16d10bb1..c0ee6da108a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2893,8 +2893,6 @@ with pkgs;
 
   kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };
 
-  maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { };
-
   matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
 
   maubot = with python3Packages; toPythonApplication maubot;

From 918e5559411a5ea6b42ecbe413e6b2e54d69d4fa Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:43:58 +0200
Subject: [PATCH 068/108] maskromtool: modernize

---
 pkgs/by-name/ma/maskromtool/package.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ma/maskromtool/package.nix b/pkgs/by-name/ma/maskromtool/package.nix
index fc96dfd5603e..d3af7bd976d1 100644
--- a/pkgs/by-name/ma/maskromtool/package.nix
+++ b/pkgs/by-name/ma/maskromtool/package.nix
@@ -6,14 +6,14 @@
   qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "maskromtool";
   version = "2024-08-18";
 
   src = fetchFromGitHub {
     owner = "travisgoodspeed";
     repo = "maskromtool";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo=";
   };
 
@@ -31,12 +31,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "CAD tool for extracting bits from Mask ROM photographs";
     homepage = "https://github.com/travisgoodspeed/maskromtool";
-    license = [
-      lib.licenses.beerware
-      lib.licenses.gpl1Plus
-    ];
-    maintainers = [
-      lib.maintainers.evanrichter
+    license = with lib.licenses; [
+      beerware
+      gpl1Plus
     ];
+    maintainers = with lib.maintainers; [ evanrichter ];
   };
-}
+})

From dfd69ee02ac8dd0673c1b27120df0473cfd83b39 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:48:07 +0200
Subject: [PATCH 069/108] texmaker: move to by-name, modernize

---
 .../te}/texmaker/fix-build-with-qt-6-10.patch |  0
 .../te/texmaker/package.nix}                  | 26 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 11 insertions(+), 17 deletions(-)
 rename pkgs/{applications/editors => by-name/te}/texmaker/fix-build-with-qt-6-10.patch (100%)
 rename pkgs/{applications/editors/texmaker/default.nix => by-name/te/texmaker/package.nix} (80%)

diff --git a/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch b/pkgs/by-name/te/texmaker/fix-build-with-qt-6-10.patch
similarity index 100%
rename from pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch
rename to pkgs/by-name/te/texmaker/fix-build-with-qt-6-10.patch
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/by-name/te/texmaker/package.nix
similarity index 80%
rename from pkgs/applications/editors/texmaker/default.nix
rename to pkgs/by-name/te/texmaker/package.nix
index ab19250e69be..8f35448653ee 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/by-name/te/texmaker/package.nix
@@ -4,21 +4,17 @@
   fetchurl,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  poppler,
-  qtbase,
-  qttools,
-  qtwebengine,
-  qt5compat,
+  qt6,
+  qt6Packages,
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "texmaker";
   version = "6.0.1";
 
   src = fetchurl {
-    url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
+    url = "http://www.xm1math.net/texmaker/texmaker-${finalAttrs.version}.tar.bz2";
     hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
   };
 
@@ -28,17 +24,17 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    poppler
-    qtbase
-    qtwebengine
-    qt5compat
-    qttools
+    qt6Packages.poppler
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qt5compat
+    qt6.qttools
     zlib
   ];
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   qmakeFlags = [
@@ -63,4 +59,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "texmaker";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0ee6da108a4..5a90f8fced27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3656,8 +3656,6 @@ with pkgs;
     extraFonts = true;
   };
 
-  texmaker = qt6Packages.callPackage ../applications/editors/texmaker { };
-
   texworks = qt6Packages.callPackage ../applications/editors/texworks { };
 
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };

From 2b076df97f638827d006f763002fa84466e8f3b3 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:51:37 +0200
Subject: [PATCH 070/108] texworks: move to by-name, modernize

---
 .../te/texworks/package.nix}                  | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 17 deletions(-)
 rename pkgs/{applications/editors/texworks/default.nix => by-name/te/texworks/package.nix} (70%)

diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/by-name/te/texworks/package.nix
similarity index 70%
rename from pkgs/applications/editors/texworks/default.nix
rename to pkgs/by-name/te/texworks/package.nix
index 43753c97f1ad..8f4fb723e5be 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/by-name/te/texworks/package.nix
@@ -4,44 +4,41 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  qt6,
+  qt6Packages,
   hunspell,
-  poppler,
-  qt5compat,
-  qttools,
-  qtwayland,
   withLua ? true,
   lua,
   withPython ? true,
   python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "texworks";
   version = "0.6.10";
 
   src = fetchFromGitHub {
     owner = "TeXworks";
     repo = "texworks";
-    rev = "release-${version}";
+    rev = "release-${finalAttrs.version}";
     sha256 = "sha256-tC3ADD35yrmwBJQ8JaXdr8trVf6WLt1r2/euzt0mvN8=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     hunspell
-    poppler
-    qt5compat
-    qttools
+    qt6Packages.poppler
+    qt6.qt5compat
+    qt6.qttools
   ]
   ++ lib.optional withLua lua
   ++ lib.optional withPython python3
-  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
 
   cmakeFlags = [
     "-DQT_DEFAULT_MAJOR_VERSION=6"
@@ -50,12 +47,12 @@ stdenv.mkDerivation rec {
   ++ lib.optional withPython "-DWITH_PYTHON=ON";
 
   meta = {
-    changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS";
+    changelog = "https://github.com/TeXworks/texworks/blob/${finalAttrs.src.rev}/NEWS";
     description = "Simple TeX front-end program inspired by TeXShop";
     homepage = "http://www.tug.org/texworks/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
-    platforms = with lib.platforms; linux;
+    platforms = lib.platforms.linux;
     mainProgram = "texworks";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a90f8fced27..554dc5d71d46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3656,8 +3656,6 @@ with pkgs;
     extraFonts = true;
   };
 
-  texworks = qt6Packages.callPackage ../applications/editors/texworks { };
-
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
   tinc = callPackage ../tools/networking/tinc { };

From b2e1a996ffd48e7a6067f4c9ad33e5459659ce7c Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:55:02 +0200
Subject: [PATCH 071/108] kernelshark: move to by-name

---
 .../ke/kernelshark/package.nix}                     | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{os-specific/linux/trace-cmd/kernelshark.nix => by-name/ke/kernelshark/package.nix} (93%)

diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/by-name/ke/kernelshark/package.nix
similarity index 93%
rename from pkgs/os-specific/linux/trace-cmd/kernelshark.nix
rename to pkgs/by-name/ke/kernelshark/package.nix
index d7136f4a5d71..a6a43e7fd72d 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/by-name/ke/kernelshark/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  qtbase,
-  qtscxml,
+  qt6,
   cmake,
   json_c,
   mesa_glu,
@@ -13,8 +12,6 @@
   libtraceevent,
   libtracefs,
   freefont_ttf,
-  wrapQtAppsHook,
-  qtwayland,
   fetchpatch,
 }:
 
@@ -40,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtscxml
-    qtwayland
+    qt6.qtbase
+    qt6.qtscxml
+    qt6.qtwayland
     json_c
     mesa_glu
     libglut
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 554dc5d71d46..2502e8d9dffb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3686,8 +3686,6 @@ with pkgs;
 
   trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
 
-  kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
-
   translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
 
   translatepy = with python3.pkgs; toPythonApplication translatepy;

From 82b5fa611fb919c1a1417816047bf9831cfe2028 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:59:45 +0200
Subject: [PATCH 072/108] doxygen: move to by-name

---
 .../doxygen/default.nix => by-name/do/doxygen/package.nix} | 7 ++++---
 pkgs/top-level/all-packages.nix                            | 6 +-----
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename pkgs/{development/tools/documentation/doxygen/default.nix => by-name/do/doxygen/package.nix} (92%)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/by-name/do/doxygen/package.nix
similarity index 92%
rename from pkgs/development/tools/documentation/doxygen/default.nix
rename to pkgs/by-name/do/doxygen/package.nix
index bd70e8d59490..be439f4faf7f 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/by-name/do/doxygen/package.nix
@@ -6,6 +6,7 @@
   python3,
   flex,
   bison,
+  withGui ? false,
   qt6,
   libiconv,
   spdlog,
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     fmt
     sqlite
   ]
-  ++ lib.optionals (qt6 != null) [
+  ++ lib.optionals withGui [
     qt6.qtbase
     qt6.wrapQtAppsHook
     qt6.qtsvg
@@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Duse_sys_fmt=ON"
     "-Duse_sys_sqlite3=ON"
   ]
-  ++ lib.optional (qt6 != null) "-Dbuild_wizard=YES";
+  ++ lib.optional withGui "-Dbuild_wizard=YES";
 
   # put examples in an output so people/tools can test against them
   outputs = [
@@ -89,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
       off-line reference manual (in LaTeX) from a set of documented source
       files.
     '';
-    platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix;
+    platforms = if withGui then lib.platforms.linux else lib.platforms.unix;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2502e8d9dffb..2129725b48b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5999,11 +5999,7 @@ with pkgs;
 
   dot2tex = with python3.pkgs; toPythonApplication dot2tex;
 
-  doxygen = callPackage ../development/tools/documentation/doxygen {
-    qt6 = null;
-  };
-
-  doxygen_gui = lowPrio (doxygen.override { inherit qt6; });
+  doxygen_gui = lowPrio (doxygen.override { withGui = true; });
 
   drake = callPackage ../development/tools/build-managers/drake { };
 

From 3a6163edd0f921543504e85d2a40ddcc650b94aa Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:02:40 +0200
Subject: [PATCH 073/108] python3Packages.doxmlparser: move into
 python-packages

---
 .../doxmlparser.nix => python-modules/doxmlparser/default.nix}  | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/{tools/documentation/doxygen/doxmlparser.nix => python-modules/doxmlparser/default.nix} (100%)

diff --git a/pkgs/development/tools/documentation/doxygen/doxmlparser.nix b/pkgs/development/python-modules/doxmlparser/default.nix
similarity index 100%
rename from pkgs/development/tools/documentation/doxygen/doxmlparser.nix
rename to pkgs/development/python-modules/doxmlparser/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cce9f803536..2ed24daec215 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4572,7 +4572,7 @@ self: super: with self; {
 
   downloader-cli = callPackage ../development/python-modules/downloader-cli { };
 
-  doxmlparser = callPackage ../development/tools/documentation/doxygen/doxmlparser.nix { };
+  doxmlparser = callPackage ../development/python-modules/doxmlparser { };
 
   dparse = callPackage ../development/python-modules/dparse { };
 

From fa581fb67486c5910177d79d4115b441f0899409 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:06:49 +0200
Subject: [PATCH 074/108] retext: migrate to by-name

---
 .../re/retext/package.nix}                    | 23 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 15 deletions(-)
 rename pkgs/{applications/editors/retext/default.nix => by-name/re/retext/package.nix} (85%)

diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/by-name/re/retext/package.nix
similarity index 85%
rename from pkgs/applications/editors/retext/default.nix
rename to pkgs/by-name/re/retext/package.nix
index 5bd6ace5f54f..1bf3d35234bb 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/by-name/re/retext/package.nix
@@ -1,12 +1,9 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchzip,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  qtsvg,
+  qt6,
   buildEnv,
   aspellDicts,
   # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
@@ -17,7 +14,7 @@
   ],
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "retext";
   version = "8.1.0";
   pyproject = true;
@@ -34,19 +31,19 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-nqKAUg9nTzGPPxr80KTn6JX9JgCUJwpcwp8aOIlcxPY=";
   };
 
-  build-system = with python3.pkgs; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qttools.dev
+    qt6.wrapQtAppsHook
+    qt6.qttools.dev
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
+    qt6.qtbase
+    qt6.qtsvg
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     chardet
     docutils
     markdown
@@ -81,7 +78,7 @@ python3.pkgs.buildPythonApplication rec {
       }"
     )
 
-    cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
+    cp ${toolbarIcons}/* $out/${python3Packages.python.sitePackages}/ReText/icons
 
     substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
       --replace-fail "Exec=retext-${version}.data/scripts/retext %F" "Exec=retext %F" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2129725b48b2..d232b88e9c88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3485,8 +3485,6 @@ with pkgs;
 
   ratarmount = with python3Packages; toPythonApplication ratarmount;
 
-  retext = qt6Packages.callPackage ../applications/editors/retext { };
-
   inherit (callPackage ../tools/security/rekor { })
     rekor-cli
     rekor-server

From b31c20ab79a4fb0362e8351a5325a21b7328efd5 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 23 Jan 2026 17:50:09 +0200
Subject: [PATCH 075/108] minizinc-ide: move to by-name, modernize

---
 .../mi/minizinc-ide/package.nix}              | 25 +++++++++----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 13 insertions(+), 14 deletions(-)
 rename pkgs/{development/tools/minizinc/ide.nix => by-name/mi/minizinc-ide/package.nix} (80%)

diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/by-name/mi/minizinc-ide/package.nix
similarity index 80%
rename from pkgs/development/tools/minizinc/ide.nix
rename to pkgs/by-name/mi/minizinc-ide/package.nix
index de125700780e..760fab209312 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/by-name/mi/minizinc-ide/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
-  qtwebsockets,
+  qt6,
   minizinc,
   makeWrapper,
   copyDesktopItems,
@@ -19,27 +17,28 @@ let
     else
       "$out/bin/MiniZincIDE";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "minizinc-ide";
   version = "2.9.5";
 
   src = fetchFromGitHub {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-VqVcByPBS7UBU/h5NIUltIKA0POAX1dUVgMsn5b9C4w=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    qmake
+    qt6.qmake
     makeWrapper
     copyDesktopItems
     imagemagick
   ];
+
   buildInputs = [
-    qtbase
-    qtwebsockets
+    qt6.qtbase
+    qt6.qtwebsockets
   ];
 
   desktopItems = [
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
       name = "MiniZincIDE";
       desktopName = "MiniZincIDE";
       icon = "minizinc";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
       exec = "MiniZincIDE";
       type = "Application";
       terminal = false;
@@ -59,7 +58,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  sourceRoot = "${src.name}/MiniZincIDE";
+  sourceRoot = "${finalAttrs.src.name}/MiniZincIDE";
 
   dontWrapQtApps = true;
 
@@ -71,11 +70,11 @@ stdenv.mkDerivation rec {
     + ''
       wrapProgram ${executableLoc} \
         --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} \
-        --set QT_QPA_PLATFORM_PLUGIN_PATH "${qtbase}/lib/qt-6/plugins/platforms"
+        --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt6.qtbase}/lib/qt-6/plugins/platforms"
 
       for size in 16 24 32 48 64 128 256 512; do
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        magick -background none ${src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png
+        magick -background none ${finalAttrs.src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png
       done
     '';
 
@@ -94,4 +93,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5d5b73eb9e32..8228ce183e11 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1196,6 +1196,7 @@ mapAliases {
   minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
   minetestclient = throw "'minetestclient' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
   minetestserver = throw "'minetestserver' has been renamed to/replaced by 'luanti-server'"; # Converted to throw 2025-10-27
+  minizincide = warnAlias "'minizincide' has been renamed to 'minizinc-ide'" minizinc-ide; # Added 2026-01-03
   minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27
   miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
   mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d232b88e9c88..97bd1be46156 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6098,7 +6098,6 @@ with pkgs;
     );
 
   minizinc = callPackage ../development/tools/minizinc { };
-  minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix { };
 
   mkdocs = with python3Packages; toPythonApplication mkdocs;
 

From 2dc0ec1cd338bcb21ae4a9f847bc3ade5c154581 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:22:28 +0200
Subject: [PATCH 076/108] qtcreator: move to by-name

---
 .../qt/qtcreator/package.nix}                 | 54 +++++++------------
 .../qt}/qtcreator/with-plugins.nix            |  0
 pkgs/top-level/all-packages.nix               |  5 --
 3 files changed, 20 insertions(+), 39 deletions(-)
 rename pkgs/{development/tools/qtcreator/default.nix => by-name/qt/qtcreator/package.nix} (84%)
 rename pkgs/{development/tools => by-name/qt}/qtcreator/with-plugins.nix (100%)

diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/by-name/qt/qtcreator/package.nix
similarity index 84%
rename from pkgs/development/tools/qtcreator/default.nix
rename to pkgs/by-name/qt/qtcreator/package.nix
index ca44d1d9e78b..674e9e6a076e 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/by-name/qt/qtcreator/package.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   fetchurl,
   cmake,
@@ -7,24 +6,13 @@
   ninja,
   go,
   python3,
-  qtbase,
-  qt5compat,
-  qtdeclarative,
-  qtdoc,
-  qtquick3d,
-  qtquicktimeline,
-  qtserialport,
-  qtsvg,
-  qttools,
-  qtwebengine,
-  qtwayland,
-  qtshadertools,
-  wrapQtAppsHook,
+  qt6,
   yaml-cpp,
   litehtml,
   libsecret,
   gumbo,
-  llvmPackages,
+  llvmPackages_21,
+  stdenv' ? llvmPackages_21.stdenv,
   rustc-demangle,
   elfutils,
   perf,
@@ -49,39 +37,37 @@ let
       '';
     }).goModules;
 in
-stdenv.mkDerivation {
-  inherit pname;
-  inherit version;
-  inherit src;
+stdenv'.mkDerivation {
+  inherit pname version src;
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    (qttools.override { withClang = true; })
-    wrapQtAppsHook
+    (qt6.qttools.override { withClang = true; })
+    qt6.wrapQtAppsHook
     python3
     ninja
     go
   ];
 
   buildInputs = [
-    qtbase
-    qtdoc
-    qtsvg
-    qtquick3d
-    qtwebengine
-    qtwayland
-    qtserialport
-    qtshadertools
-    qt5compat
-    qtdeclarative
-    qtquicktimeline
+    qt6.qtbase
+    qt6.qtdoc
+    qt6.qtsvg
+    qt6.qtquick3d
+    qt6.qtwebengine
+    qt6.qtwayland
+    qt6.qtserialport
+    qt6.qtshadertools
+    qt6.qt5compat
+    qt6.qtdeclarative
+    qt6.qtquicktimeline
     yaml-cpp
     litehtml
     libsecret
     gumbo
-    llvmPackages.libclang
-    llvmPackages.llvm
+    llvmPackages_21.libclang
+    llvmPackages_21.llvm
     rustc-demangle
     elfutils
   ];
diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/by-name/qt/qtcreator/with-plugins.nix
similarity index 100%
rename from pkgs/development/tools/qtcreator/with-plugins.nix
rename to pkgs/by-name/qt/qtcreator/with-plugins.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97bd1be46156..2e17f9171466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6207,11 +6207,6 @@ with pkgs;
 
   pycritty = with python3Packages; toPythonApplication pycritty;
 
-  qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
-    llvmPackages = llvmPackages_21;
-    stdenv = llvmPackages_21.stdenv;
-  };
-
   qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit { };
 
   radare2 = callPackage ../development/tools/analysis/radare2 (

From e2b23c29ead8dd7720882d1236042bb9a930f92d Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:31:33 +0200
Subject: [PATCH 077/108] graphia: move to by-name

---
 .../gr/graphia/package.nix}                   | 22 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 ---
 2 files changed, 9 insertions(+), 16 deletions(-)
 rename pkgs/{applications/science/misc/graphia/default.nix => by-name/gr/graphia/package.nix} (81%)

diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/by-name/gr/graphia/package.nix
similarity index 81%
rename from pkgs/applications/science/misc/graphia/default.nix
rename to pkgs/by-name/gr/graphia/package.nix
index 9df8a729f035..dfe38b62a56e 100644
--- a/pkgs/applications/science/misc/graphia/default.nix
+++ b/pkgs/by-name/gr/graphia/package.nix
@@ -4,35 +4,31 @@
   cmake,
   git,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qtbase,
-  qtdeclarative,
-  qtsvg,
-  qtwebengine,
+  qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "graphia";
   version = "5.2";
 
   src = fetchFromGitHub {
     owner = "graphia-app";
     repo = "graphia";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k=";
   };
 
   nativeBuildInputs = [
     cmake
     git # needs to define some hash as a version
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtwebengine
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtsvg
+    qt6.qtwebengine
   ];
 
   meta = {
@@ -46,4 +42,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.bgamari ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e17f9171466..3c3a5ebe72ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6637,9 +6637,6 @@ with pkgs;
   ghp-import = with python3Packages; toPythonApplication ghp-import;
 
   ghcid = haskellPackages.ghcid.bin;
-
-  graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
-
   glfw = glfw3;
 
   glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix {

From c827f9abbd849f9814c634366d0c558518e093b3 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:35:31 +0200
Subject: [PATCH 078/108] polychromatic: migrate to by-name

---
 .../default.nix => by-name/po/polychromatic/package.nix}  | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/polychromatic/default.nix => by-name/po/polychromatic/package.nix} (94%)

diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/by-name/po/polychromatic/package.nix
similarity index 94%
rename from pkgs/applications/misc/polychromatic/default.nix
rename to pkgs/by-name/po/polychromatic/package.nix
index 6c81de45df6d..507d14663f6f 100644
--- a/pkgs/applications/misc/polychromatic/default.nix
+++ b/pkgs/by-name/po/polychromatic/package.nix
@@ -10,7 +10,7 @@
   wrapGAppsHook3,
   libayatana-appindicator,
   libxcb,
-  qt6,
+  qt6Packages,
   ibus,
   usbutils,
   psmisc,
@@ -48,11 +48,11 @@ python3Packages.buildPythonApplication rec {
     ninja
     sassc
     wrapGAppsHook3
-    qt6.wrapQtAppsHook
-    qt6.qtbase
+    qt6Packages.wrapQtAppsHook
+    qt6Packages.qtbase
   ];
 
-  buildInputs = [ qt6.qtwayland ];
+  buildInputs = [ qt6Packages.qtwayland ];
 
   propagatedBuildInputs =
     with python3Packages;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c3a5ebe72ce..ed8c718db025 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9758,8 +9758,6 @@ with pkgs;
 
   papis = with python3Packages; toPythonApplication papis;
 
-  polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
-
   scheherazade-new = scheherazade.override {
     version = "4.400";
   };

From abe9c02e412a65159197067ce02d5a545655e149 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 31 Jan 2026 19:58:13 +0200
Subject: [PATCH 079/108] polychromatic: move to by-name

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

diff --git a/pkgs/by-name/po/polychromatic/package.nix b/pkgs/by-name/po/polychromatic/package.nix
index 507d14663f6f..6c81de45df6d 100644
--- a/pkgs/by-name/po/polychromatic/package.nix
+++ b/pkgs/by-name/po/polychromatic/package.nix
@@ -10,7 +10,7 @@
   wrapGAppsHook3,
   libayatana-appindicator,
   libxcb,
-  qt6Packages,
+  qt6,
   ibus,
   usbutils,
   psmisc,
@@ -48,11 +48,11 @@ python3Packages.buildPythonApplication rec {
     ninja
     sassc
     wrapGAppsHook3
-    qt6Packages.wrapQtAppsHook
-    qt6Packages.qtbase
+    qt6.wrapQtAppsHook
+    qt6.qtbase
   ];
 
-  buildInputs = [ qt6Packages.qtwayland ];
+  buildInputs = [ qt6.qtwayland ];
 
   propagatedBuildInputs =
     with python3Packages;

From c893ad8b09b91b1b71b44b044859842ad3b1719a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:50:30 +0200
Subject: [PATCH 080/108] ausweisapp: move to by-name

---
 .../au/ausweisapp/package.nix}                | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename pkgs/{applications/misc/ausweisapp/default.nix => by-name/au/ausweisapp/package.nix} (88%)

diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/by-name/au/ausweisapp/package.nix
similarity index 88%
rename from pkgs/applications/misc/ausweisapp/default.nix
rename to pkgs/by-name/au/ausweisapp/package.nix
index e5396ceae468..b69dfd9318c1 100644
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/by-name/au/ausweisapp/package.nix
@@ -5,13 +5,8 @@
   testers,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  qt6,
   pcsclite,
-  qtscxml,
-  qtsvg,
-  qttools,
-  qtwayland,
-  qtwebsockets,
   gitUpdater,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   # The build scripts copy the entire translations directory from Qt
@@ -39,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     pcsclite
-    qtscxml
-    qtsvg
-    qttools
-    qtwayland
-    qtwebsockets
+    qt6.qtscxml
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qtwayland
+    qt6.qtwebsockets
   ];
 
   passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed8c718db025..cd3a52b07801 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9870,8 +9870,6 @@ with pkgs;
 
   bambootracker-qt6 = bambootracker.override { withQt6 = true; };
 
-  ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };
-
   awesome = callPackage ../applications/window-managers/awesome {
     cairo = cairo.override { xcbSupport = true; };
     inherit (texFunctions) fontsConf;

From 1778c8ed15d1cf21df8dbfd76a1816b1d68e4da1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:23:31 +0200
Subject: [PATCH 081/108] calcmysky: move to by-name

---
 .../ca/calcmysky/package.nix}                       | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{applications/science/astronomy/calcmysky/default.nix => by-name/ca/calcmysky/package.nix} (85%)

diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/by-name/ca/calcmysky/package.nix
similarity index 85%
rename from pkgs/applications/science/astronomy/calcmysky/default.nix
rename to pkgs/by-name/ca/calcmysky/package.nix
index 5c961c99a85c..aa0f2562fcf8 100644
--- a/pkgs/applications/science/astronomy/calcmysky/default.nix
+++ b/pkgs/by-name/ca/calcmysky/package.nix
@@ -3,32 +3,31 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
+  qt6,
   glm,
   eigen,
-  qtbase,
   stellarium,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "calcmysky";
   version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "10110111";
     repo = "CalcMySky";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-AuDHLgOS+Cu2xSJQVi8XfrINoh18STP1ox7JElafW3k=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     glm
     eigen
-    qtbase
+    qt6.qtbase
   ];
 
   cmakeFlags = [ "-DQT_VERSION=6" ];
@@ -45,4 +44,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ nickcao ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3a52b07801..2b39b1e084db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9915,8 +9915,6 @@ with pkgs;
 
   breezy = with python3Packages; toPythonApplication breezy;
 
-  calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
-
   # calico-felix and calico-node have not been packaged due to libbpf, linking issues
   inherit (callPackage ../applications/networking/cluster/calico { })
     calico-apiserver

From e23cbf4bcb63d80d867d50ee91bd6c0962872d55 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:26:09 +0200
Subject: [PATCH 082/108] copyq: move to by-name

---
 .../co/copyq/package.nix}                     | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename pkgs/{applications/misc/copyq/default.nix => by-name/co/copyq/package.nix} (89%)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/by-name/co/copyq/package.nix
similarity index 89%
rename from pkgs/applications/misc/copyq/default.nix
rename to pkgs/by-name/co/copyq/package.nix
index d0f69520f4cc..b1b3e65f8d63 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/by-name/co/copyq/package.nix
@@ -5,16 +5,11 @@
   fetchpatch2,
   cmake,
   ninja,
-  qtbase,
-  qtsvg,
-  qttools,
-  qtdeclarative,
+  qt6,
   libXfixes,
   libXtst,
-  qtwayland,
   wayland,
   pkg-config,
-  wrapQtAppsHook,
   kdePackages,
 }:
 
@@ -33,18 +28,18 @@ stdenv.mkDerivation rec {
     cmake
     ninja
     kdePackages.extra-cmake-modules
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     pkg-config
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qttools
-    qtdeclarative
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qtdeclarative
     libXfixes
     libXtst
-    qtwayland
+    qt6.qtwayland
     wayland
     kdePackages.kconfig
     kdePackages.kstatusnotifieritem
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b39b1e084db..fe4c18c89433 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9946,8 +9946,6 @@ with pkgs;
 
   confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
 
-  copyq = qt6Packages.callPackage ../applications/misc/copyq { };
-
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };

From 17fe487f5a916cfce4bc9ce3755521374d7933e0 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:29:29 +0200
Subject: [PATCH 083/108] input-leap: move to by-name

---
 .../in}/input-leap/macos-no-dmg.patch         |  0
 .../in/input-leap/package.nix}                | 28 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 ---
 3 files changed, 12 insertions(+), 20 deletions(-)
 rename pkgs/{applications/misc => by-name/in}/input-leap/macos-no-dmg.patch (100%)
 rename pkgs/{applications/misc/input-leap/default.nix => by-name/in/input-leap/package.nix} (87%)

diff --git a/pkgs/applications/misc/input-leap/macos-no-dmg.patch b/pkgs/by-name/in/input-leap/macos-no-dmg.patch
similarity index 100%
rename from pkgs/applications/misc/input-leap/macos-no-dmg.patch
rename to pkgs/by-name/in/input-leap/macos-no-dmg.patch
diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/by-name/in/input-leap/package.nix
similarity index 87%
rename from pkgs/applications/misc/input-leap/default.nix
rename to pkgs/by-name/in/input-leap/package.nix
index 5fdc6ecadcec..329d388aec42 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -3,10 +3,6 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-
-  withLibei ? !stdenv.hostPlatform.isDarwin,
-
-  avahi,
   curl,
   libICE,
   libSM,
@@ -21,20 +17,20 @@
   openssl,
   pkgsStatic,
   pkg-config,
-  qtbase,
-  qttools,
+  qt6,
   wrapGAppsHook3,
-  wrapQtAppsHook,
+  avahi,
+  avahi' ? avahi.override { withLibdnssdCompat = true; },
+  withLibei ? !stdenv.hostPlatform.isDarwin,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "input-leap";
   version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "input-leap";
     repo = "input-leap";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-zSaeeMlhpWIX3y4OmZ7eHXCu1HPP7NU5HFkME/JZjuQ=";
     fetchSubmodules = true;
   };
@@ -45,14 +41,14 @@ stdenv.mkDerivation rec {
     pkg-config
     cmake
     wrapGAppsHook3
-    wrapQtAppsHook
-    qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
   ];
 
   buildInputs = [
     curl
-    qtbase
-    avahi
+    qt6.qtbase
+    avahi'
     libX11
     libXext
     libXtst
@@ -71,7 +67,7 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DINPUTLEAP_REVISION=${builtins.substring 0 8 src.rev}"
+    "-DINPUTLEAP_REVISION=${builtins.substring 0 8 finalAttrs.src.rev}"
   ]
   ++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON";
 
@@ -102,4 +98,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe4c18c89433..26669ffe930c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10059,10 +10059,6 @@ with pkgs;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
-  input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
-    avahi = avahi.override { withLibdnssdCompat = true; };
-  };
-
   evolution-data-server-gtk4 = evolution-data-server.override {
     withGtk3 = false;
     withGtk4 = true;

From de5e0a74e1f0c3258c4c4e05951c3e17dcebdae0 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:32:10 +0200
Subject: [PATCH 084/108] focuswriter: move to by-name

---
 .../fo/focuswriter/package.nix}               | 26 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 18 deletions(-)
 rename pkgs/{applications/editors/focuswriter/default.nix => by-name/fo/focuswriter/package.nix} (75%)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/by-name/fo/focuswriter/package.nix
similarity index 75%
rename from pkgs/applications/editors/focuswriter/default.nix
rename to pkgs/by-name/fo/focuswriter/package.nix
index 0bc8aa027561..e1eab242465b 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/by-name/fo/focuswriter/package.nix
@@ -2,41 +2,35 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   cmake,
   hunspell,
-  qtbase,
-  qtmultimedia,
-  qttools,
-  qt5compat,
-  qtwayland,
-  wrapQtAppsHook,
+  qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "focuswriter";
   version = "1.8.13";
 
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = "focuswriter";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI=";
   };
 
   nativeBuildInputs = [
     pkg-config
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     hunspell
-    qtbase
-    qtmultimedia
-    qt5compat
-    qtwayland
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qt5compat
+    qt6.qtwayland
   ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
@@ -52,4 +46,4 @@ stdenv.mkDerivation rec {
     homepage = "https://gottcode.org/focuswriter/";
     mainProgram = "focuswriter";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26669ffe930c..bac6de25f7fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10079,8 +10079,6 @@ with pkgs;
     hamlib = hamlib_4;
   };
 
-  focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { };
-
   fossil = callPackage ../applications/version-management/fossil {
     sqlite = sqlite.override { enableDeserialize = true; };
   };

From badd54e68e48f8ed3522528dbb766259f19d1def Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:34:27 +0200
Subject: [PATCH 085/108] welle-io: move to by-name

---
 .../we/welle-io/package.nix}                     | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/radio/welle-io/default.nix => by-name/we/welle-io/package.nix} (90%)

diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/by-name/we/welle-io/package.nix
similarity index 90%
rename from pkgs/applications/radio/welle-io/default.nix
rename to pkgs/by-name/we/welle-io/package.nix
index ba6a49a7e710..623eff5967c0 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/by-name/we/welle-io/package.nix
@@ -5,11 +5,7 @@
   fetchpatch,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
-  qtmultimedia,
-  qt5compat,
+  qt6,
   faad2,
   rtl-sdr,
   soapysdr-with-plugins,
@@ -45,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     unixtools.xxd
   ];
 
@@ -55,10 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
     lame
     libusb-compat-0_1
     mpg123
-    qtbase
-    qtcharts
-    qtmultimedia
-    qt5compat
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtmultimedia
+    qt6.qt5compat
     rtl-sdr
     soapysdr-with-plugins
   ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bac6de25f7fe..7dd77b6608a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10121,8 +10121,6 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  welle-io = qt6Packages.callPackage ../applications/radio/welle-io { };
-
   wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
     libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
   };

From 2f3eb7881cab87f9232d63f3239b981cd6fd6d62 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:39:49 +0200
Subject: [PATCH 086/108] wireshark-qt: create alias

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8228ce183e11..c4314dfc31d1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1867,6 +1867,7 @@ mapAliases {
   wineWayland = throw "'wineWayland' has been renamed to/replaced by 'wine-wayland'"; # Converted to throw 2025-10-27
   wingpanel-indicator-ayatana = throw "'wingpanel-indicator-ayatana' has been removed as it is archived upstream and doesn't work with pantheon 8 and onwards. Use wingpanel-indicator-namarupa instead"; # Added 2026-01-14
   winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
+  wireshark-qt = warnAlias "'wireshark-qt' has been renamed to/replaced by 'wireshark'" wireshark; # Added 2026-01-23
   wkhtmltopdf-bin = throw "'wkhtmltopdf-bin' has been renamed to/replaced by 'wkhtmltopdf'"; # Converted to throw 2025-10-27
   wlx-overlay-s = throw "'wlx-overlay-s' and 'wayvr-dashboard' have been merged into a single application. Please switch to 'wayvr'"; # Added 2026-01-09
   wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7dd77b6608a9..27a98bd017f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10124,7 +10124,6 @@ with pkgs;
   wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
     libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
   };
-  wireshark-qt = wireshark;
 
   qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { };
 

From 2c491b52f7f2ddf2a32b5225632af43efd272368 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:48:10 +0200
Subject: [PATCH 087/108] wireshark: move to by-name, modernize

---
 .../wi/wireshark/package.nix}                      | 14 +++++++-------
 .../wireshark/patches/lookup-dumpcap-in-path.patch |  0
 pkgs/top-level/all-packages.nix                    |  9 +--------
 3 files changed, 8 insertions(+), 15 deletions(-)
 rename pkgs/{applications/networking/sniffers/wireshark/default.nix => by-name/wi/wireshark/package.nix} (96%)
 rename pkgs/{applications/networking/sniffers => by-name/wi}/wireshark/patches/lookup-dumpcap-in-path.patch (100%)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/by-name/wi/wireshark/package.nix
similarity index 96%
rename from pkgs/applications/networking/sniffers/wireshark/default.nix
rename to pkgs/by-name/wi/wireshark/package.nix
index 9d5a98ac5f1a..5293c378af7e 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/by-name/wi/wireshark/package.nix
@@ -50,14 +50,14 @@
   brotli,
 
   withQt ? true,
-  qt6 ? null,
+  qt6,
+  libpcap' ? libpcap.override { withBluez = stdenv.hostPlatform.isLinux; },
 }:
 let
   isAppBundle = withQt && stdenv.hostPlatform.isDarwin;
 in
-assert withQt -> qt6 != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
   version = "4.6.3";
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     repo = "wireshark";
     owner = "wireshark";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DthYkAW6UYnsDLQf2h3jgJB8RZoasjREWV1NTtZv7PQ=";
   };
 
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     libkrb5
     libmaxminddb
     libopus
-    libpcap
+    libpcap'
     libsmi
     libssh
     libxml2
@@ -226,7 +226,7 @@ stdenv.mkDerivation rec {
       experts. It runs on UNIX, macOS and Windows.
     '';
     homepage = "https://www.wireshark.org";
-    changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html";
+    changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.src.tag}.html";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
@@ -235,4 +235,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = if withQt then "wireshark" else "tshark";
   };
-}
+})
diff --git a/pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch b/pkgs/by-name/wi/wireshark/patches/lookup-dumpcap-in-path.patch
similarity index 100%
rename from pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch
rename to pkgs/by-name/wi/wireshark/patches/lookup-dumpcap-in-path.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a98bd017f9..7e7ff9e15b9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10121,17 +10121,10 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
-    libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
-  };
-
   qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { };
 
   tshark = wireshark-cli;
-  wireshark-cli = wireshark.override {
-    withQt = false;
-    libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
-  };
+  wireshark-cli = wireshark.override { withQt = false; };
 
   buildMozillaMach =
     opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };

From 7e388cae04d1fc2bbb431692b16ead1c2c87061c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 18:03:55 +0000
Subject: [PATCH 088/108] python3Packages.waterfurnace: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix
index 3e9e9cd357e6..fd4c8a87ca07 100644
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "waterfurnace";
-  version = "1.4.0";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sdague";
     repo = "waterfurnace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1WHXhLLk9l/WQvmC6zrkbLFth9jf/M1vZsv05CZtevE=";
+    hash = "sha256-xXtAC099RideDuTvdUUn5wtuagpBMDMvrOMx9+alWhg=";
   };
 
   build-system = [ setuptools ];

From cabb13163c640bcf74c07e4923d57caa4552e4d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Jan 2026 21:19:15 +0000
Subject: [PATCH 089/108] stackql: 0.8.175 -> 0.9.339

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

diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix
index 5abb0bd2729d..4ec3efbcbdc0 100644
--- a/pkgs/by-name/st/stackql/package.nix
+++ b/pkgs/by-name/st/stackql/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "stackql";
-  version = "0.8.175";
+  version = "0.9.339";
 
   src = fetchFromGitHub {
     owner = "stackql";
     repo = "stackql";
     rev = "v${version}";
-    hash = "sha256-JA9vTmjNIXhvcdH9BPmtSD3W3VkytG+dYOtOJ+hFnsQ=";
+    hash = "sha256-WuzY4Vje+Gwzf0Ep5nE5jkF1iJkFKX640ay+nqiF0Dg=";
   };
 
-  vendorHash = "sha256-lACvTdzOZ5AnPqaw+uGMbO3HnjKU/dSVATgmrdYpWNE=";
+  vendorHash = "sha256-H8vp2yuP2/mh8GAWTsFOpNJEXfxjyLHZq4m65iyERmw=";
 
   ldflags = [
     "-s"
@@ -25,7 +25,7 @@ buildGoModule rec {
     "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion=${builtins.elemAt (lib.splitVersion version) 0}"
     "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMinorVersion=${builtins.elemAt (lib.splitVersion version) 1}"
     "-X github.com/stackql/stackql/internal/stackql/cmd.BuildPatchVersion=${builtins.elemAt (lib.splitVersion version) 2}"
-    "-X github.com/stackql/stackql/internal/stackql/cmd.BuildDate=2024-05-15T07:51:52Z" # date of commit hash
+    "-X github.com/stackql/stackql/internal/stackql/cmd.BuildDate=2026-01-14T07:36:20Z" # date of commit hash
     "-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=true"
   ];
 

From 4be0a32c68efdd572de879e718cbe633c6c578a6 Mon Sep 17 00:00:00 2001
From: bitbloxhub <45184892+bitbloxhub@users.noreply.github.com>
Date: Sat, 31 Jan 2026 18:42:39 +0000
Subject: [PATCH 090/108] python3Packages.py-slvs: add patch for CMake 4

---
 pkgs/development/python-modules/py-slvs/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/py-slvs/default.nix b/pkgs/development/python-modules/py-slvs/default.nix
index 5f68487a879a..db3adcdb2a43 100644
--- a/pkgs/development/python-modules/py-slvs/default.nix
+++ b/pkgs/development/python-modules/py-slvs/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   swig,
   cmake,
   ninja,
@@ -19,6 +20,15 @@ buildPythonPackage rec {
     hash = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI=";
   };
 
+  patches = [
+    # https://github.com/realthunder/slvs_py/pull/11
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/realthunder/slvs_py/compare/ab95814...ad0e1f7.patch";
+      hash = "sha256-LqDDx7uWq5VOkbE/aRu1JAau/DVfr40KK+L8PbBeGoU=";
+    })
+  ];
+
   pyproject = true;
 
   nativeBuildInputs = [

From 85a935c358b16befbf97c22b7052b9b399ea7910 Mon Sep 17 00:00:00 2001
From: Gon Solo <gonsolo@gmail.com>
Date: Thu, 22 Jan 2026 10:43:08 +0100
Subject: [PATCH 091/108] klayout: 0.30.4-1 -> 0.30.5

Diff: https://github.com/KLayout/klayout/compare/v0.30.4-1...v0.30.5

Changelog: https://www.klayout.de/development.html#0.30.5
---
 pkgs/applications/misc/klayout/default.nix | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 51ebe629d37b..6165feaf8b1b 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  installShellFiles,
   python3,
   ruby,
   wrapQtAppsHook,
@@ -16,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klayout";
-  version = "0.30.4-1";
+  version = "0.30.5";
 
   src = fetchFromGitHub {
     owner = "KLayout";
     repo = "klayout";
     rev = "v${version}";
-    hash = "sha256-EhIGxiXqo09/p8mA00RRvKgXJncVr4qguYSPyEC0fqc=";
+    hash = "sha256-WigRictn6CxOPId2YitlEm43vEw+dSRWdoareD9HtMc=";
   };
 
   postPatch = ''
@@ -31,10 +32,11 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    which
+    (python3.withPackages (ps: [ ps.tomli ]))
+    installShellFiles
     perl
-    python3
     ruby
+    which
     wrapQtAppsHook
   ];
 
@@ -49,17 +51,25 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     runHook preBuild
     mkdir -p $out/lib
-    ./build.sh -qt5 -prefix $out/lib -option -j$NIX_BUILD_CORES
+
+    # -qt5: Using Qt5 as per your previous configuration.
+    # -rpath: Ensures the klayout binary can find its internal libraries (tl, db, etc.)
+    #         in the nix store without needing LD_LIBRARY_PATH.
+    ./build.sh \
+      -qt5 \
+      -prefix $out/lib \
+      -option "-j$NIX_BUILD_CORES" \
+      -rpath $out/lib
+
     runHook postBuild
   '';
 
   postBuild =
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      mkdir $out/bin
-
       install -Dm444 etc/klayout.desktop -t $out/share/applications
       install -Dm444 etc/logo.png $out/share/icons/hicolor/256x256/apps/klayout.png
-      mv $out/lib/klayout $out/bin/
+
+      installBin $out/lib/klayout
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
@@ -79,10 +89,10 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ];
 
-  dontInstall = true; # Installation already happens as part of "build.sh"
+  # Installation is handled manually in buildPhase/postBuild via build.sh -prefix
+  dontInstall = true;
 
-  # Fix: "gsiDeclQMessageLogger.cc:126:42: error: format not a string literal
-  # and no format arguments [-Werror=format-security]"
+  # Fix for: "gsiDeclQMessageLogger.cc: error: format not a string literal"
   hardeningDisable = [ "format" ];
 
   meta = {

From 388e1ca299b089f760c9845d080bcae99513aaa1 Mon Sep 17 00:00:00 2001
From: bitbloxhub <45184892+bitbloxhub@users.noreply.github.com>
Date: Sat, 31 Jan 2026 19:06:43 +0000
Subject: [PATCH 092/108] vimPlugins.org-notebook-nvim: init at
 0-unstable-2025-12-18

https://github.com/bitbloxhub/org-notebook.nvim
---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix | 11 +++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 25 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index b4a904cb6cfd..0bc97cbeb934 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12748,6 +12748,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  org-notebook-nvim = buildVimPlugin {
+    pname = "org-notebook.nvim";
+    version = "0-unstable-2025-12-18";
+    src = fetchFromGitHub {
+      owner = "bitbloxhub";
+      repo = "org-notebook.nvim";
+      rev = "fd381c5381930c773ef99d1ff11d0f77dc409f65";
+      hash = "sha256-O1AwDqi2SdmycDHe1wWBeo5dEMPmYlFDjZJBSCCf3fM=";
+    };
+    meta.homepage = "https://github.com/bitbloxhub/org-notebook.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   org-roam-nvim = buildVimPlugin {
     pname = "org-roam.nvim";
     version = "0.2.0-unstable-2025-12-15";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 6f24b18ac5c9..ab6767107b29 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3003,6 +3003,17 @@ assertNoAdditions {
     dependencies = [ self.orgmode ];
   };
 
+  org-notebook-nvim = super.org-notebook-nvim.overrideAttrs {
+    dependencies = [
+      self.orgmode
+      self.jupyter-api-nvim
+    ];
+    nvimSkipModules = [
+      # Requires mini.test, deno, and some deno dependencies, look into it once https://github.com/NixOS/nixpkgs/pull/453904 is merged
+      "org-notebook.test"
+    ];
+  };
+
   otter-nvim = super.otter-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
     nvimSkipModules = [
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index e82a5b787769..01b20d9e0f26 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -979,6 +979,7 @@ https://github.com/tyru/open-browser.vim/,,
 https://github.com/nickjvandyke/opencode.nvim/,HEAD,
 https://github.com/Almo7aya/openingh.nvim/,,
 https://github.com/salkin-mada/openscad.nvim/,HEAD,
+https://github.com/bitbloxhub/org-notebook.nvim/,HEAD,
 https://github.com/chipsenkbeil/org-roam.nvim/,HEAD,
 https://github.com/rgroli/other.nvim/,HEAD,
 https://github.com/jmbuhr/otter.nvim/,,

From cc019a09bbb55c40c9ddaa393b4374c0048487fa Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 Jan 2026 20:19:22 +0100
Subject: [PATCH 093/108] ci/OWNERS: sync Forgejo maintainership

A dedicated Forgejo team with various new members has since been formed
and we really want to make sure we get pings for the VM test and the
forgejo.md module documentation too, as the regular CI is still lacking
in that regard.
---
 ci/OWNERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index ea52e0dd9386..4e8cc28e50fe 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -423,8 +423,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/networking/cluster/terraform-providers @zowoq
 
 # Forgejo
-nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
-pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
+nixos/modules/services/misc/forgejo.* @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
+pkgs/by-name/fo/forgejo/              @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
+nixos/tests/forgejo.nix               @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
 
 # Dotnet
 /pkgs/build-support/dotnet                  @corngood

From 0977c02ba0085a0bb9d1a4b99eac8045bab40455 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 16:45:50 +0000
Subject: [PATCH 094/108] python3Packages.rawpy: 0.25.1 -> 0.26.0

---
 pkgs/development/python-modules/rawpy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/rawpy/default.nix b/pkgs/development/python-modules/rawpy/default.nix
index fa1f147ab595..ea4b2cf786dd 100644
--- a/pkgs/development/python-modules/rawpy/default.nix
+++ b/pkgs/development/python-modules/rawpy/default.nix
@@ -22,16 +22,16 @@
   scikit-image,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "rawpy";
-  version = "0.25.1";
+  version = "0.26.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "letmaik";
     repo = "rawpy";
-    tag = "v${version}";
-    hash = "sha256-d3TxPW3GdCQT8bBbnveSxtWHkf5zinM8nSy4m/P7m7Q=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dFY1JNZxcV+FIj4qQgP1M1BP4x2ByV/K0J5kPZm/fjw=";
   };
 
   build-system = [
@@ -88,4 +88,4 @@ buildPythonPackage rec {
     ];
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From bfee022a68a73cc5e2df111c43ece075edbabd2c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 31 Jan 2026 12:01:33 -0800
Subject: [PATCH 095/108] python3Packages.zodb: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 2ce8dc96abb3..3f296d981644 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -23,7 +23,7 @@
   zope-testrunner,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "zodb";
   version = "6.2";
   pyproject = true;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zodb";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-R6qf/9Sr70OsZzes+haT/J6RIz6Wlof/l6rQRl3snHI=";
   };
 
@@ -72,9 +72,9 @@ buildPythonPackage rec {
   meta = {
     description = "Zope Object Database: object database and persistence";
     homepage = "https://zodb-docs.readthedocs.io/";
-    changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/zopefoundation/ZODB/blob/${finalAttrs.src.tag}/CHANGES.rst";
     downloadPage = "https://github.com/zopefoundation/ZODB";
     license = lib.licenses.zpl21;
     maintainers = [ ];
   };
-}
+})

From 75503b0e639992372e49fbf20ac94bc70205f6d6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 31 Jan 2026 20:28:54 +0000
Subject: [PATCH 096/108] python3Packages.fastmri: use finalAttrs

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

diff --git a/pkgs/development/python-modules/fastmri/default.nix b/pkgs/development/python-modules/fastmri/default.nix
index 5b5be75d08bd..9b058f093083 100644
--- a/pkgs/development/python-modules/fastmri/default.nix
+++ b/pkgs/development/python-modules/fastmri/default.nix
@@ -23,7 +23,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "fastmri";
   version = "0.3.0";
   pyproject = true;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "fastMRI";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-0IJV8OhY5kPWQwUYPKfmdI67TyYzDAPlwohdc0jWcV4=";
   };
 
@@ -76,8 +76,8 @@ buildPythonPackage rec {
   meta = {
     description = "Pytorch-based MRI reconstruction tooling";
     homepage = "https://github.com/facebookresearch/fastMRI";
-    changelog = "https://github.com/facebookresearch/fastMRI/releases/tag/v${version}";
+    changelog = "https://github.com/facebookresearch/fastMRI/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ osbm ];
   };
-}
+})

From 2547647ddb2ffc35b4b85cb173a75838ada3a3f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 20:33:29 +0000
Subject: [PATCH 097/108] dita-ot: 4.3.5 -> 4.4

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

diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix
index d9d9d076e4ed..b867b4587a6e 100644
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dita-ot";
-  version = "4.3.5";
+  version = "4.4";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ openjdk17 ];
 
   src = fetchzip {
     url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-odL9i48SICfXLxSDqwqIXBXG57dENRjdkZkRjt3xhMg=";
+    hash = "sha256-0P2E0c5HHOCk1w0/CHe3a6AH8FJIeKoQdTruuGkwo/c=";
   };
 
   installPhase = ''

From 205ea5d2204ea659bb30fe48a25b657803abf834 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 31 Jan 2026 20:33:47 +0000
Subject: [PATCH 098/108] python3Packages.fastmri: skip failing tests on
 python>=3.14

Tracking: https://github.com/NixOS/nixpkgs/issues/475732
---
 pkgs/development/python-modules/fastmri/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/fastmri/default.nix b/pkgs/development/python-modules/fastmri/default.nix
index 9b058f093083..1a2e61ab620f 100644
--- a/pkgs/development/python-modules/fastmri/default.nix
+++ b/pkgs/development/python-modules/fastmri/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build system
   setuptools,
@@ -66,6 +67,12 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    # AttributeError: '...' object has no attribute '__annotations__'.
+    "test_unet_scripting"
+    "test_varnet_scripting"
+  ];
+
   disabledTestPaths = [
     # much older version of pytorch-lightning is used
     "tests/test_modules.py"

From 280a4579088286c593363139bf48b7d861b520d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 20:52:56 +0000
Subject: [PATCH 099/108] routedns: 0.1.130 -> 0.1.131

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

diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index 84c0cc44cf01..e3fc5a205024 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "routedns";
-  version = "0.1.130";
+  version = "0.1.131";
 
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "routedns";
     rev = "v${version}";
-    hash = "sha256-eYtFfRi+w+0xnIZi/OXc+dt/HI/SQxoZphgduK6eETU=";
+    hash = "sha256-KrRazsjNBsHWdkmJYeNmHDNAorAV5NuneumevChEuDQ=";
   };
 
   vendorHash = "sha256-woInU618JPwVxGDJDZQ6+j9wY6qNSB5Xu8wXf7s2qvQ=";

From cc4bd5f859cdf01153d999995c20c9a457045bd6 Mon Sep 17 00:00:00 2001
From: Jhony Elmer Angulo Fabian <leohjaf@gmail.com>
Date: Sun, 25 Jan 2026 12:44:38 -0500
Subject: [PATCH 100/108] codex: 0.89.0 -> 0.92.0

- Update Codex from 0.89.0 to 0.92.0.
- Add cmake and git to nativeBuildInputs: rama-boring-sys uses git for patching
  during build.rs and boringssl builds via cmake; without these, local
  aarch64-darwin builds can fail with "No such file or directory".
- Add clang/libclang inputs plus LIBCLANG_PATH and compiler warning flags so
  bindgen can find libclang; keep GCC stringop-overflow and Clang
  character-conversion warning-as-error disabled to avoid known false positives
  in BoringSSL's a_bitstr.cc.
---
 pkgs/by-name/co/codex/package.nix | 34 +++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 890687be4703..38cf10a4911f 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -4,6 +4,10 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  clang,
+  cmake,
+  gitMinimal,
+  libclang,
   makeBinaryWrapper,
   nix-update-script,
   pkg-config,
@@ -14,26 +18,48 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.89.0";
+  version = "0.92.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-VFbtxGOqX80qWqVo+BG+BnUr8DiLCfcJCrN9fwy7utY=";
+    hash = "sha256-m/g+5wdehyaHDw6i5vik4HXiisY/iWFtPX0gKjCFPNY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-gg7KPEMO2aiBcIN8TllaDQeTLyw+WLfmMrXBKV/L53M=";
+  cargoHash = "sha256-fuT8vPb9/7fZam129nR6y+r+3j46WBhlf73Htkcjpzc=";
 
   nativeBuildInputs = [
+    clang
+    cmake
+    gitMinimal
     installShellFiles
     makeBinaryWrapper
     pkg-config
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    libclang
+    openssl
+  ];
+
+  # NOTE: set LIBCLANG_PATH so bindgen can locate libclang, and adjust
+  # warning-as-error flags to avoid known false positives (GCC's
+  # stringop-overflow in BoringSSL's a_bitstr.cc) while keeping Clang's
+  # character-conversion warning-as-error disabled.
+  env = {
+    LIBCLANG_PATH = "${lib.getLib libclang}/lib";
+    NIX_CFLAGS_COMPILE = toString (
+      lib.optionals stdenv.cc.isGNU [
+        "-Wno-error=stringop-overflow"
+      ]
+      ++ lib.optionals stdenv.cc.isClang [
+        "-Wno-error=character-conversion"
+      ]
+    );
+  };
 
   # NOTE: part of the test suite requires access to networking, local shells,
   # apple system configuration, etc. since this is a very fast moving target

From b5bcbd79ca609439bd3f2a23d9e922ae4a74ffe8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 20:56:04 +0000
Subject: [PATCH 101/108] terraform-providers.hashicorp_local: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ffadba0e1a97..1c51ec6a7fa9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -616,13 +616,13 @@
     "vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
   },
   "hashicorp_local": {
-    "hash": "sha256-Mdy4g8i26JeYd7MDZth5WRvKVWM7xpgd5/JHG9+Yqs0=",
+    "hash": "sha256-TyMNKLfw40LVIifw9iJ1ZAIZ/Ba9NI1whi/uaEIoIt4=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/local",
     "owner": "hashicorp",
     "repo": "terraform-provider-local",
-    "rev": "v2.6.1",
+    "rev": "v2.6.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-MDhCYXJe8x7AEqQwVn+Ot3jI1i5l4AJB0KEoiHXplCc="
+    "vendorHash": "sha256-FHhdCM0bg61OW5+dIFLUlxC85HpPSfvHxkL2Qz/AYeY="
   },
   "hashicorp_nomad": {
     "hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",

From a9cbf2676125a63fd946613c2b998be4314b2b71 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 31 Jan 2026 21:02:28 +0000
Subject: [PATCH 102/108] python3Packages.gluonts: use finalAttrs

---
 .../development/python-modules/gluonts/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/gluonts/default.nix b/pkgs/development/python-modules/gluonts/default.nix
index 0335550d148b..2d91cf17fe6b 100644
--- a/pkgs/development/python-modules/gluonts/default.nix
+++ b/pkgs/development/python-modules/gluonts/default.nix
@@ -1,6 +1,6 @@
 {
-  stdenv,
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
@@ -20,7 +20,7 @@
   lightning,
   scipy,
 
-  # test
+  # tests
   pytestCheckHook,
   distutils,
   matplotlib,
@@ -30,7 +30,7 @@
   which,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gluonts";
   version = "0.16.2";
   pyproject = true;
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "gluonts";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-h0+RYgGMz0gPchiKGIu0/NGcWBky5AWNTJKzoupn/iQ=";
   };
 
@@ -100,7 +100,7 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
     which
   ]
-  ++ optional-dependencies.torch;
+  ++ finalAttrs.passthru.optional-dependencies.torch;
 
   disabledTestPaths = [
     # requires `cpflows`, not in Nixpkgs
@@ -119,8 +119,8 @@ buildPythonPackage rec {
   meta = {
     description = "Probabilistic time series modeling in Python";
     homepage = "https://ts.gluon.ai";
-    changelog = "https://github.com/awslabs/gluonts/releases/tag/${src.tag}";
+    changelog = "https://github.com/awslabs/gluonts/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
-}
+})

From b601cf7d6f2653d18dcbd0fc850afd3e7cfa2d9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 21:03:28 +0000
Subject: [PATCH 103/108] wasmtime: 41.0.0 -> 41.0.1

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

diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 38ddcbfd515a..b5470d569d14 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "41.0.0";
+  version = "41.0.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/NQ1nmF5u/mNhS5orvohUWjSrp6YYtzJqpJV2iwn63Q=";
+    hash = "sha256-x3WA49sj+77uf9iy06IDPZfrRymVLlj9sRe7BF4bms0=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-OViDhQVAs11PzuS4OGL0dzn+K9+yqHwTzXynxl95y88=";
+  cargoHash = "sha256-ub6MWrVejxRJRCaeEOls1fgAegLG2GJpFEQYORJuWLk=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"

From 74e33613f323a9ef4190f05934fec6419f1ef224 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 31 Jan 2026 21:04:15 +0000
Subject: [PATCH 104/108] python3Packages.gluonts: disable on python>=3.14

Tracking: https://github.com/NixOS/nixpkgs/issues/475732
---
 pkgs/development/python-modules/gluonts/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/gluonts/default.nix b/pkgs/development/python-modules/gluonts/default.nix
index 2d91cf17fe6b..743e3562350f 100644
--- a/pkgs/development/python-modules/gluonts/default.nix
+++ b/pkgs/development/python-modules/gluonts/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
+  pythonAtLeast,
 
   # build-system
   setuptools,
@@ -42,6 +43,9 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-h0+RYgGMz0gPchiKGIu0/NGcWBky5AWNTJKzoupn/iQ=";
   };
 
+  # pydantic.v1.errors.ConfigError: unable to infer type for attribute "target"
+  disabled = pythonAtLeast "3.14";
+
   patches = [
     # Fixes _pickle.UnpicklingError: Weights only load failed.
     # https://github.com/awslabs/gluonts/pull/3269

From f9a76d9e78cc9791672f3d68d3a796e3a787df22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Jan 2026 22:11:05 +0000
Subject: [PATCH 105/108] terraform-providers.checkly_checkly: 1.17.1 -> 1.17.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ffadba0e1a97..791a75e44a8d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -155,11 +155,11 @@
     "vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
   },
   "checkly_checkly": {
-    "hash": "sha256-EYZoQTALazHWOj0dL3cDbgs/sNGkuPToWPD3hQeOcQA=",
+    "hash": "sha256-EAYf/8mKsR18F4XSEaZCDoydq4VPH7xmDhEOHo26J70=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.17.1",
+    "rev": "v1.17.2",
     "spdx": null,
     "vendorHash": "sha256-QOBjpG2pv9ngzslBIac15aWh21o1ctkM6ODC36H8bXU="
   },

From 4861f9d03206d3fa945e03442fe6207d9bd9f927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 28 Jan 2026 14:14:54 +0100
Subject: [PATCH 106/108] luaPackages.image-nvim: 1.3.0-1 -> 1.4.0

---
 maintainers/scripts/luarocks-packages.csv     |  1 -
 .../lua-modules/generated-packages.nix        | 33 -----------------
 .../lua-modules/image-nvim/default.nix        | 35 +++++++++++++++++++
 pkgs/development/lua-modules/overrides.nix    |  8 -----
 pkgs/top-level/lua-packages.nix               |  2 ++
 5 files changed, 37 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/lua-modules/image-nvim/default.nix

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 877e97fd2aed..3cb60cea6ae2 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -29,7 +29,6 @@ gitsigns.nvim,,,,,5.1,
 grug-far.nvim,,,,,5.1,teto
 haskell-tools.nvim,,,,,5.1,mrcjkb
 http,,,,0.4-0,,vcunat
-image.nvim,,,,,5.1,teto
 inspect,,,,,,
 jsregexp,,,,0.0.7-2,,
 ldbus,,,https://luarocks.org/dev,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index cb1189466280..6af1545fde09 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1010,39 +1010,6 @@ final: prev: {
     }
   ) { };
 
-  image-nvim = callPackage (
-    {
-      buildLuarocksPackage,
-      fetchurl,
-      fetchzip,
-      luaOlder,
-      magick,
-    }:
-    buildLuarocksPackage {
-      pname = "image.nvim";
-      version = "1.3.0-1";
-      knownRockspec =
-        (fetchurl {
-          url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec";
-          sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9";
-        }).outPath;
-      src = fetchzip {
-        url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip";
-        sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr";
-      };
-
-      disabled = luaOlder "5.1";
-      propagatedBuildInputs = [ magick ];
-
-      meta = {
-        homepage = "https://github.com/3rd/image.nvim";
-        description = "🖼️ Bringing images to Neovim.";
-        maintainers = with lib.maintainers; [ teto ];
-        license.fullName = "MIT";
-      };
-    }
-  ) { };
-
   inspect = callPackage (
     {
       buildLuarocksPackage,
diff --git a/pkgs/development/lua-modules/image-nvim/default.nix b/pkgs/development/lua-modules/image-nvim/default.nix
new file mode 100644
index 000000000000..bd7abb627618
--- /dev/null
+++ b/pkgs/development/lua-modules/image-nvim/default.nix
@@ -0,0 +1,35 @@
+{
+  buildLuarocksPackage,
+  fetchFromGitHub,
+  lib,
+  lua,
+  luaOlder,
+  luajitPackages,
+}:
+buildLuarocksPackage rec {
+  pname = "image.nvim";
+  version = "1.4.0";
+
+  disabled = luaOlder "5.1";
+  knownRockspec = "image.nvim-scm-1.rockspec";
+  rockspecVersion = "scm-1";
+
+  src = fetchFromGitHub {
+    owner = "3rd";
+    repo = "image.nvim";
+    tag = "v${version}";
+    hash = "sha256-EaDeY8aP41xHTw5epqYjaBqPYs6Z2DABzSaVOnG6D6I=";
+  };
+
+  propagatedBuildInputs = [
+    lua
+    luajitPackages.magick
+  ];
+
+  meta = {
+    homepage = "https://github.com/3rd/image.nvim";
+    description = "🖼️ Bringing images to Neovim.";
+    maintainers = with lib.maintainers; [ teto ];
+    license.fullName = "MIT";
+  };
+}
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 3c3c5ef0677c..fd95c001628a 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -35,7 +35,6 @@
   libxcrypt,
   libyaml,
   lua-language-server,
-  luajitPackages,
   mariadb,
   mpfr,
   neovim-unwrapped,
@@ -251,13 +250,6 @@ in
     '';
   };
 
-  image-nvim = prev.image-nvim.overrideAttrs {
-    propagatedBuildInputs = [
-      lua
-      luajitPackages.magick
-    ];
-  };
-
   ldbus = prev.ldbus.overrideAttrs (old: {
     luarocksConfig = old.luarocksConfig // {
       variables = {
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index e2a42938108b..fc17bc35f2bd 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -110,6 +110,8 @@ rec {
     }
   ) { };
 
+  image-nvim = callPackage ../development/lua-modules/image-nvim { };
+
   lua-pam = callPackage (
     {
       fetchFromGitHub,

From 83987d8e82c1bbd4d628cb48b365adc830924ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Jan 2026 18:42:00 +0100
Subject: [PATCH 107/108] luaPackages.image-nvim: adopt on maintainer request

---
 pkgs/development/lua-modules/image-nvim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/lua-modules/image-nvim/default.nix b/pkgs/development/lua-modules/image-nvim/default.nix
index bd7abb627618..4f5b0839cef1 100644
--- a/pkgs/development/lua-modules/image-nvim/default.nix
+++ b/pkgs/development/lua-modules/image-nvim/default.nix
@@ -29,7 +29,7 @@ buildLuarocksPackage rec {
   meta = {
     homepage = "https://github.com/3rd/image.nvim";
     description = "🖼️ Bringing images to Neovim.";
-    maintainers = with lib.maintainers; [ teto ];
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
     license.fullName = "MIT";
   };
 }

From 6fda86789fdf1ea216fab0a80cb2e6f3f9769967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Jan 2026 18:53:43 +0100
Subject: [PATCH 108/108] luaPackages.readline: move out of overrides

---
 pkgs/development/lua-modules/overrides.nix    | 47 -------------------
 .../lua-modules/readline/default.nix          | 45 ++++++++++++++++++
 pkgs/top-level/lua-packages.nix               |  2 +
 3 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/lua-modules/readline/default.nix

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index fd95c001628a..65901e802f4f 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -937,53 +937,6 @@ in
     '';
   };
 
-  readline = final.callPackage (
-    {
-      buildLuarocksPackage,
-      fetchurl,
-      luaAtLeast,
-      luaOlder,
-      luaposix,
-    }:
-    # upstream broken, can't be generated, so moved out from the generated set
-    buildLuarocksPackage {
-      pname = "readline";
-      version = "3.2-0";
-      knownRockspec =
-        (fetchurl {
-          url = "mirror://luarocks/readline-3.2-0.rockspec";
-          sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";
-        }).outPath;
-      src = fetchurl {
-        # the rockspec url doesn't work because 'www.' is not covered by the certificate so
-        # I manually removed the 'www' prefix here
-        url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";
-        sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";
-      };
-
-      luarocksConfig.variables = rec {
-        READLINE_INCDIR = "${readline.dev}/include";
-        HISTORY_INCDIR = READLINE_INCDIR;
-      };
-      unpackCmd = ''
-        unzip "$curSrc"
-        tar xf *.tar.gz
-      '';
-
-      propagatedBuildInputs = [
-        luaposix
-        readline.out
-      ];
-
-      meta = {
-        homepage = "https://pjb.com.au/comp/lua/readline.html";
-        description = "Interface to the readline library";
-        license.fullName = "MIT/X11";
-        broken = (luaOlder "5.1") || (luaAtLeast "5.5");
-      };
-    }
-  ) { };
-
   rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs {
 
     # E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem
diff --git a/pkgs/development/lua-modules/readline/default.nix b/pkgs/development/lua-modules/readline/default.nix
new file mode 100644
index 000000000000..ef2a04267fe2
--- /dev/null
+++ b/pkgs/development/lua-modules/readline/default.nix
@@ -0,0 +1,45 @@
+{
+  buildLuarocksPackage,
+  fetchurl,
+  luaAtLeast,
+  luaOlder,
+  luaposix,
+  readline,
+}:
+# upstream broken, can't be generated, so moved out from the generated set
+buildLuarocksPackage {
+  pname = "readline";
+  version = "3.2-0";
+  knownRockspec =
+    (fetchurl {
+      url = "mirror://luarocks/readline-3.2-0.rockspec";
+      sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";
+    }).outPath;
+  src = fetchurl {
+    # the rockspec url doesn't work because 'www.' is not covered by the certificate so
+    # I manually removed the 'www' prefix here
+    url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";
+    sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";
+  };
+
+  luarocksConfig.variables = rec {
+    READLINE_INCDIR = "${readline.dev}/include";
+    HISTORY_INCDIR = READLINE_INCDIR;
+  };
+  unpackCmd = ''
+    unzip "$curSrc"
+    tar xf *.tar.gz
+  '';
+
+  propagatedBuildInputs = [
+    luaposix
+    readline.out
+  ];
+
+  meta = {
+    homepage = "https://pjb.com.au/comp/lua/readline.html";
+    description = "Interface to the readline library";
+    license.fullName = "MIT/X11";
+    broken = (luaOlder "5.1") || (luaAtLeast "5.5");
+  };
+}
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index fc17bc35f2bd..ce44a1a21147 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -253,6 +253,8 @@ rec {
     inherit (pkgs) zenity;
   };
 
+  readline = callPackage ../development/lua-modules/readline { inherit (pkgs) readline; };
+
   vicious = callPackage (
     { fetchFromGitHub }:
     stdenv.mkDerivation rec {