From 636d65a33708de84e735c3c79cfe6a06a6694020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?=
 <1771332+vlaci@users.noreply.github.com>
Date: Thu, 2 Oct 2025 16:15:25 +0200
Subject: [PATCH 001/196] ghidra: expose all binaries under support dir

For example I am making use of `bsim` tooling
---
 pkgs/tools/security/ghidra/build.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index 5171667f2554..987054c50d78 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -179,7 +179,11 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     mkdir -p "$out/bin"
     ln -s "${pkg_path}/ghidraRun" "$out/bin/ghidra"
-    ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless"
+    for bin ${pkg_path}/support/*; do
+      if [[ -x $bin ]]; then
+        ln -s "$bin" "$out/bin/ghidra-$(basename $bin)"
+      fi
+    done
     wrapProgram "${pkg_path}/support/launch.sh" \
       --set-default NIX_GHIDRAHOME "${pkg_path}/Ghidra" \
       --prefix PATH : ${lib.makeBinPath [ openjdk21 ]}

From 6d34d72df7bf8cb2123ed5807bb49b079517edef Mon Sep 17 00:00:00 2001
From: Xinyang Li <lixinyang411@gmail.com>
Date: Sat, 22 Nov 2025 23:39:57 +0200
Subject: [PATCH 002/196] owncloud-client: 5.3.2 -> 6.0.2

---
 pkgs/by-name/ow/owncloud-client/package.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix
index 8f7bdfffac4c..503c9bfa96eb 100644
--- a/pkgs/by-name/ow/owncloud-client/package.nix
+++ b/pkgs/by-name/ow/owncloud-client/package.nix
@@ -1,13 +1,14 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   nix-update-script,
   qt6Packages,
   # nativeBuildInputs
   pkg-config,
   cmake,
-  extra-cmake-modules,
+  kdePackages,
   # buildInputs
   sqlite,
   libsecret,
@@ -19,19 +20,26 @@
 
 stdenv.mkDerivation rec {
   pname = "owncloud-client";
-  version = "5.3.2";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "owncloud";
     repo = "client";
     tag = "v${version}";
-    hash = "sha256-HEnjtedmdNJTpc/PmEyoEsLGUydFkVF3UAsSdzQ4L1Q=";
+    hash = "sha256-cqnDe9q7+qQ0MNrt48zTw6TcNYCEFgQmwXkmQCjR1Uc=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/owncloud/client/commit/ef0791a727051191f0c0ff7bca78b10d5dd97e1e.patch";
+      hash = "sha256-r/TlRjmnZdPWXZ8Kn/9GgcisWiF/qOO5X8m2ReooKWo=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
-    extra-cmake-modules
+    kdePackages.extra-cmake-modules
     qt6Packages.qttools
     qt6Packages.wrapQtAppsHook
   ];

From ac545f5e817d334bb00cacf4ee49ac049741e366 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Dec 2025 00:45:31 +0000
Subject: [PATCH 003/196] mdbook-variables: 0.2.4 -> 0.4.0

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

diff --git a/pkgs/by-name/md/mdbook-variables/package.nix b/pkgs/by-name/md/mdbook-variables/package.nix
index d25c13ed3643..f99b4d6a959c 100644
--- a/pkgs/by-name/md/mdbook-variables/package.nix
+++ b/pkgs/by-name/md/mdbook-variables/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-variables";
-  version = "0.2.4";
+  version = "0.4.0";
 
   src = fetchFromGitLab {
     owner = "tglman";
     repo = "mdbook-variables";
     rev = version;
-    hash = "sha256-whvRCV1g2avKegfQpMgYi+E6ETxT2tQqVS2SWRpAqF8=";
+    hash = "sha256-zverdL4Mrnn/8pxQk6qVyidPJNxnrmaETt+XTp64Rns=";
   };
 
-  cargoHash = "sha256-WLHXeYNfALa7GfFAHEO9PAlFKB2lbDefgAYCn6G0U6Y=";
+  cargoHash = "sha256-/zp5Qj2NUVpQqKAFgQP4QatYzg/hMJQE08ANacvNPko=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 55ce457ff501d6977e43d147a21bc7a9e2a8eeb8 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 21 Oct 2025 02:57:56 +0100
Subject: [PATCH 004/196] speedcrunch: migrate to `qt6`

- Speedcrunch supports `Qt6`, this commit implements it.

- The commit used has been bumped as the prior update limited the
  unstable version to the latest penultimate upstream commit as the
  latest commit enforced the use of `Qt6`.

- Updated the `description` and `longDescription` to align closer to the
  current upstream documentation of the program.

- General reformatting.
---
 .../sp/speedcrunch/01-fix-qt6-build.patch     | 38 +++++++++++++++++++
 pkgs/by-name/sp/speedcrunch/package.nix       | 35 +++++++++--------
 2 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/by-name/sp/speedcrunch/01-fix-qt6-build.patch

diff --git a/pkgs/by-name/sp/speedcrunch/01-fix-qt6-build.patch b/pkgs/by-name/sp/speedcrunch/01-fix-qt6-build.patch
new file mode 100644
index 000000000000..db42a355309f
--- /dev/null
+++ b/pkgs/by-name/sp/speedcrunch/01-fix-qt6-build.patch
@@ -0,0 +1,38 @@
+# Sourced from https://bitbucket.org/heldercorreia/speedcrunch/pull-requests/140/commits
+
+diff --git a/cmake/QtWin32Deploy.cmake b/cmake/QtWin32Deploy.cmake
+
+--- a/cmake/QtWin32Deploy.cmake
++++ b/cmake/QtWin32Deploy.cmake
+@@ -15,7 +15,7 @@ set(qtwin32_QMLPLUGIN_SUFFIX_DEBUG "plugin${qtwin32_DLL_SUFFIX_DEBUG}")
+ 
+ # Determine the Qt minor version (so '6.4' or '6.5') for version checking. There's unlikely to be enough changes in
+ # patch releases to make it worth distinguishing based on those.
+-string(REGEX MATCH "[0-9]+[.][0-9]+" qtwin32_QT_MINOR_VERSION ${Qt6Core_VERSION_STRING})
++string(REGEX MATCH "[0-9]+[.][0-9]+" qtwin32_QT_MINOR_VERSION "${Qt6Core_VERSION}")
+ 
+ 
+ # qtwin32_check_qt_version([STRICT] <version>...)
+diff --git a/math/rational.h b/math/rational.h
+--- a/math/rational.h
++++ b/math/rational.h
+@@ -19,6 +19,8 @@
+ #ifndef RATIONAL_H
+ #define RATIONAL_H
+ 
++#include <QHash>
++
+ class HNumber;
+ class QString;
+ 
+@@ -64,6 +66,10 @@ public:
+     QString toString() const;
+     HNumber toHNumber( )const;
+     double toDouble() const;
++
++    friend size_t qHash(const Rational &r, size_t seed = 0) {
++        return qHashMulti(seed, r.m_num, r.m_denom, r.m_valid);
++    }
+ };
+ 
+ #endif // RATIONAL_H
diff --git a/pkgs/by-name/sp/speedcrunch/package.nix b/pkgs/by-name/sp/speedcrunch/package.nix
index 5a5ceaacb6a9..7d807a5fe2b4 100644
--- a/pkgs/by-name/sp/speedcrunch/package.nix
+++ b/pkgs/by-name/sp/speedcrunch/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromBitbucket,
   cmake,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation {
@@ -13,39 +13,44 @@ stdenv.mkDerivation {
   src = fetchFromBitbucket {
     owner = "heldercorreia";
     repo = "speedcrunch";
-    rev = "db51fc5e547aa83834761d874d3518c06d0fec9e";
-    hash = "sha256-rnl4z/HU3lAF9Y1JvdM8LZWIV1NGfR4q5gOMxlNU2EA=";
+    rev = "3c1b4c18ccb275eb2891f9d8ff36a9205c0f566b";
+    hash = "sha256-9/id5h+5aBntlcsEUGkyEzMJf7we7hMslnkqKDcbaNY=";
   };
 
   sourceRoot = "source/src";
 
-  buildInputs = with libsForQt5; [
-    qtbase
-    qttools
+  patches = [
+    ./01-fix-qt6-build.patch
   ];
 
   nativeBuildInputs = [
     cmake
-  ]
-  ++ [
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qttools
   ];
 
   meta = {
     homepage = "https://speedcrunch.org";
     license = lib.licenses.gpl2Plus;
-    description = "Fast power user calculator";
+    description = "High-precision scientific calculator";
     mainProgram = "speedcrunch";
     longDescription = ''
-      SpeedCrunch is a fast, high precision and powerful desktop calculator.
-      Among its distinctive features are a scrollable display, up to 50 decimal
-      precisions, unlimited variable storage, intelligent automatic completion
-      full keyboard-friendly and more than 15 built-in math function.
+      SpeedCrunch is a high-precision scientific calculator.
+      Among its distinctive features are a syntax-highlighted scrollable display,
+      up to 50 decimal places of precision, complex number support, various
+      numeric bases, unit conversions, intelligent automatic completion of functions
+      and variables, integrated formula book, over 150 built-in scientific constants,
+      fully keyboard-driven interface, over 80 built-in mathematical functions and
+      support for user-defined functions.
     '';
     maintainers = with lib.maintainers; [
       j0hax
     ];
-    inherit (libsForQt5.qtbase.meta) platforms;
+    inherit (qt6.qtbase.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }

From e53ca90334ecbd84752f38fd328f077cbe7e6c6a Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 15 Dec 2025 23:27:12 +0100
Subject: [PATCH 005/196] lib.teams: Collect all errors for missing
 lib.maintainers entries

In https://github.com/NixOS/nixpkgs/pull/471116#pullrequestreview-3580366406
we had two users without maintainer entries, while CI only showed one
---
 maintainers/computed-team-list.nix | 103 +++++++++++++++++------------
 1 file changed, 60 insertions(+), 43 deletions(-)

diff --git a/maintainers/computed-team-list.nix b/maintainers/computed-team-list.nix
index 7ee37f4283e3..543a6d216d37 100644
--- a/maintainers/computed-team-list.nix
+++ b/maintainers/computed-team-list.nix
@@ -12,48 +12,65 @@ let
   ];
 
   maintainerSetToList =
-    githubTeam:
-    lib.mapAttrsToList (
-      login: id:
-      maintainersById.${toString id}
-      or (throw "lib.teams: No maintainer entry for GitHub user @${login} who's part of the @NixOS/${githubTeam} team")
-    );
-
-in
-# TODO: Consider automatically exposing all GitHub teams under `lib.teams`,
-# so that no manual PRs are necessary to add such teams anymore
-lib.mapAttrs (
-  name: attrs:
-  if attrs ? github then
+    githubTeam: users:
     let
-      githubTeam =
-        githubTeams.${attrs.github}
-          or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
+      missingUsers = lib.filter (login: !maintainersById ? ${toString users.${login}}) (
+        lib.attrNames users
+      );
     in
-    # TODO: Consider specifying `githubId` in team-list.nix and inferring `github` from it (or even dropping it)
-    # This would make renames easier because no additional place needs to keep track of them.
-    # Though in a future where all Nixpkgs GitHub teams are automatically exposed under `lib.teams`,
-    # this would also not be an issue anymore.
-    assert lib.assertMsg (!attrs ? githubId)
-      "lib.teams.${name}: Both `githubId` and `github` is set, but the former is synced from the latter";
-    assert lib.assertMsg (!attrs ? shortName)
-      "lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
-    assert lib.assertMsg (
-      !attrs ? scope
-    ) "lib.teams.${name}: Both `scope` and `github` is set, but the former is synced from the latter";
-    assert lib.assertMsg (
-      !attrs ? members
-    ) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
-    attrs
-    // {
-      githubId = githubTeam.id;
-      shortName = githubTeam.name;
-      scope = githubTeam.description;
-      members =
-        maintainerSetToList attrs.github githubTeam.maintainers
-        ++ maintainerSetToList attrs.github githubTeam.members;
-      githubMaintainers = maintainerSetToList attrs.github githubTeam.maintainers;
-    }
-  else
-    attrs
-) teams
+    if missingUsers == [ ] then
+      lib.mapAttrsToList (login: id: maintainersById.${toString id}) users
+    else
+      {
+        errors = map (
+          login:
+          "\n- No maintainer entry for GitHub user @${login} who's part of the @NixOS/${githubTeam} team"
+        ) missingUsers;
+      };
+
+  # TODO: Consider automatically exposing all GitHub teams under `lib.teams`,
+  # so that no manual PRs are necessary to add such teams anymore
+  result = lib.mapAttrs (
+    name: attrs:
+    if attrs ? github then
+      let
+        githubTeam =
+          githubTeams.${attrs.github}
+            or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
+        maintainers = maintainerSetToList attrs.github githubTeam.maintainers;
+        nonMaintainers = maintainerSetToList attrs.github githubTeam.members;
+      in
+      # TODO: Consider specifying `githubId` in team-list.nix and inferring `github` from it (or even dropping it)
+      # This would make renames easier because no additional place needs to keep track of them.
+      # Though in a future where all Nixpkgs GitHub teams are automatically exposed under `lib.teams`,
+      # this would also not be an issue anymore.
+      assert lib.assertMsg (!attrs ? githubId)
+        "lib.teams.${name}: Both `githubId` and `github` is set, but the former is synced from the latter";
+      assert lib.assertMsg (!attrs ? shortName)
+        "lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
+      assert lib.assertMsg (
+        !attrs ? scope
+      ) "lib.teams.${name}: Both `scope` and `github` is set, but the former is synced from the latter";
+      assert lib.assertMsg (
+        !attrs ? members
+      ) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
+      if !maintainers ? errors && !nonMaintainers ? errors then
+        attrs
+        // {
+          githubId = githubTeam.id;
+          shortName = githubTeam.name;
+          scope = githubTeam.description;
+          members = maintainers ++ nonMaintainers;
+          githubMaintainers = maintainers;
+        }
+      else
+        maintainers.errors or [ ] ++ nonMaintainers.errors or [ ]
+    else
+      attrs
+  ) teams;
+
+  errors = lib.concatLists (
+    lib.mapAttrsToList (name: value: value) (lib.filterAttrs (name: lib.isList) result)
+  );
+in
+if errors == [ ] then result else throw ("lib.teams:" + lib.concatStrings errors)

From ce07de72eb3ee27071217e9159b06aed02042fde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Dec 2025 01:05:02 +0000
Subject: [PATCH 006/196] armadillo: 15.2.2 -> 15.2.3

---
 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 4c943d6d9d54..5745305c5a14 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.2";
+  version = "15.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-juAc1NpVvAe3vH08unAqxugTfThNfnGF8/SuHwx5cE8=";
+    hash = "sha256-AYLWfWlJ5DR6C8YvyMJ5O+frIDxx8Z7f+T+MRf1KgZA=";
   };
 
   nativeBuildInputs = [ cmake ];

From b882231ea415e0588c26ed66080f7de9d7c31cb3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 1 Jan 2026 00:26:59 +0100
Subject: [PATCH 007/196] edl: fix Python dependencies

Drop pylzma dependency due to build issue.
Use pycrytodomex as the correct module instead of pycrytodome

Signed-off-by: Petr Hodina <phodina@protonmail.com>
---
 pkgs/by-name/ed/edl/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ed/edl/package.nix b/pkgs/by-name/ed/edl/package.nix
index 87b5fd6149ac..4d47204e498a 100644
--- a/pkgs/by-name/ed/edl/package.nix
+++ b/pkgs/by-name/ed/edl/package.nix
@@ -22,8 +22,7 @@ python3Packages.buildPythonPackage {
     pyusb
     pyserial
     docopt
-    pylzma
-    pycryptodome
+    pycryptodomex
     lxml
     colorama
     capstone

From b8b7ebec6e3b21b5516ef50de43f514f19aa75e1 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Thu, 1 Jan 2026 17:45:53 +0100
Subject: [PATCH 008/196] waywall: add update script

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

diff --git a/pkgs/by-name/wa/waywall/package.nix b/pkgs/by-name/wa/waywall/package.nix
index 8d36e31cf2fb..04f75c8ec019 100644
--- a/pkgs/by-name/wa/waywall/package.nix
+++ b/pkgs/by-name/wa/waywall/package.nix
@@ -9,6 +9,7 @@
   makeWrapper,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   wayland,
   wayland-protocols,
@@ -57,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Wayland compositor for Minecraft speedrunning";
     longDescription = ''

From cd98a82f052af004d07c085cd2689650185c10a1 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Thu, 1 Jan 2026 17:49:49 +0100
Subject: [PATCH 009/196] waywall: 0.2025.12.20 -> 0.2025.12.30

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

diff --git a/pkgs/by-name/wa/waywall/package.nix b/pkgs/by-name/wa/waywall/package.nix
index 04f75c8ec019..6ee54a18ef1a 100644
--- a/pkgs/by-name/wa/waywall/package.nix
+++ b/pkgs/by-name/wa/waywall/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "waywall";
-  version = "0.2025.12.20";
+  version = "0.2025.12.30";
 
   src = fetchFromGitHub {
     owner = "tesselslate";
     repo = "waywall";
     tag = finalAttrs.version;
-    hash = "sha256-sGb/dxXBlzXBvv2IWjgwSE8WM5qB04mYATl0uhSozMQ=";
+    hash = "sha256-idtlOXT3RGjAOMgZ+e5vwZnxd33snc4sIjq0G6TU7HU=";
   };
 
   nativeBuildInputs = [

From 0346166d99c5c62635c87bb52a96a78f6424799d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Fri, 2 Jan 2026 18:23:06 +0100
Subject: [PATCH 010/196] just: 1.45.0 -> 1.46.0

Diff: https://github.com/casey/just/compare/1.45.0...1.46.0

Changelog: https://github.com/casey/just/blob/1.46.0/CHANGELOG.md
---
 pkgs/by-name/ju/just/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index 1182233cdd95..9be4d7dfc50a 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -17,7 +17,7 @@
   withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
 }:
 let
-  version = "1.45.0";
+  version = "1.46.0";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -34,10 +34,10 @@ rustPlatform.buildRustPackage {
     owner = "casey";
     repo = "just";
     tag = version;
-    hash = "sha256-D+xMPpn8JLX88eIO9zY051K81KPGBhcFvhBIwuTDymk=";
+    hash = "sha256-NE54LKS2bYBfQL+yLJPaG4iF7EiJfDqBfnsrlPo1+OE=";
   };
 
-  cargoHash = "sha256-zokI+mWyI/HmzP7GuO59usEsscl3tpeyhNT2tXmLny8=";
+  cargoHash = "sha256-yyaJAWp6luizA/aQuUGhdxRX2Ofri4CeLIO3/ndSCzc=";
 
   nativeBuildInputs =
     lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]

From 4b34238a750f49cc6aa8b1d2114416ff3a760221 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 2 Jan 2026 14:15:36 -0800
Subject: [PATCH 011/196] ezquake: 3.6.3 -> 3.6.8

---
 pkgs/by-name/ez/ezquake/package.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index 2f30630226b5..c8c6865e755b 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -7,46 +7,45 @@
   jansson,
   libpng,
   libjpeg,
-  libGLU,
   libGL,
   libX11,
   libsndfile,
-  libXxf86vm,
-  pcre,
+  pcre2,
+  minizip,
+  cmake,
   pkg-config,
   SDL2,
-  vim,
-  speex,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ezquake";
-  version = "3.6.3";
+  version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "QW-Group";
     repo = "ezquake" + "-source";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8=";
+    hash = "sha256-BIkBl6ncwo0NljuqOHJ3yQeDTcClh5FGssdFsKUjN90=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [
+    minizip
+    pcre2
     expat
     curl
     jansson
     libpng
     libjpeg
-    libGLU
     libGL
     libsndfile
     libX11
-    libXxf86vm
-    pcre
     SDL2
-    vim
-    speex
   ];
 
   installPhase =

From 53c440273ba8e9d735fb864ce67c335f7a6a090b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 00:50:25 +0100
Subject: [PATCH 012/196] changelogger: 0.6.1 -> 0.7.0

---
 pkgs/by-name/ch/changelogger/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index 8327dcff00f9..433ac948eec0 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "changelogger";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = "changelogger";
     rev = "v${version}";
-    sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M=";
+    sha256 = "sha256-Glup2Y3sGO2hNKFeZXOrffHct2F4Ebn9+f6yOy3pekY=";
   };
 
-  vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM=";
+  vendorHash = "sha256-f6ojMri3m3pwLXbLnNbS/Xl2lqo0eEHLGbbT5KR1Clc=";
 
   ldflags = [
     "-s"
@@ -26,6 +26,12 @@ buildGoModule rec {
     "-X github.com/MarkusFreitag/changelogger/cmd.BuildDate=1970-01-01T00:00:00"
   ];
 
+  preCheck = ''
+    # Test needs gitconfig
+    substituteInPlace pkg/gitconfig/gitconfig_test.go \
+      --replace-fail "TestGetGitAuthor" "SkipGetGitAuthor"
+  '';
+
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 7a585f7427b2670a88a2b67af82a0f201a068ed8 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 00:51:21 +0100
Subject: [PATCH 013/196] changelogger: use finalAttrs pattern

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

diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index 433ac948eec0..007a9826ac85 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -6,14 +6,14 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "changelogger";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = "changelogger";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-Glup2Y3sGO2hNKFeZXOrffHct2F4Ebn9+f6yOy3pekY=";
   };
 
@@ -22,7 +22,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/MarkusFreitag/changelogger/cmd.BuildVersion=${version}"
+    "-X github.com/MarkusFreitag/changelogger/cmd.BuildVersion=${finalAttrs.version}"
     "-X github.com/MarkusFreitag/changelogger/cmd.BuildDate=1970-01-01T00:00:00"
   ];
 
@@ -44,9 +44,9 @@ buildGoModule rec {
   meta = {
     description = "Tool to manage your changelog file in Markdown";
     homepage = "https://github.com/MarkusFreitag/changelogger";
-    changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "changelogger";
   };
-}
+})

From 1fa6a8ea56f1383fee0c35527f8e5693a5f27556 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 00:51:46 +0100
Subject: [PATCH 014/196] changelogger: reorder meta attributes

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

diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index 007a9826ac85..4d4f00f650ea 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -42,11 +42,11 @@ buildGoModule (finalAttrs: {
   '';
 
   meta = {
+    changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Tool to manage your changelog file in Markdown";
     homepage = "https://github.com/MarkusFreitag/changelogger";
-    changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = [ ];
     mainProgram = "changelogger";
+    maintainers = [ ];
   };
 })

From 270d2a860875b715b6cea74b45cf4ff1a589e9b2 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 00:52:08 +0100
Subject: [PATCH 015/196] changelogger: use tag instead of rev

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

diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index 4d4f00f650ea..deacb100c080 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "MarkusFreitag";
     repo = "changelogger";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-Glup2Y3sGO2hNKFeZXOrffHct2F4Ebn9+f6yOy3pekY=";
   };
 

From 624c40579e612d287b134dbd0f62feea24124d30 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 3 Jan 2026 00:52:29 +0100
Subject: [PATCH 016/196] changelogger: add hythera as maintainer

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

diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index deacb100c080..64d3dd1fb480 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -47,6 +47,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/MarkusFreitag/changelogger";
     license = lib.licenses.mit;
     mainProgram = "changelogger";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
   };
 })

From 49001d070af48c6d13ce07700bb5f9b0574cde13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 3 Jan 2026 21:52:15 +0100
Subject: [PATCH 017/196] librenms: 25.10.0 -> 25.12.0

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

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 9b25dbf09364..9cd9ca43e7cb 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "25.10.0";
+  version = "25.12.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    hash = "sha256-SzDSeWTnsXy274H2mkGIHOsW26EoL7aony7Xcb+e+h4=";
+    hash = "sha256-d73izEdLWviOp0XcMbQ3goLWgLZupO4QtQv7WUxdfk8=";
   };
 
-  vendorHash = "sha256-lCDBz0+VUTlvH371WRCPBh8NFWn6BTVS6BPMQM621dE=";
+  vendorHash = "sha256-34+srnXDto82xuITDSPEiNnbCgmZbijvpqpmwlszCEg=";
 
   php = phpPackage;
 
@@ -103,7 +103,8 @@ phpPackage.buildComposerProject2 rec {
     substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
     substituteInPlace $out/snmp-scan.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
 
-    substituteInPlace $out/app/Listeners/CommandStartingListener.php --replace-fail '\App\Checks::runningUser();' '//\App\Checks::runningUser(); //removed as nix forces ownership to root'
+    substituteInPlace $out/app/Listeners/CommandStartingListener.php \
+      --replace-fail "! function_exists('posix_getpwuid') || ! function_exists('posix_geteuid')" "true"
 
     wrapProgram $out/daily.sh --prefix PATH : ${phpPackage}/bin
 

From 7ba00255d0a68aaa8fee52c402a706fce7432952 Mon Sep 17 00:00:00 2001
From: Max S <150921823+maxschipper@users.noreply.github.com>
Date: Sun, 4 Jan 2026 14:23:33 +0100
Subject: [PATCH 018/196] libmatchbox: 1.11 -> 1.14 This fixes a build error
 with GCC15. The license is also updated to reflect the upstream changes.

The newer releases are only available as snapshots, so we switch to using
autoreconfHook and pkg-config.
Dependencies are now moved to propagatedBuildInputs so downstream packages
(matchbox) can correctly detect them via pkg-config.
This also allows us to drop the manual NIX_LDFLAGS = "-lX11".
---
 pkgs/by-name/li/libmatchbox/package.nix | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/libmatchbox/package.nix b/pkgs/by-name/li/libmatchbox/package.nix
index c8f757899b31..2faa140afea7 100644
--- a/pkgs/by-name/li/libmatchbox/package.nix
+++ b/pkgs/by-name/li/libmatchbox/package.nix
@@ -2,41 +2,47 @@
   lib,
   stdenv,
   fetchurl,
+  autoreconfHook,
+  libICE,
+  libjpeg,
+  libpng,
   libX11,
   libXext,
-  libpng,
   libXft,
-  libICE,
   pango,
-  libjpeg,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libmatchbox";
-  version = "1.11";
+  version = "1.14";
 
-  buildInputs = [
-    libXft
-    libICE
-    pango
-    libjpeg
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
   ];
   propagatedBuildInputs = [
+    libICE
+    libjpeg
+    libpng
     libX11
     libXext
-    libpng
+    libXft
+    pango
   ];
-  NIX_LDFLAGS = "-lX11";
 
   src = fetchurl {
-    url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";
-    sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15";
+    url = "https://git.yoctoproject.org/libmatchbox/snapshot/libmatchbox-${version}.tar.gz";
+    sha256 = "1b66jl178pkwmswf1gqcyrpy15rll1znz38n07l9b3ybga13w31d";
   };
 
   meta = {
     description = "Library of the matchbox X window manager";
     homepage = "http://matchbox-project.org/";
-    license = lib.licenses.gpl2Plus;
+    license = with lib.licenses; [
+      lgpl2Plus
+      hpnd
+    ];
     platforms = lib.platforms.unix;
   };
 }

From 8edaedac0de6a219980a0e598921b40a5012a436 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 5 Jan 2026 01:46:23 +0100
Subject: [PATCH 019/196] superscs: fix build with gcc 15

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

diff --git a/pkgs/by-name/su/superscs/package.nix b/pkgs/by-name/su/superscs/package.nix
index ae5fb5537be4..7bce24bc5bea 100644
--- a/pkgs/by-name/su/superscs/package.nix
+++ b/pkgs/by-name/su/superscs/package.nix
@@ -19,7 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Qu7RM6Ew4hEmoIXO0utDDVmjmNX3yt3FxWZXCQ/Xjp4=";
   };
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = ''
+    substituteInPlace include/unit_test_util.h \
+      --replace-fail "typedef int bool;" "#include <stdbool.h>"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace Makefile --replace-fail \
       ".so" \
       ".dylib"

From 156b33dcbb522e663485eda769406b858356b762 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 5 Jan 2026 15:00:48 +0100
Subject: [PATCH 020/196] func: 1.16.2 -> 1.20.1

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

diff --git a/pkgs/by-name/fu/func/package.nix b/pkgs/by-name/fu/func/package.nix
index a2a5b15cd8ef..8bbbd2f9dd96 100644
--- a/pkgs/by-name/fu/func/package.nix
+++ b/pkgs/by-name/fu/func/package.nix
@@ -10,24 +10,24 @@
 
 buildGoModule (finalAttrs: {
   pname = "func";
-  version = "1.16.2";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "knative";
     repo = "func";
     tag = "knative-v${finalAttrs.version}";
-    hash = "sha256-nbS7X5WPu+WBtPUKShE5aWve5m2gw2naQQzNeG7pbGM=";
+    hash = "sha256-SYqkWE7dVFy6stibcWayU2J+oIFIfwNDoK6TzchgBzo=";
   };
 
-  vendorHash = "sha256-Gn+nyck/VOwf8iKPeyLvsPWOpfdN/maUcQOLFAU0oic=";
+  vendorHash = "sha256-F/TQ1QwfQfum1DOY2xrzpTlm7jvuJQUjtBLY6pZfTh8=";
 
   subPackages = [ "cmd/func" ];
 
   ldflags = [
-    "-X knative.dev/func/pkg/app.vers=v${finalAttrs.version}"
+    "-X knative.dev/func/pkg/version.Vers=v${finalAttrs.version}"
     "-X main.date=19700101T000000Z"
-    "-X knative.dev/func/pkg/app.hash=${finalAttrs.version}"
-    "-X knative.dev/func/pkg/app.kver=${finalAttrs.src.tag}"
+    "-X knative.dev/func/pkg/version.Hash=${finalAttrs.version}"
+    "-X knative.dev/func/pkg/version.Kver=${finalAttrs.src.tag}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];

From d5d13de0e4d629a14000c926ce05c0ef82f11ac0 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 5 Jan 2026 18:09:59 +0100
Subject: [PATCH 021/196] outfox: 0.5.0-pre042 -> 0.5.0-pre043

---
 pkgs/by-name/ou/outfox/package.nix | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix
index 5bfe4933dc47..87e594575d35 100644
--- a/pkgs/by-name/ou/outfox/package.nix
+++ b/pkgs/by-name/ou/outfox/package.nix
@@ -10,29 +10,22 @@
   libpulseaudio,
   makeDesktopItem,
   makeWrapper,
+  openldap,
 }:
 
 stdenv.mkDerivation rec {
   pname = "outfox";
-  version = "0.5.0-pre042";
+  version = "0.5.0-pre043";
 
   src =
     {
-      i686-linux = fetchurl {
-        url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-14.04-32bit-i386-i386-legacy-date-20231227.tar.gz";
-        hash = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs=";
-      };
       x86_64-linux = fetchurl {
-        url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-22.04-amd64-current-date-20231224.tar.gz";
-        hash = "sha256-dW+g/JYav3rUuI+nHDi6rXu/O5KYiEdk/HH82jgOUnI=";
+        url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-043/OutFox-alpha-0.5.0-pre-043-Final-24.04-amd64-current-date-20250907.tar.gz";
+        hash = "sha256-1YN3YCcSluHBUpNRQdh0pJ9R9hTHKBuTSULTKL28OO0=";
       };
       aarch64-linux = fetchurl {
-        url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-18.04-arm64-arm64v8-modern-date-20231225.tar.gz";
-        hash = "sha256-7Qrq6t8KmUSIK4Rskkxw5l4UZ2vsb9/orzPegHySaJ4=";
-      };
-      armv7l-linux = fetchurl {
-        url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-14.04-arm32-arm32v7-legacy-date-20231227.tar.gz";
-        hash = "sha256-PRp7kuqFBRy7nextTCB+/poc+A9AX2EiQphx6aUfT8E=";
+        url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-043/OutFox-alpha-0.5.0-pre-043-Final-RaspberryPi-debian12-arm64-aarch64-current-date-20250927.tar.gz";
+        hash = "sha256-/E4Keh1J3iytqaq0ziJy9F1mRR3mPbjlGto1Dbct3JM=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -48,6 +41,7 @@ stdenv.mkDerivation rec {
     libjack2
     libglvnd
     libpulseaudio
+    openldap
   ];
 
   desktop = makeDesktopItem {
@@ -73,14 +67,12 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Rhythm game engine forked from StepMania";
     homepage = "https://projectoutfox.com";
-    changelog = "https://projectoutfox.com/releases/${version}";
+    changelog = "https://github.com/TeamRizu/OutFox/releases/tag/OF5.0.0-043";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
-      "i686-linux"
       "aarch64-linux"
-      "armv7l-linux"
     ];
     maintainers = with lib.maintainers; [ maxwell-lt ];
     mainProgram = "OutFox";

From 69e685e2196d266578066b2d7019fb4751b1b61d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 30 Dec 2025 15:22:55 -0800
Subject: [PATCH 022/196] python3Packages.aioconsole: disable failing test on
 Darwin

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

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 88c5d428dfa7..f25c181fde24 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pytest-asyncio,
@@ -22,8 +23,6 @@ buildPythonPackage rec {
   version = "0.8.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "vxgmichel";
     repo = "aioconsole";
@@ -52,6 +51,11 @@ buildPythonPackage rec {
     "test_interact_multiple_indented_lines"
   ];
 
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # OSError: AF_UNIX path too long
+    "tests/test_server.py::test_uds_server[default]"
+  ];
+
   pythonImportsCheck = [ "aioconsole" ];
 
   meta = {

From 6013bd5d7535b86102cdab81b736f15af351e39d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 19:18:04 +0000
Subject: [PATCH 023/196] terragrunt: 0.96.0 -> 0.97.0

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

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 171887124368..9b3b3a016568 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.96.0";
+  version = "0.97.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KIfhgzPQwN3AieWexjiWOMrVNTyK0/kuubP2LQk10QE=";
+    hash = "sha256-LJGc85oCDEW/z9I4Mcr9Pyv9MLqqN4Zu/nJK1LTD9mk=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ buildGo125Module (finalAttrs: {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-cjbVE8b8CKSl7cRkMuHMKcRb/Yj26oLKU3rAdRCBbk0=";
+  vendorHash = "sha256-BXFtw7+f9Isnk6EB3U4eLlho5B3rTnofmWBDbbbroUs=";
 
   doCheck = false;
 

From acd62a21e81c761ce0c6781bc43f1fa48dca34a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jan 2026 19:52:42 +0000
Subject: [PATCH 024/196] k6: 1.4.2 -> 1.5.0

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

diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 3f6d489521d0..adcde1d409fa 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "k6";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "k6";
     rev = "v${version}";
-    hash = "sha256-393Ld7V7KBW9ZnItqW9U/8XkDapwNh7T2ABeh2CikGc=";
+    hash = "sha256-kgdJAmjk92xXBYJrfprYztBnTK4cqIpk9iwKULDVRl8=";
   };
 
   subPackages = [ "./" ];

From 7ceec0731b7c4a3da993eb03c5fff74aa6e84b2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 Jan 2026 00:26:02 +0000
Subject: [PATCH 025/196] wofi: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/by-name/wo/wofi/package.nix b/pkgs/by-name/wo/wofi/package.nix
index 71ee4a47f4cb..32a406e1ca48 100644
--- a/pkgs/by-name/wo/wofi/package.nix
+++ b/pkgs/by-name/wo/wofi/package.nix
@@ -12,7 +12,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "wofi";
-  version = "1.5.1";
+  version = "1.5.2";
 
   outputs = [
     "out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     repo = "wofi";
     owner = "~scoopta";
     rev = "v${version}";
-    sha256 = "sha256-r+p8WDJw8aO1Gdgy6+UwT5QJdejIjcPFSs/Gfzq+D/c=";
+    sha256 = "sha256-j0KkmRfTRYpzfqHdIsOXk+pYHCrdzICD1Dm847C5ihs=";
     vc = "hg";
   };
 

From 0503f328ad1524eb2c220ff3c13d83e289f9ec92 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 5 Jan 2026 20:50:57 +0800
Subject: [PATCH 026/196] cnijfilter2: 6.40 -> 6.90-1

---
 pkgs/by-name/cn/cnijfilter2/bool.patch        |  11 +
 pkgs/by-name/cn/cnijfilter2/package.nix       | 253 +++++++++---------
 .../cn/cnijfilter2/patches/get_protocol.patch |  14 -
 .../add_missing_import.patch => stdlib.patch} |   2 -
 4 files changed, 131 insertions(+), 149 deletions(-)
 create mode 100644 pkgs/by-name/cn/cnijfilter2/bool.patch
 delete mode 100644 pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
 rename pkgs/by-name/cn/cnijfilter2/{patches/add_missing_import.patch => stdlib.patch} (70%)

diff --git a/pkgs/by-name/cn/cnijfilter2/bool.patch b/pkgs/by-name/cn/cnijfilter2/bool.patch
new file mode 100644
index 000000000000..77e64c9a06a8
--- /dev/null
+++ b/pkgs/by-name/cn/cnijfilter2/bool.patch
@@ -0,0 +1,11 @@
+--- a/lgmon3/src/common/libcnnet2_type.h
++++ b/lgmon3/src/common/libcnnet2_type.h
+@@ -48,7 +48,7 @@
+ } CNNET2_SETTING_FLAGS;
+ 
+ #ifndef __cplusplus
+-typedef char bool;
++#include <stdbool.h>
+ #endif
+ 
+ typedef struct {
diff --git a/pkgs/by-name/cn/cnijfilter2/package.nix b/pkgs/by-name/cn/cnijfilter2/package.nix
index aca035cd916f..f3c6b3e1fec2 100644
--- a/pkgs/by-name/cn/cnijfilter2/package.nix
+++ b/pkgs/by-name/cn/cnijfilter2/package.nix
@@ -1,174 +1,161 @@
 {
-  stdenv,
-  lib,
-  fetchzip,
   autoconf,
   automake,
+  autoPatchelfHook,
   cups,
+  fetchpatch2,
+  fetchzip,
   glib,
-  libxml2,
-  libusb1,
+  lib,
   libtool,
-  withDebug ? false,
+  libusb1,
+  libxml2,
+  stdenv,
 }:
-
+let
+  blobDir = "com/libs_bin_${stdenv.hostPlatform.uname.processor}";
+in
 stdenv.mkDerivation {
   pname = "cnijfilter2";
-
-  version = "6.40";
+  version = "6.90-1";
 
   src = fetchzip {
-    url = "https://gdlp01.c-wss.com/gds/1/0100011381/01/cnijfilter2-source-6.40-1.tar.gz";
-    sha256 = "3RoG83jLOsdTEmvUkkxb7wa8oBrJA4v1mGtxTGwSowU=";
+    url = "https://gdlp01.c-wss.com/gds/9/0100012819/01/cnijfilter2-source-6.90-1.tar.gz";
+    hash = "sha256-kvMEC2IR448JAM8unoLzF01GDlWhTSk/gi6giHI0u0E=";
   };
 
+  patches = [
+    ./stdlib.patch
+    ./bool.patch
+
+    # See:
+    # - https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711
+    # - https://bugs.gentoo.org/723186
+    (fetchpatch2 {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch?id=24688d64544b43f2c14be54531ad8764419dde09";
+      hash = "sha256-ygAfS68100ducWsxeA2Q2eoE8cBFMVO7KiXn/RGIHFw=";
+    })
+  ];
+
   nativeBuildInputs = [
     automake
     autoconf
-  ];
-  buildInputs = [
-    cups
+    autoPatchelfHook
     glib
-    libxml2
-    libusb1
     libtool
   ];
 
-  patches = [
-    ./patches/get_protocol.patch
-    ./patches/add_missing_import.patch
+  buildInputs = [
+    cups
+    libusb1
+    libxml2
   ];
 
-  # lgmon3's --enable-libdir flag is used solely for specifying in which
-  # directory the cnnnet.ini cache file should reside.
-  # NixOS uses /var/cache/cups, and given the name, it seems like a reasonable
-  # place to put the cnnet.ini file, and thus we do so.
-  #
-  # Note that the drivers attempt to dlopen
-  # $out/lib/cups/filter/libcnbpcnclapicom2.so
+  postPatch = ''
+    substituteInPlace lgmon3/src/Makefile.am \
+      --replace-fail /usr/include/libusb-1.0 ${lib.getDev libusb1}/include/libusb-1.0
+  '';
+
+  preConfigure = ''
+    for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
+      cd $i
+      env NOCONFIGURE=1 ./autogen.sh
+      cd ..
+    done
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+    for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
+      cd $i
+      configureFlags="--build=${stdenv.buildPlatform.config}"
+      configureFlags="$configureFlags --host=${stdenv.hostPlatform.config}"
+      configureFlags="$configureFlags --target=${stdenv.targetPlatform.config}"
+      configureFlags="$configureFlags --prefix=$out --disable-dependency-tracking --disable-static"
+      if [ $i = cnijbe2 -o $i = lgmon3 -o $i = rastertocanonij ]; then
+        configureFlags="$configureFlags --enable-progpath=$out/bin"
+      fi
+      if [ $i = lgmon3 ]; then
+        # lgmon3's --enable-libdir flag is used solely for specifying in which
+        # directory the cnnnet.ini cache file should reside.
+        # NixOS uses /var/cache/cups, and given the name, it seems like a reasonable
+        # place to put the cnnet.ini file, and thus we do so.
+        configureFlags="$configureFlags --enable-libpath=/var/cache/cups"
+      fi
+      ./configure $configureFlags
+      cd ..
+    done
+    runHook postConfigure
+  '';
+
   buildPhase = ''
-    mkdir -p $out/lib
-    cp com/libs_bin_x86_64/* $out/lib
-    mkdir -p $out/lib/cups/filter
-    ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter
-
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"
-  ''
-  + lib.optionalString withDebug ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__DEBUG__ -DDEBUG_LOG"
-  ''
-  + ''
-
-    (
-      cd lgmon3
-      substituteInPlace src/Makefile.am \
-        --replace /usr/include/libusb-1.0 \
-                  ${libusb1.dev}/include/libusb-1.0
-      ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
-                   --datadir=$out/share \
-                   --enable-libdir=/var/cache/cups
+    runHook preBuild
+    for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
+      cd $i
       make
-    )
-
-    (
-      cd cmdtocanonij2
-      ./autogen.sh --prefix=$out
-      make
-    )
-
-    (
-      cd cmdtocanonij3
-      ./autogen.sh --prefix=$out
-      make
-    )
-
-    (
-      cd cnijbe2
-      substituteInPlace src/Makefile.am \
-        --replace "/usr/lib/cups/backend" \
-                  "$out/lib/cups/backend"
-      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-      make
-    )
-
-    (
-      cd rastertocanonij
-      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-      make
-    )
-
-    (
-      cd tocanonij
-      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-      make
-    )
-
-    (
-      cd tocnpwg
-      ./autogen.sh --prefix=$out --enable-progpath=$out/bin
-      make
-    )
+      cd ..
+    done
+    runHook postBuild
   '';
 
   installPhase = ''
-    (
-      cd lgmon3
+    runHook preInstall
+    for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
+      cd $i
       make install
-    )
-
-    (
-      cd cmdtocanonij2
-      make install
-    )
-
-    (
-      cd cmdtocanonij3
-      make install
-    )
-
-    (
-      cd cnijbe2
-      make install
-    )
-
-    (
-      cd rastertocanonij
-      make install
-    )
-
-    (
-      cd tocanonij
-      make install
-    )
-
-    (
-      cd tocnpwg
-      make install
-    )
-
-    mkdir -p $out/share/cups/model
-    cp ppd/*.ppd $out/share/cups/model
+      cd ..
+    done
+    runHook postInstall
   '';
 
+  postInstall = ''
+    install -Dm755 -t $out/lib ${blobDir}/*
+    install -Dm644 -t $out/share/cups/model ppd/*.ppd
+  '';
+
+  runtimeDependencies = [ (placeholder "out") ];
+
+  env = {
+    NIX_CFLAGS_COMPILE = "-I${lib.getDev libxml2}/include/libxml2";
+    NIX_LDFLAGS = "-L../../${blobDir}";
+  };
+
   meta = {
     description = "Canon InkJet printer drivers for many Pixma series printers";
     longDescription = ''
-      Canon InjKet printer drivers for series E200, E300, E3100, E3300, E4200, E450, E470, E480,
-      G3000, G3010, G4000, G4010, G5000, G5080, G6000, G6050, G6080, G7000, G7050, G7080, GM2000,
-      GM2080, GM4000, GM4080, iB4000, iB4100, iP110, MB2000, MB2100, MB2300, MB2700, MB5000,
-      MB5100, MB5300, MB5400, MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800,
-      MG6900, MG7500, MG7700, MX490, TR4500, TR703, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530,
-      TS200, TS300, TS3100, TS3300, TS5000, TS5100, TS5300, TS5380, TS6000, TS6100, TS6130, TS6180,
-      TS6200, TS6230, TS6280, TS6300, TS6330, TS6380, TS700, TS708, TS7330, TS8000, TS8100, TS8130,
-      TS8180, TS8200, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000, TS9100, TS9180, TS9500,
-      TS9580, XK50, XK60, XK70, XK80.
+      Canon InkJet printer drivers for series BX110, E200, E300, E460, E470,
+      E480, E3100, E3300, E3400, E3600, E4200, E4500, G500, G600, G1020, G1030,
+      G2020, G2030, G2060, G2070, G3000, G3010, G3020, G3030, G3060, G3070,
+      G3080, G3090, G4000, G4010, G4070, G4080, G4090, G5000, G5080, G6000,
+      G6080, G7000, G7080, GM2000, GM2080, GM4000, GM4080, GX1000, GX2000,
+      GX3000, GX4000, GX4000i, GX5000, GX5100, GX5500, GX6000, GX6100, GX6500,
+      GX7000, GX7100, GX7100i, iB4000, iB4100, iP110, MB2000, MB2100, MB2300,
+      MB2700, MB5000, MB5100, MB5300, MB5400, MG2900, MG3000, MG3600, MG5600,
+      MG5700, MG6600, MG6800, MG6900, MG7500, MG7700, MX490, TR150, TR160,
+      TR703, TR4500, TR4600, TR4700, TR7000, TR7100, TR7500, TR7530, TR7600,
+      TR7800, TR8500, TR8530, TR8580, TR8600, TR8630, TR9530, TS200, TS300,
+      TS700, TS708, TS2400, TS2600, TS3100, TS3300, TS3400, TS3500, TS3600,
+      TS3700, TS4000, TS4100i, TS4300, TS5000, TS5100, TS5300, TS5350i, TS5380,
+      TS5400, TS5500, TS5630, TS6000, TS6100, TS6130, TS6180, TS6200, TS6230,
+      TS6280, TS6300, TS6330, TS6380, TS6400, TS6500, TS6500i, TS6630, TS6730,
+      TS7330, TS7400, TS7430, TS7450i, TS7500i, TS7530, TS7600i, TS7630, TS7700,
+      TS7700A, TS7700i, TS8000, TS8100, TS8130, TS8180, TS8200, TS8230, TS8280,
+      TS8300, TS8330, TS8380, TS8430, TS8530, TS8630, TS8700, TS8800, TS8930,
+      TS9000, TS9100, TS9180, TS9500, TS9580, XK50, XK60, XK70, XK80, XK90,
+      XK100, XK110, XK120, XK130, XK140, XK500, XK510.
     '';
-    homepage = "https://hk.canon/en/support/0101048401/1";
+    downloadPage = "https://hk.canon/en/support/0101281901";
     license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryNativeCode
+    ];
+    maintainers = with lib.maintainers; [ prince213 ];
     platforms = [
+      "aarch64-linux"
       "i686-linux"
+      "mips64el-linux"
       "x86_64-linux"
     ];
-    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch b/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
deleted file mode 100644
index 18cb1ce1d014..000000000000
--- a/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Resolves the compilation issue reported at https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711
-# An identical issue was previously reported in Gentoo: https://bugs.gentoo.org/723186
-# This patch is taken from the solution of Alfredo Tupone (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09)
---- a/lgmon3/src/cnijlgmon3.c	2022-07-22 12:44:32.194641628 +0100
-+++ b/lgmon3/src/cnijlgmon3.c	2022-07-22 12:43:53.954817724 +0100
-@@ -55,7 +55,7 @@
- int (*GET_STATUS)(char *, int, int *, int * , char *);
- int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
- int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *);
--int (*GET_PROTOCOL)(char *, size_t);
-+static int (*GET_PROTOCOL)(char *, size_t);
- 
- 
-  int main(int argc, char *argv[])
diff --git a/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch b/pkgs/by-name/cn/cnijfilter2/stdlib.patch
similarity index 70%
rename from pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch
rename to pkgs/by-name/cn/cnijfilter2/stdlib.patch
index 298416e27706..abd9107580c2 100644
--- a/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch
+++ b/pkgs/by-name/cn/cnijfilter2/stdlib.patch
@@ -1,5 +1,3 @@
-diff --git a/lgmon3/src/keytext.c b/lgmon3/src/keytext.c
-index 8c15ff8..b80bbe5 100644
 --- a/lgmon3/src/keytext.c
 +++ b/lgmon3/src/keytext.c
 @@ -37,6 +37,7 @@

From d7c1af4db4f3df8abf79b30378e9be7abc809b25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 Jan 2026 12:33:51 +0000
Subject: [PATCH 027/196] git-machete: 3.38.0 -> 3.38.1

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

diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix
index ba8d9e1ecc52..291ed51fc88d 100644
--- a/pkgs/by-name/gi/git-machete/package.nix
+++ b/pkgs/by-name/gi/git-machete/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.38.0";
+  version = "3.38.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = "git-machete";
     tag = "v${version}";
-    hash = "sha256-cn++U2Vy6LCEZvtmvDOTQydnAxapUZxLUE+6Kxg7Rq8=";
+    hash = "sha256-m/GstZAxBi4Q8GRv2GRrJNzChV1Rzw1vNuNP0Ao+GIY=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 56cef17a52aefb9f3208eec1801086d48df8f4ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Jan 2026 11:47:20 +0000
Subject: [PATCH 028/196] python3Packages.textual: 6.11.0 -> 7.0.0

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

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 7bebcc3b9057..1d784e75e6d0 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "6.11.0";
+  version = "7.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-xfGxI8Q9a11mD+1Ha+wnJn0HMxAzzhUIeeu1sk5cW+w=";
+    hash = "sha256-wXv3Q0/q5U75D/XE6oR8bsUKZhGbP+a8DhNrU6klYjA=";
   };
 
   build-system = [ poetry-core ];

From 71ed46b25210c57d264debdeaa353ff6efb71410 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 7 Jan 2026 13:31:54 +0100
Subject: [PATCH 029/196] libvpx: Fix ppc64 cross, improve ppc64le cross

- ppc64le now has a corresponding target in libvpx. Adjust code to use ppc64le-linux-gnu for ppc64le cross.
- 32-bit POWER & ppc64 cross currently doesn't build, because there are no known platform targets in libvpx for these.
  Adjust isGeneric code to include non-ppc64le POWER.
---
 pkgs/by-name/li/libvpx/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix
index 3887adeddd39..f1c99103a243 100644
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@@ -84,6 +84,8 @@ let
       "arm64"
     else if stdenv.hostPlatform.isx86_32 then
       "x86"
+    else if (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) then
+      "ppc64le"
     else
       stdenv.hostPlatform.parsed.cpu.name;
 
@@ -97,7 +99,10 @@ let
       stdenv.hostPlatform.parsed.kernel.name;
 
   isGeneric =
-    (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian)
+    (
+      stdenv.hostPlatform.isPower
+      && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)
+    )
     || stdenv.hostPlatform.parsed.cpu.name == "armv6l"
     || stdenv.hostPlatform.isLoongArch64
     || stdenv.hostPlatform.isRiscV;

From 1ab8a0f31634e9360631e79c168a0655da0e0443 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Jan 2026 16:57:33 +0000
Subject: [PATCH 030/196] mycli: 1.42.0 -> 1.43.1

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

diff --git a/pkgs/by-name/my/mycli/package.nix b/pkgs/by-name/my/mycli/package.nix
index c9c12deea349..f25d70e9fac9 100644
--- a/pkgs/by-name/my/mycli/package.nix
+++ b/pkgs/by-name/my/mycli/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mycli";
-  version = "1.42.0";
+  version = "1.43.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbcli";
     repo = "mycli";
     tag = "v${version}";
-    hash = "sha256-V8HqrhC+bVEgXlRPAZEo5KI8Bpz8qWbqd0qyLzSbSEQ=";
+    hash = "sha256-KybGpi9ZNkAiniZTnyzzjlUf+xISRk+k4kcIxU/iVSM=";
   };
 
   pythonRelaxDeps = [

From d09fe3b54d0548c8ecb56c8ae01d31b8f9d0ddec Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 7 Jan 2026 18:47:13 +0100
Subject: [PATCH 031/196] photoqt: 4.9.2 -> 5.0

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

diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix
index df1176e327a2..15aee4d2062e 100644
--- a/pkgs/by-name/ph/photoqt/package.nix
+++ b/pkgs/by-name/ph/photoqt/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "photoqt";
-  version = "4.9.2";
+  version = "5.0";
 
   src = fetchurl {
-    url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    hash = "sha256-kPhxWekecE57wY45qLy/EnfmjFLn0cEmZ+4qWHGbL4U=";
+    url = "https://photoqt.org/downloads/source/photoqt-${version}.tar.gz";
+    hash = "sha256-BSe95dwzBCVp5jHIX6xh9BZ4OgPl88YUxt0iTSTnx18=";
   };
 
   nativeBuildInputs = [

From ec2e86f50b38e643f30943f8386e2fb8c34d983b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Jan 2026 18:29:27 +0000
Subject: [PATCH 032/196] xlights: 2025.13 -> 2026.01

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

diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index 1d6aab973686..7249c1b43c9e 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2025.13";
+  version = "2026.01";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-HYOfcANhOmngNxtMYT53N2aoAI/0n/n+WMyQfjkuqXg=";
+    hash = "sha256-injxqVC4NhlbnY2JHdNczlOZzKfFiwqAdUAdbPG5bKw=";
   };
 
   meta = {

From c666480059915a1219d4e6226234cbd82a05384d Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Thu, 8 Jan 2026 04:34:17 +0800
Subject: [PATCH 033/196] nixos/tlp: explicitly set wantedBy for tlp-pd

---
 nixos/modules/services/hardware/tlp.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 9cb29c65ea98..58d6a4f8e569 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -172,6 +172,12 @@ in
         # won't fail due to the save dir not existing.
         serviceConfig.StateDirectory = "tlp";
       };
+
+      services.tlp-pd = lib.mkIf cfg.pd.enable {
+        # have to define again because [Install] in included file not honored
+        # https://github.com/NixOS/nixpkgs/issues/81138
+        wantedBy = [ "graphical.target" ];
+      };
     };
   };
 }

From ba55a0c1050e9bdc725329c5ab211c3dae697785 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 7 Jan 2026 23:21:42 +0100
Subject: [PATCH 034/196] tyrolienne: 1.1.0 -> 1.2.0

Changelog: https://git.uku3lig.net/uku/tyrolienne/releases/tag/1.2.0
---
 pkgs/by-name/ty/tyrolienne/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/tyrolienne/package.nix b/pkgs/by-name/ty/tyrolienne/package.nix
index a14327c03100..f5e808ce2040 100644
--- a/pkgs/by-name/ty/tyrolienne/package.nix
+++ b/pkgs/by-name/ty/tyrolienne/package.nix
@@ -14,17 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tyrolienne";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitea {
     domain = "git.uku3lig.net";
     owner = "uku";
     repo = "tyrolienne";
     tag = finalAttrs.version;
-    hash = "sha256-LJZxQLATVGEhb0HK8PO3Fe+N+GjJdwX1Z7mOCIwQkqo=";
+    hash = "sha256-jl1h7L+Ae28A7YFoIsQqxbx2XmxxjUHebD5Xba0cB5o=";
   };
 
-  cargoHash = "sha256-ax8Akv26XFFxKVstUIAHUDKypzkJOS8mpBDIT3NfBbE=";
+  cargoHash = "sha256-J/gS8tyy+5ZG1xl4NrYCU26lD0yvsVyRUoOXntCgVSE=";
 
   nativeBuildInputs = [
     copyDesktopItems

From a74f683c2b5ef59e75e7a41bbc8a66e98abbddb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Jan 2026 23:29:27 +0000
Subject: [PATCH 035/196] restinio: 0.7.8 -> 0.7.9

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

diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix
index ea21ec4a5fea..6be2b593fa1a 100644
--- a/pkgs/by-name/re/restinio/package.nix
+++ b/pkgs/by-name/re/restinio/package.nix
@@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "restinio";
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "Stiffstream";
     repo = "restinio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PXm9s586V1aZ7D5GwYzBc/Fljif/Iq3VChDe2NHWKSU=";
+    hash = "sha256-ZosfTdi/u8/sHDf6UYP49ZEkTtT9FkVCazff/rMNbLA=";
   };
 
   # https://www.github.com/Stiffstream/restinio/issues/230

From 655f41a47d95c857ef546e81cd652754e04cde97 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 7 Jan 2026 15:40:39 -0800
Subject: [PATCH 036/196] python314Packages.altair: use finalAttrs

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

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 9bf7c73401b1..538ba6b9a0cb 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -20,7 +20,7 @@
   vega-datasets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "altair";
   version = "5.5.0";
   pyproject = true;
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "altair-viz";
     repo = "altair";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lrKC4FYRQEax5E0lQNhO9FLk5UOJ0TnYzqZjndlRpGI=";
   };
 
@@ -90,4 +90,4 @@ buildPythonPackage rec {
       vinetos
     ];
   };
-}
+})

From f1a43c40e73aab601f4199ced74ff055d92c31dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jan 2026 04:35:01 +0000
Subject: [PATCH 037/196] llama-swap: 176 -> 182

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

diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix
index 113cadfe5cca..49fe455bdfef 100644
--- a/pkgs/by-name/ll/llama-swap/package.nix
+++ b/pkgs/by-name/ll/llama-swap/package.nix
@@ -17,7 +17,7 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "llama-swap";
-  version = "176";
+  version = "182";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     owner = "mostlygeek";
     repo = "llama-swap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nfkuaiEITOmpkiLft3iNW1VUexHwZ36c8gwcQKGANbQ=";
+    hash = "sha256-w/VQS8uCpgniwLiJsH/8IG/AGasRxjCv7fADTfpvWLw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-/EbFyuCVFxHTTO0UwSV3B/6PYUpudxB2FD8nNx1Bb+M=";
+  vendorHash = "sha256-XiDYlw/byu8CWvg4KSPC7m8PGCZXtp08Y1velx4BR8U=";
 
   passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
 

From 46c8e57ed64bbe1cf82047a163e2aa0212719bd3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 7 Jan 2026 16:11:36 -0800
Subject: [PATCH 038/196] python314Packages.altair: 5.5.0 -> 6.0.0

---
 .../python-modules/altair/default.nix         | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 538ba6b9a0cb..bc86a2f5255d 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -3,10 +3,12 @@
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
+  anywidget,
   ipython,
   ipywidgets,
   jinja2,
   jsonschema,
+  mistune,
   narwhals,
   numpy,
   packaging,
@@ -17,21 +19,20 @@
   pythonOlder,
   toolz,
   typing-extensions,
-  vega-datasets,
+  vl-convert-python,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "altair";
-  version = "5.5.0";
+  version = "6.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "altair-viz";
     repo = "altair";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lrKC4FYRQEax5E0lQNhO9FLk5UOJ0TnYzqZjndlRpGI=";
+    hash = "sha256-+Qc51L4tL1pRDpWwadxPpTE4tDH3FTO/wH67FtXMN7k=";
   };
 
   build-system = [ hatchling ];
@@ -48,16 +49,23 @@ buildPythonPackage (finalAttrs: {
   ++ lib.optional (pythonOlder "3.14") typing-extensions;
 
   nativeCheckInputs = [
+    anywidget
     ipython
     ipywidgets
+    mistune
     polars
     pytest-xdist
     pytestCheckHook
-    vega-datasets
+    vl-convert-python
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "altair" ];
 
+  enabledTestPaths = [
+    "tests/"
+  ];
+
   disabledTests = [
     # ValueError: Saving charts in 'svg' format requires the vl-convert-python or altair_saver package: see http://github.com/altair-viz/altair_saver/
     "test_renderer_with_none_embed_options"
@@ -66,13 +74,17 @@ buildPythonPackage (finalAttrs: {
     "test_dataframe_to_csv[pandas]"
     # Network access
     "test_theme_remote_lambda"
+    "test_chart_validation_errors"
+    "test_multiple_field_strings_in_condition"
   ];
 
   disabledTestPaths = [
     # Disabled because it requires internet connectivity
     "tests/test_examples.py"
+    "tests/test_datasets.py"
+    "altair/datasets/_data.py"
     # TODO: Disabled because of missing altair_viewer package
-    "tests/vegalite/v5/test_api.py"
+    "tests/vegalite/v6/test_api.py"
     # avoid updating files and dependency on black
     "tests/test_toplevel.py"
     # require vl-convert package

From ace5e37d5d6ae6f3fab10941d8b9d4529b24b0b4 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 8 Jan 2026 17:37:50 +0900
Subject: [PATCH 039/196] ocamlPackages.ansiterminal: fix licenses

Co-authored-by: Jo <jopejoe1@missing.ninja>
---
 pkgs/development/ocaml-modules/ansiterminal/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix
index ecbb4c9d7b2e..07652e61dd94 100644
--- a/pkgs/development/ocaml-modules/ansiterminal/default.nix
+++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix
@@ -27,7 +27,10 @@ buildDunePackage rec {
       this part is currently work in progress).
     '';
     homepage = "https://github.com/Chris00/ANSITerminal";
-    license = lib.licenses.lgpl3;
+    license = with lib.licenses; [
+      lgpl3Plus
+      ocamlLgplLinkingException
+    ];
     maintainers = [ lib.maintainers.jirkamarsik ];
   };
 }

From 1c1fc7a59f16a2786e4bac1b2b28f08225af65c2 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 7 Jan 2026 23:21:56 +0100
Subject: [PATCH 040/196] tyrolienne: add darwin support

---
 pkgs/by-name/ty/tyrolienne/package.nix | 40 ++++++++++++++++++--------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ty/tyrolienne/package.nix b/pkgs/by-name/ty/tyrolienne/package.nix
index f5e808ce2040..5755a66a995c 100644
--- a/pkgs/by-name/ty/tyrolienne/package.nix
+++ b/pkgs/by-name/ty/tyrolienne/package.nix
@@ -1,6 +1,8 @@
 {
   lib,
+  stdenv,
   rustPlatform,
+  cargo-bundle,
   copyDesktopItems,
   fetchFromGitea,
   ffmpeg,
@@ -10,7 +12,6 @@
   nix-update-script,
   pkg-config,
   wrapGAppsHook4,
-  zenity,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tyrolienne";
@@ -27,10 +28,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-J/gS8tyy+5ZG1xl4NrYCU26lD0yvsVyRUoOXntCgVSE=";
 
   nativeBuildInputs = [
-    copyDesktopItems
-    imagemagick
     pkg-config
     wrapGAppsHook4
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    copyDesktopItems
+    imagemagick
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cargo-bundle
   ];
 
   buildInputs = [ libadwaita ];
@@ -38,7 +44,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Tests are disabled because there are none, avoids having to recompile everything twice
   doCheck = false;
 
-  postInstall = ''
+  installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    runHook preInstall
+
+    # cargo-bundle expects the binary in target/release
+    release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
+    mv $release_target/tyrolienne target/release/tyrolienne
+
+    export CARGO_BUNDLE_SKIP_BUILD=true
+    app_path=$(cargo bundle --release | xargs)
+    mkdir -p $out/Applications
+    mv $app_path $out/Applications/
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     for size in 16 32 48 128 256; do
       dir="$out/share/icons/hicolor/''${size}x''${size}/apps"
       mkdir -p "$dir"
@@ -46,14 +67,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     done
   '';
 
-  preFixup = ''
+  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     gappsWrapperArgs+=(
-      --prefix PATH : ${
-        lib.makeBinPath [
-          ffmpeg
-          zenity
-        ]
-      }
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
     )
   '';
 
@@ -75,7 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Simple tool to convert, upload, and embed videos to Zipline";
     homepage = "https://git.uku3lig.net/uku/tyrolienne";
     license = lib.licenses.mpl20;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ uku3lig ];
     mainProgram = "tyrolienne";
   };

From d2e6067246fe492459eb38579a8f789113169cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9rence=20Chateign=C3=A9?=
 <terence.chateigne@posteo.net>
Date: Wed, 7 Jan 2026 14:26:38 +0100
Subject: [PATCH 041/196] google-chat-linux: 5.29.23-1 -> 5.39.24-1

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

diff --git a/pkgs/by-name/go/google-chat-linux/package.nix b/pkgs/by-name/go/google-chat-linux/package.nix
index b64012899c98..180ce9dca571 100644
--- a/pkgs/by-name/go/google-chat-linux/package.nix
+++ b/pkgs/by-name/go/google-chat-linux/package.nix
@@ -5,20 +5,21 @@
   fetchFromGitHub,
   lib,
   makeDesktopItem,
+  nix-update-script,
 }:
 
 buildNpmPackage rec {
   pname = "google-chat-linux";
-  version = "5.29.23-1";
+  version = "5.39.24-1";
 
   src = fetchFromGitHub {
     owner = "squalou";
     repo = "google-chat-linux";
     tag = version;
-    hash = "sha256-JBjxZUs0HUgAkJJBYhNv2SHjpBtAcP09Ah4ATPwpZsQ=";
+    hash = "sha256-yQBnqGyTCUr/t+PCCSTsUhKvlT5wV/F/OvCXrgeiceA=";
   };
 
-  npmDepsHash = "sha256-7lKWbXyDpYh1sP9LAV/oA7rfpckSbIucwKT21vBrJ3Y=";
+  npmDepsHash = "sha256-8eZAn8zIDcMDKi30AiG1di4T/3xVoCewJ/e4qf7n9nY=";
   dontNpmBuild = true;
 
   nativeBuildInputs = [
@@ -56,6 +57,8 @@ buildNpmPackage rec {
     })
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Electron-base client for Google Hangouts Chat";
     homepage = "https://github.com/squalou/google-chat-linux";

From 467c26c195dcce726fa1170ba4cfb78a12f1793e Mon Sep 17 00:00:00 2001
From: lylythechosenone <code@lysandermealy.com>
Date: Thu, 8 Jan 2026 09:59:12 -0500
Subject: [PATCH 042/196] netbird,netbird-*: 0.61.0 -> 0.62.1

---
 pkgs/by-name/ne/netbird-dashboard/package.nix | 4 ++--
 pkgs/by-name/ne/netbird/package.nix           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index cb1ba67bfd34..849d758898e6 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.25.0";
+  version = "2.26.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-P0qTxUdyM2Ect2+GSLC0vJbAxvaLXQi1ZMFujBnGKQ0=";
+    hash = "sha256-8MC3sHKs7HmxzqFw7px+Q0zX9PzzZhb4I5gcJ/fQ4uc=";
   };
 
   npmDepsHash = "sha256-RIhVSRjqzFawXaRZHAUwGodnNerGz+I3GbPFsP5qESY=";
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 689f978145b4..e8fd6bd593af 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -68,16 +68,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.61.0";
+  version = "0.62.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hMg7KrD6vkpEEMQButhoVE8crEODUU01Pz+ifdQ10C4=";
+    hash = "sha256-u5XzTUlGhOA++dgu0yrltQ6Cxkg+P7ghTRMvT0+2Dx4=";
   };
 
-  vendorHash = "sha256-b3Wl9jsAdYC91JM/kDo4yIF05hqbivtrcn1aRuZzP3s=";
+  vendorHash = "sha256-FsSio0gn3BBMkmQ5lSzYBkK2iU13wJKo4yWIxojvQaM=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 

From b19910075c0798c1e3d7890441eab27981866a36 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jan 2026 16:26:45 +0100
Subject: [PATCH 043/196] haskellPackages.cabal-pkg-config-version-hook:
 0.1.0.1 -> 0.1.1.0

---
 .../cabal-pkg-config-version-hook.nix         | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix

diff --git a/pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix b/pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix
new file mode 100644
index 000000000000..0381063b1689
--- /dev/null
+++ b/pkgs/development/haskell-modules/replacements-by-name/cabal-pkg-config-version-hook.nix
@@ -0,0 +1,24 @@
+{
+  mkDerivation,
+  base,
+  Cabal,
+  containers,
+  lens,
+  lib,
+  process,
+}:
+mkDerivation {
+  pname = "cabal-pkg-config-version-hook";
+  version = "0.1.1.0";
+  sha256 = "18l87dcq2854vqchg21bvv85sdm4126nbk8sj9ilr5819qslk26f";
+  libraryHaskellDepends = [
+    base
+    Cabal
+    containers
+    lens
+    process
+  ];
+  homepage = "https://github.com/hercules-ci/hercules-ci-agent/tree/master/cabal-pkg-config-version-hook#readme";
+  description = "Make Cabal aware of pkg-config package versions";
+  license = lib.licensesSpdx."BSD-3-Clause";
+}

From 50dcda8f7283784b199cbb7afdf9a36fc087df18 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jan 2026 16:28:21 +0100
Subject: [PATCH 044/196] haskellPackages.hercules-ci-cnix-store: 0.4.0.0 ->
 0.4.1.0

---
 .../hercules-ci-cnix-store.nix                | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix

diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
new file mode 100644
index 000000000000..7fd0763154ea
--- /dev/null
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
@@ -0,0 +1,65 @@
+{
+  mkDerivation,
+  base,
+  boost,
+  bytestring,
+  Cabal,
+  cabal-pkg-config-version-hook,
+  conduit,
+  containers,
+  exceptions,
+  hspec,
+  hspec-discover,
+  inline-c,
+  inline-c-cpp,
+  lib,
+  nix,
+  protolude,
+  template-haskell,
+  temporary,
+  text,
+  unix,
+  unliftio-core,
+  vector,
+}:
+mkDerivation {
+  pname = "hercules-ci-cnix-store";
+  version = "0.4.1.0";
+  sha256 = "0jy7p69jhv81rg8xikd7smgpg3vwccjzly3k8hs7ipdp2mprwffc";
+  setupHaskellDepends = [
+    base
+    Cabal
+    cabal-pkg-config-version-hook
+  ];
+  libraryHaskellDepends = [
+    base
+    bytestring
+    conduit
+    containers
+    inline-c
+    inline-c-cpp
+    protolude
+    template-haskell
+    unix
+    unliftio-core
+    vector
+  ];
+  librarySystemDepends = [ boost ];
+  libraryPkgconfigDepends = [ nix ];
+  testHaskellDepends = [
+    base
+    bytestring
+    containers
+    exceptions
+    hspec
+    inline-c
+    inline-c-cpp
+    protolude
+    temporary
+    text
+  ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://docs.hercules-ci.com";
+  description = "Haskell bindings for Nix's libstore";
+  license = lib.licensesSpdx."Apache-2.0";
+}

From 35bfc205bbb29645a990ca673e49e1296accd2da Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jan 2026 16:28:27 +0100
Subject: [PATCH 045/196] haskellPackages.hercules-ci-cnix-expr: 0.5.0.0 ->
 0.5.1.0

---
 .../hercules-ci-cnix-expr.nix                 | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix

diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
new file mode 100644
index 000000000000..90ad7e7240a5
--- /dev/null
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
@@ -0,0 +1,82 @@
+{
+  mkDerivation,
+  aeson,
+  base,
+  boost,
+  bytestring,
+  Cabal,
+  cabal-pkg-config-version-hook,
+  conduit,
+  containers,
+  directory,
+  exceptions,
+  filepath,
+  hercules-ci-cnix-store,
+  hspec,
+  hspec-discover,
+  inline-c,
+  inline-c-cpp,
+  lib,
+  nix,
+  process,
+  protolude,
+  QuickCheck,
+  scientific,
+  temporary,
+  text,
+  unliftio,
+  unordered-containers,
+  vector,
+}:
+mkDerivation {
+  pname = "hercules-ci-cnix-expr";
+  version = "0.5.1.0";
+  sha256 = "01m6l915yy3v6qpc53xq48kp3mi39bclsjdwswvgwvp9z9hjvg0p";
+  setupHaskellDepends = [
+    base
+    Cabal
+    cabal-pkg-config-version-hook
+  ];
+  libraryHaskellDepends = [
+    aeson
+    base
+    bytestring
+    conduit
+    containers
+    directory
+    exceptions
+    filepath
+    hercules-ci-cnix-store
+    inline-c
+    inline-c-cpp
+    protolude
+    scientific
+    text
+    unliftio
+    unordered-containers
+    vector
+  ];
+  librarySystemDepends = [ boost ];
+  libraryPkgconfigDepends = [ nix ];
+  testHaskellDepends = [
+    aeson
+    base
+    bytestring
+    containers
+    filepath
+    hercules-ci-cnix-store
+    hspec
+    process
+    protolude
+    QuickCheck
+    scientific
+    temporary
+    text
+    unordered-containers
+    vector
+  ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://docs.hercules-ci.com";
+  description = "Bindings for the Nix evaluator";
+  license = lib.licensesSpdx."Apache-2.0";
+}

From 82274cbd1792e94e2c843a4e2ab3e3c622bf8f84 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jan 2026 16:28:31 +0100
Subject: [PATCH 046/196] haskellPackages.hercules-ci-agent: 0.10.7 -> 0.10.8

---
 .../hercules-ci-agent.nix                     | 255 ++++++++++++++++++
 1 file changed, 255 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix

diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
new file mode 100644
index 000000000000..ff02b6fb32d2
--- /dev/null
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
@@ -0,0 +1,255 @@
+{
+  mkDerivation,
+  aeson,
+  async,
+  attoparsec,
+  base,
+  base64-bytestring,
+  bifunctors,
+  binary,
+  binary-conduit,
+  boost,
+  bytestring,
+  Cabal,
+  cabal-pkg-config-version-hook,
+  cachix,
+  cachix-api,
+  conduit,
+  conduit-extra,
+  containers,
+  directory,
+  dlist,
+  exceptions,
+  file-embed,
+  filepath,
+  hercules-ci-api,
+  hercules-ci-api-agent,
+  hercules-ci-api-core,
+  hercules-ci-cnix-expr,
+  hercules-ci-cnix-store,
+  hostname,
+  hspec,
+  hspec-discover,
+  http-client,
+  http-client-tls,
+  http-conduit,
+  HUnit,
+  inline-c,
+  inline-c-cpp,
+  katip,
+  lens,
+  lens-aeson,
+  lib,
+  lifted-async,
+  lifted-base,
+  monad-control,
+  mtl,
+  network,
+  network-uri,
+  nix,
+  optparse-applicative,
+  process,
+  process-extras,
+  profunctors,
+  protolude,
+  QuickCheck,
+  safe-exceptions,
+  scientific,
+  servant,
+  servant-auth-client,
+  servant-client,
+  servant-client-core,
+  stm,
+  tagged,
+  temporary,
+  text,
+  time,
+  tls,
+  tomland,
+  transformers,
+  transformers-base,
+  unbounded-delays,
+  unix,
+  unliftio,
+  unliftio-core,
+  unordered-containers,
+  uuid,
+  vector,
+  websockets,
+  wuss,
+}:
+mkDerivation {
+  pname = "hercules-ci-agent";
+  version = "0.10.8";
+  sha256 = "0f8d5xfix0bsxdvanf6zn1l2qs80aivva86qf3j1clfr2dny4g59";
+  isLibrary = true;
+  isExecutable = true;
+  setupHaskellDepends = [
+    base
+    Cabal
+    cabal-pkg-config-version-hook
+  ];
+  libraryHaskellDepends = [
+    aeson
+    async
+    base
+    binary
+    binary-conduit
+    bytestring
+    conduit
+    containers
+    directory
+    dlist
+    exceptions
+    file-embed
+    filepath
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-expr
+    hercules-ci-cnix-store
+    katip
+    lens
+    lens-aeson
+    lifted-async
+    lifted-base
+    monad-control
+    mtl
+    network
+    network-uri
+    process
+    process-extras
+    protolude
+    safe-exceptions
+    stm
+    tagged
+    temporary
+    text
+    time
+    tls
+    transformers
+    transformers-base
+    unbounded-delays
+    unix
+    unliftio
+    unliftio-core
+    uuid
+    vector
+    websockets
+    wuss
+  ];
+  executableHaskellDepends = [
+    aeson
+    async
+    attoparsec
+    base
+    base64-bytestring
+    bifunctors
+    binary
+    binary-conduit
+    bytestring
+    cachix
+    cachix-api
+    conduit
+    conduit-extra
+    containers
+    directory
+    dlist
+    exceptions
+    filepath
+    hercules-ci-api
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-expr
+    hercules-ci-cnix-store
+    hostname
+    http-client
+    http-client-tls
+    http-conduit
+    inline-c
+    inline-c-cpp
+    katip
+    lens
+    lens-aeson
+    lifted-async
+    lifted-base
+    monad-control
+    mtl
+    network
+    network-uri
+    optparse-applicative
+    process
+    process-extras
+    profunctors
+    protolude
+    safe-exceptions
+    scientific
+    servant
+    servant-auth-client
+    servant-client
+    servant-client-core
+    stm
+    temporary
+    text
+    time
+    tomland
+    transformers
+    transformers-base
+    unix
+    unliftio
+    unliftio-core
+    unordered-containers
+    uuid
+    vector
+    websockets
+    wuss
+  ];
+  executableSystemDepends = [ boost ];
+  executablePkgconfigDepends = [ nix ];
+  testHaskellDepends = [
+    aeson
+    async
+    attoparsec
+    base
+    bifunctors
+    binary
+    binary-conduit
+    bytestring
+    conduit
+    containers
+    exceptions
+    filepath
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-store
+    hspec
+    HUnit
+    katip
+    lens
+    lens-aeson
+    lifted-async
+    lifted-base
+    monad-control
+    mtl
+    process
+    profunctors
+    protolude
+    QuickCheck
+    safe-exceptions
+    scientific
+    stm
+    tagged
+    temporary
+    text
+    tomland
+    transformers
+    transformers-base
+    unliftio-core
+    unordered-containers
+    uuid
+    vector
+  ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://docs.hercules-ci.com";
+  description = "Runs Continuous Integration tasks on your machines";
+  license = lib.licensesSpdx."Apache-2.0";
+}

From b92b5c81e1444dea95af0eb32a8b3674611dcc3e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jan 2026 16:28:38 +0100
Subject: [PATCH 047/196] haskellPackages.hercules-ci-cli: 0.3.8 -> 0.3.9

---
 .../replacements-by-name/hercules-ci-cli.nix  | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix

diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix
new file mode 100644
index 000000000000..e06ec7fbfc1e
--- /dev/null
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cli.nix
@@ -0,0 +1,132 @@
+{
+  mkDerivation,
+  aeson,
+  aeson-pretty,
+  async,
+  atomic-write,
+  attoparsec,
+  base,
+  bytestring,
+  conduit,
+  containers,
+  data-has,
+  directory,
+  exceptions,
+  filepath,
+  hercules-ci-agent,
+  hercules-ci-api,
+  hercules-ci-api-agent,
+  hercules-ci-api-core,
+  hercules-ci-cnix-expr,
+  hercules-ci-cnix-store,
+  hercules-ci-optparse-applicative,
+  hostname,
+  hspec,
+  http-client,
+  http-client-tls,
+  http-types,
+  inline-c-cpp,
+  katip,
+  lens,
+  lens-aeson,
+  lib,
+  lifted-base,
+  monad-control,
+  network-uri,
+  process,
+  protolude,
+  QuickCheck,
+  retry,
+  rio,
+  safe-exceptions,
+  servant,
+  servant-auth-client,
+  servant-client,
+  servant-client-core,
+  servant-conduit,
+  temporary,
+  text,
+  tls,
+  transformers,
+  transformers-base,
+  unix,
+  unliftio,
+  unliftio-core,
+  unordered-containers,
+  uuid,
+}:
+mkDerivation {
+  pname = "hercules-ci-cli";
+  version = "0.3.9";
+  sha256 = "091j83ac4byr6vbmd0wq1b86p23d1z7sn5ls6w24l72dp8fvfjjp";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson
+    aeson-pretty
+    async
+    atomic-write
+    attoparsec
+    base
+    bytestring
+    conduit
+    containers
+    data-has
+    directory
+    exceptions
+    filepath
+    hercules-ci-agent
+    hercules-ci-api
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-expr
+    hercules-ci-cnix-store
+    hercules-ci-optparse-applicative
+    hostname
+    http-client
+    http-client-tls
+    http-types
+    inline-c-cpp
+    katip
+    lens
+    lens-aeson
+    lifted-base
+    monad-control
+    network-uri
+    process
+    protolude
+    retry
+    rio
+    safe-exceptions
+    servant
+    servant-auth-client
+    servant-client
+    servant-client-core
+    servant-conduit
+    temporary
+    text
+    tls
+    transformers
+    transformers-base
+    unix
+    unliftio
+    unliftio-core
+    unordered-containers
+    uuid
+  ];
+  executableHaskellDepends = [ base ];
+  testHaskellDepends = [
+    aeson
+    base
+    bytestring
+    containers
+    hspec
+    protolude
+    QuickCheck
+    unordered-containers
+  ];
+  homepage = "https://docs.hercules-ci.com";
+  description = "The hci command for working with Hercules CI";
+  license = lib.licenses.asl20;
+  mainProgram = "hci";
+}

From 64555cee7682fd77b8d44187a8e74acf2ca9fd2e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jan 2026 16:35:10 +0100
Subject: [PATCH 048/196] haskellPackages.hercules-ci-cnix-store.nixPackage:
 2.28 -> 2.31

---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 87c0b23de599..0484220e09e5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1647,7 +1647,7 @@ builtins.intersectAttrs super {
     overrideCabal
       (old: {
         passthru = old.passthru or { } // {
-          nixPackage = pkgs.nixVersions.nix_2_28;
+          nixPackage = pkgs.nixVersions.nix_2_31;
         };
       })
       (

From 36484791b559241875a08584ced0324d7a8aeec3 Mon Sep 17 00:00:00 2001
From: William Edwards <shadowapex@gmail.com>
Date: Thu, 8 Jan 2026 08:26:20 -0800
Subject: [PATCH 049/196] opengamepadui: 0.42.3 -> 0.44.0

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

diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix
index 7e91a2d92920..22fe6ebe8f13 100644
--- a/pkgs/by-name/op/opengamepadui/package.nix
+++ b/pkgs/by-name/op/opengamepadui/package.nix
@@ -4,7 +4,7 @@
   dbus,
   fetchFromGitHub,
   gamescope,
-  godot_4_4,
+  godot_4_5,
   hwdata,
   lib,
   libGL,
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opengamepadui";
-  version = "0.42.3";
+  version = "0.44.0";
 
   buildType = if withDebug then "debug" else "release";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ShadowBlip";
     repo = "OpenGamepadUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sqzCGGrMxOjepi9GxJFCAY+tzuIwOgs5qYeIYKb7Y1U=";
+    hash = "sha256-hVOoo6YHgGJMksVbn9PqDNQedw7Zxxrmydwxh6qVebo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cargo
-    godot_4_4
+    godot_4_5
     pkg-config
     rustPlatform.cargoSetupHook
   ];
@@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   env =
     let
-      versionAndRelease = lib.splitString "-" godot_4_4.version;
+      versionAndRelease = lib.splitString "-" godot_4_5.version;
     in
     {
-      GODOT = lib.getExe godot_4_4;
+      GODOT = lib.getExe godot_4_5;
       GODOT_VERSION = lib.elemAt versionAndRelease 0;
       GODOT_RELEASE = lib.elemAt versionAndRelease 1;
-      EXPORT_TEMPLATE = "${godot_4_4.export-template}/share/godot/export_templates";
+      EXPORT_TEMPLATE = "${godot_4_5.export-template}/share/godot/export_templates";
       BUILD_TYPE = "${finalAttrs.buildType}";
     };
 

From 07543881e2753f619037bf85067f5190ee86e936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jan 2026 20:35:28 +0000
Subject: [PATCH 050/196] dix: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/by-name/di/dix/package.nix b/pkgs/by-name/di/dix/package.nix
index 367176abc9db..57daa6a9b66a 100644
--- a/pkgs/by-name/di/dix/package.nix
+++ b/pkgs/by-name/di/dix/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dix";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "faukah";
     repo = "dix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X+yFRLorfq9jvyMCvVCYUCh1pVN207XqTDr2FM1C+QE=";
+    hash = "sha256-p02luVvo02zFTpXUoIK86xIiLKdnhjzGaLJkZ3RSUdw=";
   };
 
-  cargoHash = "sha256-Y9cTncgTfv+mr5izioLF3wb6ZRBWe0eKAZ2iqcsf/Tk=";
+  cargoHash = "sha256-DBswUOoUMvTy9CijUJF2VGLTkx9WiT1ebdntl9+ytY4=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From c6c720452bb109f1720276abe3c0b2fd03e43291 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Thu, 8 Jan 2026 21:15:53 +0100
Subject: [PATCH 051/196] signal-desktop: 7.83.0 -> 7.84.0

---
 pkgs/by-name/si/signal-desktop/package.nix    |   8 +-
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |   6 +-
 .../signal-desktop/webrtc-fix-gcc-build.patch |  39 ---
 .../si/signal-desktop/webrtc-sources.json     | 224 +++++++++++++-----
 pkgs/by-name/si/signal-desktop/webrtc.nix     |   4 -
 5 files changed, 171 insertions(+), 110 deletions(-)
 delete mode 100644 pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 9fd84b6a07e2..7ce2c0872db6 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -54,13 +54,13 @@ let
     '';
   });
 
-  version = "7.83.0";
+  version = "7.84.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-r1RB6vtG2mdRJifaKNrmQvxJxXOqkpHoWivvPPpesow=";
+    hash = "sha256-c76Z+AJCGBXpHPejtZaA2RJpEMy+sd2xvjx+epC1Eqw=";
     postCheckout = ''
       git -C "$out" show -s --format=%ct > "$out"/GIT_COMMIT_TIME
     '';
@@ -147,9 +147,9 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-taF3A2YcqMzqcS401fxRW9wEC/Ol7bVJ6belF4RTIRk="
+        "sha256-/1/sUHt1J6wv/MuaZdE1XbkIkXfrllBoqt8AXP1d0Pw="
       else
-        "sha256-sWxxANPW0W5/tmowoJ7ZPBEBSurKN6C+wZAcLa2QHz8=";
+        "sha256-x2A4sX7m/zNVTEWRXOKD6VsUR+aGjEFhIv+NQVe+RwQ=";
   };
 
   env = {
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index eff4bc70f17e..dba9823cff51 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.60.7";
+  version = "2.61.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tTfWAnY7I1Gch/tRr4o7NhoZhZ5+jGoZ1BWgAYl0a+I=";
+    hash = "sha256-84QqCfz+NKVLr2FAEDSFAvCm4RhHhq+174M2rxD/D0s=";
   };
 
-  cargoHash = "sha256-h44LLxKDKBVfBMVdVUtlQdct+sFK553rRoOAXsSYqIM=";
+  cargoHash = "sha256-LpYjNXc/HzV3OYSIyCxDTlL3UZYbOiRkPCBeIqW2hB8=";
 
   preConfigure = ''
     # Check for matching webrtc version
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch b/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch
deleted file mode 100644
index 701edc9c5d22..000000000000
--- a/pkgs/by-name/si/signal-desktop/webrtc-fix-gcc-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h
-index f774b3d..c7242d9 100644
---- a/p2p/base/port_interface.h
-+++ b/p2p/base/port_interface.h
-@@ -55,7 +55,7 @@ class PortInterface {
-   virtual ~PortInterface();
- 
-   virtual IceCandidateType Type() const = 0;
--  virtual const Network* Network() const = 0;
-+  virtual const ::webrtc::Network* Network() const = 0;
- 
-   // Methods to set/get ICE role and tiebreaker values.
-   virtual void SetIceRole(IceRole role) = 0;
-diff --git a/pc/codec_vendor.h b/pc/codec_vendor.h
-index 1472225..251afbd 100644
---- a/pc/codec_vendor.h
-+++ b/pc/codec_vendor.h
-@@ -119,7 +119,7 @@ class CodecVendor {
- class CodecLookupHelper {
-  public:
-   virtual ~CodecLookupHelper() = default;
--  virtual PayloadTypeSuggester* PayloadTypeSuggester() = 0;
-+  virtual ::webrtc::PayloadTypeSuggester* PayloadTypeSuggester() = 0;
-   // Look up the codec vendor to use, depending on context.
-   // This call may get additional arguments in the future, to aid
-   // in selection of the correct context.
-diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h
-index ab914f3..3ff6f6f 100644
---- a/pc/jsep_transport.h
-+++ b/pc/jsep_transport.h
-@@ -214,7 +214,7 @@ class JsepTransport {
-     return rtp_dtls_transport_;
-   }
- 
--  scoped_refptr<SctpTransport> SctpTransport() const { return sctp_transport_; }
-+  scoped_refptr<::webrtc::SctpTransport> SctpTransport() const { return sctp_transport_; }
- 
-   // TODO(bugs.webrtc.org/9719): Delete method, update callers to use
-   // SctpTransport() instead.
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 930dfda27d7a..6b824925c682 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,25 +1,25 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-bjbMVnTgSrjHbJOpQz+PSf0kppzX3Wvu5wihPTRY9qg=",
+            "hash": "sha256-M9cwhO7CbaqdffJgFguKkX1WN0q1m/INpb/+B4km15c=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7339f"
+            "tag": "7444a"
         },
         "fetcher": "fetchFromGitHub"
     },
     "src/build": {
         "args": {
-            "hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=",
-            "rev": "66d076c7ab192991f67891b062b35404f3cb0739",
+            "hash": "sha256-UHTiL6tMDu/rhSmfy89QQPwEEdU2kS0IaYBhWKKJ4Yo=",
+            "rev": "045565e91c7360951bddbd0618a20ea59cdd31f3",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=",
-            "rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3",
+            "hash": "sha256-OOCCh0pSzUPpjlaceYIR2VGQ66eAqUAv8x7kgDfBD/0=",
+            "rev": "3e6e75d1961a90054ee0e3030ee66b6a04164c10",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
@@ -35,40 +35,40 @@
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=",
-            "rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d",
+            "hash": "sha256-UT4DGNjd+F6liecGeXDwS5Zast4ZriOinbrXAqd96ks=",
+            "rev": "c030c132cbab406942fb208b7180f8846aa4abf1",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=",
-            "rev": "e30091e8987ee0bb0cd30bc467250a96a7614762",
+            "hash": "sha256-qxIivQe2O9L6N5T5RpjtdSXvEFQ4CDZtMSounS8iixw=",
+            "rev": "de738129ebb915bbe34cdf06520c7050ef8aa9d9",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=",
-            "rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac",
+            "hash": "sha256-yGBxpmWrFURe3gziO3en5ZKs9wAup8XEwHhzq+cKVu8=",
+            "rev": "db638238d29708a20b991af3b2488e45a8bbcf71",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=",
-            "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
+            "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM=",
+            "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=",
-            "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
+            "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0=",
+            "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -99,12 +99,20 @@
     },
     "src/third_party/compiler-rt/src": {
         "args": {
-            "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=",
-            "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
+            "hash": "sha256-MHamj1BEwae6pohqjrMULEp2hrh8+jGDxNgYbzqtGK0=",
+            "rev": "dbef1a89100395f128231024d0c07e4dcfe72140",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/cpuinfo/src": {
+        "args": {
+            "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=",
+            "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+            "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/crc32c/src": {
         "args": {
             "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
@@ -115,60 +123,100 @@
     },
     "src/third_party/dav1d/libdav1d": {
         "args": {
-            "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=",
-            "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
+            "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=",
+            "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d",
             "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=",
-            "rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8",
+            "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=",
+            "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/eigen3/src": {
+        "args": {
+            "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE=",
+            "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+            "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
+    "src/third_party/farmhash/src": {
+        "args": {
+            "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+            "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+            "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=",
-            "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
+            "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=",
+            "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/flatbuffers/src": {
         "args": {
-            "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-            "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
+            "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=",
+            "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
             "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fontconfig/src": {
         "args": {
-            "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=",
-            "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
+            "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8=",
+            "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
             "url": "https://chromium.googlesource.com/external/fontconfig.git"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/fp16/src": {
+        "args": {
+            "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=",
+            "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+            "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=",
-            "rev": "08805be530d6820d2bf8a1b7685826de40f06812",
+            "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98=",
+            "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=",
-            "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
+            "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k=",
+            "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/fxdiv/src": {
+        "args": {
+            "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+            "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+            "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
+    "src/third_party/gemmlowp/src": {
+        "args": {
+            "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs=",
+            "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+            "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/google_benchmark/src": {
         "args": {
             "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
@@ -179,16 +227,16 @@
     },
     "src/third_party/googletest/src": {
         "args": {
-            "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=",
-            "rev": "373af2e3df71599b87a40ce0e37164523849166b",
+            "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=",
+            "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8",
             "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=",
-            "rev": "806e186735cc3bf4375f43d2d6a9483c607e4278",
+            "hash": "sha256-JUws1tD5/4mfx/muCkx5FvQoh0Vb2mD5/bIacCAZVAg=",
+            "rev": "de6ce7f32b1bf254d2b4c04e8872b63284632fd3",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -203,8 +251,8 @@
     },
     "src/third_party/harfbuzz-ng/src": {
         "args": {
-            "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=",
-            "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495",
+            "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=",
+            "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843",
             "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -243,28 +291,36 @@
     },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=",
-            "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
+            "hash": "sha256-s+fFufuRRGfItmd63IbHCR6ScANkJ49y+fsIGhTdwZE=",
+            "rev": "dcfc0bd1934130570d04597a3b75de0824dc434d",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++/src": {
         "args": {
-            "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=",
-            "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
+            "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs=",
+            "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++abi/src": {
         "args": {
-            "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=",
-            "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
+            "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ=",
+            "rev": "864f61dc9253d56586ada34c388278565ef513f6",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/libgav1/src": {
+        "args": {
+            "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
+            "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+            "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/libjpeg_turbo": {
         "args": {
             "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
@@ -273,6 +329,14 @@
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/libpfm4/src": {
+        "args": {
+            "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=",
+            "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+            "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/libsrtp": {
         "args": {
             "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
@@ -283,32 +347,32 @@
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=",
-            "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
+            "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30=",
+            "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=",
-            "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
+            "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c=",
+            "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=",
-            "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
+            "hash": "sha256-9Qn1v9iUrk28bjW9HGepvzEM0wrpmCiA43+a/GPc9/s=",
+            "rev": "5b22f31cb5d39c1309a589f148678c2a217e75db",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=",
-            "rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326",
+            "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg=",
+            "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -329,6 +393,14 @@
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/neon_2_sse/src": {
+        "args": {
+            "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
+            "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+            "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/openh264/src": {
         "args": {
             "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
@@ -339,32 +411,64 @@
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=",
-            "rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed",
+            "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs=",
+            "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
             "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/protobuf-javascript/src": {
         "args": {
-            "hash": "sha256-c/aC+LZQtedL5oouUXw2eTF6xD7LN3J3C0q3D0wl+W0=",
-            "rev": "28bf5df73ef2f345a936d9cc95d64ba8ed426a53",
+            "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=",
+            "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024",
             "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/pthreadpool/src": {
+        "args": {
+            "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0=",
+            "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+            "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/third_party/re2/src": {
         "args": {
-            "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=",
-            "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
+            "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE=",
+            "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
             "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
+    "src/third_party/ruy/src": {
+        "args": {
+            "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk=",
+            "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
+            "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
+    "src/third_party/tflite/src": {
+        "args": {
+            "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY=",
+            "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+            "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
+    "src/third_party/xnnpack/src": {
+        "args": {
+            "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw=",
+            "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+            "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+        },
+        "fetcher": "fetchFromGitiles"
+    },
     "src/tools": {
         "args": {
-            "hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=",
-            "rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8",
+            "hash": "sha256-a3sRfYOVGgroZu25lPS+jGN5Nf/lhfKvKhMl8WiAybs=",
+            "rev": "3b73a00861c1cc1d6308e20786f42045b77864cd",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index b0f3968145b0..b4c02a195b94 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -57,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     pulseaudio
   ];
 
-  patches = [
-    ./webrtc-fix-gcc-build.patch
-  ];
-
   postPatch = ''
     substituteInPlace build/toolchain/linux/BUILD.gn \
       --replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

From d6e2f76cc0601879d867f847658b67a1e6ccd324 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Sat, 3 Jan 2026 06:43:44 +0800
Subject: [PATCH 052/196] gopeed: fix libgopeed

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

diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index 9ebd3485003d..ba4625382139 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -31,6 +31,13 @@ let
 
     vendorHash = "sha256-rIj4T+NEqWla6/+ofosTwagL4/VMovDp1NEYMuzbOrQ=";
 
+    # Fix C23 compat
+    preBuild = ''
+      chmod +w vendor/github.com/anacrolix/go-libutp/utp_types.h
+      substituteInPlace vendor/github.com/anacrolix/go-libutp/utp_types.h \
+        --replace-fail "typedef uint8 bool;" ""
+    '';
+
     buildPhase = ''
       runHook preBuild
 

From 250386534b1f03dbe5637554bc37211a64429c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 9 Jan 2026 00:54:00 +0100
Subject: [PATCH 053/196] python3Packages.textual-textarea: relax textual
 dependency

---
 pkgs/development/python-modules/textual-textarea/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index c01efb0342a7..ba60e1ed6b8e 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -32,6 +32,10 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
+  pythonRelaxDeps = [
+    "textual"
+  ];
+
   dependencies = [
     pyperclip
     textual

From 1c215329d41aa1608c1e8733eeededd3ab70b8cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 02:51:35 +0000
Subject: [PATCH 054/196] gomtree: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/go/gomtree/package.nix b/pkgs/by-name/go/gomtree/package.nix
index b2dea43ca591..2f808367a0ee 100644
--- a/pkgs/by-name/go/gomtree/package.nix
+++ b/pkgs/by-name/go/gomtree/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "gomtree";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "vbatts";
     repo = "go-mtree";
     rev = "v${version}";
-    hash = "sha256-SCjmyvZZGI/vQg2Ok4vw6v4Om8pNgdWDBwWVB/LIKaA=";
+    hash = "sha256-MLZybHyYxRxxRy0/pd1n8apcfzrNVu2joP2S2P4KRHU=";
   };
 
   vendorHash = null;

From 53b2ae291c8e3da202a680023dcc61142b763462 Mon Sep 17 00:00:00 2001
From: nicknb <nicknb@posteo.com>
Date: Sun, 12 Oct 2025 22:29:26 +0200
Subject: [PATCH 055/196] maintainers: add nicknb

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6ecb30a5b18a..78dce1d17848 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18723,6 +18723,20 @@
     githubId = 115494;
     name = "Nick Lewis";
   };
+  nicknb = {
+    name = "nicknb";
+    email = "nicknb@posteo.com";
+    github = "fk29g";
+    githubId = 205353326;
+    keys = [
+      {
+        fingerprint = "8FF0 1BEE BCBF 1D20 ECD3  5FFA D903 84C8 07BC 1FE6";
+      }
+      {
+        fingerprint = "6F9B 47B6 FFB0 823D 2ACF  9ED8 2BF0 FBB4 05AD 6A7C";
+      }
+    ];
+  };
   nicknovitski = {
     email = "nixpkgs@nicknovitski.com";
     github = "nicknovitski";

From 71cddf59c06c3f2cdd2567c84a7ca2c03f3dba32 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Fri, 9 Jan 2026 07:47:49 +0100
Subject: [PATCH 056/196] xcursor-viewer: init at 0-unstable-2026-01-05

I ran this to preview a cursor theme on wayland and it worked as expected.

The updater also works.
---
 pkgs/by-name/xc/xcursor-viewer/package.nix | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/xc/xcursor-viewer/package.nix

diff --git a/pkgs/by-name/xc/xcursor-viewer/package.nix b/pkgs/by-name/xc/xcursor-viewer/package.nix
new file mode 100644
index 000000000000..5f3c20580090
--- /dev/null
+++ b/pkgs/by-name/xc/xcursor-viewer/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  qt5,
+  unstableGitUpdater,
+}:
+
+stdenv.mkDerivation {
+  pname = "xcursor-viewer";
+  version = "0-unstable-2026-01-05";
+
+  src = fetchFromGitHub {
+    owner = "drizt";
+    repo = "xcursor-viewer";
+    rev = "216ed3b6b4694f75fc424862874dc5e2b66fb685";
+    hash = "sha256-faQuxHrUAqqSODDKZrRlMnWRj0NeM8hSHSbec7KSo50=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "A preview application for cursors in xcurosr format built in QT5";
+    homepage = "https://github.com/drizt/xcursor-viewer/";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ atemu ];
+    mainProgram = "xcursor-viewer";
+    platforms = lib.platforms.all;
+  };
+}

From 5f298204c350ddc80db4d4cd96b629e04605c676 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 9 Jan 2026 17:35:35 +0800
Subject: [PATCH 057/196] qq: 2025-12-03 -> 2026-01-08

---
 pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 813e1db6d940..1afa1d38ea6d 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-12-03
+# Last updated: 2026-01-09
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.86-2025-12-03";
+    version = "6.9.87-2026-01-08";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.86_251203_01.dmg";
-      hash = "sha256-QzH3XYbARAgNi6WCB/9KZbON9BqpH2eWzYo6n0usCzI=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.87_260108_01.dmg";
+      hash = "sha256-qsRJln44kpR9+muiKzqr0uZ8BEVpRbn/xc1IiQ+xyhk=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.22-2025-12-03";
+    version = "3.2.23-2026-01-08";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.22_251203_arm64_01.deb";
-      hash = "sha256-3HBpnLkO/an/E876Q0A2mG5JNBafxUdm33DL6KLjeZk=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.23_260108_arm64_01.deb";
+      hash = "sha256-hw7TwOQX6bs6AhwdVlGLwvu6gtHD4YcThPZKt+IZI/c=";
     };
   };
   x86_64-linux = {
-    version = "3.2.22-2025-12-03";
+    version = "3.2.23-2026-01-08";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.22_251203_amd64_01.deb";
-      hash = "sha256-PwBL2yRrMZTSdsY26pbLQKfguBP+pHCVfRMx6AMyvVQ=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.23_260108_amd64_01.deb";
+      hash = "sha256-pCUnGcG+uK3ODaCev8MQzlDHnqVI9czkKVBXZdC/uoQ=";
     };
   };
 }

From 3086237f0d28d9a3d4cd740272bf083af8ac9770 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 10:03:07 +0000
Subject: [PATCH 058/196] slade-unstable: 3.2.9-unstable-2026-01-03 ->
 3.2.10-unstable-2026-01-06

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

diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index 2106f404ffdb..6c7a972093aa 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.9-unstable-2026-01-03";
+  version = "3.2.10-unstable-2026-01-06";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "2f67a4aed53fdd97aabfafa103ff120df5f73b3c";
-    hash = "sha256-eb9UBHws9VFcYIc5ONcbjoM56zHKwETUyaSIZBAgRHo=";
+    rev = "41967633f73a507181b44a1b52694547dcd534d5";
+    hash = "sha256-6HnhsO9EuZia2ox7edVIade1RZ4ES6zWZkLNwA0PqZ0=";
   };
 
   nativeBuildInputs = [

From e0cc550f9629e0a91dda9d53c3c343981ff8bc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?=
 <1771332+vlaci@users.noreply.github.com>
Date: Fri, 9 Jan 2026 11:15:33 +0100
Subject: [PATCH 059/196] intune-portal: fix update script

The changes are needed as the package target Ubuntu 24.04 since the
last update.
---
 pkgs/by-name/in/intune-portal/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/intune-portal/update.sh b/pkgs/by-name/in/intune-portal/update.sh
index 4908bcf43794..fcb4312f2994 100755
--- a/pkgs/by-name/in/intune-portal/update.sh
+++ b/pkgs/by-name/in/intune-portal/update.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p curl gzip dpkg common-updater-scripts
 
-index_file=$(curl -sL https://packages.microsoft.com/ubuntu/22.04/prod/dists/jammy/main/binary-amd64/Packages.gz | gzip -dc)
+index_file=$(curl -sL https://packages.microsoft.com/ubuntu/24.04/prod/dists/noble/main/binary-amd64/Packages.gz | gzip -dc)
 
 latest_version="0"
 

From 408f464edfd5e4ff6fef273606cf5c9ae8d6bda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?=
 <1771332+vlaci@users.noreply.github.com>
Date: Fri, 9 Jan 2026 11:16:20 +0100
Subject: [PATCH 060/196] intune-portal: 1.2503.10-noble -> 1.2508.17-noble

Generated via the command:

    nix-shell maintainers/scripts/update.nix --argstr package intune-portal
---
 pkgs/by-name/in/intune-portal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix
index bccc6d76396f..52cd47569f68 100644
--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@@ -30,11 +30,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "intune-portal";
-  version = "1.2503.10-noble";
+  version = "1.2508.17-noble";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
-    hash = "sha256-NlJ8m7V1yLErOntprHs3EagPtwSzYWd7NBH0jc72+i4=";
+    hash = "sha256-UTP+Z6xsjr48deizuwVDb8GrpeeAf5RZwloXsZ7Um3E=";
   };
 
   nativeBuildInputs = [ dpkg ];

From 4935c497ebd7a93d117574f4fbd208b815444f76 Mon Sep 17 00:00:00 2001
From: nicknb <nicknb@posteo.com>
Date: Fri, 9 Jan 2026 04:04:06 +0100
Subject: [PATCH 061/196] gitnapped: init at 0.1.4

---
 pkgs/by-name/gi/gitnapped/package.nix | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/gi/gitnapped/package.nix

diff --git a/pkgs/by-name/gi/gitnapped/package.nix b/pkgs/by-name/gi/gitnapped/package.nix
new file mode 100644
index 000000000000..7c68d7d0d7d3
--- /dev/null
+++ b/pkgs/by-name/gi/gitnapped/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  makeBinaryWrapper,
+  git,
+}:
+
+let
+  wrapperPath = lib.makeBinPath [
+    git
+  ];
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gitnapped";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "Solexma";
+    repo = "gitnapped";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DkKei7PnQnF+0odsPwJJ/pwO/yqdZGRrJQcdIMQ/3uI=";
+  };
+
+  cargoHash = "sha256-AIYDgjDYOwIi6KK5GzMF5UWYe9h7mGNONdwtlNygod4=";
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/gitnapped \
+      --prefix PATH : ${wrapperPath}
+  '';
+
+  meta = {
+    description = "Git commit timeline analyzer";
+    homepage = "https://site.gitnapped.dev";
+    maintainers = with lib.maintainers; [
+      nicknb
+    ];
+    mainProgram = "gitnapped";
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.unix;
+  };
+})

From 5f26fe687be909455c5a924cff2ad121b3f31220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 9 Jan 2026 04:44:11 -0800
Subject: [PATCH 062/196] python3Packages.fontforge: remove superfluous
 disabled

---
 pkgs/top-level/python-packages.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b60dcaf2b9a..af067d16f6ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5718,13 +5718,11 @@ self: super: with self; {
 
   fontfeatures = callPackage ../development/python-modules/fontfeatures { };
 
-  fontforge = disabledIf (pythonOlder "3.10") (
-    toPythonModule (
-      pkgs.fontforge.override {
-        withPython = true;
-        python3 = python;
-      }
-    )
+  fontforge = toPythonModule (
+    pkgs.fontforge.override {
+      withPython = true;
+      python3 = python;
+    }
   );
 
   fontmake = callPackage ../development/python-modules/fontmake { };

From cf99938ea541a86226f500c64d2d16548377e664 Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Fri, 9 Jan 2026 13:51:03 +0100
Subject: [PATCH 063/196] nixosTests.apparmor: adapt test to new pathname style

Since https://github.com/NixOS/nixpkgs/pull/443245 file rules are
written with the pathname first.

Also somehow the sorting was strange.
---
 nixos/tests/apparmor/default.nix              |   6 +-
 nixos/tests/apparmor/makeExpectedPolicies.nix | 144 +++++++++---------
 2 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/nixos/tests/apparmor/default.nix b/nixos/tests/apparmor/default.nix
index e2667df8ec80..be35cec0da38 100644
--- a/nixos/tests/apparmor/default.nix
+++ b/nixos/tests/apparmor/default.nix
@@ -83,13 +83,13 @@ in
                 pkgs.writeText "expected.rules" (import ./makeExpectedPolicies.nix { inherit pkgs; })
               } ${
                 pkgs.runCommand "actual.rules" { preferLocalBuild = true; } ''
-                  ${getExe pkgs.gnused} -e 's:^[^ ]* ${builtins.storeDir}/[^,/-]*-\([^/,]*\):\1 \0:' ${
+                  ${getExe pkgs.gnused} -e 's:^${builtins.storeDir}/[^,/-]*-\([^/, ]*\):\1 \0:' ${
                     pkgs.apparmorRulesFromClosure {
                       name = "ping";
-                      additionalRules = [ "x $path/foo/**" ];
+                      additionalRules = [ "$path/foo/** x" ];
                     } [ pkgs.libcap ]
                   } |
-                  ${getExe' pkgs.coreutils "sort"} -n -k1 |
+                  LC_ALL=C ${getExe' pkgs.coreutils "sort"} |
                   ${getExe pkgs.gnused} -e 's:^[^ ]* ::' >$out
                 ''
               }"
diff --git a/nixos/tests/apparmor/makeExpectedPolicies.nix b/nixos/tests/apparmor/makeExpectedPolicies.nix
index f8cf7a82860e..728005213173 100644
--- a/nixos/tests/apparmor/makeExpectedPolicies.nix
+++ b/nixos/tests/apparmor/makeExpectedPolicies.nix
@@ -1,75 +1,75 @@
 { pkgs }:
 ''
-  ixr ${pkgs.bashNonInteractive}/libexec/**,
-  mr ${pkgs.bashNonInteractive}/lib/**.so*,
-  mr ${pkgs.bashNonInteractive}/lib64/**.so*,
-  mr ${pkgs.bashNonInteractive}/share/**,
-  r ${pkgs.bashNonInteractive},
-  r ${pkgs.bashNonInteractive}/etc/**,
-  r ${pkgs.bashNonInteractive}/lib/**,
-  r ${pkgs.bashNonInteractive}/lib64/**,
-  x ${pkgs.bashNonInteractive}/foo/**,
-  ixr ${pkgs.glibc}/libexec/**,
-  mr ${pkgs.glibc}/lib/**.so*,
-  mr ${pkgs.glibc}/lib64/**.so*,
-  mr ${pkgs.glibc}/share/**,
-  r ${pkgs.glibc},
-  r ${pkgs.glibc}/etc/**,
-  r ${pkgs.glibc}/lib/**,
-  r ${pkgs.glibc}/lib64/**,
-  x ${pkgs.glibc}/foo/**,
-  ixr ${pkgs.libcap}/libexec/**,
-  mr ${pkgs.libcap}/lib/**.so*,
-  mr ${pkgs.libcap}/lib64/**.so*,
-  mr ${pkgs.libcap}/share/**,
-  r ${pkgs.libcap},
-  r ${pkgs.libcap}/etc/**,
-  r ${pkgs.libcap}/lib/**,
-  r ${pkgs.libcap}/lib64/**,
-  x ${pkgs.libcap}/foo/**,
-  ixr ${pkgs.libcap.lib}/libexec/**,
-  mr ${pkgs.libcap.lib}/lib/**.so*,
-  mr ${pkgs.libcap.lib}/lib64/**.so*,
-  mr ${pkgs.libcap.lib}/share/**,
-  r ${pkgs.libcap.lib},
-  r ${pkgs.libcap.lib}/etc/**,
-  r ${pkgs.libcap.lib}/lib/**,
-  r ${pkgs.libcap.lib}/lib64/**,
-  x ${pkgs.libcap.lib}/foo/**,
-  ixr ${pkgs.libidn2.out}/libexec/**,
-  mr ${pkgs.libidn2.out}/lib/**.so*,
-  mr ${pkgs.libidn2.out}/lib64/**.so*,
-  mr ${pkgs.libidn2.out}/share/**,
-  r ${pkgs.libidn2.out},
-  r ${pkgs.libidn2.out}/etc/**,
-  r ${pkgs.libidn2.out}/lib/**,
-  r ${pkgs.libidn2.out}/lib64/**,
-  x ${pkgs.libidn2.out}/foo/**,
-  ixr ${pkgs.libunistring}/libexec/**,
-  mr ${pkgs.libunistring}/lib/**.so*,
-  mr ${pkgs.libunistring}/lib64/**.so*,
-  mr ${pkgs.libunistring}/share/**,
-  r ${pkgs.libunistring},
-  r ${pkgs.libunistring}/etc/**,
-  r ${pkgs.libunistring}/lib/**,
-  r ${pkgs.libunistring}/lib64/**,
-  x ${pkgs.libunistring}/foo/**,
-  ixr ${pkgs.tzdata}/libexec/**,
-  mr ${pkgs.tzdata}/lib/**.so*,
-  mr ${pkgs.tzdata}/lib64/**.so*,
-  mr ${pkgs.tzdata}/share/**,
-  r ${pkgs.tzdata},
-  r ${pkgs.tzdata}/etc/**,
-  r ${pkgs.tzdata}/lib/**,
-  r ${pkgs.tzdata}/lib64/**,
-  x ${pkgs.tzdata}/foo/**,
-  ixr ${pkgs.glibc.libgcc}/libexec/**,
-  mr ${pkgs.glibc.libgcc}/lib/**.so*,
-  mr ${pkgs.glibc.libgcc}/lib64/**.so*,
-  mr ${pkgs.glibc.libgcc}/share/**,
-  r ${pkgs.glibc.libgcc},
-  r ${pkgs.glibc.libgcc}/etc/**,
-  r ${pkgs.glibc.libgcc}/lib/**,
-  r ${pkgs.glibc.libgcc}/lib64/**,
-  x ${pkgs.glibc.libgcc}/foo/**,
+  ${pkgs.bashNonInteractive} r,
+  ${pkgs.bashNonInteractive}/etc/** r,
+  ${pkgs.bashNonInteractive}/foo/** x,
+  ${pkgs.bashNonInteractive}/lib/** r,
+  ${pkgs.bashNonInteractive}/lib/**.so* mr,
+  ${pkgs.bashNonInteractive}/lib64/** r,
+  ${pkgs.bashNonInteractive}/lib64/**.so* mr,
+  ${pkgs.bashNonInteractive}/libexec/** ixr,
+  ${pkgs.bashNonInteractive}/share/** mr,
+  ${pkgs.glibc} r,
+  ${pkgs.glibc}/etc/** r,
+  ${pkgs.glibc}/foo/** x,
+  ${pkgs.glibc}/lib/** r,
+  ${pkgs.glibc}/lib/**.so* mr,
+  ${pkgs.glibc}/lib64/** r,
+  ${pkgs.glibc}/lib64/**.so* mr,
+  ${pkgs.glibc}/libexec/** ixr,
+  ${pkgs.glibc}/share/** mr,
+  ${pkgs.libcap} r,
+  ${pkgs.libcap}/etc/** r,
+  ${pkgs.libcap}/foo/** x,
+  ${pkgs.libcap}/lib/** r,
+  ${pkgs.libcap}/lib/**.so* mr,
+  ${pkgs.libcap}/lib64/** r,
+  ${pkgs.libcap}/lib64/**.so* mr,
+  ${pkgs.libcap}/libexec/** ixr,
+  ${pkgs.libcap}/share/** mr,
+  ${pkgs.libcap.lib} r,
+  ${pkgs.libcap.lib}/etc/** r,
+  ${pkgs.libcap.lib}/foo/** x,
+  ${pkgs.libcap.lib}/lib/** r,
+  ${pkgs.libcap.lib}/lib/**.so* mr,
+  ${pkgs.libcap.lib}/lib64/** r,
+  ${pkgs.libcap.lib}/lib64/**.so* mr,
+  ${pkgs.libcap.lib}/libexec/** ixr,
+  ${pkgs.libcap.lib}/share/** mr,
+  ${pkgs.libidn2.out} r,
+  ${pkgs.libidn2.out}/etc/** r,
+  ${pkgs.libidn2.out}/foo/** x,
+  ${pkgs.libidn2.out}/lib/** r,
+  ${pkgs.libidn2.out}/lib/**.so* mr,
+  ${pkgs.libidn2.out}/lib64/** r,
+  ${pkgs.libidn2.out}/lib64/**.so* mr,
+  ${pkgs.libidn2.out}/libexec/** ixr,
+  ${pkgs.libidn2.out}/share/** mr,
+  ${pkgs.libunistring} r,
+  ${pkgs.libunistring}/etc/** r,
+  ${pkgs.libunistring}/foo/** x,
+  ${pkgs.libunistring}/lib/** r,
+  ${pkgs.libunistring}/lib/**.so* mr,
+  ${pkgs.libunistring}/lib64/** r,
+  ${pkgs.libunistring}/lib64/**.so* mr,
+  ${pkgs.libunistring}/libexec/** ixr,
+  ${pkgs.libunistring}/share/** mr,
+  ${pkgs.tzdata} r,
+  ${pkgs.tzdata}/etc/** r,
+  ${pkgs.tzdata}/foo/** x,
+  ${pkgs.tzdata}/lib/** r,
+  ${pkgs.tzdata}/lib/**.so* mr,
+  ${pkgs.tzdata}/lib64/** r,
+  ${pkgs.tzdata}/lib64/**.so* mr,
+  ${pkgs.tzdata}/libexec/** ixr,
+  ${pkgs.tzdata}/share/** mr,
+  ${pkgs.glibc.libgcc} r,
+  ${pkgs.glibc.libgcc}/etc/** r,
+  ${pkgs.glibc.libgcc}/foo/** x,
+  ${pkgs.glibc.libgcc}/lib/** r,
+  ${pkgs.glibc.libgcc}/lib/**.so* mr,
+  ${pkgs.glibc.libgcc}/lib64/** r,
+  ${pkgs.glibc.libgcc}/lib64/**.so* mr,
+  ${pkgs.glibc.libgcc}/libexec/** ixr,
+  ${pkgs.glibc.libgcc}/share/** mr,
 ''

From 62a01a9ca20b7288cf0b14f27b48fa65ceebfd1e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:12 +0800
Subject: [PATCH 064/196] folder-color-switcher: 1.7.0 -> 1.7.1

https://github.com/linuxmint/folder-color-switcher/compare/c528788f05697d1e176df4f869d64bcebbab1528...856f6f27dfa48ee1ac8d7ec40333e3f892458067
---
 pkgs/by-name/fo/folder-color-switcher/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix
index d8615d606c93..3e5be59d577e 100644
--- a/pkgs/by-name/fo/folder-color-switcher/package.nix
+++ b/pkgs/by-name/fo/folder-color-switcher/package.nix
@@ -8,14 +8,14 @@
 
 stdenvNoCC.mkDerivation {
   pname = "folder-color-switcher";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "folder-color-switcher";
     # They don't really do tags, this is just a named commit.
-    rev = "c528788f05697d1e176df4f869d64bcebbab1528";
-    hash = "sha256-RSIiNjoU2Qk+0ACirUeo+VSfpjQ8NNJqmKKASD7RZXs=";
+    rev = "856f6f27dfa48ee1ac8d7ec40333e3f892458067";
+    hash = "sha256-nNH8/MIgVk7Y9YyGfN1jjdGJ4DruXu2Lg8+GjQnIggM=";
   };
 
   nativeBuildInputs = [

From 9933d7aaa101956ad46e859006540b4a9fb0d3c8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:19 +0800
Subject: [PATCH 065/196] pix: 3.4.9 -> 3.4.10

https://github.com/linuxmint/pix/compare/3.4.9...3.4.10
---
 pkgs/by-name/pi/pix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix
index 6df3eac91ba1..0aed654cba65 100644
--- a/pkgs/by-name/pi/pix/package.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pix";
-  version = "3.4.9";
+  version = "3.4.10";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "pix";
     rev = version;
-    hash = "sha256-cuNggVsNNqACWttPy1Tt8MfPFQKiuYhaMnh8TTHCi74=";
+    hash = "sha256-IrRE2Bv2+DZMLI48at7npcAd3TSJRuZNzU/YbNK8x3k=";
   };
 
   nativeBuildInputs = [

From 22c45e6b1926cc99f95882de7d9a3bcbc0d64fef Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:20 +0800
Subject: [PATCH 066/196] warpinator: 2.0.2 -> 2.0.3

https://github.com/linuxmint/warpinator/compare/2.0.2...2.0.3
---
 pkgs/by-name/wa/warpinator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix
index 6a17ab535df4..f1c6c1ad31af 100644
--- a/pkgs/by-name/wa/warpinator/package.nix
+++ b/pkgs/by-name/wa/warpinator/package.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "warpinator";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "warpinator";
     rev = version;
-    hash = "sha256-bVK60fSIWp02qrKCJ68awyPcZhMTW5bjRPI7YHmmScc=";
+    hash = "sha256-3ZkufMZFTn8BQO9DHr3s9ELRuDrTflE4Ym73dO7rrKs=";
   };
 
   nativeBuildInputs = [

From 0bbbc3c75b45ca69f24e30b34dc507a163350132 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:21 +0800
Subject: [PATCH 067/196] xapp: 3.2.1 -> 3.2.2

https://github.com/linuxmint/xapp/compare/3.2.1...3.2.2
---
 pkgs/by-name/xa/xapp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index 519068b0d9af..e941332d231a 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation rec {
   pname = "xapp";
-  version = "3.2.1";
+  version = "3.2.2";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = "xapp";
     rev = version;
-    hash = "sha256-Uc3vMcWVzT0N9FCDxxI2e4yk1fg6FJiC7XXpY80mV0c=";
+    hash = "sha256-xVGIrK7koqX6xKoanVHWQMBUusUjtvHzQg2OV0E0b78=";
   };
 
   # Recommended by upstream, which enables the build of xapp-debug.

From a5ba45cc230d56b0a29630cbd13b553065c3251b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:22 +0800
Subject: [PATCH 068/196] xreader: 4.6.2 -> 4.6.3

https://github.com/linuxmint/xreader/compare/4.6.2...4.6.3
---
 pkgs/by-name/xr/xreader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix
index a272bee3cb38..d497b6edb27a 100644
--- a/pkgs/by-name/xr/xreader/package.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xreader";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xreader";
     rev = version;
-    hash = "sha256-LUpP4gBxe5kxH3OdCFWPx3APMqVMfJy/r3FGHrGxPqI=";
+    hash = "sha256-lVJFNOiayAai/Lg4tl8lNaK5fdTlZ0ptzstUzciH1mA=";
   };
 
   nativeBuildInputs = [

From 8efb30374bc6ba7da47f89e4042de449a357e66c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:24 +0800
Subject: [PATCH 069/196] hypnotix: 5.5 -> 5.6

https://github.com/linuxmint/hypnotix/compare/5.5...5.6
---
 pkgs/by-name/hy/hypnotix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix
index f97936c52d1c..19f11b1d33eb 100644
--- a/pkgs/by-name/hy/hypnotix/package.nix
+++ b/pkgs/by-name/hy/hypnotix/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hypnotix";
-  version = "5.5";
+  version = "5.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "hypnotix";
     tag = version;
-    hash = "sha256-/bFqPar/Ey48e+KG1EN0IuTF4HX+2jeMcFkqcEcOKMs=";
+    hash = "sha256-7CPrRMoVM1FaU8aJlnZigTkHa97bDPdwcu4JY7sERJQ=";
   };
 
   patches = [

From 286dedeb7c8d5647c82d2d7f4deb2b256a6df4da Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:25 +0800
Subject: [PATCH 070/196] sticky: 1.29 -> 1.30

https://github.com/linuxmint/sticky/compare/1.29...1.30
---
 pkgs/by-name/st/sticky/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix
index 3fdc81033520..ba70b3e3b905 100644
--- a/pkgs/by-name/st/sticky/package.nix
+++ b/pkgs/by-name/st/sticky/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sticky";
-  version = "1.29";
+  version = "1.30";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "sticky";
     rev = version;
-    hash = "sha256-5KDjvohmdw8j5G8V+uFXPzRSRo/C2HgeRodWfguQjYg=";
+    hash = "sha256-8Y6PoQQHS8h1AT+4DMbExd9y7ScDMig0M9BJQjq09Uc=";
   };
 
   postPatch = ''

From 1f920790577b3aa781ff9ae1f4b1a527e2511115 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:26 +0800
Subject: [PATCH 071/196] timeshift: 25.12.3 -> 25.12.4

https://github.com/linuxmint/timeshift/compare/25.12.3...25.12.4
---
 pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index b945e0929765..4d7b535eb8ae 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "timeshift";
-  version = "25.12.3";
+  version = "25.12.4";
   outputs = [
     "out"
     "man"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linuxmint";
     repo = "timeshift";
     tag = finalAttrs.version;
-    hash = "sha256-yrPeaGdt32bmP8lV+eYZb2H3OmVl3G5AH7eeGZ3LM3k=";
+    hash = "sha256-4iK9RngcqwR0sYo9AXcTwEQ1eoPQPbAmwM5k/rcgU9s=";
   };
 
   postPatch = ''

From 5d63813078155d2353acb9aff7a1f5ea2a6fbcec Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 9 Jan 2026 21:13:27 +0800
Subject: [PATCH 072/196] xed-editor: 3.8.8 -> 3.8.9

https://github.com/linuxmint/xed/compare/3.8.8...3.8.9
---
 pkgs/by-name/xe/xed-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix
index 9592ae997bca..708b89454fe6 100644
--- a/pkgs/by-name/xe/xed-editor/package.nix
+++ b/pkgs/by-name/xe/xed-editor/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xed-editor";
-  version = "3.8.8";
+  version = "3.8.9";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xed";
     rev = version;
-    hash = "sha256-BbakdZwigC/im9Il5sCeRF0SJuLCPtqe7/mcYmPcCRI=";
+    hash = "sha256-ZTrTCyyyUDbt+/kjb1+I/bOjwXcsYGYd5K9ebPjJTA8=";
   };
 
   patches = [

From e896953e7df3211402a98e70f3894c093303e82a Mon Sep 17 00:00:00 2001
From: Tom Vincent <git@tlvince.com>
Date: Fri, 9 Jan 2026 14:32:30 +0000
Subject: [PATCH 073/196] immich-kiosk: 0.28.1 -> 0.30.1

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

diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix
index 607cbcec951b..cbc5dae1d2b3 100644
--- a/pkgs/by-name/im/immich-kiosk/package.nix
+++ b/pkgs/by-name/im/immich-kiosk/package.nix
@@ -9,20 +9,21 @@
 }:
 buildGoModule rec {
   pname = "immich-kiosk";
-  version = "0.28.1";
+  version = "0.30.1";
 
   src = fetchFromGitHub {
     owner = "damongolding";
     repo = "immich-kiosk";
     tag = "v${version}";
-    hash = "sha256-9ZKjhCmOL2fjGOjdzgVG7/aq6SdBJCG/+bFrlHdkll4=";
+    hash = "sha256-EuCRYLpfAFstoADPyC0d7CHcJgzwTx2iiRcQdbjuUD8=";
   };
 
   # Delete vendor directory to regenerate it consistently across platforms
   postPatch = ''
     rm -rf vendor
   '';
-  vendorHash = "sha256-5y//CdHgQjNJayNI/jzdD5WPa4XlIxMonqkPc/kJp8c=";
+  vendorHash = "sha256-XZ49wYC+oUqEL0HXeqdRQAI2Y4zJAMgfqL/+6RrBWos=";
+  proxyVendor = true;
 
   pnpmDeps = fetchPnpmDeps {
     inherit
@@ -32,7 +33,7 @@ buildGoModule rec {
       ;
     pnpm = pnpm_9;
     sourceRoot = "${src.name}/frontend";
-    hash = "sha256-FThVaNUUE3QCbq0iPRCet4SnlHCCQaw3N5PThKSM1ek=";
+    hash = "sha256-ELIbM+tWOGntv8XmNvRZ/Q2iSRq0g9Kv5LnkwLPisPM=";
     fetcherVersion = 2;
   };
 

From d10e38cb1b07f9ca810d6979a65d6bf192633410 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Fri, 9 Jan 2026 14:52:06 +0000
Subject: [PATCH 074/196] notepad-next: fixed GCC15 build

---
 pkgs/by-name/no/notepad-next/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/no/notepad-next/package.nix b/pkgs/by-name/no/notepad-next/package.nix
index 32760a7495cf..036a8a015c1b 100644
--- a/pkgs/by-name/no/notepad-next/package.nix
+++ b/pkgs/by-name/no/notepad-next/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [ qt5.qtx11extras ];
 
+  # Fix build with GCC 14+: Scintilla needs cstdint for intptr_t/uintptr_t types
+  # https://github.com/dail8859/NotepadNext/issues/752
+  postPatch = ''
+    sed -i '1i #include <cstdint>' src/scintilla/include/ScintillaTypes.h
+  '';
+
   qmakeFlags = [
     "PREFIX=${placeholder "out"}"
     "src/NotepadNext.pro"

From 6b36e4ea9002e1cd3a19235c25b6fa871c4cdc00 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 12 Dec 2025 13:16:48 +0100
Subject: [PATCH 075/196] perl: add comments for patches

Describes all patches we apply to perl, to help with readability of the
derivation and comply with the style guide.
---
 .../interpreters/perl/interpreter.nix         | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index 4f3036dfb5c5..428009e6b900 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -34,10 +34,49 @@ assert (enableCrypt -> (libxcrypt != null));
 let
   crossCompiling = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
   commonPatches = [
+    # Do not look in /usr etc. for dependencies.
     ./no-sys-dirs.patch
   ]
+
+  # Fix build on Solaris on x86_64
+  # See also:
+  # * perl tracker: https://github.com/Perl/perl5/issues/9669
+  # * netbsd tracker: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=44999
   ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch
+
+  # Don't pass -no-cpp-precomp, even if it is "supported"
+  #
+  # cpp-precomp is a relic from NeXT days, when there was a separate
+  # cpp preprocessor that produced "precompiled header files" (hence
+  # cpp-precomp) - binary files containing information from .h files, that
+  # sped up the compilation slightly.
+  #
+  # However, cpp-precomp was semi-broken and didn't accept a lot of valid
+  # code, so there was a way to disable it (-no-cpp-precomp).
+  #
+  # This flag seems to have lost all relevance back in 2002 or so, when
+  # cpp-precomp stopped being used; gcc dropped it completely in 4.8 (and
+  # now errors out if you pass it), but for some reason clang still accepts
+  # it (but it's a no-op). This means that if you compile perl with clang,
+  # it will think that this flag is still supported, and it can cause issues
+  # if you compile c code from perl:
+  # https://trac.macports.org/ticket/38913
+  #
+  # More info about -no-cpp-precomp: https://www.mistys-internet.website/blog/blog/2013/10/19/no-cpp-precomp-the-compiler-flag-that-time-forgot
+  #
+  # See also: https://github.com/NixOS/nixpkgs/pull/1160
   ++ lib.optional stdenv.hostPlatform.isDarwin ./cpp-precomp.patch
+
+  # Miniperl is a "bootstrap" perl which doesn't support dynamic loading, among other things.
+  # It is used to build modules for the "final" perl.
+  #
+  # This patch enables more modules to be loaded with miniperl (mostly by
+  # removing dynamically loaded libraries and using perl builtins instead),
+  # which is needed during cross-compilation because the bootstrapping process
+  # has more stages than the default build and doesn't get to the main perl
+  # binary as early.
+  #
+  # Some more details: https://arsv.github.io/perl-cross/modules.html
   ++ lib.optional crossCompiling ./cross.patch;
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";

From 7785911a83335286b8099ae21af388957d994181 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 16:28:09 +0000
Subject: [PATCH 076/196] mirrord: 3.179.0 -> 3.180.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 2d5c79932518..6be5b07cd1fd 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.179.0",
+  "version": "3.180.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_x86_64",
-      "hash": "sha256-VStFqwOut1VnspK7963VvR5tnEEmASiWxHj8riiPUCg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_x86_64",
+      "hash": "sha256-hpmuMhN2HS+4zPlTOh87A1UQvlxVKlzqHKKDm1VBLhg="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_aarch64",
-      "hash": "sha256-mK+b3oCCZ098MMYQtRoXo1BuAlxz+4rtdB7EN1vDO38="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_aarch64",
+      "hash": "sha256-dGe0r7ckuKkMzVkGyWaYR2PVkDtGRRhC3ievXzKs5dU="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
-      "hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal",
+      "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
-      "hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal",
+      "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw="
     }
   }
 }

From 4458925b0f1aab5c5d5da39686453ddcc07b79ac Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 9 Jan 2026 10:59:41 -0600
Subject: [PATCH 077/196] hyprland: add hyprland-uwsm to
 passthru.providedSessions

Fix issue with displayManager `defaultSession` not accepting the string
since it's missing from the lookup it does with
`passthru.providedSessions`.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/hy/hyprland/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 6a2356b951d2..6fb149c7fb6f 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -214,7 +214,7 @@ customStdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    providedSessions = [ "hyprland" ];
+    providedSessions = [ "hyprland" ] ++ optionals withSystemd [ "hyprland-uwsm" ];
     updateScript = ./update.sh;
   };
 

From 4df5e91bc6fc0fcbd8e6f1e8b7c8769d7eebb41a Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack@wilsdon.me>
Date: Fri, 9 Jan 2026 17:26:39 +0000
Subject: [PATCH 078/196] libedgetpu: fix building with GCC 15

---
 pkgs/by-name/li/libedgetpu/cstdint.patch | 13 +++++++++++++
 pkgs/by-name/li/libedgetpu/package.nix   |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/by-name/li/libedgetpu/cstdint.patch

diff --git a/pkgs/by-name/li/libedgetpu/cstdint.patch b/pkgs/by-name/li/libedgetpu/cstdint.patch
new file mode 100644
index 000000000000..a27eb2ba1125
--- /dev/null
+++ b/pkgs/by-name/li/libedgetpu/cstdint.patch
@@ -0,0 +1,13 @@
+diff --git a/driver/usb/usb_device_interface.h b/driver/usb/usb_device_interface.h
+index 238bca9..54f2f6e 100644
+--- a/driver/usb/usb_device_interface.h
++++ b/driver/usb/usb_device_interface.h
+@@ -15,6 +15,8 @@
+ #ifndef DARWINN_DRIVER_USB_USB_DEVICE_INTERFACE_H_
+ #define DARWINN_DRIVER_USB_USB_DEVICE_INTERFACE_H_
+ 
++#include <cstdint>
++
+ #include "port/array_slice.h"
+ #include "port/integral_types.h"
+ #include "port/status.h"
diff --git a/pkgs/by-name/li/libedgetpu/package.nix b/pkgs/by-name/li/libedgetpu/package.nix
index ef4e2368ea42..fc5911ffb120 100644
--- a/pkgs/by-name/li/libedgetpu/package.nix
+++ b/pkgs/by-name/li/libedgetpu/package.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
       hash = "sha256-mMODpQmikfXtsQvtgh26cy97EiykYNLngSjidOBt/3I=";
     })
     ./fix-abseil-20250512.0.patch
+    ./cstdint.patch
   ];
 
   postPatch = ''

From 70660943478844e3e1f72069350de73d31a6d29a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 9 Jan 2026 19:14:56 +0100
Subject: [PATCH 079/196] wrapWithXFileSearchPathHook: move to top-level from
 xorg:

---
 .../wrapWithXFileSearchPathHook/package.nix   | 28 ++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             |  2 ++
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 ++
 pkgs/servers/x11/xorg/overrides.nix           | 29 -------------------
 4 files changed, 32 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix

diff --git a/pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix b/pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix
new file mode 100644
index 000000000000..aaf2c326aa05
--- /dev/null
+++ b/pkgs/by-name/wr/wrapWithXFileSearchPathHook/package.nix
@@ -0,0 +1,28 @@
+{
+  makeBinaryWrapper,
+  makeSetupHook,
+  writeScript,
+  xbitmaps,
+}:
+
+makeSetupHook
+  {
+    name = "wrapWithXFileSearchPathHook";
+    propagatedBuildInputs = [ makeBinaryWrapper ];
+  }
+  (
+    writeScript "wrapWithXFileSearchPathHook.sh" ''
+      wrapWithXFileSearchPath() {
+        paths=(
+          "$out/share/X11/%T/%N"
+          "$out/include/X11/%T/%N"
+          "${xbitmaps}/include/X11/%T/%N"
+        )
+        for exe in $out/bin/*; do
+          wrapProgram "$exe" \
+            --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
+        done
+      }
+      postInstallHooks+=(wrapWithXFileSearchPath)
+    ''
+  )
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 79141d56bf1e..761789bdd4eb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -110,6 +110,7 @@
   transset,
   util-macros,
   viewres,
+  wrapWithXFileSearchPathHook,
   x11perf,
   xauth,
   xbacklight,
@@ -199,6 +200,7 @@ self: with self; {
     smproxy
     transset
     viewres
+    wrapWithXFileSearchPathHook
     x11perf
     xauth
     xbacklight
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9c2c32c17c80..48145068c566 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -442,6 +442,7 @@ print OUT <<EOF;
   transset,
   util-macros,
   viewres,
+  wrapWithXFileSearchPathHook,
   x11perf,
   xauth,
   xbacklight,
@@ -531,6 +532,7 @@ self: with self; {
     smproxy
     transset
     viewres
+    wrapWithXFileSearchPathHook
     x11perf
     xauth
     xbacklight
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f09cbb0b800f..ac5fed739bcf 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -80,35 +80,6 @@ let
 in
 self: super:
 {
-  wrapWithXFileSearchPathHook = callPackage (
-    {
-      makeBinaryWrapper,
-      makeSetupHook,
-      writeScript,
-    }:
-    makeSetupHook
-      {
-        name = "wrapWithXFileSearchPathHook";
-        propagatedBuildInputs = [ makeBinaryWrapper ];
-      }
-      (
-        writeScript "wrapWithXFileSearchPathHook.sh" ''
-          wrapWithXFileSearchPath() {
-            paths=(
-              "$out/share/X11/%T/%N"
-              "$out/include/X11/%T/%N"
-              "${xorg.xbitmaps}/include/X11/%T/%N"
-            )
-            for exe in $out/bin/*; do
-              wrapProgram "$exe" \
-                --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
-            done
-          }
-          postInstallHooks+=(wrapWithXFileSearchPath)
-        ''
-      )
-  ) { };
-
   mkfontdir = xorg.mkfontscale;
 
   xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {

From 542b162fcc003ee35f51ee35b0d3957aa2692d3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 19:15:24 +0000
Subject: [PATCH 080/196] mpvScripts.mpris: 1.1 -> 1.2

---
 pkgs/by-name/mp/mpv/scripts/mpris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mp/mpv/scripts/mpris.nix b/pkgs/by-name/mp/mpv/scripts/mpris.nix
index 7d488c7e66fd..a2a661fed9cc 100644
--- a/pkgs/by-name/mp/mpv/scripts/mpris.nix
+++ b/pkgs/by-name/mp/mpv/scripts/mpris.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mpv-mpris";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "hoyon";
     repo = "mpv-mpris";
     rev = version;
-    hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=";
+    hash = "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4=";
   };
   passthru.updateScript = gitUpdater { };
 

From 268aaf34feef97e43b23f10ae3cc4694460db13a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 20:54:11 +0100
Subject: [PATCH 081/196] python313Packages.pyoverkiz: 1.19.3 -> 1.19.4

Diff: https://github.com/iMicknl/python-overkiz-api/compare/v1.19.3...v1.19.4

Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.19.4
---
 pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index fff97993a3e4..8adee2944f84 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.19.3";
+  version = "1.19.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${version}";
-    hash = "sha256-h7PGtcpBcYGlqdi4grbz7KG65zZO3x8Hf/J7n271sDs=";
+    hash = "sha256-8MU+FH6fpQREpJ0x4OXh4BIlBtWEW+fL+oQCipTk4zg=";
   };
 
   build-system = [ hatchling ];

From effff33a593742c3bef1995074e36f24bb8a041c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 20:55:25 +0100
Subject: [PATCH 082/196] python313Packages.pyswitchbot: 0.75.0 -> 0.76.0

Diff: https://github.com/Danielhiversen/pySwitchbot/compare/0.75.0...0.76.0

Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.76.0
---
 pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 4c3cb9c39068..33e3afed019c 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.75.0";
+  version = "0.76.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-fC5DVY3nGFJQg2uDfXqWjIgzr+pKLzt8mvX2azWCopM=";
+    hash = "sha256-t5ij86Nq5BQONizKRFPeNyleFo7n4RD9pEglLPhS+Gk=";
   };
 
   build-system = [ setuptools ];

From 16d4a771d95371f1e8dac34b1bbb57889ae39b63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 20:56:59 +0100
Subject: [PATCH 083/196] python313Packages.opower: 0.16.0 -> 0.16.1

Diff: https://github.com/tronikos/opower/compare/v0.16.0...v0.16.1

Changelog: https://github.com/tronikos/opower/releases/tag/v0.16.1
---
 pkgs/development/python-modules/opower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index fc3a5542c1f6..3db927745be7 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.16.0";
+  version = "0.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-UtIb0gSv3hyRDU2ZixSnfxU0eU80tkxsQJgOhnNk65Y=";
+    hash = "sha256-+Jpse32N1D697jQnutEPvdcL/AmE0ntO1IGyG3qHN1w=";
   };
 
   build-system = [ setuptools ];

From 71fb0df1853474f55defe58f08e7254d69cf9fb3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 20:58:05 +0100
Subject: [PATCH 084/196] python313Packages.pynintendoparental: 2.3.0 -> 2.3.2

Diff: https://github.com/pantherale0/pynintendoparental/compare/2.3.0...2.3.2

Changelog: https://github.com/pantherale0/pynintendoparental/releases/tag/2.3.2
---
 .../development/python-modules/pynintendoparental/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
index d9a9b7499464..57f0466950b5 100644
--- a/pkgs/development/python-modules/pynintendoparental/default.nix
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pynintendoparental";
-  version = "2.3.0";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pynintendoparental";
     tag = version;
-    hash = "sha256-gq81cdI/HegNs1llQkC4GbEzHzvEs6f4MrBtIK/G2SE=";
+    hash = "sha256-jF1hoGNDwbbacJuLiFAdtaXOykzioUt++RQrYO1skkA=";
   };
 
   postPatch = ''

From 462fd144dbd01089fdc3132fbac88b633af41050 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 20:59:45 +0100
Subject: [PATCH 085/196] python313Packages.ruuvitag-ble: 0.3.0 -> 0.4.0

Diff: https://github.com/Bluetooth-Devices/ruuvitag-ble/compare/v0.3.0...v0.4.0

Changelog: https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/v0.4.0
---
 pkgs/development/python-modules/ruuvitag-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix
index 22d199c71f94..f6002a060cca 100644
--- a/pkgs/development/python-modules/ruuvitag-ble/default.nix
+++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "ruuvitag-ble";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "ruuvitag-ble";
     tag = "v${version}";
-    hash = "sha256-5hlO2/YCTc65ImwjJVyWhFe2PTPlQ33aNdqEIxH/lms=";
+    hash = "sha256-/xtNT36s7vdU0+1QFW2Of6v3OIQ9e6ZA9K3t9rPw5o8=";
   };
 
   build-system = [ hatchling ];

From 3b72253f2256bd223b3bfb9a51d5acdb974cb9ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:08:34 +0100
Subject: [PATCH 086/196] python313Packages.python-otbr-api: 2.7.0 -> 2.7.1

Diff: https://github.com/home-assistant-libs/python-otbr-api/compare/2.7.0...2.7.1

Changelog: https://github.com/home-assistant-libs/python-otbr-api/releases/tag/2.7.1
---
 pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix
index c188a00692b2..09ca4af1c4b9 100644
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-otbr-api";
-  version = "2.7.0";
+  version = "2.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "python-otbr-api";
     tag = version;
-    hash = "sha256-irQ4QvpGIAYYKq0UqLuo7Nrnde905+GJFd4HkxsCDmQ=";
+    hash = "sha256-hFWFi64mRJL5487N6Xm6EQVVaYEzsdg9P2QZYEn758k=";
   };
 
   build-system = [ setuptools ];

From 6b0f2eda3b579b2158d347bc3e35e7a434eed216 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:16:50 +0100
Subject: [PATCH 087/196] python313Packages.pynintendoparental: migrate to
 finalAttrs

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

diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
index 57f0466950b5..998613d17b42 100644
--- a/pkgs/development/python-modules/pynintendoparental/default.nix
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -7,7 +7,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pynintendoparental";
   version = "2.3.2";
   pyproject = true;
@@ -15,13 +15,13 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pynintendoparental";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-jF1hoGNDwbbacJuLiFAdtaXOykzioUt++RQrYO1skkA=";
   };
 
   postPatch = ''
     substituteInPlace pynintendoparental/_version.py \
-      --replace-fail '__version__ = "0.0.0"' '__version__ = "${version}"'
+      --replace-fail '__version__ = "0.0.0"' '__version__ = "${finalAttrs.version}"'
   '';
 
   build-system = [ setuptools ];
@@ -37,10 +37,10 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/pantherale0/pynintendoparental/releases/tag/${src.tag}";
+    changelog = "https://github.com/pantherale0/pynintendoparental/releases/tag/${finalAttrs.src.tag}";
     description = "Python module to interact with Nintendo Parental Controls";
     homepage = "https://github.com/pantherale0/pynintendoparental";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.dotlambda ];
   };
-}
+})

From 22f6ab5de632cbfab6a7c243b3fee6f6a0f45e5c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:17:35 +0100
Subject: [PATCH 088/196] python313Packages.ruuvitag-ble: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix
index f6002a060cca..07f8ce15efa4 100644
--- a/pkgs/development/python-modules/ruuvitag-ble/default.nix
+++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix
@@ -11,7 +11,7 @@
   sensor-state-data,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ruuvitag-ble";
   version = "0.4.0";
   pyproject = true;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "ruuvitag-ble";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/xtNT36s7vdU0+1QFW2Of6v3OIQ9e6ZA9K3t9rPw5o8=";
   };
 
@@ -40,10 +40,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "ruuvitag_ble" ];
 
   meta = {
-    changelog = "https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/${src.tag}";
     description = "Library for Ruuvitag BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble";
+    changelog = "https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 74b384e03ea8ae9bb0b1e28905fc08eaf325f49b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:18:28 +0100
Subject: [PATCH 089/196] python313Packages.opower: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 3db927745be7..dbdb3cf9df5a 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -13,7 +13,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "opower";
   version = "0.16.1";
   pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+Jpse32N1D697jQnutEPvdcL/AmE0ntO1IGyG3qHN1w=";
   };
 
@@ -56,8 +56,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module for getting historical and forecasted usage/cost from utilities that use opower.com";
     homepage = "https://github.com/tronikos/opower";
-    changelog = "https://github.com/tronikos/opower/releases/tag/${src.tag}";
+    changelog = "https://github.com/tronikos/opower/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 523ef544ded18c694f662ba0d9aa88e2de0f8ebf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:20:17 +0100
Subject: [PATCH 090/196] python313Packages.pyswitchbot: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 33e3afed019c..c913bec5c7ca 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -12,7 +12,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyswitchbot";
   version = "0.76.0";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-t5ij86Nq5BQONizKRFPeNyleFo7n4RD9pEglLPhS+Gk=";
   };
 
@@ -44,9 +44,9 @@ buildPythonPackage rec {
   meta = {
     description = "Python library to control Switchbot IoT devices";
     homepage = "https://github.com/Danielhiversen/pySwitchbot";
-    changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${src.tag}";
+    changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 0bc95ac543019ca36e1f9deec361c1bdd4ce0dcc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:21:00 +0100
Subject: [PATCH 091/196] python313Packages.pyoverkiz: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 8adee2944f84..574634b810b3 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -13,7 +13,7 @@
   warrant-lite,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyoverkiz";
   version = "1.19.4";
   pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iMicknl";
     repo = "python-overkiz-api";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8MU+FH6fpQREpJ0x4OXh4BIlBtWEW+fL+oQCipTk4zg=";
   };
 
@@ -46,8 +46,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs";
     homepage = "https://github.com/iMicknl/python-overkiz-api";
-    changelog = "https://github.com/iMicknl/python-overkiz-api/releases/tag/${src.tag}";
+    changelog = "https://github.com/iMicknl/python-overkiz-api/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 8c391de8f9627623adb7e9b125050bade3dcfffe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:23:37 +0100
Subject: [PATCH 092/196] python313Packages.python-otbr-api: migrate to
 finalAttrs

---
 .../python-modules/python-otbr-api/default.nix        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix
index 09ca4af1c4b9..82d570be73a5 100644
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@@ -7,23 +7,20 @@
   fetchFromGitHub,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   typing-extensions,
   voluptuous,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-otbr-api";
   version = "2.7.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-otbr-api";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-hFWFi64mRJL5487N6Xm6EQVVaYEzsdg9P2QZYEn758k=";
   };
 
@@ -47,8 +44,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library for the Open Thread Border Router";
     homepage = "https://github.com/home-assistant-libs/python-otbr-api";
-    changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${version}";
+    changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From b0abf9504d6e7afcb65dd4d94ecad6f83c8ffa2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 20:36:28 +0000
Subject: [PATCH 093/196] diffnav: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix
index d109a82aa770..a1164095862b 100644
--- a/pkgs/by-name/di/diffnav/package.nix
+++ b/pkgs/by-name/di/diffnav/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "diffnav";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "diffnav";
     rev = "refs/tags/v${version}";
-    hash = "sha256-admPiEKyatdUkR89vZP8RYHTqtZVSJ8KSvtpnsBViBw=";
+    hash = "sha256-uaEqnlA34EagOjmnK2U9+vOIIRupSDrSd4hrM1jaNlM=";
   };
 
-  vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";
+  vendorHash = "sha256-cDA5qstTRApt4DXcakNLR5nsyh9i7z2Qrvp6q/OoYhY=";
 
   ldflags = [
     "-s"

From 33f713ccc16e473ddf89cf2d50fef8dfe1938d07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 20:45:57 +0000
Subject: [PATCH 094/196] all-the-package-names: 2.0.2315 -> 2.0.2321

---
 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 bb24fc97bcbf..7724e840b9c5 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.2315";
+  version = "2.0.2321";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-kVTwrxvNBRVuovgnfjBktgBXgP9tYfl+ivYyS10bPdM=";
+    hash = "sha256-wkgVhmzfI15GFZ1YDI0MYGdfFIzyfd3ob949kyWA8N4=";
   };
 
-  npmDepsHash = "sha256-iizozowyq1mVJWLKIC8EPoRX4c1YdyVVWuhLtadNDYI=";
+  npmDepsHash = "sha256-mikgLEfjusRvmOMjdeENRtC+Vi+yV9zwBIqu3IbLY8A=";
 
   passthru.updateScript = nix-update-script { };
 

From 3ef5c763318233428c2159ede3e650717d90b05d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:46:25 +0100
Subject: [PATCH 095/196] python313Packages.mitogen: 0.3.36 -> 0.3.37

Diff: https://github.com/mitogen-hq/mitogen/compare/v0.3.36...v0.3.37

Changelog: https://github.com/mitogen-hq/mitogen/blob/v0.3.37/docs/changelog.rst
---
 pkgs/development/python-modules/mitogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 16458648a37e..1aa542c167c8 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.36";
+  version = "0.3.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${version}";
-    hash = "sha256-bs00ibMHAhH9oIEoRndX3AMOHwayY5atS5Hi6mJGGJ4=";
+    hash = "sha256-LN4vm3VWt2pm0wljSgGxqH61B3RTsNDyA1SCnZqyoSo=";
   };
 
   build-system = [ setuptools ];

From 29b7f6ffe9508c34333c358a5608b1215011e9df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:53:09 +0100
Subject: [PATCH 096/196] python313Packages.rns: 1.1.0 -> 1.1.2

Diff: https://github.com/markqvist/Reticulum/compare/1.1.0...1.1.2

Changelog: https://github.com/markqvist/Reticulum/blob/1.1.2/Changelog.md
---
 pkgs/development/python-modules/rns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 5343363b44c2..ee2345f8691b 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "1.1.0";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = version;
-    hash = "sha256-aoKiTdv5r3Z20D6znFLVf/8C4WpDBjKKnaYJQ8zaGVI=";
+    hash = "sha256-KX6g9RGPHg3W/gzVaVoPBMpmPQs2jEJaDFDlA6D9Ql8=";
   };
 
   patches = [

From e032ec65727e877dbef034b2dc6b87707cc5c29a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:53:19 +0100
Subject: [PATCH 097/196] python313Packages.lxmf: 0.9.3 -> 0.9.4

Diff: https://github.com/markqvist/lxmf/compare/0.9.3...0.9.4

Changelog: https://github.com/markqvist/LXMF/releases/tag/0.9.4
---
 pkgs/development/python-modules/lxmf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index c8fd74940661..85a53100ab1c 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.9.3";
+  version = "0.9.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "lxmf";
     tag = version;
-    hash = "sha256-bPRoKJGMy+JAyhKcRXKR3Jra5K1UAjRMg0lMt2lOvzA=";
+    hash = "sha256-WeEGwdbW2hmN7sdMl8tR5pmaXGqRb6y5Zb536ty3eiY=";
   };
 
   build-system = [ setuptools ];

From 7c47dd4ce8ea7c09ef6374fa30a674cb56904344 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 21:53:29 +0100
Subject: [PATCH 098/196] python313Packages.nomadnet: 0.9.1 -> 0.9.7

Diff: https://github.com/markqvist/NomadNet/compare/0.9.1...0.9.7

Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.9.7
---
 pkgs/development/python-modules/nomadnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 45b4b62d451d..f700195fe336 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "nomadnet";
-  version = "0.9.1";
+  version = "0.9.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "NomadNet";
     tag = version;
-    hash = "sha256-Rqs0x5KF3Nb/VMNBr6IriDWX7th4OrBj3x5tQhUIU3U=";
+    hash = "sha256-IDEbyvTX5PLPqDQ8gj5UwNkGCn+5wJx2xkYJ8BIWmWI=";
   };
 
   build-system = [ setuptools ];

From e82ec074f7efaa337cfbd6ab5c361b776eca220f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 20:53:58 +0000
Subject: [PATCH 099/196] algia: 0.0.97 -> 0.0.98

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

diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
index 03fcd2003b30..1b70f222850d 100644
--- a/pkgs/by-name/al/algia/package.nix
+++ b/pkgs/by-name/al/algia/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "algia";
-  version = "0.0.97";
+  version = "0.0.98";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "algia";
     tag = "v${version}";
-    hash = "sha256-vja/l0zLoqTDog32YvkSya4wnMCNj/H93xzwipP2msQ=";
+    hash = "sha256-Xd0WhXvEPt1VLIdsswk91hTb2UK6ikqhKMR3l/D0/jk=";
   };
 
   vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";

From 0104baf7b82ec1e8683c400601db9d081f7c8208 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 22:11:07 +0100
Subject: [PATCH 100/196] python313Packages.mitogen: modernize

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

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 1aa542c167c8..023d3ba1db08 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -5,7 +5,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mitogen";
   version = "0.3.37";
   pyproject = true;
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mitogen-hq";
     repo = "mitogen";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LN4vm3VWt2pm0wljSgGxqH61B3RTsNDyA1SCnZqyoSo=";
   };
 
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python Library for writing distributed self-replicating programs";
     homepage = "https://github.com/mitogen-hq/mitogen";
-    changelog = "https://github.com/mitogen-hq/mitogen/blob/${src.tag}/docs/changelog.rst";
+    changelog = "https://github.com/mitogen-hq/mitogen/blob/${finalAttrs.src.tag}/docs/changelog.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From c86eb074134131132388f0d447bfd46b427ef0a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 21:15:17 +0000
Subject: [PATCH 101/196] python3Packages.publicsuffixlist: 1.0.2.20260108 ->
 1.0.2.20260109

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

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 78ef71f85f3b..daf639a145e4 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260108";
+  version = "1.0.2.20260109";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Jrm70tRfc8kRf4K7+81yGFxBqfl0uyVaYLTNaE5kEQw=";
+    hash = "sha256-3fS1KZvzGyiYkt4GsYZ4zElGoazRiIeBTDuNbNQFjhk=";
   };
 
   postPatch = ''

From 5b2d6f4991f6f46cc4fb42b019075867b8676dc7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 22:31:53 +0100
Subject: [PATCH 102/196] python313Packages.rns: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index ee2345f8691b..696144d28392 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -12,7 +12,7 @@
   versionCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "rns";
   version = "1.1.2";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-KX6g9RGPHg3W/gzVaVoPBMpmPQs2jEJaDFDlA6D9Ql8=";
   };
 
@@ -41,15 +41,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "RNS" ];
 
-  nativeCheckInputs = [
-    versionCheckHook
-  ];
+  nativeCheckInputs = [ versionCheckHook ];
+
   versionCheckProgram = "${placeholder "out"}/bin/rncp";
 
   meta = {
     description = "Cryptography-based networking stack for wide-area networks";
     homepage = "https://reticulum.network";
-    changelog = "https://github.com/markqvist/Reticulum/blob/${src.tag}/Changelog.md";
+    changelog = "https://github.com/markqvist/Reticulum/blob/${finalAttrs.src.tag}/Changelog.md";
     # Reticulum License
     # https://github.com/markqvist/Reticulum/blob/master/LICENSE
     license = lib.licenses.unfree;
@@ -58,4 +57,4 @@ buildPythonPackage rec {
       qbit
     ];
   };
-}
+})

From 8a1a0e2f36f51a1093e42323951ec8495934ce2f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 22:32:30 +0100
Subject: [PATCH 103/196] python313Packages.nomadnet: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index f700195fe336..e2dfe466eb77 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -3,24 +3,21 @@
   buildPythonPackage,
   fetchFromGitHub,
   lxmf,
-  pythonOlder,
   qrcode,
   rns,
   setuptools,
   urwid,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nomadnet";
   version = "0.9.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "NomadNet";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-IDEbyvTX5PLPqDQ8gj5UwNkGCn+5wJx2xkYJ8BIWmWI=";
   };
 
@@ -41,9 +38,9 @@ buildPythonPackage rec {
   meta = {
     description = "Off-grid, resilient mesh communication";
     homepage = "https://github.com/markqvist/NomadNet";
-    changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}";
+    changelog = "https://github.com/markqvist/NomadNet/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nomadnet";
   };
-}
+})

From b135f8ebf66c25cf91af107fff13373db244b850 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jan 2026 22:32:55 +0100
Subject: [PATCH 104/196] python313Packages.lxmf: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 85a53100ab1c..d2576871e319 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -6,7 +6,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "lxmf";
   version = "0.9.4";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "lxmf";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-WeEGwdbW2hmN7sdMl8tR5pmaXGqRb6y5Zb536ty3eiY=";
   };
 
@@ -30,11 +30,11 @@ buildPythonPackage rec {
   meta = {
     description = "Lightweight Extensible Message Format for Reticulum";
     homepage = "https://github.com/markqvist/lxmf";
-    changelog = "https://github.com/markqvist/LXMF/releases/tag/${src.tag}";
+    changelog = "https://github.com/markqvist/LXMF/releases/tag/${finalAttrs.src.tag}";
     # Reticulum License
     # https://github.com/markqvist/LXMF/blob/master/LICENSE
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "lxmd";
   };
-}
+})

From f7b6df2a4732c9ef6dfe26e7f9eb4f9e5836db3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 22:19:25 +0000
Subject: [PATCH 105/196] kazumi: 1.9.3 -> 1.9.4

---
 pkgs/by-name/ka/kazumi/git-hashes.json   |  20 +-
 pkgs/by-name/ka/kazumi/package.nix       |   4 +-
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 254 ++++++++---------------
 3 files changed, 104 insertions(+), 174 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json
index f007ae4e6982..025e0bb3141c 100644
--- a/pkgs/by-name/ka/kazumi/git-hashes.json
+++ b/pkgs/by-name/ka/kazumi/git-hashes.json
@@ -1,12 +1,12 @@
 {
-  "desktop_webview_window": "sha256-FSI/R9HvAJWQttY8oaAmBYygUliv/bw3hmwty7PRUjE=",
-  "media_kit": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_libs_android_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_libs_ios_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_libs_linux": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_libs_macos_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_libs_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_libs_windows_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "media_kit_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
-  "webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU="
+  "desktop_webview_window": "sha256-kkBPJvPVAChzk9eDL5xwZvonWobChW0C5dGQYTlQ8qA=",
+  "media_kit": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_libs_android_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_libs_ios_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_libs_linux": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_libs_macos_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_libs_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_libs_windows_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "media_kit_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
+  "webview_windows": "sha256-pDnCv8tkeeaodMcNggHOyvPPkoCfd0hvopTg1Uvx0sM="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 30fa64a74b72..9f857e55512c 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-ZAc8i7nsJ00rzrOevVd4apb+CJ43rnsTkWGXhsDvrdc=";
+    hash = "sha256-xWbk81y+cA/iJCttZAKR1EfSkA7u9+aLFnty548Bv0g=";
   };
 in
 flutter338.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 30ac5f119445..2de2076b8004 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "67.0.0"
+      "version": "91.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
+      "version": "8.4.1"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -104,21 +104,21 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "4.0.3"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "build_daemon": {
       "dependency": "transitive",
@@ -130,35 +130,15 @@
       "source": "hosted",
       "version": "4.0.4"
     },
-    "build_resolvers": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.3.2"
+      "version": "2.10.4"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -330,16 +310,6 @@
       "source": "hosted",
       "version": "3.1.2"
     },
-    "cookie_jar": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cookie_jar",
-        "sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.8"
-    },
     "crypto": {
       "dependency": "transitive",
       "description": {
@@ -374,11 +344,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.6"
+      "version": "3.1.3"
     },
     "dbus": {
       "dependency": "transitive",
@@ -394,33 +364,13 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "b107a03068b8c4249cec4a3b159d56f1326103c5",
-        "resolved-ref": "b107a03068b8c4249cec4a3b159d56f1326103c5",
+        "ref": "5a07358",
+        "resolved-ref": "5a07358d2f52a0cd01a767ba6d998f5e32170426",
         "url": "https://github.com/Predidit/linux_webview_window.git"
       },
       "source": "git",
       "version": "0.2.4"
     },
-    "device_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "11.5.0"
-    },
-    "device_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "device_info_plus_platform_interface",
-        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.0.3"
-    },
     "dio": {
       "dependency": "direct main",
       "description": {
@@ -431,16 +381,6 @@
       "source": "hosted",
       "version": "5.8.0+1"
     },
-    "dio_cookie_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dio_cookie_manager",
-        "sha256": "47cacbf6a783c263bfa7cd7d08101e93127d87760ddb003ba289162f7be0f679",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.0"
-    },
     "dio_web_adapter": {
       "dependency": "transitive",
       "description": {
@@ -465,11 +405,11 @@
       "dependency": "direct main",
       "description": {
         "name": "dynamic_color",
-        "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
+        "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.7.0"
+      "version": "1.8.1"
     },
     "equatable": {
       "dependency": "transitive",
@@ -535,11 +475,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fl_chart",
-        "sha256": "577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7",
+        "sha256": "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -631,11 +571,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -697,11 +637,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
+        "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "2.2.3"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -725,16 +665,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "frontend_server_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "frontend_server_client",
-        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
     "get_it": {
       "dependency": "transitive",
       "description": {
@@ -765,35 +695,35 @@
       "source": "hosted",
       "version": "2.3.2"
     },
-    "hive": {
+    "hive_ce": {
       "dependency": "direct main",
       "description": {
-        "name": "hive",
-        "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
+        "name": "hive_ce",
+        "sha256": "412c638aeac0f003bba664884e3048b9547e541aaca13f10cc639da788184bed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.16.0"
     },
-    "hive_flutter": {
+    "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
-        "name": "hive_flutter",
-        "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
+        "name": "hive_ce_flutter",
+        "sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "2.3.3"
     },
-    "hive_generator": {
+    "hive_ce_generator": {
       "dependency": "direct dev",
       "description": {
-        "name": "hive_generator",
-        "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4",
+        "name": "hive_ce_generator",
+        "sha256": "b19ac263cb37529513508ba47352c41e6de72ba879952898d9c18c9c8a955921",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "1.10.0"
     },
     "html": {
       "dependency": "direct main",
@@ -865,6 +795,16 @@
       "source": "hosted",
       "version": "1.0.5"
     },
+    "isolate_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "isolate_channel",
+        "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.2+1"
+    },
     "js": {
       "dependency": "transitive",
       "description": {
@@ -919,11 +859,11 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "logger": {
       "dependency": "direct main",
@@ -969,8 +909,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -980,8 +920,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -991,8 +931,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1002,8 +942,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1013,8 +953,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1024,8 +964,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1035,8 +975,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1046,8 +986,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
-        "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
+        "ref": "7b248251fc274f986635876946130f2afc78c959",
+        "resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1087,21 +1027,21 @@
       "dependency": "direct main",
       "description": {
         "name": "mobx",
-        "sha256": "bf1a90e5bcfd2851fc6984e20eef69557c65d9e4d0a88f5be4cf72c9819ce6b0",
+        "sha256": "25ea9a3ee69243d578fb6288721d8eeb18550d0391c32f896d377d994154bff2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.6.0"
     },
     "mobx_codegen": {
       "dependency": "direct dev",
       "description": {
         "name": "mobx_codegen",
-        "sha256": "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc",
+        "sha256": "2dbad72338df5959ff80312bb6796ec7045ba3188996ef9512c281cbe6c962cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.0"
+      "version": "2.7.5"
     },
     "modular_core": {
       "dependency": "transitive",
@@ -1407,11 +1347,11 @@
       "dependency": "direct main",
       "description": {
         "name": "saver_gallery",
-        "sha256": "bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c",
+        "sha256": "1d942bd7f4fedc162d9a751e156ebac592e4b81fc2e757af82de9077f3437003",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.1.0"
     },
     "screen_brightness_android": {
       "dependency": "direct main",
@@ -1607,11 +1547,11 @@
       "dependency": "direct main",
       "description": {
         "name": "skeletonizer",
-        "sha256": "eebc03dc86b298e2d7f61e0ebce5713e9dbbc3e786f825909b4591756f196eb6",
+        "sha256": "83157d8e2e41f0252079cfec496281c16e4c63660052dab8d4cd72a206bb7109",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0+1"
+      "version": "2.1.2"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -1623,21 +1563,21 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "4.1.1"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.5"
+      "version": "1.3.8"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1779,16 +1719,6 @@
       "source": "hosted",
       "version": "0.7.7"
     },
-    "timing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "timing",
-        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
     "tray_manager": {
       "dependency": "direct main",
       "description": {
@@ -1833,11 +1763,11 @@
       "dependency": "direct main",
       "description": {
         "name": "upgrader",
-        "sha256": "60293b391f4146ce1e381ed6198b6374559a4aadf885d313e94e6c7d454d03ca",
+        "sha256": "4ba3f840691ffa43c6d71a93a6ad3ae01590c7895c3eb33f9f683513f736a9f7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.4.0"
+      "version": "12.3.0"
     },
     "uri_parser": {
       "dependency": "transitive",
@@ -2073,11 +2003,11 @@
       "dependency": "direct main",
       "description": {
         "name": "webview_flutter",
-        "sha256": "c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba",
+        "sha256": "a3da219916aba44947d3a5478b1927876a09781174b5a2b67fa5be0555154bf9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.13.0"
+      "version": "4.13.1"
     },
     "webview_flutter_android": {
       "dependency": "transitive",
@@ -2113,8 +2043,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
-        "resolved-ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
+        "ref": "9962cb9416f867d9ce9f409ccd6784e78c5f72ca",
+        "resolved-ref": "9962cb9416f867d9ce9f409ccd6784e78c5f72ca",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2130,16 +2060,6 @@
       "source": "hosted",
       "version": "5.14.0"
     },
-    "win32_registry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32_registry",
-        "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
     "window_manager": {
       "dependency": "direct main",
       "description": {
@@ -2199,10 +2119,20 @@
       },
       "source": "hosted",
       "version": "3.1.3"
+    },
+    "yaml_writer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml_writer",
+        "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.38.4"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.38.6"
   }
 }

From ec62af01ce0097ca4d9e95fabb7386968b4fa6e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 22:45:51 +0000
Subject: [PATCH 106/196] nixpkgs-track: 0.3.0 -> 0.5.0

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

diff --git a/pkgs/by-name/ni/nixpkgs-track/package.nix b/pkgs/by-name/ni/nixpkgs-track/package.nix
index cc9c69cdbc96..517808f2a696 100644
--- a/pkgs/by-name/ni/nixpkgs-track/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-track/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixpkgs-track";
-  version = "0.3.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "uncenter";
     repo = "nixpkgs-track";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NXEX2C2UhXmzyhN8jfqkv3d028axR1KIuXU94EPUmrU=";
+    hash = "sha256-HycVA5Eln/9w4PC3FnULvpVXlN1HLOcWsokVLN6ReKQ=";
   };
 
-  cargoHash = "sha256-AbT0r6T2+ag70zEMjN3/2AMK1DfVkLfLAbG9puchD58=";
+  cargoHash = "sha256-DOQSRRY/ZR4VcHN666Sk8MhJgED61IYzBZTlc37O/M0=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [

From 8ad2ad29eb74ad2d8198a7a3e4af4e6cfcd128de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 10 Jan 2026 03:01:35 +0700
Subject: [PATCH 107/196] =?UTF-8?q?chroma:=202.20.0=20=E2=86=92=202.22.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ch/chroma/package.nix |  4 ++--
 pkgs/by-name/ch/chroma/src.json    | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index e2a2039a542a..42a9a9943b18 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -10,7 +10,7 @@ in
 
 buildGoModule rec {
   pname = "chroma";
-  version = "2.20.0";
+  version = "2.22.0";
 
   # To update:
   # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@@ -21,7 +21,7 @@ buildGoModule rec {
     inherit (srcInfo) sha256;
   };
 
-  vendorHash = "sha256-GiaVgqhhrexSnBWVtQ+/cwdykHVDxR95BFMkrH1s+8Q=";
+  vendorHash = "sha256-kzlXrIMSa5C4UFt+BiMh6NedelQG49OxYbreeWhCb80=";
 
   modRoot = "./cmd/chroma";
 
diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json
index c705d660c1cb..2ae37368251d 100644
--- a/pkgs/by-name/ch/chroma/src.json
+++ b/pkgs/by-name/ch/chroma/src.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/alecthomas/chroma.git",
-  "rev": "303b65df3f2d2151cee24bcf9f9b625db474ef51",
-  "date": "2025-08-04T13:55:06+10:00",
-  "path": "/nix/store/1f8p33h1srs9knj6sn6mc5rf0wcybf4g-chroma",
-  "sha256": "05w4hnfcxqdlsz7mkc0m3jbp1aj67wzyhq5jh8ldfgnyjnlafia3",
-  "hash": "sha256-Q0WnqJXePtcogrJg6D8/RqpwlxwVsFnP17ThzpyFhBc=",
+  "rev": "467c878aa553cdb4b0d486a534ea744f6ac7ef5e",
+  "date": "2026-01-10T09:37:30+11:00",
+  "path": "/nix/store/qkfgjvpw8j5rkfgh687kxzkv8ac9apba-chroma",
+  "sha256": "1wlvxxlbwaq963rkr9fwxc6qwa77m49icq2gdzf46w7wdc3cygpm",
+  "hash": "sha256-9T7PBmv8cEPcb09gFhOp5yiODevcpTzzMAkrvmjvm/I=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }

From 5db16246f308d5733fe7d39304e622c7df954537 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 9 Jan 2026 22:47:55 +0000
Subject: [PATCH 108/196] python3Packages.pyopencl: 2026.1 -> 2026.1.1

Diff: https://github.com/inducer/pyopencl/compare/v2026.1...v2026.1.1

Changelog: https://github.com/inducer/pyopencl/releases/tag/v2026.1.1
---
 pkgs/development/python-modules/pyopencl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index d6982c495f11..31b4cb579d32 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyopencl";
-  version = "2026.1";
+  version = "2026.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
     repo = "pyopencl";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-1P0An6yP7+ie893i1AkKlfXprhfikJGY3FTTnxQgWtI=";
+    hash = "sha256-+uFuOhz2zkseL95iHJgGmz36+Rz1zcg2RX3Dc7IThxY=";
   };
 
   build-system = [

From d6fd6ca5f5ed0b4b243effe10b9f8f351d3eeae4 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Mon, 29 Dec 2025 14:47:46 -0500
Subject: [PATCH 109/196] maintainers: add anish

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50bd2b3f4c1e..32ee248f0309 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1832,6 +1832,13 @@
     githubId = 6091755;
     name = "Anirrudh Krishnan";
   };
+  anish = {
+    email = "i@anish.land";
+    github = "ap-1";
+    githubId = 67872951;
+    name = "Anish Pallati";
+    keys = [ { fingerprint = "2A0A 16F5 E026 BE3B A47F B7A6 841A FB68 9A5B ACCB"; } ];
+  };
   ankhers = {
     email = "me@ankhers.dev";
     github = "ankhers";

From cc3d2ddd30975e3d7c9e755f30fcc7f004a418d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 23:37:44 +0000
Subject: [PATCH 110/196] gh-gei: 1.23.0 -> 1.26.0

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

diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 808a2efffc3e..786df314649b 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.23.0";
+  version = "1.26.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-9sTyxLs5ug1fKh2qvKkuhA9r0cmfdaPT+pWuc6hxyN4=";
+    hash = "sha256-oyNnHEGOLQvxIoBnvH0rA6hYAx+BYY1+aG3qMx1RpX4=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

From 688be46c678293c40aba30fcc71b3cbbdceba246 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Fri, 9 Jan 2026 18:39:02 -0500
Subject: [PATCH 111/196] dioxus-cli: add wasm-bindgen-cli to PATH

---
 pkgs/by-name/di/dioxus-cli/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix
index 8464548ca211..274af1d1bc27 100644
--- a/pkgs/by-name/di/dioxus-cli/package.nix
+++ b/pkgs/by-name/di/dioxus-cli/package.nix
@@ -6,6 +6,8 @@
   cacert,
   openssl,
   rustfmt,
+  makeWrapper,
+  wasm-bindgen-cli_0_2_106,
   nix-update-script,
   testers,
   dioxus-cli,
@@ -35,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cacert
+    makeWrapper
   ];
 
   buildInputs = [
@@ -65,6 +68,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     };
   };
 
+  postInstall = ''
+    wrapProgram $out/bin/dx \
+      --prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_106 ]}
+  '';
+
   meta = {
     description = "CLI for building fullstack web, desktop, and mobile apps with a single codebase.";
     homepage = "https://dioxus.dev";
@@ -75,6 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [
       cathalmullan
+      anish
     ];
     platforms = lib.platforms.all;
     mainProgram = "dx";

From 3168f0b84d1972cb63b835526769648d9b4229cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jan 2026 23:48:00 +0000
Subject: [PATCH 112/196] pscale: 0.268.0 -> 0.269.0

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

diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index 17e78f75e3e5..4e432c58da92 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "pscale";
-  version = "0.268.0";
+  version = "0.269.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-z6hvjwrIscZHC/3pZkknyAMWpXEAItEhioRK37o82aw=";
+    sha256 = "sha256-fs4MXuC4CLxoApgimmHNOoxyhck2ZV/IE4rGoAKr7Lk=";
   };
 
-  vendorHash = "sha256-0Db91ESDf+5j4+da4F44uxycGDBV4A5Wkwz8Uvjo9ec=";
+  vendorHash = "sha256-HxvjFM1o14L2EVToDaqdvnnm/UeOy5BQ73ge1xx815k=";
 
   ldflags = [
     "-s"

From e2ecc95a8519c722d6e814e0994547af7d53c45a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 9 Jan 2026 23:47:29 +0000
Subject: [PATCH 113/196] scs: 3.2.10 -> 3.2.11

Diff: https://github.com/cvxgrp/scs/compare/3.2.10...3.2.11

Changelog: https://github.com/cvxgrp/scs/releases/tag/3.2.11
---
 pkgs/by-name/sc/scs/package.nix                 |  4 ++--
 pkgs/development/python-modules/scs/default.nix | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix
index 3f2071577cfe..3cc3e15d6c8c 100644
--- a/pkgs/by-name/sc/scs/package.nix
+++ b/pkgs/by-name/sc/scs/package.nix
@@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "scs";
-  version = "3.2.10";
+  version = "3.2.11";
 
   src = fetchFromGitHub {
     owner = "cvxgrp";
     repo = "scs";
     tag = finalAttrs.version;
-    hash = "sha256-HrKtl9GO0olH+AUgpkIDfz7jtYyREJCGZAM+0xVTmgE=";
+    hash = "sha256-hF5BxCLscyUmNXIVFIAAjY0GDbcH7WjODC4116aQfIs=";
   };
 
   # Actually link and add libgfortran to the rpath
diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
index 9832b8f52abc..2c11f92e31a1 100644
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -20,7 +20,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "scs";
   inherit (pkgs.scs) version;
   pyproject = true;
@@ -28,9 +28,9 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bodono";
     repo = "scs-python";
-    tag = version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-ZxbQ1WbavDKKYBmGB2W0zMVCH/WZIk8bFJ5TmC+QqYc=";
+    hash = "sha256-ZB1A6613ZgwGsZ97MpK9c1vUfNe+0RkUULtzQxGKd88=";
   };
 
   postPatch = ''
@@ -66,8 +66,8 @@ buildPythonPackage rec {
     '';
     inherit (pkgs.scs.meta) homepage;
     downloadPage = "https://github.com/bodono/scs-python";
-    changelog = "https://github.com/bodono/scs-python/releases/tag/${src.tag}";
+    changelog = "https://github.com/bodono/scs-python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 8fd13fc71bc1d191d1419168183661d4d5dce391 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Fri, 9 Jan 2026 19:13:11 -0500
Subject: [PATCH 114/196] dioxus-cli: remove nix-update-script

---
 pkgs/by-name/di/dioxus-cli/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix
index 274af1d1bc27..d3be3f661a3d 100644
--- a/pkgs/by-name/di/dioxus-cli/package.nix
+++ b/pkgs/by-name/di/dioxus-cli/package.nix
@@ -8,7 +8,6 @@
   rustfmt,
   makeWrapper,
   wasm-bindgen-cli_0_2_106,
-  nix-update-script,
   testers,
   dioxus-cli,
   withTelemetry ? false,
@@ -56,7 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = nix-update-script { };
     tests = {
       version = testers.testVersion {
         package = dioxus-cli;

From 9f7e393bc262505ede3938c5d0c7f52f44184035 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 10 Jan 2026 00:00:30 +0000
Subject: [PATCH 115/196] python3Packages.cleanlab: unmark as broken

---
 .../python-modules/cleanlab/default.nix            | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix
index b1c392e3e037..e263c99526e4 100644
--- a/pkgs/development/python-modules/cleanlab/default.nix
+++ b/pkgs/development/python-modules/cleanlab/default.nix
@@ -5,7 +5,6 @@
 
   # build-system
   setuptools,
-  setuptools-scm,
 
   # dependencies
   numpy,
@@ -43,9 +42,13 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-sgDQJy0iNxs3bIVuqV7LVEFC0jjlWvnqFzKr7ZDGmPo=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=65.0,<70.0" "setuptools"
+  '';
+
   build-system = [
     setuptools
-    setuptools-scm
   ];
 
   dependencies = [
@@ -79,6 +82,9 @@ buildPythonPackage (finalAttrs: {
     # Requires the datasets we prevent from downloading
     "test_create_imagelab"
 
+    # AssertionError: assert np.int64(36) == 35
+    "test_num_label_issues"
+
     # Non-trivial numpy2 incompatibilities
     # assert np.float64(0.492) == 0.491
     "test_duplicate_points_have_similar_scores"
@@ -107,9 +113,5 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/cleanlab/cleanlab/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ happysalada ];
-    # cleanlab is incompatible with datasets>=4.0.0
-    # cleanlab/datalab/internal/data.py:313: AssertionError
-    # https://github.com/cleanlab/cleanlab/issues/1244
-    broken = lib.versionAtLeast datasets.version "4.0.0";
   };
 })

From 2eb8cbeb784198e7970370869f4b34aa777783ba Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 9 Jan 2026 22:05:13 +0100
Subject: [PATCH 116/196] buildMozillaMach: use icu 78 for firefox 147 and
 newer

---
 .../networking/mailreaders/thunderbird/packages.nix       | 8 ++++----
 pkgs/build-support/build-mozilla-mach/default.nix         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index afa4f1ce54f2..046d9d5eaf15 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -4,8 +4,8 @@
   buildMozillaMach,
   callPackage,
   fetchurl,
-  icu73,
   icu77,
+  icu78,
   fetchpatch2,
   config,
 }:
@@ -25,8 +25,8 @@ let
         })
       ];
     });
-  icu73' = patchICU icu73;
   icu77' = patchICU icu77;
+  icu78' = patchICU icu78;
 
   common =
     {
@@ -49,8 +49,8 @@ let
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
       ];
       extraPassthru = {
-        icu73 = icu73';
         icu77 = icu77';
+        icu78 = icu78';
       };
 
       meta = {
@@ -77,8 +77,8 @@ let
 
         pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
 
-        icu73 = icu73';
         icu77 = icu77';
+        icu78 = icu78';
       };
 
 in
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 2c1276a886e6..58502c3ed32f 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -76,8 +76,8 @@ in
   glib,
   gnum4,
   gtk3,
-  icu73,
   icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides
+  icu78,
   libGL,
   libGLU,
   libevent,
@@ -581,7 +581,7 @@ buildStdenv.mkDerivation {
       libdrm
     ]
   ))
-  ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ]
+  ++ [ (if (lib.versionAtLeast version "147") then icu78 else icu77) ]
   ++ lib.optional gssSupport libkrb5
   ++ lib.optional jemallocSupport jemalloc
   ++ extraBuildInputs;

From 61f13a9873a9d353892abbcd93d9e152a36600e9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 9 Jan 2026 20:09:08 +0000
Subject: [PATCH 117/196] firefox-beta-unwrapped: 146.0b9 -> 147.0b9

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index df74e5e63ae3..0b1e6d33d2b2 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "146.0b9";
+  version = "147.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "77a9a4617f3d24f7eff77289e03e53373998ae617f601893be255a1eba85dd81fea5a26976159a25187aada7401ad8da6cbb0b5a3650c4936a7445a3a7f55d42";
+    sha512 = "346beb18a5012349da2f87c82080bf5fa605339db27644bdce4474bd63246dcfa9369e7d95620ee336649ff9c1d28677ff892d2309662a9b6f7ef0f055648c81";
   };
 
   meta = {

From eefb272431eb6ca72dd7fc3e254d53db2d93356a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 9 Jan 2026 20:10:09 +0000
Subject: [PATCH 118/196] firefox-devedition-unwrapped: 146.0b9 -> 147.0b9

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 2c74b044c326..d76b0fe33ef8 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "146.0b9";
+  version = "147.0b9";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "6fac88325150620388f49ffe1ba0385216184b98e0faa54e01804292563798a032a8cef375dbc78a41b9ba3e18d1e9258aca5e090bc827f2e7e842f76ee34c25";
+    sha512 = "66aad9dd7dc427d628fc7994a0e85997d6df0af4e0542f4bbd48dfdfe923e3b10ad6d6322c1eaed40bf30b61dfa5849785e46f7453b9fc6c478a2bb0fed6b93c";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From f5ce33f30f654bc8c02853b42920220f4ffb3427 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 9 Jan 2026 16:39:26 -0800
Subject: [PATCH 119/196] vmTools: Re-export qemuCommandLinux

This was un-exported in db467c36ec3a8054fcc68777b5ab842f625057f7, but
that breaks disko [1] and lvm2 [2].

[1] https://github.com/nix-community/disko/blob/916506443ecd0d0b4a0f4cf9d40a3c22ce39b378/lib/make-disk-image.nix#L296
[2] https://github.com/lvmteam/lvm2/blob/6e208b81ec587434097de3207fbd1ecd7a0afb8c/nix/default.nix#L136
---
 pkgs/build-support/vm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 73325c0d81eb..cf5c72b001c2 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1603,6 +1603,7 @@ in
     makeImageTestScript
     modulesClosure
     qemu
+    qemuCommandLinux
     rpmClosureGenerator
     rpmDistros
     runInLinuxImage

From d5dc3ec97b6cc99a707983366c5d259557240ed0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 00:44:26 +0000
Subject: [PATCH 120/196] airshipper: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix
index aba284758545..0b576751e455 100644
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -26,7 +26,7 @@
   patchelf,
 }:
 let
-  version = "0.16.0";
+  version = "0.17.0";
   # Patch for airshipper to install veloren
   patch =
     let
@@ -65,10 +65,10 @@ rustPlatform.buildRustPackage {
     owner = "Veloren";
     repo = "airshipper";
     tag = "v${version}";
-    hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
+    hash = "sha256-M89RswC08MZnNfk2T1+rtDajTpDGTnJoZ2U8bU5U2+0=";
   };
 
-  cargoHash = "sha256-TkeB939zV5VvqICFqJd/7uX+ydXyEQOJ3sYQbHbZhP0=";
+  cargoHash = "sha256-ry0hFvMDnotDQu6mqgyt+6hKOvGRJLmZKs3SxEVtDRg=";
 
   buildInputs = [
     fontconfig

From 8f94992aad3e318deb0e740ca9d9b0ed45c0bf06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 00:59:21 +0000
Subject: [PATCH 121/196] cosign: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix
index 8862e9b4d233..318af8026f0f 100644
--- a/pkgs/by-name/co/cosign/package.nix
+++ b/pkgs/by-name/co/cosign/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cosign";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = "cosign";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2cCeSG3ELkSWL1ZJ/bMGm4Nj7OZgewyUwu8lblRjCh4=";
+    hash = "sha256-Ddq9MJNRZ+ywJwxIUP4nhag8UZIH/hOYnF71P3+gI/0=";
   };
 
   buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     installShellFiles
   ];
 
-  vendorHash = "sha256-LTJoEEOGrmgQi+8T++wNMfs+jdWI+R+Xo1vBXuoLBMM=";
+  vendorHash = "sha256-TuA3LwZFAKjZ4aoX92tYd7eziG5N1vDOTsEgwhg5n6w=";
 
   subPackages = [
     "cmd/cosign"

From 6f4c57dbae7d836594ced7e5a883c96aab405ccc Mon Sep 17 00:00:00 2001
From: Patrick Hobusch <patrick@hobusch.net>
Date: Sat, 10 Jan 2026 02:08:04 +0100
Subject: [PATCH 122/196] atlassian-plugin-sdk: 9.1.1 -> 9.9.1

Also fix updateScript to follow HTTP redirects with curl -L flag.
---
 pkgs/by-name/at/atlassian-plugin-sdk/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix
index f3915dbd578a..e8c20ce197e5 100644
--- a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix
+++ b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix
@@ -15,15 +15,15 @@
 
 let
   mavenGroupIdUrl = "https://packages.atlassian.com/maven/public/com/atlassian/amps";
-
 in
+
 stdenv.mkDerivation rec {
   pname = "atlassian-plugin-sdk";
-  version = "9.1.1";
+  version = "9.9.1";
 
   src = fetchurl {
     url = "${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-${version}.tar.gz";
-    hash = "sha256-sEAe1eif9qXvIOu8RfZ4MWngEO5yCjU74g4Crd85J3Y=";
+    hash = "sha256-6svtGwk9d+/ipPHy/1kCQ5kyt1v9uaTwjYv6/ncCStc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
         ]
       }:$PATH"
 
-      NEW_VERSION=$(curl -s ${mavenGroupIdUrl}/atlassian-plugin-sdk/maven-metadata.xml | xq -r '.metadata.versioning.latest')
+      NEW_VERSION=$(curl -sL ${mavenGroupIdUrl}/atlassian-plugin-sdk/maven-metadata.xml | xq -r '.metadata.versioning.latest')
 
       if [[ "${version}" = "$NEW_VERSION" ]]; then
           echo "The new version same as the old version."

From 7ce3d1a625b04733b4b7be24ee93af83887bdb3b Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Fri, 2 Jan 2026 23:38:15 -0500
Subject: [PATCH 123/196] radiotray-ng: move to by-name

---
 .../audio => by-name/ra}/radiotray-ng/no-dl-googletest.patch  | 0
 .../default.nix => by-name/ra/radiotray-ng/package.nix}       | 4 ++--
 .../audio => by-name/ra}/radiotray-ng/tests-c++17.patch       | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio => by-name/ra}/radiotray-ng/no-dl-googletest.patch (100%)
 rename pkgs/{applications/audio/radiotray-ng/default.nix => by-name/ra/radiotray-ng/package.nix} (99%)
 rename pkgs/{applications/audio => by-name/ra}/radiotray-ng/tests-c++17.patch (100%)

diff --git a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/pkgs/by-name/ra/radiotray-ng/no-dl-googletest.patch
similarity index 100%
rename from pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
rename to pkgs/by-name/ra/radiotray-ng/no-dl-googletest.patch
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/by-name/ra/radiotray-ng/package.nix
similarity index 99%
rename from pkgs/applications/audio/radiotray-ng/default.nix
rename to pkgs/by-name/ra/radiotray-ng/package.nix
index 001a1024933b..75eed14164ff 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/by-name/ra/radiotray-ng/package.nix
@@ -18,7 +18,7 @@
   libappindicator-gtk3,
   libnotify,
   libxdg_basedir,
-  wxGTK,
+  wxGTK32,
   # GStreamer
   glib-networking,
   gst_all_1,
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     libnotify
     libxdg_basedir
     lsb-release
-    wxGTK
+    wxGTK32
     # for https gstreamer / libsoup
     glib-networking
   ]
diff --git a/pkgs/applications/audio/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch
similarity index 100%
rename from pkgs/applications/audio/radiotray-ng/tests-c++17.patch
rename to pkgs/by-name/ra/radiotray-ng/tests-c++17.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19b97af60743..8872d07eed22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11683,10 +11683,6 @@ with pkgs;
     fltk = fltk13;
   };
 
-  radiotray-ng = callPackage ../applications/audio/radiotray-ng {
-    wxGTK = wxGTK32;
-  };
-
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
     fftw = fftwSinglePrec;
   };

From 7da9c8987d342bb67a512c556ec2b048772c532e Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Fri, 2 Jan 2026 23:41:05 -0500
Subject: [PATCH 124/196] radiotray-ng: use finalAttrs style

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

diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix
index 75eed14164ff..502dc55b0c2e 100644
--- a/pkgs/by-name/ra/radiotray-ng/package.nix
+++ b/pkgs/by-name/ra/radiotray-ng/package.nix
@@ -48,14 +48,14 @@ let
     lxml
   ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "radiotray-ng";
   version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "ebruck";
     repo = "radiotray-ng";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs=";
   };
 
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}"
+    (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
   ];
 
   # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated
@@ -125,4 +125,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 92c4ae0761c955ea401fbb54c7b8f214ac4bac1d Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Fri, 2 Jan 2026 23:41:50 -0500
Subject: [PATCH 125/196] radiotray-ng: 0.2.9 -> 0.2.10.1

---
 pkgs/by-name/ra/radiotray-ng/package.nix       |  4 ++--
 pkgs/by-name/ra/radiotray-ng/tests-c++17.patch | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix
index 502dc55b0c2e..a41aa5ef4906 100644
--- a/pkgs/by-name/ra/radiotray-ng/package.nix
+++ b/pkgs/by-name/ra/radiotray-ng/package.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "radiotray-ng";
-  version = "0.2.9";
+  version = "0.2.10.1";
 
   src = fetchFromGitHub {
     owner = "ebruck";
     repo = "radiotray-ng";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs=";
+    hash = "sha256-GYSacYKS0az5sqPqZhnuTZOT9NSzW+P9o5r5p0RhTtI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch
index 750c12f6d211..234de3ff40f7 100644
--- a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch
+++ b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch
@@ -10,16 +10,3 @@ index 58ab5c2..4f56a25 100644
  function(add_gmock_test target)
      add_executable(${target} ${ARGN})
      target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread)
-diff --git a/tests/bookmarks_test.cpp b/tests/bookmarks_test.cpp
-index 2d72356..97f898a 100644
---- a/tests/bookmarks_test.cpp
-+++ b/tests/bookmarks_test.cpp
-@@ -215,7 +215,7 @@ TEST(Bookmarks, test_that_stations_are_added_and_removed_from_a_group_and_moved)
- 	ASSERT_FALSE(bm[0].stations[0].notifications);
- 
- 	// vector only throws when using at()
--	EXPECT_THROW(bm[0].stations.at(100), std::out_of_range);
-+	EXPECT_THROW(static_cast<void>(bm[0].stations.at(100)), std::out_of_range);
- 	EXPECT_THROW(bm[1], std::out_of_range);
- }
- 

From 957dad692a9a88fa83ccbe941fafbd68e8af50e7 Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Fri, 2 Jan 2026 23:41:56 -0500
Subject: [PATCH 126/196] radiotray-ng: adopt as maintainer

---
 pkgs/by-name/ra/radiotray-ng/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix
index a41aa5ef4906..f844a04d46c3 100644
--- a/pkgs/by-name/ra/radiotray-ng/package.nix
+++ b/pkgs/by-name/ra/radiotray-ng/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Internet radio player for linux";
     homepage = "https://github.com/ebruck/radiotray-ng";
     license = lib.licenses.gpl3;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.somasis ];
     platforms = lib.platforms.linux;
   };
 })

From a9d226ccb705b0815620a97f4effaab257a1c1b9 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Dec 2025 05:16:15 +0100
Subject: [PATCH 127/196] xf86-input-mouse: refactor, move to pkgs/by-name &
 rename from xorg.xf86inputmouse

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-input-mouse/package.nix  | 63 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  4 +-
 pkgs/servers/x11/xorg/overrides.nix           |  9 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 69 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-input-mouse/package.nix

diff --git a/pkgs/by-name/xf/xf86-input-mouse/package.nix b/pkgs/by-name/xf/xf86-input-mouse/package.nix
new file mode 100644
index 000000000000..136340c56cc5
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-input-mouse/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorgproto,
+  xorg-server,
+  nix-update-script,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-input-mouse";
+  version = "1.9.5";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-input-mouse";
+    tag = "xf86-input-mouse-${finalAttrs.version}";
+    hash = "sha256-vxdzLn9sclIYmPKw7vRa4oQJYmQV98WMfIjkMRosr/w=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    xorgproto
+    xorg-server
+  ];
+
+  configureFlags = [ "--with-sdkdir=${placeholder "out"}/include/xorg" ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-mouse-(.*)" ]; };
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Mouse input driver for non-Linux platforms for the Xorg X server";
+    longDescription = ''
+      This driver is used on non-Linux operating systems such as BSD & Solaris, as modern Linux
+      systems use the xf86-input-evdev or xf86-input-libinput drivers instead.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse";
+    license = with lib.licenses; [
+      mit
+      hpndSellVariant
+      x11
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xorg-mouse" ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputmouse.x86_64-darwin
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 79141d56bf1e..56315e3b7f91 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -127,6 +127,7 @@
   xdriinfo,
   xev,
   xeyes,
+  xf86-input-mouse,
   xfd,
   xfontsel,
   xfs,
@@ -331,8 +332,9 @@ self: with self; {
   xcbutil = libxcb-util;
   xcbutilrenderutil = libxcb-render-util;
   xcbutilwm = libxcb-wm;
-  xkeyboardconfig = xkeyboard-config;
   xcursorthemes = xcursor-themes;
+  xf86inputmouse = xf86-input-mouse;
+  xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
   xorgserver = xorg-server;
@@ -530,42 +532,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86inputmouse = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-input-mouse";
-      version = "1.9.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz";
-        sha256 = "0s4rzp7aqpbqm4474hg4bz7i7vg3ir93ck2q12if4lj3nklqmpjg";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xorg-mouse" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputsynaptics = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9c2c32c17c80..f00e13d97bb4 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -459,6 +459,7 @@ print OUT <<EOF;
   xdriinfo,
   xev,
   xeyes,
+  xf86-input-mouse,
   xfd,
   xfontsel,
   xfs,
@@ -663,8 +664,9 @@ self: with self; {
   xcbutil = libxcb-util;
   xcbutilrenderutil = libxcb-render-util;
   xcbutilwm = libxcb-wm;
-  xkeyboardconfig = xkeyboard-config;
   xcursorthemes = xcursor-themes;
+  xf86inputmouse = xf86-input-mouse;
+  xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
   xorgserver = xorg-server;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f09cbb0b800f..71ebb5cc381d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -122,15 +122,6 @@ self: super:
     ];
   });
 
-  xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
-    configureFlags = [
-      "--with-sdkdir=${placeholder "out"}/include/xorg"
-    ];
-    meta = attrs.meta // {
-      broken = isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputmouse.x86_64-darwin
-    };
-  });
-
   xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
     configureFlags = [
       "--with-sdkdir=${placeholder "out"}/include/xorg"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 5e12f1358438..34e3efacbb17 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -7,7 +7,6 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
-mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz
 mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz

From a30434b78094bfa9ab169d2649dfef1a8109cb96 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 01:08:30 +0100
Subject: [PATCH 128/196] xorg-server: fix freebsd build

---
 pkgs/by-name/xo/xorg-server/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index bfede48f705a..cc8ac9b2e548 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -110,6 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
     dri-pkgconfig-stub
     libdrm
     libgbm
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     libtirpc
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -160,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dapple-applications-dir=${placeholder "out"}/Applications"
     "-Dbundle-id-prefix=org.nixos.xquartz"
     "-Dsha1=CommonCrypto"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+    # fixed upstream (unreleased)
+    "-Dudev=false"
+    "-Dudev_kms=false"
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 3ffa7005a9c68ba3e637ff5e16c4d78b50f73c70 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Dec 2025 05:56:02 +0100
Subject: [PATCH 129/196] xf86-input-mouse: 1.9.5 -> 2.0.0

this update drops linux support, however it still supports various other unixes

pkgsCross.x86_64-freebsd.xf86-input-mouse successfully builds on x86_64-linux
---
 pkgs/by-name/xf/xf86-input-mouse/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xf/xf86-input-mouse/package.nix b/pkgs/by-name/xf/xf86-input-mouse/package.nix
index 136340c56cc5..4afdfd6bc0c7 100644
--- a/pkgs/by-name/xf/xf86-input-mouse/package.nix
+++ b/pkgs/by-name/xf/xf86-input-mouse/package.nix
@@ -12,7 +12,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xf86-input-mouse";
-  version = "1.9.5";
+  version = "2.0.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "driver";
     repo = "xf86-input-mouse";
     tag = "xf86-input-mouse-${finalAttrs.version}";
-    hash = "sha256-vxdzLn9sclIYmPKw7vRa4oQJYmQV98WMfIjkMRosr/w=";
+    hash = "sha256-qPP0u7k1g30vw4A1c0fuVbQ9HHovTqWy8OAQ8uMGGg0=";
   };
 
   strictDeps = true;
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    util-macros
     xorgproto
     xorg-server
   ];
@@ -57,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = [ ];
     pkgConfigModules = [ "xorg-mouse" ];
-    platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputmouse.x86_64-darwin
+    # platforms according to the readme
+    platforms = with lib.platforms; freebsd ++ netbsd ++ openbsd ++ illumos;
   };
 })

From 84a3f8ffb3f3d55030252dea47460c474ce825a4 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Dec 2025 06:05:43 +0100
Subject: [PATCH 130/196] xf86-input-synaptics: refactor, move to pkgs/by-name
 & rename from xorg.xf86inputsynaptics

relevant changes:
- switch to GitLab source instead of release tarball
---
 .../xf/xf86-input-synaptics/package.nix       | 71 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           | 11 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 75 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-input-synaptics/package.nix

diff --git a/pkgs/by-name/xf/xf86-input-synaptics/package.nix b/pkgs/by-name/xf/xf86-input-synaptics/package.nix
new file mode 100644
index 000000000000..264d4f3db8e4
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-input-synaptics/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libevdev,
+  libx11,
+  libxi,
+  libxtst,
+  nix-update-script,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-input-synaptics";
+  version = "1.10.0";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-input-synaptics";
+    tag = "xf86-input-synaptics-${finalAttrs.version}";
+    hash = "sha256-IHkUxphSV6JOlTzIgXGl5hWb6OphJ9Lyzp/YS2phVQs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libevdev
+    libx11
+    libxi
+    libxtst
+  ];
+
+  configureFlags = [
+    "--with-sdkdir=${placeholder "dev"}/include/xorg"
+    "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-synaptics-(.*)" ]; };
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Synaptics touchpad driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [ "xorg-synaptics" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 56315e3b7f91..8c80cc5e8b1c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -128,6 +128,7 @@
   xev,
   xeyes,
   xf86-input-mouse,
+  xf86-input-synaptics,
   xfd,
   xfontsel,
   xfs,
@@ -334,6 +335,7 @@ self: with self; {
   xcbutilwm = libxcb-wm;
   xcursorthemes = xcursor-themes;
   xf86inputmouse = xf86-input-mouse;
+  xf86inputsynaptics = xf86-input-synaptics;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -532,50 +534,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86inputsynaptics = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libevdev,
-      libX11,
-      libXi,
-      xorgserver,
-      libXtst,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-input-synaptics";
-      version = "1.10.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz";
-        sha256 = "1hmm3g6ab4bs4hm6kmv508fdc8kr2blzb1vsz1lhipcf0vdnmhp0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libevdev
-        libX11
-        libXi
-        xorgserver
-        libXtst
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xorg-synaptics" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputvmmouse = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index f00e13d97bb4..1da8dcc31005 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -460,6 +460,7 @@ print OUT <<EOF;
   xev,
   xeyes,
   xf86-input-mouse,
+  xf86-input-synaptics,
   xfd,
   xfontsel,
   xfs,
@@ -666,6 +667,7 @@ self: with self; {
   xcbutilwm = libxcb-wm;
   xcursorthemes = xcursor-themes;
   xf86inputmouse = xf86-input-mouse;
+  xf86inputsynaptics = xf86-input-synaptics;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 71ebb5cc381d..bc46aeb651e0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -147,17 +147,6 @@ self: super:
     ];
   });
 
-  xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # *.pc pulls xorgserver.dev
-    configureFlags = [
-      "--with-sdkdir=${placeholder "dev"}/include/xorg"
-      "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
-    ];
-  });
-
   xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: {
     configureFlags = [
       "--sysconfdir=${placeholder "out"}/etc"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 34e3efacbb17..a7211988bccb 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -7,7 +7,6 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
-mirror://xorg/individual/driver/xf86-input-synaptics-1.10.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz

From 50d4f7d507eebc48a3c6f5d13a184c62d0bd8e05 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Dec 2025 04:22:37 +0100
Subject: [PATCH 131/196] xf86-input-vmmouse: refactor, move to pkgs/by-name &
 rename from xorg.xf86inputvmmouse

relevant changes:
- switch to GitLab source instead of release tarball
---
 .../by-name/xf/xf86-input-vmmouse/package.nix | 61 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           | 15 -----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 65 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-input-vmmouse/package.nix

diff --git a/pkgs/by-name/xf/xf86-input-vmmouse/package.nix b/pkgs/by-name/xf/xf86-input-vmmouse/package.nix
new file mode 100644
index 000000000000..9b30f1bc861f
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-input-vmmouse/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  udev,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-input-vmmouse";
+  version = "13.2.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-input-vmmouse";
+    tag = "xf86-input-vmmouse-${finalAttrs.version}";
+    hash = "sha256-SasWsIzq9s8i3dabRwKGZ0NSuFqnUu4WCWYTu/ZZpS8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # xorg-server defines autoconf macros that we need
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    udev
+  ];
+
+  configureFlags = [
+    "--sysconfdir=${placeholder "out"}/etc"
+    "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
+    "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-vmmouse-(.*)" ]; };
+  };
+
+  meta = {
+    description = "VMware guest mouse driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse";
+    license = with lib.licenses; [
+      hpndSellVariant
+      x11
+    ];
+    maintainers = [ ];
+    platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8c80cc5e8b1c..2986605d3145 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -129,6 +129,7 @@
   xeyes,
   xf86-input-mouse,
   xf86-input-synaptics,
+  xf86-input-vmmouse,
   xfd,
   xfontsel,
   xfs,
@@ -336,6 +337,7 @@ self: with self; {
   xcursorthemes = xcursor-themes;
   xf86inputmouse = xf86-input-mouse;
   xf86inputsynaptics = xf86-input-synaptics;
+  xf86inputvmmouse = xf86-input-vmmouse;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -534,44 +536,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86inputvmmouse = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      udev,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-input-vmmouse";
-      version = "13.2.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz";
-        sha256 = "1f1rlgp1rpsan8k4ax3pzhl1hgmfn135r31m80pjxw5q19c7gw2n";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        udev
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputvoid = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 1da8dcc31005..d9abbbc0cb48 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -461,6 +461,7 @@ print OUT <<EOF;
   xeyes,
   xf86-input-mouse,
   xf86-input-synaptics,
+  xf86-input-vmmouse,
   xfd,
   xfontsel,
   xfs,
@@ -668,6 +669,7 @@ self: with self; {
   xcursorthemes = xcursor-themes;
   xf86inputmouse = xf86-input-mouse;
   xf86inputsynaptics = xf86-input-synaptics;
+  xf86inputvmmouse = xf86-input-vmmouse;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bc46aeb651e0..870170482ed2 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -147,21 +147,6 @@ self: super:
     ];
   });
 
-  xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: {
-    configureFlags = [
-      "--sysconfdir=${placeholder "out"}/etc"
-      "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
-      "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
-    ];
-
-    meta = attrs.meta // {
-      platforms = [
-        "i686-linux"
-        "x86_64-linux"
-      ];
-    };
-  });
-
   xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin
   xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a7211988bccb..609f5a23be3f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -7,7 +7,6 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
-mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2

From 7c4d50d24b57d351122687ff046758243eef35c6 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Dec 2025 04:38:55 +0100
Subject: [PATCH 132/196] xf86-input-void: refactor, move to pkgs/by-name &
 rename from xorg.xf86inputvoid

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-input-void/package.nix   | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-input-void/package.nix

diff --git a/pkgs/by-name/xf/xf86-input-void/package.nix b/pkgs/by-name/xf/xf86-input-void/package.nix
new file mode 100644
index 000000000000..c52742e08170
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-input-void/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-input-void";
+  version = "1.4.2";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-input-void";
+    tag = "xf86-input-void-${finalAttrs.version}";
+    hash = "sha256-R2c+FUBJQ9GfMcZ9NKSgT0lfOkqiCKrA+lFVu8l6e10=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-void-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Null input driver for the Xorg X server";
+    longDescription = ''
+      This is a null input driver for the Xorg X server.
+      It doesn't connect to any physical device, and it never delivers any events.
+      It functions as both a pointer and keyboard device, and may be used as the X server's core
+      pointer and/or core keyboard.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-void";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2986605d3145..f7460d78d8e2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -130,6 +130,7 @@
   xf86-input-mouse,
   xf86-input-synaptics,
   xf86-input-vmmouse,
+  xf86-input-void,
   xfd,
   xfontsel,
   xfs,
@@ -338,6 +339,7 @@ self: with self; {
   xf86inputmouse = xf86-input-mouse;
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
+  xf86inputvoid = xf86-input-void;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -536,42 +538,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86inputvoid = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgserver,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-input-void";
-      version = "1.4.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz";
-        sha256 = "11bqy2djgb82c1g8ylpfwp3wjw4x83afi8mqyn5fvqp03kidh4d2";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgserver
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoamdgpu = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d9abbbc0cb48..95549174eabd 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -462,6 +462,7 @@ print OUT <<EOF;
   xf86-input-mouse,
   xf86-input-synaptics,
   xf86-input-vmmouse,
+  xf86-input-void,
   xfd,
   xfontsel,
   xfs,
@@ -670,6 +671,7 @@ self: with self; {
   xf86inputmouse = xf86-input-mouse;
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
+  xf86inputvoid = xf86-input-void;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 870170482ed2..a460e2ae8919 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -147,7 +147,6 @@ self: super:
     ];
   });
 
-  xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin
   xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
 
   xf86videoark = super.xf86videoark.overrideAttrs (attrs: {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 609f5a23be3f..b180eb4e017f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -7,7 +7,6 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
-mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz

From e9bd3931c33fd5d50333bea4764137c10bc458a0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 27 Sep 2025 20:20:38 -0500
Subject: [PATCH 133/196] various: migrate callPackage to by-name

---
 .../fo/fortran-language-server/package.nix}   | 12 ++++---
 .../ki/kitti3}/kitti3-fix-build-system.patch  |  0
 .../ki/kitti3/package.nix}                    | 18 +++++-----
 pkgs/by-name/lu/lutris-free/package.nix       |  7 ++++
 .../lu/lutris-unwrapped/package.nix}          | 27 +++------------
 .../lu/lutris/package.nix}                    |  0
 .../mi/minijail-tools/package.nix}            |  8 ++---
 .../mt/mtprotoproxy/package.nix}              | 13 +++----
 .../ni/nix-visualize/package.nix}             | 13 +++----
 .../nx/nxdomain/package.nix}                  | 14 ++++----
 .../rs/rshell/package.nix}                    |  8 ++---
 .../sc/scfbuild/package.nix}                  | 16 ++++-----
 .../sp/spf-engine/package.nix}                | 15 ++++----
 .../st/steamback/package.nix}                 | 26 ++++----------
 pkgs/by-name/sy/syncplay-nogui/package.nix    |  7 ++++
 .../sy/syncplay/package.nix}                  | 27 +++++++--------
 .../sy}/syncplay/trusted_certificates.patch   |  0
 pkgs/top-level/all-packages.nix               | 34 -------------------
 18 files changed, 88 insertions(+), 157 deletions(-)
 rename pkgs/{development/tools/language-servers/fortran-language-server/default.nix => by-name/fo/fortran-language-server/package.nix} (71%)
 rename pkgs/{applications/window-managers/i3 => by-name/ki/kitti3}/kitti3-fix-build-system.patch (100%)
 rename pkgs/{applications/window-managers/i3/kitti3.nix => by-name/ki/kitti3/package.nix} (86%)
 create mode 100644 pkgs/by-name/lu/lutris-free/package.nix
 rename pkgs/{applications/misc/lutris/default.nix => by-name/lu/lutris-unwrapped/package.nix} (88%)
 rename pkgs/{applications/misc/lutris/fhsenv.nix => by-name/lu/lutris/package.nix} (100%)
 rename pkgs/{tools/system/minijail/tools.nix => by-name/mi/minijail-tools/package.nix} (87%)
 rename pkgs/{servers/mtprotoproxy/default.nix => by-name/mt/mtprotoproxy/package.nix} (79%)
 rename pkgs/{tools/package-management/nix-visualize/default.nix => by-name/ni/nix-visualize/package.nix} (83%)
 rename pkgs/{tools/networking/nxdomain/default.nix => by-name/nx/nxdomain/package.nix} (71%)
 rename pkgs/{development/embedded/rshell/default.nix => by-name/rs/rshell/package.nix} (81%)
 rename pkgs/{tools/misc/scfbuild/default.nix => by-name/sc/scfbuild/package.nix} (74%)
 rename pkgs/{servers/mail/spf-engine/default.nix => by-name/sp/spf-engine/package.nix} (79%)
 rename pkgs/{tools/games/steamback/default.nix => by-name/st/steamback/package.nix} (79%)
 create mode 100644 pkgs/by-name/sy/syncplay-nogui/package.nix
 rename pkgs/{applications/networking/syncplay/default.nix => by-name/sy/syncplay/package.nix} (75%)
 rename pkgs/{applications/networking => by-name/sy}/syncplay/trusted_certificates.patch (100%)

diff --git a/pkgs/development/tools/language-servers/fortran-language-server/default.nix b/pkgs/by-name/fo/fortran-language-server/package.nix
similarity index 71%
rename from pkgs/development/tools/language-servers/fortran-language-server/default.nix
rename to pkgs/by-name/fo/fortran-language-server/package.nix
index 59abe18298f8..2cbc117a12f0 100644
--- a/pkgs/development/tools/language-servers/fortran-language-server/default.nix
+++ b/pkgs/by-name/fo/fortran-language-server/package.nix
@@ -1,19 +1,23 @@
 {
   lib,
   fetchPypi,
-  buildPythonApplication,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "fortran-language-server";
   version = "1.12.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
+    hash = "sha256-7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
   };
 
+  build-system = [
+    python3Packages.setuptools
+  ];
+
   checkPhase = "$out/bin/fortls --help 1>/dev/null";
   pythonImportsCheck = [ "fortls" ];
 
diff --git a/pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch b/pkgs/by-name/ki/kitti3/kitti3-fix-build-system.patch
similarity index 100%
rename from pkgs/applications/window-managers/i3/kitti3-fix-build-system.patch
rename to pkgs/by-name/ki/kitti3/kitti3-fix-build-system.patch
diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/by-name/ki/kitti3/package.nix
similarity index 86%
rename from pkgs/applications/window-managers/i3/kitti3.nix
rename to pkgs/by-name/ki/kitti3/package.nix
index 50e71aa49edd..90695c800211 100644
--- a/pkgs/applications/window-managers/i3/kitti3.nix
+++ b/pkgs/by-name/ki/kitti3/package.nix
@@ -1,13 +1,11 @@
 {
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  i3ipc,
   lib,
-  poetry-core,
   writeScript,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "kitti3";
   version = "0.5.1-unstable-2021-09-10";
   pyproject = true;
@@ -25,12 +23,12 @@ buildPythonApplication rec {
     ./kitti3-fix-build-system.patch
   ];
 
-  nativeBuildInputs = [
-    poetry-core
+  build-system = [
+    python3Packages.poetry-core
   ];
 
-  propagatedBuildInputs = [
-    i3ipc
+  dependencies = [
+    python3Packages.i3ipc
   ];
 
   passthru.updateScript = writeScript "update-kitti3" ''
@@ -38,7 +36,7 @@ buildPythonApplication rec {
     #!nix-shell -i bash -p git common-updater-scripts perl tomlq
     tmpdir="$(mktemp -d)"
     trap "rm -rf $tmpdir" EXIT
-    git clone --depth=1 "${src.gitRepoUrl}" "$tmpdir"
+    git clone --depth=1 "${finalAttrs.src.gitRepoUrl}" "$tmpdir"
     pushd "$tmpdir"
     newVersionNumber=$(perl -ne 'print if s/version = "([\d.]+)"/$1/' pyproject.toml)
     newRevision=$(git show -s --pretty='format:%H')
@@ -59,4 +57,4 @@ buildPythonApplication rec {
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/lu/lutris-free/package.nix b/pkgs/by-name/lu/lutris-free/package.nix
new file mode 100644
index 000000000000..c4a8ba959acc
--- /dev/null
+++ b/pkgs/by-name/lu/lutris-free/package.nix
@@ -0,0 +1,7 @@
+{
+  lutris,
+}:
+
+lutris.override {
+  steamSupport = false;
+}
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix
similarity index 88%
rename from pkgs/applications/misc/lutris/default.nix
rename to pkgs/by-name/lu/lutris-unwrapped/package.nix
index f91c0fc58be1..a701967a14ae 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix
@@ -1,5 +1,5 @@
 {
-  buildPythonApplication,
+  python3Packages,
   lib,
   fetchFromGitHub,
 
@@ -20,25 +20,6 @@
   meson,
   ninja,
 
-  # check inputs
-  xvfb-run,
-  nose2,
-  flake8,
-
-  # python dependencies
-  certifi,
-  dbus-python,
-  distro,
-  evdev,
-  lxml,
-  pillow,
-  pygobject3,
-  pypresence,
-  pyyaml,
-  requests,
-  protobuf,
-  moddb,
-
   # commands that lutris needs
   xrandr,
   pciutils,
@@ -79,14 +60,14 @@ let
     util-linux
   ];
 in
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "lutris-unwrapped";
   version = "0.5.19";
 
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
   };
 
@@ -123,7 +104,7 @@ buildPythonApplication rec {
   ]);
 
   # See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     certifi
     dbus-python
     distro
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/by-name/lu/lutris/package.nix
similarity index 100%
rename from pkgs/applications/misc/lutris/fhsenv.nix
rename to pkgs/by-name/lu/lutris/package.nix
diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/by-name/mi/minijail-tools/package.nix
similarity index 87%
rename from pkgs/tools/system/minijail/tools.nix
rename to pkgs/by-name/mi/minijail-tools/package.nix
index d80ab9e103e6..c050c48c7048 100644
--- a/pkgs/tools/system/minijail/tools.nix
+++ b/pkgs/by-name/mi/minijail-tools/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   pkgsBuildTarget,
-  python,
+  pkgsBuildHost,
   minijail,
 }:
 
@@ -10,7 +10,7 @@ let
   targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc;
 in
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   format = "setuptools";
   pname = "minijail-tools";
   inherit (minijail) version src;
@@ -28,7 +28,7 @@ buildPythonApplication {
     make libconstants.gen.c libsyscalls.gen.c
     ${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \
         libconstants.gen.c libsyscalls.gen.c
-    ${python.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \
+    ${pkgsBuildHost.python3.interpreter} tools/generate_constants_json.py \
         --output constants.json \
         libconstants.gen.ll libsyscalls.gen.ll
   '';
diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/by-name/mt/mtprotoproxy/package.nix
similarity index 79%
rename from pkgs/servers/mtprotoproxy/default.nix
rename to pkgs/by-name/mt/mtprotoproxy/package.nix
index 79fad4195681..bd69fbea102d 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/by-name/mt/mtprotoproxy/package.nix
@@ -2,11 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python,
-  pyaes,
-  pycrypto,
-  uvloop,
-  wrapPython,
+  python3Packages,
+  python3,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs=";
   };
 
-  nativeBuildInputs = [ wrapPython ];
-  pythonPath = [
+  nativeBuildInputs = with python3Packages; [ wrapPython ];
+  pythonPath = with python3Packages; [
     pyaes
     pycrypto
     uvloop
@@ -36,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Async MTProto proxy for Telegram";
     license = lib.licenses.mit;
     homepage = "https://github.com/alexbers/mtprotoproxy";
-    platforms = python.meta.platforms;
+    platforms = python3.meta.platforms;
     maintainers = [ ];
     mainProgram = "mtprotoproxy";
   };
diff --git a/pkgs/tools/package-management/nix-visualize/default.nix b/pkgs/by-name/ni/nix-visualize/package.nix
similarity index 83%
rename from pkgs/tools/package-management/nix-visualize/default.nix
rename to pkgs/by-name/ni/nix-visualize/package.nix
index 999b03a637f0..c031036333ca 100644
--- a/pkgs/tools/package-management/nix-visualize/default.nix
+++ b/pkgs/by-name/ni/nix-visualize/package.nix
@@ -2,15 +2,10 @@
   lib,
   fetchFromGitHub,
   nix,
-  python,
-  matplotlib,
-  networkx,
-  pandas,
-  pygraphviz,
-  setuptools,
+  python3Packages,
 }:
 
-python.pkgs.buildPythonApplication {
+python3Packages.buildPythonApplication {
   version = "1.0.5-unstable-2024-01-17";
   pname = "nix-visualize";
   pyproject = true;
@@ -27,9 +22,9 @@ python.pkgs.buildPythonApplication {
       --prefix PATH : ${lib.makeBinPath [ nix ]}
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     matplotlib
     networkx
     pandas
diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/by-name/nx/nxdomain/package.nix
similarity index 71%
rename from pkgs/tools/networking/nxdomain/default.nix
rename to pkgs/by-name/nx/nxdomain/package.nix
index 636ef4100963..df9a6b872fbf 100644
--- a/pkgs/tools/networking/nxdomain/default.nix
+++ b/pkgs/by-name/nx/nxdomain/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  dnspython,
-  pytestCheckHook,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "nxdomain";
   version = "1.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0va7nkbdjgzrf7fnbxkh1140pbc62wyj86rdrrh5wmg3phiziqkb";
   };
 
-  propagatedBuildInputs = [ dnspython ];
+  build-system = with python3Packages; [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  dependencies = with python3Packages; [ dnspython ];
+
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
   postCheck = ''
     echo example.org > simple.list
diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/by-name/rs/rshell/package.nix
similarity index 81%
rename from pkgs/development/embedded/rshell/default.nix
rename to pkgs/by-name/rs/rshell/package.nix
index b9826336d9c6..560681e8c67b 100644
--- a/pkgs/development/embedded/rshell/default.nix
+++ b/pkgs/by-name/rs/rshell/package.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  pyserial,
-  pyudev,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "rshell";
   version = "0.0.36";
   format = "setuptools";
@@ -16,7 +14,7 @@ buildPythonApplication rec {
     hash = "sha256-SmbYNSB0eVUOWdDdPoMAPQTE7KeKTkklD4h+0t1LC/U=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     pyserial
     pyudev
   ];
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/by-name/sc/scfbuild/package.nix
similarity index 74%
rename from pkgs/tools/misc/scfbuild/default.nix
rename to pkgs/by-name/sc/scfbuild/package.nix
index 99b17307263e..1f3f6b3a4b32 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/pkgs/by-name/sc/scfbuild/package.nix
@@ -1,15 +1,11 @@
 {
   lib,
-  buildPythonApplication,
   fetchFromGitHub,
-  python,
-  pyyaml,
-  fonttools,
-  fontforge,
-  setuptools,
+  python3Packages,
+  python3,
 }:
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "scfbuild";
   version = "2.0.0";
 
@@ -22,7 +18,7 @@ buildPythonApplication {
     sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     pyyaml
     fonttools
     fontforge
@@ -32,8 +28,8 @@ buildPythonApplication {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/${python.sitePackages}
-    cp -r scfbuild $out/${python.sitePackages}
+    mkdir -p $out/${python3.sitePackages}
+    cp -r scfbuild $out/${python3.sitePackages}
     cp -r bin $out
 
     runHook postInstall
diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/by-name/sp/spf-engine/package.nix
similarity index 79%
rename from pkgs/servers/mail/spf-engine/default.nix
rename to pkgs/by-name/sp/spf-engine/package.nix
index a6b21036c141..2f948bf3178a 100644
--- a/pkgs/servers/mail/spf-engine/default.nix
+++ b/pkgs/by-name/sp/spf-engine/package.nix
@@ -1,15 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchurl,
-  flit-core,
-  pyspf,
-  dnspython,
-  authres,
-  pymilter,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "spf-engine";
   version = "3.1.0";
   pyproject = true;
@@ -19,9 +14,11 @@ buildPythonApplication rec {
     hash = "sha256-HUuMxYFCqItLFgMSnrkwfmJWqgFGyI1RWgmljb+jkWk=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  nativeBuildInputs = [
+    python3Packages.flit-core
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     pyspf
     dnspython
     authres
diff --git a/pkgs/tools/games/steamback/default.nix b/pkgs/by-name/st/steamback/package.nix
similarity index 79%
rename from pkgs/tools/games/steamback/default.nix
rename to pkgs/by-name/st/steamback/package.nix
index 05f77f0e65a6..c60282daaf59 100644
--- a/pkgs/tools/games/steamback/default.nix
+++ b/pkgs/by-name/st/steamback/package.nix
@@ -1,19 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  pillow,
-  psutil,
-  async-tkinter-loop,
-  timeago,
-  platformdirs,
-  sv-ttk,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "steamback";
   version = "0.3.6";
   format = "pyproject";
@@ -23,28 +14,25 @@ buildPythonApplication rec {
     hash = "sha256-hvMPSxIfwwQqo80JCpYhcbVY4kXs5jWtjjafVSMrw6o=";
   };
 
-  build-system = [
+  build-system = with python3Packages; [
+    setuptools
     setuptools-scm
     wheel
   ];
 
-  buildInputs = [
-    setuptools
-    pillow
-  ];
-
-  dependencies = [
+  dependencies = with python3Packages; [
     psutil
     async-tkinter-loop
     timeago
     platformdirs
     sv-ttk
+    pillow
   ];
 
   pythonRelaxDeps = [
     "async-tkinter-loop"
     "platformdirs"
-    "Pillow"
+    "pillow"
     "psutil"
   ];
 
diff --git a/pkgs/by-name/sy/syncplay-nogui/package.nix b/pkgs/by-name/sy/syncplay-nogui/package.nix
new file mode 100644
index 000000000000..f993c880f49d
--- /dev/null
+++ b/pkgs/by-name/sy/syncplay-nogui/package.nix
@@ -0,0 +1,7 @@
+{
+  syncplay,
+}:
+
+syncplay.override {
+  enableGUI = false;
+}
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/by-name/sy/syncplay/package.nix
similarity index 75%
rename from pkgs/applications/networking/syncplay/default.nix
rename to pkgs/by-name/sy/syncplay/package.nix
index 8ad4528894bf..98bec9f4b631 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/by-name/sy/syncplay/package.nix
@@ -2,17 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildPythonApplication,
-  pem,
-  pyside6,
-  twisted,
-  certifi,
+  python3Packages,
   qt6,
-  appnope,
   enableGUI ? true,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "syncplay";
   version = "1.7.4";
 
@@ -32,14 +27,16 @@ buildPythonApplication rec {
   buildInputs = lib.optionals enableGUI [
     (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase)
   ];
-  propagatedBuildInputs = [
-    certifi
-    pem
-    twisted
-  ]
-  ++ twisted.optional-dependencies.tls
-  ++ lib.optional enableGUI pyside6
-  ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope;
+  dependencies =
+    with python3Packages;
+    [
+      certifi
+      pem
+      twisted
+    ]
+    ++ twisted.optional-dependencies.tls
+    ++ lib.optional enableGUI pyside6
+    ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope;
   nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ];
 
   makeFlags = [
diff --git a/pkgs/applications/networking/syncplay/trusted_certificates.patch b/pkgs/by-name/sy/syncplay/trusted_certificates.patch
similarity index 100%
rename from pkgs/applications/networking/syncplay/trusted_certificates.patch
rename to pkgs/by-name/sy/syncplay/trusted_certificates.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19b97af60743..b6f1ae8f8ce7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3224,8 +3224,6 @@ with pkgs;
 
   minijail = callPackage ../tools/system/minijail { };
 
-  minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { };
-
   mir-qualia = callPackage ../tools/text/mir-qualia {
     pythonPackages = python3Packages;
   };
@@ -3370,8 +3368,6 @@ with pkgs;
 
   nwdiag = with python3Packages; toPythonApplication nwdiag;
 
-  nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
-
   ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
 
   ola = callPackage ../applications/misc/ola {
@@ -3715,8 +3711,6 @@ with pkgs;
     };
   };
 
-  scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
-
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
@@ -5804,10 +5798,6 @@ with pkgs;
 
   ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
 
-  fortran-language-server =
-    python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server
-      { };
-
   inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd;
 
   antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
@@ -8189,8 +8179,6 @@ with pkgs;
     };
   };
 
-  rshell = python3.pkgs.callPackage ../development/embedded/rshell { };
-
   SDL = SDL_compat;
   SDL2 = sdl2-compat;
 
@@ -9023,8 +9011,6 @@ with pkgs;
 
   mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
 
-  mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };
-
   moodle = callPackage ../servers/web-apps/moodle { };
 
   moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
@@ -9353,8 +9339,6 @@ with pkgs;
 
   public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { };
 
-  spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { };
-
   pypiserver = with python3Packages; toPythonApplication pypiserver;
 
   qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
@@ -10925,8 +10909,6 @@ with pkgs;
 
   i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
 
-  kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { };
-
   waybox = callPackage ../by-name/wa/waybox/package.nix {
     wlroots = wlroots_0_17;
   };
@@ -11212,14 +11194,6 @@ with pkgs;
 
   luddite = with python3Packages; toPythonApplication luddite;
 
-  lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
-    inherit (pkgs) meson;
-  };
-  lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
-  lutris-free = lutris.override {
-    steamSupport = false;
-  };
-
   lxi-tools = callPackage ../tools/networking/lxi-tools { };
   lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
 
@@ -11861,10 +11835,6 @@ with pkgs;
     waylandSupport = true;
   };
 
-  syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
-
-  syncplay-nogui = syncplay.override { enableGUI = false; };
-
   inherit
     (callPackages ../applications/networking/syncthing {
       inherit (darwin) autoSignDarwinBinariesHook;
@@ -12763,8 +12733,6 @@ with pkgs;
   steam-run = steam.run;
   steam-run-free = steam.run-free;
 
-  steamback = python3.pkgs.callPackage ../tools/games/steamback { };
-
   protonup-ng = with python3Packages; toPythonApplication protonup-ng;
 
   stuntrally = callPackage ../games/stuntrally { boost = boost183; };
@@ -13688,8 +13656,6 @@ with pkgs;
     else
       haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;
 
-  nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { };
-
   nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
 
   nixos-artwork = recurseIntoAttrs (callPackage ../data/misc/nixos-artwork { });

From dab165ebaffc023fe9c6e0d1bc320d5921d1441d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 01:33:26 +0000
Subject: [PATCH 134/196] go-judge: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 9f177e26656b..b6501a97d4e6 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-judge";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "criyle";
     repo = "go-judge";
     rev = "v${version}";
-    hash = "sha256-qSTtXLjtrwwp6ipnquzoDM6yzAtoE3WIAXqWFCuOI9s=";
+    hash = "sha256-+NqBAxes9xnuyTN0ITrEDlRC8EvgUGBulF3EQx5XSDQ=";
   };
 
-  vendorHash = "sha256-+KPbY63wF+zh7R7OVyfBI7Nuf8kAh35dxJIIRrP5Js0=";
+  vendorHash = "sha256-2yuWsNa4jyJEFAox0KMfTYAnwVv622hHErEd2RtJgl4=";
 
   tags = [
     "nomsgpack"

From 08bcacdb6242231fc07409eb5884d8f379ac587e Mon Sep 17 00:00:00 2001
From: Merikei <73759842+Merikei@users.noreply.github.com>
Date: Sat, 10 Jan 2026 01:46:28 +0000
Subject: [PATCH 135/196] doc: fix end quote typo

---
 doc/languages-frameworks/python.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index fad930c8206d..d367775d60c2 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -192,7 +192,7 @@ following are specific to `buildPythonPackage`:
   When `__structuredAttrs = false`, the attribute `makeWrapperArgs` is passed as a space-separated string to the build script. Developers should use `prependToVar` or `appendToVar` to add arguments to it in build phases, or use `__structuredAttrs = true` to ensure that `makeWrapperArgs` is passed as a Bash array.
 
   For compatibility purposes,
-  when `makeWrapperArgs` shell variable is specified as a space-separated string (instead of a Bash array) in the build script, the string content is Bash-expanded before concatenated into the `wrapProgram` command. Still, developers should not rely on such behaviours, but use `__structuredAttrs = true` to specify flags containing spaces (e.g. `makeWrapperArgs = [ "--set" "GREETING" "Hello, world!" ]`), or use -pre and -post phases to specify flags with Bash-expansions (e.g. `preFixup = ''makeWrapperArgs+=(--prefix PATH : "$SOME_PATH")`'').
+  when `makeWrapperArgs` shell variable is specified as a space-separated string (instead of a Bash array) in the build script, the string content is Bash-expanded before concatenated into the `wrapProgram` command. Still, developers should not rely on such behaviours, but use `__structuredAttrs = true` to specify flags containing spaces (e.g. `makeWrapperArgs = [ "--set" "GREETING" "Hello, world!" ]`), or use -pre and -post phases to specify flags with Bash-expansions (e.g. `preFixup = ''makeWrapperArgs+=(--prefix PATH : "$SOME_PATH")''`).
   :::
 
 * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this

From d8c88a593b4fb2234672cc98a6e020901ce8d7be Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 14 Dec 2025 03:22:49 +0100
Subject: [PATCH 136/196] xf86-video-ark: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoark

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-ark/package.nix    | 53 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 57 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-ark/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-ark/package.nix b/pkgs/by-name/xf/xf86-video-ark/package.nix
new file mode 100644
index 000000000000..8b3d6db048c4
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-ark/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-ark";
+  version = "0.7.6";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-ark";
+    tag = "xf86-video-ark-${finalAttrs.version}";
+    hash = "sha256-IE35hEZVsfxjwrNxV/xtw8bdox9pwlO/Ra8vkcK19pM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-ark-(.*)" ]; };
+  };
+
+  meta = {
+    description = "ARK Logic video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.aarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c450d989311e..3f202dc3db72 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -132,6 +132,7 @@
   xf86-input-synaptics,
   xf86-input-vmmouse,
   xf86-input-void,
+  xf86-video-ark,
   xfd,
   xfontsel,
   xfs,
@@ -342,6 +343,7 @@ self: with self; {
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
   xf86inputvoid = xf86-input-void;
+  xf86videoark = xf86-video-ark;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -622,44 +624,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoark = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-ark";
-      version = "0.7.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz";
-        sha256 = "0p88blr3zgy47jc4aqivc6ypj4zq9pad1cl70wwz9xig29w9xk2s";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoast = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a12a0f04a0aa..4d12e6b5f0b9 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -464,6 +464,7 @@ print OUT <<EOF;
   xf86-input-synaptics,
   xf86-input-vmmouse,
   xf86-input-void,
+  xf86-video-ark,
   xfd,
   xfontsel,
   xfs,
@@ -674,6 +675,7 @@ self: with self; {
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
   xf86inputvoid = xf86-input-void;
+  xf86videoark = xf86-video-ark;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0a728f4843e5..f7463b4f8e99 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -120,12 +120,6 @@ self: super:
 
   xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
 
-  xf86videoark = super.xf86videoark.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      badPlatforms = lib.platforms.aarch64;
-    };
-  });
-
   xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: {
     meta = attrs.meta // {
       badPlatforms = lib.platforms.aarch64;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b180eb4e017f..4c48a185879e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -9,7 +9,6 @@ mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz

From 6d88a2280101c1d4a8248041368474da60e41d7b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 14 Dec 2025 03:55:56 +0100
Subject: [PATCH 137/196] xf86-video-geode: refactor, move to pkgs/by-name &
 rename from xorg.xf86videogeode

relevant changes:
- switch to GitLab source instead of release tarball

New license just dropped: Just put the third clause of BSD-3-Clause
into the X11 license. I'm not gonna add this to spdx because geode
is fucking old and probably deprecated in a few years anyway, maybe
before Xorg. The package is not even listed on repology, despite being
packaged in most distros.
---
 lib/licenses.nix                              |  5 ++
 pkgs/by-name/xf/xf86-video-geode/package.nix  | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 6 files changed, 65 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-geode/package.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index ce2e15951fc1..63fc954d50a6 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -1542,6 +1542,11 @@ lib.mapAttrs mkLicense (
       fullName = "X11 License";
     };
 
+    x11BsdClause = {
+      fullName = "X11 License with third BSD clause";
+      url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/blob/d147c3f1b6907ae9db6f12853cedd450537d99d2/COPYING";
+    };
+
     x11NoPermitPersons = {
       spdxId = "X11-no-permit-persons";
       fullName = "X11 no permit persons clause";
diff --git a/pkgs/by-name/xf/xf86-video-geode/package.nix b/pkgs/by-name/xf/xf86-video-geode/package.nix
new file mode 100644
index 000000000000..dba6eaf99ee3
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-geode/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-geode";
+  version = "2.18.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-geode";
+    tag = "xf86-video-geode-${finalAttrs.version}";
+    hash = "sha256-y9fQpMg6qKjaQvDfqYbWscFomtzmHQ1cvzMaa4anhOE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-geode-(.*)" ]; };
+  };
+
+  meta = {
+    description = "AMD Geode GX and LX graphics driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode";
+    license = with lib.licenses; [
+      x11
+      x11BsdClause
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.aarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3f202dc3db72..de0b8fd1a972 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -133,6 +133,7 @@
   xf86-input-vmmouse,
   xf86-input-void,
   xf86-video-ark,
+  xf86-video-geode,
   xfd,
   xfontsel,
   xfs,
@@ -344,6 +345,7 @@ self: with self; {
   xf86inputvmmouse = xf86-input-vmmouse;
   xf86inputvoid = xf86-input-void;
   xf86videoark = xf86-video-ark;
+  xf86videogeode = xf86-video-geode;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -858,44 +860,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videogeode = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-geode";
-      version = "2.18.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz";
-        sha256 = "0a8c6g3ndzf76rrrm3dwzmndcdy4y2qfai4324sdkmi8k9szicjr";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoi128 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 4d12e6b5f0b9..318650fff725 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -465,6 +465,7 @@ print OUT <<EOF;
   xf86-input-vmmouse,
   xf86-input-void,
   xf86-video-ark,
+  xf86-video-geode,
   xfd,
   xfontsel,
   xfs,
@@ -676,6 +677,7 @@ self: with self; {
   xf86inputvmmouse = xf86-input-vmmouse;
   xf86inputvoid = xf86-input-void;
   xf86videoark = xf86-video-ark;
+  xf86videogeode = xf86-video-geode;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f7463b4f8e99..e9e1c4b134fb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -120,12 +120,6 @@ self: super:
 
   xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
 
-  xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      badPlatforms = lib.platforms.aarch64;
-    };
-  });
-
   xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: {
     meta = attrs.meta // {
       badPlatforms = lib.platforms.aarch64;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 4c48a185879e..061da8ce2be5 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -15,7 +15,6 @@ mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
-mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2

From b565132d52c9d551ffb95e9c6cfac3f449bc036b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 14 Dec 2025 04:38:37 +0100
Subject: [PATCH 138/196] xf86-video-nouveau: 3ee7cbc... -> 1.0.18, refactor,
 move to pkgs/by-name & rename from xorg.xf86videonouveau

---
 .../by-name/xf/xf86-video-nouveau/package.nix | 62 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 44 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           | 10 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 66 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-nouveau/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-nouveau/package.nix b/pkgs/by-name/xf/xf86-video-nouveau/package.nix
new file mode 100644
index 000000000000..7763c58ed1bb
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-nouveau/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libpciaccess,
+  udev,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-nouveau";
+  version = "1.0.18";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-nouveau";
+    tag = "xf86-video-nouveau-${finalAttrs.version}";
+    hash = "sha256-gsrq32h0EKesivMoNbe1Thlc7FfubmS6zdwQmMxHsOk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libdrm
+    libpciaccess
+    udev
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-nouveau-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Xorg X server driver for NVIDIA video cards";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau";
+    license = with lib.licenses; [
+      mit
+      hpndSellVariant
+      # possibly unfree code according to the manpage in the repo
+      # https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/merge_requests/17
+      # unfree
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index de0b8fd1a972..bec8cbc83b3f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -134,6 +134,7 @@
   xf86-input-void,
   xf86-video-ark,
   xf86-video-geode,
+  xf86-video-nouveau,
   xfd,
   xfontsel,
   xfs,
@@ -346,6 +347,7 @@ self: with self; {
   xf86inputvoid = xf86-input-void;
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
+  xf86videonouveau = xf86-video-nouveau;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -1084,48 +1086,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videonouveau = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libdrm,
-      udev,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-nouveau";
-      version = "3ee7cbca8f9144a3bb5be7f71ce70558f548d268";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2";
-        sha256 = "0rhs3z274jdzd82pcsl25xn8hmw6i4cxs2kwfnphpfhxbbkiq7wl";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libdrm
-        udev
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videonv = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 318650fff725..301bbef80990 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -466,6 +466,7 @@ print OUT <<EOF;
   xf86-input-void,
   xf86-video-ark,
   xf86-video-geode,
+  xf86-video-nouveau,
   xfd,
   xfontsel,
   xfs,
@@ -678,6 +679,7 @@ self: with self; {
   xf86inputvoid = xf86-input-void;
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
+  xf86videonouveau = xf86-video-nouveau;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e9e1c4b134fb..a71027c2dd17 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -146,16 +146,6 @@ self: super:
     configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
   });
 
-  xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [
-      autoreconfHook
-      buildPackages.xorg.utilmacros # For xorg-utils.m4 macros
-      buildPackages.xorg.xorgserver # For xorg-server.m4 macros
-    ];
-    # fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'?
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  });
-
   xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {
     meta = attrs.meta // {
       broken = isDarwin;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 061da8ce2be5..76747a5e9fcc 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -20,7 +20,6 @@ mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
-https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2

From 580c18b275eefabb630894c14e87fc481d341cd1 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 14 Dec 2025 04:54:05 +0100
Subject: [PATCH 139/196] xf86-video-s3virge: refactor, move to pkgs/by-name &
 rename from xorg.xf86videos3virge

relevant changes:
- switch to GitLab source instead of release tarball
---
 .../by-name/xf/xf86-video-s3virge/package.nix | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 61 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-s3virge/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-s3virge/package.nix b/pkgs/by-name/xf/xf86-video-s3virge/package.nix
new file mode 100644
index 000000000000..c36de3ad4838
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-s3virge/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-s3virge";
+  version = "1.11.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-s3virge";
+    tag = "xf86-video-s3virge-${finalAttrs.version}";
+    hash = "sha256-UxAzsevKIMA3p6Q5cKjRPOku4cfbXiLmcJQWNEjpu7s=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-s3virge-(.*)" ]; };
+  };
+
+  meta = {
+    description = "S3 ViRGE video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3virge";
+    license = with lib.licenses; [
+      x11
+      free # unknown free license TODO add to spdx
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.aarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index bec8cbc83b3f..e7a7357ab29b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -135,6 +135,7 @@
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-nouveau,
+  xf86-video-s3virge,
   xfd,
   xfontsel,
   xfs,
@@ -348,6 +349,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
+  xf86videos3virge = xf86-video-s3virge;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -1292,44 +1294,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videos3virge = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-s3virge";
-      version = "1.11.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz";
-        sha256 = "1qzfcq3rlpfdb6qxz8hrp9py1q11vyzl4iqxip1vpgfnfn83vl6f";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videosavage = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 301bbef80990..a7aa264a8e2f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -467,6 +467,7 @@ print OUT <<EOF;
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-nouveau,
+  xf86-video-s3virge,
   xfd,
   xfontsel,
   xfs,
@@ -680,6 +681,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
+  xf86videos3virge = xf86-video-s3virge;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a71027c2dd17..8ea7770c0999 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -126,12 +126,6 @@ self: super:
     };
   });
 
-  xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      badPlatforms = lib.platforms.aarch64;
-    };
-  });
-
   xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: {
     meta = attrs.meta // {
       platforms = lib.platforms.linux;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 76747a5e9fcc..3ebc527364f3 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -25,7 +25,6 @@ mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
 mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz

From d0fcd3892c51df7f69759c52690f3d872ccc1e60 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 14 Dec 2025 05:07:11 +0100
Subject: [PATCH 140/196] xf86-video-v4l: refactor, move to pkgs/by-name &
 rename from xorg.xf86videov4l

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-v4l/package.nix    | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 60 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-v4l/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-v4l/package.nix b/pkgs/by-name/xf/xf86-video-v4l/package.nix
new file mode 100644
index 000000000000..aeb2813eea2d
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-v4l/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-v4l";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-v4l";
+    tag = "xf86-video-v4l-${finalAttrs.version}";
+    hash = "sha256-uCKeecAqHycYduKaDVMupGvMN84vHeF3ECyVchkXwdA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-v4l-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Video 4 Linux adaptor driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l";
+    license = with lib.licenses; [
+      # MIT AND X11 AND (GPL-2.0-or-later OR BSD-3-Clause)
+      mit
+      x11
+      gpl2Plus
+      bsd3
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e7a7357ab29b..9923fae3d974 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -136,6 +136,7 @@
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
+  xf86-video-v4l,
   xfd,
   xfontsel,
   xfs,
@@ -350,6 +351,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
+  xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -1636,42 +1638,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videov4l = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-v4l";
-      version = "0.3.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2";
-        sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videovboxvideo = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a7aa264a8e2f..aeb72a556c36 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -468,6 +468,7 @@ print OUT <<EOF;
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
+  xf86-video-v4l,
   xfd,
   xfontsel,
   xfs,
@@ -682,6 +683,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
+  xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8ea7770c0999..c6a3db5821fa 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -126,12 +126,6 @@ self: super:
     };
   });
 
-  xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      platforms = lib.platforms.linux;
-    };
-  });
-
   xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: {
     env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-overflow" ];
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3ebc527364f3..a06f37eefefd 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -34,7 +34,6 @@ mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz

From ef5c6d7d76d82175dce5d0b6a4b03d4233d5a1f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 02:25:30 +0000
Subject: [PATCH 141/196] tomat: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix
index 5dd57ae11029..5aaf5eb5e467 100644
--- a/pkgs/by-name/to/tomat/package.nix
+++ b/pkgs/by-name/to/tomat/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tomat";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "jolars";
     repo = "tomat";
     tag = "v${version}";
-    hash = "sha256-i6gakWbY6N1FB1lAfONuDsoXv5PcaXqnbmfuSBp/DC0=";
+    hash = "sha256-EihzQT+JUO9PlXgYg3R1VbBxRfOnw4b94oRV/mKZ60U=";
   };
 
-  cargoHash = "sha256-dLdo0mtf9IO9mBc6MI1Q6fu8x6+TmlFN6rfEFC6cFek=";
+  cargoHash = "sha256-xCdQAhK3/0meat2YvsWJHPz0IDYEvwcHi8pd0mckELQ=";
 
   nativeBuildInputs = [
     pkg-config

From 3eec9941f3e3d55040d6a4f95db445524ec5dca4 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Fri, 9 Jan 2026 19:38:04 -0500
Subject: [PATCH 142/196] opencode: 1.1.8 -> 1.1.11

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 1e929fe4fa42..d88772d19622 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -14,12 +14,12 @@
 }:
 let
   pname = "opencode";
-  version = "1.1.8";
+  version = "1.1.11";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${version}";
-    hash = "sha256-i0PYcI3qM52jcl72dqHxiBUQH5n4oBXTlxJqvWNS8CQ=";
+    hash = "sha256-PZB9XsuUr8EzXDhlzM3tKANFAXc19RheIyxSXjLuZrM=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -71,7 +71,7 @@ let
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-NbKp1XXTirox/UnBSn/VfLtPXnjrDJxU94MaAh22wk4=";
+    outputHash = "sha256-vRIWQt02VljcoYG3mwJy8uCihSTB/OLypyw+vt8LuL8=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 6cef2925c5d8c0d76f72e0b684d8c3732c782388 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 03:01:14 +0000
Subject: [PATCH 143/196] zola: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix
index 568ec219fec1..4b1f2b59a4af 100644
--- a/pkgs/by-name/zo/zola/package.nix
+++ b/pkgs/by-name/zo/zola/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "getzola";
     repo = "zola";
     rev = "v${version}";
-    hash = "sha256-+/0MhKKDSbOEa5btAZyaS3bQPeGJuski/07I4Q9v9cg=";
+    hash = "sha256-ahinXciTzG4fBtWKLSWP9uFG3Z3M7NHg60mcziMV1qM=";
   };
 
-  cargoHash = "sha256-K2wdq61FVVG9wJF+UcRZyZ2YSEw3iavboAGkzCcTGkU=";
+  cargoHash = "sha256-37AoQOfntpdLb0EPRmlgqrElLts7IGW0fr8g2TeTTRc=";
 
   nativeBuildInputs = [
     pkg-config

From 885af7691eb155739cce7e380da6d2d0173ab16d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 03:24:41 +0000
Subject: [PATCH 144/196] workset: 0.2.1 -> 0.3.0

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

diff --git a/pkgs/by-name/wo/workset/package.nix b/pkgs/by-name/wo/workset/package.nix
index 78f18ad21b8b..ed5b10b1dac1 100644
--- a/pkgs/by-name/wo/workset/package.nix
+++ b/pkgs/by-name/wo/workset/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "workset";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "fossable";
     repo = "workset";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aLSpgxTnyloMbCAIf2Uk9w0niJcJ2XZvcIl+T8Dq40U=";
+    hash = "sha256-Ryi5zLlOVNVtHhMZ5PglNFKVrrSlrcj3TOoeHKjGAic=";
   };
 
-  cargoHash = "sha256-5bOWtKpC4ZtU5gMvwErd7Xqy+awjp7QlnQIFQ+eHGoA=";
+  cargoHash = "sha256-VJ1vXEZkOYUGba8hfgdlNpT0QAvHDPdR+TNhDNprKNk=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 0876c7d0ca778946db5c3aa49f6942d530e7ee2d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 10 Jan 2026 13:12:33 +0800
Subject: [PATCH 145/196] uv: 0.9.22 -> 0.9.24

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 11086b6e757b..5c191539a1d0 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.9.22";
+  version = "0.9.24";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-6LdOzNnmPPpfoi3/QtsZgiAb39ClZVRpNqzZ0w/gQrE=";
+    hash = "sha256-ZgZhEgSzCje7penbL1bgSyt2zu42dar9v9RBQUMv96U=";
   };
 
-  cargoHash = "sha256-2u9OAFoSD4XvEAG4bzQSGFKnMI3XljLL8dgJdk4hlf0=";
+  cargoHash = "sha256-D00LMdCQ3j5Uguc6aU1TYkSezy35r0+yRtI17HxAX64=";
 
   buildInputs = [
     rust-jemalloc-sys

From a472d85787ed426cdd437dc959fbc5744951eb90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 06:07:16 +0000
Subject: [PATCH 146/196] highscore-mupen64plus: 0-unstable-2025-12-28 ->
 0-unstable-2026-01-05

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

diff --git a/pkgs/by-name/hi/highscore-mupen64plus/package.nix b/pkgs/by-name/hi/highscore-mupen64plus/package.nix
index c681af6bd9ee..8ec714a8f5f8 100644
--- a/pkgs/by-name/hi/highscore-mupen64plus/package.nix
+++ b/pkgs/by-name/hi/highscore-mupen64plus/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-mupen64plus";
-  version = "0-unstable-2025-12-28";
+  version = "0-unstable-2026-01-05";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mupen64plus-highscore";
-    rev = "94ab5644e5363cf359b334ac057f3f36d24910be";
-    hash = "sha256-Q+6iL7DGr62C2fVEP0EWCgm7S7AYAW1C2X1GPKbI7aY=";
+    rev = "84f913ed4433f37b8a990cace2f9e1cfb641e2dc";
+    hash = "sha256-Afrb7WUw5QeST/NRM06UIyUTzxvrGqayFneaXjAw6aM=";
   };
 
   postPatch = ''

From 4924ab9792f49be338fe3c7940438731b16dbb0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 06:09:50 +0000
Subject: [PATCH 147/196] highscore-mednafen: 0-unstable-2025-12-28 ->
 0-unstable-2026-01-05

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

diff --git a/pkgs/by-name/hi/highscore-mednafen/package.nix b/pkgs/by-name/hi/highscore-mednafen/package.nix
index 27283551044a..8f5ba7d3ec83 100644
--- a/pkgs/by-name/hi/highscore-mednafen/package.nix
+++ b/pkgs/by-name/hi/highscore-mednafen/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-mednafen";
-  version = "0-unstable-2025-12-28";
+  version = "0-unstable-2026-01-05";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mednafen-highscore";
-    rev = "58404782e3f69186c7be821a880cf1442b240f2f";
-    hash = "sha256-FXSfBAPpi+Ch9vuPQf6nqLMKxvrbXG+6F5HHaU9fs2s=";
+    rev = "fc1d23378594c5ed6aa1d89d555b4276214e1e11";
+    hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/highscore";

From f9d9b3b0df96acca543d6c6ff0ff6527dc960072 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 06:11:52 +0000
Subject: [PATCH 148/196] highscore-bsnes: 0-unstable-2025-12-23 ->
 0-unstable-2026-01-06

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

diff --git a/pkgs/by-name/hi/highscore-bsnes/package.nix b/pkgs/by-name/hi/highscore-bsnes/package.nix
index de023330065e..55e817beec8a 100644
--- a/pkgs/by-name/hi/highscore-bsnes/package.nix
+++ b/pkgs/by-name/hi/highscore-bsnes/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-bsnes";
-  version = "0-unstable-2025-12-23";
+  version = "0-unstable-2026-01-06";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "bsnes";
-    rev = "df88234e314f97a2ca124df1982e4bd39f6fcea0";
-    hash = "sha256-QI9mRvcsPkVBhUZlhchgGVPROj7HAqgtHHnbHVzIIBI=";
+    rev = "7e26b2970c95404ef9a95bed6e509c8923f2815d";
+    hash = "sha256-mOJPhhHqVrYIHYUZ7z1fA8AD6yjWcnUxecMorsaPvFg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/bsnes";

From 9706fcd5223e60ae70d65e70dbf20f0895c9ade0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 06:17:03 +0000
Subject: [PATCH 149/196] highscore-sameboy: 0-unstable-2026-01-04 ->
 0-unstable-2026-01-05

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

diff --git a/pkgs/by-name/hi/highscore-sameboy/package.nix b/pkgs/by-name/hi/highscore-sameboy/package.nix
index 300624458360..7a807719b8ab 100644
--- a/pkgs/by-name/hi/highscore-sameboy/package.nix
+++ b/pkgs/by-name/hi/highscore-sameboy/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-sameboy";
-  version = "0-unstable-2026-01-04";
+  version = "0-unstable-2026-01-05";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "SameBoy";
-    rev = "80578af6531ac2da2a9ba76318e8e1dab856fabe";
-    hash = "sha256-LB0HTcTNEe9WlxTi8xwYsbas0SX6Cs2VNo/ljyrcxzQ=";
+    rev = "8c9700abf0bbff49003540ddbe339110bf0b05a9";
+    hash = "sha256-IEuqc2pTWHE5nwgANPcsuufE2U5VsqGQr63ikH47BO4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/highscore";

From b1e562bf593e55a7b9669cfaef8281db75030467 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 06:42:59 +0000
Subject: [PATCH 150/196] ersatztv: 25.9.0 -> 26.1.1

---
 pkgs/by-name/er/ersatztv/nuget-deps.json | 271 +++++++++--------------
 pkgs/by-name/er/ersatztv/package.nix     |   4 +-
 2 files changed, 110 insertions(+), 165 deletions(-)

diff --git a/pkgs/by-name/er/ersatztv/nuget-deps.json b/pkgs/by-name/er/ersatztv/nuget-deps.json
index 5d37d3d477e1..3b58de4b7652 100644
--- a/pkgs/by-name/er/ersatztv/nuget-deps.json
+++ b/pkgs/by-name/er/ersatztv/nuget-deps.json
@@ -46,8 +46,8 @@
   },
   {
     "pname": "BlazorSortable",
-    "version": "5.1.6",
-    "hash": "sha256-aRw6nbwi8LnS2I7jlt75cH0ECnmhQkU7o8JoUKNpOns="
+    "version": "5.2.1",
+    "hash": "sha256-T+0zzQOq81NJUtER+9Ag5DQvn1v3+rbA5AOu/zqWFVg="
   },
   {
     "pname": "Blurhash.Core",
@@ -136,13 +136,13 @@
   },
   {
     "pname": "ExtendedNumerics.BigDecimal",
-    "version": "3001.1.0.233",
-    "hash": "sha256-XP9qmY+lYNWQ4NVvhZ4wPrIXS0Dj6DTaS9wkTfQdryc="
+    "version": "3003.0.0.346",
+    "hash": "sha256-tAGqjmLbUYak5D2CKb1AOzzOJt4MFlR4zT8MyIuXqmw="
   },
   {
     "pname": "FluentValidation",
-    "version": "12.1.0",
-    "hash": "sha256-9I30avP9CoS1usoqOuGrpJW/OuSa6b2M5/z935182kQ="
+    "version": "12.1.1",
+    "hash": "sha256-lyAUmtH266O3GsYQUwNKjeDM2Fq3vs8EsQRxT5AxVRs="
   },
   {
     "pname": "FluentValidation.AspNetCore",
@@ -186,8 +186,8 @@
   },
   {
     "pname": "Heron.MudCalendar",
-    "version": "3.3.0",
-    "hash": "sha256-1QVTu7VuJeBNqf0wBc9wPJBQ352Ko7neC+4iL5Tiolw="
+    "version": "3.4.0",
+    "hash": "sha256-QVrlIlO35o2LElr+Ac3F6UZHlI9fosIjheucWBF+QZU="
   },
   {
     "pname": "HtmlSanitizer",
@@ -216,18 +216,18 @@
   },
   {
     "pname": "Json.More.Net",
-    "version": "2.1.1",
-    "hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU="
+    "version": "2.2.0",
+    "hash": "sha256-Hb4ylcT/6bLHVADpnjoBJKyTR3cU+WjYlblO79A+SSU="
   },
   {
     "pname": "JsonPointer.Net",
-    "version": "5.3.1",
-    "hash": "sha256-nV1r0doxPiApc2sEI4AulBz+arLWF2VSnHm9tymBJzE="
+    "version": "6.0.1",
+    "hash": "sha256-iIvOHz6jjTsGnXyxOK71z2F8gh21TmQS4A9SLB4u93A="
   },
   {
     "pname": "JsonSchema.Net",
-    "version": "7.4.0",
-    "hash": "sha256-j6QMakexHXNAsf7emMnYgjTvnXSj0xCHgYLs184Z0p0="
+    "version": "8.0.5",
+    "hash": "sha256-zFSEmqckius1fa/vxhJEMoNC/RU25kF3AStyMwxHCPM="
   },
   {
     "pname": "LanguageExt.Core",
@@ -316,33 +316,33 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.JwtBearer",
-    "version": "9.0.11",
-    "hash": "sha256-uz9t6volHVoUM0j1GFXXfWU157ba05TvZBnres47roA="
+    "version": "10.0.1",
+    "hash": "sha256-x30FL5t31tGtbgTTHZlIEIky+J2Slba5YuLqytt56l4="
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect",
-    "version": "9.0.11",
-    "hash": "sha256-RhcnttgtQtLpNkX+yqrKu8wqlrS9muxSA0GLGAfRMJI="
+    "version": "10.0.1",
+    "hash": "sha256-fMLVW4xy3tU2pXbd/hX/JxxCRO02eGEuccc7uv9r+UE="
   },
   {
     "pname": "Microsoft.AspNetCore.JsonPatch",
-    "version": "9.0.11",
-    "hash": "sha256-MeQFvZt5GIEs9IQILjDwC72GlgyIMUH52nxsJbKCNdo="
+    "version": "10.0.1",
+    "hash": "sha256-bbX3CGoxG5E8RPUBeEvG9Us8l8WxBHRcjxPR3mJLnbg="
   },
   {
     "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
-    "version": "9.0.11",
-    "hash": "sha256-+WtuaFv9zL11yQpFDYv87BeXulu63UkqvH+cNJa3EY4="
+    "version": "10.0.1",
+    "hash": "sha256-E1ciFt7uy39aKRDfmXrHJ6e4SsaWm+C3inQqTzQEC2U="
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "9.0.11",
-    "hash": "sha256-FvIqXjGE0RqejaBu43zcdCA3toYLTELPCRpnJp4kYuk="
+    "version": "10.0.1",
+    "hash": "sha256-O31K6+++fM7XWd0JGrzmzLrtydYGiI4efzv+WqAdnQA="
   },
   {
     "pname": "Microsoft.AspNetCore.SpaServices.Extensions",
-    "version": "9.0.11",
-    "hash": "sha256-xD0gi4AGjRnIALAUC+YbugVHEmt9sa4m9JOlf2/NuUs="
+    "version": "10.0.1",
+    "hash": "sha256-8n3nq/eDMGxthVnYXCMud8+F0h5Y9ZelF53KXNuZ8gk="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -506,13 +506,13 @@
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
-    "version": "9.0.11",
-    "hash": "sha256-6+v6bVecvv1q47FscMLdEuMYJmpwonIWmMXGo5td5Sg="
+    "version": "10.0.1",
+    "hash": "sha256-v+YRzli27wGy5Oh6PqSMGtRiFcCTcT4xBFLHhUNFWvQ="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI="
+    "version": "10.0.1",
+    "hash": "sha256-qVLAEqxPK/dNq+z1a6D9NqdcSg/18sfzZhlBWMkqV/A="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
@@ -521,8 +521,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "10.0.0",
-    "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4="
+    "version": "10.0.1",
+    "hash": "sha256-Qb7xK6VEZDas0lJFaW1suKdFjtkSYwLHHxkQEfWIU2A="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
@@ -541,34 +541,24 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "10.0.0",
-    "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.10",
-    "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
+    "version": "10.0.1",
+    "hash": "sha256-7xdHie4uHwoGZz5yUT4vWg2EWvkLvsSzItWCoqm4dTM="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "10.0.0",
     "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "10.0.1",
+    "hash": "sha256-s4PDp+vtzdxKIxnOT3+dDRoTDopyl8kqmmw4KDnkOtQ="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "8.0.0",
     "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
   },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
-  },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "9.0.11",
@@ -586,13 +576,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "9.0.0",
-    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "9.0.10",
-    "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
+    "version": "10.0.1",
+    "hash": "sha256-fiqTHE6EfaUXICaVrWzQEU/K6GjQNac6yRNErig6wRk="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -601,8 +586,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.0",
-    "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
+    "version": "10.0.1",
+    "hash": "sha256-RKOB+zPrtQNUbJY/1jR54rKOM8KHPgynPExxugku3I8="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -611,8 +596,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
+    "version": "10.0.1",
+    "hash": "sha256-zNUpau51ds7iQTaSUTFtyTHIUoinYc129W50CnufMdQ="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -624,11 +609,6 @@
     "version": "8.0.2",
     "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "9.0.11",
@@ -636,8 +616,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "9.0.0",
-    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
+    "version": "10.0.0",
+    "hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
@@ -656,8 +636,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "10.0.0",
-    "hash": "sha256-o7QkCisEcFIh227qBUfWFci2ns4cgEpLqpX7YvHGToQ="
+    "version": "10.0.1",
+    "hash": "sha256-MoBF0X5AVT0xORvhNvpc9DA5dSOJhjrfGeWDvEJQOoc="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
@@ -666,8 +646,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY="
+    "version": "10.0.1",
+    "hash": "sha256-tEt6VaaDR7bICKHiCp0l2Cmz8u+FCYORLVNAaJymGM8="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
@@ -676,8 +656,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="
+    "version": "10.0.1",
+    "hash": "sha256-IYtaZ5nssj9RPHL+DODXt9Z2IvTtj8rKuLQuyoMqo+w="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
@@ -686,13 +666,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
+    "version": "10.0.1",
+    "hash": "sha256-2t+yF23Ac9MvytZK8hym+aUYynuAFZVdKdcRVvVsdXo="
   },
   {
     "pname": "Microsoft.Extensions.Http",
-    "version": "10.0.0",
-    "hash": "sha256-gnsO9erEi7xLS3QwYukcrzPDpcUgRkNFnGzPARHVjrs="
+    "version": "10.0.1",
+    "hash": "sha256-Kme3514XmxnZ6Ke+itb/b/bgc9allgOAfwHulPNfYO8="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -701,13 +681,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.0",
-    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.10",
-    "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
+    "version": "10.0.1",
+    "hash": "sha256-zuLP3SIpCToMOlIPOEv3Kq8y/minecd8k8GSkxFo13E="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -724,6 +699,11 @@
     "version": "10.0.0",
     "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "10.0.1",
+    "hash": "sha256-NRk0feNE1fgi/hyO0AVDbSGJQRT+9yte6Lpm4Hz/2Bs="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "8.0.2",
@@ -734,16 +714,6 @@
     "version": "8.0.3",
     "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.10",
-    "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
-  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "9.0.11",
@@ -751,18 +721,18 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "9.0.10",
-    "hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI="
+    "version": "10.0.1",
+    "hash": "sha256-/7ywcFsEmmQzWEcIvxoGAYHF0oDSXV/LTDAiW/MNQtg="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "9.0.10",
-    "hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E="
+    "version": "10.0.1",
+    "hash": "sha256-m/E02c5NSCYyH4THNKxpnsi3Kp8gqOi2aPrfXx7sQ9s="
   },
   {
     "pname": "Microsoft.Extensions.Logging.TraceSource",
-    "version": "9.0.10",
-    "hash": "sha256-VrOfGKu31ySmSAPq0A+bE+ZfQytKGEe2A8dfKq1idK0="
+    "version": "10.0.1",
+    "hash": "sha256-NS7P5jo7dtiH7DmyyipTIfaRf4ZwEJLU2UVG+4hlFSE="
   },
   {
     "pname": "Microsoft.Extensions.Options",
@@ -771,13 +741,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.0",
-    "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.10",
-    "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
+    "version": "10.0.1",
+    "hash": "sha256-vBiSS1vqAC7eDrpJNT4H3A9qLikCSAepnNRbry0mKnk="
   },
   {
     "pname": "Microsoft.Extensions.Options",
@@ -786,13 +751,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "10.0.0",
-    "hash": "sha256-XGAs5DxMvWnmjX8dqRwKY0vsuS40SHvsfJqB1rO4L7k="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "9.0.10",
-    "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
+    "version": "10.0.1",
+    "hash": "sha256-1CNSVXZ3RAH4vzbYDqcQHl9c/YBhuSfrFUXCLIx5/rY="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -801,13 +761,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "10.0.1",
+    "hash": "sha256-EXmukq09erT4s+miQpBSYy3IY4HxxKlwEPL43/KoyEc="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.0",
-    "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -901,8 +861,8 @@
   },
   {
     "pname": "Microsoft.OpenApi",
-    "version": "1.6.17",
-    "hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk="
+    "version": "2.0.0",
+    "hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k="
   },
   {
     "pname": "Microsoft.SqlServer.Server",
@@ -914,11 +874,6 @@
     "version": "160.1000.6",
     "hash": "sha256-XU5s3iwz8JIwIrG5Xe8wZJ8cuCUx7q3fOLYzNHmA9jg="
   },
-  {
-    "pname": "Microsoft.VisualStudio.Threading.Analyzers",
-    "version": "17.14.15",
-    "hash": "sha256-wv0Hi7pjPYeSwDFyaa8baIOyiUraVfudmVtpm0okoYU="
-  },
   {
     "pname": "Mono.TextTemplating",
     "version": "3.0.0",
@@ -941,13 +896,13 @@
   },
   {
     "pname": "NCalc.Core",
-    "version": "5.8.0",
-    "hash": "sha256-gLexewkgetT42BHiJv5O62TKMYP/fmJlwmH2fdEyyTk="
+    "version": "5.11.0",
+    "hash": "sha256-THgAix81mZxztHNMf5JlTPUGbcs1ZuRS3EVM7eFHseg="
   },
   {
     "pname": "NCalcSync",
-    "version": "5.8.0",
-    "hash": "sha256-vq+eXmt1ykzTiyUCF/NHtbLQ+3x0soarZfJH2h6neEM="
+    "version": "5.11.0",
+    "hash": "sha256-Kui0K2WuLS0filTnpdcA3/H/XqqDOjtKms97WqbulEw="
   },
   {
     "pname": "NETStandard.Library",
@@ -1021,8 +976,8 @@
   },
   {
     "pname": "Parlot",
-    "version": "1.5.2",
-    "hash": "sha256-gMKHhCNJTqjzZRGfXDTSUkJsqDCMY5TnJge0pAha4pE="
+    "version": "1.5.6",
+    "hash": "sha256-Ffbs7IpgN0aOKScBe64PGySnzWxapVSuM73fQmt+2nU="
   },
   {
     "pname": "Pomelo.EntityFrameworkCore.MySql",
@@ -1031,23 +986,23 @@
   },
   {
     "pname": "Refit",
-    "version": "8.0.0",
-    "hash": "sha256-YORvtZtDy0+wlUoJTur1lO5wJMovFY/jxoIvfkEkObI="
+    "version": "9.0.2",
+    "hash": "sha256-FTq+jJLV9ow3hTrzTBEYwuAibxY6m0XgExNeIGoAAK4="
   },
   {
     "pname": "Refit.HttpClientFactory",
-    "version": "8.0.0",
-    "hash": "sha256-VNVCqzq3HwPSRK/GrcBkbdhb2iRYrqoeDBvGnPNyrbA="
+    "version": "9.0.2",
+    "hash": "sha256-qxUm0NlJqoOPFRTu7ArdcSR696t5zCB+BniJv1+Xdkc="
   },
   {
     "pname": "Refit.Newtonsoft.Json",
-    "version": "8.0.0",
-    "hash": "sha256-KOZbdzoV/DBYgSNRzrDZOKhcKD1qQWZcakhTpVXBy08="
+    "version": "9.0.2",
+    "hash": "sha256-cxZtCv7gecMVIVzDrgjMBg81dEAq6DT9ccR10SKuFV4="
   },
   {
     "pname": "Refit.Xml",
-    "version": "8.0.0",
-    "hash": "sha256-Dy/5KaJ/Nq5p/T126Zj7gECEg7232uA+cWlKB+Y+OxQ="
+    "version": "9.0.2",
+    "hash": "sha256-FNP7WAnsjncwdSvj4j7mxP2I+O3TNiYzlaTYVBlMWEo="
   },
   {
     "pname": "RichTextKit.Stbear",
@@ -1056,8 +1011,8 @@
   },
   {
     "pname": "Scalar.AspNetCore",
-    "version": "2.11.0",
-    "hash": "sha256-9tJSfcbv2ECnH0ZQb2ovQWsgYzMoVIgSOmctKiQUzp0="
+    "version": "2.11.10",
+    "hash": "sha256-zSBsHjGTdwgia+v95wAdhNL7X1OuQKUd+CbkKKf/T90="
   },
   {
     "pname": "Scriban.Signed",
@@ -1081,18 +1036,18 @@
   },
   {
     "pname": "Serilog.AspNetCore",
-    "version": "9.0.0",
-    "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ="
+    "version": "10.0.0",
+    "hash": "sha256-z7dY6pY2Kkns20mpzZN2GOfV172gDWpamKDXHyLhEJs="
   },
   {
     "pname": "Serilog.Extensions.Hosting",
-    "version": "9.0.0",
-    "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw="
+    "version": "10.0.0",
+    "hash": "sha256-zFQMZkAPqg+j2ZI0oBN07hO+9MFiyy5YECRbz7msxeU="
   },
   {
     "pname": "Serilog.Extensions.Logging",
-    "version": "9.0.0",
-    "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw="
+    "version": "10.0.0",
+    "hash": "sha256-MgfWK/SJWUPxPzrnCUnxn6Sy+SBVmP3dYd60uy80NdE="
   },
   {
     "pname": "Serilog.Formatting.Compact",
@@ -1106,13 +1061,8 @@
   },
   {
     "pname": "Serilog.Settings.Configuration",
-    "version": "9.0.0",
-    "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
-  },
-  {
-    "pname": "Serilog.Sinks.Console",
-    "version": "6.0.0",
-    "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
+    "version": "10.0.0",
+    "hash": "sha256-WJK+wR7XPGAtD+vO+pjF5mn4qy8tO5uWIqHhovL0lAs="
   },
   {
     "pname": "Serilog.Sinks.Console",
@@ -1124,11 +1074,6 @@
     "version": "3.0.0",
     "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE="
   },
-  {
-    "pname": "Serilog.Sinks.File",
-    "version": "6.0.0",
-    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
-  },
   {
     "pname": "Serilog.Sinks.File",
     "version": "7.0.0",
@@ -1216,8 +1161,8 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "2.0.0",
-    "hash": "sha256-cUJTPCLcnA6959PGdwWw8zsjFxhYGI+SZeIxnMC/Cwc="
+    "version": "2.0.1",
+    "hash": "sha256-NDBiPUt/ZZIMBcLHpF/6IMX/UpfsC/XnH3p4i4MHCFw="
   },
   {
     "pname": "System.Composition",
@@ -1361,8 +1306,8 @@
   },
   {
     "pname": "WebMarkupMin.Core",
-    "version": "2.20.0",
-    "hash": "sha256-v0CpbncKPK7G7dnS0HQrdm+TXMJKhm8KK4T/eqNEeTI="
+    "version": "2.20.1",
+    "hash": "sha256-6ze4MOSfIKdvMJsroQRtESB8KG5XogO3xk4qOSkHpXQ="
   },
   {
     "pname": "Winista.MimeDetect",
diff --git a/pkgs/by-name/er/ersatztv/package.nix b/pkgs/by-name/er/ersatztv/package.nix
index bca793326ff3..3ab0ce766898 100644
--- a/pkgs/by-name/er/ersatztv/package.nix
+++ b/pkgs/by-name/er/ersatztv/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "ersatztv";
-  version = "25.9.0";
+  version = "26.1.1";
 
   src = fetchFromGitHub {
     owner = "ErsatzTV";
     repo = "ErsatzTV";
     rev = "v${version}";
-    sha256 = "sha256-+ZMDMKrJN+nX9FeSZ8RTFGRf161Mhpqd7jY9FLZWNqM=";
+    sha256 = "sha256-KWgzJAH3LllR+RjEpXSHa+lId6fcZZiGs94IKDftLZo=";
   };
   postPatch = ''
     # Remove config of development tools that don't end up in

From 8873e7c1a09222e5b2bae2ea0cd7af9784406251 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Fri, 2 Jan 2026 14:23:29 -0800
Subject: [PATCH 151/196] ezquake: cleanup

---
 pkgs/by-name/ez/ezquake/package.nix | 58 ++++++++++++++++-------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index c8c6865e755b..a302fd01c7df 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -1,30 +1,31 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  curl,
+  SDL2,
+  cmake,
+  curlMinimal,
   expat,
+  fetchFromGitHub,
   jansson,
-  libpng,
-  libjpeg,
+  lib,
   libGL,
   libX11,
+  libjpeg,
+  libpng,
   libsndfile,
-  pcre2,
   minizip,
-  cmake,
+  nix-update-script,
+  pcre2,
   pkg-config,
-  SDL2,
+  stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ezquake";
   version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "QW-Group";
-    repo = "ezquake" + "-source";
-    tag = version;
+    repo = "ezquake-source";
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-BIkBl6ncwo0NljuqOHJ3yQeDTcClh5FGssdFsKUjN90=";
   };
@@ -35,31 +36,36 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    SDL2
+    curlMinimal
+    expat
+    jansson
+    libGL
+    libX11
+    libjpeg
+    libpng
+    libsndfile
     minizip
     pcre2
-    expat
-    curl
-    jansson
-    libpng
-    libjpeg
-    libGL
-    libsndfile
-    libX11
-    SDL2
   ];
 
+  enableParallelBuilding = true;
+
   installPhase =
     let
       sys = lib.last (lib.splitString "-" stdenv.hostPlatform.system);
       arch = lib.head (lib.splitString "-" stdenv.hostPlatform.system);
     in
     ''
-      mkdir -p $out/bin
-      find .
-      mv ezquake-${sys}-${arch} $out/bin/ezquake
+      runHook preInstall
+
+      install -D \
+        ezquake-${sys}-${arch} $out/bin/${finalAttrs.meta.mainProgram}
+
+      runHook postInstall
     '';
 
-  enableParallelBuilding = true;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     homepage = "https://ezquake.com/";
@@ -69,4 +75,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ edwtjo ];
   };
-}
+})

From 919bcf965c06626dfb66415bc0e3292806bb9bf7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 13:40:32 +0100
Subject: [PATCH 152/196] citrix_workspace: remove unused code for unsupported
 versions

These unused version attributes were not imported into all-packages.nix
anymore anyway, so remove them entirely.
---
 .../remote/citrix-workspace/default.nix       | 22 ++++---------------
 .../remote/citrix-workspace/sources.nix       | 15 +------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index c6bd8596920b..22b7ea21154e 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -4,24 +4,10 @@
 # reference guide: https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide
 
 let
-  inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions;
+  supportedVersions = callPackage ./sources.nix { };
 
   toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}";
-
-  unsupported = lib.listToAttrs (
-    map (
-      x:
-      lib.nameValuePair (toAttrName x) (throw ''
-        Citrix Workspace at version ${x} is not supported anymore!
-
-        Actively supported releases are listed here:
-        https://www.citrix.com/support/product-lifecycle/workspace-app.html
-      '')
-    ) unsupportedVersions
-  );
-
-  supported = lib.mapAttrs' (
-    attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo)
-  ) supportedVersions;
 in
-supported // unsupported
+lib.mapAttrs' (
+  attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo)
+) supportedVersions
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 597d24487271..e7bceff1e805 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -106,18 +106,5 @@ let
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
-
-  # Retain attribute-names for abandoned versions of Citrix workspace to
-  # provide a meaningful error-message if it's attempted to use such an old one.
-  #
-  # The lifespans of Citrix products can be found here:
-  # https://www.citrix.com/support/product-lifecycle/workspace-app.html
-  unsupportedVersions = [
-    "23.02.0"
-    "23.07.0"
-    "23.09.0"
-  ];
 in
-{
-  inherit supportedVersions unsupportedVersions;
-}
+supportedVersions

From 94e0074d9d7b995f1895b2af121735badc27cf6a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 13:48:12 +0100
Subject: [PATCH 153/196] citrix_workspace_{23_11_0,24_02_0}: drop

These versions have been EOL:
- 23.11 since 2025-07-13
- 24.02 since 2025-09-07

See https://www.citrix.com/support/product-lifecycle/workspace-app.html
for reference.

Along with the removal of 23.11, we can remove all the i686-linux
related code here.
---
 .../remote/citrix-workspace/generic.nix       | 11 ++-
 .../remote/citrix-workspace/sources.nix       | 68 ++++---------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 21 insertions(+), 62 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 57e0ff7ee8c6..b922277baba2 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -61,7 +61,6 @@
 
   homepage,
   version,
-  prefix,
   hash,
 
   extraCerts ? [ ],
@@ -97,12 +96,12 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = requireFile rec {
-    name = "${prefix}-${version}.tar.gz";
+    name = "linuxx64-${version}.tar.gz";
     sha256 = hash;
 
     message = ''
       In order to use Citrix Workspace, you need to comply with the Citrix EULA and download
-      the ${if stdenv.hostPlatform.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+      the 64-bit binaries, .tar.gz from:
 
       ${homepage}
 
@@ -247,9 +246,9 @@ stdenv.mkDerivation rec {
       export HOME=$(mktemp -d)
 
       # Run upstream installer in the store-path.
-      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst
+      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
       source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
-      faketime -f "$source_date" ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
+      faketime -f "$source_date" ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
 
       if [ -f "$ICAInstDir/util/setlog" ]; then
         chmod +x "$ICAInstDir/util/setlog"
@@ -318,7 +317,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfree;
     description = "Citrix Workspace";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    platforms = [ "x86_64-linux" ] ++ lib.optional (lib.versionOlder version "24") "i686-linux";
+    platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ flacks ];
     inherit homepage;
   };
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index e7bceff1e805..372a46cf99ab 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -7,58 +7,26 @@ let
       major,
       minor,
       patch,
-      x64hash,
-      x86hash,
-      x64suffix,
-      x86suffix,
+      hash,
+      suffix,
       homepage,
     }:
     {
-      inherit homepage;
-      version = "${major}.${minor}.${patch}.${
-        if stdenv.hostPlatform.is64bit then x64suffix else x86suffix
-      }";
-      prefix = "linuxx${if stdenv.hostPlatform.is64bit then "64" else "86"}";
-      hash = if stdenv.hostPlatform.is64bit then x64hash else x86hash;
+      inherit hash homepage;
+      version = "${major}.${minor}.${patch}.${suffix}";
     };
 
   # Attribute-set with all actively supported versions of the Citrix workspace app
   # for Linux.
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
-  # x86 is unsupported past 23.11, see https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/deprecation
   supportedVersions = lib.mapAttrs mkVersionInfo {
-
-    "23.11.0" = {
-      major = "23";
-      minor = "11";
-      patch = "0";
-      x64hash = "d3dde64baa6db7675a025eff546d552544d3523f4f3047621884f7830a9e2822";
-      x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6";
-      x64suffix = "82";
-      x86suffix = "82";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest10.html";
-    };
-
-    "24.02.0" = {
-      major = "24";
-      minor = "2";
-      patch = "0";
-      x64hash = "eaeb5d3bd079d4e5c9707da67f5f7a25cb765e19c36d01861290655dbf2aaee4";
-      x86hash = "";
-      x64suffix = "65";
-      x86suffix = "";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest12.html";
-    };
-
     "24.05.0" = {
       major = "24";
       minor = "5";
       patch = "0";
-      x64hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
-      x86hash = "";
-      x64suffix = "76";
-      x86suffix = "";
+      hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
+      suffix = "76";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html";
     };
 
@@ -66,10 +34,8 @@ let
       major = "24";
       minor = "8";
       patch = "0";
-      x64hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
-      x86hash = "";
-      x64suffix = "98";
-      x86suffix = "";
+      hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
+      suffix = "98";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2408.html";
     };
 
@@ -77,10 +43,8 @@ let
       major = "24";
       minor = "11";
       patch = "0";
-      x64hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
-      x86hash = "";
-      x64suffix = "85";
-      x86suffix = "";
+      hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
+      suffix = "85";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest13.html";
     };
 
@@ -88,10 +52,8 @@ let
       major = "25";
       minor = "03";
       patch = "0";
-      x64hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
-      x86hash = "";
-      x64suffix = "66";
-      x86suffix = "";
+      hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
+      suffix = "66";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html";
     };
 
@@ -99,10 +61,8 @@ let
       major = "25";
       minor = "05";
       patch = "0";
-      x64hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
-      x86hash = "";
-      x64suffix = "44";
-      x86suffix = "";
+      hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
+      suffix = "44";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d4f5aad043eb..be84ff2c2396 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -432,6 +432,8 @@ mapAliases {
   chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
+  citrix_workspace_23_11_0 = throw "'citrix_workspace_23_11_0' has been removed because it has reached EOL."; # Added 2025-11-25
+  citrix_workspace_24_02_0 = throw "'citrix_workspace_24_02_0' has been removed because it has reached EOL."; # Added 2025-11-25
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce1fa4a97445..9a40118d4ac5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2181,8 +2181,6 @@ with pkgs;
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_23_11_0
-    citrix_workspace_24_02_0
     citrix_workspace_24_05_0
     citrix_workspace_24_08_0
     citrix_workspace_24_11_0

From 4547216587058d33aaec646e66fa9e5a5d6c9de9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 15:34:08 +0100
Subject: [PATCH 154/196] citrix_workspace: 25.05 -> 25.08

---
 .../remote/citrix-workspace/generic.nix       | 43 +++++++++++++++----
 .../remote/citrix-workspace/sources.nix       |  9 ++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index b922277baba2..93b95bf13239 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -10,10 +10,12 @@
   cacert,
   cairo,
   dconf,
+  enchant2,
   fetchurl,
   file,
   fontconfig,
   freetype,
+  fuse3,
   gdk-pixbuf,
   glib,
   glib-networking,
@@ -22,8 +24,11 @@
   gtk2-x11,
   gtk3,
   gtk_engines,
+  harfbuzzFull,
   heimdal,
+  hyphen,
   krb5,
+  lcms2,
   libGL,
   libappindicator-gtk3,
   libcanberra-gtk3,
@@ -32,15 +37,19 @@
   libfaketime,
   libgbm,
   libinput,
-  libjpeg,
+  libjpeg8,
   libjson,
+  libmanette,
+  libnotify,
   libpng12,
   libpulseaudio,
   libredirect,
+  libseccomp,
   libsecret,
   libsoup_2_4,
   libvorbis,
   libxml2_13,
+  libxslt,
   llvmPackages,
   more,
   nspr,
@@ -54,8 +63,8 @@
   symlinkJoin,
   systemd,
   tzdata,
-  # webkitgtk_4_0,
   which,
+  woff2,
   xorg,
   zlib,
 
@@ -67,6 +76,14 @@
 }:
 
 let
+  fuse3' = symlinkJoin {
+    name = "fuse3-backwards-compat";
+    paths = [ (lib.getLib fuse3) ];
+    postBuild = ''
+      ln -sf $out/lib/libfuse3.so.3.17.4 $out/lib/libfuse3.so.3
+    '';
+  };
+
   openssl' = symlinkJoin {
     name = "openssl-backwards-compat";
     nativeBuildInputs = [ makeWrapper ];
@@ -136,8 +153,10 @@ stdenv.mkDerivation rec {
     atk
     cairo
     dconf
+    enchant2
     fontconfig
     freetype
+    fuse3'
     gdk-pixbuf
     glib-networking
     gnome2.gtkglext
@@ -145,22 +164,29 @@ stdenv.mkDerivation rec {
     gtk2-x11
     gtk3
     gtk_engines
+    harfbuzzFull
     heimdal
+    hyphen
     krb5
+    lcms2
     libGL
     libcanberra-gtk3
     libcap
     libcxx
     libgbm
     libinput
-    libjpeg
+    libjpeg8
     libjson
+    libmanette
+    libnotify
     libpng12
     libpulseaudio
+    libseccomp
     libsecret
     libsoup_2_4
     libvorbis
     libxml2_13
+    libxslt
     llvmPackages.libunwind
     nspr
     nss
@@ -172,7 +198,7 @@ stdenv.mkDerivation rec {
     speex
     stdenv.cc.cc
     (lib.getLib systemd)
-    # webkitgtk_4_0
+    woff2
     xorg.libXScrnSaver
     xorg.libXaw
     xorg.libXmu
@@ -246,7 +272,7 @@ stdenv.mkDerivation rec {
       export HOME=$(mktemp -d)
 
       # Run upstream installer in the store-path.
-      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
+      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' -e 's, -C / , -C . ,g' ./linuxx64/hinst
       source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
       faketime -f "$source_date" ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
 
@@ -302,8 +328,6 @@ stdenv.mkDerivation rec {
     find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do
       # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
       patchelf --replace-needed libtiff.so.5 libtiff.so $fname
-      # lib needs libjpeg.so.8, but nixpkgs provides libjpeg.so.9
-      patchelf --replace-needed libjpeg.so.8 libjpeg.so $fname
     done
   '';
   postFixup = ''
@@ -312,8 +336,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    # webkitgtk_4_0 was removed
-    broken = true;
+    # Older versions need webkitgtk_4_0 which was removed.
+    # 25.08 bundles the same.
+    broken = lib.versionOlder version "25.08";
     license = lib.licenses.unfree;
     description = "Citrix Workspace";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 372a46cf99ab..51ab49212f89 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -65,6 +65,15 @@ let
       suffix = "44";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
+
+    "25.08.0" = {
+      major = "25";
+      minor = "08";
+      patch = "0";
+      hash = "19nx7j78c84m6wlidkaicqf5rgy05rm85vzh3admhrl8q9zr1avr";
+      suffix = "88";
+      homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
+    };
   };
 in
 supportedVersions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a40118d4ac5..40ae481dba6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2186,8 +2186,9 @@ with pkgs;
     citrix_workspace_24_11_0
     citrix_workspace_25_03_0
     citrix_workspace_25_05_0
+    citrix_workspace_25_08_0
     ;
-  citrix_workspace = citrix_workspace_25_05_0;
+  citrix_workspace = citrix_workspace_25_08_0;
 
   colord-gtk4 = colord-gtk.override { withGtk4 = true; };
 

From 08d273674d6beade9a4d1ae33dbec44c12b42b2e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 3 Dec 2025 15:41:30 +0100
Subject: [PATCH 155/196] citrix_workspace: remove unused fixup phase

libtiff is not a dependency anymore, anyway...
---
 .../networking/remote/citrix-workspace/generic.nix          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 93b95bf13239..02af2f1b1972 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -324,12 +324,6 @@ stdenv.mkDerivation rec {
   # Make sure that `autoPatchelfHook` is executed before
   # running `ctx_rehash`.
   dontAutoPatchelf = true;
-  preFixup = ''
-    find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do
-      # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-      patchelf --replace-needed libtiff.so.5 libtiff.so $fname
-    done
-  '';
   postFixup = ''
     autoPatchelf -- "$out"
     $out/opt/citrix-icaclient/util/ctx_rehash

From cd9fd1e48077b95ad8232f1d61db076b2fd8a2a6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 3 Dec 2025 15:47:42 +0100
Subject: [PATCH 156/196] citrix_workspace: remove outdated fallback removals

These libraries are not shipped anymore.
---
 .../networking/remote/citrix-workspace/generic.nix           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 02af2f1b1972..b1df4250e217 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -299,11 +299,6 @@ stdenv.mkDerivation rec {
 
       ${mkWrappers copyCert extraCerts}
 
-      # See https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide/reference-information/#library-files
-      # Those files are fallbacks to support older libwekit.so and libjpeg.so
-      rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
-      rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
-
       # We support only Gstreamer 1.0
       rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so} || true
       ln -sf $ICAInstDir/util/gst_play1.0 $ICAInstDir/util/gst_play

From 1ab621eb6d614a37ff04ab3847d0d3913b060484 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 16:29:17 +0100
Subject: [PATCH 157/196] citrix_workspace_{24_05,24_08,24_11,25_03,25_05}_0:
 drop

All of these versions depend on a system-provided webkitgtk 4.0, which
we have dropped from Nixpkgs - they can't work anymore, ever.
---
 .../remote/citrix-workspace/sources.nix       | 45 -------------------
 pkgs/top-level/aliases.nix                    |  5 +++
 pkgs/top-level/all-packages.nix               |  5 ---
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 51ab49212f89..edcc9f2135f9 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -21,51 +21,6 @@ let
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
   supportedVersions = lib.mapAttrs mkVersionInfo {
-    "24.05.0" = {
-      major = "24";
-      minor = "5";
-      patch = "0";
-      hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
-      suffix = "76";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html";
-    };
-
-    "24.08.0" = {
-      major = "24";
-      minor = "8";
-      patch = "0";
-      hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
-      suffix = "98";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2408.html";
-    };
-
-    "24.11.0" = {
-      major = "24";
-      minor = "11";
-      patch = "0";
-      hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
-      suffix = "85";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest13.html";
-    };
-
-    "25.03.0" = {
-      major = "25";
-      minor = "03";
-      patch = "0";
-      hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
-      suffix = "66";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html";
-    };
-
-    "25.05.0" = {
-      major = "25";
-      minor = "05";
-      patch = "0";
-      hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
-      suffix = "44";
-      homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
-    };
-
     "25.08.0" = {
       major = "25";
       minor = "08";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index be84ff2c2396..d733e3bb3603 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -434,6 +434,11 @@ mapAliases {
   cinnamon-common = cinnamon; # Added 2025-08-06
   citrix_workspace_23_11_0 = throw "'citrix_workspace_23_11_0' has been removed because it has reached EOL."; # Added 2025-11-25
   citrix_workspace_24_02_0 = throw "'citrix_workspace_24_02_0' has been removed because it has reached EOL."; # Added 2025-11-25
+  citrix_workspace_24_05_0 = throw "'citrix_workspace_24_05_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_24_08_0 = throw "'citrix_workspace_24_08_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_24_11_0 = throw "'citrix_workspace_24_11_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_25_03_0 = throw "'citrix_workspace_25_03_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_25_05_0 = throw "'citrix_workspace_25_05_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40ae481dba6c..c4c750e28be4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2181,11 +2181,6 @@ with pkgs;
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_24_05_0
-    citrix_workspace_24_08_0
-    citrix_workspace_24_11_0
-    citrix_workspace_25_03_0
-    citrix_workspace_25_05_0
     citrix_workspace_25_08_0
     ;
   citrix_workspace = citrix_workspace_25_08_0;

From 37ead022cdfbafda63dbe08a9b851ff5c6f229db Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 7 Jan 2026 16:24:43 -0600
Subject: [PATCH 158/196] citrix_workspace: 25.08.00 -> 25.08.10

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../networking/remote/citrix-workspace/sources.nix        | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index edcc9f2135f9..34f0c8e627ae 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -21,12 +21,12 @@ let
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
   supportedVersions = lib.mapAttrs mkVersionInfo {
-    "25.08.0" = {
+    "25.08.10" = {
       major = "25";
       minor = "08";
-      patch = "0";
-      hash = "19nx7j78c84m6wlidkaicqf5rgy05rm85vzh3admhrl8q9zr1avr";
-      suffix = "88";
+      patch = "10";
+      hash = "06hdwi5rd8z43nlpvym6yrw3snfz8jh6ic3g4pihn9ji22bw5pbd";
+      suffix = "111";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c750e28be4..a3e4a621218c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2181,9 +2181,9 @@ with pkgs;
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_25_08_0
+    citrix_workspace_25_08_10
     ;
-  citrix_workspace = citrix_workspace_25_08_0;
+  citrix_workspace = citrix_workspace_25_08_10;
 
   colord-gtk4 = colord-gtk.override { withGtk4 = true; };
 

From 090fb8a52ea22f3f6b77c62fe036135aab61de31 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 3 Dec 2025 21:50:02 -0600
Subject: [PATCH 159/196] citrix_workspace: fix selfservice

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../networking/remote/citrix-workspace/generic.nix    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index b1df4250e217..2dc0171aa9c5 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -11,7 +11,6 @@
   cairo,
   dconf,
   enchant2,
-  fetchurl,
   file,
   fontconfig,
   freetype,
@@ -58,6 +57,7 @@
   openssl,
   pango,
   pcsclite,
+  perl,
   sane-backends,
   speex,
   symlinkJoin,
@@ -241,9 +241,9 @@ stdenv.mkDerivation rec {
           ${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \
           --set ICAROOT "$ICAInstDir" \
           --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
-          --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \
+          --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib:$ICAInstDir/usr/lib/x86_64-linux-gnu:$ICAInstDir/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle" \
           --set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \
-          --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+          --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone:/usr/lib/x86_64-linux-gnu=$ICAInstDir/usr/lib/x86_64-linux-gnu"
       '';
       wrapLink = program: ''
         ${wrap program}
@@ -319,8 +319,13 @@ stdenv.mkDerivation rec {
   # Make sure that `autoPatchelfHook` is executed before
   # running `ctx_rehash`.
   dontAutoPatchelf = true;
+  # Null out hardcoded webkit bundle path so it falls back to LD_LIBRARY_PATH
   postFixup = ''
+    ${lib.getExe perl} -0777 -pi -e 's{/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle/}{"\0" x length($&)}e' \
+      $out/opt/citrix-icaclient/usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.0.so.37.56.4
+
     autoPatchelf -- "$out"
+
     $out/opt/citrix-icaclient/util/ctx_rehash
   '';
 

From 848a11e5544280c32597670c8fcb236f038ca5ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 08:18:20 +0000
Subject: [PATCH 160/196] tasktimer: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/by-name/ta/tasktimer/package.nix b/pkgs/by-name/ta/tasktimer/package.nix
index 1f2b01079d9a..0b12e3d70535 100644
--- a/pkgs/by-name/ta/tasktimer/package.nix
+++ b/pkgs/by-name/ta/tasktimer/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tasktimer";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "tasktimer";
     rev = "v${version}";
-    sha256 = "sha256-CAqOsxmJxDgQRMx8cN23TajHd6BNiCFraFvhf5kKnzc=";
+    sha256 = "sha256-B2kuAGY7qVvv+95DzFn78no1vofJGr0dw0kW2AIeJpo=";
   };
 
-  vendorHash = "sha256-Tk0yI/WFr0FV0AxJDStlP3XLem3v78ueuXyadhrLAog=";
+  vendorHash = "sha256-IviHbJvGyjwy1ovItvbxNV91OL2JM9Z2MKHexXEhrMU=";
 
   postInstall = ''
     mv $out/bin/tasktimer $out/bin/tt

From 921621a45d30494e28e92f10bb4d4bd1bde7d0e3 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Mon, 24 Nov 2025 11:06:07 +0100
Subject: [PATCH 161/196] code-cursor: auto-update vscodeVersion and save to
 sources.json

---
 pkgs/by-name/co/code-cursor/package.nix  | 31 +++--------
 pkgs/by-name/co/code-cursor/sources.json | 22 ++++++++
 pkgs/by-name/co/code-cursor/update.sh    | 71 +++++++++++++-----------
 3 files changed, 68 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/by-name/co/code-cursor/sources.json

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index dc250d153678..3aaf8c3dd69b 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -14,38 +14,23 @@ let
   inherit (stdenv) hostPlatform;
   finalCommandLineArgs = "--update=false " + commandLineArgs;
 
-  sources = {
-    x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/x64/Cursor-2.2.44-x86_64.AppImage";
-      hash = "sha256-hit0L6vE893jPq4QQqteT6T08hghX5hE/NZLUWTqqvY=";
-    };
-    aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/arm64/Cursor-2.2.44-aarch64.AppImage";
-      hash = "sha256-D2pcfwzRED/TYGABCo83YI4g77tu3xgvqjOo8XsteSA=";
-    };
-    x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-/BD2PMcP20/SDGPCsnkv3PQW7u0FEXuORfDeG/KV0MQ=";
-    };
-    aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-qehVIZipBbWOYbf6Zo3GBStS8dp+c4EtgDTGAQz1mzE=";
-    };
-  };
+  sourcesJson = lib.importJSON ./sources.json;
+  sources = lib.mapAttrs (
+    _: info:
+    fetchurl {
+      inherit (info) url hash;
+    }
+  ) sourcesJson.sources;
 
   source = sources.${hostPlatform.system};
 in
 (callPackage vscode-generic rec {
   inherit useVSCodeRipgrep;
+  inherit (sourcesJson) version vscodeVersion;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "2.2.44";
   pname = "cursor";
 
-  # You can find the current VSCode version in the About dialog:
-  # workbench.action.showAboutDialog (Help: About)
-  vscodeVersion = "1.105.1";
-
   executableName = "cursor";
   longName = "Cursor";
   shortName = "cursor";
diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
new file mode 100644
index 000000000000..76bfea49579a
--- /dev/null
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -0,0 +1,22 @@
+{
+  "version": "2.2.44",
+  "vscodeVersion": "1.105.1",
+  "sources": {
+    "x86_64-linux": {
+      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/x64/Cursor-2.2.44-x86_64.AppImage",
+      "hash": "sha256-hit0L6vE893jPq4QQqteT6T08hghX5hE/NZLUWTqqvY="
+    },
+    "aarch64-linux": {
+      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/arm64/Cursor-2.2.44-aarch64.AppImage",
+      "hash": "sha256-D2pcfwzRED/TYGABCo83YI4g77tu3xgvqjOo8XsteSA="
+    },
+    "x86_64-darwin": {
+      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-/BD2PMcP20/SDGPCsnkv3PQW7u0FEXuORfDeG/KV0MQ="
+    },
+    "aarch64-darwin": {
+      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-qehVIZipBbWOYbf6Zo3GBStS8dp+c4EtgDTGAQz1mzE="
+    }
+  }
+}
diff --git a/pkgs/by-name/co/code-cursor/update.sh b/pkgs/by-name/co/code-cursor/update.sh
index 20e7abf12025..d0d7308c81e1 100755
--- a/pkgs/by-name/co/code-cursor/update.sh
+++ b/pkgs/by-name/co/code-cursor/update.sh
@@ -1,39 +1,44 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq coreutils common-updater-scripts
-set -eu -o pipefail
+#!nix-shell -i bash -p curl jq coreutils nix _7zz
+# shellcheck shell=bash
+set -euo pipefail
 
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; code-cursor.version or (lib.getVersion code-cursor)" | tr -d '"')
+cd -- "$(dirname "${BASH_SOURCE[0]}")"
 
-declare -A platforms=( [x86_64-linux]='linux-x64' [aarch64-linux]='linux-arm64' [x86_64-darwin]='darwin-x64' [aarch64-darwin]='darwin-arm64' )
-declare -A updates=( )
-first_version=""
+META=$(curl -fsSL "https://api2.cursor.sh/updates/api/download/stable/linux-x64/cursor")
+VERSION=$(jq -r '.version' <<< "$META")
+CURRENT=$(jq -r '.version' sources.json)
 
-for platform in ${!platforms[@]}; do
-    api_platform=${platforms[$platform]}
-    result=$(curl -s "https://api2.cursor.sh/updates/api/download/stable/$api_platform/cursor")
-    version=$(echo $result | jq -r '.version')
-    if [[ "$version" == "$currentVersion" ]]; then
-      exit 0
-    fi
-    if [[ -z "$first_version" ]]; then
-      first_version=$version
-      first_platform=$platform
-    elif [[ "$version" != "$first_version" ]]; then
-      >&2 echo "Multiple versions found: $first_version ($first_platform) and $version ($platform)"
-      exit 1
-    fi
-    url=$(echo $result | jq -r '.downloadUrl')
-    # Exits with code 22 if not downloadable
-    curl --output /dev/null --silent --head --fail "$url"
-    updates+=( [$platform]="$result" )
+[[ "$VERSION" == "$CURRENT" ]] && { echo "Already up to date ($VERSION)"; exit 0; }
+
+SOURCES="{}"
+VSCODE=""
+
+for pair in \
+  x86_64-linux:linux-x64 \
+  aarch64-linux:linux-arm64 \
+  x86_64-darwin:darwin-x64 \
+  aarch64-darwin:darwin-arm64
+do
+  IFS=: read -r sys platform <<< "$pair"
+  meta=$(curl -fsSL "https://api2.cursor.sh/updates/api/download/stable/$platform/cursor")
+  version=$(jq -r '.version' <<< "$meta")
+
+  [[ "$version" != "$VERSION" ]] && { echo "Version mismatch: $sys has $version, expected $VERSION"; exit 1; }
+
+  url=$(jq -r '.downloadUrl' <<< "$meta")
+
+  { read -r hash; read -r path; } < <(nix-prefetch-url --print-path "$url")
+
+  sri=$(nix-hash --type sha256 --to-sri "$hash")
+
+  if [[ "$sys" == "x86_64-linux" ]]; then
+    VSCODE=$(7zz x -so "$path" "usr/share/cursor/resources/app/product.json" 2>/dev/null | jq -r '.vscodeVersion')
+  fi
+
+  SOURCES=$(jq -n --argjson src "$SOURCES" --arg sys "$sys" --arg url "$url" --arg hash "$sri" \
+    '$src + {($sys): {url: $url, hash: $hash}}')
 done
 
-# Install updates
-for platform in ${!updates[@]}; do
-  result=${updates[$platform]}
-  version=$(echo $result | jq -r '.version')
-  url=$(echo $result | jq -r '.downloadUrl')
-  source=$(nix-prefetch-url "$url" --name "cursor-$version")
-  hash=$(nix-hash --to-sri --type sha256 "$source")
-  update-source-version code-cursor $version $hash "$url" --system=$platform --ignore-same-version --source-key="sources.$platform"
-done
+jq -n --arg v "$VERSION" --arg vs "$VSCODE" --argjson s "$SOURCES" \
+  '{version: $v, vscodeVersion: $vs, sources: $s}' > sources.json

From 0d66b1fd72ea9e6ed0d48aa79b2c796e8eda1d0d Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 9 Jan 2026 01:23:51 +0200
Subject: [PATCH 162/196] code-cursor: 2.2.44 -> 2.3.29

---
 pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 76bfea49579a..0f71c6b921ce 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "2.2.44",
+  "version": "2.3.29",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/x64/Cursor-2.2.44-x86_64.AppImage",
-      "hash": "sha256-hit0L6vE893jPq4QQqteT6T08hghX5hE/NZLUWTqqvY="
+      "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/x64/Cursor-2.3.29-x86_64.AppImage",
+      "hash": "sha256-uWgUCXo0MHNyiigiymr0LoMoATePp0dksI7JyR/5bRY="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/arm64/Cursor-2.2.44-aarch64.AppImage",
-      "hash": "sha256-D2pcfwzRED/TYGABCo83YI4g77tu3xgvqjOo8XsteSA="
+      "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/arm64/Cursor-2.3.29-aarch64.AppImage",
+      "hash": "sha256-/oUz5wNRtPKYkEIKpHhcjWZNAAhTMvNdJLm+sXE9pDg="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-/BD2PMcP20/SDGPCsnkv3PQW7u0FEXuORfDeG/KV0MQ="
+      "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-A93Glr2bOL6zSu0XTgNj0Pmt6G2ufRgf4lPJ0xcGhow="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-qehVIZipBbWOYbf6Zo3GBStS8dp+c4EtgDTGAQz1mzE="
+      "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-cp/aTNapbwRXxdUU0fWs3HliV7rCmT/2CbNXqZPMpEs="
     }
   }
 }

From 9e63314ca88e58e8bd090ae8cec7647199417296 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 9 Jan 2026 01:27:57 +0200
Subject: [PATCH 163/196] code-cursor: add qweered to maintainers

---
 pkgs/by-name/co/code-cursor/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 3aaf8c3dd69b..126a7929ef38 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -70,6 +70,7 @@ in
     maintainers = with lib.maintainers; [
       aspauldingcode
       prince213
+      qweered
     ];
     platforms = [
       "aarch64-linux"

From 5a9f5ec038cc3ce924ca45df061aa6a4ce5139a9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 10 Jan 2026 09:52:24 +0000
Subject: [PATCH 164/196] python3Packages.paddlepaddle: fix evaluation error
 when selecting unsupported cuda version

---
 .../python-modules/paddlepaddle/default.nix   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix
index 96bdf6a76480..fe0f6519409f 100644
--- a/pkgs/development/python-modules/paddlepaddle/default.nix
+++ b/pkgs/development/python-modules/paddlepaddle/default.nix
@@ -34,21 +34,25 @@ let
   version = sources.version;
   format = "wheel";
   pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
-  hash =
-    if cudaSupport then
-      sources."${stdenv.hostPlatform.system}"."gpu"."cu${
-        lib.replaceStrings [ "." ] [ "" ] cudaPackages.cudatoolkit.version
-      }"."${pyShortVersion}"
-    else
-      sources."${stdenv.hostPlatform.system}"."cpu"."${pyShortVersion}"
-        or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  platform = sources."${stdenv.hostPlatform.system}".platform;
+  cudaVersion = "cu${lib.replaceStrings [ "." ] [ "" ] cudaPackages.cudatoolkit.version}";
+
+  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
+  systemSources = sources."${stdenv.hostPlatform.system}" or throwSystem;
+
+  supportedCudaVersions = lib.concatStringsSep ", " (builtins.attrNames systemSources.gpu);
+  throwCuda = throw "Unsupported CUDA version: ${cudaVersion}. Supported versions: ${supportedCudaVersions}";
+  platformSources =
+    if cudaSupport then systemSources.gpu.${cudaVersion} or throwCuda else systemSources.cpu;
+
+  throwPython = throw "Unsupported python version: ${pyShortVersion}";
+  hash = platformSources.${pyShortVersion} or throwPython;
+
+  platform = sources.${stdenv.hostPlatform.system}.platform;
+
   src =
     if cudaSupport then
       (fetchurl {
-        url = "https://paddle-whl.bj.bcebos.com/stable/cu${
-          lib.replaceStrings [ "." ] [ "" ] cudaPackages.cudatoolkit.version
-        }/paddlepaddle-gpu/paddlepaddle_gpu-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl";
+        url = "https://paddle-whl.bj.bcebos.com/stable/${cudaVersion}/paddlepaddle-gpu/paddlepaddle_gpu-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl";
         inherit hash;
       })
     else

From cd1d406352578cc463a5725eea4bac83823a8ba2 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 10 Jan 2026 10:48:39 +0100
Subject: [PATCH 165/196] memo: delete

This is a quite old script I don't maintain anymore.
The Repository is achived, and I guess nobody uses this package.
---
 pkgs/by-name/me/memo/package.nix | 60 --------------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 pkgs/by-name/me/memo/package.nix

diff --git a/pkgs/by-name/me/memo/package.nix b/pkgs/by-name/me/memo/package.nix
deleted file mode 100644
index 57a1028ac01a..000000000000
--- a/pkgs/by-name/me/memo/package.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  fetchFromGitHub,
-  silver-searcher,
-  tree,
-  man,
-  lib,
-  stdenv,
-  git,
-  pandocSupport ? true,
-  pandoc ? null,
-}:
-
-assert pandocSupport -> pandoc != null;
-
-stdenv.mkDerivation rec {
-
-  pname = "memo";
-
-  version = "0.8";
-
-  src = fetchFromGitHub {
-    owner = "mrVanDalo";
-    repo = "memo";
-    rev = version;
-    sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
-  };
-
-  installPhase =
-    let
-      pandocReplacement =
-        if pandocSupport then "pandoc_cmd=${pandoc}/bin/pandoc" else "#pandoc_cmd=pandoc";
-    in
-    ''
-      mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions}
-      substituteInPlace memo \
-        --replace "ack_cmd=ack"       "ack_cmd=${silver-searcher}/bin/ag" \
-        --replace "tree_cmd=tree"     "tree_cmd=${tree}/bin/tree" \
-        --replace "man_cmd=man"       "man_cmd=${man}/bin/man" \
-        --replace "git_cmd=git"       "git_cmd=${git}/bin/git" \
-        --replace "pandoc_cmd=pandoc" "${pandocReplacement}"
-      mv memo $out/bin/
-      mv doc/memo.1 $out/share/man/man1/memo.1
-      mv completion/bash/memo.sh $out/share/bash-completion/completions/memo.sh
-      mv completion/zsh/_memo    $out/share/zsh/site-functions/_memo
-    '';
-
-  meta = {
-    description = "Simple tool written in bash to memorize stuff";
-    longDescription = ''
-      A simple tool written in bash to memorize stuff.
-      Memo organizes is structured through topics which are folders in ~/memo.
-    '';
-    homepage = "http://palovandalo.com/memo/";
-    downloadPage = "https://github.com/mrVanDalo/memo/releases";
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.mrVanDalo ];
-    platforms = lib.platforms.all;
-    mainProgram = "memo";
-  };
-}

From d563d69b5093979f68d2fd84e39a003027569e24 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 10 Jan 2026 13:01:30 +0300
Subject: [PATCH 166/196] qt6.qtwebengine: backport crash fix recommended by
 KDE

---
 .../libraries/qt-6/modules/qtwebengine/default.nix          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index df88eb6d473e..9f2271ceace4 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -111,6 +111,12 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
+
+    # Backport crash fix
+    (fetchpatch2 {
+      url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/ecf90f65ef738ae20b114691d02fb15c82e6babe.diff";
+      hash = "sha256-TW+EmCxasH5LdZ80y/0YHird3NsrVdlwciDJpgSD9x0=";
+    })
   ]
   ++ lib.optionals stdenv.cc.isClang [
     # https://chromium-review.googlesource.com/c/chromium/src/+/6633292

From e0c0d6bdbb97648decf4013c60b695cdcfaa4c0c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 10 Jan 2026 13:24:50 +0300
Subject: [PATCH 167/196] kdePackages: Frameworks 6.21 -> 6.22

---
 pkgs/kde/frameworks/kirigami/default.nix   |  11 -
 pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++-----------
 2 files changed, 216 insertions(+), 227 deletions(-)

diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix
index 182146da06cf..44158c19a1f4 100644
--- a/pkgs/kde/frameworks/kirigami/default.nix
+++ b/pkgs/kde/frameworks/kirigami/default.nix
@@ -20,17 +20,6 @@ let
 
     patches = [
       ./rb-templates.patch
-
-      # Fix rendering issues in some applications
-      # FIXME: remove in next update
-      (fetchpatch {
-        url = "https://invent.kde.org/frameworks/kirigami/-/commit/19127672cd812d177192cf84da4107f9abed2934.diff";
-        hash = "sha256-dh1OwMTksbVTEsEDw4vfBarR3fyBaulQa8SSHsddht0=";
-      })
-      (fetchpatch {
-        url = "https://invent.kde.org/frameworks/kirigami/-/commit/d13c1cb97313947f7f0e43f54585a83286604370.diff";
-        hash = "sha256-xAm08K1slaUhHT1aPl8n9Hz0EMlAlVSRYA0iHRhH36c=";
-      })
     ];
 
     extraNativeBuildInputs = [
diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index 735ca212560f..9662006aaaf3 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/attica-6.21.0.tar.xz",
-    "hash": "sha256-eI1ClRojey6swoUW+igfXwVLbXiCcAfys4PB0CLIS2M="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/attica-6.22.0.tar.xz",
+    "hash": "sha256-InSqKIBLqJXEIsP8JM3MiP9DWps5qIfO7ZOmCD2J/gA="
   },
   "baloo": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/baloo-6.21.0.tar.xz",
-    "hash": "sha256-XP74gwSFp9Qg+63KZ81EGCK8We/BxxsK/vIzuXVTdx4="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/baloo-6.22.0.tar.xz",
+    "hash": "sha256-V7KsGulT1Jm3NkEl/j56pYV/tTJFbs8L2iY16HWmbSo="
   },
   "bluez-qt": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/bluez-qt-6.21.0.tar.xz",
-    "hash": "sha256-6pGgTCbKYPpofs2nsJ3y30zBglTf6uTDqpE0quaZQ98="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/bluez-qt-6.22.0.tar.xz",
+    "hash": "sha256-S6mlUWfqPUa4wbR5WpQ4lz+t80MBGSr548eypJMK6H8="
   },
   "breeze-icons": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/breeze-icons-6.21.0.tar.xz",
-    "hash": "sha256-Oi1bATEpNnPhjw+3iAC0tKI+7+5IHpDroD3hfOr/XxU="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/breeze-icons-6.22.0.tar.xz",
+    "hash": "sha256-QjnEl0C55nCWA0Ik+mPRqAx+G0tTuls4Gywu9baAkw8="
   },
   "extra-cmake-modules": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/extra-cmake-modules-6.21.0.tar.xz",
-    "hash": "sha256-JnxUZ81lVaCvDUAQ8OwGlx+A8b1ckFY0JKhZO8CXanA="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/extra-cmake-modules-6.22.0.tar.xz",
+    "hash": "sha256-y4OmlXGyd8ILOmVn7wtvOb8pxDphkoK/S7B2/rTGCaY="
   },
   "frameworkintegration": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/frameworkintegration-6.21.0.tar.xz",
-    "hash": "sha256-rrgDPnyvwrcqk4V9fohx/aKoE4WmrNJ/QJ3ueauk2pc="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/frameworkintegration-6.22.0.tar.xz",
+    "hash": "sha256-Y+QU31yi58ECku7ok5Tv8ph6GeIpGxKIhRqWGChHel4="
   },
   "kapidox": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kapidox-6.21.0.tar.xz",
-    "hash": "sha256-bk249BnaNeVi3KH6dXYYU3X3vy77TvBo1+k7iA8yCF8="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kapidox-6.22.0.tar.xz",
+    "hash": "sha256-Q2+TbYxHVNzVFYW323p1RSr3wz8FRdPm8RHQ+wpEdxY="
   },
   "karchive": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/karchive-6.21.0.tar.xz",
-    "hash": "sha256-pffM2QQQUIPEQryCXBmIcr23oAmysrswsDjavWuxxsQ="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/karchive-6.22.0.tar.xz",
+    "hash": "sha256-hCVL0KUf89Xi+iK7lGMJzsUI8frnJqeuoVFJJgxNtZ0="
   },
   "kauth": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kauth-6.21.0.tar.xz",
-    "hash": "sha256-msTaU7QtDCqz42Je0ZtfTa/ZqZxDlparSdvwto+iEZo="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kauth-6.22.0.tar.xz",
+    "hash": "sha256-zxsozAEoDIbNZxLosvuWVrmwnlDszKWMXJyn9WuwcJ8="
   },
   "kbookmarks": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kbookmarks-6.21.0.tar.xz",
-    "hash": "sha256-BuLVrSIyTEpoCa6PajGSAEq9jcVru1soHBgo8y3I4Ho="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kbookmarks-6.22.0.tar.xz",
+    "hash": "sha256-qQI2ylPeRoWvKLbIZD2BssCQD6+DeEvS2jtSof1gGnk="
   },
   "kcalendarcore": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcalendarcore-6.21.0.tar.xz",
-    "hash": "sha256-xaCqyLuLDQB6bqROnqK3/wfNcBNpqQSP+V+e6y40QX8="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcalendarcore-6.22.0.tar.xz",
+    "hash": "sha256-yiP3RaKpuW4zZ1fdsm7ZZ+6P9OKqWhsEvd/jYKq3LGw="
   },
   "kcmutils": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcmutils-6.21.0.tar.xz",
-    "hash": "sha256-nBgIFT2cFqqgjmi2NTzlya9nsuJLmgzXWHxGpKgejtw="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcmutils-6.22.0.tar.xz",
+    "hash": "sha256-xu0tO+Hw5O/JGrykiv1k/wyJF/u2vDwLlyXGazueOZM="
   },
   "kcodecs": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcodecs-6.21.0.tar.xz",
-    "hash": "sha256-2aAV6U5s+dEO4scibdECUkaJFHwwByxHK27tG3NWfhY="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcodecs-6.22.0.tar.xz",
+    "hash": "sha256-jHqxGqW2AHs+WOZrzf36wtYtLe3hgXL1Mxqx9RAtYKM="
   },
   "kcolorscheme": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcolorscheme-6.21.0.tar.xz",
-    "hash": "sha256-+WuyNQP/bvJiFJKkNgAAGaGXwBEk6A+JQWTG9ISY+60="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcolorscheme-6.22.0.tar.xz",
+    "hash": "sha256-RZ9sDAty06dnW2LmFGEXNXQA7NtDkCYN+LTv+Fn4N9o="
   },
   "kcompletion": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcompletion-6.21.0.tar.xz",
-    "hash": "sha256-kNUfNdCZdiNEj+R3M3K/3Zboaa/Ub9qAnX7Y0+iKNbo="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcompletion-6.22.0.tar.xz",
+    "hash": "sha256-G/MkSwzgTaNMAQiZD/MA4a3k648DwScJxkekqOvn/0E="
   },
   "kconfig": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kconfig-6.21.0.tar.xz",
-    "hash": "sha256-DMHQuSImz+m4mUaAecwhOTn7+L3VuR5UVLyM38jzTiA="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kconfig-6.22.0.tar.xz",
+    "hash": "sha256-vqXPw19YbzN6pRi65PRFtol3tem+eFwViveWm/40V5A="
   },
   "kconfigwidgets": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kconfigwidgets-6.21.0.tar.xz",
-    "hash": "sha256-lja0WGHH6KBb1DK/+UyXEmcDENTjBmkxWAhDAgMltiM="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kconfigwidgets-6.22.0.tar.xz",
+    "hash": "sha256-zMoUlv1BsZND3t13+kACTCwjmPbhDEXdt+Vf/CfBDBA="
   },
   "kcontacts": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcontacts-6.21.0.tar.xz",
-    "hash": "sha256-pr948Q12gLZjZrFEMXRrOx003DE/Hue+ibGaR2Fir2Q="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcontacts-6.22.0.tar.xz",
+    "hash": "sha256-gurMHjfEDOVbcWcVhBlq4gp0Wem11OqyeXFdBJ+zYvY="
   },
   "kcoreaddons": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcoreaddons-6.21.0.tar.xz",
-    "hash": "sha256-RGHct75mzFUQHCqVfAjHhx8rPqfdbwFxg4ZsRTQWPkk="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcoreaddons-6.22.0.tar.xz",
+    "hash": "sha256-hD0nzXbKiQxPNS1vKdLiuHR4g2ArYxGRBrHrIpuV5kk="
   },
   "kcrash": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kcrash-6.21.0.tar.xz",
-    "hash": "sha256-CEVcJ7ZoRS3KK7N5VqyC5MHnBS32lJuNYizhHlyfTJQ="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kcrash-6.22.0.tar.xz",
+    "hash": "sha256-Mi18oFiMAIdG6ZezmBETKHZ7S8hzGOJKDt7aDBkecA4="
   },
   "kdav": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kdav-6.21.0.tar.xz",
-    "hash": "sha256-ta+kLuFkBLvWYmgvGmZhDvW2R56rpulRDak084Z/muI="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kdav-6.22.0.tar.xz",
+    "hash": "sha256-8F1hsTZGrD7BnHkdshFDv0h9G+JqQoHI9gY4UQFWaRQ="
   },
   "kdbusaddons": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kdbusaddons-6.21.0.tar.xz",
-    "hash": "sha256-tfTucf7vPiwj8e69iaxnlpQL2sj1RCm1z5S6+xBGInk="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kdbusaddons-6.22.0.tar.xz",
+    "hash": "sha256-eX8BhM3Rl8hsVr4pUoFNYBwvnqnuXhVaUGZtZJsoMKk="
   },
   "kdeclarative": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kdeclarative-6.21.0.tar.xz",
-    "hash": "sha256-BH2iAVNdQf/dCr/+LMuwh0rJ6Y3VCFF3JqocmaRv3rk="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kdeclarative-6.22.0.tar.xz",
+    "hash": "sha256-BVqX2hBs3B+HlsuQzdJiyPiMQVIu9ehgaMPOfcKMS+c="
   },
   "kded": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kded-6.21.0.tar.xz",
-    "hash": "sha256-NlMs/47Zi9BMnUwz5aFei78UQCK59AZcbF10VagC3aE="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kded-6.22.0.tar.xz",
+    "hash": "sha256-v+VABowkDc90Udb1c6RSuwha5TbunT+iruQGX5dy9H0="
   },
   "kdesu": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kdesu-6.21.0.tar.xz",
-    "hash": "sha256-UCnWRvFgfVQ4XQq77Yqr8ehEvt5EXEEZmKob3PC4X3Y="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kdesu-6.22.0.tar.xz",
+    "hash": "sha256-W1lHohU9n6ClAJxKKvXFXdpMEOlw3mAzVjJ/LFlihk8="
   },
   "kdnssd": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kdnssd-6.21.0.tar.xz",
-    "hash": "sha256-c9cskvMEkTPw/su8W4AkQMxi3Rb47MyLLMR83QtwVyk="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kdnssd-6.22.0.tar.xz",
+    "hash": "sha256-W+3wyJzZ1BUlgK923X2yffhWP+8hfotmx6GUfB1ilak="
   },
   "kdoctools": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kdoctools-6.21.0.tar.xz",
-    "hash": "sha256-CQc8C0L/a1u/kofN2POj+4pOdg4lLdJxh3EWFYkye5A="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kdoctools-6.22.0.tar.xz",
+    "hash": "sha256-2JPydY+eHZpSnRtXOz/EE9TD4M9LhXPs7lyZyNZqPxE="
   },
   "kfilemetadata": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kfilemetadata-6.21.0.tar.xz",
-    "hash": "sha256-2P38xUNCALJsouRuE8Qi1BW3ethiE9VhUm2oFvZT8KQ="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kfilemetadata-6.22.0.tar.xz",
+    "hash": "sha256-WOWU/bd4g9aEvWmXMe1X/yTolwwTwqG9tHD13KhPsr0="
   },
   "kglobalaccel": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kglobalaccel-6.21.0.tar.xz",
-    "hash": "sha256-Pmi4+1ci11mCyZU0R40obf41lWDKXYoQKTypDzAa7+M="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kglobalaccel-6.22.0.tar.xz",
+    "hash": "sha256-My4749CsKuyOeGQZweh1obM66EuKraMoNjnezMb/1Ng="
   },
   "kguiaddons": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kguiaddons-6.21.0.tar.xz",
-    "hash": "sha256-EknvdCvJ/M6Bs5O8RuSeIMJB54f63DFsKu0HUVKzfdA="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kguiaddons-6.22.0.tar.xz",
+    "hash": "sha256-t2Urzr6/yMH9ook8Gu/0E2xYbud//G5YnjY08OVTnu8="
   },
   "kholidays": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kholidays-6.21.0.tar.xz",
-    "hash": "sha256-keaCD/ZS6ncbIhOXRVnn/0urttnzV/QLjHIma9BDK+Q="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kholidays-6.22.0.tar.xz",
+    "hash": "sha256-ObfxxxPWxa4iW/oYpt7OIP96f0wyWgxvxKSM8+TgppA="
   },
   "ki18n": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/ki18n-6.21.0.tar.xz",
-    "hash": "sha256-1bIwRaTpiccoboZpZUQYDsdqxf0Fe1DDW9AHsnlpTY8="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/ki18n-6.22.0.tar.xz",
+    "hash": "sha256-Ipp7IrjIfO0ULKIwiU9sJdU1p4VzFMHUjhgJKaXEooo="
   },
   "kiconthemes": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kiconthemes-6.21.0.tar.xz",
-    "hash": "sha256-hzR3435v0DulZDCoT4Di4EPM7GHRPeh2JjuPIgEx3WI="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kiconthemes-6.22.0.tar.xz",
+    "hash": "sha256-gUFogFFx/32S3Bc17Go4rwVMe+VPMIup2UwaBugLPMg="
   },
   "kidletime": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kidletime-6.21.0.tar.xz",
-    "hash": "sha256-+DqUXifEE3cdIBA/ZjF4OjoNjj8lvzptGBfEt8dmwj4="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kidletime-6.22.0.tar.xz",
+    "hash": "sha256-BwG6TDIXhbpnD0qdulTFUf/UdkUcq6LHe58Hno20Ki4="
   },
   "kimageformats": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kimageformats-6.21.0.tar.xz",
-    "hash": "sha256-nHVrgeYdi17MpudWJpRUzsNhmhoTpDgDyyEEeWy/+FA="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kimageformats-6.22.0.tar.xz",
+    "hash": "sha256-1u7emnWqSzPD6K/evcyWZM9CPv/qvmhLIdwcyXKKIHM="
   },
   "kio": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kio-6.21.0.tar.xz",
-    "hash": "sha256-svc6M7gCy1K7nnw1NdMV1cYW1VTj7QfKcRyiUdsxBcY="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kio-6.22.0.tar.xz",
+    "hash": "sha256-SwPxoHD3isKjQ/E4rF+Nm8zRGSdkqqRa5Jqn9JWZJpQ="
   },
   "kirigami": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kirigami-6.21.0.tar.xz",
-    "hash": "sha256-6+DqddEh4vRQhJzpOULUbj8Go+JB0Ayjs72gHdyYC9k="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kirigami-6.22.0.tar.xz",
+    "hash": "sha256-BiJVZVkZYpxb35odMGdvuEKxM181LD+naYu4HCfnzfo="
   },
   "kitemmodels": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kitemmodels-6.21.0.tar.xz",
-    "hash": "sha256-WTkLbKTPSjBeObEQgOGu9yxTa+Vy8A9CjR2WGtJQve4="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kitemmodels-6.22.0.tar.xz",
+    "hash": "sha256-vu2Bv+DUL1894kh8sZh13RSFR6hhYBrVaAHCWMxozNQ="
   },
   "kitemviews": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kitemviews-6.21.0.tar.xz",
-    "hash": "sha256-O6qDbv+SPh3LPZid1GT7PDy5zpysamcj5+fBAI8VakY="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kitemviews-6.22.0.tar.xz",
+    "hash": "sha256-kEQgT83rYNWjJ94YkQ4kZzJvI7T6g3wwhVq/NY4w798="
   },
   "kjobwidgets": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kjobwidgets-6.21.0.tar.xz",
-    "hash": "sha256-iSs71Kgz65tyqJzM1HEza4CdeUUVv9nWuzNfG5EVefY="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kjobwidgets-6.22.0.tar.xz",
+    "hash": "sha256-zoZLzbTc/T/PCvw+Pi/LhngMkkIlIxW8AD+1R690Y/A="
   },
   "knewstuff": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/knewstuff-6.21.0.tar.xz",
-    "hash": "sha256-Z884BR15tSdb42Q4LF0UM9fBqEwPPOmtggY0Esjhr00="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/knewstuff-6.22.0.tar.xz",
+    "hash": "sha256-H21Octi2buk+7IJo+tsNFzFxb2qCyy5G8e+VXE72sbU="
   },
   "knotifications": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/knotifications-6.21.0.tar.xz",
-    "hash": "sha256-XJ4+rVAvfbxoNSVdVfsz2+StZilYd/8IqyIaQtsIBa0="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/knotifications-6.22.0.tar.xz",
+    "hash": "sha256-xJqu88zz36xzrAcVmz7g3b9uOWluRBZdOwoeoCp3QIw="
   },
   "knotifyconfig": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/knotifyconfig-6.21.0.tar.xz",
-    "hash": "sha256-H+dGFVMwTqQu27PpDciEl7UFhswsR9n2uKK00odKG0c="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/knotifyconfig-6.22.0.tar.xz",
+    "hash": "sha256-FMaGSh4Y0G93jUMvt6GGsDblk/NyGEuXIIx93d+jnbQ="
   },
   "kpackage": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kpackage-6.21.0.tar.xz",
-    "hash": "sha256-PFqWsH4orJDlHfo6/BeQIT6eGR2GfxEhMjdclaoEPHY="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kpackage-6.22.0.tar.xz",
+    "hash": "sha256-35ugstNHum4qJuSEVRypuj82UoEWc2+g6VoGoCIIAGs="
   },
   "kparts": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kparts-6.21.0.tar.xz",
-    "hash": "sha256-0A/I1zEZnEzJ+VDyWgCbOyEdA9DLNbMmc19ydDYaCRU="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kparts-6.22.0.tar.xz",
+    "hash": "sha256-4wLuRIkemP2nSHLPOs3eROtWpiXadjObWPL1UYcmIw8="
   },
   "kpeople": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kpeople-6.21.0.tar.xz",
-    "hash": "sha256-d9vRkjpS5YwNuoTGqW3kVTL3Lf6BTs5bhOaZvZwPTmE="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kpeople-6.22.0.tar.xz",
+    "hash": "sha256-R6L0jm6u0AsUY7ABEjdQ+/3MuAtQVXyF1MEeoaJg27I="
   },
   "kplotting": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kplotting-6.21.0.tar.xz",
-    "hash": "sha256-x7MZu1PLZSk6RusgntSP1MxRf/ureGVMSK1/wuyjL78="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kplotting-6.22.0.tar.xz",
+    "hash": "sha256-vy4sVjFg1T96JV4+pA3mrss04Z9eKRooSi1R/2vg8Rg="
   },
   "kpty": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kpty-6.21.0.tar.xz",
-    "hash": "sha256-Oru0uc3ok11wml3JDr3zcdiejdX6JNJDxE3+3nh367g="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kpty-6.22.0.tar.xz",
+    "hash": "sha256-6XSuNuYJ0ftIV4ITn4xqomD87o9lHaPdDRddrRwLlmM="
   },
   "kquickcharts": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kquickcharts-6.21.0.tar.xz",
-    "hash": "sha256-0AqnHa6YudvcPS8buQ05ZHs/KuXhDDqk7GEXNe46pUg="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kquickcharts-6.22.0.tar.xz",
+    "hash": "sha256-EOgsqGro4ikQoeWNufxkczXpM1vZ+tPHE8OfeUefFKQ="
   },
   "krunner": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/krunner-6.21.0.tar.xz",
-    "hash": "sha256-8Z3MVjSfEngodXKq8nPOh8d0+e7JnixDaOFkuu1RKKU="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/krunner-6.22.0.tar.xz",
+    "hash": "sha256-CUxmMJWPgqRNZosEBW9jD75Ib4MoFJojXuiAc9Q7Ego="
   },
   "kservice": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kservice-6.21.0.tar.xz",
-    "hash": "sha256-u8fCpjvkTvmmpDh3eVDivDxh84HrEBwL4/AREesENRc="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kservice-6.22.0.tar.xz",
+    "hash": "sha256-NUem9Fwaue77KgiqwkIPPQ7EUyq6Sg8d+l2dO/BU24w="
   },
   "kstatusnotifieritem": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kstatusnotifieritem-6.21.0.tar.xz",
-    "hash": "sha256-531NlDr4P9EggNvG7LnBNVofooLvvYnt+iU4TWc/1mA="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kstatusnotifieritem-6.22.0.tar.xz",
+    "hash": "sha256-U87amf7B3e+YZf+4IM6CTODIPwWtpbdQIjq8aKml8qI="
   },
   "ksvg": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/ksvg-6.21.0.tar.xz",
-    "hash": "sha256-XHUfCHeHxE4LZWxmxo2vEv1+Gg+MorehZyalFsAs/lk="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/ksvg-6.22.0.tar.xz",
+    "hash": "sha256-AfGck3vM60mxAVkO2150i1bo5KCYjYjeR0+h+mfvP/E="
   },
   "ktexteditor": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/ktexteditor-6.21.0.tar.xz",
-    "hash": "sha256-0dguzuh3+wZu59etFPLekMn2uCHYyXwOeEqYXMP5ncQ="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/ktexteditor-6.22.0.tar.xz",
+    "hash": "sha256-HZszaism7MahxbgTPqzqae14az628ewq1nBcK+pi4cU="
   },
   "ktexttemplate": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/ktexttemplate-6.21.0.tar.xz",
-    "hash": "sha256-hkZn2iGQo83UKSadkwM1fr/rPEw0y2UQcdSCxW+Ldy0="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/ktexttemplate-6.22.0.tar.xz",
+    "hash": "sha256-UwOOju25HgZyvVK9dbidGWgh2zudMKCoAvTJZOaPH30="
   },
   "ktextwidgets": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/ktextwidgets-6.21.0.tar.xz",
-    "hash": "sha256-HJPuryrIKXurruIHX4GIze4mwyscjCDDqVt7yrb/v6s="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/ktextwidgets-6.22.0.tar.xz",
+    "hash": "sha256-6WEJS8StTlHoi3/qwukUs4E+5BcduUClF/tmkX3vXPQ="
   },
   "kunitconversion": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kunitconversion-6.21.0.tar.xz",
-    "hash": "sha256-YAEaYGg1YNYxfH68nRv/09snZ1bZALKk9JYwesKbrZ0="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kunitconversion-6.22.0.tar.xz",
+    "hash": "sha256-WANXJ3+tdlnTNVXyV4OmzScoa3PN10x4G0mJ5PYke5E="
   },
   "kuserfeedback": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kuserfeedback-6.21.0.tar.xz",
-    "hash": "sha256-jE9bjFqcT2x9KE8dV/fzPa/cZmhMs16bgKvb7fA10sw="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kuserfeedback-6.22.0.tar.xz",
+    "hash": "sha256-EOLbVwNkm/03cSHqLa9ina6MwILQRXSIoEI41V2ei4c="
   },
   "kwallet": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kwallet-6.21.0.tar.xz",
-    "hash": "sha256-BA2ernTsUWTAwg5ZRp90wlsBOcnlXu8+nzv6Wi4If0g="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kwallet-6.22.0.tar.xz",
+    "hash": "sha256-EIIaRhzLm0gc7tyVm5bmAQguuSHV3/t5ern7zvclqgY="
   },
   "kwidgetsaddons": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kwidgetsaddons-6.21.0.tar.xz",
-    "hash": "sha256-FKk4Qmgxw14CGlfLKYm24Lk3m5Ntv+8+5aMzWkaJ0rw="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kwidgetsaddons-6.22.0.tar.xz",
+    "hash": "sha256-6IMqxpcFTtMkHoKZunG412ZXm35ssP2N0XbK0QrsdUs="
   },
   "kwindowsystem": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kwindowsystem-6.21.0.tar.xz",
-    "hash": "sha256-NGYLFU6FjS8umW2Y/Cy0aImpOFUbt5nnW6L7bx0GQTM="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kwindowsystem-6.22.0.tar.xz",
+    "hash": "sha256-KCHakoVOd9TSrMtbbybRiaPmIkb8Dcr70E8aeAkOUZU="
   },
   "kxmlgui": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/kxmlgui-6.21.0.tar.xz",
-    "hash": "sha256-zr85C2W9U1XWQbW+27yAcSnTmEqLwhsI1yaBXG2blww="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/kxmlgui-6.22.0.tar.xz",
+    "hash": "sha256-BjURuKLEmM3QOhg2bskYLz8SGk2TZoiIyaor7UmXOsM="
   },
   "modemmanager-qt": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/modemmanager-qt-6.21.0.tar.xz",
-    "hash": "sha256-WMyuvnqPlHDCN5gN/zafDyzLV4L813uqolJ5yED8i2A="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/modemmanager-qt-6.22.0.tar.xz",
+    "hash": "sha256-BCY2iP25+S6xPDoH0aCi9i0FebI/3TgFgvT9KONzh3I="
   },
   "networkmanager-qt": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/networkmanager-qt-6.21.0.tar.xz",
-    "hash": "sha256-U1MLKNIfGek/Bjg/P/svQ/lMG/dRp+pDdjGkHtel8UA="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/networkmanager-qt-6.22.0.tar.xz",
+    "hash": "sha256-cHrC1dyWSW3MmWbvIQDDNuB6m2zzrQfYPgPG12w4Dm4="
   },
   "prison": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/prison-6.21.0.tar.xz",
-    "hash": "sha256-BIulls2OCNNvqhF57DevSD6p7BAXEBhtdSmBF7wJiis="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/prison-6.22.0.tar.xz",
+    "hash": "sha256-xA1pJge9rfjb1aVnYSibHulpc/BIyjZx52BRnirkM5o="
   },
   "purpose": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/purpose-6.21.0.tar.xz",
-    "hash": "sha256-AyaHerizJJFIK4CSXRuG+4p6fzpYfdElFi5/tVqNXoc="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/purpose-6.22.0.tar.xz",
+    "hash": "sha256-opElg5SPQj5NZm+cvxzxrEY6JG4Q5xcHi0gx9gzCGYw="
   },
   "qqc2-desktop-style": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/qqc2-desktop-style-6.21.0.tar.xz",
-    "hash": "sha256-4gF7Ny614bEpfkhTOwta1gKoW1aH5ZMS9+zpHNFLdjg="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/qqc2-desktop-style-6.22.0.tar.xz",
+    "hash": "sha256-sHhggIc3KNTCTs7Y9NYvZyY3GPtdxpnUdpY2Iyi4H64="
   },
   "solid": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/solid-6.21.0.tar.xz",
-    "hash": "sha256-P/0H6LYjNkyDw2sjeyg4PJFlEnJRKfzw+j/0a3KJBig="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/solid-6.22.0.tar.xz",
+    "hash": "sha256-QRUxVC4qvDalxEZgXqpkxioA73uFFIxHe6mZthCbW/M="
   },
   "sonnet": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/sonnet-6.21.0.tar.xz",
-    "hash": "sha256-AEZtUQCuHS6vDP5J9XYFWiwl2mQxEYqO+NrwmmFeVn8="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/sonnet-6.22.0.tar.xz",
+    "hash": "sha256-yP3Ed2ZuE+4Q/7P8k4MazwMLBKa2chcqJ2a/noH+gNg="
   },
   "syndication": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/syndication-6.21.0.tar.xz",
-    "hash": "sha256-fqP21GcQpu4Sw3ZLP1s6IkCyLKAfEGcAJitGslsOCrs="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/syndication-6.22.0.tar.xz",
+    "hash": "sha256-+vOojmcRsGo17fKMQV/WZbVpmnyv7m/tLLSZfzGNjeA="
   },
   "syntax-highlighting": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/syntax-highlighting-6.21.0.tar.xz",
-    "hash": "sha256-61LmkLynms1OhGEOEQ/y9jhNUWZ9bYzRZtjpKZ5dtFk="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/syntax-highlighting-6.22.0.tar.xz",
+    "hash": "sha256-ULc+qZQT3ZiPo0/RaRKbzb/h3DtDxI1fkrutslEacoo="
   },
   "threadweaver": {
-    "version": "6.21.0",
-    "url": "mirror://kde/stable/frameworks/6.21/threadweaver-6.21.0.tar.xz",
-    "hash": "sha256-PW+UciyjKfFpfoDYNF2W5RMEcHc5m767Djos3Bd/BOU="
+    "version": "6.22.0",
+    "url": "mirror://kde/stable/frameworks/6.22/threadweaver-6.22.0.tar.xz",
+    "hash": "sha256-L1HjEnedxfWS6N702yJcPEBTHYceik0xqPKiLeKmWCs="
   }
 }
\ No newline at end of file

From fcc6ba95229c7396f714ffc3319240ad9b4677f5 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 21:55:29 +0100
Subject: [PATCH 168/196] xf86-video-apm: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoapm

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-apm/package.nix    | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 60 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-apm/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-apm/package.nix b/pkgs/by-name/xf/xf86-video-apm/package.nix
new file mode 100644
index 000000000000..8b7b8eb05028
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-apm/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-apm";
+  version = "1.3.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-apm";
+    tag = "xf86-video-apm-${finalAttrs.version}";
+    hash = "sha256-Q10YmtxgWiFvMqvS0RKBhWPVqyFoWNjTe1RLvt7Kxlg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-apm-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Alliance Promotion video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-apm";
+    license = with lib.licenses; [
+      x11
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9923fae3d974..6fd06e875c89 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -132,6 +132,7 @@
   xf86-input-synaptics,
   xf86-input-vmmouse,
   xf86-input-void,
+  xf86-video-apm,
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-nouveau,
@@ -347,6 +348,7 @@ self: with self; {
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
   xf86inputvoid = xf86-input-void;
+  xf86videoapm = xf86-video-apm;
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
@@ -594,44 +596,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoapm = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-apm";
-      version = "1.3.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2";
-        sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoast = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index aeb72a556c36..94c16af7b10b 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -464,6 +464,7 @@ print OUT <<EOF;
   xf86-input-synaptics,
   xf86-input-vmmouse,
   xf86-input-void,
+  xf86-video-apm,
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-nouveau,
@@ -679,6 +680,7 @@ self: with self; {
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
   xf86inputvoid = xf86-input-void;
+  xf86videoapm = xf86-video-apm;
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a06f37eefefd..2f0513eda1df 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -8,7 +8,6 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz

From ad6b453bf59320f4fe1a1d3c243073e5763b6a86 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 22:01:34 +0100
Subject: [PATCH 169/196] xf86-video-ast: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoast

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-ast/package.nix    | 53 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-ast/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-ast/package.nix b/pkgs/by-name/xf/xf86-video-ast/package.nix
new file mode 100644
index 000000000000..c8283bafd934
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-ast/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-ast";
+  version = "1.2.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-ast";
+    tag = "xf86-video-ast-${finalAttrs.version}";
+    hash = "sha256-5fZ0+6Jf/QBuR9l2lOsh4RQEGKrR9XttEvwOVO8w3t4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-ast-(.*)" ]; };
+  };
+
+  meta = {
+    description = "ASpeed Technologies graphics driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6fd06e875c89..e9bd1ab94e1e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -134,6 +134,7 @@
   xf86-input-void,
   xf86-video-apm,
   xf86-video-ark,
+  xf86-video-ast,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -350,6 +351,7 @@ self: with self; {
   xf86inputvoid = xf86-input-void;
   xf86videoapm = xf86-video-apm;
   xf86videoark = xf86-video-ark;
+  xf86videoast = xf86-video-ast;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
@@ -596,44 +598,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoast = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-ast";
-      version = "1.2.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz";
-        sha256 = "14sx6dm0nmbf1fs8cazmak0aqjpjpv9wv7v09w86ff04m7f4gal6";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoati = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 94c16af7b10b..eafcb2d49863 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -466,6 +466,7 @@ print OUT <<EOF;
   xf86-input-void,
   xf86-video-apm,
   xf86-video-ark,
+  xf86-video-ast,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -682,6 +683,7 @@ self: with self; {
   xf86inputvoid = xf86-input-void;
   xf86videoapm = xf86-video-apm;
   xf86videoark = xf86-video-ark;
+  xf86videoast = xf86-video-ast;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 2f0513eda1df..57e7441e0062 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -8,7 +8,6 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-ast-1.2.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz

From b18da9f8fae565faa5002afd0ca8342de1f403b6 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 22:08:34 +0100
Subject: [PATCH 170/196] xf86-video-ati: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoati

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-ati/package.nix    | 65 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 48 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 69 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-ati/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-ati/package.nix b/pkgs/by-name/xf/xf86-video-ati/package.nix
new file mode 100644
index 000000000000..891d5ad53547
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-ati/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libgbm,
+  libGL,
+  libpciaccess,
+  udev,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-ati";
+  version = "22.0.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-ati";
+    tag = "xf86-video-ati-${finalAttrs.version}";
+    hash = "sha256-q8+lMYS9tfO64xT7t6PYIqsARX8Dv/8uMTMeP1JCt08=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libdrm
+    libgbm
+    libGL
+    libpciaccess
+    udev
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-ati-(.*)" ]; };
+  };
+
+  meta = {
+    description = "ATI/AMD Radeon video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati";
+    license = with lib.licenses; [
+      mit
+      x11
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e9bd1ab94e1e..32bc5c0a1221 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -135,6 +135,7 @@
   xf86-video-apm,
   xf86-video-ark,
   xf86-video-ast,
+  xf86-video-ati,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -352,6 +353,7 @@ self: with self; {
   xf86videoapm = xf86-video-apm;
   xf86videoark = xf86-video-ark;
   xf86videoast = xf86-video-ast;
+  xf86videoati = xf86-video-ati;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
@@ -598,52 +600,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoati = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libgbm,
-      libGL,
-      libdrm,
-      udev,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-ati";
-      version = "22.0.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz";
-        sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libgbm
-        libGL
-        libdrm
-        udev
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videochips = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index eafcb2d49863..7029794dcc9e 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -467,6 +467,7 @@ print OUT <<EOF;
   xf86-video-apm,
   xf86-video-ark,
   xf86-video-ast,
+  xf86-video-ati,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -684,6 +685,7 @@ self: with self; {
   xf86videoapm = xf86-video-apm;
   xf86videoark = xf86-video-ark;
   xf86videoast = xf86-video-ast;
+  xf86videoati = xf86-video-ati;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 57e7441e0062..ff12a519843c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -8,7 +8,6 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz

From 64508ba25482f0e8fa22214fd829c6dba6aa4a8b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 22:25:08 +0100
Subject: [PATCH 171/196] xf86-video-chips: refactor, move to pkgs/by-name &
 rename from xorg.xf86videochips

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-chips/package.nix  | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 63 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-chips/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-chips/package.nix b/pkgs/by-name/xf/xf86-video-chips/package.nix
new file mode 100644
index 000000000000..fa91a6cfa777
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-chips/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-chips";
+  version = "1.5.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-chips";
+    tag = "xf86-video-chips-${finalAttrs.version}";
+    hash = "sha256-MQ6aT+fWKFtpdzV40LzMrr046h0ZRmHi2sgWjuYUMq8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorgproto
+    libpciaccess
+    xorg-server
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-chips-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Chips & Technologies video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-chips";
+    license = with lib.licenses; [
+      hpndSellVariant
+      bsd3
+      dec3Clause
+      mit
+      x11
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 32bc5c0a1221..169f37c56021 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -136,6 +136,7 @@
   xf86-video-ark,
   xf86-video-ast,
   xf86-video-ati,
+  xf86-video-chips,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -354,6 +355,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videoast = xf86-video-ast;
   xf86videoati = xf86-video-ati;
+  xf86videochips = xf86-video-chips;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
@@ -600,44 +602,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videochips = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-chips";
-      version = "1.5.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz";
-        sha256 = "1cyljd3h2hjv42ldqimf4lllqhb8cma6p3n979kr8nn81rjdkhw4";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videocirrus = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 7029794dcc9e..3bfc455fc02d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -468,6 +468,7 @@ print OUT <<EOF;
   xf86-video-ark,
   xf86-video-ast,
   xf86-video-ati,
+  xf86-video-chips,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -686,6 +687,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videoast = xf86-video-ast;
   xf86videoati = xf86-video-ati;
+  xf86videochips = xf86-video-chips;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ff12a519843c..3a7241fb6920 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -8,7 +8,6 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz

From 204322454ca176b7306f30f64cdb1d88f3b3c5b2 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 22:32:18 +0100
Subject: [PATCH 172/196] xf86-video-cirrus: refactor, move to pkgs/by-name &
 rename from xorg.xf86videocirrus

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-cirrus/package.nix | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 60 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-cirrus/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-cirrus/package.nix b/pkgs/by-name/xf/xf86-video-cirrus/package.nix
new file mode 100644
index 000000000000..12b80bd14a5e
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-cirrus/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-cirrus";
+  version = "1.6.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-cirrus";
+    tag = "xf86-video-cirrus-${finalAttrs.version}";
+    hash = "sha256-7V3czOujUIKFe9UqNX4FwpDWq9XsZeaLRu9ALnZyRMw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-cirrus-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Cirrus Logic video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-cirrus";
+    license = with lib.licenses; [
+      x11
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 169f37c56021..fb3daf248b3c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -137,6 +137,7 @@
   xf86-video-ast,
   xf86-video-ati,
   xf86-video-chips,
+  xf86-video-cirrus,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -356,6 +357,7 @@ self: with self; {
   xf86videoast = xf86-video-ast;
   xf86videoati = xf86-video-ati;
   xf86videochips = xf86-video-chips;
+  xf86videocirrus = xf86-video-cirrus;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
@@ -602,44 +604,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videocirrus = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-cirrus";
-      version = "1.6.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz";
-        sha256 = "00b468w01hqjczfqz42v2vqhb14db4wazcqi1w29lgfyhc0gmwqf";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videodummy = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 3bfc455fc02d..9c44f16e94e1 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -469,6 +469,7 @@ print OUT <<EOF;
   xf86-video-ast,
   xf86-video-ati,
   xf86-video-chips,
+  xf86-video-cirrus,
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
@@ -688,6 +689,7 @@ self: with self; {
   xf86videoast = xf86-video-ast;
   xf86videoati = xf86-video-ati;
   xf86videochips = xf86-video-chips;
+  xf86videocirrus = xf86-video-cirrus;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3a7241fb6920..efa1f574058c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -8,7 +8,6 @@ mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz

From 1566daa69241ebdcb0edc2c7ed2cda792d781e39 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 9 Jan 2026 23:24:03 +0100
Subject: [PATCH 173/196] zed-editor: enable cargo-nextest

Upstream is using cargo-nextest and some tests are actually failing
without it.
---
 pkgs/by-name/ze/zed-editor/package.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 5f883aee44de..f35669333952 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -225,23 +225,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  checkFlags = [
-    # Flaky: unreliably fails on certain hosts (including Hydra)
-    "--skip=zed::tests::test_window_edit_state_restoring_enabled"
-    # The following tests are flaky on at least x86_64-linux and aarch64-darwin,
-    # where they sometimes fail with: "database table is locked: workspaces".
-    "--skip=zed::tests::test_open_file_in_many_spaces"
-    "--skip=zed::tests::test_open_non_existing_file"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Flaky: unreliably fails on certain hosts (including Hydra)
-    "--skip=zed::open_listener::tests::test_open_workspace_with_directory"
-    "--skip=zed::open_listener::tests::test_open_workspace_with_nonexistent_files"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    # Fails on certain hosts (including Hydra) for unclear reason
-    "--skip=test_open_paths_action"
-  ];
+  useNextest = true;
 
   installPhase = ''
     runHook preInstall

From 9c63aae1d2efb20f67516d608f03f0bdc2bbfcb3 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 23:01:29 +0100
Subject: [PATCH 174/196] xf86-video-i128: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoi128

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-i128/package.nix   | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 60 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-i128/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-i128/package.nix b/pkgs/by-name/xf/xf86-video-i128/package.nix
new file mode 100644
index 000000000000..9210b92e9fb3
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-i128/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-i128";
+  version = "1.4.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-i128";
+    tag = "xf86-video-i128-${finalAttrs.version}";
+    hash = "sha256-2yjzaJV5DIATEmByIZJXZyZ781lTUNzfafCmIlBSBRg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-i128-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Number Nine I128 video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-i128";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9923fae3d974..b2327f2e8ae6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -134,6 +134,7 @@
   xf86-input-void,
   xf86-video-ark,
   xf86-video-geode,
+  xf86-video-i128,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -349,6 +350,7 @@ self: with self; {
   xf86inputvoid = xf86-input-void;
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
+  xf86videoi128 = xf86-video-i128;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
@@ -866,44 +868,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoi128 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-i128";
-      version = "1.4.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz";
-        sha256 = "0imwmkam09wpp3z3iaw9i4hysxicrrax7i3p0l2glgp3zw9var3h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoi740 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index aeb72a556c36..fa4223f7208c 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -466,6 +466,7 @@ print OUT <<EOF;
   xf86-input-void,
   xf86-video-ark,
   xf86-video-geode,
+  xf86-video-i128,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -681,6 +682,7 @@ self: with self; {
   xf86inputvoid = xf86-input-void;
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
+  xf86videoi128 = xf86-video-i128;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c6a3db5821fa..970789c53871 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -120,12 +120,6 @@ self: super:
 
   xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
 
-  xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      badPlatforms = lib.platforms.aarch64;
-    };
-  });
-
   xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: {
     env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-overflow" ];
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a06f37eefefd..31f44d581ab0 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -15,7 +15,6 @@ mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
-mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz

From da14298fdc538449cd33b9b5f0404b33f14abbb1 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 8 Jan 2026 23:07:46 +0100
Subject: [PATCH 175/196] xf86-video-i740: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoi740

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-i740/package.nix   | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 60 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-i740/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-i740/package.nix b/pkgs/by-name/xf/xf86-video-i740/package.nix
new file mode 100644
index 000000000000..1163bdf60e59
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-i740/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-i740";
+  version = "1.4.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-i740";
+    tag = "xf86-video-i740-${finalAttrs.version}";
+    hash = "sha256-wEpTkmzMjEebkPf6/69gjmDdJ0OQ3MrnosIXFIQor8A=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-i740-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Intel i740 video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740";
+    license = with lib.licenses; [
+      mit
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b2327f2e8ae6..86f141987efb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -135,6 +135,7 @@
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-i128,
+  xf86-video-i740,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -351,6 +352,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videoi128 = xf86-video-i128;
+  xf86videoi740 = xf86-video-i740;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
@@ -868,44 +870,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoi740 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-i740";
-      version = "1.4.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2";
-        sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videointel = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index fa4223f7208c..0874325ec8e6 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -467,6 +467,7 @@ print OUT <<EOF;
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-i128,
+  xf86-video-i740,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -683,6 +684,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videoi128 = xf86-video-i128;
+  xf86videoi740 = xf86-video-i740;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 31f44d581ab0..4bf2e5965b8a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -15,7 +15,6 @@ mirror://xorg/individual/driver/xf86-video-chips-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
-mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz

From 2aa1686813eba8ecd34283693f9c97ae81383115 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Fri, 9 Jan 2026 01:07:29 +0100
Subject: [PATCH 176/196] xf86-video-mga: refactor, move to pkgs/by-name &
 rename from xorg.xf86videomga

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-mga/package.nix    | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 63 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-mga/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-mga/package.nix b/pkgs/by-name/xf/xf86-video-mga/package.nix
new file mode 100644
index 000000000000..ff0444ecfa53
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-mga/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-mga";
+  version = "2.1.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-mga";
+    tag = "xf86-video-mga-${finalAttrs.version}";
+    hash = "sha256-9DpqSyGTu4jOttZlF95/rpi2oEu+JPU3sniuHTatoRo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorgproto
+    libdrm
+    libpciaccess
+    xorg-server
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-mga-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Matrox video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga";
+    license = with lib.licenses; [
+      x11
+      mitOpenGroup
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 86f141987efb..d4a5bf42d241 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -136,6 +136,7 @@
   xf86-video-geode,
   xf86-video-i128,
   xf86-video-i740,
+  xf86-video-mga,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -353,6 +354,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videoi128 = xf86-video-i128;
   xf86videoi740 = xf86-video-i740;
+  xf86videomga = xf86-video-mga;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
@@ -940,46 +942,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videomga = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libdrm,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-mga";
-      version = "2.1.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz";
-        sha256 = "0wxbcgg5i4yq22pbc50567877z8irxhqzgl3sk6vf5zs9szmvy3v";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libdrm
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videoneomagic = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0874325ec8e6..ef83da64c851 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -468,6 +468,7 @@ print OUT <<EOF;
   xf86-video-geode,
   xf86-video-i128,
   xf86-video-i740,
+  xf86-video-mga,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -685,6 +686,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videoi128 = xf86-video-i128;
   xf86videoi740 = xf86-video-i740;
+  xf86videomga = xf86-video-mga;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 4bf2e5965b8a..b2262061b72a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -16,7 +16,6 @@ mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2

From 2a0fbb34723557329cf8c02a0540ee46f7434eac Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Fri, 9 Jan 2026 01:20:10 +0100
Subject: [PATCH 177/196] xf86-video-neomagic: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoneomagic

relevant changes:
- switch to GitLab source instead of release tarball
---
 .../xf/xf86-video-neomagic/package.nix        | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 60 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-neomagic/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-neomagic/package.nix b/pkgs/by-name/xf/xf86-video-neomagic/package.nix
new file mode 100644
index 000000000000..b7f6c97dd963
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-neomagic/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-neomagic";
+  version = "1.3.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-neomagic";
+    tag = "xf86-video-neomagic-${finalAttrs.version}";
+    hash = "sha256-j1zhKGYmKADZ/6WuCQTca7l+rTgqlLhGoQvYhWxWAAE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-neomagic-(.*)" ]; };
+  };
+
+  meta = {
+    description = "NeoMagic video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+      # the repo contains several copyright notices without a license
+      unfree
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d4a5bf42d241..c792d5b29929 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -137,6 +137,7 @@
   xf86-video-i128,
   xf86-video-i740,
   xf86-video-mga,
+  xf86-video-neomagic,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -355,6 +356,7 @@ self: with self; {
   xf86videoi128 = xf86-video-i128;
   xf86videoi740 = xf86-video-i740;
   xf86videomga = xf86-video-mga;
+  xf86videoneomagic = xf86-video-neomagic;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
@@ -942,44 +944,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoneomagic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-neomagic";
-      version = "1.3.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz";
-        sha256 = "153lzhq0vahg3875wi8hl9rf4sgizs41zmfg6hpfjw99qdzaq7xn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videonv = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ef83da64c851..a6599d397341 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -469,6 +469,7 @@ print OUT <<EOF;
   xf86-video-i128,
   xf86-video-i740,
   xf86-video-mga,
+  xf86-video-neomagic,
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
@@ -687,6 +688,7 @@ self: with self; {
   xf86videoi128 = xf86-video-i128;
   xf86videoi740 = xf86-video-i740;
   xf86videomga = xf86-video-mga;
+  xf86videoneomagic = xf86-video-neomagic;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b2262061b72a..f16a921f15fb 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -16,7 +16,6 @@ mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
-mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2

From a03641b7c80a81201a4d0c48622be6a5f5d2c361 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 04:51:46 +0100
Subject: [PATCH 178/196] xf86-video-qxl: refactor, move to pkgs/by-name &
 rename from xorg.xf86videoqxl

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-qxl/package.nix    | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 44 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  4 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 63 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-qxl/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-qxl/package.nix b/pkgs/by-name/xf/xf86-video-qxl/package.nix
new file mode 100644
index 000000000000..54c6d3865e18
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-qxl/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libpciaccess,
+  spice-protocol,
+  udev,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-qxl";
+  version = "0.1.6";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-qxl";
+    tag = "xf86-video-qxl-${finalAttrs.version}";
+    hash = "sha256-g7NvAjmvPjyqUTXnZREDDs18O2e9Zl5hZeAza2a/1Jw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libdrm
+    libpciaccess
+    spice-protocol
+    udev
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-qxl-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Xorg video driver for the QXL virtual GPU";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9923fae3d974..00e3088db15f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -135,6 +135,7 @@
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-nouveau,
+  xf86-video-qxl,
   xf86-video-s3virge,
   xf86-video-v4l,
   xfd,
@@ -350,6 +351,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
+  xf86videoqxl = xf86-video-qxl;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
@@ -1214,48 +1216,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videoqxl = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libdrm,
-      udev,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-qxl";
-      version = "0.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz";
-        sha256 = "0pwncx60r1xxk8kpp9a46ga5h7k7hjqf14726v0gra27vdc9blra";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libdrm
-        udev
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videor128 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index aeb72a556c36..7e0a8b9136a8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -467,6 +467,7 @@ print OUT <<EOF;
   xf86-video-ark,
   xf86-video-geode,
   xf86-video-nouveau,
+  xf86-video-qxl,
   xf86-video-s3virge,
   xf86-video-v4l,
   xfd,
@@ -682,6 +683,7 @@ self: with self; {
   xf86videoark = xf86-video-ark;
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
+  xf86videoqxl = xf86-video-qxl;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c6a3db5821fa..ca80e2258fb2 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -162,10 +162,6 @@ self: super:
     };
   });
 
-  xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [ spice-protocol ];
-  });
-
   xf86videosiliconmotion = super.xf86videosiliconmotion.overrideAttrs (attrs: {
     meta = attrs.meta // {
       platforms = [
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a06f37eefefd..8b2fa6f9bbd6 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -23,7 +23,6 @@ mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz

From 31363186f459e011e12b529f3157a60bb11eae8f Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 05:05:39 +0100
Subject: [PATCH 179/196] xf86-video-r128: refactor, move to pkgs/by-name &
 rename from xorg.xf86videor128

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-r128/package.nix   | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 61 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-r128/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-r128/package.nix b/pkgs/by-name/xf/xf86-video-r128/package.nix
new file mode 100644
index 000000000000..7f3bf884eb03
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-r128/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-r128";
+  version = "6.13.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-r128";
+    tag = "xf86-video-r128-${finalAttrs.version}";
+    hash = "sha256-f75PQ3pmWtyqeEfrMQpO31U0QOydlmQ49gJuvneRoso=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libdrm
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-r128-(.*)" ]; };
+  };
+
+  meta = {
+    description = "ATI Rage 128 video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128";
+    license = with lib.licenses; [
+      mit
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 00e3088db15f..ada0cd2d26cb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -136,6 +136,7 @@
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-qxl,
+  xf86-video-r128,
   xf86-video-s3virge,
   xf86-video-v4l,
   xfd,
@@ -352,6 +353,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videoqxl = xf86-video-qxl;
+  xf86videor128 = xf86-video-r128;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
@@ -1216,46 +1218,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videor128 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libdrm,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-r128";
-      version = "6.13.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz";
-        sha256 = "0igpfgls5nx4sz8a7yppr42qi37prqmxsy08zqbxbv81q9dfs2zj";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libdrm
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videosavage = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 7e0a8b9136a8..6b7dd69883ea 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -468,6 +468,7 @@ print OUT <<EOF;
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-qxl,
+  xf86-video-r128,
   xf86-video-s3virge,
   xf86-video-v4l,
   xfd,
@@ -684,6 +685,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videoqxl = xf86-video-qxl;
+  xf86videor128 = xf86-video-r128;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8b2fa6f9bbd6..5e94d8202a6c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -23,7 +23,6 @@ mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
 mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz

From c8a1118783a932131116949d32006dcdd27987ea Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 05:27:52 +0100
Subject: [PATCH 180/196] xf86-video-sis: refactor, move to pkgs/by-name &
 rename from xorg.xf86videosis

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-sis/package.nix    | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 63 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-sis/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-sis/package.nix b/pkgs/by-name/xf/xf86-video-sis/package.nix
new file mode 100644
index 000000000000..69d5dcb15006
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-sis/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-sis";
+  version = "0.12.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-sis";
+    tag = "xf86-video-sis-${finalAttrs.version}";
+    hash = "sha256-C9OG/vWFIVXgRRAzn3AqE2ApABZOKT94CuIxgnOapjs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libdrm
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-sis-(.*)" ]; };
+  };
+
+  meta = {
+    description = "SiS and XGI video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis";
+    license = with lib.licenses; [
+      bsd3
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9923fae3d974..80c92dce9bf8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -136,6 +136,7 @@
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
+  xf86-video-sis,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -351,6 +352,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
+  xf86videosis = xf86-video-sis;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -1374,46 +1376,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videosis = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libdrm,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-sis";
-      version = "0.12.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz";
-        sha256 = "00j7i2r81496w27rf4nq9gc66n6nizp3fi7nnywrxs81j1j3pk4v";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libdrm
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videosisusb = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index aeb72a556c36..b86e116f835b 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -468,6 +468,7 @@ print OUT <<EOF;
   xf86-video-geode,
   xf86-video-nouveau,
   xf86-video-s3virge,
+  xf86-video-sis,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -683,6 +684,7 @@ self: with self; {
   xf86videogeode = xf86-video-geode;
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
+  xf86videosis = xf86-video-sis;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a06f37eefefd..9d8f1cc5c033 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
-mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz
 mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz

From 5970cad385798bb3b3eed3036c2b282077c42b3d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 05:35:19 +0100
Subject: [PATCH 181/196] xf86-video-sisusb: refactor, move to pkgs/by-name &
 rename from xorg.xf86videosisusb

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-sisusb/package.nix | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 59 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-sisusb/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-sisusb/package.nix b/pkgs/by-name/xf/xf86-video-sisusb/package.nix
new file mode 100644
index 000000000000..ca3decf26136
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-sisusb/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-sisusb";
+  version = "0.9.7";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-sisusb";
+    tag = "xf86-video-sisusb-${finalAttrs.version}";
+    hash = "sha256-Z4q1ChH+u5u+NOsrwTnBVF2iJbvkd/stffdCRK73DS8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-sisusb-(.*)" ]; };
+  };
+
+  meta = {
+    description = "SiS Net2280-based USB video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-sisusb";
+    license = with lib.licenses; [
+      bsd3
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 80c92dce9bf8..0ec4cc841de0 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -137,6 +137,7 @@
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-sis,
+  xf86-video-sisusb,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -353,6 +354,7 @@ self: with self; {
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videosis = xf86-video-sis;
+  xf86videosisusb = xf86-video-sisusb;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -1376,44 +1378,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videosisusb = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-sisusb";
-      version = "0.9.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2";
-        sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videosuncg6 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b86e116f835b..74e4e88dc616 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -469,6 +469,7 @@ print OUT <<EOF;
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-sis,
+  xf86-video-sisusb,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -685,6 +686,7 @@ self: with self; {
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videosis = xf86-video-sis;
+  xf86videosisusb = xf86-video-sisusb;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 9d8f1cc5c033..171fd6918c13 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
-mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz

From a54c58d545da2963cbb66a4e57e8c0890198af21 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 05:42:42 +0100
Subject: [PATCH 182/196] xf86-video-suncg6: refactor, move to pkgs/by-name &
 rename from xorg.xf86videosuncg6

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-suncg6/package.nix | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-suncg6/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-suncg6/package.nix b/pkgs/by-name/xf/xf86-video-suncg6/package.nix
new file mode 100644
index 000000000000..22569598238e
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-suncg6/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-suncg6";
+  version = "1.1.3";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-suncg6";
+    tag = "xf86-video-suncg6-${finalAttrs.version}";
+    hash = "sha256-M9O0BNrKAFdiEgpZstH8KHRVIMEy5dI3y8rP+MSzLCY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-suncg6-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Sun GX/Turbo GX video driver for the Xorg X server";
+    longDescription = ''
+      This driver supports the Sun GX, GXplus, TurboGX, and TurboGXplus Color Frame Buffers. These
+      Sbus cards were supported in the sun4c, sun4m, sun4d, and sun4u platforms.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0ec4cc841de0..4b98f4d3b2c9 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -138,6 +138,7 @@
   xf86-video-s3virge,
   xf86-video-sis,
   xf86-video-sisusb,
+  xf86-video-suncg6,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -355,6 +356,7 @@ self: with self; {
   xf86videos3virge = xf86-video-s3virge;
   xf86videosis = xf86-video-sis;
   xf86videosisusb = xf86-video-sisusb;
+  xf86videosuncg6 = xf86-video-suncg6;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -1378,42 +1380,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videosuncg6 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-suncg6";
-      version = "1.1.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz";
-        sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videosunffb = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 74e4e88dc616..a52c7d3eb42c 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -470,6 +470,7 @@ print OUT <<EOF;
   xf86-video-s3virge,
   xf86-video-sis,
   xf86-video-sisusb,
+  xf86-video-suncg6,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -687,6 +688,7 @@ self: with self; {
   xf86videos3virge = xf86-video-s3virge;
   xf86videosis = xf86-video-sis;
   xf86videosisusb = xf86-video-sisusb;
+  xf86videosuncg6 = xf86-video-suncg6;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c6a3db5821fa..1203af209ca6 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -134,12 +134,6 @@ self: super:
     configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
   });
 
-  xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      broken = isDarwin;
-    }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin
-  });
-
   xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: {
     meta = attrs.meta // {
       broken = isDarwin;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 171fd6918c13..b9777c0cb7c0 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
-mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2

From 6e6f89a50a035aeed80e1ad80f69f8d25e4a6384 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 05:49:41 +0100
Subject: [PATCH 183/196] xf86-video-sunffb: refactor, move to pkgs/by-name &
 rename from xorg.xf86videosunffb

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-sunffb/package.nix | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-sunffb/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-sunffb/package.nix b/pkgs/by-name/xf/xf86-video-sunffb/package.nix
new file mode 100644
index 000000000000..7210e22cc6c7
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-sunffb/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-sunffb";
+  version = "1.2.3";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-sunffb";
+    tag = "xf86-video-sunffb-${finalAttrs.version}";
+    hash = "sha256-wuzODH7iRBxWHzVE8v/npy1/BwS3r08GduMEDdtJd9E=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-sunffb-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Sun FFB video driver for the Xorg X server";
+    longDescription = ''
+      This driver supports Sun Creator, Creator 3D and Elite 3D video cards, which are UPA bus
+      devices for UltraSPARC workstations.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4b98f4d3b2c9..e885205aa82b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -139,6 +139,7 @@
   xf86-video-sis,
   xf86-video-sisusb,
   xf86-video-suncg6,
+  xf86-video-sunffb,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -357,6 +358,7 @@ self: with self; {
   xf86videosis = xf86-video-sis;
   xf86videosisusb = xf86-video-sisusb;
   xf86videosuncg6 = xf86-video-suncg6;
+  xf86videosunffb = xf86-video-sunffb;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -1380,42 +1382,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videosunffb = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-sunffb";
-      version = "1.2.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz";
-        sha256 = "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videosunleo = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a52c7d3eb42c..c4d529143257 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -471,6 +471,7 @@ print OUT <<EOF;
   xf86-video-sis,
   xf86-video-sisusb,
   xf86-video-suncg6,
+  xf86-video-sunffb,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -689,6 +690,7 @@ self: with self; {
   xf86videosis = xf86-video-sis;
   xf86videosisusb = xf86-video-sisusb;
   xf86videosuncg6 = xf86-video-suncg6;
+  xf86videosunffb = xf86-video-sunffb;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 1203af209ca6..0611e1b728a2 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -134,12 +134,6 @@ self: super:
     configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
   });
 
-  xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      broken = isDarwin;
-    }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin
-  });
-
   xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: {
     meta = attrs.meta // {
       broken = isDarwin;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b9777c0cb7c0..8ce76392fbc3 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
-mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz

From 946d6c64279ac491aa1a6d9dfb8e6e9ae63b7977 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 05:56:24 +0100
Subject: [PATCH 184/196] xf86-video-sunleo: refactor, move to pkgs/by-name &
 rename from xorg.xf86videosunleo

relevant changes:
- switch to GitLab source instead of release tarball
---
 pkgs/by-name/xf/xf86-video-sunleo/package.nix | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 61 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-sunleo/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-sunleo/package.nix b/pkgs/by-name/xf/xf86-video-sunleo/package.nix
new file mode 100644
index 000000000000..57ddb2ac63cd
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-sunleo/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-sunleo";
+  version = "1.2.3";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-sunleo";
+    tag = "xf86-video-sunleo-${finalAttrs.version}";
+    hash = "sha256-YAm1KpPpY+jJ+uBTxzi9bju1XNVnKy28IofP57MzQmk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-sunleo-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Sun Leo video driver for the Xorg X server";
+    longDescription = ''
+      This is an Xorg driver for Sun Leo (ZX) video cards.
+      Also known as the ZX or T(urbo)ZX, Leo is a 24 bit accelerated 3D graphics card. Both cards
+      are double-width, but the TZX also requires extra cooling in the form of an additional
+      double-width fan card, so effectively takes up 4 SBus slots.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e885205aa82b..fae33c1b5cc7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -140,6 +140,7 @@
   xf86-video-sisusb,
   xf86-video-suncg6,
   xf86-video-sunffb,
+  xf86-video-sunleo,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -359,6 +360,7 @@ self: with self; {
   xf86videosisusb = xf86-video-sisusb;
   xf86videosuncg6 = xf86-video-suncg6;
   xf86videosunffb = xf86-video-sunffb;
+  xf86videosunleo = xf86-video-sunleo;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -1382,42 +1384,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videosunleo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-sunleo";
-      version = "1.2.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz";
-        sha256 = "1px670aiqyzddl1nz3xx1lmri39irajrqw6dskirs2a64jgp3dpc";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videotdfx = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index c4d529143257..d62842d11871 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -472,6 +472,7 @@ print OUT <<EOF;
   xf86-video-sisusb,
   xf86-video-suncg6,
   xf86-video-sunffb,
+  xf86-video-sunleo,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -691,6 +692,7 @@ self: with self; {
   xf86videosisusb = xf86-video-sisusb;
   xf86videosuncg6 = xf86-video-suncg6;
   xf86videosunffb = xf86-video-sunffb;
+  xf86videosunleo = xf86-video-sunleo;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0611e1b728a2..061b56ad8f15 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -134,12 +134,6 @@ self: super:
     configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
   });
 
-  xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      broken = isDarwin;
-    }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin
-  });
-
   xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
     env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12
     meta = attrs.meta // {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8ce76392fbc3..a7d2f4e3d8ae 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
-mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz

From 024123a072c7ed55d54cb6b572aef8f1f4392ceb Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 06:30:57 +0100
Subject: [PATCH 185/196] xf86-video-vbox: refactor, move to pkgs/by-name &
 rename from xorg.xf86videovboxvideo

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-vbox/package.nix   | 63 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 67 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-vbox/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-vbox/package.nix b/pkgs/by-name/xf/xf86-video-vbox/package.nix
new file mode 100644
index 000000000000..c658c40d623a
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-vbox/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-vbox";
+  version = "1.0.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-vbox";
+    tag = "xf86-video-vboxvideo-${finalAttrs.version}";
+    hash = "sha256-C+5spc9EABu3p5Ck7R4bWedLDm8h0DrbYic2AwIUAqU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-vboxvideo-(.*)" ]; };
+  };
+
+  meta = {
+    description = "VirtualBox video driver for the Xorg X server";
+    longDescription = ''
+      This driver is only for use in VirtualBox guests without the vboxvideo kernel modesetting
+      driver in the guest kernel, and which are configured to use the VBoxVGA device instead of a
+      VMWare-compatible video device emulation.
+      Guests with the vboxvideo kernel modesetting driver should use the Xorg "modesetting" driver
+      module instead of this one.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-vbox";
+    license = with lib.licenses; [
+      mit
+      x11
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9923fae3d974..2fa5f942fb2a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -137,6 +137,7 @@
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
+  xf86-video-vbox,
   xfd,
   xfontsel,
   xfs,
@@ -352,6 +353,7 @@ self: with self; {
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
+  xf86videovboxvideo = xf86-video-vbox;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -1638,44 +1640,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videovboxvideo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-vboxvideo";
-      version = "1.0.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz";
-        sha256 = "12kzgf516mbdygpni0jzm3dv60vz6vf704f3hgc6pi9bgpy6bz4f";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videovesa = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index aeb72a556c36..03edaace9feb 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -469,6 +469,7 @@ print OUT <<EOF;
   xf86-video-nouveau,
   xf86-video-s3virge,
   xf86-video-v4l,
+  xf86-video-vbox,
   xfd,
   xfontsel,
   xfs,
@@ -684,6 +685,7 @@ self: with self; {
   xf86videonouveau = xf86-video-nouveau;
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
+  xf86videovboxvideo = xf86-video-vbox;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a06f37eefefd..a272494f809c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -34,7 +34,6 @@ mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz

From afd4dcf86fcc1e26c65df17645432277b12a2078 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 06:37:54 +0100
Subject: [PATCH 186/196] xf86-video-vesa: refactor, move to pkgs/by-name &
 rename from xorg.xf86videovesa

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-vesa/package.nix   | 53 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-vesa/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-vesa/package.nix b/pkgs/by-name/xf/xf86-video-vesa/package.nix
new file mode 100644
index 000000000000..5bf451dd2d62
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-vesa/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-vesa";
+  version = "2.6.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-vesa";
+    tag = "xf86-video-vesa-${finalAttrs.version}";
+    hash = "sha256-M8/mSgD398wBswOp0oEXvlcgVsYdWcTIw3ah5e1uHV8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-vesa-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Generic VESA video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2fa5f942fb2a..90b71a344529 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -138,6 +138,7 @@
   xf86-video-s3virge,
   xf86-video-v4l,
   xf86-video-vbox,
+  xf86-video-vesa,
   xfd,
   xfontsel,
   xfs,
@@ -354,6 +355,7 @@ self: with self; {
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
   xf86videovboxvideo = xf86-video-vbox;
+  xf86videovesa = xf86-video-vesa;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -1640,44 +1642,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videovesa = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-vesa";
-      version = "2.6.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz";
-        sha256 = "1ccvaigb1f1kz8nxxjmkfn598nabd92p16rx1g35kxm8n5qjf20h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videovmware = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 03edaace9feb..e6eb9fe9f1ee 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -470,6 +470,7 @@ print OUT <<EOF;
   xf86-video-s3virge,
   xf86-video-v4l,
   xf86-video-vbox,
+  xf86-video-vesa,
   xfd,
   xfontsel,
   xfs,
@@ -686,6 +687,7 @@ self: with self; {
   xf86videos3virge = xf86-video-s3virge;
   xf86videov4l = xf86-video-v4l;
   xf86videovboxvideo = xf86-video-vbox;
+  xf86videovesa = xf86-video-vesa;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a272494f809c..41b48803b0a6 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -34,7 +34,6 @@ mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz
 mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz
-mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2

From 3b9aa508e812e3c71b4e209824c1ff13d21d7ca3 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 10 Jan 2026 06:02:42 +0100
Subject: [PATCH 187/196] xf86-video-tdfx: refactor, move to pkgs/by-name &
 rename from xorg.xf86videotdfx

relevant changes:
- switch to GitLab source instead of release tarball
- mark broken when cross compiling because some weird configure error:
  - upstream https://gcc.gnu.org/bugzilla/show_bug.cgi?id=26046
- mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833)
---
 pkgs/by-name/xf/xf86-video-tdfx/package.nix   | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 63 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-video-tdfx/package.nix

diff --git a/pkgs/by-name/xf/xf86-video-tdfx/package.nix b/pkgs/by-name/xf/xf86-video-tdfx/package.nix
new file mode 100644
index 000000000000..8de423475147
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-video-tdfx/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorg-server,
+  xorgproto,
+  libdrm,
+  libpciaccess,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-video-tdfx";
+  version = "1.5.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-video-tdfx";
+    tag = "xf86-video-tdfx-${finalAttrs.version}";
+    hash = "sha256-95LFAPBT4nTuTLx83wsdOCwLOLed39WtP5FXPqiO/LI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    xorg-server # for some autoconf macros
+  ];
+
+  buildInputs = [
+    xorg-server
+    xorgproto
+    libdrm
+    libpciaccess
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-tdfx-(.*)" ]; };
+  };
+
+  meta = {
+    description = "3Dfx video driver for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken =
+      # configure: error: cannot check for file existence when cross compiling
+      (stdenv.hostPlatform != stdenv.buildPlatform)
+      # broken due to missing I/O Port syscalls
+      || stdenv.hostPlatform.isAarch64;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index fae33c1b5cc7..772991914e21 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -141,6 +141,7 @@
   xf86-video-suncg6,
   xf86-video-sunffb,
   xf86-video-sunleo,
+  xf86-video-tdfx,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -361,6 +362,7 @@ self: with self; {
   xf86videosuncg6 = xf86-video-suncg6;
   xf86videosunffb = xf86-video-sunffb;
   xf86videosunleo = xf86-video-sunleo;
+  xf86videotdfx = xf86-video-tdfx;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -1384,46 +1386,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86videotdfx = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libdrm,
-      libpciaccess,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-video-tdfx";
-      version = "1.5.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2";
-        sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libdrm
-        libpciaccess
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86videotrident = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d62842d11871..fa269c3790a1 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -473,6 +473,7 @@ print OUT <<EOF;
   xf86-video-suncg6,
   xf86-video-sunffb,
   xf86-video-sunleo,
+  xf86-video-tdfx,
   xf86-video-v4l,
   xfd,
   xfontsel,
@@ -693,6 +694,7 @@ self: with self; {
   xf86videosuncg6 = xf86-video-suncg6;
   xf86videosunffb = xf86-video-sunffb;
   xf86videosunleo = xf86-video-sunleo;
+  xf86videotdfx = xf86-video-tdfx;
   xf86videov4l = xf86-video-v4l;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a7d2f4e3d8ae..38092d390a47 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz
-mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz
 mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz

From 3b1d35a92a6d452fbdca9692bf012bba904814c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 10 Jan 2026 12:06:18 +0100
Subject: [PATCH 188/196] antlr: remove unused and none existing input

---
 pkgs/development/tools/parsing/antlr/4.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix
index 0352698f42f4..366c0d4b3502 100644
--- a/pkgs/development/tools/parsing/antlr/4.nix
+++ b/pkgs/development/tools/parsing/antlr/4.nix
@@ -8,9 +8,6 @@
   ninja,
   pkg-config,
 
-  # darwin only
-  CoreFoundation ? null,
-
   # ANTLR 4.8 & 4.9
   libuuid,
 

From ac06c1de436370299766f770ad27699e1738bb8a Mon Sep 17 00:00:00 2001
From: Ephemeral <theephemeral.txt@gmail.com>
Date: Sat, 10 Jan 2026 00:52:01 +0600
Subject: [PATCH 189/196] svu: add shell completions

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

diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix
index 81e09d06f760..d0bcf2d5bb56 100644
--- a/pkgs/by-name/sv/svu/package.nix
+++ b/pkgs/by-name/sv/svu/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   testers,
   svu,
+  installShellFiles,
+  stdenv,
 }:
 
 buildGoModule rec {
@@ -31,6 +33,14 @@ buildGoModule rec {
     rm internal/git/git_test.go
   '';
 
+  nativeBuildInputs = [ installShellFiles ];
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd svu \
+      --bash <($out/bin/svu completion bash) \
+      --fish <($out/bin/svu completion fish) \
+      --zsh <($out/bin/svu completion zsh)
+  '';
+
   passthru.tests.version = testers.testVersion { package = svu; };
 
   meta = {

From e25b29d1cb194e703abaed65190ad789b2069a99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 12:09:19 +0000
Subject: [PATCH 190/196] orbiton: 2.70.4 -> 2.70.5

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

diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index fd0a2ea71b10..a416b5e1693d 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "orbiton";
-  version = "2.70.4";
+  version = "2.70.5";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
     tag = "v${version}";
-    hash = "sha256-cdaYD6PyOjgBo83eWD2+YWQj5uJzmeHDo67dlA7Pj1g=";
+    hash = "sha256-w2t3IxWB8F2QXB0caTP/kTGum6zec5BRxK9+kYwAcDY=";
   };
 
   vendorHash = null;

From e444c3a3aad3f77f6db5ca9fd3eab2f82aba58cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Jan 2026 12:23:13 +0000
Subject: [PATCH 191/196] woodpecker-plugin-git: 2.7.0 -> 2.8.0

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

diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index cd9a311ce00b..662368ee4938 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "woodpecker-plugin-git";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = version;
-    hash = "sha256-5P3YCMOrF7X+2ExI4Y/T6PJFyGqxI8gsKIAPJjM0zpk=";
+    hash = "sha256-fUGTO60ZgMt8t/O4Cb3trSMmTFhKBxG8sjft+hrmUjQ=";
   };
 
-  vendorHash = "sha256-ZBGDFgS8lYNCBrQRq3/JX3JRaDEJPaRbr9P4grlbG7Q=";
+  vendorHash = "sha256-FbtktDU6Rl3lu3U2vu20M+hz1HdLMu1krUcqXX3HfeA=";
 
   env.CGO_ENABLED = "0";
 

From 1b716076ea915d1324d7594b69143a401592d461 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 10 Jan 2026 21:19:02 +0800
Subject: [PATCH 192/196] nixos/rl-2605: Mention Cinnamon 6.6

Forgotten in # 464969.
---
 nixos/doc/manual/release-notes/rl-2605.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index 66a57940b24d..eaef3bc208ab 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -89,6 +89,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.
+
 - `services.frp` now supports multiple instances through `services.frp.instances` to make it possible to run multiple frp clients or servers at the same time.
 
 - `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled.  This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.

From 13e3a337def6f75ab37bc8b7293df396f816e020 Mon Sep 17 00:00:00 2001
From: Gon Solo <gonsolo@gmail.com>
Date: Sat, 10 Jan 2026 12:09:55 +0100
Subject: [PATCH 193/196] magic-vlsi: fix build with modern compilers

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

diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 284220fc2ca2..1aa95871a0b4 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -87,7 +87,8 @@ stdenv.mkDerivation rec {
     install_name_tool -add_rpath ${mesa_glu.out}/lib $out/lib/magic/tcl/magicexec
   '';
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
+  # gnu89 is needed for GCC 15 that is more strict about K&R style prototypes
+  env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-implicit-function-declaration";
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
 
   meta = {

From ed181980c2a8862c1b702fd5d2ef20c10dc6354b Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Sat, 10 Jan 2026 23:28:06 +0800
Subject: [PATCH 194/196] open-webui: 0.6.43 -> 0.7.1

Diff: https://github.com/open-webui/open-webui/compare/v0.6.43...v0.7.1

Changelog: https://github.com/open-webui/open-webui/blob/v0.7.1/CHANGELOG.md
---
 pkgs/by-name/op/open-webui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 5b5d790a5a1e..3305fa23d373 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.6.43";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-gkCG2SIYCF89IFi6neslvZNFyoC6PrMM2Vda/a3mc0k=";
+    hash = "sha256-pjrzZhY886LjkUnbG58r9j/ynq1fjTNCCqLmCPKoeek=";
   };
 
   frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-bw0f6jlA09s7Ptd8+q8RHRFZgnyE+ecsfY30XdKlyRM=";
+    npmDepsHash = "sha256-useP5o3Hx9I7WY0j+idKaa4KHx2w69/Us5ezN/v2+Ns=";
 
     # See https://github.com/open-webui/open-webui/issues/15880
     npmFlags = [

From bc952b946e8d12e3ba71610b5b9d0681b1928bfa Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Tue, 2 Dec 2025 21:14:41 -0800
Subject: [PATCH 195/196] changedetection-io: add missing dependency playwright

---
 pkgs/by-name/ch/changedetection-io/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix
index 51b30a9845ba..777fb073314b 100644
--- a/pkgs/by-name/ch/changedetection-io/package.nix
+++ b/pkgs/by-name/ch/changedetection-io/package.nix
@@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
       openpyxl
       paho-mqtt
       panzi-json-logic
+      playwright
       pluggy
       price-parser
       psutil

From 7fe87ba2c0203bae32fe651be5161e8f1eaf90ad Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sat, 10 Jan 2026 16:15:20 +0000
Subject: [PATCH 196/196] nixos/llama-swap: fix model response in test

Also add in depth error messages for understanding **what** actually failed.
Fix some tests checking the wrong variable.
---
 nixos/tests/web-servers/llama-swap.nix | 65 ++++++++++++++------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/nixos/tests/web-servers/llama-swap.nix b/nixos/tests/web-servers/llama-swap.nix
index 698b562515ad..90766b74c1ed 100644
--- a/nixos/tests/web-servers/llama-swap.nix
+++ b/nixos/tests/web-servers/llama-swap.nix
@@ -55,6 +55,10 @@ in
                 llama-server = lib.getExe' llama-cpp "llama-server";
               in
               {
+                # more useful logging output
+                logLevel = "debug";
+                logToStdout = "both";
+
                 hooks.on_startup.preload = [
                   "smollm2"
                 ];
@@ -62,14 +66,14 @@ in
                 models = {
                   "smollm2" = {
                     ttl = 10;
-                    cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --no-webui --temp 0.2 --top-k 9";
+                    cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2 --no-webui --temp 0.2 --top-k 9";
                   };
                   "smollm2-group-1" = {
-                    cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --no-webui --temp 0.2 --top-k 9 -c 1024";
+                    cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2-group-1 --no-webui --temp 0.2 --top-k 9 -c 1024";
                   };
                   "smollm2-group-2" = {
                     proxy = "http://127.0.0.1:5802";
-                    cmd = "${llama-server} --port 5802 -m ${smollm2-135m} --no-webui --temp 0.2 --top-k 9 -c 1024";
+                    cmd = "${llama-server} --port 5802 -m ${smollm2-135m} --alias smollm2-group-2 --no-webui --temp 0.2 --top-k 9 -c 1024";
                   };
                 };
                 groups = {
@@ -115,7 +119,6 @@ in
           '-s',
           '--fail',
           '-H "Content-Type: application/json"',
-          '-H "Authorization: Bearer no-key"',
           "-d '{d}'".format(d=json.dumps(data))
         ]
         return json.loads(machine.succeed('curl {args} http://localhost:8080{route}'.format(args=" ".join(args), route=route)))
@@ -127,7 +130,8 @@ in
         machine.succeed('curl --fail http:/localhost:8080/ui/')
 
       with subtest('check is healthy'):
-        machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/health | grep "OK"')
+        response_healthy = machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/health')
+        assert 'OK' in response_healthy, '/health was not OK'
 
     ''
     + lib.optionalString useSmollm2-135m ''
@@ -135,10 +139,10 @@ in
       with subtest('check `/running` for preloaded smollm2'):
         machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep "smollm2"')
         running_response = get_json('/running')
-        assert len(running_response['running']) == 1
+        assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}'
         running_model = running_response['running'][0]
-        assert running_model['model'] == 'smollm2'
-        assert running_model['state'] == 'ready'
+        assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}'
+        assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}'
 
       with subtest('runs smollm2'):
         response = None
@@ -155,31 +159,30 @@ in
           response = post_json('/v1/chat/completions', data)
 
         with subtest('response is from smollm2'):
-          assert response['model'] == 'smollm2'
+          assert response['model'] == 'smollm2', f'response was not from smollm2: {response['model']}'
 
         with subtest('response contains at least one item in "choices"'):
-          assert len(response['choices']) >= 1
+          assert len(response['choices']) >= 1, f'response had no choices: {response}'
 
         assistant_choices = None
         with subtest('response contains at least one "assistant" message'):
           assistant_choices = [c for c in response['choices'] if c['message']['role'] == 'assistant']
-          assert len(assistant_choices) >= 1
+          assert len(assistant_choices) >= 1, f'response had no assistant message: {response}'
 
         with subtest('first message (lowercase) starts with "hello"'):
-          assert assistant_choices[0]['message']['content'].lower()[:5] == 'hello'
+          assert assistant_choices[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response}'
 
         with subtest('check `/running` for just smollm2'):
           running_response = get_json('/running')
-          assert len(running_response['running']) == 1
+          assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}'
           running_model = running_response['running'][0]
-          assert running_model['model'] == 'smollm2'
-          assert running_model['state'] == 'ready'
+          assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}'
+          assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}'
 
       with subtest('check `/running` for smollm2 to timeout'):
-        machine.succeed('curl --silent --fail http://localhost:8080/running | grep "smollm2"')
         machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep -v "smollm2"', timeout=11)
         running_response = get_json('/running')
-        assert len(running_response['running']) == 0
+        assert len(running_response['running']) == 0, "smollm2 was still running after timeout"
 
       with subtest('runs smollm2-group-1 and smollm2-group-2'):
         response_1 = None
@@ -196,25 +199,25 @@ in
           response_1 = post_json('/v1/chat/completions', data)
 
         with subtest('response 1 is from smollm2-group-1'):
-          assert response_1['model'] == 'smollm2-group-1'
+          assert response_1['model'] == 'smollm2-group-1', f'response was not from smollm2-group-1: {response_1['model']}'
 
         with subtest('response 1 contains at least one item in "choices"'):
-          assert len(response['choices']) >= 1
+          assert len(response_1['choices']) >= 1, f'response had no choices: {response_1}'
 
         assistant_choices_1 = None
         with subtest('response 1 contains at least one "assistant" message'):
           assistant_choices_1 = [c for c in response_1['choices'] if c['message']['role'] == 'assistant']
-          assert len(assistant_choices_1) >= 1
+          assert len(assistant_choices_1) >= 1, f'response had no assistant message: {response_1}'
 
         with subtest('first message (lowercase) in response 1 starts with "hello"'):
-          assert assistant_choices_1[0]['message']['content'].lower()[:5] == 'hello'
+          assert assistant_choices_1[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_1}'
 
         with subtest('check `/running` for just smollm2-group-1'):
           running_response = get_json('/running')
-          assert len(running_response['running']) == 1
+          assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}'
           running_model = running_response['running'][0]
-          assert running_model['model'] == 'smollm2-group-1'
-          assert running_model['state'] == 'ready'
+          assert running_model['model'] == 'smollm2-group-1', f'running model is not smollm2-group-1: {running_response}'
+          assert running_model['state'] == 'ready', f'running smollm2-group-1 is not ready: {running_response}'
 
         response_2 = None
         with subtest('send request to smollm2-group-2'):
@@ -230,29 +233,29 @@ in
           response_2 = post_json('/v1/chat/completions', data)
 
         with subtest('response 2 is from smollm2-group-2'):
-          assert response_2['model'] == 'smollm2-group-2'
+          assert response_2['model'] == 'smollm2-group-2', f'response was not from smollm2-group-2: {response_2['model']}'
 
         with subtest('response 2 contains at least one item in "choices"'):
-          assert len(response['choices']) >= 1
+          assert len(response_2['choices']) >= 1, f'response had no choices: {response_2}'
 
         assistant_choices_2 = None
         with subtest('response 2 contains at least one "assistant" message'):
           assistant_choices_2 = [c for c in response_2['choices'] if c['message']['role'] == 'assistant']
-          assert len(assistant_choices_2) >= 1
+          assert len(assistant_choices_2) >= 1, f'response had no assistant message: {response_2}'
 
         with subtest('first message (lowercase) in response 1 starts with "hello"'):
-          assert assistant_choices_2[0]['message']['content'].lower()[:5] == 'hello'
+          assert assistant_choices_2[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_2}'
 
         with subtest('check `/running` for both smollm2-group-1 and smollm2-group-2'):
           running_response = get_json('/running')['running']
-          assert len(running_response) == 2
+          assert len(running_response) == 2, 'expected both in smollm2 group to be running'
           assert len([
             rm for rm in running_response
             if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-1'
-          ]) == 1
+          ]) == 1, f'smollm2-group-1 not in running group and ready {running_response}'
           assert len([
             rm for rm in running_response
             if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-2'
-          ]) == 1
+          ]) == 1, f'smollm2-group-2 not in running group and ready {running_response}'
     '';
 }