From ab67a6ad980cfbbf6af7829fff4c20dc24332e92 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 1 Dec 2025 00:57:12 +0100
Subject: [PATCH 01/32] python3Packages.ziafont: 0.10 -> 0.11

---
 pkgs/development/python-modules/ziafont/checkfonts.nix | 4 ++++
 pkgs/development/python-modules/ziafont/default.nix    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ziafont/checkfonts.nix b/pkgs/development/python-modules/ziafont/checkfonts.nix
index 773d8a1ea066..ff077c1d5a6e 100644
--- a/pkgs/development/python-modules/ziafont/checkfonts.nix
+++ b/pkgs/development/python-modules/ziafont/checkfonts.nix
@@ -85,4 +85,8 @@
     url = "https://github.com/google/fonts/raw/main/ofl/arizonia/Arizonia-Regular.ttf";
     hash = "sha256-jfHBC8FdCroUXUWZwlyvrYPbaG0s76QmGfBptvG7zmI=";
   }
+  {
+    url = "https://mirrors.ctan.org/fonts/cinzel/truetype/CinzelDecorative-Regular.ttf";
+    hash = "sha256-OKi38GSSsvwkC5pFs/uDyZWpydVIKZ7AIjma8nfJDEY=";
+  }
 ]
diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix
index 4b6aac44ea95..7f410130530c 100644
--- a/pkgs/development/python-modules/ziafont/default.nix
+++ b/pkgs/development/python-modules/ziafont/default.nix
@@ -11,7 +11,7 @@
 }:
 buildPythonPackage rec {
   pname = "ziafont";
-  version = "0.10";
+  version = "0.11";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "cdelker";
     repo = "ziafont";
     tag = version;
-    hash = "sha256-tDwl+2EChzBDCFcZW71r4eSKyazlJSv7tRX6soPNSuY=";
+    hash = "sha256-KjJ+/Yo5mLV6m7Y0eIGHECH0RvdI+eaFTccDmytNTKI=";
   };
 
   build-system = [ setuptools ];

From cd29b059c13e1a11b7583cb199b7643a2beada0f Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 1 Dec 2025 12:09:04 +0100
Subject: [PATCH 02/32] python3Packages.schemdraw: 0.21 -> 0.22

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

diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix
index c4ae533dc8eb..bb8e709a5e36 100644
--- a/pkgs/development/python-modules/schemdraw/default.nix
+++ b/pkgs/development/python-modules/schemdraw/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "schemdraw";
-  version = "0.21";
+  version = "0.22";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "cdelker";
     repo = "schemdraw";
     tag = version;
-    hash = "sha256-+pvVt7Of5v17PNdZMj8hHvE5tICiTRMelp4trdUZsz4=";
+    hash = "sha256-trhpPv9x+S4d9AHT52/uvuCDOX4tJj6EhPzYBxtzyeQ=";
   };
 
   build-system = [ setuptools ];

From 81f4543a0f5a10c4d4288640c6f83f12808bfc15 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 1 Dec 2025 12:09:16 +0100
Subject: [PATCH 03/32] python3Packages.schemdraw: remove 'with lib'

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

diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix
index bb8e709a5e36..dd03a2654741 100644
--- a/pkgs/development/python-modules/schemdraw/default.nix
+++ b/pkgs/development/python-modules/schemdraw/default.nix
@@ -62,11 +62,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "schemdraw" ];
 
-  meta = with lib; {
+  meta = {
     description = "Package for producing high-quality electrical circuit schematic diagrams";
     homepage = "https://schemdraw.readthedocs.io/en/latest/";
     changelog = "https://schemdraw.readthedocs.io/en/latest/changes.html";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sfrijters ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sfrijters ];
   };
 }

From 939b36b98bd56850752eb5bcb4f1e25a23b10e5a Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 8 Dec 2025 19:28:11 -0500
Subject: [PATCH 04/32] python313Packages.pandas: add missing dependency
 `pyxlsb` to `excel` optdepends

---
 pkgs/development/python-modules/pandas/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index f6445d838ee2..271f41ce15cc 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -38,6 +38,7 @@
   pymysql,
   pyqt5,
   pyreadstat,
+  pyxlsb,
   qtpy,
   s3fs,
   scipy,
@@ -127,7 +128,7 @@ let
           excel = [
             odfpy
             openpyxl
-            # TODO: pyxlsb
+            pyxlsb
             xlrd
             xlsxwriter
           ];

From bec673f23351c544be2f87b116e863bba7b657a5 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <camerone@deshaw.com>
Date: Fri, 19 Dec 2025 12:05:42 -0500
Subject: [PATCH 05/32] ipopt: add optional dependencies back

---
 pkgs/by-name/ip/ipopt/package.nix | 42 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 80953aa13174..7d365c730506 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -6,9 +6,12 @@
   blas,
   lapack,
   gfortran,
-  mumps,
-  spral,
+  enableAMPL ? true,
   libamplsolver,
+  enableMUMPS ? true,
+  mumps,
+  enableSPRAL ? true,
+  spral,
 }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
@@ -25,12 +28,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
   };
 
