From b16ee304cab385afdd2ddc3f2593fc04f08f3adf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Nov 2025 01:03:10 +0000
Subject: [PATCH 01/47] armadillo: 15.2.1 -> 15.2.2

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

diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix
index 4404a640e21e..a5ba54766e4e 100644
--- a/pkgs/by-name/ar/armadillo/package.nix
+++ b/pkgs/by-name/ar/armadillo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "15.2.1";
+  version = "15.2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-pbgQnaPBaYAvUaFNO9EkY5XCS7ylVgF2CwyWo8Cy+Po=";
+    hash = "sha256-juAc1NpVvAe3vH08unAqxugTfThNfnGF8/SuHwx5cE8=";
   };
 
   nativeBuildInputs = [ cmake ];

From 628aa163db9b7ae907b5d68d6502856798214357 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Dec 2025 17:51:38 +0000
Subject: [PATCH 02/47] gitlab-ci-local: 4.63.0 -> 4.64.1

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

diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index a3671b672f28..b37c973f62b4 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "gitlab-ci-local";
-  version = "4.63.0";
+  version = "4.64.1";
 
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
     rev = version;
-    hash = "sha256-IqfCEU/ZX28CAAFW9Wx9QFQY4E5iYKC5Ac0m7AuubNk=";
+    hash = "sha256-scZ6KqpO/E3Ycu6Nn5o/4LaEpSAOWim8mOqpByjZlZE=";
   };
 
-  npmDepsHash = "sha256-0XV9jT1Ps8TPhl4pKN92v6mbMT37EcXdcn+GUo2wprg=";
+  npmDepsHash = "sha256-IoycsUU+7o4A3d+pGQvyBvaIqg7fdvwS8Pay9MmRqM4=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From a634d9ca111b9930a23677949ec4c27410148ab8 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 15 Dec 2025 13:24:11 -0500
Subject: [PATCH 03/47] {gsoap,voms}: enable on darwin

---
 pkgs/by-name/gs/gsoap/package.nix | 7 +++++--
 pkgs/by-name/vo/voms/package.nix  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gs/gsoap/package.nix b/pkgs/by-name/gs/gsoap/package.nix
index ff0d0374923a..e534ca3cf575 100644
--- a/pkgs/by-name/gs/gsoap/package.nix
+++ b/pkgs/by-name/gs/gsoap/package.nix
@@ -66,7 +66,10 @@ stdenv.mkDerivation rec {
     # 3. Proprietary commercial software development license (removes GPL
     #    restrictions)
     license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ bjornfor ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      bjornfor
+      veprbl
+    ];
   };
 }
diff --git a/pkgs/by-name/vo/voms/package.nix b/pkgs/by-name/vo/voms/package.nix
index 7746c13ff1b4..d35bc79892a8 100644
--- a/pkgs/by-name/vo/voms/package.nix
+++ b/pkgs/by-name/vo/voms/package.nix
@@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://italiangrid.github.io/voms/";
     changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux; # gsoap is currently Linux-only in Nixpkgs
-    maintainers = with lib.maintainers; [ ShamrockLee ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      ShamrockLee
+      veprbl
+    ];
   };
 })

From f3a668ee61a803323d40c6b64a5d16eae1189152 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 17 Dec 2025 13:47:20 -0500
Subject: [PATCH 04/47] davix: fix build on darwin

---
 pkgs/by-name/da/davix/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix
index db1ac97a07ac..2e1b357a6c58 100644
--- a/pkgs/by-name/da/davix/package.nix
+++ b/pkgs/by-name/da/davix/package.nix
@@ -12,6 +12,7 @@
   curl,
   gsoap,
   rapidjson,
+  zlib,
   enableTools ? true,
   # Use libcurl instead of libneon
   # Note that the libneon used is bundled in the project
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
     libxml2
     openssl
     rapidjson
+    zlib
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
   ++ lib.optional enableThirdPartyCopy gsoap;
@@ -74,6 +76,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # Transitive dependency of gsoap (only supports static library builds)
+  env.NIX_LDFLAGS = "-lz";
+
   meta = {
     description = "Toolkit for Http-based file management";
 

From 1685f42381b68e3bb54ca677af5bb53dba673efe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 10:57:03 +0000
Subject: [PATCH 05/47] github-mcp-server: 0.20.2 -> 0.25.0

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

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index ce2b3267390d..066d185aeb36 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.20.2";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1xr0AUAfYrxR7koCn9S3VJAw8PaJvFLNyzsblqyGyC0=";
+    hash = "sha256-sl/IEydxi64Z+ArqcApEELfi3lyxJY4MhR2X9g1fUbY=";
   };
 
-  vendorHash = "sha256-j0THkLxOcNTyUoyl3WkbjR+8urM4fmsg7Mt74S4wjqU=";
+  vendorHash = "sha256-90hWzVIjDzP7DBVSIYIwJtG5I89saQTQCU50n4HVylY=";
 
   ldflags = [
     "-s"

From cfaabfdc435549643470548aa6de75bab069ff2a Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Thu, 18 Dec 2025 16:15:41 +0100
Subject: [PATCH 06/47] iftop: fix build with gcc 15

---
 pkgs/by-name/if/iftop/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/if/iftop/package.nix b/pkgs/by-name/if/iftop/package.nix
index 73198fd2fe5b..c795c91f6ca4 100644
--- a/pkgs/by-name/if/iftop/package.nix
+++ b/pkgs/by-name/if/iftop/package.nix
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp";
   };
 
+  patches = [
+    # Fix build with gcc 15
+    (fetchurl {
+      url = "https://salsa.debian.org/debian/iftop/-/raw/750d49dd3fabc338586a86f5bb0a5b97a5ff5fa2/debian/patches/bug-debian-1096832-ftbfs-with-GCC-15.patch";
+      hash = "sha256-BhjN7AZNCJCqrY2IAutUYYDZkLq+TD2YnKYZxHgVdYg=";
+    })
+  ];
+
   # Explicitly link against libgcc_s, to work around the infamous
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
   LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s";

From 90368426ff5d6e9fd819665a20c39d66b02b1a9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 16:23:20 +0000
Subject: [PATCH 07/47] monetdb: 11.53.15 -> 11.55.1

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

diff --git a/pkgs/by-name/mo/monetdb/package.nix b/pkgs/by-name/mo/monetdb/package.nix
index 658caf87c12a..cb76e0e06f32 100644
--- a/pkgs/by-name/mo/monetdb/package.nix
+++ b/pkgs/by-name/mo/monetdb/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "monetdb";
-  version = "11.53.15";
+  version = "11.55.1";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-Fe1m6JFDUYlB6+0+Zf9ok8lwvPNxONLHAu4GNEjCDAw=";
+    hash = "sha256-Bf0HZcRs0pjAq39iZApUOlrjQjqg15qGEWdz5gHI4Ak=";
   };
 
   nativeBuildInputs = [

From bf027f64d46f01f54fc41615f1f89a2af9b26331 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 18 Dec 2025 15:39:54 +0100
Subject: [PATCH 08/47] kew: 3.6.4 -> 3.7.2

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

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 418e999bcbc6..aca9a620cf03 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -9,6 +9,7 @@
   faad2,
   fetchFromGitHub,
   fftwFloat,
+  gdk-pixbuf,
   glib,
   libogg,
   libopus,
@@ -33,19 +34,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.6.4";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PhNBAy+XS1wpU91GNoRc4jume9razD03xmmUER0p8I0=";
+    hash = "sha256-MCmOd8c2owIjtXkRUso3+4C0Hj/5HoOLa97E9+21FGA=";
   };
 
   postPatch = ''
     substituteInPlace Makefile \
       --replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \
-      --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}'
+      --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}' \
+      --replace-fail 'LANGDIRPREFIX = /usr' 'LANGDIRPREFIX = ${placeholder "out"}'
   '';
 
   nativeBuildInputs = [
@@ -59,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftwFloat.dev
     chafa
     curl.dev
+    gdk-pixbuf
     glib.dev
     libopus
     opusfile

From 04fac1871959b020e95f384b3ee15b20fc0316ae Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Thu, 18 Dec 2025 23:31:16 -0500
Subject: [PATCH 09/47] engauge-digitizer: move to live src

---
 pkgs/applications/science/math/engauge-digitizer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/engauge-digitizer/default.nix b/pkgs/applications/science/math/engauge-digitizer/default.nix
index 1f7dc5dc3d23..37e501bffe7b 100644
--- a/pkgs/applications/science/math/engauge-digitizer/default.nix
+++ b/pkgs/applications/science/math/engauge-digitizer/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   version = "12.2.2";
 
   src = fetchFromGitHub {
-    owner = "markummitchell";
+    owner = "akhuettel";
     repo = "engauge-digitizer";
     rev = "v${version}";
     sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";

From 92ab67ce28c8808fa53e9c7d666708ba8befda90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 04:57:41 +0000
Subject: [PATCH 10/47] cloudlog: 2.8.2 -> 2.8.3

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

diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index 90b80c77725e..29534b23c2f1 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-+NE8gu7PxaA+CrDgkMEA/jtnBbOQt8WbvxY4BHOhQQI=";
+    hash = "sha256-7Ja/EcD2oiwD2xIdeZNAl+np2nd+6zluzQ87dmUgDVg=";
   };
 
   postPatch = ''

From 575cc27186b82514b65963fce2cc1e116efaea6d Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Fri, 19 Dec 2025 09:24:41 +0100
Subject: [PATCH 11/47] readest: 0.9.95 -> 0.9.96

Changelog: https://github.com/readest/readest/releases/tag/v0.9.96
Diff: https://github.com/readest/readest/compare/v0.9.95...v0.9.96
---
 pkgs/by-name/re/readest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index d9ddf4780089..87c4ba573fff 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -21,13 +21,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.95";
+  version = "0.9.96";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0fWxmip7Emu4z4v5VyV0nW9Dj1JvOOLJub1szboawP8=";
+    hash = "sha256-3PCdcSF9ocDqHzK9P/FJQwch5u5zVLQ3eDNSGJQGSKw=";
     fetchSubmodules = true;
   };
 
