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 01/78] 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 02/78] 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 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 03/78] 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 b8b7ebec6e3b21b5516ef50de43f514f19aa75e1 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Thu, 1 Jan 2026 17:45:53 +0100
Subject: [PATCH 04/78] 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 05/78] 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 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 06/78] 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 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 07/78] 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 08/78] 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 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 09/78] 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 ba55a0c1050e9bdc725329c5ab211c3dae697785 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 7 Jan 2026 23:21:42 +0100
Subject: [PATCH 10/78] 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 11/78] 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 1c1fc7a59f16a2786e4bac1b2b28f08225af65c2 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 7 Jan 2026 23:21:56 +0100
Subject: [PATCH 12/78] 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 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 13/78] 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 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 14/78] 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 15/78] 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 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 16/78] 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 17/78] 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 18/78] 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 19/78] 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 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 20/78] 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 21/78] 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 22/78] 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 23/78] 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 24/78] 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 25/78] 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 26/78] 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 27/78] 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 28/78] 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 29/78] 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 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 30/78] 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 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 31/78] 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 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 32/78] 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 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 33/78] 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 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 34/78] 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 35/78] 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 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 36/78] 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 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 37/78] 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 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 38/78] 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 39/78] 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 40/78] 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 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 41/78] 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 42/78] 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 43/78] 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 44/78] 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 45/78] 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 46/78] 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 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 47/78] 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 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 48/78] 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 49/78] 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 50/78] 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 51/78] 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 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 52/78] 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 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 53/78] 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 54/78] 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 55/78] 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 56/78] 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 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 57/78] 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 58/78] 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 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 59/78] 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 60/78] 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 61/78] 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 62/78] 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 63/78] 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 64/78] 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 65/78] 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 66/78] 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 67/78] 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 68/78] 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 69/78] 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 70/78] 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 71/78] 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 72/78] 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 73/78] 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 74/78] 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 75/78] 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 76/78] 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 77/78] 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 78/78] 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