-  outputs = [
-    "bin"
-    "dev"
-    "out"
-    "doc"
-  ];
+  outputs =
+    # The solver executables for AMPL modeling environment are only installed
+    # when AMPL is available.
+    lib.optional enableAMPL "bin" ++ [
+      "out"
+      "dev"
+      "doc"
+    ];
 
   nativeBuildInputs = [
     pkg-config
@@ -40,17 +45,18 @@ stdenv.mkDerivation rec {
   buildInputs = [
     blas
     lapack
-    mumps
-    spral
-    libamplsolver
-  ];
+  ]
+  ++ lib.optional enableMUMPS mumps
+  ++ lib.optional enableSPRAL spral
+  ++ lib.optional enableAMPL libamplsolver;
 
-  configureFlags = [
-    "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
-    "--with-mumps-lflags=-ldmumps"
-    "--with-spral-lflags=-lspral"
-    "--with-asl-lflags=-lamplsolver"
-  ];
+  configureFlags =
+    lib.optionals enableMUMPS [
+      "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
+      "--with-mumps-lflags=-ldmumps"
+    ]
+    ++ lib.optional enableSPRAL "--with-spral-lflags=-lspral"
+    ++ lib.optional enableAMPL "--with-asl-lflags=-lamplsolver";
 
   enableParallelBuilding = true;
 

From 9f8c66ceff00e7cd1920dbf7aac651f130ffb7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 22 Dec 2025 02:21:46 +0100
Subject: [PATCH 06/32] zammad: fix mail fetch failing with OpenSSL 3.6

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

diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix
index 0e4e73f2d83e..a4562a1d0a7e 100644
--- a/pkgs/by-name/za/zammad/package.nix
+++ b/pkgs/by-name/za/zammad/package.nix
@@ -3,6 +3,7 @@
   lib,
   nixosTests,
   fetchFromGitHub,
+  fetchpatch,
   applyPatches,
   bundlerEnv,
   callPackage,
@@ -28,6 +29,12 @@ let
     src = fetchFromGitHub (lib.importJSON ./source.json);
     patches = [
       ./fix-sendmail-location.diff
+      # Fix mail fetch failing with OpenSSL 3.6
+      # https://github.com/zammad/zammad/pull/5888
+      (fetchpatch {
+        url = "https://github.com/zammad/zammad/commit/01376d45f48df057e4377518e6f7e4a0db7de624.patch";
+        hash = "sha256-uH1/t0dP5nvh12GsJz6Yf/RXpf8+hkYoVJnLJAXqpuc=";
+      })
     ];
 
     postPatch = ''

From a385f6220c268ee6d3ae109692ecee799c924630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 23 Dec 2025 01:07:25 +0100
Subject: [PATCH 07/32] nixos/syncoid: avoid leaking zfs list into journald log

---
 nixos/modules/services/backup/syncoid.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix
index fa1abfe12e2e..7529bb453df6 100644
--- a/nixos/modules/services/backup/syncoid.nix
+++ b/nixos/modules/services/backup/syncoid.nix
@@ -27,7 +27,7 @@ let
   # Function to build "zfs allow" commands for the filesystems we've delegated
   # permissions to. It also checks if the target dataset exists before
   # delegating permissions, if it doesn't exist we delegate it to the parent
-  # dataset (if it exists). This should solve the case of provisoning new
+  # dataset (if it exists). This should solve the case of provisioning new
   # datasets.
   buildAllowCommand =
     permissions: dataset:
@@ -42,7 +42,7 @@ let
           "list"
           dataset
         ]
-      } 2> /dev/null; then
+      } 2>&1 >/dev/null; then
         ${lib.escapeShellArgs [
           "/run/booted-system/sw/bin/zfs"
           "allow"

From e458ede648c7750c6ff6d7aca88cfa6e1a654bc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 05:40:25 +0000
Subject: [PATCH 08/32] mongodb-tools: 100.13.0 -> 100.14.0

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

diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
index a6c9ffaa004d..d6022fd4614c 100644
--- a/pkgs/by-name/mo/mongodb-tools/package.nix
+++ b/pkgs/by-name/mo/mongodb-tools/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "mongo-tools";
-  version = "100.13.0";
+  version = "100.14.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-tools";
     tag = version;
-    hash = "sha256-aQrwJFFdaCIkcnofdGtZ/BMX9KPqr1pHxwm+A04LhXI=";
+    hash = "sha256-QJ1pew6Lg9KAxMJ2XyVXlnRdatbgXesKKmoHCiXQb0c=";
   };
 
   vendorHash = null;

From 8b5ee78f19401c975fa110362596e0564dfd61a0 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 6 Apr 2025 12:27:51 -0700
Subject: [PATCH 09/32] kuyen-icons: init at 2.0

---
 pkgs/by-name/ku/kuyen-icons/package.nix | 40 +++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/ku/kuyen-icons/package.nix

diff --git a/pkgs/by-name/ku/kuyen-icons/package.nix b/pkgs/by-name/ku/kuyen-icons/package.nix
new file mode 100644
index 000000000000..9b753777d182
--- /dev/null
+++ b/pkgs/by-name/ku/kuyen-icons/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitLab,
+  hicolor-icon-theme,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "kuyen-icons";
+  version = "2.0"; # https://www.opendesktop.org/p/1290492/
+
+  src = fetchFromGitLab {
+    owner = "froodo_alexis";
+    repo = "kuyen-icons";
+    rev = "7d4fdecf7121ae6077e5d22501a13ba5eb54a9f6";
+    hash = "sha256-28AAcjg8f0FWwbYeYOMX5OJX2eYL6/a3dgu1HlkW2ZU=";
+  };
+
+  propagatedBuildInputs = [ hicolor-icon-theme ];
+
+  dontDropIconThemeCache = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/icons/kuyen-icons
+    cp -r * $out/share/icons/kuyen-icons
+
+    # Remove broken symlinks
+    find $out/share/icons/kuyen-icons -xtype l -delete
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Colourful flat theme designed for Plasma desktop";
+    homepage = "https://gitlab.com/froodo_alexis/kuyen-icons";
+    license = lib.licenses.cc-by-nc-sa-30;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ iamanaws ];
+  };
+}

From f2a46eaf24a41c9abfa2acdfe98c846ef3c38e36 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 6 Apr 2025 12:28:10 -0700
Subject: [PATCH 10/32] antu-icons: init at 2.0

---
 pkgs/by-name/an/antu-icons/package.nix | 40 ++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/an/antu-icons/package.nix