@@ -42,12 +42,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 1;
-    hash = "sha256-hYwkPqePFPEdqZ3w0mNvNEypsVL1PKv29LFk7b11zkg=";
+    hash = "sha256-Ea/J3W3L8vVDlIRY/szaCfcqunjiFU6yL+e8h4c5UHg=";
   };
 
   pnpmRoot = "../..";
 
-  cargoHash = "sha256-PbWjDvxbbiiKy1UeJx7cUawGampbL5t/Bhb13tirhGc=";
+  cargoHash = "sha256-AwrA0KXLTSUhLxIJHKU1crVxUxImFOKDRStB48mZfcg=";
 
   cargoRoot = "../..";
 

From ec997076458cff63216bf23540759b27c657207f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 15 Dec 2025 23:59:49 +0000
Subject: [PATCH 12/47] pnpm_10: 10.25.0 -> 10.26.1

---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 748d95a0125f..8cfaf39ab9da 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -15,8 +15,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.25.0";
-      hash = "sha256-DzcmZUsLXlLlgAkE3haK/Dxmfiq/hL2wbZrBOGEEvZA=";
+      version = "10.26.1";
+      hash = "sha256-6ObkmRKPaAT1ySIjzR8uP2JVcQLAxuJUzJm7KqIpu/k=";
     };
   };
 

From f8bfc43b5dce4d2989fc0d86d95366c08b9a534d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Fri, 19 Dec 2025 16:41:04 +0100
Subject: [PATCH 13/47] mkosi: 25.3 -> 26

Diff: https://github.com/systemd/mkosi/compare/21850673a7f75125d516268ce379dae776dd816a...v26

Changelog: https://github.com/systemd/mkosi/releases/tag/v26
---
 ...naries-instead-of-Python-interpreter.patch | 65 ++++++++-----------
 .../mk/mkosi/0002-Fix-library-resolving.patch |  6 +-
 .../mkosi/0003-Fix-QEMU-firmware-path.patch   |  4 +-
 pkgs/by-name/mk/mkosi/package.nix             |  6 +-
 4 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/mk/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch b/pkgs/by-name/mk/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch
index 4ca73670a0ca..90f0223665d5 100644
--- a/pkgs/by-name/mk/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch
+++ b/pkgs/by-name/mk/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch
@@ -9,14 +9,14 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
 ---
  mkosi/__init__.py   | 17 +++++++----------
  mkosi/bootloader.py |  3 +--
- mkosi/run.py        |  8 ++++----
- 3 files changed, 12 insertions(+), 16 deletions(-)
+ mkosi/run.py        |  6 +++---
+ 3 files changed, 11 insertions(+), 15 deletions(-)
 
 diff --git a/mkosi/__init__.py b/mkosi/__init__.py
-index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee6637b95bcb 100644
+index f4766ae71244a21caa5bcbf5b5376f617c706b33..8f85f923b41feaa7716ae409cc2e983a73579ea8 100644
 --- a/mkosi/__init__.py
 +++ b/mkosi/__init__.py