diff --git a/pkgs/by-name/an/antu-icons/package.nix b/pkgs/by-name/an/antu-icons/package.nix
new file mode 100644
index 000000000000..acf835f6c84e
--- /dev/null
+++ b/pkgs/by-name/an/antu-icons/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitLab,
+  hicolor-icon-theme,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "antu-icons";
+  version = "2.0"; # https://www.opendesktop.org/p/1188266/
+
+  src = fetchFromGitLab {
+    owner = "froodo_alexis";
+    repo = "Antu-icons";
+    rev = "a12a9e559b59c8ded47531e299a5516718ef9a28";
+    hash = "sha256-CLcr+X/b0moVEBV0O/dzCDq4w5G2+KRLUBdqKm0eAKA=";
+  };
+
+  propagatedBuildInputs = [ hicolor-icon-theme ];
+
+  dontDropIconThemeCache = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/icons/antu-icons
+    cp -r * $out/share/icons/antu-icons
+
+    # Remove broken symlinks
+    find $out/share/icons/antu-icons -xtype l -delete
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Smooth icon theme designed for Plasma Desktop";
+    homepage = "https://gitlab.com/froodo_alexis/Antu-icons";
+    license = lib.licenses.cc-by-nc-sa-30;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ iamanaws ];
+  };
+}

From 68753f75040e3f54f0e565c6f9b7f47584cd04a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Dec 2025 17:19:27 +0000
Subject: [PATCH 11/32] all-the-package-names: 2.0.2296 -> 2.0.2309

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

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index cbb835669047..29a13583c428 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2296";
+  version = "2.0.2309";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-cAB0YF1Qi98yVZgU8Bi/zVB08TebOeQpdxHlVgR9qbg=";
+    hash = "sha256-DSriCaoMVYoZOIZKGZIximjzPVteAuIwOv2bswinqgc=";
   };
 
-  npmDepsHash = "sha256-oaaNWLaUV7Hd1x6QEw4p3n7MZQJeXeUqWH2nMNGm+H4=";
+  npmDepsHash = "sha256-Qz7sbsbeaS2e2OsM6rtTPfzNzUXZOVxK/pi438qzy2o=";
 
   passthru.updateScript = nix-update-script { };
 

From 372af59892016fc1126fdaf02ba919f245b4f6c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jan 2026 00:28:11 +0000
Subject: [PATCH 12/32] sqlboiler: 4.19.5 -> 4.19.6

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

diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix
index 42413fb2aeec..2cac14f32036 100644
--- a/pkgs/by-name/sq/sqlboiler/package.nix
+++ b/pkgs/by-name/sq/sqlboiler/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "sqlboiler";
-  version = "4.19.5";
+  version = "4.19.6";
 
   src = fetchFromGitHub {
     owner = "volatiletech";
     repo = "sqlboiler";
     tag = "v${version}";
-    hash = "sha256-GbQCHScE04nM8QzQzPSpD3efmfYEQRbioNfVcdmfPlc=";
+    hash = "sha256-A0NHGq5yVlHqKpu/4KIVj/EJYOrN/oFRaCkOBm5h4i8=";
   };
 
-  vendorHash = "sha256-LMHFDOKZQa0DJLHehRBzGGlb7apppnMDbjnJ4spuZtA=";
+  vendorHash = "sha256-ULoyMN54RIFST6P91V3MnRrfiC7+o3LmUFdc0pIqj90=";
 
   tags = [
     "mysql"

From af35da587bdf1a99c329f1937aee2066b3d02135 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jan 2026 06:15:30 +0000
Subject: [PATCH 13/32] xenia-canary: 0-unstable-2025-12-25 ->
 0-unstable-2025-12-30

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 59a284b2e513..7a128276a8d8 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-12-25";
+  version = "0-unstable-2025-12-30";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "c42aeacf2518b7001d9192b555247503fd314869";
-    hash = "sha256-ztiqkjFIvMQrm+sRb3MDrjMdkPyYJd6Z5+hAbsc55pg=";
+    rev = "53c0178766f3370794bd123ee5634702d40f6e44";
+    hash = "sha256-zZY+490yHHRga1O2VI0Mtc7gS95Nj82Igbh4TrMnf5Q=";
   };
 
   dontConfigure = true;

From f58602e54f25e2f2febb53d0054fdc32a76e8476 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 24 Dec 2025 19:21:16 -0800
Subject: [PATCH 14/32] =?UTF-8?q?validator-nu:=2023.4.11-unstable-2023-12-?=
 =?UTF-8?q?18=20=E2=86=92=2025.12.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/va/validator-nu/package.nix | 38 +++++++++++++++++-------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/va/validator-nu/package.nix b/pkgs/by-name/va/validator-nu/package.nix