-@@ -570,7 +570,7 @@ def finalize_host_scripts(
+@@ -613,7 +613,7 @@ def finalize_host_scripts(
          if context.config.find_binary(binary):
              scripts[binary] = (binary, "--root", "/buildroot")
      if ukify := context.config.find_binary("ukify"):
@@ -25,7 +25,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
      return finalize_scripts(context.config, scripts | dict(helpers))
  
  
-@@ -702,7 +702,7 @@ def script_maybe_chroot_sandbox(
+@@ -755,7 +755,7 @@ def script_maybe_chroot_sandbox(
  
      helpers = {
          "mkosi-chroot": [
@@ -34,7 +34,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
              "--bind", "/buildroot", "/",
              "--bind", "/var/tmp", "/var/tmp",
              *apivfs_options(root=Path("/")),
-@@ -1593,7 +1593,7 @@ def run_ukify(
+@@ -1587,7 +1587,7 @@ def run_ukify(
      sign: bool = True,
      json_out: bool = False,
  ) -> dict[str, Any]:
@@ -43,7 +43,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
      if not ukify:
          die("Could not find ukify")
  
-@@ -1605,7 +1605,6 @@ def run_ukify(
+@@ -1599,7 +1599,6 @@ def run_ukify(
      (context.workspace / "cmdline").write_text(f"{' '.join(cmdline)}\x00")
  
      cmd = [
@@ -51,7 +51,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
          ukify,
          "build",
          *arguments,
-@@ -1700,7 +1699,7 @@ def build_uki(
+@@ -1694,7 +1693,7 @@ def build_uki(
      profiles: Sequence[Path],
      output: Path,
  ) -> dict[str, Any]:
@@ -60,15 +60,15 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
          die("Could not find ukify")
  
      json_out = False
-@@ -1759,7 +1758,6 @@ def build_uki(
-         # TODO: bump version to 258 once it is released
+@@ -1755,7 +1754,6 @@ def build_uki(
+ 
          if (
              systemd_tool_version(
 -                python_binary(context.config),
                  ukify,
                  sandbox=context.sandbox,
              )
-@@ -1819,7 +1817,6 @@ def build_uki(
+@@ -1815,7 +1813,6 @@ def build_uki(
          # new .ucode section support?
          if (
              systemd_tool_version(
@@ -76,16 +76,16 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
                  ukify,
                  sandbox=context.sandbox,
              )
-@@ -1887,7 +1884,7 @@ def want_uki(context: Context) -> bool:
+@@ -1883,7 +1880,7 @@ def want_uki(context: Context) -> bool:
          or (
-             context.config.unified_kernel_images == ConfigFeature.auto
+             context.config.unified_kernel_images == UnifiedKernelImage.auto
              and systemd_stub_binary(context).exists()
 -            and context.config.find_binary("ukify", "/usr/lib/systemd/ukify") is not None
 +            and context.config.find_binary("ukify", "@UKIFY@") is not None
          )
      )
  
-@@ -2769,9 +2766,9 @@ def check_ukify(
+@@ -2799,9 +2796,9 @@ def check_ukify(
      reason: str,
      hint: Optional[str] = None,
  ) -> None:
@@ -98,10 +98,10 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
          die(
              f"Found '{ukify}' with version {v} but version {version} or newer is required to {reason}.",
 diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
-index 6f112b854f72a8863dc5e7348f0154851d3dda96..28b32b9c8fcaa7c49a7d69e7e303ccf332d47d58 100644
+index 7d434bb4776980c6fa58ae8f7795f3ffc319baeb..8960a6d17d153b06b029f9072a464a12f5cafe65 100644
 --- a/mkosi/bootloader.py
 +++ b/mkosi/bootloader.py
-@@ -270,8 +270,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
+@@ -316,8 +316,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
  def python_binary(config: Config) -> PathString:
      # If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools
      # tree, just use the default python3 interpreter.
@@ -112,10 +112,19 @@ index 6f112b854f72a8863dc5e7348f0154851d3dda96..28b32b9c8fcaa7c49a7d69e7e303ccf3
  
  def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path:
 diff --git a/mkosi/run.py b/mkosi/run.py
-index 422006d889802182d7e2f1734b2c342318583e7b..b9a1490bcd7780fea75d834e3ea4fb9a7033cc51 100644
+index 159b75c1af1b5d84e409426e566e098571086c8e..7ade34fc6a9d53e010f5f45cce53a9c92407f49d 100644
 --- a/mkosi/run.py
 +++ b/mkosi/run.py
-@@ -277,7 +277,7 @@ def finalize_path(
+@@ -238,7 +238,7 @@ def spawn(
+             module = stack.enter_context(resource_path(sys.modules[__package__ or __name__]))
+             prefix = [
+                 *(["strace", "--detach-on=execve", "--string-limit=256"] if ARG_DEBUG_SANDBOX.get() else []),
+-                sys.executable, "-SI", os.fspath(module / "sandbox.py"),
++                @MKOSI_SANDBOX@,
+                 *sbx,
+             ]  # fmt: skip
+ 
+@@ -321,7 +321,7 @@ def finalize_path(
          # Make sure that /usr/bin and /usr/sbin are always in $PATH.
          path += [s for s in ("/usr/bin", "/usr/sbin") if s not in path]
      else:
@@ -124,16 +133,7 @@ index 422006d889802182d7e2f1734b2c342318583e7b..b9a1490bcd7780fea75d834e3ea4fb9a
  
      if prefix_usr:
          path = [os.fspath(root / s.lstrip("/")) if s in ("/usr/bin", "/usr/sbin") else s for s in path]
-@@ -463,7 +463,7 @@ def sandbox_cmd(
-         cmdline: list[PathString] = [
-             *setup,
-             *(["strace", "--detach-on=execve"] if ARG_DEBUG_SANDBOX.get() else []),
--            sys.executable, "-SI", module / "sandbox.py",
-+            @MKOSI_SANDBOX@,
-             "--proc", "/proc",
-             # We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are
-             # used instead.
-@@ -633,7 +633,7 @@ def chroot_options() -> list[PathString]:
+@@ -690,7 +690,7 @@ def chroot_options() -> list[PathString]:
          "--unshare-ipc",
          "--setenv", "container", "mkosi",
          "--setenv", "HOME", "/",
@@ -142,12 +142,3 @@ index 422006d889802182d7e2f1734b2c342318583e7b..b9a1490bcd7780fea75d834e3ea4fb9a
          "--setenv", "BUILDROOT", "/",
      ]  # fmt: skip
  
-@@ -647,7 +647,7 @@ def chroot_cmd(
- ) -> Iterator[list[PathString]]:
-     with vartmpdir() as dir, resource_path(sys.modules[__package__ or __name__]) as module:
-         cmdline: list[PathString] = [
--            sys.executable, "-SI", module / "sandbox.py",
-+            @MKOSI_SANDBOX@,
-             *root("/"),
-             # We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are
-             # used instead.
diff --git a/pkgs/by-name/mk/mkosi/0002-Fix-library-resolving.patch b/pkgs/by-name/mk/mkosi/0002-Fix-library-resolving.patch
index 7f9e4cf00e7a..3901d44c8039 100644
--- a/pkgs/by-name/mk/mkosi/0002-Fix-library-resolving.patch
+++ b/pkgs/by-name/mk/mkosi/0002-Fix-library-resolving.patch
@@ -11,10 +11,10 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkosi/sandbox.py b/mkosi/sandbox.py
-index c79b48739f3d7127375274bc0b1ef3463cae9032..1d7ad421f4534e25c6456c3a169ea9189668aefd 100755
+index 4a41f333a764bc41abbd36302bd9fe86baa45a3f..1ce102597f1935deadcec475ec873eab9ca03c22 100755
 --- a/mkosi/sandbox.py
 +++ b/mkosi/sandbox.py
-@@ -92,7 +92,7 @@ class cap_user_data_t(ctypes.Structure):
+@@ -124,7 +124,7 @@ class cap_user_data_t(ctypes.Structure):
      ]
  
  
@@ -23,7 +23,7 @@ index c79b48739f3d7127375274bc0b1ef3463cae9032..1d7ad421f4534e25c6456c3a169ea918
  
  libc.syscall.restype = ctypes.c_long
  libc.unshare.argtypes = (ctypes.c_int,)
-@@ -221,7 +221,7 @@ def seccomp_suppress(*, chown: bool = False, sync: bool = False) -> None:
+@@ -291,7 +291,7 @@ def seccomp_suppress(*, chown: bool = False, sync: bool = False) -> None:
      if not chown and not sync:
          return
  
diff --git a/pkgs/by-name/mk/mkosi/0003-Fix-QEMU-firmware-path.patch b/pkgs/by-name/mk/mkosi/0003-Fix-QEMU-firmware-path.patch
index d6eb6020add0..92341d1caed2 100644
--- a/pkgs/by-name/mk/mkosi/0003-Fix-QEMU-firmware-path.patch
+++ b/pkgs/by-name/mk/mkosi/0003-Fix-QEMU-firmware-path.patch
@@ -9,10 +9,10 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkosi/qemu.py b/mkosi/qemu.py
-index 0c406d818a9fa9dcce3be97d0c89e9df0d2a96fa..c134ab4a8bfba1e3564c831a5069be52d90ee15a 100644
+index 4d1bec15605ca36d66a05add0744afdfbdc4853d..d10007ed58ebc16271b313b1a846ca2c24d8ae81 100644
 --- a/mkosi/qemu.py
 +++ b/mkosi/qemu.py
-@@ -211,7 +211,7 @@ def find_ovmf_firmware(config: Config, firmware: Firmware) -> Optional[OvmfConfi
+@@ -189,7 +189,7 @@ def find_ovmf_firmware(config: Config, firmware: Firmware) -> Optional[OvmfConfi
      if not firmware.is_uefi():
          return None
  
diff --git a/pkgs/by-name/mk/mkosi/package.nix b/pkgs/by-name/mk/mkosi/package.nix
index d200ad81eaad..13834539426e 100644
--- a/pkgs/by-name/mk/mkosi/package.nix
+++ b/pkgs/by-name/mk/mkosi/package.nix
@@ -58,7 +58,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "mkosi";
-  version = "25.3";
+  version = "26";
   format = "pyproject";
 
   outputs = [
@@ -69,8 +69,8 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "mkosi";
-    rev = "21850673a7f75125d516268ce379dae776dd816a";
-    hash = "sha256-3dhr9lFJpI8aN8HILaMvGuuTbmTVUqdaLAGxSpqciTs=";
+    tag = "v${version}";
+    hash = "sha256-6DVIyFsEV2VkQ/kesn6cN+iH9MW+mmAZw5i0R5C4xaU=";
   };
 
   patches = [

From 77f10837e69733b23dd501a27943a2a292da50c2 Mon Sep 17 00:00:00 2001
From: Nathan Henrie <nate@n8henrie.com>
Date: Fri, 19 Dec 2025 10:10:55 -0700
Subject: [PATCH 14/47] mpv: fix sandbox-related versionCheck breakage on
 darwin

---
 pkgs/applications/video/mpv/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index f2e1aa9663fe..5b51f5d50c99 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -264,6 +264,10 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
+  sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    (allow mach-lookup (global-name "com.apple.coreservices.launchservicesd"))
+  '';
+
   postInstall = ''
     # Use a standard font
     mkdir -p $out/share/mpv

From bcc621cd5fdbcef8c2e6b502bb169c71a137ac66 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Fri, 19 Dec 2025 21:09:17 +0100
Subject: [PATCH 15/47] linuxPackages.nvidiaPackages.latest: 580.119.02 ->
 590.48.01

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 98a6c6b1636f..99cafbcab9c7 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -81,12 +81,12 @@ rec {
   };
 
   latest = selectHighestVersion production (generic {
-    version = "575.64.05";
-    sha256_64bit = "sha256-hfK1D5EiYcGRegss9+H5dDr/0Aj9wPIJ9NVWP3dNUC0=";
-    sha256_aarch64 = "sha256-GRE9VEEosbY7TL4HPFoyo0Ac5jgBHsZg9sBKJ4BLhsA=";
-    openSha256 = "sha256-mcbMVEyRxNyRrohgwWNylu45vIqF+flKHnmt47R//KU=";
-    settingsSha256 = "sha256-o2zUnYFUQjHOcCrB0w/4L6xI1hVUXLAWgG2Y26BowBE=";
-    persistencedSha256 = "sha256-2g5z7Pu8u2EiAh5givP5Q1Y4zk4Cbb06W37rf768NFU=";
+    version = "590.48.01";
+    sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
+    sha256_aarch64 = "sha256-FOz7f6pW1NGM2f74kbP6LbNijxKj5ZtZ08bm0aC+/YA=";
+    openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44=";
+    settingsSha256 = "sha256-NWsqUciPa4f1ZX6f0By3yScz3pqKJV1ei9GvOF8qIEE=";
+    persistencedSha256 = "sha256-wsNeuw7IaY6Qc/i/AzT/4N82lPjkwfrhxidKWUtcwW8=";
   });
 
   beta = selectHighestVersion latest (generic {

From d354e0c81d731bb34a2d2a38352755a3af0f29b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 22:27:19 +0000
Subject: [PATCH 16/47] taskwarrior-tui: 0.26.4 -> 0.26.5

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

diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index 805006f36c5b..fae09705d0df 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "taskwarrior-tui";
-  version = "0.26.4";
+  version = "0.26.5";
 
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
     rev = "v${version}";
-    sha256 = "sha256-Ubl2xSFb5ZJ/5JqNI0In3hX6SxZd4g/AEq+CLdN2FsE=";
+    sha256 = "sha256-mdkGRxe9d92WXBCLhBUWNALS4WwjoeYgZop2frZwNN0=";
   };
 
-  cargoHash = "sha256-lq2mqMrhcRX2gX7youx8NrZEKmEOJYuhIsHHixuQmmk=";
+  cargoHash = "sha256-Z9y8LLqTicbw4Q+lFalQo4kZFddU2fVMBl6iR4f6D9g=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b02c674b287d97be3ca7067652102b5fb316ace8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 22:28:45 +0000
Subject: [PATCH 17/47] spaceship-prompt: 4.19.1 -> 4.19.3

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

diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index f2e2e3b689fc..af3a9ed7a845 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "4.19.1";
+  version = "4.19.3";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
     rev = "v${version}";
-    sha256 = "sha256-zMazuPTwvbmtd6BIjD7oDJ3V4TGlUnxJT25Pe1TI3UY=";
+    sha256 = "sha256-2RWU341FFGPOUBz86O+ocAWgER8V8yxXzWc8K1PG1CE=";
   };
 
   strictDeps = true;

From 4a71f4a1d96da9d966d974e2de08cd5df0378f0d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 19 Dec 2025 22:10:46 +0100
Subject: [PATCH 18/47] ringboard: 0.12.2-unstable-2025-09-23 ->
 0.13.2-unstable-2025-12-19

---
 pkgs/by-name/ri/ringboard/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ri/ringboard/package.nix b/pkgs/by-name/ri/ringboard/package.nix
index af04fa4b014f..2add27225960 100644
--- a/pkgs/by-name/ri/ringboard/package.nix
+++ b/pkgs/by-name/ri/ringboard/package.nix
@@ -21,17 +21,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringboard" + lib.optionalString (displayServer == "wayland") "-wayland";
 
   # release version needs nightly, so we use a custom tree, see:
-  # https://github.com/SUPERCILEX/clipboard-history/issues/22#issuecomment-3322075172
-  version = "0.12.2-unstable-2025-09-23";
+  # https://github.com/SUPERCILEX/clipboard-history/issues/22#issuecomment-3676256971
+  version = "0.13.2-unstable-2025-12-19";
 
   src = fetchFromGitHub {
     owner = "SUPERCILEX";
     repo = "clipboard-history";
-    rev = "228a39dd8a9aece0bb06f68ad44906b297270628";
-    hash = "sha256-qA7wwvWnnZHN9edkmubEo37F+peU0LQGo/Zl8FpywuE=";
+    rev = "08a2a2a77fa38240dfc6a33adabb3a473ce6bcfd";
+    hash = "sha256-iG/pk6xizCv2sUqTA44nb4AnbaOuDsIONuUfJuOWnc8=";
   };
 
-  cargoHash = "sha256-MFfuUu/hpb6Uaqe21bvXNKRyJazAL5m+Vw/vAeeDYEk=";
+  cargoHash = "sha256-LuWUf37X/Z0xCbAQmaMY8lle7gGZWoz2bgYhe/uRonU=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # To reopen the window, a special file can be deleted which wakes the GUI via inotify.
     # If, instead, a new instance of the GUI is opened, this special file is used to first check for a previously running instance of the GUI and kill it if it exists.
     # https://alexsaveau.dev/blog/projects/performance/clipboard/ringboard/ringboard#gui-startup-latency-and-long-lived-client-windows
-    sed -i "s|Exec=ringboard-egui|Exec=$(echo /bin/sh -c \"ps -p \`cat /tmp/.ringboard/\$USER.egui-sleep 2\> /dev/null\` \> /dev/null 2\>\\\&1 \\\&\\\& exec rm -f /tmp/.ringboard/\$USER.egui-sleep \\\|\\\| exec $out/bin/ringboard-egui\")|g" $out/share/applications/ringboard-egui.desktop
+    sed -i "s|Exec=ringboard-egui|Exec=$out/bin/ringboard-egui toggle|g" $out/share/applications/ringboard-egui.desktop
     sed -i "s|Icon=ringboard|Icon=$out/share/icons/hicolor/1024x1024/ringboard.jpeg|g" $out/share/applications/ringboard-egui.desktop
   '';
 

From e2fab1d3939cb2504c63e345172d53bdba9c8f94 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 7 Dec 2025 02:11:11 +0300
Subject: [PATCH 19/47] gtkwave: 3.3.121 -> 3.3.125

New version includes fix for build errors with gcc15:
https://www.github.com/gtkwave/gtkwave/pull/406
https://github.com/gtkwave/gtkwave/commit/b8ff75c9aeed8b5f9190e3f61a6e84d07bc3f10f

Fixes build failure with gcc15:
```
menu.c:7725:56: error: initialization of 'void (*)(void)'
from incompatible pointer type 'void (*)(void *, guint,  GtkWidget *)'
{aka 'void (*)(void *, unsigned int,  struct _GtkWidget *)'} [-Wincompatible-pointer-types]
 7725 |     WAVE_GTKIFE("/File/Open New Window", "<Control>N", menu_new_viewer, WV_MENU_FONV, "<Item>"),
      |                                                        ^~~~~~~~~~~~~~~
gtk23compat.h:55:37: note: in definition of macro 'WAVE_GTKIFE'
   55 | #define WAVE_GTKIFE(a,b,c,d,e) {a,b,c,d,e,NULL}
      |                                     ^
menu.c:7725:56: note: (near initialization for 'menu_items[0].callback')
 7725 |     WAVE_GTKIFE("/File/Open New Window", "<Control>N", menu_new_viewer, WV_MENU_FONV, "<Item>"),
      |                                                        ^~~~~~~~~~~~~~~
gtk23compat.h:55:37: note: in definition of macro 'WAVE_GTKIFE'
   55 | #define WAVE_GTKIFE(a,b,c,d,e) {a,b,c,d,e,NULL}
      |                                     ^
menu.c:3610:1: note: 'menu_new_viewer' declared here
 3610 | menu_new_viewer(gpointer null_data, guint callback_action, GtkWidget *widget)
      | ^~~~~~~~~~~~~~~
...
menu.c:7726:53: error: initialization of 'void (*)(void)'
from incompatible pointer type 'void (*)(void *, guint,  GtkWidget *)'
{aka 'void (*)(void *, unsigned int,  struct _GtkWidget *)'} [-Wincompatible-pointer-types]
 7726 |     WAVE_GTKIFE("/File/Open New Tab", "<Control>T", menu_new_viewer_tab, WV_MENU_FONVT, "<Item>"),
      |                                                     ^~~~~~~~~~~~~~~~~~~
...
menu.c:7727:63: error: initialization of 'void (*)(void)'
from incompatible pointer type 'void (*)(void *, guint,  GtkWidget *)'
{aka 'void (*)(void *, unsigned int,  struct _GtkWidget *)'} [-Wincompatible-pointer-types]
 7727 |     WAVE_GTKIFE("/File/Reload Waveform", "<Shift><Control>R", menu_reload_waveform, WV_MENU_FRW, "<Item>"),
      |                                                               ^~~~~~~~~~~~~~~~~~~~
...
```
---
 ...etection-of-quartz-in-gdk-3.0-target.patch |  40 -------
 ...NDOWING_X11-macro-when-using-GtkPlug.patch | 101 ------------------
 pkgs/by-name/gt/gtkwave/package.nix           |  12 +--
 3 files changed, 2 insertions(+), 151 deletions(-)
 delete mode 100644 pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
 delete mode 100644 pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch

diff --git a/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
deleted file mode 100644
index b28e0b8e9720..000000000000
--- a/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 69a6ab80cf0908c2a44430c297932ef3659a1655 Mon Sep 17 00:00:00 2001
-From: Jiajie Chen <c@jia.je>
-Date: Wed, 22 Jun 2022 16:24:10 +0800
-Subject: [PATCH 1/2] Fix detection of quartz in gdk-3.0 target
-
-The GTK+3 built by Nix targets ``broadway quartz`` instead of only `quartz`,
-thus the target check is wrong. The script is modified to look up `quartz` in a
-loop. The variable name is renamed to `targets` in `gdk-3.0.pc` as well.
-
----
- configure | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 628a80f..9cb88d5 100755
---- a/configure
-+++ b/configure
-@@ -7361,7 +7361,10 @@ $as_echo "yes" >&6; }
- fi
-         GTK_VER=`$PKG_CONFIG gtk+-3.0 --modversion`
- 
--        _gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0`
-+        # gdk-3.0 may have multiple targets e.g. "broadway quartz"
-+        _gdk_tgts=`$PKG_CONFIG --variable=targets gdk-3.0`
-+        for _gdk_tgt in $_gdk_tgts;
-+        do
-         if test "x$_gdk_tgt" = xquartz; then
- 
- pkg_failed=no
-@@ -7466,6 +7469,7 @@ fi
-            COCOA_GTK_LDFLAGS="-framework Cocoa -framework ApplicationServices"
- 
-         fi
-+        done
- 
-         if test x$with_gconf = xyes; then
- 
--- 
-2.36.1
-
diff --git a/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
deleted file mode 100644
index 456f5fa278f3..000000000000
--- a/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 6045177a0d4753bb7a6a6ffc3f1a4a3e96129c6d Mon Sep 17 00:00:00 2001
-From: Jiajie Chen <c@jia.je>
-Date: Wed, 22 Jun 2022 17:03:29 +0800
-Subject: [PATCH 2/2] Check GDK_WINDOWING_X11 macro when using GtkPlug
-
----
- src/main.c     |  5 +++++
- src/twinwave.c | 12 ++++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index 81bf505..b89f629 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2080,10 +2080,15 @@ if(!GLOBALS->socket_xid)
- #ifdef WAVE_USE_XID
- 	else
- 	{
-+#ifdef GDK_WINDOWING_X11
-         GLOBALS->mainwindow = gtk_plug_new(GLOBALS->socket_xid);
-         gtk_widget_show(GLOBALS->mainwindow);
- 
-         g_signal_connect(XXX_GTK_OBJECT(GLOBALS->mainwindow), "destroy",   /* formerly was "destroy" */G_CALLBACK(plug_destroy),"Plug destroy");
-+#else
-+	fprintf(stderr, "GTKWAVE | GtkPlug widget is unavailable\n");
-+	exit(1);
-+#endif
- 	}
- #endif
- }
-diff --git a/src/twinwave.c b/src/twinwave.c
-index 590c7f6..d5c60f2 100644
---- a/src/twinwave.c
-+++ b/src/twinwave.c
-@@ -143,15 +143,19 @@ if(GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()))
- 	use_embedded = 0;
- 	}
- #endif
-+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
- 	{
- 	xsocket[0] = gtk_socket_new ();
- 	xsocket[1] = gtk_socket_new ();
- 	gtk_widget_show (xsocket[0]);
- 	gtk_widget_show (xsocket[1]);
- 	}
-+#endif
- 
-+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
- if(!twinwayland)
- g_signal_connect(XXX_GTK_OBJECT(xsocket[0]), "plug-removed", G_CALLBACK(plug_removed), NULL);
-+#endif
- 
- #if GTK_CHECK_VERSION(3,0,0)
- main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
-@@ -208,7 +212,7 @@ if(hMapFile != NULL)
- 				memset(&pi, 0, sizeof(PROCESS_INFORMATION));
- 
- 				sprintf(buf, "0+%08X", shmid);
--#ifdef MINGW_USE_XID
-+#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
- 				sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
- #else
- 				sprintf(buf2, "%x", 0);
-@@ -279,7 +283,7 @@ if(hMapFile != NULL)
- 				memset(&pi, 0, sizeof(PROCESS_INFORMATION));
- 
- 				sprintf(buf, "1+%08X", shmid);
--#ifdef MINGW_USE_XID
-+#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
- 				sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
- #else
- 				sprintf(buf2, "%x", 0);
-@@ -429,10 +433,12 @@ if(shmid >=0)
- 				sprintf(buf, "0+%08X", shmid);
- 				if(use_embedded)
- 					{
-+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
- #ifdef MAC_INTEGRATION
- 					sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
- #else
- 					sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
-+#endif
- #endif
- 					}
- 					else
-@@ -467,10 +473,12 @@ if(shmid >=0)
- 			sprintf(buf, "1+%08X", shmid);
- 			if(use_embedded)
- 				{
-+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
- #ifdef MAC_INTEGRATION
- 				sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
- #else
- 				sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
-+#endif
- #endif
- 				}
- 				else
--- 
-2.36.1
-
diff --git a/pkgs/by-name/gt/gtkwave/package.nix b/pkgs/by-name/gt/gtkwave/package.nix
index 6ae23ab2b8a4..d87503a827a2 100644
--- a/pkgs/by-name/gt/gtkwave/package.nix
+++ b/pkgs/by-name/gt/gtkwave/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkwave";
-  version = "3.3.121";
+  version = "3.3.125";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
-    sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y=";
+    sha256 = "sha256-Musd9N/Vbg3eF+igjeYPIBOK8BeoqK1kUi9pYnVixDc=";
   };
 
   nativeBuildInputs = [
@@ -44,14 +44,6 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
 
-  # fix compilation under Darwin
-  # remove these patches upon next release
-  # https://github.com/gtkwave/gtkwave/pull/136
-  patches = [
-    ./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
-    ./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
-  ];
-
   configureFlags = [
     "--with-tcl=${tcl}/lib"
     "--with-tk=${tk}/lib"

From 579c4bb8d74b497062b2fd2c86211da967e16d19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Dec 2025 02:39:02 +0000
Subject: [PATCH 20/47] numr: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/nu/numr/package.nix b/pkgs/by-name/nu/numr/package.nix
index 588810bc58cb..c4ca5534e104 100644
--- a/pkgs/by-name/nu/numr/package.nix
+++ b/pkgs/by-name/nu/numr/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "numr";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "nasedkinpv";
     repo = "numr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Qy0HIG2E7d7QU19XQAAWodJdAglaCSFM+IeDCnvpzww=";
+    hash = "sha256-fa/F1bE/iUdtLe4kgHIQF3lcT/LLyUgdiYSgE9pCCSc=";
   };
 
-  cargoHash = "sha256-iXUIf2G00qYgwHZ70Egzu0RginOjKVgidkMhjPwEIT4=";
+  cargoHash = "sha256-onIhdgcB7MDiLCOi4qMysnu3VVpZ138jro9mZXDp9LI=";
 
   nativeBuildInputs = [
     pkg-config

From 2e37276cee9d1ec1c2b7131f4f9fd3eda44f96c3 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 19 Dec 2025 22:42:41 -0500
Subject: [PATCH 21/47] brave: 1.85.117 -> 1.85.118

https://community.brave.app/t/release-channel-1-85-118/647176
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 3c87c2efb453..a5283cf85ac1 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.85.117";
+  version = "1.85.118";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-cGqxB3dVYraCqf3DoO3Who2RFm+ZnSedUG5jb8D9Mk8=";
+      hash = "sha256-xn7x6O2JVKu2KlcMXSo7P4oTYfVyC1S4OIemXK82vD0=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-ov0gwAv9tCX45EqZa3SBXIzgczBD1RwNS+N1L2vE3Uc=";
+      hash = "sha256-I++3Oq+iW4uuccKiSa5FwS652aT+tFQI0D0n4Nq6U1w=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-SFe2qX/BugI9Pumv2me5jfC1FpRUsSbtSm+Jl+gW03U=";
+      hash = "sha256-Igh0anjOkf+nemi4hi6kOu49+oXL4cQ0z7bxjyAt5AU=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-Z0n+TqcgZXqjS1hBx9uznEC6/LftZfaE7k26RhsWI0I=";
+      hash = "sha256-NxL7IsFhPIthG8kO1wO6lbxqlghixZvnsgTbLfi2OX4=";
     };
   };
 

From 35224e6faf2419ea0b50418757476cf9699805b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Dec 2025 04:24:53 +0000
Subject: [PATCH 22/47] prow: 0-unstable-2025-11-25 -> 0-unstable-2025-12-18

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

diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix
index a0ff5cfee009..b12695f4f56a 100644
--- a/pkgs/by-name/pr/prow/package.nix
+++ b/pkgs/by-name/pr/prow/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "prow";
-  version = "0-unstable-2025-11-25";
-  rev = "e3ae8cf22a59dce06665a4eec8ed70d14c276c77";
+  version = "0-unstable-2025-12-18";
+  rev = "6bd26c8c553779752ecd8b21d8d32cb7067a8e71";
 
   src = fetchFromGitHub {
     inherit rev;
 
     owner = "kubernetes-sigs";
     repo = "prow";
-    hash = "sha256-w+EpyhCCUoMGuRRN+dEOpHXzs8kFYEBfk53/okCqeHY=";
+    hash = "sha256-ImjNTj0VdPrH0C0FKfH8AgfUFWGr0VD6GNACeTR2THU=";
   };
 
-  vendorHash = "sha256-Rgn8fgDUSqYlf2JLlDCfLj5hXzujC5qyTYbJ+54FTD4=";
+  vendorHash = "sha256-/ZAnYxUHHq+tqk0hcJrt6ZrpDDRqyLITWGL/hgW4A6A=";
 
   # doCheck = false;
 

From e5f5d9f51b71b645ab6cd69ed03744859e981873 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Sat, 20 Dec 2025 11:14:30 -0500
Subject: [PATCH 23/47] nix: add passthru.nix-cli

---
 .../package-management/nix/modular/packaging/everything.nix      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
index 19d8260532cc..d1b9134c4450 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
@@ -182,6 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     inherit (nix-cli) version;
+    inherit nix-cli;
     src = patchedSrc;
 
     /**

From cac51c361a2db3cfc9737f8c366720937209572b Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 11:31:47 -0500
Subject: [PATCH 24/47] norwester-font: fix src and homepage 404

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

diff --git a/pkgs/by-name/no/norwester-font/package.nix b/pkgs/by-name/no/norwester-font/package.nix
index fb8ef1ab1e73..53a7579374b5 100644
--- a/pkgs/by-name/no/norwester-font/package.nix
+++ b/pkgs/by-name/no/norwester-font/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "1.2";
 
   src = fetchzip {
-    url = "http://jamiewilson.io/norwester/assets/norwester.zip";
+    url = "https://jamiewilson.github.io/norwester/assets/norwester.zip";
     stripRoot = false;
     hash = "sha256-Ak/nobrQE/XYGWs/IhlZlTp74ff+s4adUR6Sht5Yf8g=";
   };
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://jamiewilson.io/norwester";
+    homepage = "https://jamiewilson.github.io/norwester/";
     description = "Condensed geometric sans serif by Jamie Wilson";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;

From e3bf7980a32c96c01f93dd3a06008baf3c7ccfbb Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 20 Dec 2025 18:10:25 +0100
Subject: [PATCH 25/47] vencord: 1.13.9 -> 1.13.11

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

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index dff8ccb349e8..dcf85e9b72a3 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.13.9";
+  version = "1.13.11";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AvwYAsc/dozSfIGPcsySAqOa47jg6bXvHj53eVsjYiM=";
+    hash = "sha256-PSA1CD5YMDSNrP6JUEfdqSC1fNXXWHKsu5hCXnoXGCA=";
   };
 
   patches = [ ./fix-deps.patch ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-M9yZxBtuZg5KwG2Sli+f6Ionwccq7F7tI8/FnP1iObA=";
+    hash = "sha256-K9rjPsODn56kM2k5KZHxY99n8fKvWbRbxuxFpYVXYks=";
   };
 
   nativeBuildInputs = [

From a0a837c08d881e360bca2e803a37478171efc45d Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 11:53:42 -0500
Subject: [PATCH 26/47] barlow: move 404ing src  to github

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

diff --git a/pkgs/by-name/ba/barlow/package.nix b/pkgs/by-name/ba/barlow/package.nix
index 077d4bc8536b..67fdf32c04af 100644
--- a/pkgs/by-name/ba/barlow/package.nix
+++ b/pkgs/by-name/ba/barlow/package.nix
@@ -1,17 +1,18 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitHub,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "barlow";
   version = "1.422";
 
-  src = fetchzip {
-    url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip";
-    stripRoot = false;
-    hash = "sha256-aHAGPEgBkH41r7HR0D74OGCa7ta7Uo8Mgq4YVtYOwU8=";
+  src = fetchFromGitHub {
+    owner = "jpt";
+    repo = "barlow";
+    tag = "${version}";
+    hash = "sha256-FG68o6qN/296RhSNDHFXYXbkhlXSZJgGhVjzlJqsksY=";
   };
 
   installPhase = ''

From ee889da6ff1ef494e26b7339f6f86ddea0014b34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Dec 2025 18:56:17 +0000
Subject: [PATCH 27/47] simdutf: 7.7.0 -> 7.7.1

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 288c816bf86c..2b855c7bbda0 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "7.7.0";
+  version = "7.7.1";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OjQHPxk4lH+h48HfkJmiWY6nnGZd/bhUcZPW7NkF5jg=";
+    hash = "sha256-/sz1GVMkHPlUkQxhbMGpoEg6byFH9WNMjEo6hjGRhE8=";
   };
 
   # Fix build on darwin

From a0c76d6788cd4325f097e2951cbb85792a0a94f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 00:37:26 +0000
Subject: [PATCH 28/47] vimPlugins.zig-vim: 0-unstable-2025-11-28 ->
 0-unstable-2025-12-07

---
 .../editors/vim/plugins/non-generated/zig-vim/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
index ceea25c95f3d..f984fa0e52ee 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
@@ -6,14 +6,14 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "zig.vim";
-  version = "0-unstable-2025-11-28";
+  version = "0-unstable-2025-12-07";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "ziglang";
     repo = "zig.vim";
-    rev = "8ff80c24a2ff8fd9edd4a92c2f5793e921043cd6";
-    hash = "sha256-VhEObsEYN/7o+U48MIywhPoYMHemXnKplX+zOrRHuxM=";
+    rev = "74bdb43c9d5da8d6b715809b79f92ef8f711df8e";
+    hash = "sha256-RmrRgJ6YdExMwmua6nGv6W7DPP98k2URIaJTm+O4uR8=";
   };
 
   passthru.updateScript = nix-update-script {

From 83acaa98ebd7b4b0ed9caa06d3271c2e6b63a09a Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 19:56:25 -0500
Subject: [PATCH 29/47] glabels-qt: unstable-2021-02-06 -> unstable-2025-12-03

---
 pkgs/by-name/gl/glabels-qt/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gl/glabels-qt/package.nix b/pkgs/by-name/gl/glabels-qt/package.nix
index 1bc6e4fe0074..a8aeff04dea0 100644
--- a/pkgs/by-name/gl/glabels-qt/package.nix
+++ b/pkgs/by-name/gl/glabels-qt/package.nix
@@ -3,24 +3,24 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation {
   pname = "glabels-qt";
-  version = "unstable-2021-02-06";
+  version = "unstable-2025-12-03";
 
   src = fetchFromGitHub {
     owner = "jimevins";
     repo = "glabels-qt";
-    rev = "glabels-3.99-master564";
-    hash = "sha256-SdNOkjspqf6NuuIBZDsJneY6PNrIiP4HU46wDpBLt9Y=";
+    tag = "3.99-master602";
+    hash = "sha256-7MQufoU1GBvmZd8FRn331/PwmwQMuZeuFKQqViRI754=";
   };
 
   nativeBuildInputs = [
     cmake
-    libsForQt5.wrapQtAppsHook
-    libsForQt5.qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
   ];
 
   meta = {

From e73d8904644ead3334a25af72964a7f90058ced4 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 15 Sep 2025 11:00:39 -0300
Subject: [PATCH 30/47] nix: fix cygwin build

This change is from upstream packaging/.
---
 .../package-management/nix/modular/packaging/components.nix     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index df8ee0671382..38da049618b1 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -123,7 +123,7 @@ let
       +
         lib.optionalString
           (
-            !stdenv.hostPlatform.isWindows
+            !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin)
             # build failure
             && !stdenv.hostPlatform.isStatic
             # LTO breaks exception handling on x86-64-darwin.

From 41e8c08968ce3e470cf9068c1a819f507d74f680 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 3 Dec 2025 13:25:56 -0400
Subject: [PATCH 31/47] release-cross: add nixVersions.git to cygwin

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f6efd125497a..7f2696a23828 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -114,6 +114,7 @@ let
 
   cygwinCommon = {
     hello = nativePlatforms;
+    nixVersions.git = nativePlatforms;
   };
 
   wasiCommon = {

From 34ef732c4fe321312cdd5a5ca7ad0d395f36248e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 03:18:09 +0000
Subject: [PATCH 32/47] python3Packages.google-photos-library-api: 1.0.0 ->
 1.0.1

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

diff --git a/pkgs/development/python-modules/google-photos-library-api/default.nix b/pkgs/development/python-modules/google-photos-library-api/default.nix
index 34406748b650..59998f3a0c79 100644
--- a/pkgs/development/python-modules/google-photos-library-api/default.nix
+++ b/pkgs/development/python-modules/google-photos-library-api/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "google-photos-library-api";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "python-google-photos-library-api";
     tag = version;
-    hash = "sha256-BtVnFQ0MtxQBvT0xff59hBED89rtg8xfuv31T13qL8w=";
+    hash = "sha256-pmAAvwhr783ih9vpqr5DmT462z3Ug1xwHaz9itu/mt4=";
   };
 
   build-system = [ setuptools ];

From f1d4232f4949cb50035e9557439e705559bda11b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 04:15:44 +0000
Subject: [PATCH 33/47] smile: 2.10.2 -> 2.11.0

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

diff --git a/pkgs/by-name/sm/smile/package.nix b/pkgs/by-name/sm/smile/package.nix
index 202826697d14..dbc0ca526309 100644
--- a/pkgs/by-name/sm/smile/package.nix
+++ b/pkgs/by-name/sm/smile/package.nix
@@ -15,14 +15,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "smile";
-  version = "2.10.2";
+  version = "2.11.0";
   pyproject = false; # Builds with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "smile";
     tag = version;
-    hash = "sha256-J+cCYt5ATR5xm/NsjYGkfQmHpTS5LDugj0XCphHanDc=";
+    hash = "sha256-uggbeFcafCvIpT+qHsnULTZ9oyQkfT7phI5KW00HEXg=";
   };
 
   nativeBuildInputs = [

From ff1d14b6f21b8eb49fbbbacc561c964f42ffdeff Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 21 Dec 2025 00:13:51 +0100
Subject: [PATCH 34/47] lsp-plugins: 1.2.25 -> 1.2.26

---
 pkgs/by-name/ls/lsp-plugins/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index 796765172b8e..e7f52ff234e4 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -39,7 +39,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lsp-plugins";
-  version = "1.2.25";
+  version = "1.2.26";
 
   outputs = [
     "out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz";
-    hash = "sha256-qCm3DfRF7LR6wk5TtC/r1GIA2ZI7YrrZTKNHjLDjJnM=";
+    hash = "sha256-RIMqmSJkF90u+nSICZCj3nGrAx1mfUXsPQb3lXicCfM=";
   };
 
   # By default, GStreamer plugins are installed right alongside GStreamer itself
@@ -178,6 +178,10 @@ stdenv.mkDerivation (finalAttrs: {
       - Send
       - Surge Filter
       - Trigger
+
+      Matcher plugins:
+      - Matcher
+      - Sidechain Matcher
     '';
     homepage = "https://lsp-plug.in";
     changelog = "https://github.com/lsp-plugins/lsp-plugins/releases/tag/${finalAttrs.version}";

From 0c2152e95f099a2f12e03bacdf4384866e20267a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 05:17:23 +0000
Subject: [PATCH 35/47] playwright-mcp: 0.0.41 -> 0.0.53

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

diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix
index 6507edcf1297..815e4146124e 100644
--- a/pkgs/by-name/pl/playwright-mcp/package.nix
+++ b/pkgs/by-name/pl/playwright-mcp/package.nix
@@ -7,16 +7,16 @@
 }:
 buildNpmPackage rec {
   pname = "playwright-mcp";
-  version = "0.0.41";
+  version = "0.0.53";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright-mcp";
     tag = "v${version}";
-    hash = "sha256-OoTAYd1/hedR0k/3b83YOPaOviLWv1Y3pffNoeSf2g4=";
+    hash = "sha256-TuXdvaPa5732NTZ5Fchjr5pXsURYxsnrjf6CS1qlkOA=";
   };
 
-  npmDepsHash = "sha256-xgOPlCnlRXJZAZRM4xZ7SYSA5lsPglSewXxY19TbD/A=";
+  npmDepsHash = "sha256-Rdtc8rWyBmWmC1qy7TetaAdb1OFG6PdB5/2xQe8MwUg=";
 
   postInstall = ''
     rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright

From e984074c14bfcc6587c3bcae0ea093685af1dd15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 06:24:50 +0000
Subject: [PATCH 36/47] terraform-providers.aminueza_minio: 3.11.5 -> 3.12.0

---
 .../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 5b4b07c419d9..273cb9cfd6d1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -54,11 +54,11 @@
     "vendorHash": "sha256-LSvX63g4GWcr2Uo6H50dOWG0XWUhmbhUw9EYsQqs+HU="
   },
   "aminueza_minio": {
-    "hash": "sha256-7nBNfOBzRJ2DkIErr48vTEkn1re7e2DapSx1RBQNZTc=",
+    "hash": "sha256-G6eQeoxIeuUJK7LF8gByOrNP27i3p0OccZNxL2DxDw0=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v3.11.5",
+    "rev": "v3.12.0",
     "spdx": "AGPL-3.0",
     "vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA="
   },

From 8b1d494d33035f2eb5b02dcfdc13e99a22af8912 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 07:56:24 +0000
Subject: [PATCH 37/47] apache-answer: 1.6.0 -> 1.7.1

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

diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index e4e19678f1b6..5bfc98304ab7 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "apache-answer";
-  version = "1.6.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "answer";
     tag = "v${version}";
-    hash = "sha256-QrLYkGiEDBB4uUzG2yrlEUYXpQxovKFBmGZjLbZiGKk=";
+    hash = "sha256-QTm/6srSn4oF78795ADpW10bZmyEmqTNezB6JSkS2I4=";
   };
 
   webui = stdenv.mkDerivation {
@@ -58,7 +58,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-mWSKoEYj23fy6ix3mK1/5HeGugp1UAUO+iwInXkzgU4=";
+  vendorHash = "sha256-ZZ+6OS967qtstMxdBzDxTU2wvyieZJM+/g9V96rXPVI=";
 
   doCheck = false; # TODO checks are currently broken upstream
 

From 921f2e5497c7bc8a4fee2ea1589949d76519c211 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 08:02:09 +0000
Subject: [PATCH 38/47] borgmatic: 2.0.12 -> 2.0.13

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

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 27bb9309e1df..ffbfd9a96d8c 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "2.0.12";
+  version = "2.0.13";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-z2LOj7NW1S1C6hSsaeBKXYnrwS0XskOK9idwIfiA9Do=";
+    hash = "sha256-0Prjgh/L5nCo3CNXZccNW9Dz3d6jIfrXDZmy5fL6zrU=";
   };
 
   passthru.updateScript = nix-update-script { };

From 0f9b89d54c4187ea4cdb7962296921240f11128e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 21 Dec 2025 12:00:17 +0300
Subject: [PATCH 39/47] linux-firmware: 20251125 -> unstable-2025-12-18

This is to pick up the AMDGPU hang fixes that are biting
more people than anticipated, with a new upstream tag
also taking longer to materialize than anticipated.
---
 pkgs/by-name/li/linux-firmware/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index fcbde7a8795f..a95b8ada1e35 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -20,15 +20,15 @@ let
     fi
   '';
 in
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   pname = "linux-firmware";
-  version = "20251125";
+  version = "20251125-unstable-2025-12-18";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
-    tag = version;
-    hash = "sha256-eNzCgVx6iPWbPccMM1TLBIsFKwiha9/gajmFtobj4SE=";
+    rev = "881c549a82203abd9a88870ba27f3e8ce754b2c4";
+    hash = "sha256-ziKzNbP8pqwFilzQb227FtVMqaUGDcbZ57tc9mAMSxs=";
   };
 
   postUnpack = ''

From 464a0d33d3340c9afc3ffcd74bac43f31f971758 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 09:28:21 +0000
Subject: [PATCH 40/47] terraform-providers.tencentcloudstack_tencentcloud:
 1.82.44 -> 1.82.47

---
 .../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 5b4b07c419d9..4bcff085e0e3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1310,11 +1310,11 @@
     "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-BCYwbyaZFA1zVlfDaTdUDiAFH683zfAoXIE4pj1OzOs=",
+    "hash": "sha256-VpaGrpwILnJroZ+4mAM9eVhxXAUl8QMShAwgCzNAi4Q=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.44",
+    "rev": "v1.82.47",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 2c62f010f900b3aa7bff4e414973d929fa02d1ce Mon Sep 17 00:00:00 2001
From: bas <github.plated100@passmail.net>
Date: Fri, 19 Dec 2025 12:33:32 +0100
Subject: [PATCH 41/47] python3Packages.pycambia: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/pycambia/default.nix b/pkgs/development/python-modules/pycambia/default.nix
new file mode 100644
index 000000000000..2e23a766570a
--- /dev/null
+++ b/pkgs/development/python-modules/pycambia/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  openssl,
+  pkg-config,
+  pytestCheckHook,
+  rustPlatform,
+}:
+let
+  cargoLockPatch = (
+    fetchpatch {
+      name = "cargo.lock.patch";
+      url = "https://github.com/KyokoMiki/pycambia/commit/00446e13c20a461c323b119e16f3f57489ba662d.patch";
+      hash = "sha256-N7F67VRxfndoN8NllmGKEePOh3mgbjlNaToUvxh+IrE=";
+    }
+  );
+in
+buildPythonPackage rec {
+  pname = "pycambia";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KyokoMiki";
+    repo = "pycambia";
+    tag = version;
+    hash = "sha256-ZflLy6Qa4tBlPZkTya3ELu463qcnRcMS57a6FfHpSNE=";
+  };
+
+  patches = [ cargoLockPatch ];
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-jmdf+Idg9PR4jgZ7bexPsAyGj86vGxLseTWXnhzP7+E=";
+    patches = [ cargoLockPatch ];
+  };
+
+  buildInputs = [ openssl ];
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "cambia" ];
+
+  meta = {
+    description = "Python wrapper for compact disc ripper log checking utility cambia";
+    homepage = "https://github.com/KyokoMiki/pycambia";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ undefined-landmark ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf8cf0483ce0..c6d42e091f1e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13013,6 +13013,8 @@ self: super: with self; {
 
   pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs.buildPackages) meson; };
 
+  pycambia = callPackage ../development/python-modules/pycambia { };
+
   pycangjie = callPackage ../development/python-modules/pycangjie {
     inherit (pkgs.buildPackages) meson;
   };

From 9ace99a248ad969609c1daf97e0e37c8857624f0 Mon Sep 17 00:00:00 2001
From: bas <github.plated100@passmail.net>
Date: Sun, 21 Dec 2025 11:01:39 +0100
Subject: [PATCH 42/47] python3Packages.pyoxipng: init at 9.1.1

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

diff --git a/pkgs/development/python-modules/pyoxipng/default.nix b/pkgs/development/python-modules/pyoxipng/default.nix
new file mode 100644
index 000000000000..f696a8a44b1c
--- /dev/null
+++ b/pkgs/development/python-modules/pyoxipng/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyoxipng";
+  version = "9.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nfrasser";
+    repo = "pyoxipng";
+    tag = "v${version}";
+    hash = "sha256-aVya+0+X2p0VaWCZTxVlVUFFlqkqZ7A2lJjhxiXAgrE=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-wMCx6cujqM4q96b1mg4eovKjWmsv0FcaDBCxy0OodmA=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "oxipng" ];
+
+  meta = {
+    description = "Python wrapper for multithreaded PNG optimizer oxipng";
+    homepage = "https://github.com/nfrasser/pyoxipng";
+    changelog = "https://github.com/nfrasser/pyoxipng/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ undefined-landmark ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6d42e091f1e..bc614d98cabf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14110,6 +14110,8 @@ self: super: with self; {
 
   pyoxigraph = callPackage ../development/python-modules/pyoxigraph { };
 
+  pyoxipng = callPackage ../development/python-modules/pyoxipng { };
+
   pypager = callPackage ../development/python-modules/pypager { };
 
   pypalazzetti = callPackage ../development/python-modules/pypalazzetti { };

From 2e5f95719e8e3c63707185083fa1c6c3fddcd47e Mon Sep 17 00:00:00 2001
From: bas <github.plated100@passmail.net>
Date: Sun, 21 Dec 2025 11:04:56 +0100
Subject: [PATCH 43/47] smoked-salmon: init at 0.9.7.4

---
 pkgs/by-name/sm/smoked-salmon/package.nix | 94 +++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 pkgs/by-name/sm/smoked-salmon/package.nix

diff --git a/pkgs/by-name/sm/smoked-salmon/package.nix b/pkgs/by-name/sm/smoked-salmon/package.nix
new file mode 100644
index 000000000000..9c38d4fbd84c
--- /dev/null
+++ b/pkgs/by-name/sm/smoked-salmon/package.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  fetchFromGitHub,
+  ffmpeg-headless,
+  flac,
+  lame,
+  mp3val,
+  python3Packages,
+  sox,
+}:
+let
+  runtimeDeps = [
+    ffmpeg-headless
+    flac
+    lame
+    mp3val
+    sox
+  ];
+in
+python3Packages.buildPythonApplication rec {
+  pname = "smoked-salmon";
+  version = "0.9.7.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "smokin-salmon";
+    repo = "smoked-salmon";
+    tag = version;
+    hash = "sha256-JOwqu/Hu7BjYLo3DdL6o+9TI/OQvlgj5Xu8WQ0cujwo=";
+  };
+
+  # Upstream tends to use very narrow version constraints
+  pythonRelaxDeps = true;
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    aiohttp
+    aiohttp-jinja2
+    beautifulsoup4
+    bitstring
+    click
+    deluge-client
+    ffmpeg-python
+    filetype
+    httpx
+    humanfriendly
+    jinja2
+    msgspec
+    musicbrainzngs
+    mutagen
+    pillow
+    platformdirs
+    pycambia
+    pyoxipng
+    pyperclip
+    qbittorrent-api
+    ratelimit
+    requests
+    rich
+    send2trash
+    setuptools
+    torf
+    tqdm
+    transmission-rpc
+    unidecode
+    wheel
+  ];
+
+  makeWrapperArgs = [
+    "--suffix"
+    "PATH"
+    ":"
+    (lib.makeBinPath runtimeDeps)
+  ];
+
+  passthru = {
+    inherit runtimeDeps;
+  };
+
+  meta = {
+    description = "Toolkit for checking, editing and uploading music to Gazelle-based trackers";
+    homepage = "https://github.com/smokin-salmon/smoked-salmon";
+    license = with lib.licenses; [ asl20 ];
+    mainProgram = "salmon";
+    maintainers = with lib.maintainers; [
+      ambroisie
+      undefined-landmark
+    ];
+  };
+}

From d4d006b1f3119bf7c5d9fdee979ae7ef1760dd37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 11:00:48 +0000
Subject: [PATCH 44/47] python3Packages.urllib3-future: 2.14.908 -> 2.15.900

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

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index f6416908579e..155c9ccf5a26 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.14.908";
+  version = "2.15.900";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-EPM3LbzNA7gKkwJy4xd/d/Mhs0qhuPRGI4uVkDHiUnI=";
+    hash = "sha256-YSV9Wjwq98VbYeCuTvjP4uxhxtyZtD/Hgh84i6vgFoo=";
   };
 
   postPatch = ''

From 8a16d070c1c82fdb470102dffffe03e411d43a80 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 15:35:08 -0500
Subject: [PATCH 45/47] manrope: drop

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

diff --git a/pkgs/by-name/ma/manrope/package.nix b/pkgs/by-name/ma/manrope/package.nix
deleted file mode 100644
index 1e967ebe7c6c..000000000000
--- a/pkgs/by-name/ma/manrope/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "manrope";
-  version = "4.505";
-
-  src = fetchFromGitHub {
-    owner = "sharanda";
-    repo = "manrope";
-    rev = "d79b66b10608610692d59f4107791d249d244416"; # no tags in repo
-    hash = "sha256-dxnCOkPUEG0knSekolx2+SGJR81vRK0wUrbzGH4KGD0=";
-  };
-
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-  doCheck = false;
-  dontFixup = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype
-    install -Dm644 fonts/ttf/*.ttf fonts/variable/*.ttf -t $out/share/fonts/truetype
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Open-source modern sans-serif font family";
-    homepage = "https://www.gent.media/manrope";
-    license = lib.licenses.ofl;
-    platforms = lib.platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 50ebf60ae40f..b2df197734f2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1043,6 +1043,7 @@ mapAliases {
   mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
   makeOverridable = warnAlias "'makeOverridable' has been removed from pkgs, use `lib.makeOverridable` instead" lib.makeOverridable; # Added 2025-10-30
   manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
+  manrope = throw "'manrope' has been removed because its source has been pulled"; # Added 2025-12-20
   mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
   marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27
   marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27

From 6bfb89b890a5c21b7fce3d25653c6d66012c4339 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 23:42:26 -0500
Subject: [PATCH 46/47] gen-oath-safe: change 404 src to point to sourcehut

---
 pkgs/by-name/ge/gen-oath-safe/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ge/gen-oath-safe/package.nix b/pkgs/by-name/ge/gen-oath-safe/package.nix
index 170ba1500d37..5daef03f9a56 100644
--- a/pkgs/by-name/ge/gen-oath-safe/package.nix
+++ b/pkgs/by-name/ge/gen-oath-safe/package.nix
@@ -1,6 +1,6 @@
 {
   coreutils,
-  fetchFromGitHub,
+  fetchFromSourcehut,
   file,
   libcaca,
   makeWrapper,
@@ -15,13 +15,13 @@
 stdenv.mkDerivation rec {
   pname = "gen-oath-safe";
   version = "0.11.0";
-  src = fetchFromGitHub {
-    owner = "mcepl";
+
+  src = fetchFromSourcehut {
+    owner = "~mcepl";
     repo = "gen-oath-safe";
-    rev = version;
+    tag = version;
     sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
   };
-
   nativeBuildInputs = [ makeWrapper ];
 
   dontBuild = true;
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
         --prefix PATH : ${path}
     '';
   meta = {
-    homepage = "https://github.com/mcepl/gen-oath-safe";
+    homepage = "https://git.sr.ht/~mcepl/gen-oath-safe";
     description = "Script for generating HOTP/TOTP keys (and QR code)";
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;

From 4f2f7d9a67b021ef837be6844320e3734051084a Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 12:22:59 -0500
Subject: [PATCH 47/47] computecpp: drop

---
 .../co/computecpp-unwrapped/package.nix       | 59 -------------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               | 18 ------
 3 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/by-name/co/computecpp-unwrapped/package.nix

diff --git a/pkgs/by-name/co/computecpp-unwrapped/package.nix b/pkgs/by-name/co/computecpp-unwrapped/package.nix
deleted file mode 100644
index c439bedca109..000000000000
--- a/pkgs/by-name/co/computecpp-unwrapped/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  pkg-config,
-  autoPatchelfHook,
-  installShellFiles,
-  ocl-icd,
-  zlib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "computecpp";
-  version = "2.11.0";
-
-  src = fetchzip {
-    url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
-    hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY=";
-    stripRoot = true;
-  };
-
-  dontStrip = true;
-
-  buildInputs = [
-    (lib.getLib stdenv.cc.cc)
-    ocl-icd
-    zlib
-  ];
-  nativeBuildInputs = [
-    autoPatchelfHook
-    pkg-config
-    installShellFiles
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \;
-    find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \;
-    find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \;
-    find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \;
-    find ./include -type f -exec install -D -m 0644 {} -t $out/include \;
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    isClang = true;
-  };
-
-  meta = {
-    description = "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards";
-    homepage = "https://www.codeplay.com/products/computesuite/computecpp";
-    license = lib.licenses.unfree;
-    maintainers = [ ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 72e4fdf67493..ac706d5fc41a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -453,6 +453,8 @@ mapAliases {
   collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
+  computecpp = throw "'computecpp' has been removed because its source has been pulled"; # Added 2025-12-20
+  computecpp-unwrapped = throw "'computecpp-unwrapped' has been removed because its source has been pulled"; # Added 2025-12-20
   conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48dc7cff6d71..9bf61c7ed3e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4234,24 +4234,6 @@ with pkgs;
 
   inherit (coqPackages_9_0) compcert;
 
-  computecpp = wrapCCWith rec {
-    cc = computecpp-unwrapped;
-    extraPackages = [
-      llvmPackages.compiler-rt
-    ];
-    extraBuildCommands = ''
-      wrap compute $wrapper $ccPath/compute
-      wrap compute++ $wrapper $ccPath/compute++
-      export named_cc=compute
-      export named_cxx=compute++
-
-      rsrc="$out/resource-root"
-      mkdir -p "$rsrc/lib"
-      ln -s "${cc}/lib" "$rsrc/include"
-      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '';
-  };
-
   corretto11 = javaPackages.compiler.corretto11;
   corretto17 = javaPackages.compiler.corretto17;
   corretto21 = javaPackages.compiler.corretto21;