index 45450844e09d..bf7074c64c38 100644
--- a/pkgs/by-name/va/validator-nu/package.nix
+++ b/pkgs/by-name/va/validator-nu/package.nix
@@ -1,9 +1,13 @@
 {
+  ant,
+  cacert,
   fetchFromGitHub,
   git,
+  installShellFiles,
   jdk_headless,
   jre_headless,
   makeWrapper,
+  pandoc,
   python3,
   stdenvNoCC,
   lib,
@@ -12,14 +16,13 @@
 
 let
   pname = "validator-nu";
-  version = "23.4.11-unstable-2023-12-18";
+  version = "25.12.12";
 
   src = fetchFromGitHub {
     owner = "validator";
     repo = "validator";
-    rev = "c3a401feb6555affdc891337f5a40af238f9ac2d";
-    fetchSubmodules = true;
-    hash = "sha256-pcA3HXduzFKzoOHhor12qvzbGSSvo3k3Bpy2MvvQlCI=";
+    rev = "7ed7f67468f7f61975dcc78891ea462fce578828";
+    hash = "sha256-cdDmhRyXIdoNWhP4oqu7vRb5abuNXRqvt4P4Dzq48xY=";
   };
 
   deps = stdenvNoCC.mkDerivation {
@@ -27,23 +30,31 @@ let
     inherit version src;
 
     nativeBuildInputs = [
-      git
+      ant
+      cacert
       jdk_headless
       python3
-      python3.pkgs.certifi
     ];
 
+    postPatch = ''
+      substituteInPlace build/build.xml \
+        --replace-fail \
+        'src="https://html.spec.whatwg.org/"' \
+        'src="https://html.spec.whatwg.org/commit-snapshots/0aa021ab4f21a6550f1591a9cc98449aaea9eefa/"'
+    '';
+
     buildPhase = ''
       python checker.py dldeps
     '';
 
     installPhase = ''
-      mkdir "$out"
+      mkdir "$out" "$out/build"
       mv dependencies extras "$out"
+      mv build/html5spec "$out/build"
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-LPtxpUd7LAYZHJL7elgcZOTaTgHqeqquiB9hiuajA6c=";
+    outputHash = "sha256-8cMoLeOnKNqisezkVS2UeVW11gtkGmhvQWrbSVuqbb8=";
   };
 
 in
@@ -51,21 +62,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   inherit pname version src;
 
   nativeBuildInputs = [
-    git
+    ant
+    installShellFiles
     jdk_headless
     makeWrapper
+    pandoc
     python3
   ];
 
   postPatch = ''
-    substituteInPlace build/build.py --replace-warn \
+    substituteInPlace build/build.py --replace-fail \
       'validatorVersion = "%s.%s.%s" % (year, month, day)' \
       'validatorVersion = "${finalAttrs.version}"'
   '';
 
   buildPhase = ''
     ln -s '${deps}/dependencies' '${deps}/extras' .
-    JAVA_HOME='${jdk_headless}' python checker.py build
+    ln -s '${deps}/build/html5spec' build/
+    JAVA_HOME='${jdk_headless}' python checker.py --offline build
+    make -C docs VNU_VERSION='${finalAttrs.version}' DATE='date -d @$(SOURCE_DATE_EPOCH)'
   '';
 
   installPhase = ''
@@ -73,6 +88,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     mkdir -p "$out/bin" "$out/share/java"
     mv build/dist/vnu.jar "$out/share/java/"
+    installManPage docs/*.1
     makeWrapper "${jre_headless}/bin/java" "$out/bin/vnu" \
       --add-flags "-jar '$out/share/java/vnu.jar'"
 

From bc38aa55f5d7bdbbdae658b576da0890217067d0 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Thu, 1 Jan 2026 15:53:03 +0800
Subject: [PATCH 15/32] maintainers: add sempiternal-aurora

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 161b48e0498b..a8ba10826ef5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23803,6 +23803,11 @@
     githubId = 33031;
     name = "Greg Pfeil";
   };
+  sempiternal-aurora = {
+    github = "sempiternal-aurora";
+    githubId = 78790545;
+    name = "Myria Sarvay";
+  };
   semtexerror = {
     email = "github@spampert.com";
     github = "SemtexError";

From 53c995ea8b95adddb53f65b0f5e50c58c742c1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= <lotte@chir.rs>
Date: Wed, 31 Dec 2025 16:48:00 +0100
Subject: [PATCH 16/32] =?UTF-8?q?intel-compute-runtime-legacy1:=2024.35.30?=
 =?UTF-8?q?872.32=20=E2=86=92=2024.35.30872.41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And add patch for gcc 15 compatibility, submitted as:
https://github.com/intel/compute-runtime/pull/879

- See: #475479
---
 .../add-cstdint-include-gcc15.patch           | 25 +++++++++++++++++++
 .../intel-compute-runtime-legacy1/package.nix |  9 +++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/in/intel-compute-runtime-legacy1/add-cstdint-include-gcc15.patch

diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/add-cstdint-include-gcc15.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/add-cstdint-include-gcc15.patch
new file mode 100644
index 000000000000..52dca486e95d
--- /dev/null
+++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/add-cstdint-include-gcc15.patch
@@ -0,0 +1,25 @@
+From 38fdd9d36c5e8a471f38d3f131c2fdf6720e2577 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= <lotte@chir.rs>
+Date: Wed, 31 Dec 2025 16:32:36 +0100
+Subject: [PATCH] fix: Add another missing include for GCC 15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Charlotte Deleńkec <lotte@chir.rs>
+---
+ shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp b/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+index 99f771c98457e..e78c638c35532 100644
+--- a/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
++++ b/shared/source/os_interface/linux/local/dg1/drm_tip_helper.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include "shared/source/os_interface/linux/i915.h"
+ 
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 
diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
index 0b9069dd744e..83cb41bdc1a3 100644
--- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
@@ -17,13 +17,13 @@ in
 stdenv.mkDerivation rec {
   # https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md
   pname = "intel-compute-runtime-legacy1";
-  version = "24.35.30872.32"; # 24.35.30872.x is the last series to support Gen8, Gen9 and Gen11 GPU support
+  version = "24.35.30872.41"; # 24.35.30872.x is the last series to support Gen8, Gen9 and Gen11 GPU support
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     rev = version;
-    hash = "sha256-POImMopbrhVXuSx2MQ9mwPNKQx7BljyikKhu6M4hZME=";
+    hash = "sha256-CnMIOAPnVhKVQxAcOZAuV5M4HJ2qftzEm9YdCuvkFbI=";
   };
 
   nativeBuildInputs = [
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
     level-zero
   ];
 
+  patches = [
+    # https://github.com/intel/compute-runtime/pull/879
+    ./add-cstdint-include-gcc15.patch
+  ];
+
   cmakeFlags = [
     "-DSKIP_UNIT_TESTS=1"
     "-DIGC_DIR=${intel-graphics-compiler}"

From ddd80ed2c7433b20735ba7ef0af57898d1e3d3e4 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Thu, 1 Jan 2026 15:54:04 +0800
Subject: [PATCH 17/32] vampire: 4.9 -> 5.0.0

Release notes: https://github.com/vprover/vampire/releases/tag/v5.0.0
Fixes gcc15 build, changes to recommended cmake build, and removes old
dependencies and patches
---
 pkgs/by-name/va/vampire/minisat-fenv.patch | 57 ----------------------
 pkgs/by-name/va/vampire/package.nix        | 54 +++++++++++---------
 2 files changed, 30 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/by-name/va/vampire/minisat-fenv.patch

diff --git a/pkgs/by-name/va/vampire/minisat-fenv.patch b/pkgs/by-name/va/vampire/minisat-fenv.patch
deleted file mode 100644
index 31e481bd6696..000000000000
--- a/pkgs/by-name/va/vampire/minisat-fenv.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/core/Main.cc b/core/Main.cc
-index 2b0d97b..9ba985d 100644
---- a/core/Main.cc
-+++ b/core/Main.cc
-@@ -77,9 +77,13 @@ int main(int argc, char** argv)
-         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
-         // printf("This is MiniSat 2.0 beta\n");
-         
--#if defined(__linux__)
--        fpu_control_t oldcw, newcw;
--        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
-+#if defined(__linux__) && defined(__x86_64__)
-+        fenv_t fenv;
-+
-+        fegetenv(&fenv);
-+        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
-+        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
-+        fesetenv(&fenv);
-         printf("WARNING: for repeatability, setting FPU to use double precision\n");
- #endif
-         // Extra options:
-diff --git a/simp/Main.cc b/simp/Main.cc
-index 2804d7f..7fbdb33 100644
---- a/simp/Main.cc
-+++ b/simp/Main.cc
-@@ -78,9 +78,13 @@ int main(int argc, char** argv)
-         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
-         // printf("This is MiniSat 2.0 beta\n");
-         
--#if defined(__linux__)
--        fpu_control_t oldcw, newcw;
--        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
-+#if defined(__linux__) && defined(__x86_64__)
-+        fenv_t fenv;
-+
-+        fegetenv(&fenv);
-+        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
-+        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
-+        fesetenv(&fenv);
-         printf("WARNING: for repeatability, setting FPU to use double precision\n");
- #endif
-         // Extra options:
-diff --git a/utils/System.h b/utils/System.h
-index 1758192..840bee5 100644
---- a/utils/System.h
-+++ b/utils/System.h
-@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
- #ifndef Minisat_System_h
- #define Minisat_System_h
- 
--#if defined(__linux__)
--#include <fpu_control.h>
-+#if defined(__linux__) && defined(__x86_64__)
-+#include <fenv.h>
- #endif
- 
- #include "mtl/IntTypes.h"
diff --git a/pkgs/by-name/va/vampire/package.nix b/pkgs/by-name/va/vampire/package.nix
index adfb8ea0ffbc..ee354e8af38e 100644
--- a/pkgs/by-name/va/vampire/package.nix
+++ b/pkgs/by-name/va/vampire/package.nix
@@ -2,50 +2,56 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  cmake,
   z3,
-  zlib,
 }:
 
-stdenv.mkDerivation rec {
+let
+  z3_4_14_0 = z3.overrideAttrs rec {
+    version = "4.14.0";
+    src = fetchFromGitHub {
+      owner = "Z3Prover";
+      repo = "z3";
+      rev = "z3-${version}";
+      hash = "sha256-Bv7+0J7ilJNFM5feYJqDpYsOjj7h7t1Bx/4OIar43EI=";
+    };
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "vampire";
-  version = "4.9";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "vprover";
     repo = "vampire";
-    tag = "v${version}casc2024";
-    hash = "sha256-NHAlPIy33u+TRmTuFoLRlPCvi3g62ilTfJ0wleboMNU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jRzVh1KirWi9GpOkzSGoIBUExDN1rV0b3AGwa6gWb3I=";
+    fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    z3
-    zlib
+    z3_4_14_0
   ];
 
-  makeFlags = [
-    "vampire_z3_rel"
-    "CC:=$(CC)"
-    "CXX:=$(CXX)"
-  ];
-
-  postPatch = ''
-    patch -p1 -i ${./minisat-fenv.patch} -d Minisat || true
-  '';
+  cmakeFlags = [ (lib.cmakeFeature "Z3_DIR" "${z3_4_14_0.dev}/lib/cmake") ];
 
   enableParallelBuilding = true;
 
-  fixupPhase = ''
-    runHook preFixup
-
+  prePatch = ''
     rm -rf z3
-
-    runHook postFixup
   '';
 
   installPhase = ''
     runHook preInstall
 
-    install -m0755 -D vampire_z3_rel* $out/bin/vampire
+    # some versions place the binary at ./ while others at bin/
+    if test -n "$(find . -maxdepth 1 -name 'vampire*' -print -quit)"
+    then
+      install -m0755 -D vampire* $out/bin/vampire
+    else
+      install -m0755 -D bin/vampire* $out/bin/vampire
+    fi
 
     runHook postInstall
   '';
@@ -56,6 +62,6 @@ stdenv.mkDerivation rec {
     mainProgram = "vampire";
     platforms = lib.platforms.unix;
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ sempiternal-aurora ];
   };
-}
+})

From 539b5c6cb0d4ff6a9d07dfdd27f59fad579fe90c Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Thu, 1 Jan 2026 15:51:17 +0100
Subject: [PATCH 18/32] libretro.citra: fix build with GCC 15

---
 .../applications/emulators/libretro/cores/citra.nix |  5 +++++
 .../libretro/cores/patches/citra-gcc-15.patch       | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch

diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix
index 4bde590895c9..b2723c025be9 100644
--- a/pkgs/applications/emulators/libretro/cores/citra.nix
+++ b/pkgs/applications/emulators/libretro/cores/citra.nix
@@ -19,6 +19,11 @@ mkLibretroCore {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Fix build with GCC 15. See https://github.com/KhronosGroup/glslang/pull/3684.
+    ./patches/citra-gcc-15.patch
+  ];
+
   makefile = "Makefile";
 
   extraBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch b/pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch
new file mode 100644
index 000000000000..bb4595acb551
--- /dev/null
+++ b/pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch
@@ -0,0 +1,13 @@
+Submodule externals/glslang contains modified content
+diff --git a/externals/glslang/SPIRV/SpvBuilder.h b/externals/glslang/SPIRV/SpvBuilder.h
+index 02e9cf40..40efd59c 100644
+--- a/externals/glslang/SPIRV/SpvBuilder.h
++++ b/externals/glslang/SPIRV/SpvBuilder.h
+@@ -56,6 +56,7 @@ namespace spv {
+ }
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>

From 669a73f7e60f032791beed52322c77add214d57e Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Thu, 1 Jan 2026 15:51:17 +0100
Subject: [PATCH 19/32] libretro.mupen64plus: fix build with GCC 15

---
 .../emulators/libretro/cores/mupen64plus.nix        |  2 ++
 .../libretro/cores/patches/mupen64plus-gcc-15.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch

diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
index b7d77967bde7..ab1231313be8 100644
--- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
@@ -39,6 +39,8 @@ mkLibretroCore {
       url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/3c3e7fbc70b8f533c09c964cf468ba5e8d61351c.patch?full_index=1";
       hash = "sha256-PCJLNYhhccnWLcnPaHL6tz+5qdjogJRYfzZIh3r+Vlk=";
     })
+    # Fix for GCC 15. See https://github.com/libretro/GLideN64/pull/1.
+    ./patches/mupen64plus-gcc-15.patch
   ];
 
   extraNativeBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch b/pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch
new file mode 100644
index 000000000000..e34aec434506
--- /dev/null
+++ b/pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch
@@ -0,0 +1,13 @@
+diff --git a/GLideN64/src/GLideNHQ/TxHiResLoader.h b/GLideN64/src/GLideNHQ/TxHiResLoader.h
+index 4c13651..f887c78 100644
+--- a/GLideN64/src/GLideNHQ/TxHiResLoader.h
++++ b/GLideN64/src/GLideNHQ/TxHiResLoader.h
+@@ -13,6 +13,8 @@
+ #define CORRECTFILENAME(str)
+ #endif /* OS_WINDOWS */
+ 
++#include <cstdint>
++
+ #include "TxCache.h"
+ #include "TxQuantize.h"
+ #include "TxImage.h"

From 6355638c7122e46efc244893a0b50650cb7c214e Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Fri, 2 Jan 2026 04:07:15 +0800
Subject: [PATCH 20/32] rocmPackages.amdsmi: fix build with gcc15

---
 pkgs/development/rocm-modules/6/amdsmi/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/6/amdsmi/default.nix
index 089420f3ccea..df9125aa40c8 100644
--- a/pkgs/development/rocm-modules/6/amdsmi/default.nix
+++ b/pkgs/development/rocm-modules/6/amdsmi/default.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/ROCm/amdsmi/commit/49aa2af045a4bc688e6f3ee0545f12afc45c1efe.patch";
       hash = "sha256-5dH9N4m+2mJIGVEB86SvdK3uAYyGFTfbCBJ8e09iQ3w=";
     })
+    (fetchpatch {
+      name = "fix-build-with-gcc15.patch";
+      url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch";
+      hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw=";
+    })
   ];
 
   nativeBuildInputs = [

From f37fffd7dc44346222d85cf2c686fb095f549fa0 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Thu, 1 Jan 2026 15:29:01 -0500
Subject: [PATCH 21/32] nufraw: Fix build for GCC 15

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

diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix
index 28c1f0b369fa..8a9fc312edb5 100644
--- a/pkgs/applications/graphics/nufraw/default.nix
+++ b/pkgs/applications/graphics/nufraw/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     "--enable-dst-correction"
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+  env.NIX_CFLAGS_COMPILE = "-Wno-narrowing -Wno-error=incompatible-pointer-types -std=gnu17";
 
   postInstall = lib.optionalString addThumbnailer ''
     mkdir -p $out/share/thumbnailers

From 80aa94dad8b065f486d5e3c58935fb037e427e2f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 1 Jan 2026 22:26:33 +0100
Subject: [PATCH 22/32] surge: fix build with GCC 15

---
 pkgs/by-name/su/surge/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index 48a28452d0b8..6d8734803635 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -70,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
     rsync
   ];
 
+  # Fix build with gcc 15
+  env.NIX_CFLAGS_COMPILE = "-Wno-deprecated";
+
   postPatch = ''
     substituteInPlace src/common/SurgeStorage.cpp \
       --replace "/usr/share/Surge" "$out/share/surge"

From 5d474323763dced94780a36e8b55fa751e7c4e17 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Fri, 2 Jan 2026 05:45:32 +0800
Subject: [PATCH 23/32] cgns: fix source hash

---
 pkgs/by-name/cg/cgns/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix
index 989b8345e72d..770a259b49cc 100644
--- a/pkgs/by-name/cg/cgns/package.nix
+++ b/pkgs/by-name/cg/cgns/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "cgns";
     repo = "cgns";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9i44GJesbZ2kV+ZSpYPYEhH873W8DxD1/aYzD19eAJ8=";
+    hash = "sha256-0cZtq8nVAHAubHD6IDofnh8N7xiNHQkbhXR5OpdhPQU=";
   };
 
   postPatch = ''

From 470ad5f3ad6eda1a0c279af1573746ac373e20e7 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Thu, 1 Jan 2026 13:27:13 -0800
Subject: [PATCH 24/32] paratype-pt-mono: move src to google fonts, ofl license

---
 pkgs/by-name/pa/paratype-pt-mono/package.nix | 32 +++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/pa/paratype-pt-mono/package.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix
index 1a95bbf38519..a0573a129183 100644
--- a/pkgs/by-name/pa/paratype-pt-mono/package.nix
+++ b/pkgs/by-name/pa/paratype-pt-mono/package.nix
@@ -1,41 +1,37 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitHub,
 }:
 
 stdenvNoCC.mkDerivation {
   pname = "paratype-pt-mono";
-  version = "2.005";
+  version = "1.001";
 
-  src = fetchzip {
-    urls = [
-      "https://company.paratype.com/system/attachments/631/original/ptmono.zip"
-      "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip"
-    ];
-    stripRoot = false;
-    hash = "sha256-mfDAu/KGelC6wZpUCrUrLVZKo+XiKNBqcpMI8tH2tMw=";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "fonts";
+    rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf";
+    hash = "sha256-wzm6KzO/arar7VMvm0l0L6gi3CnglmZKSGe7c0i530Q=";
+    rootDir = "ofl/ptmono";
   };
 
   installPhase = ''
     runHook preInstall
 
     install -Dm644 *.ttf -t $out/share/fonts/truetype
-    install -Dm644 *.txt -t $out/share/doc/paratype
 
     runHook postInstall
   '';
 
   meta = {
-    homepage = "http://www.paratype.ru/public/";
+    homepage = "https://www.paratype.ru/catalog/font/pt/pt-mono";
     description = "Open Paratype font";
-
-    license = lib.licenses.paratype;
-    # no commercial distribution of the font on its own
-    # must rename on modification
-    # http://www.paratype.ru/public/pt_openlicense.asp
-
+    license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      pancaek
+    ];
   };
 }

From ab0f6e4182c973c4ef31300adaeb9292435dcec6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Thu, 1 Jan 2026 13:27:13 -0800
Subject: [PATCH 25/32] paratype-pt-sans: move src to google fonts, ofl license

---
 pkgs/by-name/pa/paratype-pt-sans/package.nix | 32 +++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/pa/paratype-pt-sans/package.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix
index f57cca833bbd..000ac93e602b 100644
--- a/pkgs/by-name/pa/paratype-pt-sans/package.nix
+++ b/pkgs/by-name/pa/paratype-pt-sans/package.nix
@@ -1,41 +1,37 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitHub,
 }:
 
 stdenvNoCC.mkDerivation {
   pname = "paratype-pt-sans";
-  version = "2.005";
+  version = "2.003";
 
-  src = fetchzip {
-    urls = [
-      "https://company.paratype.com/system/attachments/629/original/ptsans.zip"
-      "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip"
-    ];
-    stripRoot = false;
-    hash = "sha256-34TqYXtWzkAstaGQBhJy+/hVk5tg6ZvHZ/kvUroWVLs=";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "fonts";
+    rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf";
+    hash = "sha256-44G9Pdi4GxeC9hzvCKuE7AmHyjVrjzalr3XZOgl3l6o=";
+    rootDir = "ofl/ptsans";
   };
 
   installPhase = ''
     runHook preInstall
 
     install -Dm644 *.ttf -t $out/share/fonts/truetype
-    install -Dm644 *.txt -t $out/share/doc/paratype
 
     runHook postInstall
   '';
 
   meta = {
-    homepage = "http://www.paratype.ru/public/";
+    homepage = "https://www.paratype.ru/catalog/font/pt/pt-sans";
     description = "Open Paratype font";
-
-    license = lib.licenses.paratype;
-    # no commercial distribution of the font on its own
-    # must rename on modification
-    # http://www.paratype.ru/public/pt_openlicense.asp
-
+    license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      pancaek
+    ];
   };
 }

From 5a3116cfb49401c9a5a5415790a753bb7dd5c045 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Thu, 1 Jan 2026 13:27:13 -0800
Subject: [PATCH 26/32] paratype-pt-serif: move src to google fonts, ofl
 license

---
 pkgs/by-name/pa/paratype-pt-serif/package.nix | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/pa/paratype-pt-serif/package.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix
index b23b3804db3e..f84c4f0df42b 100644
--- a/pkgs/by-name/pa/paratype-pt-serif/package.nix
+++ b/pkgs/by-name/pa/paratype-pt-serif/package.nix
@@ -1,41 +1,37 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitHub,
 }:
 
 stdenvNoCC.mkDerivation {
   pname = "paratype-pt-serif";
-  version = "2.005";
+  version = "1.000";
 
-  src = fetchzip {
-    urls = [
-      "https://company.paratype.com/system/attachments/634/original/ptserif.zip"
-      "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip"
-    ];
-    stripRoot = false;
-    hash = "sha256-4L3t5NEHmj975fn8eBAkRUO1OL0xseNp9g7k7tt/O2c=";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "fonts";
+    rev = "a4f3deeca2d7547351ff746f7bf3b51f5528dbcf";
+    hash = "sha256-HpA4r5VqAVtPFY9ltRUeZERNfyFRkAvwununoDF+5mk=";
+    rootDir = "ofl/ptserif";
   };
 
   installPhase = ''
     runHook preInstall
 
     install -Dm644 *.ttf -t $out/share/fonts/truetype
-    install -Dm644 *.txt -t $out/share/doc/paratype
 
     runHook postInstall
   '';
 
   meta = {
-    homepage = "http://www.paratype.ru/public/";
+    homepage = "https://www.paratype.ru/catalog/font/pt/pt-serif";
     description = "Open Paratype font";
-
-    license = lib.licenses.paratype;
-    # no commercial distribution of the font on its own
-    # must rename on modification
-    # http://www.paratype.ru/public/pt_openlicense.asp
-
+    license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      pancaek
+    ];
   };
 }

From fcb734d22ef25adfafce33e5f8a66f29ac08e14b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 1 Jan 2026 23:25:21 +0100
Subject: [PATCH 27/32] rstudio: pin nodejs to nodejs_22

---
 pkgs/by-name/rs/rstudio/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index add0e2360079..c4d1d3340d09 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -17,7 +17,7 @@
   git,
   jdk,
   makeWrapper,
-  nodejs,
+  nodejs_22,
   npmHooks,
   xcbuild,
   yarn,
@@ -44,6 +44,10 @@
 }:
 
 let
+  # nodejs_24 has npm v11, which broke the lockfile
+  # let's just use nodejs_22 for now
+  nodejs = nodejs_22;
+
   electron = electron_37;
 
   mathJaxSrc = fetchzip {

From 9cecd88a4770b5497a270bd7dedbb7fd14eb187d Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 1 Jan 2026 23:30:39 +0100
Subject: [PATCH 28/32] bs-manager: pin nodejs to nodejs_22

---
 pkgs/by-name/bs/bs-manager/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix
index 7c8f1c9dc52e..19848408dd79 100644
--- a/pkgs/by-name/bs/bs-manager/package.nix
+++ b/pkgs/by-name/bs/bs-manager/package.nix
@@ -8,6 +8,7 @@
   fetchNpmDeps,
   fetchFromGitHub,
   makeDesktopItem,
+  nodejs_22,
 
   autoPatchelfHook,
   copyDesktopItems,
@@ -17,7 +18,7 @@
   steam-run-free,
 }:
 
-buildNpmPackage (finalAttrs: {
+buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
   pname = "bs-manager";
   version = "1.5.4";
 

From eff7d6c3785a541078500ed0db1d293c84de05e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jan 2026 23:52:55 +0000
Subject: [PATCH 29/32] ananicy-rules-cachyos: 0-unstable-2025-12-25 ->
 0-unstable-2025-12-28

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

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index a33b90417890..9c959c10ac93 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-12-25";
+  version = "0-unstable-2025-12-28";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "410a04d9af9ac9b6bfefa06cf53ae9b91f1294bd";
-    hash = "sha256-vEwpJ5AQS4Xwdyvm6/jOtG3V32C50qr3W8hkEbq/IJk=";
+    rev = "3f1f24c3fc1c15444efd00d5562a37e2d4e06995";
+    hash = "sha256-RXOV8JICxo97T4TPtCr0tfiudHy1Tam7vjP5BDj86bY=";
   };
 
   dontConfigure = true;

From 5367003ba35dbb8e93444472b52f3c677b4296ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Jan 2026 00:28:44 +0000
Subject: [PATCH 30/32] python3Packages.json-repair: 0.54.3 -> 0.55.0

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

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index 7e589c0ed7bf..068e6a4bc46d 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.54.3";
+  version = "0.55.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-mLysH1+kr2PcmRphfcYeZ9K1hSinQXFDCrjTxc/MB0s=";
+    hash = "sha256-yQ+btSuifrtr0y5GRcLY0SUEp3LQXdpvaxa6ZorA/Q8=";
   };
 
   build-system = [ setuptools ];

From 86ef2eb3c694cc30dc3a27c8bade21364bf98a2c Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Fri, 2 Jan 2026 04:02:00 +0100
Subject: [PATCH 31/32] monotone: fix build of temporarily-vendored botan2 with
 fresher C++

---
 pkgs/applications/version-management/monotone/botan2.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/monotone/botan2.nix b/pkgs/applications/version-management/monotone/botan2.nix
index 0c89c5f7bf1f..e97561f0a058 100644
--- a/pkgs/applications/version-management/monotone/botan2.nix
+++ b/pkgs/applications/version-management/monotone/botan2.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
   };
 
+  postPatch = ''
+    sed -e '1i#include <cstdint>' -i src/cli/cli.h
+  '';
+
   nativeBuildInputs = [
     python3
     docutils

From 819134cdcdbfd2373025f80dd7a721e2dcde0615 Mon Sep 17 00:00:00 2001
From: Justin Chen <42143810+StarryReverie@users.noreply.github.com>
Date: Fri, 2 Jan 2026 12:02:33 +0800
Subject: [PATCH 32/32] fbida: fix build with GCC 15

---
 pkgs/by-name/fb/fbida/function-parameters.patch | 16 ++++++++++++++++
 pkgs/by-name/fb/fbida/package.nix               |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/fb/fbida/function-parameters.patch

diff --git a/pkgs/by-name/fb/fbida/function-parameters.patch b/pkgs/by-name/fb/fbida/function-parameters.patch
new file mode 100644
index 000000000000..10fb4482f142
--- /dev/null
+++ b/pkgs/by-name/fb/fbida/function-parameters.patch
@@ -0,0 +1,16 @@
+diff --git a/jpeg/62/jpeglib.h b/jpeg/62/jpeglib.h
+index d1be8dd..38436ef 100644
+--- a/jpeg/62/jpeglib.h
++++ b/jpeg/62/jpeglib.h
+@@ -814,11 +814,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
+  * Note JPP requires double parentheses.
+  */
+ 
+-#ifdef HAVE_PROTOTYPES
+ #define JPP(arglist)	arglist
+-#else
+-#define JPP(arglist)	()
+-#endif
+ 
+ 
+ /* Short forms of external names for systems with brain-damaged linkers.
diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix
index 1464389e1115..8f269d0eacea 100644
--- a/pkgs/by-name/fb/fbida/package.nix
+++ b/pkgs/by-name/fb/fbida/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
       url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2";
       sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi";
     })
+    # Prevents using function declaration without explicit parameters.
+    ./function-parameters.patch
   ];
 
   nativeBuildInputs = [