From 5368225673400136286646c3ce5288648bab366f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Sun, 16 Mar 2025 22:48:49 +0100
Subject: [PATCH 001/321] perl buildPerlPackage: use patchShebangs by default

---
 pkgs/development/perl-modules/generic/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 583a8c862cebe..2f478cf42f9e7 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -35,6 +35,8 @@
 
   env ? { },
 
+  postPatch ? "patchShebangs .",
+
   ...
 }@attrs:
 
@@ -66,6 +68,7 @@ lib.throwIf (attrs ? name)
             doCheck
             checkTarget
             enableParallelBuilding
+            postPatch
             ;
           env = {
             inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;

From 9425abcdffdf1caf0df616dcc46d2779b3dc31c5 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 19 Mar 2025 17:20:00 +0000
Subject: [PATCH 002/321] python3Packages.flasgger: fix build

66209649883659e071b686d348de491774f57f23 updated the version without
updating the hash.

Also, both patches appear to be already applied.
---
 .../python-modules/flasgger/default.nix           | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix
index b7cb3821defca..dab9287e1b3e5 100644
--- a/pkgs/development/python-modules/flasgger/default.nix
+++ b/pkgs/development/python-modules/flasgger/default.nix
@@ -25,22 +25,9 @@ buildPythonPackage rec {
     owner = "flasgger";
     repo = "flasgger";
     rev = "v${version}";
-    hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg=";
+    hash = "sha256-ULEf9DJiz/S2wKlb/vjGto8VCI0QDcm0pkU5rlOwtiE=";
   };
 
-  patches = [
-    (fetchpatch {
-      # flask 2.3 compat
-      url = "https://github.com/flasgger/flasgger/commit/ab77be7c6de1d4b361f0eacfa37290239963f890.patch";
-      hash = "sha256-ZbE5pPUP23nZAP/qcdeWkwzrZgqJSRES7oFta8U1uVQ=";
-    })
-    (fetchpatch {
-      # python 3.12 compat
-      url = "https://github.com/flasgger/flasgger/commit/6f5fcf24c1d816cf7ab529b3a8a764f86df4458d.patch";
-      hash = "sha256-37Es1sgBQ9qX3YHQYub4HJkSNTSt3MbtCfV+XdTQZyY=";
-    })
-  ];
-
   propagatedBuildInputs = [
     flask
     jsonschema

From dfbb8d8b83fc5511652c5118fe8eee5e91d9577c Mon Sep 17 00:00:00 2001
From: Kek5chen <kx@imkx.dev>
Date: Thu, 21 Nov 2024 22:38:34 +0100
Subject: [PATCH 003/321] libxmlxx3: 3.0.1 -> 3.2.5

---
 pkgs/development/libraries/libxmlxx/v3.nix | 81 ++++++++++++++++++----
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index c40631e78b9a8..5dabe98bd711b 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -7,36 +7,82 @@
   glibmm,
   perl,
   gnome,
+  meson,
+  ninja,
+  docbook5,
+  docbook-xsl-ns,
+  doxygen,
+  libxslt,
+  fop,
+  dblatex,
+  graphviz,
+
+  withDocumentation ? false,
+  withManual ? false, # Broken due to not being allowed to fetch file from web
+  withPDF ? false,
+  withExamples ? false,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libxml++";
-  version = "3.0.1";
+  version = "3.2.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
+    url = "mirror://gnome/sources/libxml++/${lib.versions.majorMinor version}/libxml++-${version}.tar.xz";
+    hash = "sha256-DJs4G1qD1rOrSwuGXXJW2rJ9V1mBtjvi+Fnty5TaWcc=";
   };
 
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-    "devdoc"
-  ];
+  outputs =
+    [
+      "out"
+      "dev"
+    ]
+    ++ lib.lists.optionals withDocumentation [
+      "doc"
+      "devdoc"
+    ];
 
-  nativeBuildInputs = [
-    pkg-config
-    perl
-  ];
+  nativeBuildInputs =
+    [
+      ninja
+      meson
+      pkg-config
+    ]
+    ++ lib.lists.optionals withDocumentation [
+      perl
+      doxygen
+      libxslt
+      graphviz
+    ]
+    ++ lib.lists.optionals withManual [
+      docbook5
+      docbook-xsl-ns
+    ]
+    ++ lib.lists.optional withPDF [
+      fop
+      dblatex
+    ];
 
   buildInputs = [ glibmm ];
 
   propagatedBuildInputs = [ libxml2 ];
 
+  mesonFlags = [
+    (lib.mesonBool "maintainer-mode" false)
+    (lib.mesonBool "build-documentation" withDocumentation)
+    (lib.mesonBool "build-manual" withManual)
+    (lib.mesonBool "build-pdf" withPDF)
+    (lib.mesonBool "build-examples" withExamples)
+    (lib.mesonBool "build-tests" doCheck)
+  ];
+
+  preBuild = lib.strings.optionalString withDocumentation ''
+    doxygen -u docs/reference/Doxyfile
+  '';
+
   postFixup = ''
     substituteInPlace $dev/lib/pkgconfig/libxml++-3.0.pc \
-      --replace 'docdir=''${datarootdir}' "docdir=$doc/share"
+      --replace-fail 'docdir=''${datarootdir}' "docdir=$doc/share"
   '';
 
   passthru = {
@@ -48,11 +94,16 @@ stdenv.mkDerivation rec {
     };
   };
 
+  doCheck = true;
+
   meta = with lib; {
     homepage = "https://libxmlplusplus.sourceforge.net/";
     description = "C++ wrapper for the libxml2 XML parser library, version 3";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ loskutov ];
+    maintainers = with maintainers; [
+      loskutov
+      willow
+    ];
   };
 }

From e606e1b060a53876218bd44339e41cf51a20770e Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@banananet.work>
Date: Sun, 8 Jun 2025 21:12:11 +0000
Subject: [PATCH 004/321] libmbim: 1.30.0 -> 1.32.0

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

diff --git a/pkgs/by-name/li/libmbim/package.nix b/pkgs/by-name/li/libmbim/package.nix
index 8a3467f987dcf..d39eb7bf13027 100644
--- a/pkgs/by-name/li/libmbim/package.nix
+++ b/pkgs/by-name/li/libmbim/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libmbim";
-  version = "1.30.0";
+  version = "1.32.0";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "mobile-broadband";
     repo = "libmbim";
     rev = version;
-    hash = "sha256-sHTpu9WeMZroT+1I18ObEHWSzcyj/Relyz8UNe+WawI=";
+    hash = "sha256-+4INXuH2kbKs9C6t4bOJye7yyfYH/BLukmgDVvXo+u0=";
   };
 
   mesonFlags = [

From edfd16e5353a803ff40bc5d073bba3acaf13ab32 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@banananet.work>
Date: Sun, 8 Jun 2025 21:12:37 +0000
Subject: [PATCH 005/321] modemmanager: 1.22.0 -> 1.24.0

- removed GI_TYPELIB_PATH.patch as merged upstream into 1.24.0
- expanded patch to remove dummy dirs in sysconfdir
---
 .../mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch | 11 +++++++++++
 pkgs/by-name/mo/modemmanager/package.nix              | 10 ++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch b/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
index d293efa7b2456..f8e3ccde36a11 100644
--- a/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
+++ b/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
@@ -18,3 +18,14 @@ index 5dc3b6a0..25a948a1 100644
  mkdir_cmd = 'mkdir -p ${DESTDIR}@0@'
 -meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdiruser))
  meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdirpackage))
+diff --git a/data/dispatcher-modem-setup/meson.build b/data/dispatcher-modem-setup/meson.build
+index 812152a3..7527022b 100644
+--- a/data/dispatcher-modem-setup/meson.build
++++ b/data/dispatcher-modem-setup/meson.build
+@@ -22,5 +22,4 @@ install_data(
+ )
+ 
+ mkdir_cmd = 'mkdir -p ${DESTDIR}@0@'
+-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_modemsetupdiruser))
+ meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_modemsetupdirpackage))
+ 
diff --git a/pkgs/by-name/mo/modemmanager/package.nix b/pkgs/by-name/mo/modemmanager/package.nix
index 5ccfa92549fbd..d147fccdffbf3 100644
--- a/pkgs/by-name/mo/modemmanager/package.nix
+++ b/pkgs/by-name/mo/modemmanager/package.nix
@@ -31,26 +31,20 @@
 
 stdenv.mkDerivation rec {
   pname = "modemmanager";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mobile-broadband";
     repo = "ModemManager";
     rev = version;
-    hash = "sha256-/D9b2rCCUhpDCUfSNAWR65+3EyUywzFdH1R17eSKRDo=";
+    hash = "sha256-3jI75aR2esmv5dkE4TrdCHIcCvtdOBKnBC5XLEKoVFs=";
   };
 
   patches = [
     # Since /etc is the domain of NixOS, not Nix, we cannot install files there.
     # But these are just placeholders so we do not need to install them at all.
     ./no-dummy-dirs-in-sysconfdir.patch
-
-    (fetchpatch {
-      name = "GI_TYPELIB_PATH.patch";
-      url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/daa829287894273879799a383ed4dc373c6111b0.patch";
-      hash = "sha256-tPQokiZO2SpTlX8xMlkWjP1AIXgoLHW3rJwnmG33z/k=";
-    })
   ];
 
   strictDeps = true;

From 7747ba0fdba45c199cc8a792b3dd15fadfcbfb8b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 3 Jul 2025 09:32:35 +0200
Subject: [PATCH 006/321] libseccomp: Apply patch to fix test failures on
 big-endian architectures

---
 pkgs/by-name/li/libseccomp/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix
index f3721858b2da1..e9f723f85bf02 100644
--- a/pkgs/by-name/li/libseccomp/package.nix
+++ b/pkgs/by-name/li/libseccomp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   getopt,
   util-linuxMinimal,
   which,
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    # Remove when version > 2.6.0
+    # Fixes test failures on big-endian archs
+    (fetchpatch {
+      name = "0001-libseccomp-remove-fuzzer-from-test-62-sim-arch_transactions.patch";
+      url = "https://github.com/seccomp/libseccomp/commit/2f0f3b0e9121720108431c5d054164016f476230.patch";
+      hash = "sha256-AKAQyALJlLgxnS23OEoqfyDswp0kU2vmja5ohgvFojw=";
+    })
+
     ./oob-read.patch
   ];
 

From 02756043195aaca5440d66d7468e566ccb982ee8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 3 Jul 2025 09:47:17 +0200
Subject: [PATCH 007/321] libseccomp: Switch to fetching OOB patch

---
 pkgs/by-name/li/libseccomp/oob-read.patch | 37 -----------------------
 pkgs/by-name/li/libseccomp/package.nix    |  8 ++++-
 2 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/li/libseccomp/oob-read.patch

diff --git a/pkgs/by-name/li/libseccomp/oob-read.patch b/pkgs/by-name/li/libseccomp/oob-read.patch
deleted file mode 100644
index c769abdf7e91d..0000000000000
--- a/pkgs/by-name/li/libseccomp/oob-read.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 904e9dee373eca499e976dce131f0baee06db2d6 Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Thu, 13 Feb 2025 12:05:17 +0100
-Subject: [PATCH] api: fix seccomp_export_bpf_mem out-of-bounds read
-
-*len is the length of the destination buffer, but program->blks is
-probably not anywhere near that long.  It's already been checked above
-that BPF_PGM_SIZE(program) is less than or equal to *len, so that's
-the correct value to use here to avoid either reading or writing too
-much.
-
-I noticed this because tests/11-basic-basic_errors started failing on
-musl after e797591 ("all: add seccomp_precompute() functionality").
-
-Signed-off-by: Alyssa Ross <hi@alyssa.is>
----
-Link: https://github.com/seccomp/libseccomp/pull/458
-
- src/api.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/api.c b/src/api.c
-index adccef3..65a277a 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -786,7 +786,7 @@ API int seccomp_export_bpf_mem(const scmp_filter_ctx ctx, void *buf,
- 		if (BPF_PGM_SIZE(program) > *len)
- 			rc = _rc_filter(-ERANGE);
- 		else
--			memcpy(buf, program->blks, *len);
-+			memcpy(buf, program->blks, BPF_PGM_SIZE(program));
- 	}
- 	*len = BPF_PGM_SIZE(program);
- 
--- 
-2.47.0
-
diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix
index e9f723f85bf02..fe66fcb250687 100644
--- a/pkgs/by-name/li/libseccomp/package.nix
+++ b/pkgs/by-name/li/libseccomp/package.nix
@@ -29,7 +29,13 @@ stdenv.mkDerivation rec {
       hash = "sha256-AKAQyALJlLgxnS23OEoqfyDswp0kU2vmja5ohgvFojw=";
     })
 
-    ./oob-read.patch
+    # Remove when version > 2.6.0
+    # Fixes OOB reads & tests on musl
+    (fetchpatch {
+      name = "0002-libseccomp-fix-seccomp_export_bpf_mem-out-of-bounds-read.patch";
+      url = "https://github.com/seccomp/libseccomp/commit/dd759e8c4f5685b526638fba9ec4fc24c37c9aec.patch";
+      hash = "sha256-TdfQ5T8FrGE6+P24MIi9rKSC3fQu/Jlr4bsFiJd4yVY=";
+    })
   ];
 
   outputs = [

From 6ffc64b81b50ccb9e5b99af19f49b609e7a33775 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 4 Jul 2025 13:48:20 +0200
Subject: [PATCH 008/321] bpftools: Re-apply patch to fix build on powerpc64*

---
 .../bpftools/include-asm-types-for-powerpc64.patch   | 12 ++++++++++++
 pkgs/by-name/bp/bpftools/package.nix                 |  6 ++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/bp/bpftools/include-asm-types-for-powerpc64.patch

diff --git a/pkgs/by-name/bp/bpftools/include-asm-types-for-powerpc64.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-powerpc64.patch
new file mode 100644
index 0000000000000..9d0a1930dcf0f
--- /dev/null
+++ b/pkgs/by-name/bp/bpftools/include-asm-types-for-powerpc64.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ruN a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h
+--- a/tools/include/uapi/linux/types.h	2025-05-18 06:26:10.000000000 +0000
++++ b/tools/include/uapi/linux/types.h	2025-07-04 08:00:39.772748792 +0000
+@@ -2,7 +2,7 @@
+ #ifndef _UAPI_LINUX_TYPES_H
+ #define _UAPI_LINUX_TYPES_H
+ 
+-#include <asm-generic/int-ll64.h>
++#include <asm/types.h>
+ 
+ /* copied from linux:include/uapi/linux/types.h */
+ #define __bitwise
diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix
index ada5e96b0ab7f..c94bd1d3cd696 100644
--- a/pkgs/by-name/bp/bpftools/package.nix
+++ b/pkgs/by-name/bp/bpftools/package.nix
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
 
   separateDebugInfo = true;
 
+  patches = [
+    # fix unknown type name '__vector128' on powerpc64*
+    # https://www.spinics.net/lists/bpf/msg28613.html
+    ./include-asm-types-for-powerpc64.patch
+  ];
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     python3

From 1986cfb231fb9e40851c4426bc91a7ff5c9d7d21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 20:23:12 +0000
Subject: [PATCH 009/321] fluidsynth: 2.4.6 -> 2.4.7

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

diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix
index 18ae634968d9e..5df139c2513ec 100644
--- a/pkgs/by-name/fl/fluidsynth/package.nix
+++ b/pkgs/by-name/fl/fluidsynth/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluidsynth";
-  version = "2.4.6";
+  version = "2.4.7";
 
   src = fetchFromGitHub {
     owner = "FluidSynth";
     repo = "fluidsynth";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hy2kWJmvvmItXl05Nw9gWEYpoDg+NtP2veO2vZ00QhI=";
+    hash = "sha256-z7DIX8KpPdtEHEMoxH7ewW32aXm27gfmWPZawwITyRQ=";
   };
 
   outputs = [

From 577422ac4fe15bfdc35e75442cab66e1908d3623 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 21:29:40 +0000
Subject: [PATCH 010/321] kdePackages.taglib: 2.1 -> 2.1.1

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

diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix
index fc9ad9d6f58ae..8b23abdf2c276 100644
--- a/pkgs/by-name/ta/taglib/package.nix
+++ b/pkgs/by-name/ta/taglib/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taglib";
-  version = "2.1";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "taglib";
     repo = "taglib";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1eIx4Lp/GZEBdHJcMN1zvctxJK2OAywuPzBwgtZgbmE=";
+    hash = "sha256-pzsjZgtr9icfXWxsZoA5GXf9k3gh92DzJRcp87T0PVQ=";
   };
 
   strictDeps = true;

From 89a5c19c4dd6f936f6d860d6e064fcd28813c604 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 19 Jul 2025 11:31:35 +0200
Subject: [PATCH 011/321] libtiff: Apply patch to fix test_directory test on
 big-endian

---
 pkgs/by-name/li/libtiff/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index 8018672a7f3fc..7594413c785f4 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   nix-update-script,
 
   cmake,
@@ -50,6 +51,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
+    # Fix test_directory test on big-endian
+    # https://gitlab.com/libtiff/libtiff/-/issues/652
+    (fetchpatch {
+      name = "0001-Update-test_directory-not-to-fail-on-big-endian-machines";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/e8233c42f2e0a0ea7260c3cc7ebbaec8e5cb5e07.patch";
+      hash = "sha256-z5odG66j4U+WoUjTUuBIhcVUCGK1GYdvW/cVucawNZI=";
+    })
+
     # libc++abi 11 has an `#include <version>`, this picks up files name
     # `version` in the project's include paths
     ./rename-version.patch

From 56463934a63a0b5ecb7d19470f719eaf8b3bba41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 11:59:38 +0000
Subject: [PATCH 012/321] jdk: 21.0.7+6 -> 21.0.8+9

---
 pkgs/development/compilers/openjdk/21/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
index 88dca693a01af..a514f2dc908e4 100644
--- a/pkgs/development/compilers/openjdk/21/source.json
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-H2ed09+1qafIDsHYDYRIcE9nyWwQagVyE563ROlNTtk=",
+  "hash": "sha256-8wUwxjhAGIp1bzny2e86vPH9q4vw1kLDoTjO7FrJbx4=",
   "owner": "openjdk",
   "repo": "jdk21u",
-  "rev": "refs/tags/jdk-21.0.7+6"
+  "rev": "refs/tags/jdk-21.0.8+9"
 }

From 21c8967f1c05993637ab5b1456a7ad614432e4d6 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 21 Jul 2025 17:16:09 +0200
Subject: [PATCH 013/321] buildGoModule: add buildTestBinaries option

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/build-support/go/module.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 9b692b4f6dec0..a00e70ed32988 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -64,6 +64,12 @@ lib.extendMkDerivation {
       # Go build flags.
       GOFLAGS ? [ ],
 
+      # Instead of building binary targets with 'go install', build test binaries with 'go test'.
+      # The binaries found in $out/bin can be executed as go tests outside of the sandbox.
+      # This is mostly useful outside of nixpkgs, for example to build integration/e2e tests
+      # that won't run within the sandbox.
+      buildTestBinaries ? false,
+
       ...
     }@args:
     {
@@ -338,8 +344,18 @@ lib.extendMkDerivation {
                   export NIX_BUILD_CORES=1
               fi
               for pkg in $(getGoDirs ""); do
-                echo "Building subPackage $pkg"
-                buildGoDir install "$pkg"
+                ${
+                  if buildTestBinaries then
+                    ''
+                      echo "Building test binary for $pkg"
+                      buildGoDir "test -c -o $GOPATH/bin/" "$pkg"
+                    ''
+                  else
+                    ''
+                      echo "Building subPackage $pkg"
+                      buildGoDir install "$pkg"
+                    ''
+                }
               done
             ''
           + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
@@ -359,7 +375,7 @@ lib.extendMkDerivation {
           ''
         );
 
-      doCheck = args.doCheck or true;
+      doCheck = args.doCheck or (!buildTestBinaries);
       checkPhase =
         args.checkPhase or ''
           runHook preCheck

From 868bd310c35820e6b735b4e60152d125aedf3d1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 13:51:08 +0000
Subject: [PATCH 014/321] inih: 60 -> 61

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

diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix
index f3e0fdeaa4e5e..14336b289ac78 100644
--- a/pkgs/by-name/in/inih/package.nix
+++ b/pkgs/by-name/in/inih/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inih";
-  version = "60";
+  version = "61";
 
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "inih";
     rev = "r${version}";
-    hash = "sha256-6U6/b7J4dGFwVPw31Vl+BEDrN2ygK43Hb344Uk8NdFs=";
+    hash = "sha256-tSmdd9uAXaRQtnqj0hKuT0wofcZcYjqgPbhtaR+cr84=";
   };
 
   nativeBuildInputs = [

From 1d2563835a20392a2b867de6cfe8c1a176c6dc53 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 21 Jul 2025 19:22:52 +0200
Subject: [PATCH 015/321] buildGoModule: add test for buildTestBinaries

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/build-support/go/tests.nix               |  9 +++++
 .../go/tests/build-test-binaries/go.mod       |  3 ++
 .../go/tests/build-test-binaries/main_test.go |  7 ++++
 .../go/tests/build-test-binaries/package.nix  | 34 +++++++++++++++++++
 pkgs/test/default.nix                         |  2 ++
 5 files changed, 55 insertions(+)
 create mode 100644 pkgs/build-support/go/tests.nix
 create mode 100644 pkgs/build-support/go/tests/build-test-binaries/go.mod
 create mode 100644 pkgs/build-support/go/tests/build-test-binaries/main_test.go
 create mode 100644 pkgs/build-support/go/tests/build-test-binaries/package.nix

diff --git a/pkgs/build-support/go/tests.nix b/pkgs/build-support/go/tests.nix
new file mode 100644
index 0000000000000..8966fe927aea8
--- /dev/null
+++ b/pkgs/build-support/go/tests.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  callPackage,
+}:
+
+lib.packagesFromDirectoryRecursive {
+  inherit callPackage;
+  directory = ./tests;
+}
diff --git a/pkgs/build-support/go/tests/build-test-binaries/go.mod b/pkgs/build-support/go/tests/build-test-binaries/go.mod
new file mode 100644
index 0000000000000..26cef8bdf8fca
--- /dev/null
+++ b/pkgs/build-support/go/tests/build-test-binaries/go.mod
@@ -0,0 +1,3 @@
+module build-test-binaries
+
+go 1.24
diff --git a/pkgs/build-support/go/tests/build-test-binaries/main_test.go b/pkgs/build-support/go/tests/build-test-binaries/main_test.go
new file mode 100644
index 0000000000000..29378df53b02c
--- /dev/null
+++ b/pkgs/build-support/go/tests/build-test-binaries/main_test.go
@@ -0,0 +1,7 @@
+package main
+
+import "testing"
+
+func TestHelloFromTest(t *testing.T) {
+	t.Log("Hello from test")
+}
diff --git a/pkgs/build-support/go/tests/build-test-binaries/package.nix b/pkgs/build-support/go/tests/build-test-binaries/package.nix
new file mode 100644
index 0000000000000..761d793233bd8
--- /dev/null
+++ b/pkgs/build-support/go/tests/build-test-binaries/package.nix
@@ -0,0 +1,34 @@
+{
+  buildGoModule,
+  runCommandCC,
+}:
+
+let
+  testPackage = buildGoModule {
+    name = "build-test-binaries";
+    src = ./.;
+    vendorHash = null;
+    buildTestBinaries = true;
+  };
+in
+
+runCommandCC "build-test-binaries-check"
+  {
+    nativeBuildInputs = [ testPackage ];
+    passthru = { inherit testPackage; };
+  }
+  ''
+    fail() {
+      echo "Test failed: $1" >&2
+      exit 1
+    }
+
+    command -v build-test-binaries.test ||
+      fail "build-test-binaries.test not found in PATH"
+
+    build-test-binaries.test -test.v | tee $out ||
+      fail "build-test-binaries.test failed"
+
+    grep -q "Hello from test" $out ||
+      fail "Output does not contain expected string"
+  ''
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index fe6f9eb43852e..7636498fff795 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -148,6 +148,8 @@ with pkgs;
 
   php = recurseIntoAttrs (callPackages ./php { });
 
+  go = recurseIntoAttrs (callPackage ../build-support/go/tests.nix { });
+
   pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }) // {
     __recurseIntoDerivationForReleaseJobs = true;
   };

From 969cc016b0c096ebc5b2c7beecee96b06d05a654 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 21 Jul 2025 20:08:18 +0200
Subject: [PATCH 016/321] docs: document buildTestBinaries for buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 doc/languages-frameworks/go.section.md | 6 ++++++
 doc/redirects.json                     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index fcc3c687d3540..e45269a35e48e 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -194,6 +194,12 @@ Specifies the contents of the `go.sum` file and triggers rebuilds when it change
 
 Defaults to `null`
 
+### `buildTestBinaries` {#var-go-buildTestBinaries}
+
+This option allows to compile test binaries instead of the usual binaries produced by a package.
+Go can [compile test into binaries](https://pkg.go.dev/cmd/go#hdr-Test_packages) using the `go test -c` command.
+These binaries can then be executed at a later point (outside the Nix sandbox) to run the tests.
+This is mostly useful for downstream consumers to run integration or end-to-end tests that won't work in the Nix sandbox, for example because they require network access.
 
 ## Versioned toolchains and builders {#ssec-go-toolchain-versions}
 
diff --git a/doc/redirects.json b/doc/redirects.json
index bf27cda981864..eda98b1ce418f 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -532,6 +532,9 @@
   "typst-package-scope-and-usage": [
     "index.html#typst-package-scope-and-usage"
   ],
+  "var-go-buildTestBinaries": [
+    "index.html#var-go-buildTestBinaries"
+  ],
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],

From d5754ff89847c67247c95fc909e050cadf74daa7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 13:48:47 +0000
Subject: [PATCH 017/321] memcached: 1.6.38 -> 1.6.39

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

diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix
index bb40119382f78..dcce7f82a05ea 100644
--- a/pkgs/by-name/me/memcached/package.nix
+++ b/pkgs/by-name/me/memcached/package.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.38";
+  version = "1.6.39";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/${pname}-${version}.tar.gz";
-    sha256 = "sha256-M015IpTjdzh5a1sDN1xHu22yg7EVLi6kzLcgFS3RfGY=";
+    sha256 = "sha256-I+VQfpM7FUYxYdTF05IbDF80C1Qtbt1/bF4Xw08Ro2M=";
   };
 
   configureFlags = [

From 223a5ba4fd8925cdd6305d3d19bd669a36274cbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jul 2025 12:35:45 +0000
Subject: [PATCH 018/321] openexr: 3.3.4 -> 3.3.5

---
 pkgs/development/libraries/openexr/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index ce8675aa6db86..b07b4ccb711e7 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "3.3.4";
+  version = "3.3.5";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    hash = "sha256-dPPL9ML5O/u0FXuLxE3bkkgetOzNU3qni3n0pq25bT0=";
+    hash = "sha256-J1SButHDPy0gGkVOZKfemaMF0MY/lifB5n39+3GRKR8=";
   };
 
   outputs = [

From bcd242f02e85f74c63d633eb3be9ead173297a43 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 29 Jul 2025 23:16:02 +0100
Subject: [PATCH 019/321] =?UTF-8?q?python313Packages.mypy:=20fix=20build?=
 =?UTF-8?q?=20on=20Darwin=20with=20case=E2=80=90sensitive=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 79a0cd86947f5..01b502c88ed95 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   pythonAtLeast,
   pythonOlder,
@@ -46,6 +47,15 @@ buildPythonPackage rec {
     hash = "sha256-y67kt5i8mT9TcSbUGwnNuTAeqjy9apvWIbA2QD96LS4=";
   };
 
+  patches = [
+    # Fix the build on Darwin with a case‐sensitive store.
+    # Remove on next release.
+    (fetchpatch {
+      url = "https://github.com/python/mypy/commit/7534898319cb7f16738c11e4bc1bdcef0eb13c38.patch";
+      hash = "sha256-5jD0JBRnirmoMlUz9+n8G4AqHqCi8BaUX5rEl9NnLts=";
+    })
+  ];
+
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };

From 61b1d30e553048da697e3b755ab099288725ce36 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 27 Apr 2025 00:13:00 +0200
Subject: [PATCH 020/321] ico: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/ic/ico/package.nix               | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/ic/ico/package.nix

diff --git a/pkgs/by-name/ic/ico/package.nix b/pkgs/by-name/ic/ico/package.nix
new file mode 100644
index 0000000000000..ad1f3cd95c884
--- /dev/null
+++ b/pkgs/by-name/ic/ico/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libX11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ico";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/ico-${finalAttrs.version}.tar.xz";
+    hash = "sha256-OPNp1DHnUygP3nD6SJzJTOIE+fjqvS9J/H0yr6afRAU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libX11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Simple animation program that may be used for testing various X11 operations and extensions";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/ico";
+    license = with lib.licenses; [
+      x11
+      hpnd
+      hpndSellVariant
+    ];
+    mainProgram = "ico";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..40c84a7e3037a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -5,6 +5,7 @@
   font-alias,
   font-util,
   gccmakedep,
+  ico,
   imake,
   libpciaccess,
   libpthread-stubs,
@@ -35,6 +36,7 @@ self: with self; {
   inherit
     bdftopcf
     gccmakedep
+    ico
     imake
     libpciaccess
     libxcb
@@ -1697,42 +1699,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  ico = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "ico";
-      version = "1.0.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/ico-1.0.6.tar.xz";
-        sha256 = "01a4kykayckxzi4jzggaz3wh9qjcr6f4iykhvq7jhlz767a6kwrq";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libAppleWM = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..09d6b18544bae 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -290,6 +290,7 @@
   font-alias,
   font-util,
   gccmakedep,
+  ico,
   imake,
   libpciaccess,
   libpthread-stubs,
@@ -320,6 +321,7 @@
   inherit
     bdftopcf
     gccmakedep
+    ico
     imake
     libpciaccess
     libxcb
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..47732e5f5e779 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -147,7 +147,6 @@ self: super:
   });
 
   iceauth = addMainProgram super.iceauth { };
-  ico = addMainProgram super.ico { };
 
   mkfontdir = xorg.mkfontscale;
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..6182b6d065d80 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -9,7 +9,6 @@ mirror://xorg/individual/app/bitmap-1.1.1.tar.xz
 mirror://xorg/individual/app/editres-1.0.9.tar.xz
 mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
-mirror://xorg/individual/app/ico-1.0.6.tar.xz
 mirror://xorg/individual/app/listres-1.0.6.tar.xz
 mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz

From 7c2537d7b9e034f7a337e4ef4f35bcb15c8dc0c1 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 18:06:28 +0200
Subject: [PATCH 021/321] libapplewm: refactor and migrate to pkgs/by-name from
 xorg.libAppleWM

---
 pkgs/by-name/li/libapplewm/package.nix        | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../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, 61 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/by-name/li/libapplewm/package.nix

diff --git a/pkgs/by-name/li/libapplewm/package.nix b/pkgs/by-name/li/libapplewm/package.nix
new file mode 100644
index 0000000000000..82b2ec2a2a6f1
--- /dev/null
+++ b/pkgs/by-name/li/libapplewm/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  pkg-config,
+  autoreconfHook,
+  util-macros,
+  xorgproto,
+  libX11,
+  libXext,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libapplewm";
+  version = "1.4.1-unstable-2021-01-04";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "xorg/lib";
+    repo = "libapplewm";
+    rev = "be972ebc3a97292e7d2b2350eff55ae12df99a42";
+    hash = "sha256-NH9YeOEtnEupqpnsMLC21I+LmCOzT7KnfdzNNWqba/Y=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    util-macros
+  ];
+
+  buildInputs = [
+    xorgproto
+    libX11
+    libXext
+  ];
+
+  passthru = {
+    # updateScript = # no updatescript since we don't use a tagged release (last one was 14 years ago)
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib-based library for the Apple-WM extension";
+    longDescription = ''
+      AppleWM is a simple library designed to interface with the Apple-WM extension.
+      This extension allows X window managers to better interact with the Mac OS X Aqua user
+      interface when running X11 in a rootless mode.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libapplewm";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [ "applewm" ];
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 40c84a7e3037a..f19a2c418bd73 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -7,6 +7,7 @@
   gccmakedep,
   ico,
   imake,
+  libapplewm,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -52,6 +53,7 @@ self: with self; {
     ;
   fontalias = font-alias;
   fontutil = font-util;
+  libAppleWM = libapplewm;
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
@@ -1699,44 +1701,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libAppleWM = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libAppleWM";
-      version = "be972ebc3a97292e7d2b2350eff55ae12df99a42";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2";
-        sha256 = "1hrq03pahmrbb05r6a7j7m1nxl65wlfi6d2lwm1kvra63q91f9ph";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "applewm" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libFS = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 09d6b18544bae..0ee00e602e6de 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -292,6 +292,7 @@
   gccmakedep,
   ico,
   imake,
+  libapplewm,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -337,6 +338,7 @@
     ;
   fontalias = font-alias;
   fontutil = font-util;
+  libAppleWM = libapplewm;
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 47732e5f5e779..c2f6abb3e544a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -150,16 +150,6 @@ self: super:
 
   mkfontdir = xorg.mkfontscale;
 
-  libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [
-      autoreconfHook
-      xorg.utilmacros
-    ];
-    meta = attrs.meta // {
-      platforms = lib.platforms.darwin;
-    };
-  });
-
   libXtst = super.libXtst.overrideAttrs (attrs: {
     meta = attrs.meta // {
       pkgConfigModules = [ "xtst" ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 6182b6d065d80..78117765e4626 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -153,7 +153,6 @@ mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz
 mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz
 mirror://xorg/individual/lib/libFS-1.0.10.tar.xz

From e1ebdea2aa12137f4ebf681264deed60c76b2219 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 18:55:36 +0200
Subject: [PATCH 022/321] libdmx: refactor and migrate to pkgs/by-name from
 xorg namespace

libdmx has been deprecated by upstream, but I can't remove it yet because xdpyinfo still depends on it
---
 pkgs/by-name/li/libdmx/package.nix            | 54 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 ++
 pkgs/servers/x11/xorg/overrides.nix           |  3 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/li/libdmx/package.nix

diff --git a/pkgs/by-name/li/libdmx/package.nix b/pkgs/by-name/li/libdmx/package.nix
new file mode 100644
index 0000000000000..e0fe0d238dc14
--- /dev/null
+++ b/pkgs/by-name/li/libdmx/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libdmx";
+  version = "1.1.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libdmx-${finalAttrs.version}.tar.xz";
+    hash = "sha256-NaTiaosLK0/jZEHcpGNkXD+lLSgqw1IFAaOOqULL908=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    # updateScript = # libdmx it deprecated and thus needs no updatescript
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib-based library for the DMX (Distributed Multihead X) extension";
+    longDescription = ''
+      This library allows X11 clients to use the Distributed Multihead X (DMX) Extension,
+      as previously implemented in the Xdmx server.
+      X.Org removed support for the Xdmx server from the xorg-server releases in the version 21
+      release in 2021. This library is thus now considered deprecated and the version 1.1.5 release
+      is the last release X.Org plans to make of libdmx.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libdmx";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [ "dmx" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f19a2c418bd73..6436f2bf1ddbc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -8,6 +8,7 @@
   ico,
   imake,
   libapplewm,
+  libdmx,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -39,6 +40,7 @@ self: with self; {
     gccmakedep
     ico
     imake
+    libdmx
     libpciaccess
     libxcb
     libxcvt
@@ -2888,44 +2890,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libdmx = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libdmx";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz";
-        sha256 = "0kzprd1ak3m3042m5hra50nsagswciis9p21ckilyaqbidmf591m";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "dmx" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libfontenc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0ee00e602e6de..c9be9d636860a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -36,6 +36,7 @@
 $pcMap{"GL"} = "libGL";
 $pcMap{"gbm"} = "libgbm";
 $pcMap{"hwdata"} = "hwdata";
+$pcMap{"dmx"} = "libdmx";
 $pcMap{"fontutil"} = "fontutil";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
@@ -293,6 +294,7 @@
   ico,
   imake,
   libapplewm,
+  libdmx,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -324,6 +326,7 @@
     gccmakedep
     ico
     imake
+    libdmx
     libpciaccess
     libxcb
     libxcvt
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c2f6abb3e544a..bc259ee05ffad 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -179,9 +179,6 @@ self: super:
   libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
-  libdmx = super.libdmx.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
   libFS = super.libFS.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 78117765e4626..514ea0a613218 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -153,7 +153,6 @@ mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz
 mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz
 mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
 mirror://xorg/individual/lib/libICE-1.1.2.tar.xz

From e234ad4b007fb599a20790476389d1466319b83f Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sat, 26 Apr 2025 21:33:15 +0200
Subject: [PATCH 023/321] libfontenc: refactor and move to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/li/libfontenc/package.nix        | 49 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 ++
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 54 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/by-name/li/libfontenc/package.nix

diff --git a/pkgs/by-name/li/libfontenc/package.nix b/pkgs/by-name/li/libfontenc/package.nix
new file mode 100644
index 0000000000000..17f4e032f4a3a
--- /dev/null
+++ b/pkgs/by-name/li/libfontenc/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  zlib,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libfontenc";
+  version = "1.1.8";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libfontenc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-ewLD1AUjbg2GgGsd6daGj+YMMTYos4NQsDKRSqT9FMY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    zlib
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X font encoding library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libfontenc";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [ "fontenc" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6436f2bf1ddbc..3eb1113ad4518 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -9,6 +9,7 @@
   imake,
   libapplewm,
   libdmx,
+  libfontenc,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -41,6 +42,7 @@ self: with self; {
     ico
     imake
     libdmx
+    libfontenc
     libpciaccess
     libxcb
     libxcvt
@@ -2890,42 +2892,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libfontenc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      zlib,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libfontenc";
-      version = "1.1.8";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz";
-        sha256 = "1ihlznj4m49jn1887cr86qqhrrlghvbfj7bbh230svi30pac60kv";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        zlib
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "fontenc" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libxkbfile = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index c9be9d636860a..144a9834b2ea8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -37,6 +37,7 @@
 $pcMap{"gbm"} = "libgbm";
 $pcMap{"hwdata"} = "hwdata";
 $pcMap{"dmx"} = "libdmx";
+$pcMap{"fontenc"} = "libfontenc";
 $pcMap{"fontutil"} = "fontutil";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
@@ -295,6 +296,7 @@
   imake,
   libapplewm,
   libdmx,
+  libfontenc,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -327,6 +329,7 @@
     ico
     imake
     libdmx
+    libfontenc
     libpciaccess
     libxcb
     libxcvt
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 514ea0a613218..c5fee5ef8f941 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -153,7 +153,6 @@ mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz
 mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
 mirror://xorg/individual/lib/libICE-1.1.2.tar.xz
 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz

From 60fd33046a3d2c63a8a171db9d1d28910237aca0 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 17:05:04 +0200
Subject: [PATCH 024/321] libfs: refactor and migrate to pkgs/by-name from
 xorg.libFS

---
 pkgs/by-name/li/libfs/package.nix             | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  3 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 61 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/li/libfs/package.nix

diff --git a/pkgs/by-name/li/libfs/package.nix b/pkgs/by-name/li/libfs/package.nix
new file mode 100644
index 0000000000000..0cc70de9e0d91
--- /dev/null
+++ b/pkgs/by-name/li/libfs/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  xtrans,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libfs";
+  version = "1.0.10";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libFS-${finalAttrs.version}.tar.xz";
+    hash = "sha256-m6u9PIYGnJhWPaBEBF/cDs5OwMk9zdLGiqdOs0tPO3c=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    xtrans
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libFS \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Font Service client library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libfs";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "libfs" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3eb1113ad4518..df84d66f15b60 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -10,6 +10,7 @@
   libapplewm,
   libdmx,
   libfontenc,
+  libfs,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -58,6 +59,7 @@ self: with self; {
   fontalias = font-alias;
   fontutil = font-util;
   libAppleWM = libapplewm;
+  libFS = libfs;
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
@@ -1705,42 +1707,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libFS = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xtrans,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libFS";
-      version = "1.0.10";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libFS-1.0.10.tar.xz";
-        sha256 = "0xrv9x5v6km7ib3d5k9xr704xkhfvigh8i507mb9i706hqybvawv";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xtrans
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "libfs" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libICE = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 144a9834b2ea8..657b686c1bdc5 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -39,6 +39,7 @@
 $pcMap{"dmx"} = "libdmx";
 $pcMap{"fontenc"} = "libfontenc";
 $pcMap{"fontutil"} = "fontutil";
+$pcMap{"libfs"} = "libFS";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
 $pcMap{"x11"} = "libX11";
@@ -297,6 +298,7 @@
   libapplewm,
   libdmx,
   libfontenc,
+  libfs,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -345,6 +347,7 @@
   fontalias = font-alias;
   fontutil = font-util;
   libAppleWM = libapplewm;
+  libFS = libfs;
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bc259ee05ffad..56fb6a8a3cfc0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -179,9 +179,6 @@ self: super:
   libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
-  libFS = super.libFS.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
   libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c5fee5ef8f941..73c4a1b975741 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -153,7 +153,6 @@ mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
 mirror://xorg/individual/lib/libICE-1.1.2.tar.xz
 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2

From 24a342d53569310de913d243e048f28cd229367f Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 27 Apr 2025 00:40:33 +0200
Subject: [PATCH 025/321] transset: 1.0.3 -> 1.0.4 && refactor and move to
 pkgs/by-name from xorg namespace

---
 pkgs/by-name/tr/transset/package.nix          | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/tr/transset/package.nix

diff --git a/pkgs/by-name/tr/transset/package.nix b/pkgs/by-name/tr/transset/package.nix
new file mode 100644
index 0000000000000..57cbdf5fdff34
--- /dev/null
+++ b/pkgs/by-name/tr/transset/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "transset";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/transset-${finalAttrs.version}.tar.xz";
+    hash = "sha256-gamrdK8TdzOqjLajf4KSlIUm/n7wa4WfwP8nLEN8Czg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility for setting opacity/transparency property on a window";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/transset";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      hpndSellVariant
+    ];
+    mainProgram = "transset";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..d8ffefe7de385 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -19,6 +19,7 @@
   makedepend,
   pixman,
   sessreg,
+  transset,
   util-macros,
   xbitmaps,
   xcb-proto,
@@ -44,6 +45,7 @@ self: with self; {
     makedepend
     pixman
     sessreg
+    transset
     xbitmaps
     xorgproto
     xtrans
@@ -3304,42 +3306,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  transset = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "transset";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/transset-1.0.4.tar.xz";
-        sha256 = "0f0bgi1jq9zzq2gqaszhgvz2d1clja17z8xnijm36xqkmxsapac1";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   twm = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..249f761809974 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -304,6 +304,7 @@
   makedepend,
   pixman,
   sessreg,
+  transset,
   util-macros,
   xbitmaps,
   xcb-proto,
@@ -329,6 +330,7 @@
     makedepend
     pixman
     sessreg
+    transset
     xbitmaps
     xorgproto
     xtrans
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..fe0a864b55189 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -482,7 +482,6 @@ self: super:
   mkfontscale = addMainProgram super.mkfontscale { };
   oclock = addMainProgram super.oclock { };
   smproxy = addMainProgram super.smproxy { };
-  transset = addMainProgram super.transset { };
 
   viewres = addMainProgram super.viewres { };
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..015254fc49840 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -15,7 +15,6 @@ mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz
 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
 mirror://xorg/individual/app/smproxy-1.0.8.tar.xz
-mirror://xorg/individual/app/transset-1.0.4.tar.xz
 mirror://xorg/individual/app/twm-1.0.13.1.tar.xz
 mirror://xorg/individual/app/viewres-1.0.8.tar.xz
 mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2

From 90990b93f2f735335e7b89779a96306dfba81ff4 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 01:05:07 +0200
Subject: [PATCH 026/321] xcmsdb: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xc/xcmsdb/package.nix            | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/by-name/xc/xcmsdb/package.nix

diff --git a/pkgs/by-name/xc/xcmsdb/package.nix b/pkgs/by-name/xc/xcmsdb/package.nix
new file mode 100644
index 0000000000000..3b3a729f5b720
--- /dev/null
+++ b/pkgs/by-name/xc/xcmsdb/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcmsdb";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xcmsdb-${finalAttrs.version}.tar.xz";
+    hash = "sha256-XsQGjkiBh7BeqS7hNiyWt4qQ8ZzMehhExZIdcGJrvDg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libx11 ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Device Color Characterization utility for X Color Management System";
+    longDescription = ''
+      xcmsdb is used to load, query, or remove Device Color Characterization data stored in
+      properties on the root window of the screen as specified in section 7, Device Color
+      Characterization, of the X11 Inter-Client Communication Conventions Manual (ICCCM).
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcmsdb";
+    license = with lib.licenses; [
+      hpnd
+      mitOpenGroup
+    ];
+    mainProgram = "xcmsdb";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..5f50f64073eaa 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -22,6 +22,7 @@
   util-macros,
   xbitmaps,
   xcb-proto,
+  xcmsdb,
   xkeyboard-config,
   xorg-cf-files,
   xorg-docs,
@@ -45,6 +46,7 @@ self: with self; {
     pixman
     sessreg
     xbitmaps
+    xcmsdb
     xorgproto
     xtrans
     ;
@@ -3962,38 +3964,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcmsdb = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcmsdb";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz";
-        sha256 = "0f5wddi707cjqm21hynckkqr12mpjqn3dq9fm5gb11w19270di2y";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ libX11 ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcompmgr = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..789739daf78b1 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -307,6 +307,7 @@
   util-macros,
   xbitmaps,
   xcb-proto,
+  xcmsdb,
   xkeyboard-config,
   xorg-cf-files,
   xorg-docs,
@@ -330,6 +331,7 @@
     pixman
     sessreg
     xbitmaps
+    xcmsdb
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..d8c1095aa7d1c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1100,7 +1100,6 @@ self: super:
 
   xbacklight = addMainProgram super.xbacklight { };
   xclock = addMainProgram super.xclock { };
-  xcmsdb = addMainProgram super.xcmsdb { };
   xcompmgr = addMainProgram super.xcompmgr { };
   xconsole = addMainProgram super.xconsole { };
   xcursorgen = addMainProgram super.xcursorgen { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..0fd4db7a5d6b8 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -23,7 +23,6 @@ mirror://xorg/individual/app/xauth-1.1.4.tar.xz
 mirror://xorg/individual/app/xbacklight-1.2.4.tar.xz
 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
-mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz
 mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz
 mirror://xorg/individual/app/xconsole-1.1.0.tar.xz
 mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz

From 59a16f2888c449892f2dad2fd230e86768a3f504 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 02:42:29 +0200
Subject: [PATCH 027/321] xprop: 1.2.7 -> 1.2.8 && refactor and move to
 pkgs/by-name from xorg namespace

---
 pkgs/by-name/xp/xprop/package.nix             | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/xp/xprop/package.nix

diff --git a/pkgs/by-name/xp/xprop/package.nix b/pkgs/by-name/xp/xprop/package.nix
new file mode 100644
index 0000000000000..9943a313949d0
--- /dev/null
+++ b/pkgs/by-name/xp/xprop/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xprop";
+  version = "1.2.8";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xprop-${finalAttrs.version}.tar.xz";
+    hash = "sha256-1onirbfve0OfZGm1HNqKfa78gyQ4VMKjuPhNDwKdZ+4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Command line tool to display and/or set window and font properties of an X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xprop";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpndSellVariant
+      mit
+    ];
+    mainProgram = "xprop";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..8cf2c96c4f9de 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -27,6 +27,7 @@
   xorg-docs,
   xorgproto,
   xorg-sgml-doctools,
+  xprop,
   xtrans,
 }:
 
@@ -46,6 +47,7 @@ self: with self; {
     sessreg
     xbitmaps
     xorgproto
+    xprop
     xtrans
     ;
   fontalias = font-alias;
@@ -7304,42 +7306,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xprop = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xprop";
-      version = "1.2.8";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xprop-1.2.8.tar.xz";
-        sha256 = "1vk7kl10ykgqp2iw4m1q4j1zrbkxibd1rdb9cjgl6yzgnyny52fn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xrandr = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..0ed222f48fb85 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -312,6 +312,7 @@
   xorg-docs,
   xorgproto,
   xorg-sgml-doctools,
+  xprop,
   xtrans,
 }:
 
@@ -331,6 +332,7 @@
     sessreg
     xbitmaps
     xorgproto
+    xprop
     xtrans
     ;
   fontalias = font-alias;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..9017d8ceff771 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1214,7 +1214,6 @@ self: super:
   xmore = addMainProgram super.xmore { };
 
   xpr = addMainProgram super.xpr { };
-  xprop = addMainProgram super.xprop { };
 
   xrdb = super.xrdb.overrideAttrs (attrs: {
     configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..dbc147f21cef4 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -55,7 +55,6 @@ mirror://xorg/individual/app/xmessage-1.0.7.tar.xz
 mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz
 mirror://xorg/individual/app/xmore-1.0.4.tar.xz
 mirror://xorg/individual/app/xpr-1.2.0.tar.xz
-mirror://xorg/individual/app/xprop-1.2.8.tar.xz
 mirror://xorg/individual/app/xrandr-1.5.3.tar.xz
 mirror://xorg/individual/app/xrdb-1.2.2.tar.xz
 mirror://xorg/individual/app/xrefresh-1.1.0.tar.xz

From ae18c40b85505ada15a04bdeef5048d63f1f37e3 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 03:12:37 +0200
Subject: [PATCH 028/321] xrefresh: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xr/xrefresh/package.nix          | 50 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 54 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/xr/xrefresh/package.nix

diff --git a/pkgs/by-name/xr/xrefresh/package.nix b/pkgs/by-name/xr/xrefresh/package.nix
new file mode 100644
index 0000000000000..11866c2ce5c8a
--- /dev/null
+++ b/pkgs/by-name/xr/xrefresh/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xrefresh";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xrefresh-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Ke1ZLV7ONaMCkATYxG8wAvkpcIcKlsEeOLr38RIri18=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to refresh all or part of an X screen";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xrefresh";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpnd
+    ];
+    mainProgram = "xrefresh";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8cf2c96c4f9de..4b139143994be 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -28,6 +28,7 @@
   xorgproto,
   xorg-sgml-doctools,
   xprop,
+  xrefresh,
   xtrans,
 }:
 
@@ -48,6 +49,7 @@ self: with self; {
     xbitmaps
     xorgproto
     xprop
+    xrefresh
     xtrans
     ;
   fontalias = font-alias;
@@ -7384,42 +7386,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xrefresh = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xrefresh";
-      version = "1.1.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xrefresh-1.1.0.tar.xz";
-        sha256 = "0pwb5c9g3xxs70gc35hahxq2ky8261pw9n04j01a6dffbqnmkv99";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xset = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0ed222f48fb85..df8abadb0d4a6 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -313,6 +313,7 @@
   xorgproto,
   xorg-sgml-doctools,
   xprop,
+  xrefresh,
   xtrans,
 }:
 
@@ -333,6 +334,7 @@
     xbitmaps
     xorgproto
     xprop
+    xrefresh
     xtrans
     ;
   fontalias = font-alias;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 9017d8ceff771..e653e59e8d7f8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1231,7 +1231,6 @@ self: super:
     };
   });
 
-  xrefresh = addMainProgram super.xrefresh { };
   xset = addMainProgram super.xset { };
   xsetroot = addMainProgram super.xsetroot { };
   xsm = addMainProgram super.xsm { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index dbc147f21cef4..414f8bf59e4a0 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -57,7 +57,6 @@ mirror://xorg/individual/app/xmore-1.0.4.tar.xz
 mirror://xorg/individual/app/xpr-1.2.0.tar.xz
 mirror://xorg/individual/app/xrandr-1.5.3.tar.xz
 mirror://xorg/individual/app/xrdb-1.2.2.tar.xz
-mirror://xorg/individual/app/xrefresh-1.1.0.tar.xz
 mirror://xorg/individual/app/xset-1.2.5.tar.xz
 mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz
 mirror://xorg/individual/app/xsm-1.0.6.tar.xz

From 2f91c6aa23df10a90ea37995863e9c86d229856b Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 03:41:27 +0200
Subject: [PATCH 029/321] xwininfo: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xw/xwininfo/package.nix          | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/xw/xwininfo/package.nix

diff --git a/pkgs/by-name/xw/xwininfo/package.nix b/pkgs/by-name/xw/xwininfo/package.nix
new file mode 100644
index 0000000000000..f34aee5c7b179
--- /dev/null
+++ b/pkgs/by-name/xw/xwininfo/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  libxcb,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xwininfo";
+  version = "1.1.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xwininfo-${finalAttrs.version}.tar.xz";
+    hash = "sha256-NRiJfBdEjfm6ma1tm7HKDxe8DtfA/WEoGzTO7SmpJT8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    libxcb
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to print information about windows on an X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xwininfo";
+    license = with lib.licenses; [
+      mit
+      # mit-open-group with icu disclaimer ?!
+      # close enough to mit-open-group
+      mitOpenGroup
+      hpndSellVariant
+    ];
+    mainProgram = "xwininfo";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..156feb26f7376 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -28,6 +28,7 @@
   xorgproto,
   xorg-sgml-doctools,
   xtrans,
+  xwininfo,
 }:
 
 self: with self; {
@@ -47,6 +48,7 @@ self: with self; {
     xbitmaps
     xorgproto
     xtrans
+    xwininfo
     ;
   fontalias = font-alias;
   fontutil = font-util;
@@ -7738,44 +7740,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xwininfo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libxcb,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xwininfo";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz";
-        sha256 = "0gr5m4lyvkil3cl63zf0sw7bq5qgraqrnvddk6xgk3a42xy8j61m";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libxcb
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xwud = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..d7e0297c320ab 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -313,6 +313,7 @@
   xorgproto,
   xorg-sgml-doctools,
   xtrans,
+  xwininfo,
 }:
 
 self: with self; {
@@ -332,6 +333,7 @@
     xbitmaps
     xorgproto
     xtrans
+    xwininfo
     ;
   fontalias = font-alias;
   fontutil = font-util;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..89dfdb6cdb98d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1238,7 +1238,6 @@ self: super:
   xsm = addMainProgram super.xsm { };
   xstdcmap = addMainProgram super.xstdcmap { };
   xwd = addMainProgram super.xwd { };
-  xwininfo = addMainProgram super.xwininfo { };
   xwud = addMainProgram super.xwud { };
 
   # convert Type1 vector fonts to OpenType fonts
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..5f35df1d84fa8 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -66,7 +66,6 @@ mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
-mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz
 mirror://xorg/individual/app/xwud-1.0.7.tar.xz
 mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz

From 83ea1c364681c44cee98a939580cb0e0df9db58e Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 03:49:26 +0200
Subject: [PATCH 030/321] xwud: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xw/xwud/package.nix              | 47 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 51 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/xw/xwud/package.nix

diff --git a/pkgs/by-name/xw/xwud/package.nix b/pkgs/by-name/xw/xwud/package.nix
new file mode 100644
index 0000000000000..c7bf3f5cdd632
--- /dev/null
+++ b/pkgs/by-name/xw/xwud/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xwud";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xwud-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5Vy+2rNtel9nGr+OWUiIr8SMqhFtUdQp6lPqMX7Axh4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to display an image in XWD (X Window Dump) format";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xwud";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xwud";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 156feb26f7376..f553ed6ce8664 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -29,6 +29,7 @@
   xorg-sgml-doctools,
   xtrans,
   xwininfo,
+  xwud,
 }:
 
 self: with self; {
@@ -49,6 +50,7 @@ self: with self; {
     xorgproto
     xtrans
     xwininfo
+    xwud
     ;
   fontalias = font-alias;
   fontutil = font-util;
@@ -7740,40 +7742,4 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xwud = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xwud";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xwud-1.0.7.tar.xz";
-        sha256 = "07n6q1z33sjkx8lx8lbd26m8ri5gi145k3mz39kmyykdngdbwp75";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
 }
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d7e0297c320ab..88628c31ac74b 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -314,6 +314,7 @@
   xorg-sgml-doctools,
   xtrans,
   xwininfo,
+  xwud,
 }:
 
 self: with self; {
@@ -334,6 +335,7 @@
     xorgproto
     xtrans
     xwininfo
+    xwud
     ;
   fontalias = font-alias;
   fontutil = font-util;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 89dfdb6cdb98d..627c790e5a156 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1238,7 +1238,6 @@ self: super:
   xsm = addMainProgram super.xsm { };
   xstdcmap = addMainProgram super.xstdcmap { };
   xwd = addMainProgram super.xwd { };
-  xwud = addMainProgram super.xwud { };
 
   # convert Type1 vector fonts to OpenType fonts
   fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 5f35df1d84fa8..b3f1a06a2ae19 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -66,7 +66,6 @@ mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
-mirror://xorg/individual/app/xwud-1.0.7.tar.xz
 mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz

From 05ae0e0406286a9c6b8b75dad66af0b3c1d9e5a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 02:38:26 +0000
Subject: [PATCH 031/321] neon: 0.34.2 -> 0.35.0

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

diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix
index 62f3da0cc050b..9015a737ada80 100644
--- a/pkgs/by-name/ne/neon/package.nix
+++ b/pkgs/by-name/ne/neon/package.nix
@@ -22,12 +22,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.34.2";
+  version = "0.35.0";
   pname = "neon";
 
   src = fetchurl {
     url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-+Yzjx0MAvgXt3wXcy9ykmLFNQMKJ93MZXdGlWc/6WFY=";
+    sha256 = "sha256-FGevtz814/XQ6f1wYowUy6Jmpl4qH7bj+UXuM4XIWVs=";
   };
 
   patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ];

From 9ad3a410d24b53f1b023548fd88ec7d99e3e432c Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 20:55:14 +0200
Subject: [PATCH 032/321] libxv: refactor and migrate to pkgs/by-name from
 xorg.libXv

---
 pkgs/by-name/li/libxv/package.nix             | 64 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  9 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 69 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/by-name/li/libxv/package.nix

diff --git a/pkgs/by-name/li/libxv/package.nix b/pkgs/by-name/li/libxv/package.nix
new file mode 100644
index 0000000000000..df8cd9625aaab
--- /dev/null
+++ b/pkgs/by-name/li/libxv/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libX11,
+  libXext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxv";
+  version = "1.0.13";
+
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXv-${finalAttrs.version}.tar.xz";
+    hash = "sha256-fTSRCVjhwfjRk9go/qG32hkilygKNUN68GkvADugN1U=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libX11
+    libXext
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXv \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib-based library for the X Video (Xv) extension to the X Window System";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxv";
+    license = with lib.licenses; [
+      hpnd
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xv" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..8cdb225e101a1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -14,6 +14,7 @@
   libxcvt,
   libxdmcp,
   libxext,
+  libxv,
   lndir,
   luit,
   makedepend,
@@ -55,6 +56,7 @@ self: with self; {
   libXau = libxau;
   libXdmcp = libxdmcp;
   libXext = libxext;
+  libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2763,44 +2765,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXv = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXv";
-      version = "1.0.13";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXv-1.0.13.tar.xz";
-        sha256 = "0m9pl0xh0bv9y1x46d8a52bj46fsnyhzwa6qjg8zihg1b04r2d3x";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xv" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXvMC = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..4028e5a126c86 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -47,6 +47,7 @@
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xtrans"} = "xtrans";
+$pcMap{"xv"} = "libXv";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -299,6 +300,7 @@
   libxcvt,
   libxdmcp,
   libxext,
+  libxv,
   lndir,
   luit,
   makedepend,
@@ -340,6 +342,7 @@
   libXau = libxau;
   libXdmcp = libxdmcp;
   libXext = libxext;
+  libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..b047f7ec5dc0b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -404,15 +404,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXv = super.libXv.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "devdoc"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   libXvMC = super.libXvMC.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..98fcd3c62b014 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -184,7 +184,6 @@ mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
-mirror://xorg/individual/lib/libXv-1.0.13.tar.xz
 mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz
 mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2

From 0412b1ef6c573b4a742614a69aa7073385f9c405 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 22:58:52 +0200
Subject: [PATCH 033/321] libxfixes: refactor and migrate to pkgs/by-name from
 xorg.libXfixes

---
 pkgs/by-name/li/libxfixes/package.nix         | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 62 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/by-name/li/libxfixes/package.nix

diff --git a/pkgs/by-name/li/libxfixes/package.nix b/pkgs/by-name/li/libxfixes/package.nix
new file mode 100644
index 0000000000000..cf51e21d9d1e7
--- /dev/null
+++ b/pkgs/by-name/li/libxfixes/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libX11,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxfixes";
+  version = "6.0.1";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXfixes-${finalAttrs.version}.tar.xz";
+    hash = "sha256-tpX5PNJJlCGrAtInREWOZQzMiMHUyBMNYCACE6vALVg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libX11
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXfixes \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib-based library for the XFIXES Extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxfixes";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xfixes" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8cdb225e101a1..4af533466d2a7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -14,6 +14,7 @@
   libxcvt,
   libxdmcp,
   libxext,
+  libxfixes,
   libxv,
   lndir,
   luit,
@@ -56,6 +57,7 @@ self: with self; {
   libXau = libxau;
   libXdmcp = libxdmcp;
   libXext = libxext;
+  libXfixes = libxfixes;
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
@@ -2162,42 +2164,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXfixes = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXfixes";
-      version = "6.0.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz";
-        sha256 = "0n1dq2mi60i0c06i7j6lq64cq335ir2l89yj0amj3529s8ygk5dn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xfixes" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXfont = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 4028e5a126c86..1ac98976b4c62 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -46,6 +46,7 @@
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
+$pcMap{"xfixes"} = "libXfixes";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
 $pcMap{"\$PIXMAN"} = "pixman";
@@ -300,6 +301,7 @@
   libxcvt,
   libxdmcp,
   libxext,
+  libxfixes,
   libxv,
   lndir,
   luit,
@@ -342,6 +344,7 @@
   libXau = libxau;
   libXdmcp = libxdmcp;
   libXext = libxext;
+  libXfixes = libxfixes;
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b047f7ec5dc0b..4c414fce365c0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -316,13 +316,6 @@ self: super:
     };
   });
 
-  libXfixes = super.libXfixes.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
   libXi = super.libXi.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 98fcd3c62b014..e6fceb334abcd 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -165,7 +165,6 @@ mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
-mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz
 mirror://xorg/individual/lib/libXft-2.3.9.tar.xz

From c8bd0548a6b0b5cc3b0d9fd68a80ebbeb3f91581 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 23:09:09 +0200
Subject: [PATCH 034/321] libxrender: refactor and migrate to pkgs/by-name from
 xorg.libXrender

---
 pkgs/by-name/li/libxrender/package.nix        | 61 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 10 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 66 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/li/libxrender/package.nix

diff --git a/pkgs/by-name/li/libxrender/package.nix b/pkgs/by-name/li/libxrender/package.nix
new file mode 100644
index 0000000000000..c38fb008845f9
--- /dev/null
+++ b/pkgs/by-name/li/libxrender/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxrender";
+  version = "0.9.12";
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXrender-${finalAttrs.version}.tar.xz";
+    hash = "sha256-uDISjaSLOcjWCCJEgXQ0A60Wkb9OVU5L6cF03xcdG5c=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXrender \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib library for the Render Extension to the X11 protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxrender";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xrender" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4af533466d2a7..39b840db9307e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -15,6 +15,7 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxrender,
   libxv,
   lndir,
   luit,
@@ -58,6 +59,7 @@ self: with self; {
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXrender = libxrender;
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
@@ -2577,42 +2579,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXrender = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXrender";
-      version = "0.9.12";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXrender-0.9.12.tar.xz";
-        sha256 = "15qv3lbxyx61x55lwmafpy8idb836is82i1213bchfcblj6i4cmq";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xrender" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXres = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 1ac98976b4c62..073baffba74b6 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -47,6 +47,7 @@
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
+$pcMap{"xrender"} = "libXrender";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
 $pcMap{"\$PIXMAN"} = "pixman";
@@ -302,6 +303,7 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxrender,
   libxv,
   lndir,
   luit,
@@ -345,6 +347,7 @@
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXrender = libxrender;
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 4c414fce365c0..e9ec5564ab43b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -372,16 +372,6 @@ self: super:
     ];
   });
 
-  libXrender = super.libXrender.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "doc"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ];
-  });
-
   libXres = super.libXres.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e6fceb334abcd..21a9f8f57b1b8 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -176,7 +176,6 @@ mirror://xorg/individual/lib/libXp-1.0.4.tar.xz
 mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz
 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz
 mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz
-mirror://xorg/individual/lib/libXrender-0.9.12.tar.xz
 mirror://xorg/individual/lib/libXres-1.2.2.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz

From aae6be8d50e058c9344b6c66129f25534f16d6a1 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 23:51:03 +0200
Subject: [PATCH 035/321] libxcursor: refactor and migrate to pkgs/by-name from
 xorg.libXcursor

---
 pkgs/by-name/li/libxcursor/package.nix        | 58 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 63 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcursor/package.nix

diff --git a/pkgs/by-name/li/libxcursor/package.nix b/pkgs/by-name/li/libxcursor/package.nix
new file mode 100644
index 0000000000000..0a7cbcbfe3a57
--- /dev/null
+++ b/pkgs/by-name/li/libxcursor/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxfixes,
+  libxrender,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcursor";
+  version = "1.2.3";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXcursor-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/elALdTP552nHi2Wu5gK/F5v9Pin10wVnhlmr7KywsA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxfixes
+    libxrender
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXcursor \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X11 Cursor management library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcursor";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xcursor" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 39b840db9307e..348d0c7a4db59 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -12,6 +12,7 @@
   libxau,
   libxcb,
   libxcvt,
+  libxcursor,
   libxdmcp,
   libxext,
   libxfixes,
@@ -56,6 +57,7 @@ self: with self; {
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
+  libXcursor = libxcursor;
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
@@ -2088,46 +2090,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXcursor = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXfixes,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXcursor";
-      version = "1.2.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz";
-        sha256 = "1h62narayrhrkqalrmx7z3s6yppw1acbp5id3skrvrygshnl1sgx";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXfixes
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcursor" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXdamage = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 073baffba74b6..58e4a71397dc6 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -44,6 +44,7 @@
 $pcMap{"xau"} = "libXau";
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-proto"} = "xcbproto";
+$pcMap{"xcursor"} = "libXcursor";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
@@ -300,6 +301,7 @@
   libxau,
   libxcb,
   libxcvt,
+  libxcursor,
   libxdmcp,
   libxext,
   libxfixes,
@@ -344,6 +346,7 @@
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
+  libXcursor = libxcursor;
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e9ec5564ab43b..84d19d1caeb24 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -281,13 +281,6 @@ self: super:
     propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXmu ];
   });
 
-  libXcursor = super.libXcursor.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
   libXdamage = super.libXdamage.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 21a9f8f57b1b8..4eca06e719057 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -163,7 +163,6 @@ mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
-mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz

From 21144d55a93da9e66b3151b9136b5b8742f72386 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 00:02:46 +0200
Subject: [PATCH 036/321] libxrandr: refactor and migrate to pkgs/by-name from
 xorg.libXrandr

---
 pkgs/by-name/li/libxrandr/package.nix         | 64 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  9 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 69 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/by-name/li/libxrandr/package.nix

diff --git a/pkgs/by-name/li/libxrandr/package.nix b/pkgs/by-name/li/libxrandr/package.nix
new file mode 100644
index 0000000000000..93a575ce705bf
--- /dev/null
+++ b/pkgs/by-name/li/libxrandr/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxrender,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxrandr";
+  version = "1.5.4";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXrandr-${finalAttrs.version}.tar.xz";
+    hash = "sha256-GtWwZTdfSoWRWqYGEcxkB8BgSSohTX+dryFL51LDtNM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxrender
+  ];
+
+  propagatedBuildInputs = [ libxrender ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXrandr \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Xlib Resize, Rotate and Reflection (RandR) extension library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxrandr";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xrandr" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 348d0c7a4db59..b5062bf24e0f7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -16,6 +16,7 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxrandr,
   libxrender,
   libxv,
   lndir,
@@ -61,6 +62,7 @@ self: with self; {
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXrandr = libxrandr;
   libXrender = libxrender;
   libXv = libxv;
   utilmacros = util-macros;
@@ -2501,46 +2503,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXrandr = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXrandr";
-      version = "1.5.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz";
-        sha256 = "1lxlqd9ffjr1myfpyk91594n1h07ck6121m6ba8qajjz6xjv1m8s";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xrandr" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXres = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 58e4a71397dc6..3a85296e25963 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -48,6 +48,7 @@
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
+$pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
@@ -305,6 +306,7 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxrandr,
   libxrender,
   libxv,
   lndir,
@@ -350,6 +352,7 @@
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXrandr = libxrandr;
   libXrender = libxrender;
   libXv = libxv;
   utilmacros = util-macros;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 84d19d1caeb24..78614285a41c9 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -344,15 +344,6 @@ self: super:
     buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ];
   });
 
-  libXrandr = super.libXrandr.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXrender ];
-  });
-
   libSM = super.libSM.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 4eca06e719057..6a88c77a930da 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -174,7 +174,6 @@ mirror://xorg/individual/lib/libXmu-1.2.1.tar.xz
 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz
 mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz
 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz
-mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz
 mirror://xorg/individual/lib/libXres-1.2.2.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz

From 81e10b98d139814b8a66cacdd8c9dbf7bc4a9229 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 01:19:57 +0200
Subject: [PATCH 037/321] xdriinfo: 1.0.7 -> 1.0.8, refactor and migrate to
 pkgs/by-name from xorg namespace

---
 pkgs/by-name/xd/xdriinfo/package.nix          | 49 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 53 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/xd/xdriinfo/package.nix

diff --git a/pkgs/by-name/xd/xdriinfo/package.nix b/pkgs/by-name/xd/xdriinfo/package.nix
new file mode 100644
index 0000000000000..9b53f106ece0d
--- /dev/null
+++ b/pkgs/by-name/xd/xdriinfo/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libGL,
+  xorgproto,
+  libx11,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdriinfo";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xdriinfo-${finalAttrs.version}.tar.xz";
+    hash = "sha256-AEYwVkNbgiYcInrQ3hhz/UU2EBYH+8V1QOKOSgqbcfc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libGL
+    xorgproto
+    libx11
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to query configuration information of X11 DRI drivers";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xdriinfo";
+    license = lib.licenses.mit;
+    mainProgram = "xdriinfo";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5f50f64073eaa..7af2c8f03b000 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -23,6 +23,7 @@
   xbitmaps,
   xcb-proto,
   xcmsdb,
+  xdriinfo,
   xkeyboard-config,
   xorg-cf-files,
   xorg-docs,
@@ -47,6 +48,7 @@ self: with self; {
     sessreg
     xbitmaps
     xcmsdb
+    xdriinfo
     xorgproto
     xtrans
     ;
@@ -4244,44 +4246,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xdriinfo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libGL,
-      xorgproto,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xdriinfo";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz";
-        sha256 = "0d7p9fj3znq0av9pjgi2kphqaz5w7b9hxlz63zbxs69bknp8p0yx";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libGL
-        xorgproto
-        libX11
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xev = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 789739daf78b1..6825ab76399ba 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -308,6 +308,7 @@
   xbitmaps,
   xcb-proto,
   xcmsdb,
+  xdriinfo,
   xkeyboard-config,
   xorg-cf-files,
   xorg-docs,
@@ -332,6 +333,7 @@
     sessreg
     xbitmaps
     xcmsdb
+    xdriinfo
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d8c1095aa7d1c..d8fa5544bef31 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -745,13 +745,6 @@ self: super:
     };
   });
 
-  xdriinfo = super.xdriinfo.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [ libGL ];
-    meta = attrs.meta // {
-      mainProgram = "xdriinfo";
-    };
-  });
-
   xev = addMainProgram super.xev { };
   xeyes = addMainProgram super.xeyes { };
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 0fd4db7a5d6b8..5d7c155a9c784 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -28,7 +28,6 @@ mirror://xorg/individual/app/xconsole-1.1.0.tar.xz
 mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz
 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
-mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz
 mirror://xorg/individual/app/xev-1.2.6.tar.xz
 mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz

From b91f8ce4289b8bda8ce420ccaaebb92fd568629c Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 01:27:05 +0200
Subject: [PATCH 038/321] xlsatoms: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xl/xlsatoms/package.nix          | 43 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 47 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/by-name/xl/xlsatoms/package.nix

diff --git a/pkgs/by-name/xl/xlsatoms/package.nix b/pkgs/by-name/xl/xlsatoms/package.nix
new file mode 100644
index 0000000000000..708710b177cdd
--- /dev/null
+++ b/pkgs/by-name/xl/xlsatoms/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xlsatoms";
+  version = "1.1.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xlsatoms-${finalAttrs.version}.tar.xz";
+    hash = "sha256-9L+hX1bAZtMmpdWykmRnCPJbkkdQaEC5BHzSaH3Mcbc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to list interned atoms defined on X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsatoms";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xlsatoms";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7af2c8f03b000..15291853e339f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -25,6 +25,7 @@
   xcmsdb,
   xdriinfo,
   xkeyboard-config,
+  xlsatoms,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -49,6 +50,7 @@ self: with self; {
     xbitmaps
     xcmsdb
     xdriinfo
+    xlsatoms
     xorgproto
     xtrans
     ;
@@ -6878,38 +6880,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xlsatoms = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxcb,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xlsatoms";
-      version = "1.1.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz";
-        sha256 = "1dviriynilkw0jwl0s2h8y95pwh8cxj95cnmllkd6rn0args3gzl";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ libxcb ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xlsclients = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6825ab76399ba..80bc58fb98f82 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -310,6 +310,7 @@
   xcmsdb,
   xdriinfo,
   xkeyboard-config,
+  xlsatoms,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -334,6 +335,7 @@
     xbitmaps
     xcmsdb
     xdriinfo
+    xlsatoms
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d8fa5544bef31..9e88be8f2fa52 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1198,7 +1198,6 @@ self: super:
   xkbprint = addMainProgram super.xkbprint { };
   xkill = addMainProgram super.xkill { };
   xload = addMainProgram super.xload { };
-  xlsatoms = addMainProgram super.xlsatoms { };
   xlsclients = addMainProgram super.xlsclients { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 5d7c155a9c784..29566530d875f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -45,7 +45,6 @@ mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
 mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
 mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
-mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz
 mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz
 mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz

From 8ef333a61fd251e9f4f9c39623ae0707a941deaf Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 01:33:31 +0200
Subject: [PATCH 039/321] xlsclients: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xl/xlsclients/package.nix        | 46 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 50 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/by-name/xl/xlsclients/package.nix

diff --git a/pkgs/by-name/xl/xlsclients/package.nix b/pkgs/by-name/xl/xlsclients/package.nix
new file mode 100644
index 0000000000000..d2cc35c2e9ca7
--- /dev/null
+++ b/pkgs/by-name/xl/xlsclients/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xlsclients";
+  version = "1.1.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xlsclients-${finalAttrs.version}.tar.xz";
+    hash = "sha256-aLruV+cCUKxKd1n7eCIYMfl9iLyOUdzC5k6z+MpWuuM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to list client applications running on a X11 display";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsclients";
+    license = with lib.licenses; [
+      mitOpenGroup
+      mit
+    ];
+    mainProgram = "xlsclients";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15291853e339f..954a63ca37d2e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -26,6 +26,7 @@
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
+  xlsclients,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -51,6 +52,7 @@ self: with self; {
     xcmsdb
     xdriinfo
     xlsatoms
+    xlsclients
     xorgproto
     xtrans
     ;
@@ -6880,38 +6882,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xlsclients = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxcb,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xlsclients";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz";
-        sha256 = "1qxsav5gicsfwv1dqlcfpj47vy9i30i7iysrfx5aql02wxbyxfk8";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ libxcb ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xlsfonts = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 80bc58fb98f82..3524475cad1a2 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -311,6 +311,7 @@
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
+  xlsclients,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -336,6 +337,7 @@
     xcmsdb
     xdriinfo
     xlsatoms
+    xlsclients
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 9e88be8f2fa52..b0d6d376d8903 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1198,7 +1198,6 @@ self: super:
   xkbprint = addMainProgram super.xkbprint { };
   xkill = addMainProgram super.xkill { };
   xload = addMainProgram super.xload { };
-  xlsclients = addMainProgram super.xlsclients { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };
   xmodmap = addMainProgram super.xmodmap { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 29566530d875f..819e3e8cee2e5 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -45,7 +45,6 @@ mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
 mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
 mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
-mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz
 mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz

From 4fbe4c9f5a4b43f2974335fdf8fc093c817014dd Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 01:58:44 +0200
Subject: [PATCH 040/321] xlsfonts: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xl/xlsfonts/package.nix          | 47 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 51 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/xl/xlsfonts/package.nix

diff --git a/pkgs/by-name/xl/xlsfonts/package.nix b/pkgs/by-name/xl/xlsfonts/package.nix
new file mode 100644
index 0000000000000..d632b6d9e3102
--- /dev/null
+++ b/pkgs/by-name/xl/xlsfonts/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xlsfonts";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xlsfonts-${finalAttrs.version}.tar.xz";
+    hash = "sha256-gH+QnqzmhLhm/GOz6WJynBIIIqbJbgUf9RzzULP/ts0=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to list core protocol fonts on an X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsfonts";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xlsfonts";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 954a63ca37d2e..017cd8bb0dbe2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -27,6 +27,7 @@
   xkeyboard-config,
   xlsatoms,
   xlsclients,
+  xlsfonts,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -53,6 +54,7 @@ self: with self; {
     xdriinfo
     xlsatoms
     xlsclients
+    xlsfonts
     xorgproto
     xtrans
     ;
@@ -6882,42 +6884,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xlsfonts = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xlsfonts";
-      version = "1.0.8";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz";
-        sha256 = "1kdnzyrm1wqwylghavn9lqi0h4lwf9ifkcv3zikbi176mjg90zw0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xmag = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 3524475cad1a2..fa63c30ba271e 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -312,6 +312,7 @@
   xkeyboard-config,
   xlsatoms,
   xlsclients,
+  xlsfonts,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -338,6 +339,7 @@
     xdriinfo
     xlsatoms
     xlsclients
+    xlsfonts
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b0d6d376d8903..bbfae0e146429 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -819,13 +819,6 @@ self: super:
       postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts);
     });
 
-  xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      license = lib.licenses.mit;
-      mainProgram = "xlsfonts";
-    };
-  });
-
   xorgserver = super.xorgserver.overrideAttrs (
     attrs_passed:
     let
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 819e3e8cee2e5..775683d5eb339 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -45,7 +45,6 @@ mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
 mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
 mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
-mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz
 mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c04f6db459a19..f9083c730009a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12327,8 +12327,6 @@ with pkgs;
     freeoffice
     ;
 
-  inherit (xorg) xlsfonts;
-
   gimp3 = callPackage ../applications/graphics/gimp {
     lcms = lcms2;
   };

From cc984a2d2e948fe74de939f1d60243fb5e8f082b Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Mon, 9 Jun 2025 02:26:58 +0200
Subject: [PATCH 041/321] xmodmap: refactor and migrate to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xm/xmodmap/package.nix           | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/xm/xmodmap/package.nix

diff --git a/pkgs/by-name/xm/xmodmap/package.nix b/pkgs/by-name/xm/xmodmap/package.nix
new file mode 100644
index 0000000000000..eb6e40c439a60
--- /dev/null
+++ b/pkgs/by-name/xm/xmodmap/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libx11,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xmodmap";
+  version = "1.0.11";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xmodmap-${finalAttrs.version}.tar.xz";
+    hash = "sha256-mi+BaPewvDgoKIR0A5Astr8XXhdlizYYnqyH7dqHfoE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility for modifying keymaps and pointer button mappings in X";
+    longDescription = ''
+      The xmodmap program is used to edit and display the keyboard modifier map and keymap table
+      that are used by client applications to convert event keycodes into keysyms. It is usually run
+      from the user's session startup script to configure the keyboard according to personal tastes.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xmodmap";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+    ];
+    mainProgram = "xmodmap";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 017cd8bb0dbe2..21ed856105e8e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -28,6 +28,7 @@
   xlsatoms,
   xlsclients,
   xlsfonts,
+  xmodmap,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -55,6 +56,7 @@ self: with self; {
     xlsatoms
     xlsclients
     xlsfonts
+    xmodmap
     xorgproto
     xtrans
     ;
@@ -6970,42 +6972,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xmodmap = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xmodmap";
-      version = "1.0.11";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz";
-        sha256 = "10byhzdfv1xckqc3d2v52xg1ggxn5j806x4450l3ig5hyxl82bws";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xmore = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index fa63c30ba271e..0b4c15925a564 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -313,6 +313,7 @@
   xlsatoms,
   xlsclients,
   xlsfonts,
+  xmodmap,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -340,6 +341,7 @@
     xlsatoms
     xlsclients
     xlsfonts
+    xmodmap
     xorgproto
     xtrans
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bbfae0e146429..067b94155359f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1193,7 +1193,6 @@ self: super:
   xload = addMainProgram super.xload { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };
-  xmodmap = addMainProgram super.xmodmap { };
   xmore = addMainProgram super.xmore { };
 
   xpr = addMainProgram super.xpr { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 775683d5eb339..e4212757e7016 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -47,7 +47,6 @@ mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz
-mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz
 mirror://xorg/individual/app/xmore-1.0.4.tar.xz
 mirror://xorg/individual/app/xpr-1.2.0.tar.xz
 mirror://xorg/individual/app/xprop-1.2.8.tar.xz

From f52d374f46bf74cc19a9357acdaf0658198d7f6a Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sat, 26 Apr 2025 21:46:35 +0200
Subject: [PATCH 042/321] mkfontscale: refactor and move to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/mk/mkfontscale/package.nix       | 53 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 57 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/mk/mkfontscale/package.nix

diff --git a/pkgs/by-name/mk/mkfontscale/package.nix b/pkgs/by-name/mk/mkfontscale/package.nix
new file mode 100644
index 0000000000000..4b3e08ccd7543
--- /dev/null
+++ b/pkgs/by-name/mk/mkfontscale/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libfontenc,
+  freetype,
+  xorgproto,
+  zlib,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mkfontscale";
+  version = "1.2.3";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/mkfontscale-${finalAttrs.version}.tar.xz";
+    hash = "sha256-KSHNw0TxrO4EvNbqHilWXBMIJjAG4TSp7jjPnJ1v514=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    libfontenc
+    freetype
+    xorgproto
+    zlib
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utilities to create the fonts.scale and fonts.dir index files used by the legacy X11 font system";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/mkfontscale";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      hpndSellVariant
+    ];
+    maintainers = [ ];
+    mainProgram = "mkfontscale";
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dab99654eb6e5..5d5d346812930 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -17,6 +17,7 @@
   lndir,
   luit,
   makedepend,
+  mkfontscale,
   pixman,
   sessreg,
   util-macros,
@@ -42,6 +43,7 @@ self: with self; {
     lndir
     luit
     makedepend
+    mkfontscale
     pixman
     sessreg
     xbitmaps
@@ -3140,46 +3142,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  mkfontscale = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libfontenc,
-      freetype,
-      xorgproto,
-      zlib,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "mkfontscale";
-      version = "1.2.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz";
-        sha256 = "0pp7dyfrrkrqxslk9q8660k0h4swaqlixsnnph2fxb7i8k1ws899";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libfontenc
-        freetype
-        xorgproto
-        zlib
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   oclock = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2515d4bd7e24e..171172268423a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -302,6 +302,7 @@
   lndir,
   luit,
   makedepend,
+  mkfontscale,
   pixman,
   sessreg,
   util-macros,
@@ -327,6 +328,7 @@
     lndir
     luit
     makedepend
+    mkfontscale
     pixman
     sessreg
     xbitmaps
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8416c836dd66d..5c8d4668dbb4f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -479,7 +479,6 @@ self: super:
     };
   });
 
-  mkfontscale = addMainProgram super.mkfontscale { };
   oclock = addMainProgram super.oclock { };
   smproxy = addMainProgram super.smproxy { };
   transset = addMainProgram super.transset { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 059b308c7ed7f..f93aa9074ae72 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -11,7 +11,6 @@ mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
 mirror://xorg/individual/app/ico-1.0.6.tar.xz
 mirror://xorg/individual/app/listres-1.0.6.tar.xz
-mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz
 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
 mirror://xorg/individual/app/smproxy-1.0.8.tar.xz

From 3cdf37b2ff03643ee5f068c34e364517266e5576 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 21 Jul 2025 18:53:34 +0200
Subject: [PATCH 043/321] ffmpeg: use gmp for rtmp(e)

---
 pkgs/development/libraries/ffmpeg/generic.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 76bd9e39a938a..bc69d2f2b05c6 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -86,6 +86,7 @@
   withFrei0r ? withFullDeps && withGPL, # frei0r video filtering
   withFribidi ? withHeadlessDeps, # Needed for drawtext filter
   withGme ? withFullDeps, # Game Music Emulator
+  withGmp ? withHeadlessDeps && withVersion3, # rtmp(t)e support
   withGnutls ? withHeadlessDeps,
   withGsm ? withFullDeps, # GSM de/encoder
   withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1", # Needed for drawtext filter
@@ -122,7 +123,7 @@
   withQuirc ? withFullDeps && lib.versionAtLeast version "7", # QR decoding
   withRav1e ? withFullDeps, # AV1 encoder (focused on speed and safety)
   withRist ? withHeadlessDeps, # Reliable Internet Stream Transport (RIST) protocol
-  withRtmp ? withFullDeps, # RTMP[E] support
+  withRtmp ? false, # RTMP[E] support via librtmp
   withRubberband ? withFullDeps && withGPL && !stdenv.hostPlatform.isFreeBSD, # Rubberband filter
   withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3, # Samba protocol
   withSdl2 ? withSmallDeps,
@@ -254,6 +255,7 @@
   frei0r,
   fribidi,
   game-music-emu,
+  gmp,
   gnutls,
   gsm,
   harfbuzz,
@@ -638,6 +640,7 @@ stdenv.mkDerivation (
       (enableFeature withFrei0r "frei0r")
       (enableFeature withFribidi "libfribidi")
       (enableFeature withGme "libgme")
+      (enableFeature withGmp "gmp")
       (enableFeature withGnutls "gnutls")
       (enableFeature withGsm "libgsm")
     ]
@@ -851,6 +854,7 @@ stdenv.mkDerivation (
       ++ optionals withFrei0r [ frei0r ]
       ++ optionals withFribidi [ fribidi ]
       ++ optionals withGme [ game-music-emu ]
+      ++ optionals withGmp [ gmp ]
       ++ optionals withGnutls [ gnutls ]
       ++ optionals withGsm [ gsm ]
       ++ optionals withHarfbuzz [ harfbuzz ]

From 867c793adbdf4aafdc21fef39c4e38811ee3ffb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 01:34:21 +0000
Subject: [PATCH 044/321] jasper: 4.2.5 -> 4.2.6

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

diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index ee237051d4824..3c04037dc1acf 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jasper";
-  version = "4.2.5";
+  version = "4.2.6";
 
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "jasper";
     rev = "version-${finalAttrs.version}";
-    hash = "sha256-PjgglP4mKW1eOJ7QgUmc4KNsp/d9ubJBWr4CLcQAyRA=";
+    hash = "sha256-tq27ANDDRdP224E12UeQnvE6BFZRk7KczH4Dq+yt0nY=";
   };
 
   outputs = [

From f1b2ab45b4af4707bb6318157cf09357b9a0a292 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 3 Aug 2025 00:31:09 +0100
Subject: [PATCH 045/321] =?UTF-8?q?atf:=20don=E2=80=99t=20install=20test?=
 =?UTF-8?q?=20programs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix
index ced8145fa9340..8f0aa01360ae6 100644
--- a/pkgs/by-name/at/atf/package.nix
+++ b/pkgs/by-name/at/atf/package.nix
@@ -53,6 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
     kyua
   ];
 
+  # Don’t install the test programs for ATF itself; they’re useless
+  # other than as part of the `installCheckPhase`, and they contain
+  # non‐reproducible references to the build directory.
+  postInstall = ''
+    rm -r $out/tests
+  '';
+
   installCheckPhase = ''
     runHook preInstallCheck
     HOME=$TMPDIR PATH=$out/bin:$PATH kyua test

From f8bc00efc5671bd6084f88f995d6928956e6b85f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 18:13:16 +0200
Subject: [PATCH 046/321] postgresql.pg_config: make overrideable

This allows `postgresql.withPackages` to easily override the paths to
the default and man outputs for `pg_config`. It avoids all
`buildEnv`-dev-output hackery, which it didn't properly support, and
separates the logic cleanly.
---
 pkgs/servers/sql/postgresql/generic.nix   | 145 +++++++++++-----------
 pkgs/servers/sql/postgresql/libpq.nix     |   6 +
 pkgs/servers/sql/postgresql/pg_config.nix |  11 +-
 pkgs/servers/sql/postgresql/pg_config.sh  |   2 +-
 4 files changed, 89 insertions(+), 75 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 028722c5aff16..a9a1ea3980600 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -456,9 +456,12 @@ let
         "$out/bin/pg_config" > "$dev/nix-support/pg_config.expected"
       ''
       + ''
-        rm "$out/bin/pg_config"
-        make -C src/common pg_config.env
-        install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"
+          rm "$out/bin/pg_config"
+          make -C src/common pg_config.env
+          substituteInPlace src/common/pg_config.env \
+            --replace-fail "$out" "@out@" \
+            --replace-fail "$man" "@man@"
+          install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"
 
         # postgres exposes external symbols get_pkginclude_path and similar. Those
         # can't be stripped away by --gc-sections/LTO, because they could theoretically
@@ -585,7 +588,13 @@ let
             postgresql = this;
           };
 
-          pg_config = buildPackages.callPackage ./pg_config.nix { inherit (finalAttrs) finalPackage; };
+          pg_config = buildPackages.callPackage ./pg_config.nix {
+            inherit (finalAttrs) finalPackage;
+            outputs = {
+              out = lib.getOutput "out" finalAttrs.finalPackage;
+              man = lib.getOutput "man" finalAttrs.finalPackage;
+            };
+          };
 
           tests = {
             postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage;
@@ -639,84 +648,76 @@ let
     f:
     let
       installedExtensions = f postgresql.pkgs;
-      finalPackage =
-        (buildEnv {
-          name = "${postgresql.pname}-and-plugins-${postgresql.version}";
-          paths = installedExtensions ++ [
-            # consider keeping in-sync with `postBuild` below
-            postgresql
-            postgresql.man # in case user installs this into environment
-          ];
+      finalPackage = buildEnv {
+        name = "${postgresql.pname}-and-plugins-${postgresql.version}";
+        paths = installedExtensions ++ [
+          # consider keeping in-sync with `postBuild` below
+          postgresql
+          postgresql.man # in case user installs this into environment
+        ];
 
-          pathsToLink = [
-            "/"
-            "/bin"
-            "/share/postgresql/extension"
-            # Unbreaks Omnigres' build system
-            "/share/postgresql/timezonesets"
-            "/share/postgresql/tsearch_data"
-          ];
+        pathsToLink = [
+          "/"
+          "/bin"
+          "/share/postgresql/extension"
+          # Unbreaks Omnigres' build system
+          "/share/postgresql/timezonesets"
+          "/share/postgresql/tsearch_data"
+        ];
 
-          nativeBuildInputs = [ makeBinaryWrapper ];
-          postBuild =
-            let
-              args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions;
-            in
-            ''
-              wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args}
-
-              mkdir -p "$dev/nix-support"
-              substitute "${lib.getDev postgresql}/nix-support/pg_config.env" "$dev/nix-support/pg_config.env" \
-                --replace-fail "${postgresql}" "$out" \
-                --replace-fail "${postgresql.man}" "$out"
-            '';
-
-          passthru = {
-            inherit installedExtensions;
-            inherit (postgresql)
-              pkgs
-              psqlSchema
-              version
-              ;
+        nativeBuildInputs = [ makeBinaryWrapper ];
+        postBuild =
+          let
+            args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions;
+          in
+          ''
+            wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args}
+          '';
+
+        passthru = {
+          inherit installedExtensions;
+          inherit (postgresql)
+            pkgs
+            psqlSchema
+            version
+            ;
+
+          pg_config = postgresql.pg_config.override {
+            outputs = {
+              out = finalPackage;
+              man = finalPackage;
+            };
+          };
 
-            pg_config = postgresql.pg_config.override { inherit finalPackage; };
+          withJIT = postgresqlWithPackages {
+            inherit
+              buildEnv
+              lib
+              makeBinaryWrapper
+              postgresql
+              ;
+          } (_: installedExtensions ++ [ postgresql.jit ]);
+          withoutJIT = postgresqlWithPackages {
+            inherit
+              buildEnv
+              lib
+              makeBinaryWrapper
+              postgresql
+              ;
+          } (_: lib.remove postgresql.jit installedExtensions);
 
-            withJIT = postgresqlWithPackages {
-              inherit
-                buildEnv
-                lib
-                makeBinaryWrapper
-                postgresql
-                ;
-            } (_: installedExtensions ++ [ postgresql.jit ]);
-            withoutJIT = postgresqlWithPackages {
+          withPackages =
+            f':
+            postgresqlWithPackages {
               inherit
                 buildEnv
                 lib
                 makeBinaryWrapper
                 postgresql
                 ;
-            } (_: lib.remove postgresql.jit installedExtensions);
-
-            withPackages =
-              f':
-              postgresqlWithPackages {
-                inherit
-                  buildEnv
-                  lib
-                  makeBinaryWrapper
-                  postgresql
-                  ;
-              } (ps: installedExtensions ++ f' ps);
-          };
-        }).overrideAttrs
-          {
-            # buildEnv doesn't support passing `outputs`, so going via overrideAttrs.
-            outputs = [
-              "out"
-              "dev"
-            ];
-          };
+            } (ps: installedExtensions ++ f' ps);
+        };
+      };
     in
     finalPackage;
 
diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index d3f3da989186f..ab977dfb531d3 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -128,6 +128,9 @@ stdenv.mkDerivation (finalAttrs: {
     make -C src/interfaces/libpq install
     make -C src/port install
 
+    substituteInPlace src/common/pg_config.env \
+      --replace-fail "$out" "@out@"
+
     install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"
     moveToOutput "lib/*.a" "$dev"
 
@@ -151,6 +154,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.pg_config = buildPackages.callPackage ./pg_config.nix {
     inherit (finalAttrs) finalPackage;
+    outputs = {
+      out = lib.getOutput "out" finalAttrs.finalPackage;
+    };
   };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/pg_config.nix b/pkgs/servers/sql/postgresql/pg_config.nix
index 20544cdb06141..c4cc1cee06cd0 100644
--- a/pkgs/servers/sql/postgresql/pg_config.nix
+++ b/pkgs/servers/sql/postgresql/pg_config.nix
@@ -6,6 +6,8 @@
   stdenv,
   # PostgreSQL package
   finalPackage,
+  # PostgreSQL package's outputs
+  outputs,
 }:
 
 replaceVarsWith {
@@ -15,12 +17,17 @@ replaceVarsWith {
   isExecutable = true;
   replacements = {
     inherit runtimeShell;
-    postgresql-dev = lib.getDev finalPackage;
+    "pg_config.env" = replaceVarsWith {
+      name = "pg_config.env";
+      src = "${lib.getDev finalPackage}/nix-support/pg_config.env";
+      replacements = outputs;
+    };
   };
   nativeCheckInputs = [
     diffutils
   ];
-  postCheck = ''
+  # The expected output only matches when outputs have *not* been altered by postgresql.withPackages.
+  postCheck = lib.optionalString (outputs.out == lib.getOutput "out" finalPackage) ''
     if [ -e ${lib.getDev finalPackage}/nix-support/pg_config.expected ]; then
         diff ${lib.getDev finalPackage}/nix-support/pg_config.expected <($out/bin/pg_config)
     fi
diff --git a/pkgs/servers/sql/postgresql/pg_config.sh b/pkgs/servers/sql/postgresql/pg_config.sh
index 3f0aa08eb70cc..ff18e3a4752bf 100644
--- a/pkgs/servers/sql/postgresql/pg_config.sh
+++ b/pkgs/servers/sql/postgresql/pg_config.sh
@@ -13,7 +13,7 @@ set -euo pipefail
 #   https://github.com/postgres/postgres/blob/7510ac6203bc8e3c56eae95466feaeebfc1b4f31/src/bin/pg_config/pg_config.sh
 #   https://github.com/postgres/postgres/blob/master/src/bin/pg_config/pg_config.c
 
-source @postgresql-dev@/nix-support/pg_config.env
+source @pg_config.env@
 
 help="
 pg_config provides information about the installed version of PostgreSQL.

From 43fddf04c0d04300c5859c2853965d725ed5e8cf Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 18:29:56 +0200
Subject: [PATCH 047/321] Revert "python3Packages.pgvector: temporarily disable
 checkPhase"

This reverts commit 39767f902ebfc8ecd9722ee085cad51e0100aac7.
---
 pkgs/development/python-modules/pgvector/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix
index 377535d893c83..cc604bc879975 100644
--- a/pkgs/development/python-modules/pgvector/default.nix
+++ b/pkgs/development/python-modules/pgvector/default.nix
@@ -42,10 +42,6 @@ buildPythonPackage rec {
 
   dependencies = [ numpy ];
 
-  # Temporarily disabled until the following is solved:
-  # https://github.com/NixOS/nixpkgs/pull/425384
-  doCheck = false;
-
   nativeCheckInputs = [
     asyncpg
     django

From 267991cc76cdad7f266d5c375492add53ed1620f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 19 Jul 2025 18:30:04 +0200
Subject: [PATCH 048/321] Revert
 "python3Packages.langgraph-checkpoint-postgres: temporarily disable
 checkPhase"

This reverts commit 6dee2b6377c673da32fdc08289f59c304a77043f.
---
 .../python-modules/langgraph-checkpoint-postgres/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 590d0ecefcdbd..d17f7c55de9ae 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -58,10 +58,7 @@ buildPythonPackage rec {
     "psycopg-pool"
   ];
 
-  # Temporarily disabled until the following is solved:
-  # https://github.com/NixOS/nixpkgs/pull/425384
-  doCheck = false;
-  # doCheck = !(stdenvNoCC.hostPlatform.isDarwin);
+  doCheck = !(stdenvNoCC.hostPlatform.isDarwin);
 
   nativeCheckInputs = [
     pytest-asyncio

From 23d3a000714df4410f861c589b057ed69c7b9ab9 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:11:38 -0400
Subject: [PATCH 049/321] installShellFiles: Add nushell support to
 installShellCompletion

---
 .../in/installShellFiles/setup-hook.sh        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/in/installShellFiles/setup-hook.sh b/pkgs/by-name/in/installShellFiles/setup-hook.sh
index b348939165418..94231824222cf 100644
--- a/pkgs/by-name/in/installShellFiles/setup-hook.sh
+++ b/pkgs/by-name/in/installShellFiles/setup-hook.sh
@@ -51,11 +51,11 @@ installManPage() {
 # installShellCompletion [--cmd <name>] ([--bash|--fish|--zsh] [--name <name>] <path>)...
 #
 # Each path is installed into the appropriate directory for shell completions for the given shell.
-# If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell.
-# Otherwise the file extension will be examined to pick a shell. If the shell is unknown a warning
-# will be logged and the command will return a non-zero status code after processing any remaining
-# paths. Any of the shell flags will affect all subsequent paths (unless another shell flag is
-# given).
+# If one of `--bash`, `--fish`, `--zsh`, or `--nushell` is given the path is assumed to belong to
+# that shell. Otherwise the file extension will be examined to pick a shell. If the shell is
+# unknown a warning will be logged and the command will return a non-zero status code after
+# processing any remaining paths. Any of the shell flags will affect all subsequent paths (unless
+# another shell flag is given).
 #
 # If the shell completion needs to be renamed before installing the optional `--name <name>` flag
 # may be given. Any name provided with this flag only applies to the next path.
@@ -84,6 +84,7 @@ installManPage() {
 #
 #   installShellCompletion --bash --name foobar.bash share/completions.bash
 #   installShellCompletion --fish --name foobar.fish share/completions.fish
+#   installShellCompletion --nushell --name foobar share/completions.nu
 #   installShellCompletion --zsh --name _foobar share/completions.zsh
 #
 # Or to use shell newline escaping to split a single invocation across multiple lines:
@@ -91,6 +92,7 @@ installManPage() {
 #   installShellCompletion --cmd foobar \
 #     --bash <($out/bin/foobar --bash-completion) \
 #     --fish <($out/bin/foobar --fish-completion) \
+#     --nushell <($out/bin/foobar --nushell-completion)
 #     --zsh <($out/bin/foobar --zsh-completion)
 #
 # If any argument is `--` the remaining arguments will be treated as paths.
@@ -100,7 +102,7 @@ installShellCompletion() {
         # Parse arguments
         if (( parseArgs )); then
             case "$arg" in
-            --bash|--fish|--zsh)
+            --bash|--fish|--zsh|--nushell)
                 shell=${arg#--}
                 continue;;
             --name)
@@ -146,7 +148,7 @@ installShellCompletion() {
         elif [[ -p "$arg" ]]; then
             # this is a named fd or fifo
             if [[ -z "$curShell" ]]; then
-                nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --bash, --fish, or --zsh"
+                nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --bash, --fish, --zsh, or --nushell"
                 return 1
             elif [[ -z "$name" && -z "$cmdname" ]]; then
                 nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --cmd or --name"
@@ -161,6 +163,7 @@ installShellCompletion() {
                 case "$argbase" in
                 ?*.bash) curShell=bash;;
                 ?*.fish) curShell=fish;;
+                ?*.nu) curShell=nushell;;
                 ?*.zsh) curShell=zsh;;
                 *)
                     if [[ "$argbase" = _* && "$argbase" != *.* ]]; then
@@ -182,6 +185,7 @@ installShellCompletion() {
         elif [[ -n "$cmdname" ]]; then
             case "$curShell" in
             bash|fish) outName=$cmdname.$curShell;;
+            nushell) outName=$cmdname.nu;;
             zsh) outName=_$cmdname;;
             *)
                 # Our list of shells is out of sync with the flags we accept or extensions we detect.
@@ -193,6 +197,7 @@ installShellCompletion() {
         case "$curShell" in
         bash) sharePath=bash-completion/completions;;
         fish) sharePath=fish/vendor_completions.d;;
+        nushell) sharePath=nushell/vendor/autoload;;
         zsh)
             sharePath=zsh/site-functions
             # only apply automatic renaming if we didn't have a manual rename

From 62d5fd3f0be0ab4e7a245715c85bea0e195f88db Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:55:10 -0400
Subject: [PATCH 050/321] installShellFiles.tests: Add nushell to tests

---
 .../in/installShellFiles/tests/install-completion-cmd.nix | 8 +++++++-
 .../installShellFiles/tests/install-completion-fifo.nix   | 4 +++-
 .../tests/install-completion-inference.nix                | 4 +++-
 .../installShellFiles/tests/install-completion-name.nix   | 8 +++++++-
 .../in/installShellFiles/tests/install-completion.nix     | 8 +++++++-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix
index a8687ccc2c7d0..78bf082778327 100644
--- a/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix
+++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix
@@ -14,11 +14,17 @@ runCommandLocal "install-shell-files--install-completion-cmd"
     echo bar > bar.zsh
     echo baz > baz.fish
     echo qux > qux.fish
+    echo buzz > buzz.nu
 
-    installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish
+    installShellCompletion \
+      --cmd foobar --bash foo.bash \
+      --zsh bar.zsh \
+      --fish baz.fish --name qux qux.fish \
+      --nushell --cmd buzzbar buzz.nu
 
     cmp foo.bash $out/share/bash-completion/completions/foobar.bash
     cmp bar.zsh $out/share/zsh/site-functions/_foobar
     cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish
     cmp qux.fish $out/share/fish/vendor_completions.d/qux
+    cmp buzz.nu $out/share/nushell/vendor/autoload/buzzbar.nu
   ''
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix
index 2c777f0fb68a1..d9a4d98b94228 100644
--- a/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix
+++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix
@@ -13,9 +13,11 @@ runCommandLocal "install-shell-files--install-completion-fifo"
     installShellCompletion \
       --bash --name foo.bash <(echo foo) \
       --zsh --name _foo <(echo bar) \
-      --fish --name foo.fish <(echo baz)
+      --fish --name foo.fish <(echo baz) \
+      --nushell --name foo.nu <(echo bucks)
 
     [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; }
     [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; }
     [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; }
+    [[ $(<$out/share/nushell/vendor/autoload/foo.nu) == bucks ]] || { echo "foo.nu comparison failed"; exit 1; }
   ''
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix
index 9a51965ccecbd..e9b87e028eeaf 100644
--- a/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix
+++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix
@@ -13,10 +13,12 @@ runCommandLocal "install-shell-files--install-completion-inference"
     echo foo > foo.bash
     echo bar > bar.zsh
     echo baz > baz.fish
+    echo buzz > buzz.nu
 
-    installShellCompletion foo.bash bar.zsh baz.fish
+    installShellCompletion foo.bash bar.zsh baz.fish buzz.nu
 
     cmp foo.bash $out/share/bash-completion/completions/foo.bash
     cmp bar.zsh $out/share/zsh/site-functions/_bar
     cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish
+    cmp buzz.nu $out/share/nushell/vendor/autoload/buzz.nu
   ''
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix
index 2473318dee2c1..ebf09f5b207e1 100644
--- a/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix
+++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix
@@ -13,10 +13,16 @@ runCommandLocal "install-shell-files--install-completion-name"
     echo foo > foo
     echo bar > bar
     echo baz > baz
+    echo bucks > bucks
 
-    installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz
+    installShellCompletion \
+      --bash --name foobar.bash foo \
+      --zsh --name _foobar bar \
+      --fish baz \
+      --nushell --name foobar.nu bucks
 
     cmp foo $out/share/bash-completion/completions/foobar.bash
     cmp bar $out/share/zsh/site-functions/_foobar
     cmp baz $out/share/fish/vendor_completions.d/baz
+    cmp bucks $out/share/nushell/vendor/autoload/foobar.nu
   ''
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion.nix
index 2738dd647f566..37fec86e8afa5 100644
--- a/pkgs/by-name/in/installShellFiles/tests/install-completion.nix
+++ b/pkgs/by-name/in/installShellFiles/tests/install-completion.nix
@@ -15,12 +15,18 @@ runCommandLocal "install-shell-files--install-completion"
     echo baz > baz
     echo qux > qux.zsh
     echo quux > quux
+    echo quokka > quokka
 
-    installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux
+    installShellCompletion \
+      --bash foo bar \
+      --zsh baz qux.zsh \
+      --fish quux \
+      --nushell quokka
 
     cmp foo $out/share/bash-completion/completions/foo
     cmp bar $out/share/bash-completion/completions/bar
     cmp baz $out/share/zsh/site-functions/_baz
     cmp qux.zsh $out/share/zsh/site-functions/_qux
     cmp quux $out/share/fish/vendor_completions.d/quux
+    cmp quokka $out/share/nushell/vendor/autoload/quokka
   ''

From c2f9c14b9d2435408a5dd50e1f352e3dab6b724a Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:54:30 -0400
Subject: [PATCH 051/321] docs: Update installShellFiles docs for Nushell
 completions

---
 doc/hooks/installShellFiles.section.md | 8 +++++---
 doc/release-notes/rl-2511.section.md   | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md
index 223c47f2e684b..26ccf29f2fdb6 100644
--- a/doc/hooks/installShellFiles.section.md
+++ b/doc/hooks/installShellFiles.section.md
@@ -58,8 +58,8 @@ The `installShellCompletion` function takes one or more paths to shell
 completion files.
 
 By default it will autodetect the shell type from the completion file extension,
-but you may also specify it by passing one of `--bash`, `--fish`, or
-`--zsh`. These flags apply to all paths listed after them (up until another
+but you may also specify it by passing one of `--bash`, `--fish`, `--zsh`, or
+`--nushell`. These flags apply to all paths listed after them (up until another
 shell flag is given). Each path may also have a custom installation name
 provided by providing a flag `--name NAME` before the path. If this flag is not
 provided, zsh completions will be renamed automatically such that `foobar.zsh`
@@ -77,9 +77,10 @@ zsh).
     # explicit behavior
     installShellCompletion --bash --name foobar.bash share/completions.bash
     installShellCompletion --fish --name foobar.fish share/completions.fish
+    installShellCompletion --nushell --name foobar share/completions.nu
     installShellCompletion --zsh --name _foobar share/completions.zsh
     # implicit behavior
-    installShellCompletion share/completions/foobar.{bash,fish,zsh}
+    installShellCompletion share/completions/foobar.{bash,fish,zsh,nu}
   '';
 }
 ```
@@ -104,6 +105,7 @@ failure. To prevent this, guard the completion generation commands.
     installShellCompletion --cmd foobar \
       --bash <($out/bin/foobar --bash-completion) \
       --fish <($out/bin/foobar --fish-completion) \
+      --nushell <($out/bin/foobar --nushell-completion) \
       --zsh <($out/bin/foobar --zsh-completion)
   '';
 }
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 34277e0abf9d2..812e4d7fd02e7 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -78,6 +78,8 @@
 
 - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update.
 
+- `installShellCompletion`: now supports Nushell completion files
+
 - New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.
 
 - `gramps` has been updated to 6.0.0

From cbe92242d016a6d87f17411ab1286a50d5d30b48 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 2 Aug 2025 23:03:36 +0100
Subject: [PATCH 052/321] llvmPackages.tblgen: only install the tools we use

Otherwise we install a weird `update_core_linalg_named_ops.sh`
maintainer script that refers to the build directory.

There are explicit install targets for some of these and probably
better ways we could install the others, but the Clang derivation
also just explicitly copies a bunch of them, so meh.
---
 .../compilers/llvm/common/tblgen.nix          | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix
index beebce95d0215..33409745e0d44 100644
--- a/pkgs/development/compilers/llvm/common/tblgen.nix
+++ b/pkgs/development/compilers/llvm/common/tblgen.nix
@@ -56,12 +56,31 @@ let
     else
       src;
 
+  # List of tablegen targets.
+  targets = [
+    "clang-tblgen"
+    "llvm-tblgen"
+  ]
+  ++ lib.optionals (lib.versionAtLeast release_version "15") [
+    "clang-tidy-confusable-chars-gen"
+  ]
+  ++ lib.optionals (lib.versionAtLeast release_version "16") [
+    "mlir-tblgen"
+  ]
+  ++
+    lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20"))
+      [
+        "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.
+      ];
+
   self = stdenv.mkDerivation (finalAttrs: {
     inherit pname version patches;
 
     src = src';
     sourceRoot = "${finalAttrs.src.name}/llvm";
 
+    __structuredAttrs = true;
+
     postPatch = ''
       (
         cd ../clang
@@ -100,26 +119,13 @@ let
     ]
     ++ devExtraCmakeFlags;
 
-    # List of tablegen targets.
-    ninjaFlags = [
-      "clang-tblgen"
-      "llvm-tblgen"
-    ]
-    ++ lib.optionals (lib.versionAtLeast release_version "15") [
-      "clang-tidy-confusable-chars-gen"
-    ]
-    ++ lib.optionals (lib.versionAtLeast release_version "16") [
-      "mlir-tblgen"
-    ]
-    ++
-      lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20"))
-        [
-          "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.
-        ];
+    ninjaFlags = targets;
+
+    inherit targets;
 
     installPhase = ''
-      mkdir -p $out
-      cp -ar bin $out/bin
+      mkdir -p $out/bin
+      cp "''${targets[@]/#/bin/}" $out/bin
     '';
   });
 in

From 0b2b7c18ed5e4f9f629dac862a8a3b9e39b038ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 12:38:29 +0000
Subject: [PATCH 053/321] zlib-ng: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix
index e4b51d4c8cf09..3f5e1c670c7ce 100644
--- a/pkgs/by-name/zl/zlib-ng/package.nix
+++ b/pkgs/by-name/zl/zlib-ng/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zlib-ng";
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "zlib-ng";
     rev = version;
-    hash = "sha256-Khmrhp5qy4vvoQe4WgoogpjWrgcUB/q8zZeqIydthYg=";
+    hash = "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=";
   };
 
   outputs = [

From d9fe0e52bbbf2e6447ed72f806cea3c34d258da7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 13:48:13 +0000
Subject: [PATCH 054/321] libxmlb: 0.3.22 -> 0.3.23

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

diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix
index e0d778528d5df..f611cae060d9d 100644
--- a/pkgs/by-name/li/libxmlb/package.nix
+++ b/pkgs/by-name/li/libxmlb/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libxmlb";
-  version = "0.3.22";
+  version = "0.3.23";
 
   outputs = [
     "out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "libxmlb";
     rev = version;
-    hash = "sha256-6S/4X6dYsVj9v98LoDJjir6Kmb5L8PloD23yvvkiD6o=";
+    hash = "sha256-hdF1yce9/ztXVV6BYocPGVAjoxJancID77rnHBJsKmM=";
   };
 
   patches = [

From d8e966caccba22c83200e6edadc8161f6c9ae8f8 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 8 Aug 2025 01:22:21 +0900
Subject: [PATCH 055/321] systemd: 257.7 -> 257.8

https://github.com/systemd/systemd/compare/v257.7...v257.8
Signed-off-by: misilelab <misileminecord@gmail.com>
---
 ....build-do-not-create-systemdstatedir.patch |  4 +-
 ...ail-when-the-same-file-is-updated-mu.patch | 57 -------------------
 ...> 0018-meson-Don-t-link-ssh-dropins.patch} |  2 +-
 ...it_file_exists_full-follow-symlinks.patch} |  0
 ...-NSCD-when-DNSSEC-validation-is-dis.patch} |  0
 pkgs/os-specific/linux/systemd/default.nix    | 14 ++---
 6 files changed, 8 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
 rename pkgs/os-specific/linux/systemd/{0019-meson-Don-t-link-ssh-dropins.patch => 0018-meson-Don-t-link-ssh-dropins.patch} (96%)
 rename pkgs/os-specific/linux/systemd/{0020-install-unit_file_exists_full-follow-symlinks.patch => 0019-install-unit_file_exists_full-follow-symlinks.patch} (100%)
 rename pkgs/os-specific/linux/systemd/{0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch => 0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch} (100%)

diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
index 76b85b8db6742..65cd257a8a418 100644
--- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
+++ b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
  1 file changed, 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 7ede6f7a96..90860be99a 100644
+index a4730f0570..b5aaecd669 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2795,7 +2795,6 @@ install_data('LICENSE.GPL2',
+@@ -2815,7 +2815,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  
diff --git a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
deleted file mode 100644
index 70c3f0ef5f26c..0000000000000
--- a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Wed, 19 Jun 2024 16:11:23 +0900
-Subject: [PATCH] bootctl: do not fail when the same file is updated multiple
- times
-
-In the second or later trial, copy_file_with_version_check() -> version_check()
-fails with -ESRCH. Let's ignore the failure.
-
-This also adds missing assertions in update_efi_boot_binaries(), and
-drop redundant version check in update_efi_boot_binaries(), as version
-will be anyway checked later.
-
-Fixes a regression caused by 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
-Fixes #33392.
----
- src/bootctl/bootctl-install.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
-index e15c2c6bed..5b4cff5d5e 100644
---- a/src/bootctl/bootctl-install.c
-+++ b/src/bootctl/bootctl-install.c
-@@ -329,6 +329,9 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
-         _cleanup_free_ char *p = NULL;
-         int r, ret = 0;
- 
-+        assert(esp_path);
-+        assert(source_path);
-+
-         r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
-         if (r == -ENOENT)
-                 return 0;
-@@ -354,19 +357,14 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
-                 if (r == 0)
-                         continue;
- 
--                r = get_file_version(fd, &v);
--                if (r == -ESRCH)
--                        continue;  /* No version information */
--                if (r < 0)
--                        return r;
--                if (!startswith(v, "systemd-boot "))
--                        continue;
--
-                 _cleanup_free_ char *dest_path = path_join(p, de->d_name);
-                 if (!dest_path)
-                         return log_oom();
- 
--                RET_GATHER(ret, copy_file_with_version_check(source_path, dest_path, /* force = */ false));
-+                r = copy_file_with_version_check(source_path, dest_path, /* force = */ false);
-+                if (IN_SET(r, -ESTALE, -ESRCH))
-+                        continue;
-+                RET_GATHER(ret, r);
-         }
- 
-         return ret;
diff --git a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
similarity index 96%
rename from pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
rename to pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
index 55d8f989e842a..da170d869ad75 100644
--- a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch
+++ b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 90860be99a..f021f76031 100644
+index b5aaecd669..91b23f2d72 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')
diff --git a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch
rename to pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
diff --git a/pkgs/os-specific/linux/systemd/0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
rename to pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d533b228f8830..4737878643159 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -195,7 +195,7 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
 
-  version = "257.7";
+  version = "257.8";
 
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
@@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "systemd";
     repo = "systemd";
     rev = "v${version}";
-    hash = "sha256-9OnjeMrfV5DSAoX/aetI4r/QLPYITUd2aOY0DYfkTzQ=";
+    hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -243,19 +243,15 @@ stdenv.mkDerivation (finalAttrs: {
     ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
     ./0017-meson.build-do-not-create-systemdstatedir.patch
 
-    # https://github.com/systemd/systemd/issues/33392
-    # https://github.com/systemd/systemd/pull/33400
-    ./0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
-
     # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
     # if the install prefix is not /usr, but that does not work for us
     # because we include the config snippet manually
-    ./0019-meson-Don-t-link-ssh-dropins.patch
+    ./0018-meson-Don-t-link-ssh-dropins.patch
 
-    ./0020-install-unit_file_exists_full-follow-symlinks.patch
+    ./0019-install-unit_file_exists_full-follow-symlinks.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
-    ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+    ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isPower64) [
     # Auto-detect ELF ABI instead of hardcoding ELFv2 for BPF build

From e58c9e7dd621a7d7216f8dd95be32840a46b18ec Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:19:00 +0200
Subject: [PATCH 056/321] e2fsprogs: move scripts to separate output

This enables us to use the bin and out output without pulling in bash.

- Enable structuredAttrs
- Enable strictDeps
- Add bash to disallowedRequisites
---
 pkgs/by-name/e2/e2fsprogs/package.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
index ab3649104b97d..338bf3b58fcdd 100644
--- a/pkgs/by-name/e2/e2fsprogs/package.nix
+++ b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -13,12 +13,16 @@
   e2fsprogs,
   runCommand,
   libarchive,
+  bash,
+  bashNonInteractive,
 }:
 
 stdenv.mkDerivation rec {
   pname = "e2fsprogs";
   version = "1.47.3";
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz";
     hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk=";
@@ -31,9 +35,12 @@ stdenv.mkDerivation rec {
     "out"
     "man"
     "info"
+    "scripts"
   ]
   ++ lib.optionals withFuse [ "fuse2fs" ];
 
+  strictDeps = true;
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     pkg-config
@@ -43,6 +50,7 @@ stdenv.mkDerivation rec {
     libuuid
     gettext
     libarchive
+    bash
   ]
   ++ lib.optionals withFuse [ fuse3 ];
 
@@ -75,6 +83,11 @@ stdenv.mkDerivation rec {
     if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
       mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
     fi
+
+    moveToOutput bin/mk_cmds "$scripts"
+    moveToOutput bin/compile_et "$scripts"
+    moveToOutput sbin/e2scrub "$scripts"
+    moveToOutput sbin/e2scrub_all "$scripts"
   ''
   + lib.optionalString withFuse ''
     mkdir -p $fuse2fs/bin
@@ -83,6 +96,17 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputChecks = {
+    bin.disallowedRequisites = [
+      bash
+      bashNonInteractive
+    ];
+    out.disallowedRequisites = [
+      bash
+      bashNonInteractive
+    ];
+  };
+
   passthru.tests = {
     simple-filesystem = runCommand "e2fsprogs-create-fs" { } ''
       mkdir -p $out

From 198dff9ed8e91d6f743dae51e6fdbf7712d3617e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 8 Aug 2025 21:15:30 +0100
Subject: [PATCH 057/321] s2n-tls: 1.5.23 -> 1.5.24

Changes: https://github.com/aws/s2n-tls/releases/tag/v1.5.24
---
 pkgs/by-name/s2/s2n-tls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index 175edbdd09cbf..46208585ee39d 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.5.23";
+  version = "1.5.24";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "s2n-tls";
     rev = "v${version}";
-    hash = "sha256-gg8JrkZ9W93sEQ4uEqCh+oaAqtUH+xAz4FdS0GD4F90=";
+    hash = "sha256-a5TJlxDj5B+fq8EUrlXtqGKtMC3S8PoIG2w12DTYVsc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 2342757c686873afe17954a5c218b05e8abdea20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 00:32:40 +0000
Subject: [PATCH 058/321] libxkbcommon: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix
index 399194e391ff6..5c0e5bd400d56 100644
--- a/pkgs/by-name/li/libxkbcommon_8/package.nix
+++ b/pkgs/by-name/li/libxkbcommon_8/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxkbcommon";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "xkbcommon";
     repo = "libxkbcommon";
     tag = "xkbcommon-${finalAttrs.version}";
-    hash = "sha256-rLh5BD9a0bI0nHtWX+n0LqmdIO5ykd98rNc5hAN3ndE=";
+    hash = "sha256-IV1dgGM8z44OQCQYQ5PiUUw/zAvG5IIxiBywYVw2ius=";
   };
 
   patches = [

From 43bd726e1bd532c8adeaf1c5e2606cee381acb6f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 9 Aug 2025 22:04:03 +0100
Subject: [PATCH 059/321] iproute2: 6.15.0 -> 6.16.0

Changes: https://lore.kernel.org/netdev/20250803143154.2d700ad4@hermes.local/
---
 pkgs/by-name/ip/iproute2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 254c37e6b4739..566dddcd3458e 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.15.0";
+  version = "6.16.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-gEGFSoglg61SY0ZnNsnIxox0saNXVKt3DSM0P5R1KPs=";
+    hash = "sha256-WQDMwV+aw797fq6B3rWTcSPfNemTR6fxGiKBhILwqNA=";
   };
 
   patches = [

From 5f2a2237d3f5c9b8823476a3c339ac4a0e5fad23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 22:18:57 +0000
Subject: [PATCH 060/321] mpg123: 1.33.0 -> 1.33.2

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

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index f5599a5de784e..8403a57e5fb57 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
 
 stdenv.mkDerivation rec {
   pname = "${lib.optionalString libOnly "lib"}mpg123";
-  version = "1.33.0";
+  version = "1.33.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
-    hash = "sha256-IpDjrt5vTRY+GhdFIWWvM8qtS18JSPmUKc+i2Dhfqp0=";
+    hash = "sha256-LFT6u/ppbc6PmxN8jvekKaBh+P5jPNfQpRGAmFXywhk=";
   };
 
   outputs = [

From c08ce34a7af8ab78e115d8b8baf19477071f073a Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 8 Aug 2025 13:39:47 +0200
Subject: [PATCH 061/321] linux: build scripts_gdb

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index c0c6713fc346a..b3cdd7d07c3da 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -325,6 +325,7 @@ lib.makeOverridable (
           "KBUILD_BUILD_VERSION=1-NixOS"
           kernelConf.target
           "vmlinux" # for "perf" and things like that
+          "scripts_gdb"
         ]
         ++ optional isModular "modules"
         ++ optionals buildDTBs [
@@ -432,6 +433,10 @@ lib.makeOverridable (
         postInstall = optionalString isModular ''
           mkdir -p $dev
           cp vmlinux $dev/
+
+          mkdir -p $dev/lib/modules/${modDirVersion}/build/scripts
+          cp -rL ../scripts/gdb/ $dev/lib/modules/${modDirVersion}/build/scripts
+
           if [ -z "''${dontStrip-}" ]; then
             installFlagsArray+=("INSTALL_MOD_STRIP=1")
           fi

From a1ab3bdb47f16cd1e96e0112e6a2f5a51b184bba Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Aug 2025 12:47:28 +0200
Subject: [PATCH 062/321] postgresql_18: disable NUMA test-case

While the functionality itself works, it is broken inside the sandbox
since NUMA information is exposed via sysfs which is not available in
the sandbox.
---
 pkgs/servers/sql/postgresql/generic.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 028722c5aff16..34714a51b7314 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -99,14 +99,7 @@ let
       gettext,
 
       # NUMA
-      numaSupport ?
-        lib.versionAtLeast version "18"
-        && lib.meta.availableOn stdenv.hostPlatform numactl
-        # NUMA can fail in 18beta2 on some hardware with:
-        # ERROR:  invalid NUMA node id outside of allowed range [0, 0]: 1
-        # https://github.com/NixOS/nixpkgs/pull/411958#issuecomment-3031680123
-        # https://www.postgresql.org/message-id/flat/E1u1tr8-003BbN-2E%40gemulon.postgresql.org
-        && version != "18beta2",
+      numaSupport ? lib.versionAtLeast version "18" && lib.meta.availableOn stdenv.hostPlatform numactl,
       numactl,
 
       # PAM
@@ -432,6 +425,17 @@ let
         substituteInPlace "src/Makefile.global.in" --subst-var out
         substituteInPlace "src/common/config_info.c" --subst-var dev
         cat ${./pg_config.env.mk} >> src/common/Makefile
+
+        # This test always fails on hardware with >1 NUMA node: the sysfs
+        # dirs providing information about the topology are hidden in the sandbox,
+        # so postgres assumes there's only a single node `0`. However,
+        # the test checks on which NUMA nodes the allocated pages are which is >1
+        # on such hardware. This in turn triggers a safeguard in the view
+        # which breaks the test.
+        # Manual tests confirm that the testcase behaves properly outside of the
+        # Nix sandbox.
+        substituteInPlace src/test/regress/parallel_schedule \
+          --replace-fail numa ""
       ''
       # This check was introduced upstream to prevent calls to "exit" inside libpq.
       # However, this doesn't work reliably with static linking, see this and following:

From 494a1b4a17e5cfe30cf436c61c98f30171577c02 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 28 Jul 2025 14:03:59 +0200
Subject: [PATCH 063/321] shadow: use /bin/sh as default shell

See the comment in the code for the reason why using /bin/sh instead of
the runtimeShell store path.

Drop the patch and substituteInPlace in postPatch as this is much easier
to maintain than a patch.

Ldap users should now set `loginShell` to
`/run/current-system/sw/bin/bash` if they want to retain bash as the
default shell. If this is not set, the default shell for logins will be
/bin/sh which can be "turned" into a normal interactive bash by typing
"bash".
---
 nixos/tests/sssd-ldap.nix                  |  1 +
 pkgs/by-name/sh/shadow/package.nix         | 11 ++++++-----
 pkgs/by-name/sh/shadow/runtime-shell.patch | 13 -------------
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/by-name/sh/shadow/runtime-shell.patch

diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index 9bc991f6ddcea..9d18ef64f39dd 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -99,6 +99,7 @@ import ./make-test-python.nix (
               objectClass: posixAccount
               userPassword: ${testPassword}
               homeDirectory: /home/${testUser}
+              loginShell: /run/current-system/sw/bin/bash
               uidNumber: 1234
               gidNumber: 1234
               cn: ""
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 43577e3280eab..1164d803d5305 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  runtimeShell,
   nixosTests,
   autoreconfHook,
   bison,
@@ -49,8 +48,6 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  RUNTIME_SHELL = runtimeShell;
-
   nativeBuildInputs = [
     autoreconfHook
     bison
@@ -74,13 +71,17 @@ stdenv.mkDerivation rec {
     ./keep-path.patch
     # Obtain XML resources from XML catalog (patch adapted from gtk-doc)
     ./respect-xml-catalog-files-var.patch
-    ./runtime-shell.patch
     ./fix-install-with-tcb.patch
   ];
 
-  # The nix daemon often forbids even creating set[ug]id files.
   postPatch = ''
+    # The nix daemon often forbids even creating set[ug]id files
     sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
+
+    # The default shell is not defined at build time of the package. It is
+    # decided at build time of the NixOS configration. Thus, don't decide this
+    # here but just point to the location of the shell on the system.
+    substituteInPlace configure.ac --replace-fail '$SHELL' /bin/sh
   '';
 
   # `AC_FUNC_SETPGRP' is not cross-compilation capable.
diff --git a/pkgs/by-name/sh/shadow/runtime-shell.patch b/pkgs/by-name/sh/shadow/runtime-shell.patch
deleted file mode 100644
index 0b2e68e330e40..0000000000000
--- a/pkgs/by-name/sh/shadow/runtime-shell.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e4c6aaec..03883ad7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -682,7 +682,7 @@ if test "$enable_utmpx" = "yes"; then
- 	          [Define if utmpx should be used])
- fi
- 
--AC_DEFINE_UNQUOTED(SHELL, ["$SHELL"], [The default shell.])
-+AC_DEFINE_UNQUOTED(SHELL, ["$RUNTIME_SHELL"], [The runtime shell.])
- 
- AM_GNU_GETTEXT_VERSION(0.16)
- AM_GNU_GETTEXT([external], [need-ngettext])

From 30f57ba9b9cbccf52cdb06b6b7ead5322bcae7b4 Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Fri, 8 Aug 2025 15:10:29 -0400
Subject: [PATCH 064/321] perl540Packages.DigestHMAC: 1.04 -> 1.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1c4a899c4dffe..ba3d3b091aed7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10713,10 +10713,10 @@ with self;
 
   DigestHMAC = buildPerlPackage {
     pname = "Digest-HMAC";
-    version = "1.04";
+    version = "1.05";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AR/ARODLAND/Digest-HMAC-1.04.tar.gz";
-      hash = "sha256-1ryBVqonXETXlLfBj0TNrEpYFAJFyVnmsZssODiwjtQ=";
+      url = "mirror://cpan/authors/id/A/AR/ARODLAND/Digest-HMAC-1.05.tar.gz";
+      hash = "sha256-IVy1nLphB0XPstSz+O91bVkOV+OteYapkuh8SWn83Ho=";
     };
     meta = {
       description = "Keyed-Hashing for Message Authentication";

From a734ea8f912b946a4e39eda0e4468d3a323e1fad Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Fri, 8 Aug 2025 15:03:20 -0400
Subject: [PATCH 065/321] perl540Packages.CryptURandom: 0.39 -> to 0.54

https://metacpan.org/release/DDICK/Crypt-URandom-0.54/source/Changes
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1c4a899c4dffe..1570c850be43d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7419,10 +7419,10 @@ with self;
 
   CryptURandom = buildPerlPackage {
     pname = "Crypt-URandom";
-    version = "0.39";
+    version = "0.54";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.39.tar.gz";
-      hash = "sha256-Jol7PPualWAJFRLWCHMaPVv08pn20Pj3LIXzmQEkQSI=";
+      url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.54.tar.gz";
+      hash = "sha256-SnPNOUkzMo2khKrrhkXXNbNUZd9gEJ5VngoosGYFOlc=";
     };
     meta = {
       description = "Provide non blocking randomness";

From da89a2d075f2279a09585c1b217b8f7382817339 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:57 +0200
Subject: [PATCH 066/321] libpcap: add separate lib output

This enables us to use the lib output without pulling in bash.

- Enable structuredAttrs
- Enable strictDeps
- Add bash to disallowedRequisites
---
 pkgs/by-name/li/libpcap/package.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libpcap/package.nix b/pkgs/by-name/li/libpcap/package.nix
index 1e77e33880843..4936b39c88339 100644
--- a/pkgs/by-name/li/libpcap/package.nix
+++ b/pkgs/by-name/li/libpcap/package.nix
@@ -4,6 +4,8 @@
   fetchurl,
   flex,
   bison,
+  bash,
+  bashNonInteractive,
   bluez,
   libnl,
   libxcrypt,
@@ -26,13 +28,25 @@ stdenv.mkDerivation rec {
   pname = "libpcap";
   version = "1.10.5";
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
     hash = "sha256-N87ZChmjAqfzLkWCJKAMNlwReQXCzTWsVEtogKgUiPA=";
   };
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [ libnl ] ++ lib.optionals withRemote [ libxcrypt ];
+  outputs = [
+    "out"
+    "lib"
+  ];
+
+  strictDeps = true;
+
+  buildInputs = [
+    bash
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libnl ]
+  ++ lib.optionals withRemote [ libxcrypt ];
 
   nativeBuildInputs = [
     flex
@@ -62,6 +76,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputChecks.lib.disallowedRequisites = [
+    bash
+    bashNonInteractive
+  ];
+
   passthru.tests = {
     inherit
       ettercap

From 6fda4f93ee26114d10d3a9869f1018812638be3f Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:57 +0200
Subject: [PATCH 067/321] linux-pam: move scripts to separate output

This enables us to use the lib and out output without pulling in bash.

- Enable structuredAttrs
- Enable strictDeps
- Add bash to disallowedRequisites
---
 pkgs/by-name/li/linux-pam/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 3d41329f27014..5cc358a92025f 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -9,6 +9,8 @@
   ninja,
   audit,
   libxcrypt,
+  bash,
+  bashNonInteractive,
   nixosTests,
   meson,
   pkg-config,
@@ -31,8 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "linux-pam";
     tag = "v${finalAttrs.version}";
     hash = "sha256-kANcwxifQz2tYPSrSBSFiYNTm51Gr10L/zroCqm8ZHQ=";
+
   };
 
+  __structuredAttrs = true;
+
   # patching unix_chkpwd is required as the nix store entry does not have the necessary bits
   postPatch = ''
     substituteInPlace modules/module-meson.build \
@@ -43,9 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "doc"
     "man"
+    "scripts"
     # "modules"
   ];
 
+  strictDeps = true;
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     flex
@@ -65,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     db4
     libxcrypt
+    bash
   ]
   ++ lib.optionals stdenv.buildPlatform.isLinux [
     audit
@@ -89,8 +98,18 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "examples" false)
   ];
 
+  postInstall = ''
+    moveToOutput sbin/pam_namespace_helper $scripts
+    moveToOutput etc/security/namespace.init $scripts
+  '';
+
   doCheck = false; # fails
 
+  outputChecks.out.disallowedRequisites = [
+    bash
+    bashNonInteractive
+  ];
+
   passthru = {
     tests = {
       inherit (nixosTests)

From 8c8d4b0eea464f661faaa53283de3f9a6b96c3e0 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:58 +0200
Subject: [PATCH 068/321] lvm2: move scripts to separate output

This enables us to use the lib and bin output without pulling in bash.

- Enable structuredAttrs
- Enable strictDeps
- Add bash to disallowedRequisites
---
 pkgs/os-specific/linux/lvm2/common.nix | 54 +++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index cc612e8ddaf84..371b4c7aa0a38 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -8,6 +8,8 @@
   coreutils,
   libuuid,
   libaio,
+  bash,
+  bashNonInteractive,
   replaceVars,
   enableCmdlib ? false,
   enableDmeventd ? false,
@@ -39,6 +41,8 @@ stdenv.mkDerivation rec {
     + lib.optionalString enableVDO "-with-vdo";
   inherit version;
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     urls = [
       "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"
@@ -47,9 +51,12 @@ stdenv.mkDerivation rec {
     inherit hash;
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals udevSupport [ udevCheckHook ];
   buildInputs = [
     libaio
+    bash
   ]
   ++ lib.optionals udevSupport [
     udev
@@ -70,12 +77,20 @@ stdenv.mkDerivation rec {
     "--with-systemd-run=/run/current-system/systemd/bin/systemd-run"
     "--with-default-profile-subdir=profile.d"
   ]
-  ++ lib.optionals (!enableCmdlib && !onlyLib) [
-    "--bindir=${placeholder "bin"}/bin"
-    "--sbindir=${placeholder "bin"}/bin"
-    "--libdir=${placeholder "lib"}/lib"
-    "--with-libexecdir=${placeholder "lib"}/libexec"
-  ]
+  ++ lib.optionals (!onlyLib) (
+    if enableCmdlib then
+      [
+        "--bindir=${placeholder "out"}/bin"
+        "--sbindir=${placeholder "out"}/bin"
+      ]
+    else
+      [
+        "--bindir=${placeholder "bin"}/bin"
+        "--sbindir=${placeholder "bin"}/bin"
+        "--libdir=${placeholder "lib"}/lib"
+        "--with-libexecdir=${placeholder "lib"}/libexec"
+      ]
+  )
   ++ lib.optional enableCmdlib "--enable-cmdlib"
   ++ lib.optionals enableDmeventd [
     "--enable-dmeventd"
@@ -92,6 +107,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals enableVDO [
     "--enable-vdo"
+    "--with-vdo-format=${vdo}/bin/vdoformat"
   ]
   ++ lib.optionals stdenv.hostPlatform.isStatic [
     "--enable-static_link"
@@ -173,15 +189,35 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (!onlyLib) [
     "dev"
     "man"
+    "scripts"
   ]
   ++ lib.optionals (!onlyLib && !enableCmdlib) [
     "bin"
     "lib"
   ];
 
-  postInstall = lib.optionalString (enableCmdlib != true) ''
-    moveToOutput lib/libdevmapper.so $lib
-  '';
+  postInstall =
+    lib.optionalString (!onlyLib) ''
+      moveToOutput bin/fsadm $scripts
+      moveToOutput bin/blkdeactivate $scripts
+      moveToOutput bin/lvmdump $scripts
+      moveToOutput bin/lvm_import_vdo $scripts
+      moveToOutput libexec/lvresize_fs_helper $scripts/lib
+    ''
+    + lib.optionalString (!enableCmdlib) ''
+      moveToOutput lib/libdevmapper.so $lib
+    '';
+
+  outputChecks = lib.optionalString (!enableVDO) {
+    out.disallowedRequisites = [
+      bash
+      bashNonInteractive
+    ];
+    lib.disallowedRequisites = [
+      bash
+      bashNonInteractive
+    ];
+  };
 
   passthru.tests = {
     installer = nixosTests.installer.lvm;

From 7440b16b7ea1a9d2d58d878cb279d3e6ecb8d4dc Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:59 +0200
Subject: [PATCH 069/321] krb5: move all binaries to out

This enables us to use the lib output without pulling in bash.

- Enable structuredAttrs
- Enable strictDeps
- Add bash to disallowedRequisites
---
 pkgs/development/libraries/kerberos/krb5.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index c150100eba21e..790efc6865efc 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -6,6 +6,7 @@
   byacc, # can also use bison, but byacc has fewer dependencies
   keyutils,
   openssl,
+  bashNonInteractive,
   perl,
   pkg-config,
 
@@ -34,6 +35,8 @@ stdenv.mkDerivation rec {
   pname = "krb5";
   version = "1.21.3";
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz";
     hash = "sha256-t6TNXq1n+wi5gLIavRUP9yF+heoyDJ7QxtrdMEhArTU=";
@@ -73,6 +76,8 @@ stdenv.mkDerivation rec {
     "ac_cv_printf_positional=yes"
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     byacc
     perl
@@ -83,6 +88,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
+    bashNonInteractive # cannot use bashInteractive because of a dependency cycle
   ]
   ++ lib.optionals (
     stdenv.hostPlatform.isLinux
@@ -116,7 +122,7 @@ stdenv.mkDerivation rec {
   # options don't give us enough granularity to specify that, so we have to override the generated
   # Makefiles manually.
   postConfigure = ''
-    find $libFolders -type f -name Makefile -print0 | while IFS= read -rd "" f; do
+    find "''${libFolders[@]}" -type f -name Makefile -print0 | while IFS= read -rd "" f; do
       substituteInPlace "$f" --replace-fail "$out" "$lib"
     done
   '';
@@ -125,9 +131,11 @@ stdenv.mkDerivation rec {
     mkdir -p "$lib"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}}
   '';
 
-  # not via outputBin, due to reference from libkrb5.so
   postInstall = ''
+    # not via outputBin, due to reference from libkrb5.so
     moveToOutput bin/krb5-config "$dev"
+    moveToOutput sbin/krb5-send-pr "$out"
+    moveToOutput bin/compile_et "$out"
   '';
 
   # Disable _multioutDocs in stdenv by overriding it to be a no-op.
@@ -141,6 +149,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   doCheck = false; # fails with "No suitable file for testing purposes"
 
+  outputChecks.lib.disallowedRequisites = [
+    # bash cannot be here because of a dependency cycle
+    bashNonInteractive
+  ];
+
   meta = with lib; {
     description = "MIT Kerberos 5";
     homepage = "http://web.mit.edu/kerberos/";

From 4049a3645f99f1e344d388e9afd730b8673e9063 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 4 Aug 2025 23:52:00 +0200
Subject: [PATCH 070/321] kbd: do not compress by default

Removes the dependency on bash.

Increases the binary size by 2.3MiB. However, with the 9MiB saved
by removing the excessive dictionary from cracklib (#429797), this still
results in a net reduction of the mandatory closure size.

Once kbd allows using the compression libraries instead of shelling out
to the binaries (github.com/legionus/kbd/issues/138) we can compress by
default again.

Add the package `kbdCompressed` for users that want to load custom
compressed fonts and keymaps. Alternatively, they can still uncompress
custom fonts and keymaps themselves and then call loadkeys/setfont on
it.
---
 pkgs/by-name/kb/kbd/package.nix | 25 +++++++++++++++++++------
 pkgs/top-level/all-packages.nix |  4 ++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index ff4a1c3403fdb..09d694330a2d9 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -9,6 +9,7 @@
   check,
   pam,
   bash,
+  bashNonInteractive,
   coreutils,
   gzip,
   bzip2,
@@ -16,12 +17,15 @@
   zstd,
   gitUpdater,
   withVlock ? true,
+  compress ? false,
 }:
 
 stdenv.mkDerivation rec {
   pname = "kbd";
   version = "2.8.0";
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
     hash = "sha256-AfWAbafR009ZS3sqauGrIyFTRM8QZOjtzTqQ/vl3ahE=";
@@ -48,6 +52,9 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
+  ]
+  ++ lib.optionals (!compress) [
+    "--disable-compress"
   ];
 
   patches = [
@@ -67,18 +74,19 @@ stdenv.mkDerivation rec {
     mv colemak/{en-latin9,colemak}.map
     popd
 
+    sed -i '
+      1i prefix:=$(vlock)
+      1i bindir := $(vlock)/bin' \
+      src/vlock/Makefile.in \
+      src/vlock/Makefile.am
+  ''
+  + lib.optionalString compress ''
     # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`.
     substituteInPlace src/libkbdfile/kbdfile.c \
       --replace-fail 'gzip '  '${gzip}/bin/gzip ' \
       --replace-fail 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \
       --replace-fail 'xz '    '${xz.bin}/bin/xz ' \
       --replace-fail 'zstd '  '${zstd.bin}/bin/zstd '
-
-    sed -i '
-      1i prefix:=$(vlock)
-      1i bindir := $(vlock)/bin' \
-      src/vlock/Makefile.in \
-      src/vlock/Makefile.am
   '';
 
   enableParallelBuilding = true;
@@ -105,6 +113,11 @@ stdenv.mkDerivation rec {
   ];
   strictDeps = true;
 
+  outputChecks.out.disallowedRequisites = lib.optionals (!compress) [
+    bash
+    bashNonInteractive
+  ];
+
   passthru.tests = {
     inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47117587a8c92..2b4ea089eabdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12544,6 +12544,10 @@ with pkgs;
 
   kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
 
+  kbdCompressed = callPackage ../by-name/kb/kbd/package.nix {
+    compress = true;
+  };
+
   kexi = libsForQt5.callPackage ../applications/office/kexi { };
 
   kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };

From 5211a3ecb262a319233da0ff21bfb3d78f3bcae8 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:57 +0200
Subject: [PATCH 071/321] iptables: add separate lib output

This enables us to use the lib output without pulling in bash.

- Enable structuredAttrs
- Enable strictDeps
- Add bash to disallowedRequisites
---
 pkgs/os-specific/linux/iptables/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index aebb616eb39da..d9f2ee61c2663 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -12,6 +12,8 @@
   libnfnetlink,
   libnftnl,
   libpcap,
+  bash,
+  bashNonInteractive,
   nftablesCompat ? true,
   gitUpdater,
 }:
@@ -20,6 +22,8 @@ stdenv.mkDerivation rec {
   version = "1.8.11";
   pname = "iptables";
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
     sha256 = "2HMD1V74ySvK1N0/l4sm0nIBNkKwKUJXdfW60QCf57I=";
@@ -27,10 +31,13 @@ stdenv.mkDerivation rec {
 
   outputs = [
     "out"
+    "lib"
     "dev"
     "man"
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -45,6 +52,7 @@ stdenv.mkDerivation rec {
     libnfnetlink
     libnftnl
     libpcap
+    bash
   ];
 
   configureFlags = [
@@ -68,6 +76,11 @@ stdenv.mkDerivation rec {
     ln -sv xtables-nft-multi $out/bin/ip6tables-save
   '';
 
+  outputChecks.lib.disallowedRequisites = [
+    bash
+    bashNonInteractive
+  ];
+
   passthru = {
     updateScript = gitUpdater {
       url = "https://git.netfilter.org/iptables";

From c70f154403d7e7e6a655731e0d8a166fa3dd3a70 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Fri, 8 Aug 2025 22:37:17 +0200
Subject: [PATCH 072/321] systemd: remove iptables dependency

Since https://github.com/systemd/systemd/pull/17026 (v248 in 2020),
systemd can use nftables without any new dependency!

In 259, systemd plans to remove iptables suport altogether.
---
 pkgs/os-specific/linux/systemd/default.nix | 4 +---
 pkgs/top-level/all-packages.nix            | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 1a29a6306c9ac..07220bbac729e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -114,7 +114,6 @@
   withHostnamed ? true,
   withHwdb ? true,
   withImportd ? !stdenv.hostPlatform.isMusl,
-  withIptables ? true,
   withKmod ? true,
   withLibBPF ?
     lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0"
@@ -427,7 +426,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional withKmod kmod
   ++ lib.optional withLibidn2 libidn2
   ++ lib.optional withLibseccomp libseccomp
-  ++ lib.optional withIptables iptables
   ++ lib.optional withPam pam
   ++ lib.optional withPCRE2 pcre2
   ++ lib.optional withSelinux libselinux
@@ -566,7 +564,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "libcurl" wantCurl)
     (lib.mesonEnable "libidn" false)
     (lib.mesonEnable "libidn2" withLibidn2)
-    (lib.mesonEnable "libiptc" withIptables)
+    (lib.mesonEnable "libiptc" false)
     (lib.mesonEnable "repart" withRepart)
     (lib.mesonEnable "sysupdate" withSysupdate)
     (lib.mesonEnable "sysupdated" withSysupdate)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b4ea089eabdb..328f4410a49bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11099,7 +11099,6 @@ with pkgs;
     withHomed = false;
     withHwdb = false;
     withImportd = false;
-    withIptables = false;
     withLibBPF = false;
     withLibidn2 = false;
     withLocaled = false;

From 4f4f18b9bb2c1de74137812d6738ab794d950664 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:56 +0200
Subject: [PATCH 073/321] systemd: set debug-shell to upstream default /bin/sh

Using the ambient /bin/sh makes sense to use as the debug shell because
it's inherently something from the environment.

Some years ago this was changed to an explicit Nix Store path. However,
this doesn't really make sense and makes many things (like optionally
removing bash from the system) hard while not making anything easier or
better.
---
 pkgs/os-specific/linux/systemd/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 07220bbac729e..ea84ed9dcbfc8 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -464,11 +464,14 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "version-tag" version)
     (lib.mesonOption "mode" "release")
     (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
-    (lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash")
     (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
     (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d")
     (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
 
+    # /bin/sh is also the upstream default. Explicitly set this so that we're
+    # independent of upstream changes to the default.
+    (lib.mesonOption "debug-shell" "/bin/sh")
+
     # Attempts to check /usr/sbin and that fails in macOS sandbox because
     # permission is denied. If /usr/sbin is not a symlink, it defaults to true.
     # We set it to false since stdenv moves sbin/* to bin and creates a symlink,

From 9ddad561cce6340172a3857de6249a3d81dd3f36 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:18:57 +0200
Subject: [PATCH 074/321] systemd: remove bashInteractive

The only thing that needed bashInteractive were bash scripts for RPM.
Remove the RPM scripts (we definitely do not need) to get rid of
bashInteractive.
---
 pkgs/os-specific/linux/systemd/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ea84ed9dcbfc8..5cf58f5ccbe80 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -63,7 +63,6 @@
   libseccomp,
   withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools,
   kexec-tools,
-  bashInteractive,
   bash,
   libmicrohttpd,
   libfido2,
@@ -400,7 +399,6 @@ stdenv.mkDerivation (finalAttrs: {
     (if withPam then libcap else libcap.override { usePam = false; })
     libuuid
     linuxHeaders
-    bashInteractive # for patch shebangs
   ]
 
   ++ lib.optionals withGcrypt [
@@ -518,6 +516,10 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "sshconfdir" "")
     (lib.mesonOption "sshdconfdir" "no")
 
+    # RPM
+    # This stops building/installing RPM specific tools.
+    (lib.mesonOption "rpmmacrosdir" "no")
+
     # Features
 
     # Tests

From 294b2f54afb46198e382ffd941595bcbe0a137eb Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Tue, 5 Aug 2025 00:09:51 +0200
Subject: [PATCH 075/321] systemd: add bash to disallowedRequisites

---
 pkgs/os-specific/linux/systemd/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 5cf58f5ccbe80..5e1585164c5c5 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -64,6 +64,7 @@
   withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools,
   kexec-tools,
   bash,
+  bashNonInteractive,
   libmicrohttpd,
   libfido2,
   p11-kit,
@@ -908,6 +909,11 @@ stdenv.mkDerivation (finalAttrs: {
         )
       );
 
+  disallowedRequisites = [
+    bash
+    bashNonInteractive
+  ];
+
   passthru = {
     # The `interfaceVersion` attribute below points out the incompatibilities
     # between systemd versions. When the new systemd build is

From f974948e56948c1de3dabcc169d1b5b623db5041 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 11 Aug 2025 06:19:59 +0100
Subject: [PATCH 076/321] glib: 2.84.3 -> 2.84.4

Changes: https://gitlab.gnome.org/GNOME/glib/-/blob/2.84.4/NEWS?ref_type=tags
---
 pkgs/by-name/gl/glib/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 763bb75f69560..99e289918ecd4 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -74,7 +74,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.84.3";
+  version = "2.84.4";
 
   outputs = [
     "bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qk+HwyJb9XyoXzIIiPdISQGheTTKNwI8O9hDWnLbhj4=";
+    hash = "sha256-ip6hCUPDb8EX4lP4DJHkd7ZzUlrkV2KUKFiu9XYxu5A=";
   };
 
   patches =

From 5c1643066dd6352a9cb2c86fa0a60b98e74d7bd7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 11:57:05 +0300
Subject: [PATCH 077/321] scikit-build-core: Add setup hook to handle cmake
 flags

---
 .../scikit-build-core/append-cmakeFlags.sh     | 18 ++++++++++++++++++
 .../scikit-build-core/default.nix              |  3 +++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh

diff --git a/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh b/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh
new file mode 100644
index 0000000000000..30b05ff99daf5
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-build-core/append-cmakeFlags.sh
@@ -0,0 +1,18 @@
+scikitBuildFlagsHook() {
+  OLD_IFS="$IFS"
+  IFS=';'
+
+  local args=()
+  if [[ -n "$SKBUILD_CMAKE_ARGS" ]]; then
+    read -ra existing_args <<< "$SKBUILD_CMAKE_ARGS"
+    args+=("${existing_args[@]}")
+  fi
+  args+=($cmakeFlags)
+  args+=("${cmakeFlagsArray[@]}")
+  export SKBUILD_CMAKE_ARGS="${args[*]}"
+
+  IFS="$OLD_IFS"
+  unset OLD_IFS
+}
+
+preConfigureHooks+=(scikitBuildFlagsHook)
diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index d4f73945c8be8..6cf05ed16ac78 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -75,6 +75,9 @@ buildPythonPackage rec {
 
   # cmake is only used for tests
   dontUseCmakeConfigure = true;
+  setupHooks = [
+    ./append-cmakeFlags.sh
+  ];
 
   disabledTestMarks = [
     "isolated"

From 8d9afa0e85faf27a66897647343b1b7b279de0d3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:02:40 +0300
Subject: [PATCH 078/321] python3Packages.units-llnl: set cmakeFlags directly

Using scikit-build-core's setup hook.
---
 .../development/python-modules/units-llnl/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/units-llnl/default.nix b/pkgs/development/python-modules/units-llnl/default.nix
index 03d0cfda1515f..f04d3c73f7f28 100644
--- a/pkgs/development/python-modules/units-llnl/default.nix
+++ b/pkgs/development/python-modules/units-llnl/default.nix
@@ -36,14 +36,9 @@ buildPythonPackage {
     ninja
   ];
   dontUseCmakeConfigure = true;
-  env = {
-    SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" (
-      cmakeFlags
-      ++ [
-        (lib.cmakeBool "UNITS_BUILD_PYTHON_LIBRARY" true)
-      ]
-    );
-  };
+  cmakeFlags = cmakeFlags ++ [
+    (lib.cmakeBool "UNITS_BUILD_PYTHON_LIBRARY" true)
+  ];
 
   # Also upstream turns off testing for the python build so it seems, see:
   # https://github.com/LLNL/units/blob/v0.13.1/pyproject.toml#L65-L66 However

From 9daeaddf2c2e6630a485caa77ade172204c7c6c2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:03:40 +0300
Subject: [PATCH 079/321] python3Packages.llama-cpp-python: set cmakeFlags
 directly

Using scikit-build-core's setup hook.
---
 .../llama-cpp-python/default.nix              | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 045414400682c..02eaa3817004e 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   # src = /home/gaetan/llama-cpp-python;
 
   dontUseCmakeConfigure = true;
-  SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" (
+  cmakeFlags = [
     # Set GGML_NATIVE=off. Otherwise, cmake attempts to build with
     # -march=native* which is either a no-op (if cc-wrapper is able to ignore
     # it), or an attempt to build a non-reproducible binary.
@@ -61,16 +61,14 @@ buildPythonPackage rec {
     # -mcpu, breaking linux build as follows:
     #
     # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’
-    [
-      "-DGGML_NATIVE=off"
-      "-DGGML_BUILD_NUMBER=1"
-    ]
-    ++ lib.optionals cudaSupport [
-      "-DGGML_CUDA=on"
-      "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}"
-      "-DCMAKE_CUDA_COMPILER=${lib.getExe cudaPackages.cuda_nvcc}"
-    ]
-  );
+    "-DGGML_NATIVE=off"
+    "-DGGML_BUILD_NUMBER=1"
+  ]
+  ++ lib.optionals cudaSupport [
+    "-DGGML_CUDA=on"
+    "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}"
+    "-DCMAKE_CUDA_COMPILER=${lib.getExe cudaPackages.cuda_nvcc}"
+  ];
 
   enableParallelBuilding = true;
 

From d3a5ae5f84693329db94c2be04f7d60756358908 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:07:17 +0300
Subject: [PATCH 080/321] python3Packages.islpy: use cmakeFlags instead of
 pypaBuildFlags

Possible using scikit-build-core's setup hook
---
 pkgs/development/python-modules/islpy/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix
index 9ccafe8c6c5eb..b84b5d3bb998f 100644
--- a/pkgs/development/python-modules/islpy/default.nix
+++ b/pkgs/development/python-modules/islpy/default.nix
@@ -47,12 +47,12 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
-  pypaBuildFlags = [
-    "--config-setting=cmake.define.USE_SHIPPED_ISL=OFF"
-    "--config-setting=cmake.define.USE_SHIPPED_IMATH=OFF"
-    "--config-setting=cmake.define.USE_BARVINOK=OFF"
-    "--config-setting=cmake.define.ISL_INC_DIRS:LIST='${lib.getDev isl}/include'"
-    "--config-setting=cmake.define.ISL_LIB_DIRS:LIST='${lib.getLib isl}/lib'"
+  cmakeFlags = [
+    "-DUSE_SHIPPED_ISL=OFF"
+    "-DUSE_SHIPPED_IMATH=OFF"
+    "-DUSE_BARVINOK=OFF"
+    "-DISL_INC_DIRS:LIST='${lib.getDev isl}/include'"
+    "-DISL_LIB_DIRS:LIST='${lib.getLib isl}/lib'"
   ];
 
   # Force resolving the package from $out to make generated ext files usable by tests

From 4fb21651935d1154a3cb07114b5838ef6be46fc9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:10:19 +0300
Subject: [PATCH 081/321] python3Packages.lightgbm: use cmakeFlags directly

Possible using scikit-build-core's setup hook.
---
 pkgs/development/python-modules/lightgbm/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index f30739159a8a3..a1d1b3663c291 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -87,9 +87,10 @@ buildPythonPackage rec {
     scipy
   ];
 
-  pypaBuildFlags =
-    lib.optionals gpuSupport [ "--config-setting=cmake.define.USE_GPU=ON" ]
-    ++ lib.optionals cudaSupport [ "--config-setting=cmake.define.USE_CUDA=ON" ];
+  cmakeFlags = [
+    (lib.cmakeBool "USE_GPU" gpuSupport)
+    (lib.cmakeBool "USE_CUDA" cudaSupport)
+  ];
 
   optional-dependencies = {
     arrow = [

From 58495d4096414bc6b1e9fb3925cee524526ee71b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:11:15 +0300
Subject: [PATCH 082/321] python3Packages.fenics-basix: switch to cmakeFlags
 from CMAKE_ARGS

Possible using scikit-build-core's setup hook.
---
 .../python-modules/fenics-basix/default.nix            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fenics-basix/default.nix b/pkgs/development/python-modules/fenics-basix/default.nix
index d48c7082805d5..4d4d10b5c583b 100644
--- a/pkgs/development/python-modules/fenics-basix/default.nix
+++ b/pkgs/development/python-modules/fenics-basix/default.nix
@@ -52,10 +52,12 @@ buildPythonPackage rec {
     lapack
   ];
 
-  # Prefer finding BLAS and LAPACK via pkg-config.
-  # Avoid using the Accelerate.framework from the Darwin SDK.
-  # Also, avoid mistaking BLAS for LAPACK.
-  env.CMAKE_ARGS = lib.cmakeBool "BLA_PREFER_PKGCONFIG" true;
+  cmakeFlags = [
+    # Prefer finding BLAS and LAPACK via pkg-config.
+    # Avoid using the Accelerate.framework from the Darwin SDK.
+    # Also, avoid mistaking BLAS for LAPACK.
+    (lib.cmakeBool "BLA_PREFER_PKGCONFIG" true)
+  ];
 
   pythonImportsCheck = [
     "basix"

From 404fd115a028a82fbec893d7745907df9964e881 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:12:52 +0300
Subject: [PATCH 083/321] python3Packages.pillow-jpls: Use cmakeFlags

Possible using scikit-build-core's setup hook.
---
 pkgs/development/python-modules/pillow-jpls/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix
index 0d54ab62d5741..9f7ae858a90d4 100644
--- a/pkgs/development/python-modules/pillow-jpls/default.nix
+++ b/pkgs/development/python-modules/pillow-jpls/default.nix
@@ -65,9 +65,8 @@ buildPythonPackage rec {
     pyproject-metadata
   ];
 
-  pypaBuildFlags = [
-    "-C"
-    "cmake.args=--preset=sysdeps"
+  cmakeFlags = [
+    "--preset=sysdeps"
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 8e06eb1e30ad76aefdf5c570ada9790835278dee Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 7 Aug 2025 12:15:07 +0300
Subject: [PATCH 084/321] python3Packages.soxr: use cmakeFlags

Possible using scikit-build-core's setup hook.
---
 pkgs/development/python-modules/soxr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index a090b6d24bd25..202c800e1b9f1 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -46,8 +46,8 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
-  pypaBuildFlags = [
-    "--config-setting=cmake.define.USE_SYSTEM_LIBSOXR=ON"
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_LIBSOXR" true)
   ];
 
   build-system = [

From 35556ae41ce8a3ce5a07eaf062644761df4e4069 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 11 Aug 2025 17:20:08 -0700
Subject: [PATCH 085/321] libxmlxx3: run nix fmt

An old PR was merged which introduced formatting that fails lints
https://github.com/NixOS/nixpkgs/pull/354190
---
 pkgs/development/libraries/libxmlxx/v3.nix | 56 +++++++++++-----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index 5dabe98bd711b..9e6398228bcff 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -32,36 +32,34 @@ stdenv.mkDerivation rec {
     hash = "sha256-DJs4G1qD1rOrSwuGXXJW2rJ9V1mBtjvi+Fnty5TaWcc=";
   };
 
-  outputs =
-    [
-      "out"
-      "dev"
-    ]
-    ++ lib.lists.optionals withDocumentation [
-      "doc"
-      "devdoc"
-    ];
+  outputs = [
+    "out"
+    "dev"
+  ]
+  ++ lib.lists.optionals withDocumentation [
+    "doc"
+    "devdoc"
+  ];
 
-  nativeBuildInputs =
-    [
-      ninja
-      meson
-      pkg-config
-    ]
-    ++ lib.lists.optionals withDocumentation [
-      perl
-      doxygen
-      libxslt
-      graphviz
-    ]
-    ++ lib.lists.optionals withManual [
-      docbook5
-      docbook-xsl-ns
-    ]
-    ++ lib.lists.optional withPDF [
-      fop
-      dblatex
-    ];
+  nativeBuildInputs = [
+    ninja
+    meson
+    pkg-config
+  ]
+  ++ lib.lists.optionals withDocumentation [
+    perl
+    doxygen
+    libxslt
+    graphviz
+  ]
+  ++ lib.lists.optionals withManual [
+    docbook5
+    docbook-xsl-ns
+  ]
+  ++ lib.lists.optional withPDF [
+    fop
+    dblatex
+  ];
 
   buildInputs = [ glibmm ];
 

From 899c40e6f8ed0baee363a7a5d3be39241a40a1b7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 11 Aug 2025 20:25:57 +0200
Subject: [PATCH 086/321] stdenv: remove .attrs.sh fallback for structuredAttrs

This was eventually fixed in Nix 2.16+. More discussion in #357053.
---
 pkgs/build-support/testers/expect-failure.sh |  2 +-
 pkgs/stdenv/generic/make-derivation.nix      |  2 +-
 pkgs/stdenv/generic/setup.sh                 | 12 +-----------
 pkgs/stdenv/generic/source-stdenv.sh         |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh
index 08199191be7d9..113fe46857cda 100644
--- a/pkgs/build-support/testers/expect-failure.sh
+++ b/pkgs/build-support/testers/expect-failure.sh
@@ -41,7 +41,7 @@ echo "testBuildFailure: Original builder produced exit code: $r"
 #
 # NOTE: This MUST be done after the original builder has finished!
 #       Otherwise we could pollute its environment.
-if [ -e "${NIX_ATTRS_SH_FILE:-}" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
+if [ -e "${NIX_ATTRS_SH_FILE:-}" ]; then . "$NIX_ATTRS_SH_FILE"; fi
 
 # Variables injected by replaceVars
 #
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index aed866aa454b9..d092543672cc3 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -847,7 +847,7 @@ let
               "-c"
               ''
                 out="${placeholder "out"}"
-                if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
+                if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi
                 declare -p > $out
                 for var in $passAsFile; do
                     pathVar="''${var}Path"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5aebafc157491..f051ae6c7d44e 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -25,7 +25,7 @@ if [[ ${NIX_DEBUG:-0} -ge 6 ]]; then
     set -x
 fi
 
-if [ -f .attrs.sh ] || [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then
+if [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then
     __structuredAttrs=1
     echo "structuredAttrs is enabled"
 
@@ -33,16 +33,6 @@ if [ -f .attrs.sh ] || [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then
         # ex: out=/nix/store/...
         export "$outputName=${outputs[$outputName]}"
     done
-
-    # $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox
-    # https://github.com/NixOS/nix/issues/6736; please keep around until the
-    # fix reaches *every patch version* that's >= lib/minver.nix
-    if ! [[ -e "${NIX_ATTRS_JSON_FILE:-}" ]]; then
-        export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json"
-    fi
-    if ! [[ -e "${NIX_ATTRS_SH_FILE:-}" ]]; then
-        export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh"
-    fi
 else
     __structuredAttrs=
     : "${outputs:=out}"
diff --git a/pkgs/stdenv/generic/source-stdenv.sh b/pkgs/stdenv/generic/source-stdenv.sh
index 44318cd236912..1e8cbe68e9dfd 100644
--- a/pkgs/stdenv/generic/source-stdenv.sh
+++ b/pkgs/stdenv/generic/source-stdenv.sh
@@ -1,3 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
+if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi
 source "$stdenv/setup"
 source "$1"

From a30cf31051307a852a4cb5ec2546d400e718e998 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 12 Aug 2025 10:40:33 -0700
Subject: [PATCH 087/321] vim: 9.1.1566 -> 9.1.1623

Changes: https://github.com/vim/vim/compare/v9.1.1566...v9.1.1623
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 61ff8b7d877ff..fdec78c8acd45 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.1566";
+  version = "9.1.1623";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-/hzyjFGjl8Wu9tHtFgnnHtGbcJ5AIjCMUNCScrdIgwU=";
+    hash = "sha256-T7epi6ex9AU4iV/ClSeKlK3T0V0WajiVxnDVevkqaw8=";
   };
 
   enableParallelBuilding = true;

From def9ecde939309ac0e3020a6d1333bb3a6cc1a1a Mon Sep 17 00:00:00 2001
From: Josh Hoffer <jhoffer@sansorgan.es>
Date: Tue, 12 Aug 2025 10:27:16 -0700
Subject: [PATCH 088/321] audiofile: add many CVE patches

Patch the following CVEs using debian patches.

* CVE-2018-13440
* CVE-2018-17095
* CVE-2022-24599
* CVE-2019-13147
---
 pkgs/by-name/au/audiofile/package.nix | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/audiofile/package.nix b/pkgs/by-name/au/audiofile/package.nix
index de5ce22b017a1..04233447d4713 100644
--- a/pkgs/by-name/au/audiofile/package.nix
+++ b/pkgs/by-name/au/audiofile/package.nix
@@ -16,7 +16,7 @@ let
     }:
     fetchpatch {
       inherit sha256 name;
-      url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-4/debian/patches/${debname}";
+      url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-7/debian/patches/${debname}";
     };
 
 in
@@ -97,6 +97,31 @@ stdenv.mkDerivation rec {
       debname = "10_Check-for-division-by-zero-in-BlockCodec-runPull.patch";
       sha256 = "1rlislkjawq98bbcf1dgl741zd508wwsg85r37ca7pfdf6wgl6z7";
     })
+    (fetchDebianPatch {
+      name = "CVE-2018-13440.patch";
+      debname = "11_CVE-2018-13440.patch";
+      sha256 = "sha256-qDfjiBJ4QXgn8588Ra1X0ViH0jBjtFS/+2zEGIUIhuo=";
+    })
+    (fetchDebianPatch {
+      name = "CVE-2018-17095.patch";
+      debname = "12_CVE-2018-17095.patch";
+      sha256 = "sha256-FC89EFZuRLcj5x4wZVqUlitEMTRPSZk+qzQpIoVk9xY=";
+    })
+    (fetchDebianPatch {
+      name = "CVE-2022-24599.patch";
+      debname = "0013-Fix-CVE-2022-24599.patch";
+      sha256 = "sha256-DHJQ4B6cvKfSlXy66ZC5RNaCMDaygj8dWLZZhJnhw1E=";
+    })
+    (fetchDebianPatch {
+      name = "1_CVE-2019-13147.patch";
+      debname = "0014-Partial-fix-of-CVE-2019-13147.patch";
+      sha256 = "sha256-clb/XiIZbmttPr2dT9AZsbQ97W6lwifEwMO4l2ZEh0k=";
+    })
+    (fetchDebianPatch {
+      name = "2_CVE-2019-13147.patch";
+      debname = "0015-Partial-fix-of-CVE-2019-13147.patch";
+      sha256 = "sha256-JOZIw962ae7ynnjJXGO29i8tuU5Dhk67DmB0o5/vSf4=";
+    })
   ];
 
   meta = with lib; {

From 6f001d6faba6a08ab9bcd06fcd4c60148c14d665 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:04:19 +0200
Subject: [PATCH 089/321] spirv-llvm-translator: add llvm 21 support

---
 pkgs/by-name/sp/spirv-llvm-translator/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index e90a2fa4bcf0f..58774bb5fe641 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -18,6 +18,11 @@ let
 
   # ROCm, if actively updated will always be at the latest version
   versions = {
+    "21" = rec {
+      version = "21.1.0";
+      rev = "v${version}";
+      hash = "sha256-kk8BbPl/UBW1gaO/cuOQ9OsiNTEk0TkvRDLKUAh6exk=";
+    };
     "19" = rec {
       version = "19.1.6";
       rev = "v${version}";

From 129b804005ca320f551b086a7ec592cb8272dc7e Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:05:09 +0200
Subject: [PATCH 090/321] spirv-llvm-translator: add llvm 20 support

---
 pkgs/by-name/sp/spirv-llvm-translator/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 58774bb5fe641..012f1b801ee6c 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -23,6 +23,11 @@ let
       rev = "v${version}";
       hash = "sha256-kk8BbPl/UBW1gaO/cuOQ9OsiNTEk0TkvRDLKUAh6exk=";
     };
+    "20" = rec {
+      version = "20.1.5";
+      rev = "v${version}";
+      hash = "sha256-GdlC/Vl61nTNdua2s+CW2YOvkSKK6MNOvBc/393iths=";
+    };
     "19" = rec {
       version = "19.1.6";
       rev = "v${version}";

From 4a1519ed7ab5cc0f0632a45ba39261923b17afb5 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:05:36 +0200
Subject: [PATCH 091/321] spirv-llvm-translator: 19.1.6 -> 19.1.10

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

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 012f1b801ee6c..bc535528bd78f 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -29,9 +29,9 @@ let
       hash = "sha256-GdlC/Vl61nTNdua2s+CW2YOvkSKK6MNOvBc/393iths=";
     };
     "19" = rec {
-      version = "19.1.6";
+      version = "19.1.10";
       rev = "v${version}";
-      hash = "sha256-mUvDF5y+cBnqUaHjyiiE8cJGH5MfQMqGFy6bYv9vCVY=";
+      hash = "sha256-VgA47AGMnOKYNeW95nxJZzmKnYK8D/9okgssPnPqXXI=";
     };
     "18" = rec {
       version = "18.1.11";

From c70e9730b7e7bb82d66c7d919a0eed7a64e8ab5f Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:05:57 +0200
Subject: [PATCH 092/321] spirv-llvm-translator: 18.1.11 -> 18.1.15

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

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index bc535528bd78f..4562fb115d30d 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -34,9 +34,9 @@ let
       hash = "sha256-VgA47AGMnOKYNeW95nxJZzmKnYK8D/9okgssPnPqXXI=";
     };
     "18" = rec {
-      version = "18.1.11";
+      version = "18.1.15";
       rev = "v${version}";
-      hash = "sha256-VoALyFqShKL3bpeoOIdKoseNfDWiRE+j0ppHapXOmEU=";
+      hash = "sha256-rt3RTZut41uDEh0YmpOzH3sOezeEVWtAIGMKCHLSJBw=";
     };
     "17" = rec {
       version = "17.0.11";

From 9d9285c35c63ded2216d30ac529bd65dfcde3f77 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:06:36 +0200
Subject: [PATCH 093/321] spirv-llvm-translator: 17.0.11 -> 17.0.15

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

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 4562fb115d30d..1cfa9b4fe261a 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -39,9 +39,9 @@ let
       hash = "sha256-rt3RTZut41uDEh0YmpOzH3sOezeEVWtAIGMKCHLSJBw=";
     };
     "17" = rec {
-      version = "17.0.11";
+      version = "17.0.15";
       rev = "v${version}";
-      hash = "sha256-Ba4GZS7Rc93Fphj2xaBZ3AqwXvxB9UU0gzPNoDEoaQM=";
+      hash = "sha256-ETpTQYMMApECDfuRY87HrO/PUxZ13x9dBRJ3ychslUI=";
     };
     "16" = rec {
       version = "16.0.11";

From 44c95706464ee5859e1bf14d5f61fa4a00e86081 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:06:51 +0200
Subject: [PATCH 094/321] spirv-llvm-translator: 16.0.11 -> 16.0.15

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

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 1cfa9b4fe261a..b466d783132e9 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -44,9 +44,9 @@ let
       hash = "sha256-ETpTQYMMApECDfuRY87HrO/PUxZ13x9dBRJ3ychslUI=";
     };
     "16" = rec {
-      version = "16.0.11";
+      version = "16.0.15";
       rev = "v${version}";
-      hash = "sha256-PI4cT/PGqpaF5SysOTrEE4D+OcIUsIOMzww4CRPtwBQ=";
+      hash = "sha256-30i73tGl+1KlP92XA0uxdMTydd9EtaQ4SZ0W1kdm1fQ=";
     };
     "15" = rec {
       version = "15.0.13";

From 12f5b3d0fbc2d6d0068b25bd7d6d169707d11441 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:07:08 +0200
Subject: [PATCH 095/321] spirv-llvm-translator: 15.0.13 -> 15.0.15

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

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index b466d783132e9..5b24925338e5f 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -49,9 +49,9 @@ let
       hash = "sha256-30i73tGl+1KlP92XA0uxdMTydd9EtaQ4SZ0W1kdm1fQ=";
     };
     "15" = rec {
-      version = "15.0.13";
+      version = "15.0.15";
       rev = "v${version}";
-      hash = "sha256-RnGbBHUUGjIBcakQJO4nAm3/oIrQ8nkx+BC8Evw6Jmc=";
+      hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
     };
     "14" = {
       version = "14.0.11+unstable-2025-01-28";

From 3bb9bd5d4efbe38a41973bdadb75c7921735e87b Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Fri, 8 Aug 2025 14:07:31 +0200
Subject: [PATCH 096/321] spirv-llvm-translator: 14.0.11+unstable-2025-01-28 ->
 14.0.14

---
 pkgs/by-name/sp/spirv-llvm-translator/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 5b24925338e5f..a4ebb2c052cc6 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -53,10 +53,10 @@ let
       rev = "v${version}";
       hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
     };
-    "14" = {
-      version = "14.0.11+unstable-2025-01-28";
-      rev = "9df26b6af308cb834a4013deb8094f386f29accd";
-      hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM=";
+    "14" = rec {
+      version = "14.0.14";
+      rev = "v${version}";
+      hash = "sha256-PW+5w93omLYPZXjRtU4BNY2ztZ86pcjgUQZkrktMq+4=";
     };
   };
 

From 0dc5987f31114c78c5f65544d1fe812234f91b76 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 12 Aug 2025 17:27:22 -0400
Subject: [PATCH 097/321] patchelf: 0.15.0 -> 0.15.2

See the 0.15.1 and 0.15.2 changelogs: https://github.com/NixOS/patchelf/releases

I've carefully backported *just* some quality of life improvements (C++
warning fixes, shellcheck fixes, build system and CI infra). No behavior
should be changed, except for the simplest bugfixes (e.g. close file
before throwing exception). Therefore, this should be safe to bump in in
Nixpkgs right away.
---
 pkgs/development/tools/misc/patchelf/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 7b65465a2b10e..1164a4f7aee24 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "patchelf";
-  version = "0.15.0";
+  version = "0.15.2";
 
   src = fetchurl {
     url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-9ANtPuTY4ijewb7/8PbkbYpA6eVw4AaOOdd+YuLIvcI=";
+    sha256 = "sha256-F3RfVkFZyOIo/EEtplogSLhGxLa0Igt3y/IkFuAvLXw=";
   };
 
   strictDeps = true;
@@ -25,11 +25,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # fails 8 out of 24 tests, problems when loading libc.so.6
-  doCheck =
-    stdenv.name == "stdenv-linux"
-    # test scripts require unprefixed bintools binaries
-    # https://github.com/NixOS/patchelf/issues/417
-    && stdenv.cc.targetPrefix == "";
+  doCheck = stdenv.name == "stdenv-linux";
 
   meta = with lib; {
     homepage = "https://github.com/NixOS/patchelf";

From cf9f47535013dba26379fb6bd64aa2b722c7dc1f Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 25 Jul 2025 11:39:16 -0400
Subject: [PATCH 098/321] installShellFiles: Allow installManPage to take a
 piped input

---
 .../in/installShellFiles/setup-hook.sh        | 72 ++++++++++++++++---
 .../tests/install-manpage-fifo.nix            | 23 ++++++
 .../tests/install-manpage-named.nix           | 18 +++++
 .../tests/install-manpage.nix                 |  3 +
 4 files changed, 106 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-manpage-fifo.nix
 create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-manpage-named.nix

diff --git a/pkgs/by-name/in/installShellFiles/setup-hook.sh b/pkgs/by-name/in/installShellFiles/setup-hook.sh
index b348939165418..20eb8def0e2f5 100644
--- a/pkgs/by-name/in/installShellFiles/setup-hook.sh
+++ b/pkgs/by-name/in/installShellFiles/setup-hook.sh
@@ -16,35 +16,87 @@
 #
 # See comments on each function for more details.
 
-# installManPage <path> [...<path>]
+# installManPage [--name <path>] <path> [...<path>]
 #
 # Each argument is checked for its man section suffix and installed into the appropriate
 # share/man/man<n>/ directory. The function returns an error if any paths don't have the man
 # section suffix (with optional .gz compression).
+#
+# Optionally accepts pipes as input, which when provided require the `--name` argument to
+# name the output file.
+#
+# installManPage --name foobar.1 <($out/bin/foobar --manpage)
 installManPage() {
-    local path
-    for path in "$@"; do
-        if test -z "$path"; then
+    local arg name='' continueParsing=1
+    while { arg=$1; shift; }; do
+        if (( continueParsing )); then
+            case "$arg" in
+              --name)
+                  name=$1
+                  shift || {
+                      nixErrorLog "${FUNCNAME[0]}: --name flag expected an argument"
+                      return 1
+                  }
+                  continue;;
+              --name=*)
+                  # Treat `--name=foo` that same as `--name foo`
+                  name=${arg#--name=}
+                  continue;;
+              --)
+                  continueParsing=0
+                  continue;;
+            esac
+        fi
+
+        nixInfoLog "${FUNCNAME[0]}: installing $arg${name:+ as $name}"
+        local basename
+
+        # Check if path is empty
+        if test -z "$arg"; then
+            # It is an empty string
             nixErrorLog "${FUNCNAME[0]}: path cannot be empty"
             return 1
         fi
-        nixInfoLog "${FUNCNAME[0]}: installing $path"
-        local basename
-        basename=$(stripHash "$path") # use stripHash in case it's a nix store path
+
+        if test -n "$name"; then
+          # Provided name. Required for pipes, optional for paths
+          basename=$name
+        elif test -p "$arg"; then
+            # Named pipe requires a file name
+            nixErrorLog "${FUNCNAME[0]}: named pipe requires --name argument"
+        else
+            # Normal file without a name
+            basename=$(stripHash "$arg") # use stripHash in case it's a nix store path
+        fi
+
+        # Check that it is well-formed
         local trimmed=${basename%.gz} # don't get fooled by compressed manpages
         local suffix=${trimmed##*.}
         if test -z "$suffix" -o "$suffix" = "$trimmed"; then
-            nixErrorLog "${FUNCNAME[0]}: path missing manpage section suffix: $path"
+            nixErrorLog "${FUNCNAME[0]}: path missing manpage section suffix: $arg"
             return 1
         fi
+
+        # Create the out-path
         local outRoot
         if test "$suffix" = 3; then
             outRoot=${!outputDevman:?}
         else
             outRoot=${!outputMan:?}
         fi
-        local outPath="${outRoot}/share/man/man$suffix/$basename"
-        install -D --mode=644 --no-target-directory "$path" "$outPath"
+        local outPath="${outRoot}/share/man/man$suffix/"
+        nixInfoLog "${FUNCNAME[0]}: installing to $outPath"
+
+        # Install
+        if test -p "$arg"; then
+          # install doesn't work with pipes on Darwin
+          mkdir -p "$outPath" && cat "$arg" > "$outPath/$basename"
+        else
+          install -D --mode=644 --no-target-directory -- "$arg" "$outPath/$basename"
+        fi
+
+        # Reset the name for the next page
+        name=
     done
 }
 
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage-fifo.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage-fifo.nix
new file mode 100644
index 0000000000000..b0b50ad709d63
--- /dev/null
+++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage-fifo.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  installShellFiles,
+  runCommandLocal,
+}:
+
+runCommandLocal "install-shell-files--install-manpage-fifo"
+  {
+    nativeBuildInputs = [ installShellFiles ];
+    meta.platforms = lib.platforms.all;
+  }
+  ''
+    installManPage doc/*
+
+    installManPage \
+      --name foo.1 <(echo foo) \
+      --name=bar.2 <(echo bar) \
+      --name baz.3 <(echo baz)
+
+    echo "foo" | cmp - $out/share/man/man1/foo.1
+    echo "bar" | cmp - $out/share/man/man2/bar.2
+    echo "baz" | cmp - $out/share/man/man3/baz.3
+  ''
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage-named.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage-named.nix
new file mode 100644
index 0000000000000..afc94f0e4b5ee
--- /dev/null
+++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage-named.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  installShellFiles,
+  runCommandLocal,
+}:
+
+runCommandLocal "install-shell-files--install-manpage"
+  {
+    nativeBuildInputs = [ installShellFiles ];
+    meta.platforms = lib.platforms.all;
+  }
+  ''
+    echo foo > foo.1
+
+    installManPage --name bar.1 foo.1
+
+    cmp foo.1 $out/share/man/man1/bar.1
+  ''
diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix
index 7b67d0aed94ca..abcbb7ac6a08f 100644
--- a/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix
+++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix
@@ -14,10 +14,13 @@ runCommandLocal "install-shell-files--install-manpage"
     echo foo > doc/foo.1
     echo bar > doc/bar.2.gz
     echo baz > doc/baz.3
+    echo buzz > --name.1
 
     installManPage doc/*
+    installManPage -- --name.1
 
     cmp doc/foo.1 $out/share/man/man1/foo.1
     cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz
     cmp doc/baz.3 $out/share/man/man3/baz.3
+    cmp -- --name.1 $out/share/man/man1/--name.1
   ''

From 49059b8bb818598a52d823d5b2655003adca56e1 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 25 Jul 2025 11:39:16 -0400
Subject: [PATCH 099/321] docs: Allow installManPage to take a piped input

---
 doc/hooks/installShellFiles.section.md | 39 +++++++++++++++++++++++---
 doc/release-notes/rl-2511.section.md   |  2 ++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md
index 223c47f2e684b..fc325250224da 100644
--- a/doc/hooks/installShellFiles.section.md
+++ b/doc/hooks/installShellFiles.section.md
@@ -43,11 +43,42 @@ The manpages must have a section suffix, and may optionally be compressed (with
   nativeBuildInputs = [ installShellFiles ];
 
   # Sometimes the manpage file has an undersirable name; e.g. it conflicts with
-  # another software with an equal name. It should be renamed before being
-  # installed via installManPage
+  # another software with an equal name. To install it with a different name,
+  # the installed name must be provided before the path to the file.
+  #
+  # Below install a manpage "foobar.1" from the source file "./foobar.1", and
+  # also installs the manpage "fromsea.3" from the source file "./delmar.3".
   postInstall = ''
-    mv fromsea.3 delmar.3
-    installManPage foobar.1 delmar.3
+    installManPage \
+        foobar.1 \
+        --name fromsea.3 delmar.3
+  '';
+}
+```
+
+The manpage may be the result of a piped input (e.g. `<(cmd)`), in which
+case the name must be provided before the pipe with the `--name` flag.
+
+```nix
+{
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage --name foobar.1 <($out/bin/foobar --manpage)
+  '';
+}
+```
+
+If no parsing of arguments is desired, pass `--` to opt-out of all subsequent
+arguments.
+
+```nix
+{
+  nativeBuildInputs = [ installShellFiles ];
+
+  # Installs a manpage from a file called "--name"
+  postInstall = ''
+    installManPage -- --name
   '';
 }
 ```
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index ab9a4209b979d..216e085e9a0e8 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -16,6 +16,8 @@
 
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
+- `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing.
+
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.

From 39aef90642dfb0e30565ea05a7a83bdbdaa2f475 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Sat, 2 Aug 2025 03:08:53 +0800
Subject: [PATCH 100/321] rustc: Fix configure flags for custom target JSON

For custom target JSON, rustc bootstrap expects config to be set for
target."/path/to/target.json", so use that.
---
 pkgs/development/compilers/rust/rustc.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a9f3b78a11b5e..84ab93741182e 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -111,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
         stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}";
       cxxPrefixForStdenv =
         stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}";
-      setBuild = "--set=target.\"${stdenv.buildPlatform.rust.rustcTarget}\"";
-      setHost = "--set=target.\"${stdenv.hostPlatform.rust.rustcTarget}\"";
-      setTarget = "--set=target.\"${stdenv.targetPlatform.rust.rustcTarget}\"";
+      setBuild = "--set=target.\"${stdenv.buildPlatform.rust.rustcTargetSpec}\"";
+      setHost = "--set=target.\"${stdenv.hostPlatform.rust.rustcTargetSpec}\"";
+      setTarget = "--set=target.\"${stdenv.targetPlatform.rust.rustcTargetSpec}\"";
       ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
       cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv;
       ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv;

From d38784184371f921e1e4db92d417f42a4f3c2089 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Sat, 2 Aug 2025 03:12:43 +0800
Subject: [PATCH 101/321] rust/hooks: Use rustcTargetSpec for --target

The --target option expects the target spec JSON, not the short target
name, so use rustcTargetSpec.
---
 pkgs/build-support/rust/hooks/cargo-build-hook.sh   | 2 +-
 pkgs/build-support/rust/hooks/cargo-check-hook.sh   | 2 +-
 pkgs/build-support/rust/hooks/cargo-nextest-hook.sh | 2 +-
 pkgs/build-support/rust/hooks/default.nix           | 8 ++++----
 pkgs/build-support/rust/hooks/maturin-build-hook.sh | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index f0e155633503b..ff752cd7b05f0 100644
--- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -19,7 +19,7 @@ cargoBuildHook() {
 
     local flagsArray=(
         "-j" "$NIX_BUILD_CORES"
-        "--target" "@rustcTarget@"
+        "--target" "@rustcTargetSpec@"
         "--offline"
     )
 
diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
index 241061e7c7ba9..55caa8eb796d1 100644
--- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -29,7 +29,7 @@ cargoCheckHook() {
     fi
 
     flagsArray+=(
-        "--target" "@rustcTarget@"
+        "--target" "@rustcTargetSpec@"
         "--offline"
     )
 
diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
index 9d9b90976b222..056f705fb89cb 100644
--- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
@@ -10,7 +10,7 @@ cargoNextestHook() {
     fi
 
     local flagsArray=(
-        "--target" "@rustcTarget@"
+        "--target" "@rustcTargetSpec@"
         "--offline"
     )
 
diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index b9ea694c7c03a..768ad37e22657 100644
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -20,7 +20,7 @@
   cargoBuildHook = makeSetupHook {
     name = "cargo-build-hook.sh";
     substitutions = {
-      inherit (stdenv.targetPlatform.rust) rustcTarget;
+      inherit (stdenv.targetPlatform.rust) rustcTargetSpec;
       inherit (rust.envVars) setEnv;
 
     };
@@ -35,7 +35,7 @@
   cargoCheckHook = makeSetupHook {
     name = "cargo-check-hook.sh";
     substitutions = {
-      inherit (stdenv.targetPlatform.rust) rustcTarget;
+      inherit (stdenv.targetPlatform.rust) rustcTargetSpec;
       inherit (rust.envVars) setEnv;
     };
     passthru.tests = {
@@ -63,7 +63,7 @@
     name = "cargo-nextest-hook.sh";
     propagatedBuildInputs = [ cargo-nextest ];
     substitutions = {
-      inherit (stdenv.targetPlatform.rust) rustcTarget;
+      inherit (stdenv.targetPlatform.rust) rustcTargetSpec;
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoNextestHook;
@@ -121,7 +121,7 @@
       pkgsHostTarget.rustc
     ];
     substitutions = {
-      inherit (stdenv.targetPlatform.rust) rustcTarget;
+      inherit (stdenv.targetPlatform.rust) rustcTargetSpec;
       inherit (rust.envVars) setEnv;
 
     };
diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh
index 77972c2fe1712..57e4e12b4f1ea 100644
--- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh
@@ -20,7 +20,7 @@ maturinBuildHook() {
     local flagsArray=(
         "--jobs=$NIX_BUILD_CORES"
         "--offline"
-        "--target" "@rustcTarget@"
+        "--target" "@rustcTargetSpec@"
         "--manylinux" "off"
         "--strip"
         "--release"

From 8dbf0b34233f0c8da3d584c591f57d6ce1a3e5c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 13 Aug 2025 21:31:46 +0200
Subject: [PATCH 102/321] cpython: remove libxcrypt on 3.13 and newer

The 3.13 release dropped support for the crypt module, so this dependency
could have been dropped much earlier.

Drops the `withLibxcrypt` argument, because manging the default has
become quite a bit more complicated.
---
 .../interpreters/python/cpython/default.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 3e1d6cc63ff19..940e18f8fbf68 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -21,7 +21,6 @@
   expat,
   libffi,
   libuuid,
-  withLibxcrypt ? !withMinimalDeps,
   libxcrypt,
   withMpdecimal ? !withMinimalDeps,
   mpdecimal,
@@ -145,11 +144,16 @@ let
     optionals
     optionalString
     replaceStrings
-    versionOlder
     ;
 
-  # mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt
-  libxcrypt = if stdenv.hostPlatform.isFreeBSD && withMinimalDeps then null else inputs.libxcrypt;
+  withLibxcrypt =
+    (!withMinimalDeps)
+    &&
+      # mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt
+      (!stdenv.hostPlatform.isFreeBSD)
+    &&
+      # crypt module was removed in 3.13
+      passthru.pythonOlder "3.13";
 
   buildPackages = pkgsBuildHost;
   inherit (passthru) pythonOnBuildForHost;

From f63e7d248ced7346cbc53ce97f87ee94f6271e0b Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 14 Aug 2025 16:25:36 +0000
Subject: [PATCH 103/321] ruff: 0.12.8 -> 0.12.9

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.12.9
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 8dea56005858c..54fc0c2cae43c 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.12.8";
+  version = "0.12.9";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-ypYtAUQBFSf+cgly9K5eRMegtWrRmLmqrgfRmCJvXEk=";
+    hash = "sha256-F6THHweMVJqmqKeexZIWW7iHCPc0I6Ttr8RzXWSdww8=";
   };
 
   # Patch out test that fails due to ANSI escape codes being written as-is,
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-0iYwS8Ssi4JDxwr0Q2+iKvYHb179L6BiiuXa2D4qiOA=";
+  cargoHash = "sha256-gXuRcb1Gk5t2R44/xeE+x3AXccnRyt9SukYYXE0JPQU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4d93764f963a2fdc91b04a66a2444ed2596e6a8c Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Thu, 14 Aug 2025 21:10:44 +0200
Subject: [PATCH 104/321] libxmlxx-v3: remove loskutov from maintainers
 (#432953)

---
 pkgs/development/libraries/libxmlxx/v3.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index 9e6398228bcff..0b7c7f214952e 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -99,9 +99,6 @@ stdenv.mkDerivation rec {
     description = "C++ wrapper for the libxml2 XML parser library, version 3";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [
-      loskutov
-      willow
-    ];
+    maintainers = with maintainers; [ willow ];
   };
 }

From 3370b8b98624b6dfefd28fdfab30d75606c02e96 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 14 Aug 2025 20:07:38 +0100
Subject: [PATCH 105/321] re2: 2025-08-05 -> 2025-08-12

Changes: https://github.com/google/re2/compare/2025-08-05...2025-08-12
---
 pkgs/by-name/re/re2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 39a5ecea8eff9..28e9bb9432b0d 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2025-08-05";
+  version = "2025-08-12";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-Q4/xab6Jqhai/WIMND5YWOrPmNyDDf3HysKDqum3RgQ=";
+    hash = "sha256-3cWbw8Wlnl1OMPIcbNlc3HnCsuL4VT7psuHWtldsWoQ=";
   };
 
   outputs = [

From 4c70fc087ac99bc302648333b3b125aa575bdaff Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 14 Aug 2025 22:04:27 +0200
Subject: [PATCH 106/321] libpq: 17.5 -> 17.6

Release Notes:
https://www.postgresql.org/docs/release/17.6/
---
 pkgs/servers/sql/postgresql/libpq.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index d3f3da989186f..ab9c930adce26 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -31,14 +31,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpq";
-  version = "17.5";
+  version = "17.6";
 
   src = fetchFromGitHub {
     owner = "postgres";
     repo = "postgres";
     # rev, not tag, on purpose: see generic.nix.
-    rev = "refs/tags/REL_17_5";
-    hash = "sha256-jWV7hglu7IPMZbqHrZVZHLbZYjVuDeut7nH50aSQIBc=";
+    rev = "refs/tags/REL_17_6";
+    hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
   };
 
   __structuredAttrs = true;

From 4345a37636726d3c82138575578a2ace2704268a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 14 Aug 2025 23:14:35 +0200
Subject: [PATCH 107/321] python313: 3.13.6 -> 3.13.7

https://docs.python.org/release/3.13.7/whatsnew/changelog.html
---
 .../python/cpython/3.13/revert-gh134724.patch | 373 ------------------
 .../interpreters/python/cpython/default.nix   |   4 -
 .../interpreters/python/default.nix           |   4 +-
 3 files changed, 2 insertions(+), 379 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch b/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch
deleted file mode 100644
index f48dcf3b39da9..0000000000000
--- a/pkgs/development/interpreters/python/cpython/3.13/revert-gh134724.patch
+++ /dev/null
@@ -1,373 +0,0 @@
-commit 4a37dd6cef1556c64c2665061b5e01bbd2bb3a82
-Author: Gregory P. Smith <68491+gpshead@users.noreply.github.com>
-Date:   Sun Jul 27 08:30:25 2025 -0700
-
-    [3.13] gh-134698: Hold a lock when the thread state is detached in ssl (GH-134724) (#137126)
-    
-    Lock when the thread state is detached.
-    (cherry picked from commit e047a35b23c1aa69ab8d5da56f36319cec4d36b8) or really from the 3.14 backport fd565fdfc9c0001900d03d627e2fda83f1bcca90
-    
-    Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
-
-diff --git b/Modules/_ssl.c a/Modules/_ssl.c
-index 981c3d6a936..aa846f68641 100644
---- b/Modules/_ssl.c
-+++ a/Modules/_ssl.c
-@@ -42,14 +42,14 @@
- /* Redefined below for Windows debug builds after important #includes */
- #define _PySSL_FIX_ERRNO
- 
--#define PySSL_BEGIN_ALLOW_THREADS_S(save, mutex) \
--    do { (save) = PyEval_SaveThread(); PyMutex_Lock(mutex); } while(0)
--#define PySSL_END_ALLOW_THREADS_S(save, mutex) \
--    do { PyMutex_Unlock(mutex); PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0)
--#define PySSL_BEGIN_ALLOW_THREADS(self) { \
-+#define PySSL_BEGIN_ALLOW_THREADS_S(save) \
-+    do { (save) = PyEval_SaveThread(); } while(0)
-+#define PySSL_END_ALLOW_THREADS_S(save) \
-+    do { PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0)
-+#define PySSL_BEGIN_ALLOW_THREADS { \
-             PyThreadState *_save = NULL;  \
--            PySSL_BEGIN_ALLOW_THREADS_S(_save, &self->tstate_mutex);
--#define PySSL_END_ALLOW_THREADS(self) PySSL_END_ALLOW_THREADS_S(_save, &self->tstate_mutex); }
-+            PySSL_BEGIN_ALLOW_THREADS_S(_save);
-+#define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); }
- 
- #if defined(HAVE_POLL_H)
- #include <poll.h>
-@@ -304,9 +304,6 @@ typedef struct {
-     PyObject *psk_client_callback;
-     PyObject *psk_server_callback;
- #endif
--    /* Lock to synchronize calls when the thread state is detached.
--       See also gh-134698. */
--    PyMutex tstate_mutex;
- } PySSLContext;
- 
- typedef struct {
-@@ -332,9 +329,6 @@ typedef struct {
-      * and shutdown methods check for chained exceptions.
-      */
-     PyObject *exc;
--    /* Lock to synchronize calls when the thread state is detached.
--       See also gh-134698. */
--    PyMutex tstate_mutex;
- } PySSLSocket;
- 
- typedef struct {
-@@ -846,14 +840,13 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
-     self->server_hostname = NULL;
-     self->err = err;
-     self->exc = NULL;
--    self->tstate_mutex = (PyMutex){0};
- 
-     /* Make sure the SSL error state is initialized */
-     ERR_clear_error();
- 
--    PySSL_BEGIN_ALLOW_THREADS(sslctx)
-+    PySSL_BEGIN_ALLOW_THREADS
-     self->ssl = SSL_new(ctx);
--    PySSL_END_ALLOW_THREADS(sslctx)
-+    PySSL_END_ALLOW_THREADS
-     if (self->ssl == NULL) {
-         Py_DECREF(self);
-         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
-@@ -919,12 +912,12 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
-         BIO_set_nbio(SSL_get_wbio(self->ssl), 1);
-     }
- 
--    PySSL_BEGIN_ALLOW_THREADS(self)
-+    PySSL_BEGIN_ALLOW_THREADS
-     if (socket_type == PY_SSL_CLIENT)
-         SSL_set_connect_state(self->ssl);
-     else
-         SSL_set_accept_state(self->ssl);
--    PySSL_END_ALLOW_THREADS(self)
-+    PySSL_END_ALLOW_THREADS
- 
-     self->socket_type = socket_type;
-     if (sock != NULL) {
-@@ -993,10 +986,10 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self)
-     /* Actually negotiate SSL connection */
-     /* XXX If SSL_do_handshake() returns 0, it's also a failure. */
-     do {
--        PySSL_BEGIN_ALLOW_THREADS(self)
-+        PySSL_BEGIN_ALLOW_THREADS
-         ret = SSL_do_handshake(self->ssl);
-         err = _PySSL_errno(ret < 1, self->ssl, ret);
--        PySSL_END_ALLOW_THREADS(self)
-+        PySSL_END_ALLOW_THREADS
-         self->err = err;
- 
-         if (PyErr_CheckSignals())
-@@ -2369,10 +2362,9 @@ PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout)
-     ms = (int)_PyTime_AsMilliseconds(timeout, _PyTime_ROUND_CEILING);
-     assert(ms <= INT_MAX);
- 
--    Py_BEGIN_ALLOW_THREADS
-+    PySSL_BEGIN_ALLOW_THREADS
-     rc = poll(&pollfd, 1, (int)ms);
--    Py_END_ALLOW_THREADS
--    _PySSL_FIX_ERRNO;
-+    PySSL_END_ALLOW_THREADS
- #else
-     /* Guard against socket too large for select*/
-     if (!_PyIsSelectable_fd(s->sock_fd))
-@@ -2384,14 +2376,13 @@ PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout)
-     FD_SET(s->sock_fd, &fds);
- 
-     /* Wait until the socket becomes ready */
--    Py_BEGIN_ALLOW_THREADS
-+    PySSL_BEGIN_ALLOW_THREADS
-     nfds = Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int);
-     if (writing)
-         rc = select(nfds, NULL, &fds, NULL, &tv);
-     else
-         rc = select(nfds, &fds, NULL, NULL, &tv);
--    Py_END_ALLOW_THREADS
--    _PySSL_FIX_ERRNO;
-+    PySSL_END_ALLOW_THREADS
- #endif
- 
-     /* Return SOCKET_TIMED_OUT on timeout, SOCKET_OPERATION_OK otherwise
-@@ -2462,10 +2453,10 @@ _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b)
-     }
- 
-     do {
--        PySSL_BEGIN_ALLOW_THREADS(self)
-+        PySSL_BEGIN_ALLOW_THREADS
-         retval = SSL_write_ex(self->ssl, b->buf, (size_t)b->len, &count);
-         err = _PySSL_errno(retval == 0, self->ssl, retval);
--        PySSL_END_ALLOW_THREADS(self)
-+        PySSL_END_ALLOW_THREADS
-         self->err = err;
- 
-         if (PyErr_CheckSignals())
-@@ -2523,10 +2514,10 @@ _ssl__SSLSocket_pending_impl(PySSLSocket *self)
-     int count = 0;
-     _PySSLError err;
- 
--    PySSL_BEGIN_ALLOW_THREADS(self)
-+    PySSL_BEGIN_ALLOW_THREADS
-     count = SSL_pending(self->ssl);
-     err = _PySSL_errno(count < 0, self->ssl, count);
--    PySSL_END_ALLOW_THREADS(self)
-+    PySSL_END_ALLOW_THREADS
-     self->err = err;
- 
-     if (count < 0)
-@@ -2617,10 +2608,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
-         deadline = _PyDeadline_Init(timeout);
- 
-     do {
--        PySSL_BEGIN_ALLOW_THREADS(self)
-+        PySSL_BEGIN_ALLOW_THREADS
-         retval = SSL_read_ex(self->ssl, mem, (size_t)len, &count);
-         err = _PySSL_errno(retval == 0, self->ssl, retval);
--        PySSL_END_ALLOW_THREADS(self)
-+        PySSL_END_ALLOW_THREADS
-         self->err = err;
- 
-         if (PyErr_CheckSignals())
-@@ -2719,7 +2710,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
-     }
- 
-     while (1) {
--        PySSL_BEGIN_ALLOW_THREADS(self)
-+        PySSL_BEGIN_ALLOW_THREADS
-         /* Disable read-ahead so that unwrap can work correctly.
-          * Otherwise OpenSSL might read in too much data,
-          * eating clear text data that happens to be
-@@ -2732,7 +2723,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
-             SSL_set_read_ahead(self->ssl, 0);
-         ret = SSL_shutdown(self->ssl);
-         err = _PySSL_errno(ret < 0, self->ssl, ret);
--        PySSL_END_ALLOW_THREADS(self)
-+        PySSL_END_ALLOW_THREADS
-         self->err = err;
- 
-         /* If err == 1, a secure shutdown with SSL_shutdown() is complete */
-@@ -3124,10 +3115,9 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
-     // no other thread can be touching this object yet.
-     // (Technically, we can't even lock if we wanted to, as the
-     // lock hasn't been initialized yet.)
--    Py_BEGIN_ALLOW_THREADS
-+    PySSL_BEGIN_ALLOW_THREADS
-     ctx = SSL_CTX_new(method);
--    Py_END_ALLOW_THREADS
--    _PySSL_FIX_ERRNO;
-+    PySSL_END_ALLOW_THREADS
- 
-     if (ctx == NULL) {
-         _setSSLError(get_ssl_state(module), NULL, 0, __FILE__, __LINE__);
-@@ -3153,7 +3143,6 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
-     self->psk_client_callback = NULL;
-     self->psk_server_callback = NULL;
- #endif
--    self->tstate_mutex = (PyMutex){0};
- 
-     /* Don't check host name by default */
-     if (proto_version == PY_SSL_VERSION_TLS_CLIENT) {
-@@ -3270,10 +3259,9 @@ context_clear(PySSLContext *self)
-     Py_CLEAR(self->psk_server_callback);
- #endif
-     if (self->keylog_bio != NULL) {
--        Py_BEGIN_ALLOW_THREADS
-+        PySSL_BEGIN_ALLOW_THREADS
-         BIO_free_all(self->keylog_bio);
--        Py_END_ALLOW_THREADS
--        _PySSL_FIX_ERRNO;
-+        PySSL_END_ALLOW_THREADS
-         self->keylog_bio = NULL;
-     }
-     return 0;
-@@ -3992,8 +3980,7 @@ _password_callback(char *buf, int size, int rwflag, void *userdata)
-     _PySSLPasswordInfo *pw_info = (_PySSLPasswordInfo*) userdata;
-     PyObject *fn_ret = NULL;
- 
--    pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state);
--    _PySSL_FIX_ERRNO;
-+    PySSL_END_ALLOW_THREADS_S(pw_info->thread_state);
- 
-     if (pw_info->error) {
-         /* already failed previously. OpenSSL 3.0.0-alpha14 invokes the
-@@ -4023,13 +4010,13 @@ _password_callback(char *buf, int size, int rwflag, void *userdata)
-         goto error;
-     }
- 
--    pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state);
-+    PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state);
-     memcpy(buf, pw_info->password, pw_info->size);
-     return pw_info->size;
- 
- error:
-     Py_XDECREF(fn_ret);
--    pw_info->thread_state = PyThreadState_Swap(pw_info->thread_state);
-+    PySSL_BEGIN_ALLOW_THREADS_S(pw_info->thread_state);
-     pw_info->error = 1;
-     return -1;
- }
-@@ -4082,10 +4069,10 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
-         SSL_CTX_set_default_passwd_cb(self->ctx, _password_callback);
-         SSL_CTX_set_default_passwd_cb_userdata(self->ctx, &pw_info);
-     }
--    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
-+    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state);
-     r = SSL_CTX_use_certificate_chain_file(self->ctx,
-         PyBytes_AS_STRING(certfile_bytes));
--    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
-+    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state);
-     if (r != 1) {
-         if (pw_info.error) {
-             ERR_clear_error();
-@@ -4100,11 +4087,11 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
-         }
-         goto error;
-     }
--    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
-+    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state);
-     r = SSL_CTX_use_PrivateKey_file(self->ctx,
-         PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes),
-         SSL_FILETYPE_PEM);
--    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
-+    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state);
-     Py_CLEAR(keyfile_bytes);
-     Py_CLEAR(certfile_bytes);
-     if (r != 1) {
-@@ -4121,9 +4108,9 @@ _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile,
-         }
-         goto error;
-     }
--    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
-+    PySSL_BEGIN_ALLOW_THREADS_S(pw_info.thread_state);
-     r = SSL_CTX_check_private_key(self->ctx);
--    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state, &self->tstate_mutex);
-+    PySSL_END_ALLOW_THREADS_S(pw_info.thread_state);
-     if (r != 1) {
-         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
-         goto error;
-@@ -4340,9 +4327,9 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self,
-             cafile_buf = PyBytes_AS_STRING(cafile_bytes);
-         if (capath)
-             capath_buf = PyBytes_AS_STRING(capath_bytes);
--        PySSL_BEGIN_ALLOW_THREADS(self)
-+        PySSL_BEGIN_ALLOW_THREADS
-         r = SSL_CTX_load_verify_locations(self->ctx, cafile_buf, capath_buf);
--        PySSL_END_ALLOW_THREADS(self)
-+        PySSL_END_ALLOW_THREADS
-         if (r != 1) {
-             if (errno != 0) {
-                 PyErr_SetFromErrno(PyExc_OSError);
-@@ -4394,11 +4381,10 @@ _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath)
-         return NULL;
- 
-     errno = 0;
--    Py_BEGIN_ALLOW_THREADS
-+    PySSL_BEGIN_ALLOW_THREADS
-     dh = PEM_read_DHparams(f, NULL, NULL, NULL);
-     fclose(f);
--    Py_END_ALLOW_THREADS
--    _PySSL_FIX_ERRNO;
-+    PySSL_END_ALLOW_THREADS
-     if (dh == NULL) {
-         if (errno != 0) {
-             PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, filepath);
-@@ -4550,7 +4536,6 @@ _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self)
-     Py_BEGIN_ALLOW_THREADS
-     rc = SSL_CTX_set_default_verify_paths(self->ctx);
-     Py_END_ALLOW_THREADS
--    _PySSL_FIX_ERRNO;
-     if (!rc) {
-         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
-         return NULL;
-diff --git b/Modules/_ssl/debughelpers.c a/Modules/_ssl/debughelpers.c
-index fb8ae7c4e0b..5fc69a07184 100644
---- b/Modules/_ssl/debughelpers.c
-+++ a/Modules/_ssl/debughelpers.c
-@@ -135,15 +135,13 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
-      * critical debug helper.
-      */
- 
--    assert(PyMutex_IsLocked(&ssl_obj->tstate_mutex));
--    Py_BEGIN_ALLOW_THREADS
-+    PySSL_BEGIN_ALLOW_THREADS
-     PyThread_acquire_lock(lock, 1);
-     res = BIO_printf(ssl_obj->ctx->keylog_bio, "%s\n", line);
-     e = errno;
-     (void)BIO_flush(ssl_obj->ctx->keylog_bio);
-     PyThread_release_lock(lock);
--    Py_END_ALLOW_THREADS
--    _PySSL_FIX_ERRNO;
-+    PySSL_END_ALLOW_THREADS
- 
-     if (res == -1) {
-         errno = e;
-@@ -179,10 +177,9 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) {
-     if (self->keylog_bio != NULL) {
-         BIO *bio = self->keylog_bio;
-         self->keylog_bio = NULL;
--        Py_BEGIN_ALLOW_THREADS
-+        PySSL_BEGIN_ALLOW_THREADS
-         BIO_free_all(bio);
--        Py_END_ALLOW_THREADS
--        _PySSL_FIX_ERRNO;
-+        PySSL_END_ALLOW_THREADS
-     }
- 
-     if (arg == Py_None) {
-@@ -204,13 +201,13 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) {
-     self->keylog_filename = Py_NewRef(arg);
- 
-     /* Write a header for seekable, empty files (this excludes pipes). */
--    PySSL_BEGIN_ALLOW_THREADS(self)
-+    PySSL_BEGIN_ALLOW_THREADS
-     if (BIO_tell(self->keylog_bio) == 0) {
-         BIO_puts(self->keylog_bio,
-                  "# TLS secrets log file, generated by OpenSSL / Python\n");
-         (void)BIO_flush(self->keylog_bio);
-     }
--    PySSL_END_ALLOW_THREADS(self)
-+    PySSL_END_ALLOW_THREADS
-     SSL_CTX_set_keylog_callback(self->ctx, _PySSL_keylog_callback);
-     return 0;
- }
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 940e18f8fbf68..3f7454a327d65 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -369,10 +369,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals (pythonAtLeast "3.13") [
     ./3.13/virtualenv-permissions.patch
   ]
-  ++ optionals isPy313 [
-    # https://github.com/python/cpython/issues/137583
-    ./3.13/revert-gh134724.patch
-  ]
   ++ optionals mimetypesSupport [
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 9679b39a2890d..14fd4bb63a2f3 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
         sourceVersion = {
           major = "3";
           minor = "13";
-          patch = "6";
+          patch = "7";
           suffix = "";
         };
-        hash = "sha256-F7pVCIGdhzahT7/EfTbhhJRqh3hRsunEtsQ6y0SjsQQ=";
+        hash = "sha256-VGL5CZ39MOI43vg8cdkYl9jKpf9uvHpQ8U1IAs2qp5o=";
       };
     };
 

From 69fb788e4557d912d4c9585d0e6109bfbde11c78 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 14 Aug 2025 23:27:29 +0200
Subject: [PATCH 108/321] ruff: remove postPatch

---
 pkgs/by-name/ru/ruff/package.nix | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 54fc0c2cae43c..0de4a6d0b03b5 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -25,27 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-F6THHweMVJqmqKeexZIWW7iHCPc0I6Ttr8RzXWSdww8=";
   };
 
-  # Patch out test that fails due to ANSI escape codes being written as-is,
-  # causing a snapshot test to fail. The output itself is correct.
-  #
-  # This is the relevant test's output as of 0.12.5
-  # >     0       │-/home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
-  # >     1       │-/home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
-  # >     2       │-/home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
-  # >           0 │+␛[1m/home/ferris/project/code.py␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13)
-  # >           1 │+␛[1m/home/ferris/project/notebook.ipynb␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13)
-  # >           2 │+␛[1m/home/ferris/project/pyproject.toml␛[0m␛[36m:␛[0m1␛[36m:␛[0m1␛[36m:␛[0m ␛[1m␛[31mE902␛[0m Permission denied (os error 13)
-  # > ────────────┴───────────────────────────────────────────────────────────────────
-  postPatch = ''
-    substituteInPlace crates/ruff/src/commands/check.rs --replace-fail '
-        #[test]
-        fn unreadable_files() -> Result<()> {' \
-    '
-        #[test]
-        #[ignore = "ANSI Escape Codes trigger snapshot diff"]
-        fn unreadable_files() -> Result<()> {'
-  '';
-
   cargoBuildFlags = [ "--package=ruff" ];
 
   cargoHash = "sha256-gXuRcb1Gk5t2R44/xeE+x3AXccnRyt9SukYYXE0JPQU=";

From 8d8d2550cf88ed492ddec11d57626024ca4e90c7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 11 Aug 2025 15:20:32 +0300
Subject: [PATCH 109/321] gitFull: fix cross compilation evaluate and build

Co-Authored-By: Colin <colin@uninsane.org>
---
 pkgs/applications/version-management/git/default.nix | 2 ++
 pkgs/top-level/all-packages.nix                      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 93452cac87f2c..67e7e9924c106 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -115,6 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix references to gettext introduced by ./git-sh-i18n.patch
     substituteInPlace git-sh-i18n.sh \
         --subst-var-by gettext ${gettext}
+    substituteInPlace contrib/credential/libsecret/Makefile \
+        --replace-fail 'pkg-config' "$PKG_CONFIG"
   ''
   + lib.optionalString doInstallCheck ''
     # ensure we are using the correct shell when executing the test scripts
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81e3e9bedb334..b664439084c0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1202,9 +1202,9 @@ with pkgs;
 
   # The full-featured Git.
   gitFull = git.override {
-    svnSupport = true;
+    svnSupport = stdenv.buildPlatform == stdenv.hostPlatform;
     guiSupport = true;
-    sendEmailSupport = true;
+    sendEmailSupport = stdenv.buildPlatform == stdenv.hostPlatform;
     withSsh = true;
     withLibsecret = !stdenv.hostPlatform.isDarwin;
   };

From 676cdfae80d6353ebdbbdcf24a5679568c885ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 3 Aug 2025 16:59:08 +0700
Subject: [PATCH 110/321] w3m: add toastal to maintainers

---
 pkgs/by-name/w3/w3m/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 404e4c06de09f..835a6489a06fa 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -127,7 +127,10 @@ stdenv.mkDerivation rec {
     homepage = "https://w3m.sourceforge.net/";
     changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog";
     description = "Text-mode web browser";
-    maintainers = with lib.maintainers; [ anthonyroussel ];
+    maintainers = with lib.maintainers; [
+      anthonyroussel
+      toastal
+    ];
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;
     mainProgram = "w3m";

From e4895c4dff19e52191384e33fa1e8609e9edd98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 3 Aug 2025 16:59:23 +0700
Subject: [PATCH 111/321] =?UTF-8?q?w3m:=200.5.3+git20230121=20=E2=86=92=20?=
 =?UTF-8?q?0.5.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let us rejoice in the code forge moving away from Microsoft GitHub!
---
 pkgs/by-name/w3/w3m/package.nix | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 835a6489a06fa..45c1d92b7b834 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchFromSourcehut,
   fetchpatch,
   ncurses,
   boehmgc,
@@ -40,21 +40,27 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "w3m";
-  version = "0.5.3+git20230121";
+  version = "0.5.4";
 
-  src = fetchFromGitHub {
-    owner = "tats";
+  src = fetchFromSourcehut {
+    owner = "~rkta";
     repo = "w3m";
-    rev = "v${version}";
-    hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs=";
+    tag = "v${version}";
+    hash = "sha256-A11vHFiyotFncqWRiljRJbHO1wEzmWTEh1DOel803q4=";
   };
 
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl";
+  env = {
+    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl";
 
-  # we must set these so that the generated files (e.g. w3mhelp.cgi) contain
-  # the correct paths.
-  PERL = "${perl}/bin/perl";
-  MAN = "${man}/bin/man";
+    # we must set these so that the generated files (e.g. w3mhelp.cgi) contain
+    # the correct paths.
+    PERL = "${perl}/bin/perl";
+    MAN = "${man}/bin/man";
+
+    # for w3mimgdisplay
+    # see: https://bbs.archlinux.org/viewtopic.php?id=196093
+    LIBS = lib.optionalString x11Support "-lX11";
+  };
 
   makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
 
@@ -113,10 +119,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  # for w3mimgdisplay
-  # see: https://bbs.archlinux.org/viewtopic.php?id=196093
-  LIBS = lib.optionalString x11Support "-lX11";
-
   passthru.tests.version = testers.testVersion {
     inherit version;
     package = w3m;
@@ -124,8 +126,8 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "https://w3m.sourceforge.net/";
-    changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog";
+    homepage = "https://git.sr.ht/~rkta/w3m";
+    changelog = "https://git.sr.ht/~rkta/w3m/tree/v${version}/item/NEWS";
     description = "Text-mode web browser";
     maintainers = with lib.maintainers; [
       anthonyroussel

From 76d0ab5d74796392aabd37454c4dfee142f99a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Tue, 5 Aug 2025 00:47:36 +0700
Subject: [PATCH 112/321] w3m: use finalAttrs

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

diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 45c1d92b7b834..7e26071c6dc67 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -38,14 +38,14 @@ let
     '';
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "w3m";
   version = "0.5.4";
 
   src = fetchFromSourcehut {
     owner = "~rkta";
     repo = "w3m";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-A11vHFiyotFncqWRiljRJbHO1wEzmWTEh1DOel803q4=";
   };
 
@@ -120,14 +120,14 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   passthru.tests.version = testers.testVersion {
-    inherit version;
+    inherit (finalAttrs) version;
     package = w3m;
     command = "w3m -version";
   };
 
   meta = {
     homepage = "https://git.sr.ht/~rkta/w3m";
-    changelog = "https://git.sr.ht/~rkta/w3m/tree/v${version}/item/NEWS";
+    changelog = "https://git.sr.ht/~rkta/w3m/tree/v${finalAttrs.version}/item/NEWS";
     description = "Text-mode web browser";
     maintainers = with lib.maintainers; [
       anthonyroussel
@@ -137,4 +137,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     mainProgram = "w3m";
   };
-}
+})

From 15efb120d177b04ecfd2e7f9667a4e0535d6913c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Aug 2025 08:36:32 +0200
Subject: [PATCH 113/321] postgresql: fix build

The test is only available on PostgreSQL 18, thus the replace will fail
on anything lower.
---
 pkgs/servers/sql/postgresql/generic.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index de6b2d4e7a028..c22a071299717 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -425,15 +425,16 @@ let
         substituteInPlace "src/Makefile.global.in" --subst-var out
         substituteInPlace "src/common/config_info.c" --subst-var dev
         cat ${./pg_config.env.mk} >> src/common/Makefile
-
-        # This test always fails on hardware with >1 NUMA node: the sysfs
-        # dirs providing information about the topology are hidden in the sandbox,
-        # so postgres assumes there's only a single node `0`. However,
-        # the test checks on which NUMA nodes the allocated pages are which is >1
-        # on such hardware. This in turn triggers a safeguard in the view
-        # which breaks the test.
-        # Manual tests confirm that the testcase behaves properly outside of the
-        # Nix sandbox.
+      ''
+      # This test always fails on hardware with >1 NUMA node: the sysfs
+      # dirs providing information about the topology are hidden in the sandbox,
+      # so postgres assumes there's only a single node `0`. However,
+      # the test checks on which NUMA nodes the allocated pages are which is >1
+      # on such hardware. This in turn triggers a safeguard in the view
+      # which breaks the test.
+      # Manual tests confirm that the testcase behaves properly outside of the
+      # Nix sandbox.
+      + lib.optionalString (atLeast "18") ''
         substituteInPlace src/test/regress/parallel_schedule \
           --replace-fail numa ""
       ''

From b0729bef3448f8b935e24ef929eeef81eaa9cb11 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 9 Aug 2025 01:37:36 +0200
Subject: [PATCH 114/321] uv: 0.8.6 -> 0.8.7

Changelog: https://github.com/astral-sh/uv/releases/tag/0.8.7
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index ce3acab23aa78..f22e30f31ec4c 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-82KKnz42Nn2Ef8DHBWBMPTrQVsM+klIOV8hqSKnXqEY=";
+    hash = "sha256-wJGKaPtrBzByTgAfBj9bNum7B3Vvt1F+MENu/TxLDZM=";
   };
 
-  cargoHash = "sha256-l2/PMPiSPE6WpXOuU21NsMx0vsz9cuy/QeCiSTkbvVw=";
+  cargoHash = "sha256-88ORMuCpfvPU5j7FM16lpOJGA0ktGmbaA8dGYAfvsIU=";
 
   buildInputs = [
     rust-jemalloc-sys

From b21d6348cd7a9b98f812737ec63ce62dfd7ba3ae Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 9 Aug 2025 01:42:12 +0200
Subject: [PATCH 115/321] python3Packages.uv: account for new binary lookup
 methods

uv's Python module now searches for the binary in more multiple places.
Should the user have installed a separate version of the binary, then the Python module
can consider those first, then fallback to nixpkgs' uv
---
 pkgs/development/python-modules/uv/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
index 2ab81cf60602c..a89e43451ec88 100644
--- a/pkgs/development/python-modules/uv/default.nix
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -17,11 +17,12 @@ buildPythonPackage {
   build-system = [ hatchling ];
 
   postPatch =
-    # Do not rely on path lookup at runtime to find the uv binary.
-    # Use the propagated binary instead.
+    # Add the path to the uv binary as a fallback after other path search methods have been exhausted
     ''
       substituteInPlace python/uv/_find_uv.py \
-        --replace-fail '"""Return the uv binary path."""' "return '${lib.getExe uv}'"
+        --replace-fail \
+        'sysconfig.get_path("scripts", scheme=_user_scheme()),' \
+        'sysconfig.get_path("scripts", scheme=_user_scheme()), "${builtins.baseNameOf (lib.getExe uv)}",'
     ''
     # Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs,
     # to avoid rebuilding the uv binary for every active python package set.

From b4d223b979f3c1b335f34eeb09d8c46ecc0fa083 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Mon, 11 Aug 2025 10:14:28 +0000
Subject: [PATCH 116/321] uv: 0.8.7 -> 0.8.11

Changelog: https://github.com/astral-sh/uv/releases/tag/0.8.11
Diff: https://github.com/astral-sh/uv/compare/0.8.7...0.8.11
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index f22e30f31ec4c..2c061fc134068 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.7";
+  version = "0.8.11";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-wJGKaPtrBzByTgAfBj9bNum7B3Vvt1F+MENu/TxLDZM=";
+    hash = "sha256-znTLRCCprUg412h75dK2092/9qpOa+HO3Fe2dFqKON4=";
   };
 
-  cargoHash = "sha256-88ORMuCpfvPU5j7FM16lpOJGA0ktGmbaA8dGYAfvsIU=";
+  cargoHash = "sha256-lKYTKa0x9K0Al3InxjmHOhV225Q7xSZuLGw3xSS3S6c=";
 
   buildInputs = [
     rust-jemalloc-sys

From 2790457dc96d614b173e49e71fc50584a445c947 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Aug 2025 11:33:32 +0000
Subject: [PATCH 117/321] zimg: 3.0.5 -> 3.0.6

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

diff --git a/pkgs/by-name/zi/zimg/package.nix b/pkgs/by-name/zi/zimg/package.nix
index cc49026b01d25..2cbc7badea989 100644
--- a/pkgs/by-name/zi/zimg/package.nix
+++ b/pkgs/by-name/zi/zimg/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zimg";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner = "sekrit-twc";
     repo = "zimg";
     rev = "release-${version}";
-    sha256 = "sha256-DCSqHCnOyIvKtIAfprb8tgtzLn67Ix6BWyeIliu0HO4=";
+    sha256 = "sha256-T+/wuTxPK+PLofqJm3dujGqGGXhpdGQLjAttTQPsgOI=";
   };
 
   outputs = [

From 6cf981fd63fc6e57ceea7c5914c3951a1c21748a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Aug 2025 02:08:20 +0200
Subject: [PATCH 118/321] cacert: 3.114 -> 3.115

https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/Ztj7XiauJMM
---
 pkgs/by-name/ca/cacert/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix
index 67f54f65cc11f..281b77a8a9221 100644
--- a/pkgs/by-name/ca/cacert/package.nix
+++ b/pkgs/by-name/ca/cacert/package.nix
@@ -23,7 +23,7 @@ let
     lib.concatStringsSep "\n\n" extraCertificateStrings
   );
 
-  srcVersion = "3.114";
+  srcVersion = "3.115";
   version = if nssOverride != null then nssOverride.version else srcVersion;
   meta = with lib; {
     homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -47,7 +47,7 @@ let
           owner = "nss-dev";
           repo = "nss";
           rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM";
-          hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+          hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
         };
 
     dontBuild = true;

From fea9101ab466481c66f8a8138e849dd283c0c340 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 5 Aug 2025 15:41:20 +0100
Subject: [PATCH 119/321] rsync: fix tests in Darwin sandbox

---
 .../networking/sync/rsync/default.nix         |  7 +++
 .../rsync/fix-tests-in-darwin-sandbox.patch   | 56 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/networking/sync/rsync/fix-tests-in-darwin-sandbox.patch

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 6d486e5040fed..c87d1015ef4fc 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-KSS8s6Hti1UfwQH3QLnw/gogKxFQJ2R89phQ1l/YjFI=";
   };
 
+  patches = [
+    # See: <https://github.com/RsyncProject/rsync/pull/790>
+    ./fix-tests-in-darwin-sandbox.patch
+  ];
+
   nativeBuildInputs = [
     updateAutotoolsGnuConfigScriptsHook
     perl
@@ -75,6 +80,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Fast incremental file transfer utility";
     homepage = "https://rsync.samba.org/";
diff --git a/pkgs/applications/networking/sync/rsync/fix-tests-in-darwin-sandbox.patch b/pkgs/applications/networking/sync/rsync/fix-tests-in-darwin-sandbox.patch
new file mode 100644
index 0000000000000..d9209a97c1ed3
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/fix-tests-in-darwin-sandbox.patch
@@ -0,0 +1,56 @@
+From 9b104ed9859f17b6ed4c4ad01806c75a0c197dd7 Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Tue, 5 Aug 2025 15:55:24 +0100
+Subject: [PATCH] Allow `ls(1)` to fail in test setup
+
+This can happen when the tests are unable to `stat(2)` some files in
+`/etc`, `/bin`, or `/`, due to Unix permissions or other sandboxing. We
+still guard against serious errors, which use exit code 2.
+---
+ testsuite/longdir.test | 4 ++--
+ testsuite/rsync.fns    | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/testsuite/longdir.test b/testsuite/longdir.test
+index 8d66bb5f..26747292 100644
+--- a/testsuite/longdir.test
++++ b/testsuite/longdir.test
+@@ -16,9 +16,9 @@ makepath "$longdir" || test_skipped "unable to create long directory"
+ touch "$longdir/1" || test_skipped "unable to create files in long directory"
+ date > "$longdir/1"
+ if [ -r /etc ]; then
+-    ls -la /etc >"$longdir/2"
++    ls -la /etc >"$longdir/2" || [ $? -eq 1 ]
+ else
+-    ls -la / >"$longdir/2"
++    ls -la / >"$longdir/2" || [ $? -eq 1 ]
+ fi
+ checkit "$RSYNC --delete -avH '$fromdir/' '$todir'" "$fromdir/" "$todir"
+ 
+diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
+index 2ab97b69..f7da363f 100644
+--- a/testsuite/rsync.fns
++++ b/testsuite/rsync.fns
+@@ -195,15 +195,15 @@ hands_setup() {
+     echo some data > "$fromdir/dir/subdir/foobar.baz"
+     mkdir "$fromdir/dir/subdir/subsubdir"
+     if [ -r /etc ]; then
+-	ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list"
++	ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" || [ $? -eq 1 ]
+     else
+-	ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list"
++	ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" || [ $? -eq 1 ]
+     fi
+     mkdir "$fromdir/dir/subdir/subsubdir2"
+     if [ -r /bin ]; then
+-	ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list"
++	ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" || [ $? -eq 1 ]
+     else
+-	ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list"
++	ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" || [ $? -eq 1 ]
+     fi
+ 
+ #      echo testing head:
+-- 
+2.50.1
+

From 612e1e9be4b1f391b4f9d3ee8ef681b1d56a1b90 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 15 Aug 2025 22:57:54 -0400
Subject: [PATCH 120/321] moltenvk: 1.2.11 -> 1.3.0

This should solve an issue with llama-cpp-vulkan server generating
garbage tokens, as described in:

https://github.com/KhronosGroup/MoltenVK/issues/2423
https://github.com/containers/ramalama/issues/1843
---
 pkgs/by-name/mo/moltenvk/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
index 4fd4aa6e6b3be..576cab57fa59c 100644
--- a/pkgs/by-name/mo/moltenvk/package.nix
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   gitUpdater,
   apple-sdk_15,
   cereal,
@@ -22,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "MoltenVK";
-  version = "1.2.11";
+  version = "1.3.0";
 
   strictDeps = true;
 
@@ -48,18 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "KhronosGroup";
     repo = "MoltenVK";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-24qQnJ0RnJP2M4zSlSlQ4c4dVZtHutNiCvjrsCDw6wY=";
+    hash = "sha256-V69P1t48XP/pAPgpVsnFeCBidhHk60XGHRkHF6AEke0=";
   };
 
-  patches = [
-    # Cherry-pick patch to fix build failure due to a hardcoded SPIRV-Cross namespace.
-    # This can be dropped for MoltenVK 1.2.12.
-    (fetchpatch2 {
-      url = "https://github.com/KhronosGroup/MoltenVK/commit/856c8237ac3b32178caae3408effc35bedfdffa1.patch?full_index=1";
-      hash = "sha256-dVTop8sU19Swdb3ajbI+6S715NaxTqd7d0yQ/FDqxqY=";
-    })
-  ];
-
   postPatch = ''
     # Move `mvkGitRevDerived.h` to a stable location
     substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \

From 2ca19ba6eed74de98988416322fe03b5b80ad59b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 5 Aug 2025 18:39:37 +0100
Subject: [PATCH 121/321] pinentry_mac: fix the build with `sandbox = true`

---
 .../fix-with-xcbuild-plistbuddy.patch         | 21 +++++++++++++++++++
 pkgs/tools/security/pinentry/mac.nix          | 12 ++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch

diff --git a/pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch b/pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch
new file mode 100644
index 0000000000000..3af1da2319de4
--- /dev/null
+++ b/pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch
@@ -0,0 +1,21 @@
+diff --git a/macosx/copyInfoPlist.sh b/macosx/copyInfoPlist.sh
+index f366665153..dfd9511e79 100755
+--- a/macosx/copyInfoPlist.sh
++++ b/macosx/copyInfoPlist.sh
+@@ -20,9 +20,10 @@
+ cp "$1" "$dest" || exit 1
+ 
+ 
+-/usr/libexec/PlistBuddy \
+-	-c "Set CommitHash '${COMMIT_HASH:--}'" \
+-	-c "Set BuildNumber '${BUILD_NUMBER:-0}'" \
+-	-c "Set CFBundleVersion '${BUILD_VERSION:-0n}'" \
+-	-c "Set CFBundleShortVersionString '$VERSION'" \
+-	"$dest" || exit 1
++PlistBuddy "$dest" <<EOF || exit 1
++    Set CommitHash "${COMMIT_HASH:--}"
++    Set BuildNumber "${BUILD_NUMBER:-0}"
++    Set CFBundleVersion "${BUILD_VERSION:-0n}"
++    Set CFBundleShortVersionString "$VERSION"
++    Save
++EOF
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 59e5f1cad6134..17978b0ae856a 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -7,6 +7,7 @@
   libgpg-error,
   makeBinaryWrapper,
   texinfo,
+  xcbuild,
   common-updater-scripts,
   writers,
 }:
@@ -27,6 +28,9 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./gettext-0.25.patch
+
+    # Fix the build with xcbuild’s inferior `PlistBuddy(8)`.
+    ./fix-with-xcbuild-plistbuddy.patch
   ];
 
   # use pregenerated nib files because generating them requires XCode
@@ -38,16 +42,14 @@ stdenv.mkDerivation rec {
     cp '${lib.getDev libassuan}/share/aclocal/libassuan.m4' m4/libassuan.m4
   '';
 
-  # Unfortunately, PlistBuddy from xcbuild is not compatible enough pinentry-mac’s build process.
-  sandboxProfile = ''
-    (allow process-exec (literal "/usr/libexec/PlistBuddy"))
-  '';
-
   strictDeps = true;
   nativeBuildInputs = [
     autoreconfHook
     makeBinaryWrapper
     texinfo
+
+    # for `PlistBuddy(8)`
+    xcbuild
   ];
 
   configureFlags = [

From c368b87289aaa3a9fb89418bc449a79a75dfd98a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 16 Aug 2025 06:28:03 +0100
Subject: [PATCH 122/321] btrfs-progs: 6.15 -> 6.16

Changes: https://github.com/kdave/btrfs-progs/releases/tag/v6.16
---
 pkgs/by-name/bt/btrfs-progs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index fe0c062745165..04fcbd08175e2 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "6.15";
+  version = "6.16";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    hash = "sha256-V9pCjdIZn9iNg+zxytBWeM54ZA735S12M76Yh872dLs=";
+    hash = "sha256-Makw+HN8JhioJK1L0f3YP1QQPg6qFaqtxIT/rjNGb8U=";
   };
 
   nativeBuildInputs = [

From 0456b29ff803e9337002fa62113f96fc271f4c95 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 12 Aug 2025 15:09:04 +0200
Subject: [PATCH 123/321] php: fix systemdLibs dependency

---
 pkgs/development/interpreters/php/generic.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 22e8b68e8b058..7c31b26702556 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -24,7 +24,7 @@ let
       libargon2,
       libxml2,
       pcre2,
-      systemd,
+      systemdLibs,
       system-sendmail,
       valgrind,
       xcbuild,
@@ -58,7 +58,7 @@ let
       ipv6Support ? true,
       zendSignalsSupport ? true,
       zendMaxExecutionTimersSupport ? false,
-      systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
+      systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
       valgrindSupport ?
         !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind,
       ztsSupport ? apxs2Support,
@@ -250,7 +250,7 @@ let
             # Misc deps
             ++ lib.optional apxs2Support apacheHttpd
             ++ lib.optional argon2Support libargon2
-            ++ lib.optional systemdSupport systemd
+            ++ lib.optional systemdSupport systemdLibs
             ++ lib.optional valgrindSupport valgrind;
 
           CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

From b17f8f14edf1937dc6957d2156a959ae1afbf2d4 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 12 Aug 2025 15:09:21 +0200
Subject: [PATCH 124/321] at-spi2-core: fix systemdLibs dependency

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

diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index 461d2002ddf77..97efa5cc60e47 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -21,8 +21,8 @@
   libXi,
   libXext,
   gnome,
-  systemd,
-  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  systemdLibs,
+  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals systemdSupport [
     # libsystemd is a needed for dbus-broker support
-    systemd
+    systemdLibs
   ];
 
   # In atspi-2.pc dbus-1 glib-2.0

From 6f6f2f358a08fa29b231b2307829018a8b14fe34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 16 Aug 2025 16:06:57 +0200
Subject: [PATCH 125/321] python3Packages.mypy: 1.15.0 -> 1.17.1

https://github.com/python/mypy/blob/refs/tags/v1.17.1/CHANGELOG.md
---
 pkgs/development/python-modules/mypy/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 01b502c88ed95..97bffb85a3ba6 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -10,10 +10,10 @@
   isPyPy,
 
   # build-system
+  pathspec,
   setuptools,
   types-psutil,
   types-setuptools,
-  wheel,
 
   # propagates
   mypy-extensions,
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "1.15.0";
+  version = "1.17.1";
   pyproject = true;
 
   # relies on several CPython internals
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "python";
     repo = "mypy";
     tag = "v${version}";
-    hash = "sha256-y67kt5i8mT9TcSbUGwnNuTAeqjy9apvWIbA2QD96LS4=";
+    hash = "sha256-FfONUCCMU1bJXHx3GHH46Tu+wYU5FLPOqeCSCi1bRSs=";
   };
 
   patches = [
@@ -62,13 +62,12 @@ buildPythonPackage rec {
 
   build-system = [
     mypy-extensions
+    pathspec
     setuptools
     types-psutil
     types-setuptools
     typing-extensions
-    wheel
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   dependencies = [
     mypy-extensions

From f2b5d603728f84f5f8f4dceda13f5116c898907b Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Sun, 17 Aug 2025 13:09:26 +0200
Subject: [PATCH 126/321] bubblewrap: add dev output to reduce closure size of
 static build (#433640)

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

diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix
index eba4f666e176e..2aaf1399a90b5 100644
--- a/pkgs/by-name/bu/bubblewrap/package.nix
+++ b/pkgs/by-name/bu/bubblewrap/package.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U=";
   };
 
+  outputs = [
+    "out"
+    "dev"
+  ];
+
   postPatch = ''
     substituteInPlace tests/libtest.sh \
       --replace "/var/tmp" "$TMPDIR"

From 5bf25dffb60121a57c192893820058f916a6601b Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 15 Jul 2025 03:35:14 +0800
Subject: [PATCH 127/321] python3Packages.buildPythonPackage: default
 enabledTestPaths = [ "." ]

Explicitly provide a default value for the argument `enabledTestPaths`
as the current working directory (`enabledTestPaths = [ "." ]`)
to simplify overriding (making `enabledTestPaths` always specified as a
non-empty list) while preserving `pytest`'s default behaviour of
discovering tests in the current working directory.

Assert the specified `enabledTestPaths` value to be a non-empty list.
---
 doc/languages-frameworks/python.section.md           |  1 +
 doc/release-notes/rl-2511.section.md                 |  6 ++++++
 .../interpreters/python/mk-python-derivation.nix     | 12 +++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 23db76baad970..30a53f5bb6d8b 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1285,6 +1285,7 @@ Adding `pytest` is not required, since it is included with `pytestCheckHook`.
 `enabledTestPaths` and `disabledTestPaths`
 
 :   To specify path globs (files or directories) or test items.
+    `enabledTestPaths` defaults to `[ "." ]`.
 
 `enabledTests` and `disabledTests`
 
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 145185bdf26ed..b463db47606a8 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -18,6 +18,12 @@
 
 - The minimum version of Nix required to evaluate Nixpkgs has been raised from 2.3 to 2.18.
 
+- `buildPythonPackage` and `buildPythonApplication` now set `enabledTestPaths = [ "." ]` by default if not specified otherwise, and require the specified value to be a non-empty list to simplify overriding.
+
+  When running install-checks with `pytestCheckHook`, such default value resembles `pytest`'s default behaviour of discovering tests in the current working directory.
+
+  To support both version of Nixpkgs before and after this change, set `enabledTestPaths = [ "." ]` manually for packages that don't need custom `enabledTestPaths` specification.
+
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 9d392bfcb95ae..4ae97d06b2767 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -431,6 +431,17 @@ let
       # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
       installCheckPhase = attrs.checkPhase;
     }
+    // {
+      # `pytest` defaults to discover tests in the current directory if no paths or test items are specified.
+      # Provide an explicit default value to simplify overriding.
+      enabledTestPaths =
+        if attrs ? enabledTestPaths then
+          lib.throwIf (!lib.isList attrs.enabledTestPaths || attrs.enabledTestPaths == [ ])
+            "${lib.getName finalAttrs}: enabledTestPaths must be a non-empty list (default to [ \".\" ])."
+            attrs.enabledTestPaths
+        else
+          [ "." ];
+    }
     //
       lib.mapAttrs
         (
@@ -442,7 +453,6 @@ let
         (
           getOptionalAttrs [
             "enabledTestMarks"
-            "enabledTestPaths"
             "enabledTests"
           ] attrs
         )

From bca7f7493062145e34713a0e09c1c10df1f992e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Aug 2025 14:25:04 -0600
Subject: [PATCH 128/321] =?UTF-8?q?cargo-c:=200.10.14=20=E2=86=92=200.10.1?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ca/cargo-c/package.nix                 |  8 ++++----
 pkgs/development/libraries/gstreamer/rs/default.nix | 13 +------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index 287040197f519..557b21f65d0e9 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -12,19 +12,19 @@
 
 let
   # this version may need to be updated along with package version
-  cargoVersion = "0.89.0";
+  cargoVersion = "0.90.0";
 in
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.10.14";
+  version = "0.10.15";
 
   src = fetchCrate {
     inherit pname;
     version = "${version}+cargo-${cargoVersion}";
-    hash = "sha256-t6cbufPdpyaFzwEFWt19Nid2S5FXCJCS+SHJ0aJICX0=";
+    hash = "sha256-szqDSHGihE+Oj8L3EBlC5XH4kSBYOptd0Xtk3MhXooQ=";
   };
 
-  cargoHash = "sha256-nW+akmbpIGZnhJLBdwDAGI4m5eSwdT2Z/iY2RV4zMQY=";
+  cargoHash = "sha256-36ygs/EhCktG1jmBnP9c7EgnfcWnGrqqcW3qAw+Yfy4=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index d1f33e7951d89..983bcc1b197df 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -127,17 +127,6 @@ let
       ) (lib.attrNames validPlugins);
 
   invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins;
-
-  # TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138
-  cargo-c' = (cargo-c.__spliced.buildHost or cargo-c).overrideAttrs (oldAttrs: {
-    patches = (oldAttrs.patches or [ ]) ++ [
-      (fetchpatch {
-        name = "cargo-c-test-rlib-fix.patch";
-        url = "https://github.com/lu-zero/cargo-c/commit/dd02009d965cbd664785149a90d702251de747b3.diff";
-        hash = "sha256-Az0WFF9fc5+igcV8C/QFhq5GE4PAyGEO84D9ECxx3v0=";
-      })
-    ];
-  });
 in
 assert lib.assertMsg (invalidPlugins == [ ])
   "Invalid gst-plugins-rs plugin${
@@ -205,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustc
     cargo
-    cargo-c'
+    cargo-c
     nasm
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [

From 260eef77c3075eb3fc02e8475147d6940ec837d2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 11:38:21 +0200
Subject: [PATCH 129/321] util-macros: don't propegate tools

---
 pkgs/by-name/ut/util-macros/package.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix
index a6ff12c619b1c..08b724b23c5d3 100644
--- a/pkgs/by-name/ut/util-macros/package.nix
+++ b/pkgs/by-name/ut/util-macros/package.nix
@@ -3,9 +3,6 @@
   stdenv,
   fetchurl,
   pkg-config,
-  automake,
-  autoconf,
-  libtool,
   testers,
   writeScript,
 }:
@@ -22,13 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
 
-  # not needed for releases, we propagate the needed tools
-  propagatedNativeBuildInputs = [
-    automake
-    autoconf
-    libtool
-  ];
-
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     updateScript = writeScript "update-${finalAttrs.pname}" ''

From a4f579ce48242441b1b26499d96f4c5b5494a3db Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 11:42:06 +0200
Subject: [PATCH 130/321] util-macros: remove unused inputs

---
 pkgs/by-name/ut/util-macros/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix
index 08b724b23c5d3..f97b1298ddfe1 100644
--- a/pkgs/by-name/ut/util-macros/package.nix
+++ b/pkgs/by-name/ut/util-macros/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  pkg-config,
   testers,
   writeScript,
 }:
@@ -17,8 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ pkg-config ];
-
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     updateScript = writeScript "update-${finalAttrs.pname}" ''

From 6edbf9f2bb2c151cabba657f413f0b55c1913b53 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 11:46:13 +0200
Subject: [PATCH 131/321] util-macros: switch from fetchurl to fetchFromGitLab

---
 pkgs/by-name/ut/util-macros/package.nix | 29 ++++++++++++++-----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix
index f97b1298ddfe1..696ac85b361cc 100644
--- a/pkgs/by-name/ut/util-macros/package.nix
+++ b/pkgs/by-name/ut/util-macros/package.nix
@@ -1,31 +1,34 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   testers,
-  writeScript,
+  gitUpdater,
+  autoreconfHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "util-macros";
   version = "1.20.2";
 
-  src = fetchurl {
-    url = "mirror://xorg/individual/util/util-macros-${finalAttrs.version}.tar.xz";
-    hash = "sha256-msJp66JPZy19ezV05L5fMz0T8Ep3EjA7GCGypRrILo4=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "util";
+    repo = "macros";
+    tag = "util-macros-${finalAttrs.version}";
+    hash = "sha256-COIWe7GMfbk76/QUIRsN5yvjd6MEarI0j0M+Xa0WoKQ=";
   };
 
   strictDeps = true;
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    updateScript = writeScript "update-${finalAttrs.pname}" ''
-      #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p common-updater-scripts
-      version="$(list-directory-versions --pname ${finalAttrs.pname} \
-        --url https://xorg.freedesktop.org/releases/individual/util/ \
-        | sort -V | tail -n1)"
-      update-source-version ${finalAttrs.pname} "$version"
-    '';
+    updateScript = gitUpdater {
+      rev-prefix = "util-macros-";
+      ignoredVersions = "1_0_2";
+    };
   };
 
   meta = {

From 5742f1cc4c01c2c2946f40b3ff41d89b58a46f75 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 11:47:16 +0200
Subject: [PATCH 132/321] util-macros: add maintainers

---
 pkgs/by-name/ut/util-macros/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix
index 696ac85b361cc..ed69e3a5dc003 100644
--- a/pkgs/by-name/ut/util-macros/package.nix
+++ b/pkgs/by-name/ut/util-macros/package.nix
@@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
       hpndSellVariant
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      raboof
+      jopejoe1
+    ];
     pkgConfigModules = [ "xorg-macros" ];
     platforms = lib.platforms.unix;
   };

From bb9f1ba75968ad147483f42bd1e8b89fc7fbaeb9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 11:53:42 +0200
Subject: [PATCH 133/321] xorg-autoconf: remove in favor if util-macros

---
 pkgs/by-name/xl/xlogo/package.nix         |  4 +--
 pkgs/by-name/xo/xorg-autoconf/package.nix | 30 -----------------------
 pkgs/by-name/xs/xscope/package.nix        |  4 +--
 pkgs/top-level/aliases.nix                |  1 +
 4 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/xo/xorg-autoconf/package.nix

diff --git a/pkgs/by-name/xl/xlogo/package.nix b/pkgs/by-name/xl/xlogo/package.nix
index 0650a184bdd1b..bfda0f92396ce 100644
--- a/pkgs/by-name/xl/xlogo/package.nix
+++ b/pkgs/by-name/xl/xlogo/package.nix
@@ -5,7 +5,7 @@
   xorg,
   autoreconfHook,
   pkg-config,
-  xorg-autoconf,
+  util-macros,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    xorg-autoconf
+    util-macros
     autoreconfHook
     pkg-config
   ];
diff --git a/pkgs/by-name/xo/xorg-autoconf/package.nix b/pkgs/by-name/xo/xorg-autoconf/package.nix
deleted file mode 100644
index 6a42c592c5c0c..0000000000000
--- a/pkgs/by-name/xo/xorg-autoconf/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  stdenv,
-  autoreconfHook,
-  fetchFromGitLab,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xorg-autoconf";
-  version = "1.19.3";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    group = "xorg";
-    owner = "util";
-    repo = "macros";
-    rev = "util-macros-${version}";
-    sha256 = "sha256-+yEMCjLztdY5LKTNjfhudDS0fdaOj4LKZ3YL5witFR4=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  meta = with lib; {
-    description = "GNU autoconf macros shared across X.Org projects";
-    homepage = "https://gitlab.freedesktop.org/xorg/util/macros";
-    maintainers = with maintainers; [ raboof ];
-    license = licenses.mit;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/xs/xscope/package.nix b/pkgs/by-name/xs/xscope/package.nix
index 4ef86bedff1ed..71f766571413d 100644
--- a/pkgs/by-name/xs/xscope/package.nix
+++ b/pkgs/by-name/xs/xscope/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   pkg-config,
   autoreconfHook,
-  xorg-autoconf,
+  util-macros,
   xorg,
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    xorg-autoconf
+    util-macros
   ];
 
   buildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e399b3a5f936a..e61cd0038b6bf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2210,6 +2210,7 @@ mapAliases {
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
   xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
   xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
+  xorg-autoconf = util-macros; # Added 2025-08-18
   xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
   xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27

From 8da1841bfe1e0700b9e84f5cfbc8506f2111c922 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Mon, 18 Aug 2025 20:46:20 +0100
Subject: [PATCH 134/321] git: 2.50.1 -> 2.51.0

Changelog: https://git.kernel.org/pub/scm/git/git.git/tree/Documentation/RelNotes/2.51.0.adoc?h=v2.51.0

This also removes some contrib scripts that are no longer packaged with
Git.
---
 .../version-management/git/default.nix        | 10 ++------
 .../git/git-send-email-honor-PATH.patch       | 24 ++++++++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index aae74bc541c0f..8be72836cf2db 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.50.1";
+  version = "2.51.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-fj5sNt7L2PHu3RTULbZnS+A2ccIgSGS++ipBdWxcj8Q=";
+    hash = "sha256-YKfCJRzC5YjVzYe65WcmBhfG3gwi3KnNv8TH0riZC2I=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -301,12 +301,6 @@ stdenv.mkDerivation (finalAttrs: {
     cp -a contrib $out/share/git/
     mkdir -p $out/share/bash-completion/completions
     ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
-    # only readme, developed in another repo
-    rm -r contrib/hooks/multimail
-    mkdir -p $out/share/git-core/contrib
-    cp -a contrib/hooks/ $out/share/git-core/contrib/
-    substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \
-      --replace ' grep' ' ${gnugrep}/bin/grep' \
 
     # grep is a runtime dependency, need to patch so that it's found
     substituteInPlace $out/libexec/git-core/git-sh-setup \
diff --git a/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch
index 04c02fb853ea9..40369921240b1 100644
--- a/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch
+++ b/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch
@@ -1,29 +1,25 @@
 diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc
-index 7f223db42d..7e46a07d31 100644
+index 5d13a856a7..5c9978c1e4 100644
 --- a/Documentation/git-send-email.adoc
 +++ b/Documentation/git-send-email.adoc
-@@ -177,7 +177,7 @@ Sending
+@@ -190,7 +190,7 @@ Sending
  	The command will be executed in the shell if necessary.  Default
  	is the value of `sendemail.sendmailCmd`.  If unspecified, and if
- 	--smtp-server is also unspecified, git-send-email will search
--	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.
-+	for `sendmail` in $PATH.
+ 	`--smtp-server` is also unspecified, `git send-email` will search
+-	for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH`.
++	for `sendmail` in `$PATH`.
  
  --smtp-encryption=<encryption>::
  	Specify in what way encrypting begins for the SMTP connection.
-@@ -233,9 +233,9 @@ a password is obtained using 'git-credential'.
- --smtp-server=<host>::
+@@ -247,7 +247,7 @@ a password is obtained using linkgit:git-credential[1].
  	If set, specifies the outgoing SMTP server to use (e.g.
  	`smtp.example.com` or a raw IP address).  If unspecified, and if
--	`--sendmail-cmd` is also unspecified, the default is to search
--	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a
--	program is available, falling back to `localhost` otherwise.
-+	`--sendmail-cmd` is also unspecified, the default is to search for
-+	`sendmail` in $PATH if such a program is available, falling back to
-+	`localhost` otherwise.
+ 	`--sendmail-cmd` is also unspecified, the default is to search
+-	for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH` if such a
++	for `sendmail` in `$PATH` if such a
+ 	program is available, falling back to `localhost` otherwise.
  +
  For backward compatibility, this option can also specify a full pathname
- of a sendmail-like program instead; the program must support the `-i`
 diff --git a/git-send-email.perl b/git-send-email.perl
 index 798d59b84f..69c9cc2a7d 100755
 --- a/git-send-email.perl

From 7cd9593babb2f55c9bf0f785eb622b6556143cef Mon Sep 17 00:00:00 2001
From: DESPsyched <priyanshu.tripathi@deshaw.com>
Date: Mon, 18 Aug 2025 15:06:45 -0400
Subject: [PATCH 135/321] python3Packages.cfn-lint: 1.38.2 -> 1.38.3

---
 .../python-modules/cfn-lint/default.nix           | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 1f3434430a7c5..e3bea6456b11d 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "1.38.2";
+  version = "1.38.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
     tag = "v${version}";
-    hash = "sha256-oHbTB4XOyYSazyhO6No2+Z9QRR8tnuB3E4kGzG1HwTk=";
+    hash = "sha256-n3NHmbo3qRhP7oqUOokw8oGnNXo4rhRhuAgL66hvfog=";
   };
 
   build-system = [ setuptools ];
@@ -79,17 +79,6 @@ buildPythonPackage rec {
   disabledTests = [
     # Requires git directory
     "test_update_docs"
-    # Tests depend on network access (fails in getaddrinfo)
-    "test_update_resource_specs_python_2"
-    "test_update_resource_specs_python_3"
-    "test_sarif_formatter"
-    # Some CLI tests fails
-    "test_bad_config"
-    "test_override_parameters"
-    "test_positional_template_parameters"
-    "test_template_config"
-    # Assertion error
-    "test_build_graph"
   ];
 
   pythonImportsCheck = [ "cfnlint" ];

From 8d51c6277ecc2ffe3a97f0fda789160b49147615 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Wed, 13 Aug 2025 14:23:52 +0200
Subject: [PATCH 136/321] kbd: 2.8.0 -> 2.8.0-unstable-2025-08-12

Link compression libs directly.

- Clean up derivation
- Remove NIX_LDFLAGS which achieved nothing. Static compilation works
  without it on master. It's unclear what this should've every achieved.
  kbd doesn't link against audit.
- Build directly from source now instead of the preconfigured tarball
  (avoids xz-style issues)
---
 nixos/modules/config/console.nix |   1 -
 pkgs/by-name/kb/kbd/package.nix  | 127 +++++++++++++++++--------------
 2 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 7c126df4e878b..828a0499b6172 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -195,7 +195,6 @@ in
             "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
             "${config.boot.initrd.systemd.package.kbd}/bin/setfont"
             "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
-            "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed
           ]
           ++ lib.optionals (cfg.font != null && lib.hasPrefix builtins.storeDir cfg.font) [
             "${cfg.font}"
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 09d694330a2d9..75e20132fe869 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -1,34 +1,38 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchgit,
   nixosTests,
   autoreconfHook,
   pkg-config,
   flex,
+  perl,
+  bison,
+  autoPatchelfHook,
   check,
   pam,
   bash,
   bashNonInteractive,
   coreutils,
-  gzip,
+  zlib,
   bzip2,
   xz,
   zstd,
   gitUpdater,
+  pkgsCross,
   withVlock ? true,
-  compress ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "kbd";
-  version = "2.8.0";
+  version = "2.8.0-unstable-2025-08-12";
 
   __structuredAttrs = true;
 
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
-    hash = "sha256-AfWAbafR009ZS3sqauGrIyFTRM8QZOjtzTqQ/vl3ahE=";
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git";
+    rev = "46295167a55643e941c8cdcfd2cb76bd138c851c";
+    hash = "sha256-m1aVfsEme/BnyJogOPvGcOrSJfli8B/TrGxOm4POt0w=";
   };
 
   # vlock is moved into its own output, since it depends on pam. This
@@ -43,20 +47,6 @@ stdenv.mkDerivation rec {
     "vlock"
   ];
 
-  configureFlags = [
-    "--enable-optional-progs"
-    "--enable-libkeymap"
-    "--disable-nls"
-    (lib.enableFeature withVlock "vlock")
-  ]
-  ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
-    "ac_cv_func_malloc_0_nonnull=yes"
-    "ac_cv_func_realloc_0_nonnull=yes"
-  ]
-  ++ lib.optionals (!compress) [
-    "--disable-compress"
-  ];
-
   patches = [
     ./search-paths.patch
   ];
@@ -73,68 +63,87 @@ stdenv.mkDerivation rec {
     mv fgGIod/trf{,-fgGIod}.map
     mv colemak/{en-latin9,colemak}.map
     popd
-
-    sed -i '
-      1i prefix:=$(vlock)
-      1i bindir := $(vlock)/bin' \
-      src/vlock/Makefile.in \
-      src/vlock/Makefile.am
-  ''
-  + lib.optionalString compress ''
-    # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`.
-    substituteInPlace src/libkbdfile/kbdfile.c \
-      --replace-fail 'gzip '  '${gzip}/bin/gzip ' \
-      --replace-fail 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \
-      --replace-fail 'xz '    '${xz.bin}/bin/xz ' \
-      --replace-fail 'zstd '  '${zstd.bin}/bin/zstd '
   '';
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    for s in unicode_{start,stop}; do
-      substituteInPlace ''${!outputBin}/bin/$s \
-        --replace-fail /usr/bin/tty ${coreutils}/bin/tty
-      moveToOutput "bin/$s" "$scripts"
-    done
+  preConfigure = ''
+    # Perl and Bash only used during build time
+    patchShebangs --build contrib/
   '';
 
-  buildInputs = [
-    check
-    bash
+  configureFlags = [
+    "--enable-optional-progs"
+    "--enable-libkeymap"
+    "--disable-nls"
+    (lib.enableFeature withVlock "vlock")
   ]
-  ++ lib.optionals withVlock [ pam ];
+  ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
+
+  strictDeps = true;
+  enableParallelBuilding = true;
 
-  NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit";
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
     flex
+    perl
+    bison
+    autoPatchelfHook # for patching dlopen()
+  ];
+
+  nativeCheckInputs = [
+    check
   ];
-  strictDeps = true;
 
-  outputChecks.out.disallowedRequisites = lib.optionals (!compress) [
+  buildInputs = [
+    zlib
+    bzip2
+    xz
+    zstd
+    bash
+  ]
+  ++ lib.optionals withVlock [ pam ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/unicode_{start,stop} \
+      --replace-fail /usr/bin/tty ${coreutils}/bin/tty
+
+    moveToOutput bin/unicode_start $scripts
+    moveToOutput bin/unicode_stop $scripts
+  ''
+  + lib.optionalString withVlock ''
+    moveToOutput bin/vlock $vlock
+    moveToOutput etc/pam.d/vlock $vlock
+  '';
+
+  outputChecks.out.disallowedRequisites = [
     bash
     bashNonInteractive
   ];
 
-  passthru.tests = {
-    inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
-  };
   passthru = {
-    gzip = gzip;
     updateScript = gitUpdater {
       # No nicer place to find latest release.
       url = "https://github.com/legionus/kbd.git";
       rev-prefix = "v";
     };
+    tests = {
+      cross =
+        let
+          systemString = if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform";
+        in
+        pkgsCross.${systemString}.kbd;
+      inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
+    };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://kbd-project.org/";
     description = "Linux keyboard tools and keyboard maps";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ davidak ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ davidak ];
   };
 }

From b254ec74f985dfe84d79b01d860c61520105d5be Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Fri, 15 Aug 2025 17:28:23 +0200
Subject: [PATCH 137/321] kbdCompress: drop

---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 637744c55e310..9393666c7b858 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12529,10 +12529,6 @@ with pkgs;
 
   kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
 
-  kbdCompressed = callPackage ../by-name/kb/kbd/package.nix {
-    compress = true;
-  };
-
   kexi = libsForQt5.callPackage ../applications/office/kexi { };
 
   kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };

From 33ebeb9d19e76946cabdcc27eca68d63f43a7683 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 19 Aug 2025 06:29:23 +0100
Subject: [PATCH 138/321] imath: 3.2.0 -> 3.2.1

Changes: https://github.com/AcademySoftwareFoundation/Imath/releases/tag/v3.2.1
---
 pkgs/by-name/im/imath/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix
index 4ce7105df9361..710938feddcca 100644
--- a/pkgs/by-name/im/imath/package.nix
+++ b/pkgs/by-name/im/imath/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "imath";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "imath";
     rev = "v${version}";
-    sha256 = "sha256-tdJh8aRVakdu2zDeGA/0JCCNzdv6s6x55eUpgNJtuI0=";
+    hash = "sha256-O8IpP2MQ7egDbHIiL5TNBygmQCiS6Q/0VSe0LypsM/g=";
   };
 
   nativeBuildInputs = [ cmake ];

From af25844da2b78dc17c8fffda9a89104803ead743 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 19 Aug 2025 16:53:12 +1000
Subject: [PATCH 139/321] ruby_3_3: 3.3.8 -> 3.3.9

Release: https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/
---
 pkgs/development/interpreters/ruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 22d04a3499bc6..a713c5a3702d5 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -425,8 +425,8 @@ in
   };
 
   ruby_3_3 = generic {
-    version = rubyVersion "3" "3" "8" "";
-    hash = "sha256-WuKKh6WaPkrWa8KTHSMturlT0KqPa687xPj4CXfInKs=";
+    version = rubyVersion "3" "3" "9" "";
+    hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E=";
     cargoHash = "sha256-xE7Cv+NVmOHOlXa/Mg72CTSaZRb72lOja98JBvxPvSs=";
   };
 

From 484ef2ad0577dc24644f15c9d0fadf15d41a4e59 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 19 Aug 2025 12:49:17 +0200
Subject: [PATCH 140/321] cryptsetup: 2.8.0 -> 2.8.1

https://gitlab.com/cryptsetup/cryptsetup/-/raw/main/docs/v2.8.1-ReleaseNotes

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/cr/cryptsetup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix
index 277208c0be3a5..fbcb5dccfcc82 100644
--- a/pkgs/by-name/cr/cryptsetup/package.nix
+++ b/pkgs/by-name/cr/cryptsetup/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cryptsetup";
-  version = "2.8.0";
+  version = "2.8.1";
 
   outputs = [
     "bin"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-zJ4tN8JahxzqN1ILKNUyIHsMFnD7EPxU1oBx9j9SQ6I=";
+    hash = "sha256-LDN563ZZfcq1CRFEmwE+JpfEv/zHFtu/DZsOj7u0b7Q=";
   };
 
   patches = [

From 25fedb005fc6f3f82eb42341ee6b44798600be64 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 19 Aug 2025 12:47:11 +0000
Subject: [PATCH 141/321] Revert "python3Packages.buildPythonPackage: default
 enabledTestPaths = [ "." ]"

---
 doc/languages-frameworks/python.section.md           |  1 -
 doc/release-notes/rl-2511.section.md                 |  6 ------
 .../interpreters/python/mk-python-derivation.nix     | 12 +-----------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 30a53f5bb6d8b..23db76baad970 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1285,7 +1285,6 @@ Adding `pytest` is not required, since it is included with `pytestCheckHook`.
 `enabledTestPaths` and `disabledTestPaths`
 
 :   To specify path globs (files or directories) or test items.
-    `enabledTestPaths` defaults to `[ "." ]`.
 
 `enabledTests` and `disabledTests`
 
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index e89de944a221f..d481d20a06049 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -18,12 +18,6 @@
 
 - The minimum version of Nix required to evaluate Nixpkgs has been raised from 2.3 to 2.18.
 
-- `buildPythonPackage` and `buildPythonApplication` now set `enabledTestPaths = [ "." ]` by default if not specified otherwise, and require the specified value to be a non-empty list to simplify overriding.
-
-  When running install-checks with `pytestCheckHook`, such default value resembles `pytest`'s default behaviour of discovering tests in the current working directory.
-
-  To support both version of Nixpkgs before and after this change, set `enabledTestPaths = [ "." ]` manually for packages that don't need custom `enabledTestPaths` specification.
-
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 4ae97d06b2767..9d392bfcb95ae 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -431,17 +431,6 @@ let
       # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
       installCheckPhase = attrs.checkPhase;
     }
-    // {
-      # `pytest` defaults to discover tests in the current directory if no paths or test items are specified.
-      # Provide an explicit default value to simplify overriding.
-      enabledTestPaths =
-        if attrs ? enabledTestPaths then
-          lib.throwIf (!lib.isList attrs.enabledTestPaths || attrs.enabledTestPaths == [ ])
-            "${lib.getName finalAttrs}: enabledTestPaths must be a non-empty list (default to [ \".\" ])."
-            attrs.enabledTestPaths
-        else
-          [ "." ];
-    }
     //
       lib.mapAttrs
         (
@@ -453,6 +442,7 @@ let
         (
           getOptionalAttrs [
             "enabledTestMarks"
+            "enabledTestPaths"
             "enabledTests"
           ] attrs
         )

From a79f97b971d903a229f919d7920063dae8cf731d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 14:29:31 +0200
Subject: [PATCH 142/321] libice: refactor, move to pkgs/by-name and rename
 from xorg.libICE

---
 pkgs/by-name/li/libice/package.nix            | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  8 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 60 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/by-name/li/libice/package.nix

diff --git a/pkgs/by-name/li/libice/package.nix b/pkgs/by-name/li/libice/package.nix
new file mode 100644
index 0000000000000..c28044fa877e2
--- /dev/null
+++ b/pkgs/by-name/li/libice/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  xtrans,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libice";
+  version = "1.1.2";
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libICE-${finalAttrs.version}.tar.xz";
+    hash = "sha256-l05O1BQiXrPHFphd+XCfTajSKmeiiQBmvG38ia0phiU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    xtrans
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libICE \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Inter-Client Exchange Library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libice";
+    license = lib.licenses.mitOpenGroup;
+    maintainers = [ ];
+    pkgConfigModules = [ "ice" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ab48f6f94e2cd..5735ac5e9e4a5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -11,6 +11,7 @@
   libdmx,
   libfontenc,
   libfs,
+  libice,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -89,6 +90,7 @@ self: with self; {
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
+  libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
@@ -1741,42 +1743,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libICE = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xtrans,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libICE";
-      version = "1.1.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libICE-1.1.2.tar.xz";
-        sha256 = "09c656nqkz3dpik012d2cwmd5a2dkxqgjpcq2v3v6pi22ka4wklp";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xtrans
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "ice" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libSM = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9ea02810f2e6d..990824bfa1db2 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -39,6 +39,7 @@
 $pcMap{"dmx"} = "libdmx";
 $pcMap{"fontenc"} = "libfontenc";
 $pcMap{"fontutil"} = "fontutil";
+$pcMap{"ice"} = "libICE";
 $pcMap{"libfs"} = "libFS";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
@@ -304,6 +305,7 @@
   libdmx,
   libfontenc,
   libfs,
+  libice,
   libpciaccess,
   libpthread-stubs,
   libx11,
@@ -382,6 +384,7 @@
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
+  libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libX11 = libx11;
   libXau = libxau;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b47078df27119..56b6f7d06729d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -239,14 +239,6 @@ self: super:
     ];
   });
 
-  libICE = super.libICE.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "doc"
-    ];
-  });
-
   libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8333d91a4a825..e350cfba0fde0 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -141,7 +141,6 @@ mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libICE-1.1.2.tar.xz
 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz

From 365735436e5d5b216eba0a3eb1f07bfc9e80fae8 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 14:58:49 +0200
Subject: [PATCH 143/321] libsm: refactor, move to pkgs/by-name and rename from
 xorg.libSM

relevant changes:
- moves xtrans from propagatedBuildInputs to buildInputs
  xtrans was added there in cb4f2749778df37f8e8ee135caf1da75f4cc5483,
  however I think it was meant to be added to buildInputs
---
 pkgs/by-name/li/libsm/package.nix             | 67 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 12 ----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 72 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/by-name/li/libsm/package.nix

diff --git a/pkgs/by-name/li/libsm/package.nix b/pkgs/by-name/li/libsm/package.nix
new file mode 100644
index 0000000000000..f214efa55cc44
--- /dev/null
+++ b/pkgs/by-name/li/libsm/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libice,
+  libuuid,
+  xorgproto,
+  xtrans,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libsm";
+  version = "1.2.6";
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libSM-${finalAttrs.version}.tar.xz";
+    hash = "sha256-vnwKvbFcv9KaxiVzwcguh3+dQEetFTIefql9HkPYNb4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libice
+    libuuid
+    xorgproto
+    xtrans
+  ];
+
+  propagatedBuildInputs = [
+    # needs to be propagated because of header file dependencies
+    libice
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libSM \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Session Management Library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libsm";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "sm" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5735ac5e9e4a5..01f005f90afbf 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -14,6 +14,7 @@
   libice,
   libpciaccess,
   libpthread-stubs,
+  libsm,
   libx11,
   libxau,
   libxcb,
@@ -92,6 +93,7 @@ self: with self; {
   libFS = libfs;
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
+  libSM = libsm;
   libX11 = libx11;
   libXau = libxau;
   libXcursor = libxcursor;
@@ -1743,44 +1745,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libSM = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libICE,
-      libuuid,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libSM";
-      version = "1.2.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libSM-1.2.6.tar.xz";
-        sha256 = "1gimv11iwzd9gqg345dd8x09szw75v4c2wr5qsdd5gswn6yhlz5y";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libICE
-        libuuid
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "sm" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libWindowsWM = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 990824bfa1db2..3a01c1b4c2138 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -43,6 +43,7 @@
 $pcMap{"libfs"} = "libFS";
 $pcMap{"pciaccess"} = "libpciaccess";
 $pcMap{"pthread-stubs"} = "libpthreadstubs";
+$pcMap{"sm"} = "libSM";
 $pcMap{"x11"} = "libX11";
 $pcMap{"x11-xcb"} = "libX11";
 $pcMap{"xau"} = "libXau";
@@ -308,6 +309,7 @@
   libice,
   libpciaccess,
   libpthread-stubs,
+  libsm,
   libx11,
   libxau,
   libxcb,
@@ -386,6 +388,7 @@
   libFS = libfs;
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
+  libSM = libsm;
   libX11 = libx11;
   libXau = libxau;
   libXcursor = libxcursor;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 56b6f7d06729d..0779e7d82d17a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -319,18 +319,6 @@ self: super:
     buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ];
   });
 
-  libSM = super.libSM.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "doc"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
-      xorg.libICE
-      xorg.xtrans
-    ];
-  });
-
   libXres = super.libXres.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e350cfba0fde0..62210d8fcc3ec 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -141,7 +141,6 @@ mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libSM-1.2.6.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz

From 96349f4b00899c20e3e796e515da19bfd23d769d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 15:54:50 +0200
Subject: [PATCH 144/321] libxt: refactor, move to pkgs/by-name and rename from
 xorg.libXt

relevant changes:
- removes the `sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure`
  because as in libx11 it probably doesn't do anything
---
 pkgs/by-name/li/libxt/package.nix             | 82 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +---------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 22 -----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 87 insertions(+), 63 deletions(-)
 create mode 100644 pkgs/by-name/li/libxt/package.nix

diff --git a/pkgs/by-name/li/libxt/package.nix b/pkgs/by-name/li/libxt/package.nix
new file mode 100644
index 0000000000000..67cce20e315fb
--- /dev/null
+++ b/pkgs/by-name/li/libxt/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  buildPackages,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libsm,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxt";
+  version = "1.3.1";
+
+  outputDoc = "devdoc";
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXt-${finalAttrs.version}.tar.xz";
+    hash = "sha256-4Kd0szMk9NTAWxmepFBQ+HIGWG2BZV+L7026Q02TEog=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libsm
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    libx11
+    # needs to be propagated because of header file dependencies
+    libsm
+  ];
+
+  configureFlags =
+    lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"
+    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp";
+
+  env = {
+    CPP = if stdenv.hostPlatform.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -";
+  };
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXt \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Toolkit Intrinsics library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxt";
+    license = with lib.licenses; [
+      mit
+      hpndSellVariant
+      hpnd
+      mitOpenGroup
+      x11
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xt" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 01f005f90afbf..bfa495696b4f6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -25,6 +25,7 @@
   libxfixes,
   libxrandr,
   libxrender,
+  libxt,
   libxv,
   lndir,
   luit,
@@ -102,6 +103,7 @@ self: with self; {
   libXfixes = libxfixes;
   libXrandr = libxrandr;
   libXrender = libxrender;
+  libXt = libxt;
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
@@ -2395,46 +2397,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXt = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libICE,
-      xorgproto,
-      libSM,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXt";
-      version = "1.3.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXt-1.3.1.tar.xz";
-        sha256 = "120jjd6l7fjdxy5myrc1dmc0cwpqa18a97hrbg0d9x146frp99z0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libICE
-        xorgproto
-        libSM
-        libX11
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xt" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXtst = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 3a01c1b4c2138..7720fd27b5479 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -55,6 +55,7 @@
 $pcMap{"xfixes"} = "libXfixes";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
+$pcMap{"xt"} = "libXt";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
 $pcMap{"\$PIXMAN"} = "pixman";
@@ -320,6 +321,7 @@
   libxfixes,
   libxrandr,
   libxrender,
+  libxt,
   libxv,
   lndir,
   luit,
@@ -397,6 +399,7 @@
   libXfixes = libxfixes;
   libXrandr = libxrandr;
   libXrender = libxrender;
+  libXt = libxt;
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0779e7d82d17a..296da0fd745f3 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -217,28 +217,6 @@ self: super:
     };
   });
 
-  # Propagate some build inputs because of header file dependencies.
-  # Note: most of these are in Requires.private, so maybe builder.sh
-  # should propagate them automatically.
-  libXt = super.libXt.overrideAttrs (attrs: {
-    preConfigure = ''
-      sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
-    '';
-    configureFlags =
-      attrs.configureFlags or [ ]
-      ++ malloc0ReturnsNullCrossFlag
-      ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp";
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libSM ];
-    depsBuildBuild = [ buildPackages.stdenv.cc ];
-    CPP = if stdenv.hostPlatform.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -";
-    outputDoc = "devdoc";
-    outputs = [
-      "out"
-      "dev"
-      "devdoc"
-    ];
-  });
-
   libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 62210d8fcc3ec..6d76c38de82e7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -159,7 +159,6 @@ mirror://xorg/individual/lib/libXres-1.2.2.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
 mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz
 mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz

From ee1a92b0c935e27d0530d9377217ed18766a62f6 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 16:59:23 +0200
Subject: [PATCH 145/321] libxmu: refactor, move to pkgs/by-name and rename
 from xorg.libXmu

---
 pkgs/by-name/li/libxmu/package.nix            | 75 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 45 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  4 +
 pkgs/servers/x11/xorg/overrides.nix           |  9 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 81 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/by-name/li/libxmu/package.nix

diff --git a/pkgs/by-name/li/libxmu/package.nix b/pkgs/by-name/li/libxmu/package.nix
new file mode 100644
index 0000000000000..301d03ff56783
--- /dev/null
+++ b/pkgs/by-name/li/libxmu/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxt,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxmu";
+  version = "1.2.1";
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXmu-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/LJ3kySKOeX8xbnErsQMwHNLPKdqrD19HCZOf34U6LI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxt
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    libx11
+    libxt
+  ];
+
+  buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXmu \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X miscellaneous utility routines library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxmu";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpnd
+      x11
+      isc
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [
+      "xmu"
+      "xmuu"
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index bfa495696b4f6..8f7eca4f5dd92 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -23,6 +23,7 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxmu,
   libxrandr,
   libxrender,
   libxt,
@@ -101,6 +102,7 @@ self: with self; {
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXmu = libxmu;
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXt = libxt;
@@ -2190,49 +2192,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXmu = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXmu";
-      version = "1.2.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXmu-1.2.1.tar.xz";
-        sha256 = "1cp82iz7yki63iykvb3alwy4nwy01k2axi5rqpyfafca4j9pgcpw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "xmu"
-          "xmuu"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXp = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 7720fd27b5479..75a8fd1eae96b 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -53,6 +53,8 @@
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
+$pcMap{"xmu"} = "libXmu";
+$pcMap{"xmuu"} = "libXmu";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xt"} = "libXt";
@@ -319,6 +321,7 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxmu,
   libxrandr,
   libxrender,
   libxt,
@@ -397,6 +400,7 @@
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXmu = libxmu;
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXt = libxt;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 296da0fd745f3..25c461642ec47 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -288,15 +288,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXmu = super.libXmu.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "doc"
-    ];
-    buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ];
-  });
-
   libXres = super.libXres.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 6d76c38de82e7..a8993d343fdae 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -151,7 +151,6 @@ mirror://xorg/individual/lib/libXft-2.3.9.tar.xz
 mirror://xorg/individual/lib/libXi-1.8.2.tar.xz
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXmu-1.2.1.tar.xz
 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz
 mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz
 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz

From 2301e67b505cfb20722c74aa0de628992e63e0e6 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 18:10:46 +0200
Subject: [PATCH 146/321] libxpm: refactor, move to pkgs/by-name and rename
 from xorg.libXpm

relevant changes:
- remove `sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in`
  from patchPhase, added in c0496c041343219ad4e4333c2687a4122ee1dd94 with
  the message "removed unused gettext" in fucking 2008.
  I don't know exactly what this does but i think there is a high chance
  that it is not relevant anymore.
  So let's see if something breaks.
---
 pkgs/by-name/li/libxpm/package.nix            | 79 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 15 ----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 84 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/by-name/li/libxpm/package.nix

diff --git a/pkgs/by-name/li/libxpm/package.nix b/pkgs/by-name/li/libxpm/package.nix
new file mode 100644
index 0000000000000..8ffd2d3fd203b
--- /dev/null
+++ b/pkgs/by-name/li/libxpm/package.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  gettext,
+  xorgproto,
+  libx11,
+  libxext,
+  libxt,
+  ncompress,
+  gzip,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxpm";
+  version = "3.5.17";
+
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXpm-${finalAttrs.version}.tar.xz";
+    hash = "sha256-ZLMfgQGefTiMgisLKK+NUcRiK4Px8Mtvo/yV4nEibkM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxt
+  ];
+
+  propagatedBuildInputs = [
+    libx11
+  ];
+
+  env = {
+    XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ];
+    XPM_PATH_GZIP = lib.makeBinPath [ gzip ];
+    XPM_PATH_UNCOMPRESS = lib.makeBinPath [ gzip ];
+  };
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXpm \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Pixmap (XPM) image file format library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxpm";
+    license = with lib.licenses; [
+      x11
+      mit
+    ];
+    mainProgram = "sxpm";
+    maintainers = [ ];
+    pkgConfigModules = [ "xpm" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8f7eca4f5dd92..a1aa6ebd245c8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -24,6 +24,7 @@
   libxext,
   libxfixes,
   libxmu,
+  libxpm,
   libxrandr,
   libxrender,
   libxt,
@@ -103,6 +104,7 @@ self: with self; {
   libXext = libxext;
   libXfixes = libxfixes;
   libXmu = libxmu;
+  libXpm = libxpm;
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXt = libxt;
@@ -2232,50 +2234,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXpm = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      libXt,
-      gettext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXpm";
-      version = "3.5.17";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz";
-        sha256 = "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        gettext
-      ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xpm" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXpresent = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 75a8fd1eae96b..26bbee3feafcf 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -55,6 +55,7 @@
 $pcMap{"xfixes"} = "libXfixes";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
+$pcMap{"xpm"} = "libXpm";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xt"} = "libXt";
@@ -322,6 +323,7 @@
   libxext,
   libxfixes,
   libxmu,
+  libxpm,
   libxrandr,
   libxrender,
   libxt,
@@ -401,6 +403,7 @@
   libXext = libxext;
   libXfixes = libxfixes;
   libXmu = libxmu;
+  libXpm = libxpm;
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXt = libxt;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 25c461642ec47..16b29b8a2135e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -320,21 +320,6 @@ self: super:
     ];
   });
 
-  libXpm = super.libXpm.overrideAttrs (attrs: {
-    outputs = [
-      "bin"
-      "dev"
-      "out"
-    ]; # tiny man in $bin
-    patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
-    XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ];
-    XPM_PATH_GZIP = lib.makeBinPath [ gzip ];
-    XPM_PATH_UNCOMPRESS = lib.makeBinPath [ gzip ];
-    meta = attrs.meta // {
-      mainProgram = "sxpm";
-    };
-  });
-
   libXpresent = super.libXpresent.overrideAttrs (attrs: {
     buildInputs = attrs.buildInputs ++ [
       xorg.libXext
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a8993d343fdae..c4bd8b9b9a78e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -152,7 +152,6 @@ mirror://xorg/individual/lib/libXi-1.8.2.tar.xz
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz
-mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz
 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz
 mirror://xorg/individual/lib/libXres-1.2.2.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz

From 847dbb84a3dd2e98f120f438c3b76a45b72e44f9 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 20:23:50 +0200
Subject: [PATCH 147/321] libxaw: refactor, move to pkgs/by-name and rename
 from xorg.libXaw

this also fixes the build on static
---
 pkgs/by-name/li/libxaw/package.nix            | 82 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 49 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  4 +
 pkgs/servers/x11/xorg/overrides.nix           |  9 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 88 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/by-name/li/libxaw/package.nix

diff --git a/pkgs/by-name/li/libxaw/package.nix b/pkgs/by-name/li/libxaw/package.nix
new file mode 100644
index 0000000000000..0f5bef3c01c6f
--- /dev/null
+++ b/pkgs/by-name/li/libxaw/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxmu,
+  libxpm,
+  libxt,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxaw";
+  version = "1.0.16";
+
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXaw-${finalAttrs.version}.tar.xz";
+    hash = "sha256-cx1XK1THCPgeGXpq+oAWkY4uBt/TAl4GbKZCpbjDnI8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxmu
+    libxpm
+    libxt
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    libxt
+    # needs to be propagated because of header file dependencies
+    libxmu
+  ];
+
+  postInstall =
+    # remove dangling symlinks to .so files on static
+    lib.optionalString stdenv.hostPlatform.isStatic "rm $out/lib/*.so*";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXaw \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Athena Widget Set, based on the X Toolkit Intrinsics (Xt) Library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxaw";
+    license = with lib.licenses; [
+      mitOpenGroup
+      x11
+      hpndSellVariant
+      hpnd
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [
+      "xaw6"
+      "xaw7"
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a1aa6ebd245c8..928e74bf2dbaf 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -17,6 +17,7 @@
   libsm,
   libx11,
   libxau,
+  libxaw,
   libxcb,
   libxcvt,
   libxcursor,
@@ -99,6 +100,7 @@ self: with self; {
   libSM = libsm;
   libX11 = libx11;
   libXau = libxau;
+  libXaw = libxaw;
   libXcursor = libxcursor;
   libXdmcp = libxdmcp;
   libXext = libxext;
@@ -1867,53 +1869,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXaw = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      libXmu,
-      libXpm,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXaw";
-      version = "1.0.16";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz";
-        sha256 = "13wwqfwaahm6dh35w0nkvw32x3li2s0glsks34ggh267ahmmf7bk";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-        libXmu
-        libXpm
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "xaw6"
-          "xaw7"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXcomposite = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 26bbee3feafcf..851c9eb60ea91 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -47,6 +47,8 @@
 $pcMap{"x11"} = "libX11";
 $pcMap{"x11-xcb"} = "libX11";
 $pcMap{"xau"} = "libXau";
+$pcMap{"xaw6"} = "libXaw";
+$pcMap{"xaw7"} = "libXaw";
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xcursor"} = "libXcursor";
@@ -316,6 +318,7 @@
   libsm,
   libx11,
   libxau,
+  libxaw,
   libxcb,
   libxcvt,
   libxcursor,
@@ -398,6 +401,7 @@
   libSM = libsm;
   libX11 = libx11;
   libXau = libxau;
+  libXaw = libxaw;
   libXcursor = libxcursor;
   libXdmcp = libxdmcp;
   libXext = libxext;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 16b29b8a2135e..72782cd4be227 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -225,15 +225,6 @@ self: super:
     propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXfixes ];
   });
 
-  libXaw = super.libXaw.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "devdoc"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXmu ];
-  });
-
   libXdamage = super.libXdamage.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c4bd8b9b9a78e..4166fe5c3cd2e 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -142,7 +142,6 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2

From b7a50d3f5348688f00c4040ef1e2b5e5d26b8cd4 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 22:23:43 +0200
Subject: [PATCH 148/321] libxvmc: refactor, move to pkgs/by-name and rename
 from xorg.libXvMC

---
 pkgs/by-name/li/libxvmc/package.nix           | 68 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 45 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  4 ++
 pkgs/servers/x11/xorg/overrides.nix           | 10 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 74 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/by-name/li/libxvmc/package.nix

diff --git a/pkgs/by-name/li/libxvmc/package.nix b/pkgs/by-name/li/libxvmc/package.nix
new file mode 100644
index 0000000000000..59ab561a47dfa
--- /dev/null
+++ b/pkgs/by-name/li/libxvmc/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libX11,
+  libXext,
+  libXv,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxvmc";
+  version = "1.0.14";
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXvMC-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5L6etra6/bv4H0f3FjBHIVN25F4tx4bQ6mGByTByXtk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libX11
+    libXext
+    libXv
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXvMC \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X-Video Motion Compensation API";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxvmc";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [
+      "xvmc"
+      "xvmc-wrapper"
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ab48f6f94e2cd..45e3db83bb21a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -24,6 +24,7 @@
   libxrandr,
   libxrender,
   libxv,
+  libxvmc,
   lndir,
   luit,
   makedepend,
@@ -99,6 +100,7 @@ self: with self; {
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXv = libxv;
+  libXvMC = libxvmc;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2545,49 +2547,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXvMC = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXv,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXvMC";
-      version = "1.0.14";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz";
-        sha256 = "1nayf8qck0b1xb88dirdbvj7clr18wq1dxs73zwbpzdsnsv9xgp4";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXv
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "xvmc"
-          "xvmc-wrapper"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXxf86dga = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9ea02810f2e6d..cd81b807e8d3a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -55,6 +55,8 @@
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
+$pcMap{"xvmc"} = "libXvMC";
+$pcMap{"xvmc-wrapper"} = "libXvMC";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -317,6 +319,7 @@
   libxrandr,
   libxrender,
   libxv,
+  libxvmc,
   lndir,
   luit,
   makedepend,
@@ -392,6 +395,7 @@
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXv = libxv;
+  libXvMC = libxvmc;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b47078df27119..f43c3ce5fd8bd 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -354,16 +354,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXvMC = super.libXvMC.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "doc"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-    buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
-  });
-
   libXp = super.libXp.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8333d91a4a825..ff6499c318e2a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -163,7 +163,6 @@ mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
-mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz
 mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz

From 809bf617cfdd7d6998726b778e69dc05d5140361 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 22:45:54 +0200
Subject: [PATCH 149/321] libxxf86dga: refactor, move to pkgs/by-name and
 rename from xorg.libXxf86dga

---
 pkgs/by-name/li/libxxf86dga/package.nix       | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  3 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/li/libxxf86dga/package.nix

diff --git a/pkgs/by-name/li/libxxf86dga/package.nix b/pkgs/by-name/li/libxxf86dga/package.nix
new file mode 100644
index 0000000000000..4dc5b64c16a46
--- /dev/null
+++ b/pkgs/by-name/li/libxxf86dga/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libX11,
+  libXext,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxxf86dga";
+  version = "1.1.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXxf86dga-${finalAttrs.version}.tar.xz";
+    hash = "sha256-vkRCdXmAj+OiF9WfUcrnVqJpE+tuTIc4zKtl/1bXmA8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libX11
+    libXext
+    xorgproto
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXxf86dga \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Client library for the XFree86-DGA extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86dga";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xxf86dga" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 45e3db83bb21a..ba9ff1a2fe85f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -25,6 +25,7 @@
   libxrender,
   libxv,
   libxvmc,
+  libxxf86dga,
   lndir,
   luit,
   makedepend,
@@ -101,6 +102,7 @@ self: with self; {
   libXrender = libxrender;
   libXv = libxv;
   libXvMC = libxvmc;
+  libXxf86dga = libxxf86dga;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2547,44 +2549,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXxf86dga = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXxf86dga";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz";
-        sha256 = "03wqsxbgyrdbrhw8fk3fxc9nk8jnwz5537ym2yif73w0g5sl4i5y";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xxf86dga" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXxf86misc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index cd81b807e8d3a..2abdeed8941c7 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -57,6 +57,7 @@
 $pcMap{"xv"} = "libXv";
 $pcMap{"xvmc"} = "libXvMC";
 $pcMap{"xvmc-wrapper"} = "libXvMC";
+$pcMap{"xxf86dga"} = "libXxf86dga";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -320,6 +321,7 @@
   libxrender,
   libxv,
   libxvmc,
+  libxxf86dga,
   lndir,
   luit,
   makedepend,
@@ -396,6 +398,7 @@
   libXrender = libxrender;
   libXv = libxv;
   libXvMC = libxvmc;
+  libXxf86dga = libxxf86dga;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f43c3ce5fd8bd..a0a62fe8f69e1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -173,9 +173,6 @@ self: super:
     ];
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
-  libXxf86dga = super.libXxf86dga.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
   libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ff6499c318e2a..f41dea443290b 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -163,7 +163,6 @@ mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
-mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz
 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz

From cdda889cee20a007f23cd7204c0ea0eea4ef2499 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 22:55:12 +0200
Subject: [PATCH 150/321] libxxf86misc: refactor, move to pkgs/by-name and
 rename from xorg.libXxf86misc

---
 pkgs/by-name/li/libxxf86misc/package.nix      | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  3 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/li/libxxf86misc/package.nix

diff --git a/pkgs/by-name/li/libxxf86misc/package.nix b/pkgs/by-name/li/libxxf86misc/package.nix
new file mode 100644
index 0000000000000..e3ca3584195e8
--- /dev/null
+++ b/pkgs/by-name/li/libxxf86misc/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxxf86misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXxf86misc-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-qJwD4rDxYjnWeiAxuQA/MbWmhhBrvbPHl/uIrkcq84A=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXxf86misc \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Extension library for the XFree86-Misc X extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86misc";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xxf86misc" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ba9ff1a2fe85f..d181d54787478 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -26,6 +26,7 @@
   libxv,
   libxvmc,
   libxxf86dga,
+  libxxf86misc,
   lndir,
   luit,
   makedepend,
@@ -103,6 +104,7 @@ self: with self; {
   libXv = libxv;
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
+  libXxf86misc = libxxf86misc;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2549,44 +2551,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXxf86misc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXxf86misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2";
-        sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xxf86misc" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXxf86vm = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2abdeed8941c7..ed23189983a9d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -58,6 +58,7 @@
 $pcMap{"xvmc"} = "libXvMC";
 $pcMap{"xvmc-wrapper"} = "libXvMC";
 $pcMap{"xxf86dga"} = "libXxf86dga";
+$pcMap{"xxf86misc"} = "libXxf86misc";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -322,6 +323,7 @@
   libxv,
   libxvmc,
   libxxf86dga,
+  libxxf86misc,
   lndir,
   luit,
   makedepend,
@@ -399,6 +401,7 @@
   libXv = libxv;
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
+  libXxf86misc = libxxf86misc;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a0a62fe8f69e1..45733f913840d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -173,9 +173,6 @@ self: super:
     ];
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
-  libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
   libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index f41dea443290b..d4aa7f36d8f42 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -163,7 +163,6 @@ mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
-mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz
 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz
 mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz

From f5077a75cf102fe252c338c8587dc6fff4727f45 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 23:01:59 +0200
Subject: [PATCH 151/321] libxxf86vm: refactor, move to pkgs/by-name and rename
 from xorg.libXxf86vm

---
 pkgs/by-name/li/libxxf86vm/package.nix        | 60 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 65 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/li/libxxf86vm/package.nix

diff --git a/pkgs/by-name/li/libxxf86vm/package.nix b/pkgs/by-name/li/libxxf86vm/package.nix
new file mode 100644
index 0000000000000..7f605d782e097
--- /dev/null
+++ b/pkgs/by-name/li/libxxf86vm/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libX11,
+  libXext,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxxf86vm";
+  version = "1.1.6";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXxf86vm-${finalAttrs.version}.tar.xz";
+    hash = "sha256-lq9BTHPOHVRJrQS+f58n+oMw+ES23ahD7yLj4b77PuM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libX11
+    libXext
+    xorgproto
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXxf86vm \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Extension library for the XFree86-VidMode X extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xxf86vm" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d181d54787478..a66e38f1364eb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -27,6 +27,7 @@
   libxvmc,
   libxxf86dga,
   libxxf86misc,
+  libxxf86vm,
   lndir,
   luit,
   makedepend,
@@ -105,6 +106,7 @@ self: with self; {
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
   libXxf86misc = libxxf86misc;
+  libXxf86vm = libxxf86vm;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
@@ -2551,44 +2553,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXxf86vm = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXxf86vm";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz";
-        sha256 = "1qryzfzf3qr2xx1sipdn8kw310zs4ygpzgh4mm4m87fffd643bwn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xxf86vm" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libxkbfile = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ed23189983a9d..e2c984d3ec092 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -59,6 +59,7 @@
 $pcMap{"xvmc-wrapper"} = "libXvMC";
 $pcMap{"xxf86dga"} = "libXxf86dga";
 $pcMap{"xxf86misc"} = "libXxf86misc";
+$pcMap{"xxf86vm"} = "libXxf86vm";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "xorgproto";
 $pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -324,6 +325,7 @@
   libxvmc,
   libxxf86dga,
   libxxf86misc,
+  libxxf86vm,
   lndir,
   luit,
   makedepend,
@@ -402,6 +404,7 @@
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
   libXxf86misc = libxxf86misc;
+  libXxf86vm = libxxf86vm;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 45733f913840d..aa89043fe1db3 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -166,13 +166,6 @@ self: super:
     configureFlags = lib.optional isDarwin "CFLAGS=-O0";
   });
 
-  libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
   libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index d4aa7f36d8f42..2aa4e3898c180 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -163,6 +163,5 @@ mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
-mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz
 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz
 mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz

From d41e8bba2271fc6be2fd6814e38530d79a5f5c3e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 23:51:48 +0200
Subject: [PATCH 152/321] libxcb-util: refactor, move to pkgs/by-name and
 rename from xorg.xcbutil

relevant changes:
- removes m4 from nativeBuildInputs and gperf from buildInputs as both
  haven't been required since release 0.3.9 in 2012, see:
  https://gitlab.freedesktop.org/xorg/lib/libxcb-util/-/blob/master/NEWS
- removes xorgproto from buildInputs (not needed according to
  nix-check-deps), if it is needed, it wouldn't matter since it is
  propagated by libxcb anyway.
---
 pkgs/by-name/li/libxcb-util/package.nix       | 62 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 49 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  6 ++
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 70 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb-util/package.nix

diff --git a/pkgs/by-name/li/libxcb-util/package.nix b/pkgs/by-name/li/libxcb-util/package.nix
new file mode 100644
index 0000000000000..b1239bdb4bfd9
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-util/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb-util";
+  version = "0.4.1";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xcb/xcb-util-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Wr47u9jlTw+j7JRSkbfo+oz9PMzENxj4dYQw+UEm5RI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libxcb ];
+  propagatedBuildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname xcb-util \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XCB utility libraries";
+    longDescription = ''
+      The XCB util modules provides a number of libraries which sit on top of libxcb, the core
+      X protocol library, and some of the extension libraries. These experimental libraries provid
+      convenience functions and interfaces which make the raw X protocol more usable. Some of the
+      libraries also provide client-side code which is not strictly part of the X protocol but which
+      have traditionally been provided by Xlib.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-util";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [
+      "xcb-atom"
+      "xcb-aux"
+      "xcb-event"
+      "xcb-util"
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ab48f6f94e2cd..15153795050ed 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -16,6 +16,7 @@
   libx11,
   libxau,
   libxcb,
+  libxcb-util,
   libxcvt,
   libxcursor,
   libxdmcp,
@@ -101,6 +102,7 @@ self: with self; {
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
+  xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -3192,53 +3194,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcbutil = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      gperf,
-      libxcb,
-      xorgproto,
-      m4,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcb-util";
-      version = "0.4.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz";
-        sha256 = "04p54r0zjc44fpw1hdy4rhygv37sx2vr2lllxjihykz5v2xkpgjs";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        m4
-      ];
-      buildInputs = [
-        gperf
-        libxcb
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "xcb-atom"
-          "xcb-aux"
-          "xcb-event"
-          "xcb-util"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcbutilcursor = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9ea02810f2e6d..ca4f323a4352f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -46,7 +46,11 @@
 $pcMap{"x11-xcb"} = "libX11";
 $pcMap{"xau"} = "libXau";
 $pcMap{"xbitmaps"} = "xbitmaps";
+$pcMap{"xcb-atom"} = "xcbutil";
+$pcMap{"xcb-aux"} = "xcbutil";
+$pcMap{"xcb-event"} = "xcbutil";
 $pcMap{"xcb-proto"} = "xcbproto";
+$pcMap{"xcb-util"} = "xcbutil";
 $pcMap{"xcursor"} = "libXcursor";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
@@ -309,6 +313,7 @@
   libx11,
   libxau,
   libxcb,
+  libxcb-util,
   libxcvt,
   libxcursor,
   libxdmcp,
@@ -394,6 +399,7 @@
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
+  xcbutil = libxcb-util;
   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 b47078df27119..dd48bf4170036 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -437,13 +437,6 @@ self: super:
 
   xcalc = addMainProgram super.xcalc { };
 
-  xcbutil = super.xcbutil.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
   xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8333d91a4a825..1d93ebae33d21 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz

From d051ea0c859fa14e7f63a16b26183ed886709f00 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 19 Aug 2025 00:06:53 +0200
Subject: [PATCH 153/321] libxcb-errors: refactor, move to pkgs/by-name and
 rename from xorg.xcbutilerrors

relevant changes:
- remove gperf and xorgproto from buildInputs at they don't seem to be
  required (no relevant changes with diff --recursive)
---
 pkgs/by-name/li/libxcb-errors/package.nix     | 62 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 48 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 67 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb-errors/package.nix

diff --git a/pkgs/by-name/li/libxcb-errors/package.nix b/pkgs/by-name/li/libxcb-errors/package.nix
new file mode 100644
index 0000000000000..3d99837da5086
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-errors/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  m4,
+  python3,
+  xcbproto,
+  libxcb,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb-errors";
+  version = "1.0.1";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xcb/xcb-util-errors-${finalAttrs.version}.tar.xz";
+    hash = "sha256-VijIe5hCWa2Se6zYpClYMZw2vfSwZYh4A8nYIPuA81c=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    m4
+    python3
+  ];
+
+  buildInputs = [
+    xcbproto
+    libxcb
+  ];
+
+  propagatedBuildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname xcb-util-errors \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XCB utility library that gives human readable names to error, event & request codes";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-errors";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xcb-errors" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15153795050ed..bf2460e045838 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -16,6 +16,7 @@
   libx11,
   libxau,
   libxcb,
+  libxcb-errors,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -102,6 +103,7 @@ self: with self; {
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
+  xcbutilerrors = libxcb-errors;
   xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -3240,52 +3242,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcbutilerrors = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      gperf,
-      libxcb,
-      xcbproto,
-      xorgproto,
-      m4,
-      python3,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcb-util-errors";
-      version = "1.0.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz";
-        sha256 = "0mzkh3xj1n690dw8hrdhyjykd71ib0ls9n5cgf9asna2k1xwha2n";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        m4
-        python3
-      ];
-      buildInputs = [
-        gperf
-        libxcb
-        xcbproto
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcb-errors" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcbutilimage = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ca4f323a4352f..b9b3de4f9c5c3 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -48,6 +48,7 @@
 $pcMap{"xbitmaps"} = "xbitmaps";
 $pcMap{"xcb-atom"} = "xcbutil";
 $pcMap{"xcb-aux"} = "xcbutil";
+$pcMap{"xcb-errors"} = "xcbutilerrors";
 $pcMap{"xcb-event"} = "xcbutil";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xcb-util"} = "xcbutil";
@@ -313,6 +314,7 @@
   libx11,
   libxau,
   libxcb,
+  libxcb-errors,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -399,6 +401,7 @@
   libXv = libxv;
   utilmacros = util-macros;
   xcbproto = xcb-proto;
+  xcbutilerrors = libxcb-errors;
   xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index dd48bf4170036..9a9ef9c618641 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -437,13 +437,6 @@ self: super:
 
   xcalc = addMainProgram super.xcalc { };
 
-  xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to get rid of propagating others
-  });
-
   xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1d93ebae33d21..8023711268b82 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz

From a2a6f2a295ff1c4febdbede3da80af5307edf012 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 19 Aug 2025 01:07:22 +0200
Subject: [PATCH 154/321] libxcb-image: refactor, move to pkgs/by-name and
 rename from xorg.xcbutilimage

relevant changes:
- remove gperf from buildInputs as it does not seem to be needed
---
 pkgs/by-name/li/libxcb-image/package.nix      | 62 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 67 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb-image/package.nix

diff --git a/pkgs/by-name/li/libxcb-image/package.nix b/pkgs/by-name/li/libxcb-image/package.nix
new file mode 100644
index 0000000000000..537b45f2b155c
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-image/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  m4,
+  xorgproto,
+  libxcb,
+  libxcb-util,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb-image";
+  version = "0.4.1";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xcb/xcb-util-image-${finalAttrs.version}.tar.xz";
+    hash = "sha256-zK2O5drbEnH9RyetFNm9d6ZOUFYIdmxOmCZ9mu3kDT0=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    m4
+  ];
+
+  buildInputs = [
+    xorgproto
+    libxcb
+    libxcb-util
+  ];
+
+  propagatedBuildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname xcb-util-image \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XCB port of Xlib's XImage and XShmImage functions.";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-image";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xcb-image" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index bf2460e045838..e55b18d7bd6fb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -17,6 +17,7 @@
   libxau,
   libxcb,
   libxcb-errors,
+  libxcb-image,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -104,6 +105,7 @@ self: with self; {
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xcbutilerrors = libxcb-errors;
+  xcbutilimage = libxcb-image;
   xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -3242,50 +3244,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcbutilimage = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      gperf,
-      libxcb,
-      xcbutil,
-      xorgproto,
-      m4,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcb-util-image";
-      version = "0.4.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz";
-        sha256 = "0g8dwknrlz96k176qxh8ar84x9kpppci9b978zyp24nvvbjqxbfc";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        m4
-      ];
-      buildInputs = [
-        gperf
-        libxcb
-        xcbutil
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcb-image" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcbutilkeysyms = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b9b3de4f9c5c3..b38cac967391a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -50,6 +50,7 @@
 $pcMap{"xcb-aux"} = "xcbutil";
 $pcMap{"xcb-errors"} = "xcbutilerrors";
 $pcMap{"xcb-event"} = "xcbutil";
+$pcMap{"xcb-image"} = "xcbutilimage";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xcb-util"} = "xcbutil";
 $pcMap{"xcursor"} = "libXcursor";
@@ -315,6 +316,7 @@
   libxau,
   libxcb,
   libxcb-errors,
+  libxcb-image,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -402,6 +404,7 @@
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xcbutilerrors = libxcb-errors;
+  xcbutilimage = libxcb-image;
   xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 9a9ef9c618641..bb0ac8031719e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -447,13 +447,6 @@ self: super:
     };
   });
 
-  xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to get rid of propagating others
-  });
-
   xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8023711268b82..e9099fc76d3b7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
 mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz

From 6a2c2ed9208bd32313b6a322f005cfa0847a42f4 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 19 Aug 2025 01:20:33 +0200
Subject: [PATCH 155/321] libxcb-keysyms: refactor, move to pkgs/by-name and
 rename from xorg.xcbutilkeysyms

relevant changes:
- remove m4 from nativeBuildInputs and gperf from buildInputs, as they
  both don't seem to be required
---
 pkgs/by-name/li/libxcb-keysyms/package.nix    | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 44 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 61 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb-keysyms/package.nix

diff --git a/pkgs/by-name/li/libxcb-keysyms/package.nix b/pkgs/by-name/li/libxcb-keysyms/package.nix
new file mode 100644
index 0000000000000..09015dbdfec7e
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-keysyms/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb-keysyms";
+  version = "0.4.1";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xcb/xcb-util-keysyms-${finalAttrs.version}.tar.xz";
+    hash = "sha256-fCYKUpRBKu1CnfHaL4r9O9B7fLo/7HcvuhWmE6bVxjg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libxcb
+    xorgproto
+  ];
+
+  propagatedBuildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname xcb-util-keysyms \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Standard X key constants and conversion to/from keycodes";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xcb-keysyms" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e55b18d7bd6fb..019b8bfc3f2ca 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -18,6 +18,7 @@
   libxcb,
   libxcb-errors,
   libxcb-image,
+  libxcb-keysyms,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -106,6 +107,7 @@ self: with self; {
   xcbproto = xcb-proto;
   xcbutilerrors = libxcb-errors;
   xcbutilimage = libxcb-image;
+  xcbutilkeysyms = libxcb-keysyms;
   xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
@@ -3244,48 +3246,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcbutilkeysyms = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      gperf,
-      libxcb,
-      xorgproto,
-      m4,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcb-util-keysyms";
-      version = "0.4.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz";
-        sha256 = "0f66snk179hmp8ppgv1zp9y7pl1vzn52znpikm1fsaj1ji90l9kw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        m4
-      ];
-      buildInputs = [
-        gperf
-        libxcb
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcb-keysyms" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcbutilrenderutil = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b38cac967391a..f97caf93a5aa2 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -51,6 +51,7 @@
 $pcMap{"xcb-errors"} = "xcbutilerrors";
 $pcMap{"xcb-event"} = "xcbutil";
 $pcMap{"xcb-image"} = "xcbutilimage";
+$pcMap{"xcb-keysyms"} = "xcbutilkeysyms";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xcb-util"} = "xcbutil";
 $pcMap{"xcursor"} = "libXcursor";
@@ -317,6 +318,7 @@
   libxcb,
   libxcb-errors,
   libxcb-image,
+  libxcb-keysyms,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -405,6 +407,7 @@
   xcbproto = xcb-proto;
   xcbutilerrors = libxcb-errors;
   xcbutilimage = libxcb-image;
+  xcbutilkeysyms = libxcb-keysyms;
   xcbutil = libxcb-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bb0ac8031719e..3adae8abaaff4 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -447,13 +447,6 @@ self: super:
     };
   });
 
-  xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to get rid of propagating others
-  });
-
   xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e9099fc76d3b7..1c309c6d13469 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz
 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
 mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz
 mirror://xorg/individual/app/appres-1.0.7.tar.xz

From c1db54b7d85931b61a9fed9bd6a541504be71e1e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 19 Aug 2025 01:33:53 +0200
Subject: [PATCH 156/321] libxcb-render-util: refactor, move to pkgs/by-name
 and rename from xorg.xcbutilrenderutil

relevant changes:
- remove m4 from nativeBuildInputs and gperf from buildInputs, as they
  both don't seem to be required
---
 .../by-name/li/libxcb-render-util/package.nix | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 44 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 64 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb-render-util/package.nix

diff --git a/pkgs/by-name/li/libxcb-render-util/package.nix b/pkgs/by-name/li/libxcb-render-util/package.nix
new file mode 100644
index 0000000000000..b294202e9c433
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-render-util/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb-render-util";
+  version = "0.3.10";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xcb/xcb-util-renderutil-${finalAttrs.version}.tar.xz";
+    hash = "sha256-PhXU8OItjdv7ufXXfbQ+rNejBAKb8lphZsxjyqltBLo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libxcb
+    xorgproto
+  ];
+
+  propagatedBuildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname xcb-util-renderutil \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XCB convenience functions for the Render extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util";
+    license = with lib.licenses; [
+      hpndSellVariant
+      x11
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xcb-renderutil" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 019b8bfc3f2ca..588dc2a89f9d5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -19,6 +19,7 @@
   libxcb-errors,
   libxcb-image,
   libxcb-keysyms,
+  libxcb-render-util,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -109,6 +110,7 @@ self: with self; {
   xcbutilimage = libxcb-image;
   xcbutilkeysyms = libxcb-keysyms;
   xcbutil = libxcb-util;
+  xcbutilrenderutil = libxcb-render-util;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -3246,48 +3248,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcbutilrenderutil = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      gperf,
-      libxcb,
-      xorgproto,
-      m4,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcb-util-renderutil";
-      version = "0.3.10";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz";
-        sha256 = "1fh4dnlwlqyccrhmmwlv082a7mxc7ss7vmzmp7xxp39dwbqd859y";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        m4
-      ];
-      buildInputs = [
-        gperf
-        libxcb
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcb-renderutil" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcbutilwm = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index f97caf93a5aa2..e45a32063098e 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -53,6 +53,7 @@
 $pcMap{"xcb-image"} = "xcbutilimage";
 $pcMap{"xcb-keysyms"} = "xcbutilkeysyms";
 $pcMap{"xcb-proto"} = "xcbproto";
+$pcMap{"xcb-renderutil"} = "xcbutilrenderutil";
 $pcMap{"xcb-util"} = "xcbutil";
 $pcMap{"xcursor"} = "libXcursor";
 $pcMap{"xdmcp"} = "libXdmcp";
@@ -319,6 +320,7 @@
   libxcb-errors,
   libxcb-image,
   libxcb-keysyms,
+  libxcb-render-util,
   libxcb-util,
   libxcvt,
   libxcursor,
@@ -409,6 +411,7 @@
   xcbutilimage = libxcb-image;
   xcbutilkeysyms = libxcb-keysyms;
   xcbutil = libxcb-util;
+  xcbutilrenderutil = libxcb-render-util;
   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 3adae8abaaff4..b76a893b831b1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -447,13 +447,6 @@ self: super:
     };
   });
 
-  xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to get rid of propagating others
-  });
-
   xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1c309c6d13469..c7aa188c08c1d 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
 mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz
 mirror://xorg/individual/app/appres-1.0.7.tar.xz
 mirror://xorg/individual/app/bitmap-1.1.1.tar.xz

From 3edf0cc9ce5ce96a85eea76e42f6d60c9e2b8ba1 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 19 Aug 2025 02:18:31 +0200
Subject: [PATCH 157/321] libxcb-wm: refactor, move to pkgs/by-name and rename
 from xorg.xcbutilwm

relevant changes:
- remove gperf from buildInputs as it does not seem to be needed
---
 pkgs/by-name/li/libxcb-wm/package.nix         | 63 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 47 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  4 ++
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 69 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcb-wm/package.nix

diff --git a/pkgs/by-name/li/libxcb-wm/package.nix b/pkgs/by-name/li/libxcb-wm/package.nix
new file mode 100644
index 0000000000000..874c440bb5695
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-wm/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  xorgproto,
+  m4,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcb-wm";
+  version = "0.4.2";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/xcb/xcb-util-wm-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YsNOIdBiZGh/rqftv2NjLJ8E1V5yEUqkpXu5Xk+Iigs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    m4
+  ];
+
+  buildInputs = [
+    libxcb
+    xorgproto
+  ];
+
+  propagatedBuildInputs = [ libxcb ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname xcb-util-wm \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XCB client and window-manager helpers for ICCCM & EWMH.";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [
+      "xcb-ewmh"
+      "xcb-icccm"
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 588dc2a89f9d5..94242d6c00317 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -21,6 +21,7 @@
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-util,
+  libxcb-wm,
   libxcvt,
   libxcursor,
   libxdmcp,
@@ -111,6 +112,7 @@ self: with self; {
   xcbutilkeysyms = libxcb-keysyms;
   xcbutil = libxcb-util;
   xcbutilrenderutil = libxcb-render-util;
+  xcbutilwm = libxcb-wm;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
@@ -3248,51 +3250,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcbutilwm = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      gperf,
-      libxcb,
-      xorgproto,
-      m4,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcb-util-wm";
-      version = "0.4.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz";
-        sha256 = "02wai17mxfbvlnj4l4bjbvah97rccdivzvd7mrznhr32s0hlxhv2";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        m4
-      ];
-      buildInputs = [
-        gperf
-        libxcb
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [
-          "xcb-ewmh"
-          "xcb-icccm"
-        ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xclock = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index e45a32063098e..abafbae0412b7 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -50,6 +50,8 @@
 $pcMap{"xcb-aux"} = "xcbutil";
 $pcMap{"xcb-errors"} = "xcbutilerrors";
 $pcMap{"xcb-event"} = "xcbutil";
+$pcMap{"xcb-ewmh"} = "xcbutilwm";
+$pcMap{"xcb-icccm"} = "xcbutilwm";
 $pcMap{"xcb-image"} = "xcbutilimage";
 $pcMap{"xcb-keysyms"} = "xcbutilkeysyms";
 $pcMap{"xcb-proto"} = "xcbproto";
@@ -322,6 +324,7 @@
   libxcb-keysyms,
   libxcb-render-util,
   libxcb-util,
+  libxcb-wm,
   libxcvt,
   libxcursor,
   libxdmcp,
@@ -412,6 +415,7 @@
   xcbutilkeysyms = libxcb-keysyms;
   xcbutil = libxcb-util;
   xcbutilrenderutil = libxcb-render-util;
+  xcbutilwm = libxcb-wm;
   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 b76a893b831b1..5a2a9d36dc206 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -447,13 +447,6 @@ self: super:
     };
   });
 
-  xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to get rid of propagating others
-  });
-
   xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c7aa188c08c1d..0d62e1c13e581 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz
 mirror://xorg/individual/app/appres-1.0.7.tar.xz
 mirror://xorg/individual/app/bitmap-1.1.1.tar.xz
 mirror://xorg/individual/app/editres-1.0.9.tar.xz

From 88b2fcd5e16e60f8e62fe450df6ac3ba544f3e42 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 19 Aug 2025 14:55:47 +0000
Subject: [PATCH 158/321] uv: 0.8.11 -> 0.8.12

Changelog: https://github.com/astral-sh/uv/releases/tag/0.8.12
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 2c061fc134068..9a6112305f11e 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.11";
+  version = "0.8.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-znTLRCCprUg412h75dK2092/9qpOa+HO3Fe2dFqKON4=";
+    hash = "sha256-UK+NBnOHqynvXCxAGYKdiJjHcKN7NyfA+6eq6RM0ypM=";
   };
 
-  cargoHash = "sha256-lKYTKa0x9K0Al3InxjmHOhV225Q7xSZuLGw3xSS3S6c=";
+  cargoHash = "sha256-Lrvgnco/uAdZz1NmAHQ6svvdQEKYBwh7X/tWwdwxkBU=";
 
   buildInputs = [
     rust-jemalloc-sys

From 6f93cd7bfdfeb085caf5da1631a689b85f5a134b Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Tue, 12 Aug 2025 01:39:21 +0200
Subject: [PATCH 159/321] spirv-llvm-translator: remove ROCm special handling

---
 .../by-name/sp/spirv-llvm-translator/package.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index a4ebb2c052cc6..6626acc70df9f 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -14,9 +14,7 @@
 
 let
   llvmMajor = lib.versions.major llvm.version;
-  isROCm = lib.hasPrefix "rocm" llvm.pname;
 
-  # ROCm, if actively updated will always be at the latest version
   versions = {
     "21" = rec {
       version = "21.1.0";
@@ -60,9 +58,7 @@ let
     };
   };
 
-  branch =
-    versions."${if isROCm then "17" else llvmMajor}"
-      or (throw "Incompatible LLVM version ${llvmMajor}");
+  branch = versions."${llvmMajor}" or (throw "Incompatible LLVM version ${llvmMajor}");
 in
 stdenv.mkDerivation {
   pname = "SPIRV-LLVM-Translator";
@@ -86,20 +82,20 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     pkg-config
     cmake
-  ]
-  ++ (if isROCm then [ llvm ] else [ llvm.dev ]);
+    llvm.dev
+  ];
 
   buildInputs = [
     spirv-headers
     spirv-tools
-  ]
-  ++ lib.optionals (!isROCm) [ llvm ];
+    llvm
+  ];
 
   nativeCheckInputs = [ lit ];
 
   cmakeFlags = [
     "-DLLVM_INCLUDE_TESTS=ON"
-    "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}"
+    "-DLLVM_DIR=${llvm.dev}"
     "-DBUILD_SHARED_LIBS=YES"
     "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
     # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/

From 5e3cff9cb540fa808246d72f3e4faf2f9b884821 Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Tue, 12 Aug 2025 01:42:06 +0200
Subject: [PATCH 160/321] spirv-llvm-translator: pass BASE_LLVM_VERSION for
 LLVM 20 and 21

---
 pkgs/by-name/sp/spirv-llvm-translator/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 6626acc70df9f..7fab99fbb4b66 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -102,7 +102,9 @@ stdenv.mkDerivation {
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
     "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"
   ]
-  ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0";
+  ++ lib.optional (
+    lib.toInt llvmMajor >= 19
+  ) "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0";
 
   # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
   doCheck = false;

From 9eaf6ae3682c63a461a86713cfba480d696d849e Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Tue, 12 Aug 2025 01:52:31 +0200
Subject: [PATCH 161/321] spirv-llvm-translator: mark as broken for LLVM 21
 with SPIRV Headers 1.4.321

---
 pkgs/by-name/sp/spirv-llvm-translator/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 7fab99fbb4b66..603c990353821 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -133,5 +133,13 @@ stdenv.mkDerivation {
     license = licenses.ncsa;
     platforms = platforms.unix;
     maintainers = with maintainers; [ gloaming ];
+
+    # For the LLVM 21 build some commits to spirv-headers
+    # are required that didn't make it into the final release of 1.4.321
+    # For example: 9e3836d Add SPV_INTEL_function_variants
+    # Once spirv-headers are released again and updated on nixpkgs,
+    # this will switch over to the nixpkgs version and should no
+    # longer be broken.
+    broken = llvmMajor == "21" && lib.versionOlder spirv-headers.version "1.4.322";
   };
 }

From 707b72f75655a18fc885e0f2805f23bae3c2425c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:19:10 +0200
Subject: [PATCH 162/321] python3Packages.mypy: propagate pathspec

This was a misjudgement during the update, where pathspec was only added
as a build-time dependency.
---
 pkgs/development/python-modules/mypy/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 97bffb85a3ba6..a5aefa2973409 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   pyproject = true;
 
   # relies on several CPython internals
-  disabled = pythonOlder "3.8" || isPyPy;
+  disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "python";
@@ -71,6 +71,7 @@ buildPythonPackage rec {
 
   dependencies = [
     mypy-extensions
+    pathspec
     typing-extensions
   ]
   ++ lib.optionals (pythonOlder "3.11") [ tomli ];
@@ -144,6 +145,7 @@ buildPythonPackage rec {
     description = "Optional static typing for Python";
     homepage = "https://www.mypy-lang.org";
     changelog = "https://github.com/python/mypy/blob/${src.rev}/CHANGELOG.md";
+    downloadPage = "https://github.com/python/mypy";
     license = lib.licenses.mit;
     mainProgram = "mypy";
     maintainers = with lib.maintainers; [ lnl7 ];

From 749fb9dbce3c0ccc1bc010ec361bed717079a889 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 20 Aug 2025 01:19:52 +0200
Subject: [PATCH 163/321] python3Packages.charset-normalizer: 3.4.2 -> 3.4.3

https://github.com/jawah/charset_normalizer/releases/tag/3.4.3
---
 .../python-modules/charset-normalizer/default.nix     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix
index 284d86db8a049..61cfd11b077fe 100644
--- a/pkgs/development/python-modules/charset-normalizer/default.nix
+++ b/pkgs/development/python-modules/charset-normalizer/default.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   mypy,
   pytestCheckHook,
-  pythonOlder,
   requests,
   setuptools,
   setuptools-scm,
@@ -13,16 +12,14 @@
 
 buildPythonPackage rec {
   pname = "charset-normalizer";
-  version = "3.4.2";
+  version = "3.4.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.5";
-
   src = fetchFromGitHub {
-    owner = "Ousret";
+    owner = "jawah";
     repo = "charset_normalizer";
     tag = version;
-    hash = "sha256-PkFmNEMdp9duDCqMTKooOLAOCqHf3IjrGlr8jKYT2WE=";
+    hash = "sha256-ZEHxBErjjvofqe3rkkgiEuEJcoluwo+2nZrLfrsHn5Q=";
   };
 
   build-system = [
@@ -45,7 +42,7 @@ buildPythonPackage rec {
     description = "Python module for encoding and language detection";
     mainProgram = "normalizer";
     homepage = "https://charset-normalizer.readthedocs.io/";
-    changelog = "https://github.com/Ousret/charset_normalizer/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jawah/charset_normalizer/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 4108382f36f3dc56fd3335c61850c9ab23cfcdfb Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 20 Aug 2025 17:01:55 +0200
Subject: [PATCH 164/321] compress-man-pages: don't leak build timestamp into
 archive

without `-n`, gzip leaks the file timestamp into the compressed file,
which is likely to leak the build timestamp into the output.

This fixes #434930, a regression introduced in c5252e1 / #406922
---
 pkgs/build-support/setup-hooks/compress-man-pages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh
index 26059b7d94017..77b2eb2d83fa4 100644
--- a/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh
@@ -11,7 +11,7 @@ compressManPages() {
     # Compress all uncompressed manpages.  Don't follow symlinks, etc.
     # gzip -f is needed to not error out on hard links.
     find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \
-        | xargs -0 -n1 -P "$NIX_BUILD_CORES" gzip -f
+        | xargs -0 -n1 -P "$NIX_BUILD_CORES" gzip -n -f
 
     # Point symlinks to compressed manpages.
     find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \

From 9ccbdd33d066870e18ca0ada7589ab8745ba7bd1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 20 Aug 2025 19:48:39 +0200
Subject: [PATCH 165/321] libxrender: propagate libx11

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

diff --git a/pkgs/by-name/li/libxrender/package.nix b/pkgs/by-name/li/libxrender/package.nix
index c38fb008845f9..c60e5ddc6e30e 100644
--- a/pkgs/by-name/li/libxrender/package.nix
+++ b/pkgs/by-name/li/libxrender/package.nix
@@ -32,7 +32,10 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
   ];
 
-  propagatedBuildInputs = [ xorgproto ];
+  propagatedBuildInputs = [
+    xorgproto
+    libx11
+  ];
 
   configureFlags = lib.optional (
     stdenv.hostPlatform != stdenv.buildPlatform

From 8ac5f6dec055f66d00fdd2561c348970cfe1d48e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 15 Aug 2025 14:59:27 -0700
Subject: [PATCH 166/321] python3Packages.google-cloud-storage: build from
 GitHub

---
 .../google-cloud-storage/default.nix          | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 84fa74f9e9e0a..314d513b0b590 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   google-auth,
   google-cloud-core,
   google-cloud-iam,
@@ -21,12 +21,11 @@ buildPythonPackage rec {
   version = "3.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    pname = "google_cloud_storage";
-    inherit version;
-    hash = "sha256-3syoQwdgNvRWMxmMEl0YYf+/R+v1wOO5jcubLbFViWw=";
+  src = fetchFromGitHub {
+    owner = "googleapis";
+    repo = "python-storage";
+    tag = "v${version}";
+    hash = "sha256-05jPtpsEQYqReDaeLj/Vzkz761jZfLQXC20WjTIPVc8=";
   };
 
   pythonRelaxDeps = [ "google-auth" ];
@@ -52,6 +51,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  enabledTestPaths = [
+    "tests/unit/"
+    "tests/system/"
+  ];
+
   disabledTests = [
     # Disable tests which require credentials and network access
     "create"
@@ -72,6 +76,7 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
+    "samples/"
     "tests/unit/test_bucket.py"
     "tests/system/test_blob.py"
     "tests/system/test_bucket.py"
@@ -90,11 +95,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "google.cloud.storage" ];
 
-  meta = with lib; {
+  meta = {
     description = "Google Cloud Storage API client library";
     homepage = "https://github.com/googleapis/python-storage";
     changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 397c8fec7bfe00705a915c31f1a809f658945c23 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 16 Aug 2025 09:17:27 -0700
Subject: [PATCH 167/321] python3Packages.google-cloud-storage: add sarahec as
 maintainer

---
 .../development/python-modules/google-cloud-storage/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 314d513b0b590..c9460a6dbdd22 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -100,6 +100,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-storage";
     changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ sarahec ];
   };
 }

From 87598dd2df79dd7178461568739a7f64f52a3af1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 16 Aug 2025 09:18:23 -0700
Subject: [PATCH 168/321] python3Packages.google-cloud-storage: 3.2.0 -> 3.3.0

changelog: https://github.com/googleapis/python-storage/releases/tag/v3.2.0
diff: https://github.com/googleapis/python-storage/compare/v3.2.0...v3.3.0
---
 .../python-modules/google-cloud-storage/default.nix          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index c9460a6dbdd22..f0eed472c57b5 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-storage";
     tag = "v${version}";
-    hash = "sha256-05jPtpsEQYqReDaeLj/Vzkz761jZfLQXC20WjTIPVc8=";
+    hash = "sha256-I0wC/BV8fJr3JW1nyq2TPJZlZaT4+h2lJBdGTttSzRo=";
   };
 
   pythonRelaxDeps = [ "google-auth" ];
@@ -76,7 +76,6 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
-    "samples/"
     "tests/unit/test_bucket.py"
     "tests/system/test_blob.py"
     "tests/system/test_bucket.py"

From 557a2eef7798b8da2ae3aba036db7a65768a9a3e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 17 Aug 2025 09:18:18 -0700
Subject: [PATCH 169/321] python3Packages.google-api-core: cleanup

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

diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 9269c2d259cd1..a22e24ff99f78 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -22,8 +22,6 @@ buildPythonPackage rec {
   version = "2.25.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-api-core";
@@ -79,7 +77,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "google.api_core" ];
 
-  meta = with lib; {
+  meta = {
     description = "Core Library for Google Client Libraries";
     longDescription = ''
       This library is not meant to stand-alone. Instead it defines common
@@ -87,7 +85,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/googleapis/python-api-core";
     changelog = "https://github.com/googleapis/python-api-core/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }

From 8fddfbde5010a38ade5291c32fbd209aac58658c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 17 Aug 2025 09:19:31 -0700
Subject: [PATCH 170/321] python3Packages.google-api-core: add sarahec as
 maintainer

---
 pkgs/development/python-modules/google-api-core/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index a22e24ff99f78..1f30f82d7f073 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -86,6 +86,8 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-api-core";
     changelog = "https://github.com/googleapis/python-api-core/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sarahec
+    ];
   };
 }

From 679ab9415d7113f652a52d6ea39c150d3c405318 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 20 Aug 2025 22:11:17 +0100
Subject: [PATCH 171/321] bmake: 20250707 -> 20250804

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

diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index aa6b562a3b96d..d96737d7955a9 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bmake";
-  version = "20250707";
+  version = "20250804";
 
   src = fetchurl {
     url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-phJApAZdkMOSXdd0+Po9c97sGnMiiobulfzYIGPSiwg=";
+    hash = "sha256-C0kDdkSyUyBtLnENRuMoWeYt/ixsjnIYrkOfLvUN6K0=";
   };
 
   patches = [

From 17769ba66c1ab33ad9077a00e76544e0dcf9b76b Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 21 Aug 2025 00:14:13 +0200
Subject: [PATCH 172/321] python313Packages.sphinx: disable racy tests

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 7fe28c9d5ecaa..5d4b4d581fa4f 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -132,6 +132,9 @@ buildPythonPackage rec {
     # Racy tex file creation
     "test_literalinclude_namedlink_latex"
     "test_literalinclude_caption_latex"
+    # Racy local networking
+    "test_load_mappings_cache"
+    "test_load_mappings_cache_update"
   ]
   ++ lib.optionals (pythonAtLeast "3.12") [
     # https://github.com/sphinx-doc/sphinx/issues/12430

From b6aaf4d7ba869f1bfaac9c7e274d0fc654c13ffe Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 21 Aug 2025 00:30:55 +0200
Subject: [PATCH 173/321] nodejs: do not skip passing test

The fix was upstreamed, so we can reduce the list of skipped tests.
---
 pkgs/development/web/nodejs/nodejs.nix | 1 -
 pkgs/development/web/nodejs/v20.nix    | 6 ++++++
 pkgs/development/web/nodejs/v22.nix    | 6 ++++++
 pkgs/development/web/nodejs/v24.nix    | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 33d3f2ce452b6..b4192a98008b2 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -361,7 +361,6 @@ let
               "test-process-initgroups"
               "test-process-setgroups"
               "test-process-uid-gid"
-              "test-setproctitle"
               # This is a bit weird, but for some reason fs watch tests fail with
               # sandbox.
               "test-fs-promises-watch"
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 4a78b44276f48..a00dccfaf9689 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -27,6 +27,12 @@ buildNodejs {
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
+
+    # TODO: remove when included in a release
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
+      hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
+    })
   ]
   ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 4300e29637138..de1efad0af14b 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -51,5 +51,11 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
+
+      # TODO: remove when included in a release
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
+        hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
+      })
     ];
 }
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 5fd447dd50313..0ad7f353de4ef 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -51,6 +51,12 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
+
+      # TODO: remove when included in a release
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
+        hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
+      })
     ]
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts

From 2fa8f417f169dc2b9a441d44c18dffe4e5710f9b Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sat, 26 Apr 2025 23:26:19 +0200
Subject: [PATCH 174/321] font-encodings: refactor, move to pkgs/by-name and
 rename from xorg.encodings

relevant changes:
- remove some unneeded dependencies
---
 pkgs/by-name/fo/font-encodings/package.nix    | 38 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 37 +-----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-encodings/package.nix

diff --git a/pkgs/by-name/fo/font-encodings/package.nix b/pkgs/by-name/fo/font-encodings/package.nix
new file mode 100644
index 0000000000000..9b60deb6337aa
--- /dev/null
+++ b/pkgs/by-name/fo/font-encodings/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-encodings";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/encodings-${finalAttrs.version}.tar.xz";
+    hash = "sha256-n/E8YhdWz6EulfMrpIpbI4Oej1d9AEi+2mbGfatN6XU=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ mkfontscale ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname encodings \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Font encoding tables for libfontenc";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/encodings";
+    license = lib.licenses.publicDomain;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ab48f6f94e2cd..c8fe23bc9e1b7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,6 +3,7 @@
   lib,
   bdftopcf,
   font-alias,
+  font-encodings,
   font-util,
   gccmakedep,
   ico,
@@ -85,6 +86,7 @@ self: with self; {
     xwininfo
     xwud
     ;
+  encodings = font-encodings;
   fontalias = font-alias;
   fontutil = font-util;
   libAppleWM = libapplewm;
@@ -240,41 +242,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  encodings = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "encodings";
-      version = "1.1.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/encodings-1.1.0.tar.xz";
-        sha256 = "0xg99nmpvik6vaz4h03xay7rx0r3bf5a8azkjlpa3ksn2xi3rwcz";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontadobe100dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9ea02810f2e6d..ae509cd39ed0c 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -296,6 +296,7 @@
   lib,
   bdftopcf,
   font-alias,
+  font-encodings,
   font-util,
   gccmakedep,
   ico,
@@ -378,6 +379,7 @@
     xwininfo
     xwud
     ;
+  encodings = font-encodings;
   fontalias = font-alias;
   fontutil = font-util;
   libAppleWM = libapplewm;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8333d91a4a825..790e6a2ec3102 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -105,7 +105,6 @@ 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/driver/xf86-video-wsfb-0.4.0.tar.bz2
-mirror://xorg/individual/font/encodings-1.1.0.tar.xz
 mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz

From 22b9ac1e5cf9ef1ad47ced474173467b814e23d7 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 02:16:47 +0200
Subject: [PATCH 175/321] xcursorgen: refactor and move to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/xc/xcursorgen/package.nix        | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/xc/xcursorgen/package.nix

diff --git a/pkgs/by-name/xc/xcursorgen/package.nix b/pkgs/by-name/xc/xcursorgen/package.nix
new file mode 100644
index 0000000000000..19f65724d1bf2
--- /dev/null
+++ b/pkgs/by-name/xc/xcursorgen/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libpng,
+  libx11,
+  libxcursor,
+  xorgproto,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcursorgen";
+  version = "1.0.9";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xcursorgen-${finalAttrs.version}.tar.xz";
+    hash = "sha256-DMnhVqyEyhbqkCcQrzXg+v+lHRN5cHHjtLbMfL1JO7w=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libpng
+    libx11
+    libxcursor
+    xorgproto
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "prepares X11 cursor sets for use with libXcursor";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcursorgen";
+    license = lib.licenses.hpndSellVariant;
+    mainProgram = "xcursorgen";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ab48f6f94e2cd..2327ddd5e3e30 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -35,6 +35,7 @@
   xbitmaps,
   xcb-proto,
   xcmsdb,
+  xcursorgen,
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
@@ -73,6 +74,7 @@ self: with self; {
     transset
     xbitmaps
     xcmsdb
+    xcursorgen
     xdriinfo
     xlsatoms
     xlsclients
@@ -3646,46 +3648,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcursorgen = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libpng,
-      libX11,
-      libXcursor,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcursorgen";
-      version = "1.0.9";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz";
-        sha256 = "1g1v96yprk5nnkip2w3r2cfsbzzsw0ssy417j3m1djl4mibf3j8c";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libpng
-        libX11
-        libXcursor
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcursorthemes = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9ea02810f2e6d..3c5f9bb7b8120 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -328,6 +328,7 @@
   xbitmaps,
   xcb-proto,
   xcmsdb,
+  xcursorgen,
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
@@ -366,6 +367,7 @@
     transset
     xbitmaps
     xcmsdb
+    xcursorgen
     xdriinfo
     xlsatoms
     xlsclients
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b47078df27119..0ca4e82299a98 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1026,7 +1026,6 @@ self: super:
   xclock = addMainProgram super.xclock { };
   xcompmgr = addMainProgram super.xcompmgr { };
   xconsole = addMainProgram super.xconsole { };
-  xcursorgen = addMainProgram super.xcursorgen { };
 
   xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
     nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8333d91a4a825..80dd8385668b2 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -22,7 +22,6 @@ mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
 mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz
 mirror://xorg/individual/app/xconsole-1.1.0.tar.xz
-mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz
 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
 mirror://xorg/individual/app/xev-1.2.6.tar.xz

From 66ca0ad28cff983efd2dca71e9e4a7cd544508ad Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 02:29:57 +0200
Subject: [PATCH 176/321] xcursor-themes: refactor, move to pkgs/by-name and
 rename from xorg.xcursorthemes

---
 pkgs/by-name/xc/xcursor-themes/package.nix    | 49 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +------------
 .../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, 53 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/xc/xcursor-themes/package.nix

diff --git a/pkgs/by-name/xc/xcursor-themes/package.nix b/pkgs/by-name/xc/xcursor-themes/package.nix
new file mode 100644
index 0000000000000..628d9b71baf68
--- /dev/null
+++ b/pkgs/by-name/xc/xcursor-themes/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xcursorgen,
+  xorgproto,
+  libxcursor,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcursor-themes";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/data/xcursor-themes-${finalAttrs.version}.tar.xz";
+    hash = "sha256-lbro9Igj2JSgW/Qt+/RTZ0q3296xHivAeehSWtRzeMg=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    pkg-config
+    xcursorgen
+  ];
+  buildInputs = [
+    xorgproto
+    libxcursor
+  ];
+
+  configureFlags = [ "--with-cursordir=$(out)/share/icons" ];
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/data/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Default set of cursor themes for use with libXcursor.";
+    homepage = "https://gitlab.freedesktop.org/xorg/data/cursors";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2327ddd5e3e30..55cbd6a08daec 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -36,6 +36,7 @@
   xcb-proto,
   xcmsdb,
   xcursorgen,
+  xcursor-themes,
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
@@ -104,6 +105,7 @@ self: with self; {
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
+  xcursorthemes = xcursor-themes;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
   xorgsgmldoctools = xorg-sgml-doctools;
@@ -3648,38 +3650,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcursorthemes = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libXcursor,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcursor-themes";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz";
-        sha256 = "1j3qfga5llp8g702n7mivvdvfjk7agsgnbglbfh99n13i3sfiflm";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ libXcursor ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xdm = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 3c5f9bb7b8120..dc886549e70f6 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -329,6 +329,7 @@
   xcb-proto,
   xcmsdb,
   xcursorgen,
+  xcursor-themes,
   xdriinfo,
   xkeyboard-config,
   xlsatoms,
@@ -397,6 +398,7 @@
   utilmacros = util-macros;
   xcbproto = xcb-proto;
   xkeyboardconfig = xkeyboard-config;
+  xcursorthemes = xcursor-themes;
   xorgcffiles = xorg-cf-files;
   xorgdocs = xorg-docs;
   xorgsgmldoctools = xorg-sgml-doctools;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0ca4e82299a98..f142fbbea7860 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1027,12 +1027,6 @@ self: super:
   xcompmgr = addMainProgram super.xcompmgr { };
   xconsole = addMainProgram super.xconsole { };
 
-  xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ];
-    buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
-    configureFlags = [ "--with-cursordir=$(out)/share/icons" ];
-  });
-
   xinit =
     (super.xinit.override {
       stdenv = if isDarwin then clangStdenv else stdenv;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 80dd8385668b2..a7d157c72e166 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -54,7 +54,6 @@ mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
-mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz

From 60176ccb0429f65d7a84ce0dbcb6b49476d7950b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 03:12:09 +0200
Subject: [PATCH 177/321] xev: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xe/xev/package.nix               | 54 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/xe/xev/package.nix

diff --git a/pkgs/by-name/xe/xev/package.nix b/pkgs/by-name/xe/xev/package.nix
new file mode 100644
index 0000000000000..06c7bd4b6d151
--- /dev/null
+++ b/pkgs/by-name/xe/xev/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxrandr,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xev";
+  version = "1.2.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xev-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YeHF4AismXOsp83d826d90EOdwg7Aw6wT03HN8UYB9c=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    xorgproto
+    libx11
+    libxrandr
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X event monitor";
+    longDescription = ''
+      xev creates a window and then asks the X server to send it X11 events whenever anything
+      happens to the window (such as it being moved, resized, typed in, clicked in, etc.).
+      You can also attach it to an existing window. It is useful for seeing what causes events to
+      occur and to display the information that they contain; it is essentially a debugging and
+      development tool, and should not be needed in normal usage.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xev";
+    license = lib.licenses.x11;
+    mainProgram = "xev";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 55cbd6a08daec..3f91762aa46a6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -38,6 +38,7 @@
   xcursorgen,
   xcursor-themes,
   xdriinfo,
+  xev,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -77,6 +78,7 @@ self: with self; {
     xcmsdb
     xcursorgen
     xdriinfo
+    xev
     xlsatoms
     xlsclients
     xlsfonts
@@ -3768,44 +3770,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xev = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      libXrandr,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xev";
-      version = "1.2.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xev-1.2.6.tar.xz";
-        sha256 = "1mq7332kgisd9yq0w0rv11vhwhgpkmpg7pfdlyn776dc13hcbqb1";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-        libXrandr
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xeyes = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index dc886549e70f6..a7ecd2e2e3629 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -331,6 +331,7 @@
   xcursorgen,
   xcursor-themes,
   xdriinfo,
+  xev,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -370,6 +371,7 @@
     xcmsdb
     xcursorgen
     xdriinfo
+    xev
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f142fbbea7860..19917906c394d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -683,7 +683,6 @@ self: super:
     };
   });
 
-  xev = addMainProgram super.xev { };
   xeyes = addMainProgram super.xeyes { };
 
   xvinfo = super.xvinfo.overrideAttrs (attrs: {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a7d157c72e166..952eda618e179 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -24,7 +24,6 @@ mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz
 mirror://xorg/individual/app/xconsole-1.1.0.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz
 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
-mirror://xorg/individual/app/xev-1.2.6.tar.xz
 mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz

From 12e753b55c1ec322ee12ee4a36c70a0768fd8d99 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 03:22:36 +0200
Subject: [PATCH 178/321] xfsinfo: 1.0.7 -> 1.0.8, refactor & move to
 pkgs/by-name from xorg namespace

---
 pkgs/by-name/xf/xfsinfo/package.nix           | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 60 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/xf/xfsinfo/package.nix

diff --git a/pkgs/by-name/xf/xfsinfo/package.nix b/pkgs/by-name/xf/xfsinfo/package.nix
new file mode 100644
index 0000000000000..96fe75b0da7e0
--- /dev/null
+++ b/pkgs/by-name/xf/xfsinfo/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libfs,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xfsinfo";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xfsinfo-${finalAttrs.version}.tar.xz";
+    hash = "sha256-roBZK2Bj2pKOPQyBAjcJsvopoE/NpJ9sNjrFedl/I6I=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libfs
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X font server information utility";
+    longDescription = ''
+      xfsinfo is a utility for displaying information about an X font server.
+      It is used to examine the capabilities of a server, the predefined values for various
+      parameters used in communicating between clients and the server, and the font catalogues and
+      alternate servers that are available.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfsinfo";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpndSellVariant
+    ];
+    mainProgram = "xfsinfo";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3f91762aa46a6..1cf1a8263de17 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -39,6 +39,7 @@
   xcursor-themes,
   xdriinfo,
   xev,
+  xfsinfo,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -79,6 +80,7 @@ self: with self; {
     xcursorgen
     xdriinfo
     xev
+    xfsinfo
     xlsatoms
     xlsclients
     xlsfonts
@@ -5888,42 +5890,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xfsinfo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libFS,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xfsinfo";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz";
-        sha256 = "0x48p4hk0lds2s8nwzgfl616r99s28ydx02zs7p1fxxs3i2wmwwj";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libFS
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xgamma = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a7ecd2e2e3629..0fa00790926f5 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -332,6 +332,7 @@
   xcursor-themes,
   xdriinfo,
   xev,
+  xfsinfo,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -372,6 +373,7 @@
     xcursorgen
     xdriinfo
     xev
+    xfsinfo
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 19917906c394d..fe4505b847b0e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1112,7 +1112,6 @@ self: super:
   xfd = addMainProgram super.xfd { };
   xfontsel = addMainProgram super.xfontsel { };
   xfs = addMainProgram super.xfs { };
-  xfsinfo = addMainProgram super.xfsinfo { };
   xgamma = addMainProgram super.xgamma { };
   xgc = addMainProgram super.xgc { };
   xhost = addMainProgram super.xhost { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 952eda618e179..9a412d811e686 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -28,7 +28,6 @@ mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
-mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz
 mirror://xorg/individual/app/xgamma-1.0.7.tar.xz
 mirror://xorg/individual/app/xgc-1.0.6.tar.xz
 mirror://xorg/individual/app/xhost-1.0.10.tar.xz

From f4db99ab73512c452c26d52facbeda418968c296 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 03:53:28 +0200
Subject: [PATCH 179/321] xrandr: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xr/xrandr/package.nix            | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  9 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 61 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/by-name/xr/xrandr/package.nix

diff --git a/pkgs/by-name/xr/xrandr/package.nix b/pkgs/by-name/xr/xrandr/package.nix
new file mode 100644
index 0000000000000..11a74880ff8db
--- /dev/null
+++ b/pkgs/by-name/xr/xrandr/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxrandr,
+  libxrender,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xrandr";
+  version = "1.5.3";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xrandr-${finalAttrs.version}.tar.xz";
+    hash = "sha256-+N11Zq23QUf6uZZGgLa7re6Hz0Bqf8/1Fxil5pSbhBw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxrandr
+    libxrender
+  ];
+
+  postInstall = ''
+    # remove useless xkeystone script
+    # it is written in a language not packaged in nixpkgs
+    rm $out/bin/xkeystone
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Command line interface to X11 Resize, Rotate, and Reflect (RandR) extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xrandr";
+    license = lib.licenses.hpndSellVariant;
+    mainProgram = "xrandr";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1cf1a8263de17..558540ec588a0 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -50,6 +50,7 @@
   xorgproto,
   xorg-sgml-doctools,
   xprop,
+  xrandr,
   xrefresh,
   xtrans,
   xwininfo,
@@ -87,6 +88,7 @@ self: with self; {
     xmodmap
     xorgproto
     xprop
+    xrandr
     xrefresh
     xtrans
     xwininfo
@@ -6554,46 +6556,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xrandr = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      libXrandr,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xrandr";
-      version = "1.5.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xrandr-1.5.3.tar.xz";
-        sha256 = "0744kfafd98q2zswyzva837qgvmdpfv80ilnp7x4fhdpmmk7bpgq";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-        libXrandr
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xrdb = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0fa00790926f5..ef5e7df9d50d0 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -343,6 +343,7 @@
   xorgproto,
   xorg-sgml-doctools,
   xprop,
+  xrandr,
   xrefresh,
   xtrans,
   xwininfo,
@@ -380,6 +381,7 @@
     xmodmap
     xorgproto
     xprop
+    xrandr
     xrefresh
     xtrans
     xwininfo
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index fe4505b847b0e..ed43f372d5042 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1133,15 +1133,6 @@ self: super:
     };
   });
 
-  xrandr = super.xrandr.overrideAttrs (attrs: {
-    postInstall = ''
-      rm $out/bin/xkeystone
-    '';
-    meta = attrs.meta // {
-      mainProgram = "xrandr";
-    };
-  });
-
   xset = addMainProgram super.xset { };
   xsetroot = addMainProgram super.xsetroot { };
   xsm = addMainProgram super.xsm { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 9a412d811e686..0fd2c771467ff 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -43,7 +43,6 @@ mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz
 mirror://xorg/individual/app/xmore-1.0.4.tar.xz
 mirror://xorg/individual/app/xpr-1.2.0.tar.xz
-mirror://xorg/individual/app/xrandr-1.5.3.tar.xz
 mirror://xorg/individual/app/xrdb-1.2.2.tar.xz
 mirror://xorg/individual/app/xset-1.2.5.tar.xz
 mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz

From 21a80441cc9f14fdff48eac5d2f259bb66c3d14f Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 04:03:27 +0200
Subject: [PATCH 180/321] xvinfo: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xv/xvinfo/package.nix            | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/xv/xvinfo/package.nix

diff --git a/pkgs/by-name/xv/xvinfo/package.nix b/pkgs/by-name/xv/xvinfo/package.nix
new file mode 100644
index 0000000000000..d9b021699aaa6
--- /dev/null
+++ b/pkgs/by-name/xv/xvinfo/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxv,
+  libxext,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xvinfo";
+  version = "1.1.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xvinfo-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Pt5x7LJtlhTMvGkWcgKF6VosfgxeGbhXDqr3KtfFxAQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxv
+    libxext
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to print out X-Video extension adaptor information";
+    longDescription = ''
+      xvinfo prints out the capabilities of any video adaptors associated with the display that are
+      accessible through the X-Video extension.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xvinfo";
+    license = lib.licenses.x11;
+    mainProgram = "xvinfo";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 558540ec588a0..438a4ed807384 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -53,6 +53,7 @@
   xrandr,
   xrefresh,
   xtrans,
+  xvinfo,
   xwininfo,
   xwud,
 }:
@@ -91,6 +92,7 @@ self: with self; {
     xrandr
     xrefresh
     xtrans
+    xvinfo
     xwininfo
     xwud
     ;
@@ -6802,44 +6804,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xvinfo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      libXv,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xvinfo";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz";
-        sha256 = "0164qpbjmxxa1rbvh6ay1iz2qnp9hl1745k9pk6195kdnbn73piy";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-        libXv
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xwd = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ef5e7df9d50d0..e3204e895029b 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -346,6 +346,7 @@
   xrandr,
   xrefresh,
   xtrans,
+  xvinfo,
   xwininfo,
   xwud,
 }:
@@ -384,6 +385,7 @@
     xrandr
     xrefresh
     xtrans
+    xvinfo
     xwininfo
     xwud
     ;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ed43f372d5042..32a8b340f3bfb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -685,13 +685,6 @@ self: super:
 
   xeyes = addMainProgram super.xeyes { };
 
-  xvinfo = super.xvinfo.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [ xorg.libXext ];
-    meta = attrs.meta // {
-      mainProgram = "xvinfo";
-    };
-  });
-
   xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
     configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ];
     meta = attrs.meta // {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 0fd2c771467ff..7748836d3a625 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -49,7 +49,6 @@ mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz
 mirror://xorg/individual/app/xsm-1.0.6.tar.xz
 mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
-mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz

From b9a112d42cc40ae4047dbbf21b7794c30ef12349 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 20 Aug 2025 23:19:07 -0400
Subject: [PATCH 181/321] xterm: add mainProgram

---
 pkgs/by-name/xt/xterm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 0b2d9e059a4d4..e39d0159fc79b 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ nequissimus ];
     platforms = with lib.platforms; linux ++ darwin;
     changelog = "https://invisible-island.net/xterm/xterm.log.html";
+    mainProgram = "xterm";
   };
 }

From 8b9ae6bd832fa6d1691d4034876ddf514e0faf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 20 Aug 2025 21:54:16 -0700
Subject: [PATCH 182/321] libadwaita: 1.7.5 -> 1.7.6

Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.7.5...1.7.6

Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.7.6/NEWS
---
 pkgs/by-name/li/libadwaita/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 8153e16a1583e..91c1f3cb8b1d3 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.7.5";
+  version = "1.7.6";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-KlaRwOWHvzm+VwMygiEh8wqJfEwwA+x7o9T72Qpqnmo=";
+    hash = "sha256-HpjP6VSkEAFeXIFXLbndQzEWJwVvHe6B3aSwCz6KiIM=";
   };
 
   depsBuildBuild = [

From cd7c44ecf054a088bd072512f72bdae7b187d873 Mon Sep 17 00:00:00 2001
From: Olivier LDff <olivier.ldff@gmail.com>
Date: Tue, 19 Aug 2025 18:27:54 +0200
Subject: [PATCH 183/321] gstreamer: 1.26.3 -> 1.26.5

---
 pkgs/development/libraries/gstreamer/bad/default.nix        | 4 ++--
 pkgs/development/libraries/gstreamer/base/default.nix       | 4 ++--
 pkgs/development/libraries/gstreamer/core/default.nix       | 4 ++--
 pkgs/development/libraries/gstreamer/devtools/default.nix   | 6 +++---
 pkgs/development/libraries/gstreamer/ges/default.nix        | 4 ++--
 pkgs/development/libraries/gstreamer/good/default.nix       | 4 ++--
 pkgs/development/libraries/gstreamer/libav/default.nix      | 4 ++--
 .../development/libraries/gstreamer/rtsp-server/default.nix | 4 ++--
 pkgs/development/libraries/gstreamer/ugly/default.nix       | 4 ++--
 pkgs/development/libraries/gstreamer/vaapi/default.nix      | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 567ae3ab2648b..5bee93cb51241 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -115,7 +115,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-bad";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${finalAttrs.version}.tar.xz";
-    hash = "sha256-lcSNrK8UJ29OWV9MvKlLPP6/wiKF52XiqlbQpydddWE=";
+    hash = "sha256-mJDyYvOyqVZNy2KenraX13uT0fcYl+2hqBcLfc/nMpQ=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index e226443bc0b6b..8e78f55d95593 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-base";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Tvn57wkCUwjOIg4t0iqJ5MmS2MpxuWjjxwrwY07CeTM=";
+    hash = "sha256-8MDibL7apXcyy2pXjozBOhFkvxjXN9VcMzBhxS8MSNc=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index e7b3829d5146e..74237baa194f8 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -40,7 +40,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "bin"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3GYWAyISk9zMdAhiQl61T7vtYPsp0IyAHUQKaj/4JoA=";
+    hash = "sha256-Cn7bDntC2+a1dfzmGkgIo/ayDghaHq7LwCXQ7CHx53Q=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 376a5afca3dae..678570a1af1d9 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-devtools";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${finalAttrs.version}.tar.xz";
-    hash = "sha256-T94Zw8FEg0+MsFwso/FLOlDTlbrSA9F/mKbnDBZy8ro=";
+    hash = "sha256-Y9Rqjv+ooiXiWkZLp1OKzoU/4NwecDZrJ8IIE15UAc4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       cargoRoot
       ;
     name = "gst-devtools-${finalAttrs.version}";
-    hash = "sha256-AgxvFMq37a8NuOHY1QIUGOAo8aSBt4HVeSCHNUYa1tQ=";
+    hash = "sha256-gU+SBvxwmrGiyeKXF3SA2ohIHNTS4ZBC+elB0u1QKRE=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 73b11e941ac8c..794c56b6d11c7 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-editing-services";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3SCpPSw0aLahAk/wySeIayGTe9E7jLjxdfhjc2DRb9I=";
+    hash = "sha256-c0kAlE+Q7OXi85g8M1F4/aUAI/40KqdezZ2KnDi2TZ4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 5e91e4a1b9df3..052f258866c6e 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -74,7 +74,7 @@ assert raspiCameraSupport -> hostSupportsRaspiCamera;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-good";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/k7JZw7f5rseXycWmuFFtawt0hismL2CUcj7pBrTPFM=";
+    hash = "sha256-6whi6TQEsHPpjsUDUOzn5mheopNsq4EYwrjpOOLL6os=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 21cc1d71efa07..9a9ccfaea91f3 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-libav";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Otp+UKO5uLo+QFsUxAIeJfuxA3n3fSzkkKoWUj7Sck0=";
+    hash = "sha256-1t4FiE70I3bdjN6JlA97UM7Zb09vUoiOdkzYIz508FI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index ab01ff0315b10..d249f0ceacbe1 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-rtsp-server";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QV6KU6mER4l3DdTxFqwuOkoz3kJnPFeswlxboPRAb8U=";
+    hash = "sha256-Mo3/JFdBloPypPBsoRnP0ivrYyzuGtaDBZEhMyU1PEQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 9a3879867d83a..fc32fcc326b1b 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-ugly";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QX9e6JX3NKwDQbNxnBdf/xa0yOrogG4p4XCzvLPZ26U=";
+    hash = "sha256-PfxDQ1vpfhEIFrrG1gKw8gagOFRieWg9nSU3L/En21I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 00978658919bf..80c4ddf2cf3e6 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer-vaapi";
-  version = "1.26.3";
+  version = "1.26.5";
 
   outputs = [
     "out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LWQ/vRQgKX2lpNaUXRHwpbT4L+6lTqauyTaNQpldiwM=";
+    hash = "sha256-tC1E22PzGVpvMyluHq0ywU0B7ydFK3Bo8aLYZiT1Xqk=";
   };
 
   nativeBuildInputs = [

From 96c07856e25db8be0c68933c0660a26370554611 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 21 Aug 2025 06:35:23 +0100
Subject: [PATCH 184/321] libarchive: unconditionally disable bsdcpio_test
 patrs on all linux targets

Without the change the tests started failing on filesystems with 64-bit
inode values (like `btrfs` with long age which saw 4B file creations/reletions)
as:

    cpio/test/test_basic.c:65: Contents don't match
       Description: Expected: bsdcpio: file: large inode number truncated: Numerical result out of range
    bsdcpio: linkfile: large inode number truncated: Numerical result out of range
    bsdcpio: symlink: large inode number truncated: Numerical result out of range
    bsdcpio: file2: large inode number truncated: Numerical result out of range
    bsdcpio: dir: large inode number truncated: Numerical result out of range
---
 pkgs/by-name/li/libarchive/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 640914afd9a00..488fbd91c766b 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -69,9 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
         "libarchive/test/test_read_disk_directory_traversals.c"
         "cpio/test/test_option_a.c"
         "cpio/test/test_option_t.c"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
-        # only on some aarch64-linux systems?
+        # fails tests on filesystems with 64-bit inode values:
+        # FAIL: bsdcpio_test
+        #   bsdcpio: linkfile: large inode number truncated: Numerical result out of range
         "cpio/test/test_basic.c"
         "cpio/test/test_format_newc.c"
       ];

From 0d8059fd8317755f2b919b5119c50000810349da Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:19:57 +0200
Subject: [PATCH 185/321] go,buildGoModule: 1.24 -> 1.25

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9854e231a6bf1..ba2d7fc25356d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9547,8 +9547,8 @@ with pkgs;
   ### DEVELOPMENT / GO
 
   # the unversioned attributes should always point to the same go version
-  go = go_1_24;
-  buildGoModule = buildGo124Module;
+  go = go_1_25;
+  buildGoModule = buildGo125Module;
 
   go_latest = go_1_25;
   buildGoLatestModule = buildGo125Module;

From 99ebddd2fa074398be793491ac83ed9116d81733 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:04:38 +0200
Subject: [PATCH 186/321] anvil-editor: mark broken

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/an/anvil-editor/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 4f2e1a51d41fc..046da0e6b454c 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  buildGo123Module,
+  buildGoModule,
   fetchzip,
   pkg-config,
   copyDesktopItems,
@@ -15,7 +15,7 @@
   buildPackages,
 }:
 
-buildGo123Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "anvil-editor";
   version = "0.6";
 
@@ -30,7 +30,7 @@ buildGo123Module (finalAttrs: {
 
   vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk=";
 
-  anvilExtras = buildGo123Module {
+  anvilExtras = buildGoModule {
     pname = "anvil-editor-extras";
     inherit (finalAttrs) version src meta;
     vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo=";
@@ -93,5 +93,9 @@ buildGo123Module (finalAttrs: {
     mainProgram = "anvil";
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = with lib.platforms; unix ++ windows;
+    # Doesn't build with >buildGo123Module.
+    # Multiple errors like the following:
+    # '> vendor/gioui.org/internal/vk/vulkan.go:1916:9: cannot define new methods on non-local type SurfaceCapabilities'
+    broken = true;
   };
 })

From c581870d062cbe37e2ef44b1f49f10b348dfaf3d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:09:35 +0200
Subject: [PATCH 187/321] avalanchego: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/av/avalanchego/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix
index 8c25d19d29701..4bb85ddcbb7c9 100644
--- a/pkgs/by-name/av/avalanchego/package.nix
+++ b/pkgs/by-name/av/avalanchego/package.nix
@@ -1,11 +1,11 @@
 {
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   lib,
   nix-update-script,
 }:
 
-buildGo123Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "avalanchego";
   version = "1.13.2";
 

From 51df53f67322c3fc58cf59758f7329e21eef97a4 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:11:10 +0200
Subject: [PATCH 188/321] certinfo: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/ce/certinfo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index b5f79fdd1a867..b3609d0be1f55 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -1,12 +1,12 @@
 {
   stdenv,
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   libX11,
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "certinfo";
   version = "1.0.24";
 

From 69a9d025967eb016c8e353803039ef0d6338c975 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:21:54 +0200
Subject: [PATCH 189/321] d2: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/d2/d2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix
index fc4e2bbb31c30..7d8905d6c7b12 100644
--- a/pkgs/by-name/d2/d2/package.nix
+++ b/pkgs/by-name/d2/d2/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   installShellFiles,
   git,
@@ -8,7 +8,7 @@
   d2,
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "d2";
   version = "0.7.0";
 

From 8453dbbbe021f34bb8679dc0901f15132d203751 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:25:25 +0200
Subject: [PATCH 190/321] glasskube: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/gl/glasskube/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix
index 73d9b3d4275c6..d307897cec113 100644
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   buildNpmPackage,
   fetchFromGitHub,
   nix-update-script,
@@ -37,7 +37,7 @@ let
   };
 
 in
-buildGo123Module rec {
+buildGoModule rec {
   inherit version;
   pname = "glasskube";
 

From 44fe12cb37f7756f49068162ad55cef5ab90c35e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:30:20 +0200
Subject: [PATCH 191/321] local-ai: mark broken

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/lo/local-ai/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index 41d046fb24c70..3378c919cac7a 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -15,7 +15,7 @@
   ffmpeg,
   cmake,
   pkg-config,
-  buildGo123Module,
+  buildGoModule,
   makeWrapper,
   ncurses,
   which,
@@ -356,7 +356,7 @@ let
       ${cp} ${stable-diffusion} sources/stablediffusion-ggml.cpp
     '';
 
-  self = buildGo123Module.override { stdenv = effectiveStdenv; } {
+  self = buildGoModule.override { stdenv = effectiveStdenv; } {
     inherit pname version src;
 
     vendorHash = "sha256-1OY/y1AeL0K+vOU4Jk/cj7rToVLC9EkkNhgifB+icDM=";
@@ -538,6 +538,9 @@ let
         ck3d
       ];
       platforms = platforms.linux;
+      # Doesn't build with >buildGo123Module.
+      # 'cp: cannot stat 'bin/rpc-server': No such file or directory'
+      broken = true;
     };
   };
 in

From 2601287546030561c21d194305e35995a78470a8 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:32:28 +0200
Subject: [PATCH 192/321] screego: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/sc/screego/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix
index 1caf2e75ee97d..9947d7d3d32cc 100644
--- a/pkgs/by-name/sc/screego/package.nix
+++ b/pkgs/by-name/sc/screego/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   fetchYarnDeps,
   yarnConfigHook,
@@ -48,7 +48,7 @@ let
 
 in
 
-buildGo123Module rec {
+buildGoModule rec {
   inherit src version;
 
   pname = "screego-server";

From a7570d9f8ee72aa0b0ab7d49b87ba4aef9ba248b Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:36:21 +0200
Subject: [PATCH 193/321] stash: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/st/stash/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stash/package.nix b/pkgs/by-name/st/stash/package.nix
index 7c56da71f81ea..5088847950ddd 100644
--- a/pkgs/by-name/st/stash/package.nix
+++ b/pkgs/by-name/st/stash/package.nix
@@ -1,5 +1,5 @@
 {
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   fetchYarnDeps,
   lib,
@@ -72,7 +72,7 @@ let
     dontFixup = true;
   });
 in
-buildGo123Module {
+buildGoModule {
   inherit
     pname
     src

From 0b71ad696cb4667fccab92add33b9be6593bac2b Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:46:42 +0200
Subject: [PATCH 194/321] deck: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba2d7fc25356d..de8c79523b3db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -345,10 +345,6 @@ with pkgs;
 
   cup-docker-noserver = cup-docker.override { withServer = false; };
 
-  deck = callPackage ../by-name/de/deck/package.nix {
-    buildGoModule = buildGo123Module;
-  };
-
   dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
 
   dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { };

From 23552a8f0fa0b9fa0614c3830798dd151ef59c1e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:49:36 +0200
Subject: [PATCH 195/321] cyclonedx-gomod: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de8c79523b3db..29337fa0471be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1654,9 +1654,7 @@ with pkgs;
 
   inherit (cue) writeCueValidator;
 
-  cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod {
-    buildGoModule = buildGo123Module;
-  };
+  cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { };
 
   dazel = python3Packages.callPackage ../development/tools/dazel { };
 

From ee8945f8269839ad5e50cdd95d9e3535bf0a0054 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:51:27 +0200
Subject: [PATCH 196/321] carapace: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29337fa0471be..e0e66364c1591 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4620,9 +4620,7 @@ with pkgs;
   };
   bashInteractiveFHS = bashFHS;
 
-  carapace = callPackage ../shells/carapace {
-    buildGoModule = buildGo123Module;
-  };
+  carapace = callPackage ../shells/carapace { };
 
   wrapFish = callPackage ../shells/fish/wrapper.nix { };
 

From 49faa36ea1e8d319e7e4ca3bfd293fb09d3ee3b0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 11:55:06 +0200
Subject: [PATCH 197/321] gowitness: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e66364c1591..a742e9029be10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15358,9 +15358,7 @@ with pkgs;
 
   gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { };
 
-  gowitness = callPackage ../tools/security/gowitness {
-    buildGoModule = buildGo123Module;
-  };
+  gowitness = callPackage ../tools/security/gowitness { };
 
   helmfile = callPackage ../applications/networking/cluster/helmfile { };
 

From 270aa20bd62f22253340cc7d6aff0cfe76993d63 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 12:22:57 +0200
Subject: [PATCH 198/321] teleport: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/te/teleport_16/package.nix | 4 ++--
 pkgs/by-name/te/teleport_17/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 2ef76956122cf..ea267b3db4a49 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -1,6 +1,6 @@
 {
   buildTeleport,
-  buildGo123Module,
+  buildGoModule,
   wasm-bindgen-cli_0_2_95,
 }:
 buildTeleport rec {
@@ -11,5 +11,5 @@ buildTeleport rec {
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
-  buildGoModule = buildGo123Module;
+  inherit buildGoModule;
 }
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 68e6425649716..b27de8765ff5f 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -1,6 +1,6 @@
 {
   buildTeleport,
-  buildGo123Module,
+  buildGoModule,
   wasm-bindgen-cli_0_2_95,
 }:
 
@@ -12,5 +12,5 @@ buildTeleport rec {
   pnpmHash = "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
-  buildGoModule = buildGo123Module;
+  inherit buildGoModule;
 }

From a4096c1f9e4e28e522a5c472478dae46b5b85048 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 19 Aug 2025 13:45:32 +0200
Subject: [PATCH 199/321] cryptsetup: use finalAttrs

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/cr/cryptsetup/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix
index fbcb5dccfcc82..5ab95727c063e 100644
--- a/pkgs/by-name/cr/cryptsetup/package.nix
+++ b/pkgs/by-name/cr/cryptsetup/package.nix
@@ -23,7 +23,7 @@
   rebuildMan ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cryptsetup";
   version = "2.8.1";
 
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
   separateDebugInfo = true;
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url =
+      "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor finalAttrs.version}/"
+      + "cryptsetup-${finalAttrs.version}.tar.xz";
     hash = "sha256-LDN563ZZfcq1CRFEmwE+JpfEv/zHFtu/DZsOj7u0b7Q=";
   };
 
@@ -106,7 +108,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://gitlab.com/cryptsetup/cryptsetup/";
     description = "LUKS for dm-crypt";
-    changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes";
+    changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${finalAttrs.version}/docs/v${finalAttrs.version}-ReleaseNotes";
     license = lib.licenses.gpl2Plus;
     mainProgram = "cryptsetup";
     maintainers = with lib.maintainers; [
@@ -115,4 +117,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = with lib.platforms; linux;
   };
-}
+})

From 9600cdcfb5f461fb6336b8d5e26044c5bdaf583d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 21 Aug 2025 08:50:29 +0200
Subject: [PATCH 200/321] sointu: unpin buildGoModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/so/sointu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix
index cf4a2cdf190ff..cda2e244d14a0 100644
--- a/pkgs/by-name/so/sointu/package.nix
+++ b/pkgs/by-name/so/sointu/package.nix
@@ -1,5 +1,5 @@
 {
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
   lib,
   pkg-config,
@@ -12,7 +12,7 @@
   xorg,
 }:
 
-buildGo123Module {
+buildGoModule {
   pname = "sointu";
   version = "0.4.1-unstable-2025-08-13";
 

From f4d727e4ff1b7c71abd6576e335a48b6fcf13136 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 13 Aug 2025 12:03:02 +0200
Subject: [PATCH 201/321] go_1_23,buildGo123Module: remove

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/development/compilers/go/1.23.nix | 174 -------------------------
 pkgs/top-level/aliases.nix             |   2 +
 pkgs/top-level/all-packages.nix        |   5 -
 3 files changed, 2 insertions(+), 179 deletions(-)
 delete mode 100644 pkgs/development/compilers/go/1.23.nix

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
deleted file mode 100644
index 4931643a5c1d6..0000000000000
--- a/pkgs/development/compilers/go/1.23.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  tzdata,
-  replaceVars,
-  iana-etc,
-  mailcap,
-  buildPackages,
-  pkgsBuildTarget,
-  targetPackages,
-  testers,
-  skopeo,
-  buildGo123Module,
-}:
-
-let
-  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
-
-  skopeoTest = skopeo.override { buildGoModule = buildGo123Module; };
-
-  # We need a target compiler which is still runnable at build time,
-  # to handle the cross-building case where build != host == target
-  targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
-
-  isCross = stdenv.buildPlatform != stdenv.targetPlatform;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "go";
-  version = "1.23.12";
-
-  src = fetchurl {
-    url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-4czpN5ok6JVxSkEsfd0VfSYU2e2+g6hESbbhhAtPEiY=";
-  };
-
-  strictDeps = true;
-  buildInputs =
-    [ ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
-    ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
-
-  depsBuildTarget = lib.optional isCross targetCC;
-
-  depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
-
-  postPatch = ''
-    patchShebangs .
-  '';
-
-  patches = [
-    (replaceVars ./iana-etc-1.17.patch {
-      iana = iana-etc;
-    })
-    # Patch the mimetype database location which is missing on NixOS.
-    # but also allow static binaries built with NixOS to run outside nix
-    (replaceVars ./mailcap-1.17.patch {
-      inherit mailcap;
-    })
-    # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
-    # that run outside a nix server
-    (replaceVars ./tzdata-1.19.patch {
-      inherit tzdata;
-    })
-    ./remove-tools-1.11.patch
-    ./go_no_vendor_checks-1.23.patch
-  ];
-
-  inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
-  # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
-  # Go will nevertheless build a for host system that we will copy over in
-  # the install phase.
-  GOHOSTOS = stdenv.buildPlatform.go.GOOS;
-  GOHOSTARCH = stdenv.buildPlatform.go.GOARCH;
-
-  # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
-  # to be different from CC/CXX
-  CC_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}cc" else null;
-  CXX_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}c++" else null;
-
-  GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
-  # Wasi does not support CGO
-  CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
-
-  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
-
-  buildPhase = ''
-    runHook preBuild
-    export GOCACHE=$TMPDIR/go-cache
-
-    export PATH=$(pwd)/bin:$PATH
-
-    ${lib.optionalString isCross ''
-      # Independent from host/target, CC should produce code for the building system.
-      # We only set it when cross-compiling.
-      export CC=${buildPackages.stdenv.cc}/bin/cc
-    ''}
-    ulimit -a
-
-    pushd src
-    ./make.bash
-    popd
-    runHook postBuild
-  '';
-
-  preInstall = ''
-    # Contains the wrong perl shebang when cross compiling,
-    # since it is not used for anything we can deleted as well.
-    rm src/regexp/syntax/make_perl_groups.pl
-  ''
-  + (
-    if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
-      ''
-        mv bin/*_*/* bin
-        rmdir bin/*_*
-        ${lib.optionalString
-          (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
-          ''
-            rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
-          ''
-        }
-      ''
-    else
-      lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
-        rm -rf bin/*_*
-        ${lib.optionalString
-          (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
-          ''
-            rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
-          ''
-        }
-      ''
-  );
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/go
-    cp -a bin pkg src lib misc api doc go.env VERSION $out/share/go
-    mkdir -p $out/bin
-    ln -s $out/share/go/bin/* $out/bin
-    runHook postInstall
-  '';
-
-  disallowedReferences = [ goBootstrap ];
-
-  passthru = {
-    inherit goBootstrap skopeoTest;
-    tests = {
-      skopeo = testers.testVersion { package = skopeoTest; };
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "go version";
-        version = "go${finalAttrs.version}";
-      };
-    };
-  };
-
-  meta = with lib; {
-    changelog = "https://go.dev/doc/devel/release#go${finalAttrs.version}";
-    description = "Go Programming language";
-    homepage = "https://go.dev/";
-    license = licenses.bsd3;
-    teams = [ teams.golang ];
-    platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd;
-    badPlatforms = [
-      # Support for big-endian POWER < 8 was dropped in 1.9, but POWER8 users have less of a reason to run in big-endian mode than pre-POWER8 ones
-      # So non-LE ppc64 is effectively unsupported, and Go SIGILLs on affordable ppc64 hardware
-      # https://github.com/golang/go/issues/19074 - Dropped support for big-endian POWER < 8, with community pushback
-      # https://github.com/golang/go/issues/73349 - upstream will not accept submissions to fix this
-      "powerpc64-linux"
-    ];
-    mainProgram = "go";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b81d91baffdce..e4329895ec209 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -387,6 +387,7 @@ mapAliases {
   budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
   buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28
+  buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
   buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
 
@@ -808,6 +809,7 @@ mapAliases {
   gnupg1orig = throw "'gnupg1orig' has been removed due to lack of active upstream maintainance. Consider using 'gnupg' instead"; # Added 2025-01-11
   gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
   go_1_22 = throw "Go 1.22 is end-of-life and 'go_1_22' has been removed. Please use a newer Go toolchain."; # Added 2024-03-28
+  go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
   gogs = throw ''
     Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
     weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a742e9029be10..02a9476532bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9545,11 +9545,6 @@ with pkgs;
   go_latest = go_1_25;
   buildGoLatestModule = buildGo125Module;
 
-  go_1_23 = callPackage ../development/compilers/go/1.23.nix { };
-  buildGo123Module = callPackage ../build-support/go/module.nix {
-    go = buildPackages.go_1_23;
-  };
-
   go_1_24 = callPackage ../development/compilers/go/1.24.nix { };
   buildGo124Module = callPackage ../build-support/go/module.nix {
     go = buildPackages.go_1_24;

From 5aecb50780f1e201669e525290306e4d22fc8a70 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 21 Aug 2025 14:46:09 +0200
Subject: [PATCH 202/321] lvm2: fix build on static

---
 pkgs/os-specific/linux/lvm2/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index 371b4c7aa0a38..dc8af18a8472b 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -208,7 +208,7 @@ stdenv.mkDerivation rec {
       moveToOutput lib/libdevmapper.so $lib
     '';
 
-  outputChecks = lib.optionalString (!enableVDO) {
+  outputChecks = lib.optionalAttrs (!stdenv.hostPlatform.isStatic && !enableVDO) {
     out.disallowedRequisites = [
       bash
       bashNonInteractive

From 1b4c8dc98856365739b63e06652e391a87f96261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Aug 2025 19:32:11 +0200
Subject: [PATCH 203/321] bash-completion: fix `mount -t` tab completion

---
 pkgs/by-name/ba/bash-completion/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix
index 516c5ec79b064..fdec25367b2d0 100644
--- a/pkgs/by-name/ba/bash-completion/package.nix
+++ b/pkgs/by-name/ba/bash-completion/package.nix
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-M2m9XkGKdfuZCGOSWu1bQgOYrOuzIOxMAwaz6uI/EHo=";
   };
 
+  postPatch = ''
+    # fix `mount -t` tab completion
+    substituteInPlace bash_completion \
+      --replace-fail "/lib/modules" "/run/booted-system/kernel-modules/lib/modules"
+  '';
+
   strictDeps = true;
   nativeBuildInputs = [ autoreconfHook ];
 

From cedc84cf81b35d13c93956068e6d0d6b0a09f904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 19 Aug 2025 01:05:11 +0200
Subject: [PATCH 204/321] util-linux: use --replace-fail everywhere

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

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index fb957238eaad2..a7828fab0dfd0 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -82,11 +82,11 @@ stdenv.mkDerivation (finalPackage: rec {
     patchShebangs tests/run.sh tools/all_syscalls tools/all_errnos
 
     substituteInPlace sys-utils/eject.c \
-      --replace "/bin/umount" "$bin/bin/umount"
+      --replace-fail "/bin/umount" "$bin/bin/umount"
   ''
   + lib.optionalString shadowSupport ''
     substituteInPlace include/pathnames.h \
-      --replace "/bin/login" "${shadow}/bin/login"
+      --replace-fail "/bin/login" "${shadow}/bin/login"
   ''
   + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
     substituteInPlace lib/c_strtod.c --replace-fail __APPLE__ __FreeBSD__

From 0e113241968c39fad868ee04412dac17b7741d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 19 Aug 2025 01:05:25 +0200
Subject: [PATCH 205/321] util-linux: fix mount -t tab completion

---
 pkgs/by-name/ut/util-linux/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index a7828fab0dfd0..7a3aa0673f414 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -83,6 +83,10 @@ stdenv.mkDerivation (finalPackage: rec {
 
     substituteInPlace sys-utils/eject.c \
       --replace-fail "/bin/umount" "$bin/bin/umount"
+
+    # fix `mount -t` tab completion
+    substituteInPlace bash-completion/{blkid,mount,umount} \
+      --replace-fail "/lib/modules" "/run/booted-system/kernel-modules/lib/modules"
   ''
   + lib.optionalString shadowSupport ''
     substituteInPlace include/pathnames.h \

From 9d6e6ae9934cf5402df922d675beb2afe792fb7c Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 21 Aug 2025 21:45:33 +0200
Subject: [PATCH 206/321] ruff: 0.12.9 -> 0.12.10

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.12.10
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 0de4a6d0b03b5..165df1aa71279 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.12.9";
+  version = "0.12.10";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-F6THHweMVJqmqKeexZIWW7iHCPc0I6Ttr8RzXWSdww8=";
+    hash = "sha256-pHwWYgU/PMkoKIADJsbU3ta+u7H4DR+kb3xZturqpgk=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-gXuRcb1Gk5t2R44/xeE+x3AXccnRyt9SukYYXE0JPQU=";
+  cargoHash = "sha256-M4NyUvtoDK9MKacSMl+W4d+WF7LrINm9zowrTNwy9wk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 94c392c7d948dddc7914f35b0d07e25642c155e5 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 21 Aug 2025 23:11:45 +0200
Subject: [PATCH 207/321] uv: 0.8.12 -> 0.8.13

Changelog: https://github.com/astral-sh/uv/blob/0.8.13/CHANGELOG.md
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 9a6112305f11e..62db864cfecbb 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.12";
+  version = "0.8.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-UK+NBnOHqynvXCxAGYKdiJjHcKN7NyfA+6eq6RM0ypM=";
+    hash = "sha256-U7Y3byjXxRpIZ2QS1QfZC51FF7PnyAKV0DKYC1LImzA=";
   };
 
-  cargoHash = "sha256-Lrvgnco/uAdZz1NmAHQ6svvdQEKYBwh7X/tWwdwxkBU=";
+  cargoHash = "sha256-NDWHG1yU1KFhvydVAO88YwDH+2rkH01S4Lxd1joWHFE=";
 
   buildInputs = [
     rust-jemalloc-sys

From cf928387eda2fc4775ef45aacfc886e60dee607b Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 21 Aug 2025 23:32:57 +0200
Subject: [PATCH 208/321] gowitness: buildGo123Module -> buildGoModule

https://github.com/NixOS/nixpkgs/commit/49faa36ea1e8d319e7e4ca3bfd293fb09d3ee3b0 unpinned the module builder, but didn't remove its usage
---
 pkgs/by-name/go/gowitness/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gowitness/package.nix b/pkgs/by-name/go/gowitness/package.nix
index 98283599f457c..58e369c78a251 100644
--- a/pkgs/by-name/go/gowitness/package.nix
+++ b/pkgs/by-name/go/gowitness/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "gowitness";
   version = "3.0.5";
 

From 9f48ab3f22e7336bd96c0f41f49ce4d491018b9f Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 22 Aug 2025 00:32:08 +0200
Subject: [PATCH 209/321] gowitness: add versionCheckHook

Check that the binary continues to function after unpinning the module builder
---
 pkgs/by-name/go/gowitness/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/go/gowitness/package.nix b/pkgs/by-name/go/gowitness/package.nix
index 58e369c78a251..c4381a920f404 100644
--- a/pkgs/by-name/go/gowitness/package.nix
+++ b/pkgs/by-name/go/gowitness/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -22,6 +23,10 @@ buildGoModule rec {
     "-w"
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+
   meta = with lib; {
     description = "Web screenshot utility";
     homepage = "https://github.com/sensepost/gowitness";

From 5c3464e7dbaadc220970a56d4922c18338ed5477 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 Aug 2025 06:45:18 +0100
Subject: [PATCH 210/321] fuse3: 3.17.2 -> 3.17.4

Changes:
- https://github.com/libfuse/libfuse/releases/tag/fuse-3.17.3
- https://github.com/libfuse/libfuse/releases/tag/fuse-3.17.4
---
 pkgs/os-specific/linux/fuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index bfc3e7988147e..41c8e32a27ec5 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -14,7 +14,7 @@ in
   };
 
   fuse_3 = mkFuse {
-    version = "3.17.2";
-    hash = "sha256-rpWA97ZnoYWEQoUCGtITpx9w1J4qy6LGSxomFNOnKBc=";
+    version = "3.17.4";
+    hash = "sha256-G3+cBp8q8S8oLIcgWp0p+TAtzqXlKYbRSY/5Y3L7QO4=";
   };
 }

From b712355dd5938a696691a923dc36dfc6a03d8a75 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 00:01:57 +0200
Subject: [PATCH 211/321] libva: depend on libxcb independently of libx11
 propagating it

---
 pkgs/development/libraries/libva/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index a52191590f3fc..38782260ed0a7 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -9,6 +9,7 @@
   libdrm,
   minimal ? false,
   libX11,
+  libxcb,
   libXext,
   libXfixes,
   wayland,
@@ -54,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!minimal) [
     libX11
+    libxcb
     libXext
     libXfixes
     wayland

From 596f710ee3388af1af126d2523d643ce149c3733 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 00:02:15 +0200
Subject: [PATCH 212/321] pipewire: depend on libxcb independently of libx11
 propagating it

---
 pkgs/development/libraries/pipewire/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 2ef768cb010eb..eb22e22afb8d3 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -165,6 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals x11Support [
     libcanberra
     xorg.libX11
+    xorg.libxcb
     xorg.libXfixes
   ]
   ++ lib.optionals bluezSupport [

From 3d1033ce5c0004fc4186fca5e3e0b8cc381d485b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 00:40:07 +0200
Subject: [PATCH 213/321] xkbmon: depend on libxcb independently of libx11
 propagating it

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

diff --git a/pkgs/by-name/xk/xkbmon/package.nix b/pkgs/by-name/xk/xkbmon/package.nix
index a6cef8a63a077..fb2f4c47d9211 100644
--- a/pkgs/by-name/xk/xkbmon/package.nix
+++ b/pkgs/by-name/xk/xkbmon/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libX11,
+  libxcb,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-EWW6L6NojzXodDOET01LMcQT8/1JIMpOD++MCiM3j1Y=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [
+    libX11
+    libxcb
+  ];
 
   installPhase = "install -D -t $out/bin xkbmon";
 

From a06389255ad292d479152747e547ff7fa5fd73a8 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 02:16:43 +0200
Subject: [PATCH 214/321] sdl3: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/sd/sdl3/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index a3d3b7ee7fb15..79a32b745dfbb 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -147,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals x11Support [
       xorg.libX11
+      xorg.libxcb
       xorg.libXScrnSaver
       xorg.libXcursor
       xorg.libXext

From 935ab490b84bef462106ca35983d66f286aae12f Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 12:44:05 +0200
Subject: [PATCH 215/321] anvil-editor: depend on libxcb independently of
 libx11 propagating it

---
 pkgs/by-name/an/anvil-editor/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 046da0e6b454c..a348bbce9c95a 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -51,6 +51,7 @@ buildGoModule (finalAttrs: {
     vulkan-headers
     libGL
     xorg.libX11
+    xorg.libxcb
     xorg.libXcursor
     xorg.libXfixes
   ];

From e211906503b05ad91b149ec9acf9e096270d96b7 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 13:30:52 +0200
Subject: [PATCH 216/321] azahar: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/az/azahar/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index f8f3ede31a64d..a4c7a889bee30 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -119,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
     qt6.qtwayland
     xorg.libX11
+    xorg.libxcb
     xorg.libXext
   ]
   ++ optionals stdenv.hostPlatform.isDarwin [

From 229cc17e58e38e244f8d9ba840ff8bf01c9e5933 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 14:24:24 +0200
Subject: [PATCH 217/321] gst-vaapi: depend on libxcb independently of libx11
 propagating it

---
 pkgs/development/libraries/gstreamer/vaapi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 00978658919bf..977bc168e2d8e 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     libdrm
     udev
     xorg.libX11
+    xorg.libxcb
     xorg.libXext
     xorg.libXv
     xorg.libXrandr

From 542ab468425774f7961655c8d116255da3c01584 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 14:34:36 +0200
Subject: [PATCH 218/321] xidlehook: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/xi/xidlehook/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/xi/xidlehook/package.nix b/pkgs/by-name/xi/xidlehook/package.nix
index 3b75ae786987d..4d051616ef8dc 100644
--- a/pkgs/by-name/xi/xidlehook/package.nix
+++ b/pkgs/by-name/xi/xidlehook/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     xorg.libX11
+    xorg.libxcb
     xorg.libXScrnSaver
     libpulseaudio
   ];

From c5949b0d99e1b365ad40c3791ed650e59953c0ba Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 7 Aug 2025 16:01:55 +0200
Subject: [PATCH 219/321] wlx-overlay-s: depend on libxcb independently of
 libx11 propagating it

---
 pkgs/by-name/wl/wlx-overlay-s/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index 597225f104b69..7eb8aa5c7ea75 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -6,6 +6,7 @@
   lib,
   libGL,
   libX11,
+  libxcb,
   libXext,
   libXrandr,
   libxkbcommon,
@@ -62,6 +63,7 @@ rustPlatform.buildRustPackage rec {
     fontconfig
     libGL
     libX11
+    libxcb
     libXext
     libXrandr
     libxkbcommon

From 7427c48155f7ec85ecffb35c9340e3eef1b479ff Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Fri, 8 Aug 2025 13:27:53 +0200
Subject: [PATCH 220/321] espanso: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/es/espanso/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index a74345c38be39..6c97b4b17f6bc 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -7,6 +7,7 @@
   extra-cmake-modules,
   dbus,
   libX11,
+  libxcb,
   libXi,
   libXtst,
   libnotify,
@@ -80,6 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libXi
     libXtst
     libX11
+    libxcb
     xclip
     xdotool
   ];

From a0fa1d19a3c37faa23acad12caf4029577ba5c65 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 9 Aug 2025 02:18:38 +0200
Subject: [PATCH 221/321] gossip: depend on libxcb independently of libx11
 propagating it

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

diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 218b917723f9a..be2ad199f1f4a 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -17,6 +17,7 @@
   wayland-scanner,
   nix-update-script,
   libX11,
+  libxcb,
   libXcursor,
   libXi,
   libXrandr,
@@ -65,6 +66,7 @@ rustPlatform.buildRustPackage rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
     libX11
+    libxcb
     libXcursor
     libXi
     libXrandr

From 2469316f441597f58444993bf8b69bf94797fc4f Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 9 Aug 2025 10:43:37 +0200
Subject: [PATCH 222/321] gotraceui: depend on libxcb independently of libx11
 propagating it

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

diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix
index fad24526af25c..144346b62a061 100644
--- a/pkgs/by-name/go/gotraceui/package.nix
+++ b/pkgs/by-name/go/gotraceui/package.nix
@@ -5,6 +5,7 @@
   buildGoModule,
   libGL,
   libX11,
+  libxcb,
   libXcursor,
   libXfixes,
   libxkbcommon,
@@ -42,6 +43,7 @@ buildGoModule rec {
     libxkbcommon
     wayland
     libX11
+    libxcb
     libXcursor
     libXfixes
     libGL

From 9b11be296ad2cecf8a9f2bfd14e84a9896819400 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 10 Aug 2025 13:43:46 +0200
Subject: [PATCH 223/321] libuiohook: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/li/libuiohook/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix
index faaeaf9ce7cfd..16a4ef27ff600 100644
--- a/pkgs/by-name/li/libuiohook/package.nix
+++ b/pkgs/by-name/li/libuiohook/package.nix
@@ -6,6 +6,7 @@
   cmake,
   pkg-config,
   libX11,
+  libxcb,
   libxkbcommon,
   xinput,
   xorg,
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) (
     [
       libX11
+      libxcb
       libxkbcommon
       xinput
     ]

From 4a00f12a33bed43a65ab5c6ee22137ac4df16032 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 10 Aug 2025 16:27:52 +0200
Subject: [PATCH 224/321] mesa-demos: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/me/mesa-demos/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/me/mesa-demos/package.nix b/pkgs/by-name/me/mesa-demos/package.nix
index 362d98b0bffab..c4aa6350630b4 100644
--- a/pkgs/by-name/me/mesa-demos/package.nix
+++ b/pkgs/by-name/me/mesa-demos/package.nix
@@ -6,6 +6,7 @@
   libGL,
   libGLU,
   libX11,
+  libxcb,
   libXext,
   libgbm,
   mesa,
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libglut
     libX11
+    libxcb
     libXext
     libGL
     libGLU

From 0627922852742497854de8200d865fc65f76044a Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 11 Aug 2025 13:50:48 +0200
Subject: [PATCH 225/321] slstatus: depend on libxcb independently of libx11
 propagating it

---
 pkgs/by-name/sl/slstatus/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/sl/slstatus/package.nix b/pkgs/by-name/sl/slstatus/package.nix
index c48e111434545..1c66d88c4e1e2 100644
--- a/pkgs/by-name/sl/slstatus/package.nix
+++ b/pkgs/by-name/sl/slstatus/package.nix
@@ -5,6 +5,7 @@
   pkg-config,
   writeText,
   libX11,
+  libxcb,
   libXau,
   libXdmcp,
   config,
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libX11
+    libxcb
     libXau
     libXdmcp
   ]

From 7f40bf78b5c30b674dde260d0b912760e3dcf2f6 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 13 Aug 2025 00:08:05 +0200
Subject: [PATCH 226/321] gamescope-wsi: depend on libxcb independently of
 libx11 propagating it

Maybe libxcb should be `optionals enableWsi` since the change didn't
break the gamescope package without Wsi, but i found out it also builds
fine if i move libx11 to `optionals enableWsi` so this is something
the gamescope maintainers have to figure out.
---
 pkgs/by-name/ga/gamescope/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 5432341d60e79..d2f824153884c 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -129,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
     hwdata
     xorg.libX11
+    xorg.libxcb
     wayland
     wayland-protocols
     vulkan-loader

From ecb637f1c61186e3fd07b784525d5e5b545d5376 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 11 Aug 2025 13:13:10 +0200
Subject: [PATCH 227/321] libx11: don't propagate libxcb

---
 pkgs/by-name/li/libx11/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/li/libx11/package.nix b/pkgs/by-name/li/libx11/package.nix
index cde598fa68cd7..ced740a1f43ee 100644
--- a/pkgs/by-name/li/libx11/package.nix
+++ b/pkgs/by-name/li/libx11/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [
     xorgproto
-    libxcb
   ];
 
   configureFlags =

From ffbbb86871b19e8aeca8f6dcdbfcd5ab3ebb492f Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Thu, 21 Aug 2025 16:02:28 -0700
Subject: [PATCH 228/321] zulu21: 21.0.4 -> 21.0.8

---
 pkgs/development/compilers/zulu/21.nix | 33 +++++++++++++-------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix
index 68a80599eec7a..21516f45b3d25 100644
--- a/pkgs/development/compilers/zulu/21.nix
+++ b/pkgs/development/compilers/zulu/21.nix
@@ -4,49 +4,50 @@
   ...
 }@args:
 
+let
+  # JDK FX can potentially be different version than regular JDK
+  zuluVersion = if enableJavaFX then "21.44.17" else "21.44.17";
+  jdkVersion = "21.0.8";
+in
 callPackage ./common.nix (
   {
     # Details from https://www.azul.com/downloads/?version=java-21-lts&package=jdk
     # Note that the latest build may differ by platform
     dists = {
       x86_64-linux = {
-        zuluVersion = "21.36.17";
-        jdkVersion = "21.0.4";
+        inherit zuluVersion jdkVersion;
         hash =
           if enableJavaFX then
-            "sha256-Q2bdM0/a2t5aBRCIzXBlhXamf8N7wdSUsK5VhaU9DcY="
+            "sha256-T+bGfe0IoYwX1Odh66CdRL1fzbvA63NqM9e2hLCbx2Y="
           else
-            "sha256-MY0MLtPIdvt+oslSlFzc997PtSZMpRrs4VnmNaxT1UQ=";
+            "sha256-Y/Vru0aVjPVzUvugjydV4JU3mRleVUWswMipKSC+/x4=";
       };
 
       aarch64-linux = {
-        zuluVersion = "21.36.17";
-        jdkVersion = "21.0.4";
+        inherit zuluVersion jdkVersion;
         hash =
           if enableJavaFX then
-            "sha256-BzNEcDrQo5yOWnEsJxw9JfXYdZGN6/wxnTDB0qC1i/0="
+            "sha256-6qFwo2rBV+mbEFDZNoqEs3z+2saj31fsOHG9jToST2Q="
           else
-            "sha256-2jwtfbM2cLz2ZTJEGut/M9zw0ifI2v5841zuZ/aCnEw=";
+            "sha256-/38u3R1cFTy2y0k6OqNSNFPimgXsUTslwkqhR37AxyI=";
       };
 
       x86_64-darwin = {
-        zuluVersion = "21.36.17";
-        jdkVersion = "21.0.4";
+        inherit zuluVersion jdkVersion;
         hash =
           if enableJavaFX then
-            "sha256-H3gM2XCCcuUxlAEzX6IO7Cp6NtH85PYHlH54k5XvNAc="
+            "sha256-PGnYq+9MskgczsEjx4aH5yDYjZLw8Tk8IZSMOXw03aw="
           else
-            "sha256-XOdaaiR8cCm3TEynz29g/SstaM4eiVb7RI0phDFrX+o=";
+            "sha256-KvCAUAtcwoamNTGHx8WbWq/LPtwpwch9H9cbotalI/E=";
       };
 
       aarch64-darwin = {
-        zuluVersion = "21.36.17";
-        jdkVersion = "21.0.4";
+        inherit zuluVersion jdkVersion;
         hash =
           if enableJavaFX then
-            "sha256-lLAb8MABo95A5WcayBLNvsBSdVFptnO4EmhX2gjo6r8="
+            "sha256-Bj1cYFfm3dq+HB9tdnFwT7onVQ9Slf0zRFBK4z9LUoY="
           else
-            "sha256-vCdQ+BoWbMbpwwroqrpU8lOoyOydjPwEpVX+IHEse/8=";
+            "sha256-0izgX+o+PyjIxZ8sNIvHjulnvxKJpPsoeWzAF3/2yNs=";
       };
     };
   }

From 7efb80dccb21bc93e093da4c0b79d09b158be6d4 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sat, 26 Jul 2025 19:05:49 -0700
Subject: [PATCH 229/321] ruby: remove `fetchFromSavannah` fetcher with files
 from autoconf

Co-developed-by: Philip Taron <philip.taron@gmail.com>
---
 pkgs/development/interpreters/ruby/config.nix  | 8 --------
 pkgs/development/interpreters/ruby/default.nix | 7 ++-----
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/development/interpreters/ruby/config.nix

diff --git a/pkgs/development/interpreters/ruby/config.nix b/pkgs/development/interpreters/ruby/config.nix
deleted file mode 100644
index c4f3160d16020..0000000000000
--- a/pkgs/development/interpreters/ruby/config.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Ruby >= 2.1.0 tries to download config.{guess,sub}
-{ fetchFromSavannah }:
-
-fetchFromSavannah {
-  repo = "config";
-  rev = "576c839acca0e082e536fd27568b90a446ce5b96";
-  sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0";
-}
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 2da00e48ef31e..007d5cb0e5240 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -4,7 +4,6 @@
   lib,
   fetchurl,
   fetchpatch,
-  fetchFromSavannah,
   zlib,
   gdbm,
   ncurses,
@@ -38,7 +37,6 @@ let
   op = lib.optional;
   ops = lib.optionals;
   opString = lib.optionalString;
-  config = import ./config.nix { inherit fetchFromSavannah; };
   rubygems = import ./rubygems {
     inherit
       stdenv
@@ -74,7 +72,6 @@ let
           lib,
           fetchurl,
           fetchpatch,
-          fetchFromSavannah,
           rubygemsSupport ? true,
           zlib,
           zlibSupport ? true,
@@ -229,10 +226,10 @@ let
             cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
           '';
 
+          # Ruby >= 2.1.0 tries to download config.{guess,sub}; copy it from autoconf instead.
           postPatch = ''
             sed -i configure.ac -e '/config.guess/d'
-            cp --remove-destination ${config}/config.guess tool/
-            cp --remove-destination ${config}/config.sub tool/
+            cp --remove-destination ${autoconf}/share/autoconf/build-aux/config.{guess,sub} tool/
           '';
 
           configureFlags = [

From 10cc298857955c8514e5e9ecb7421279ff3f6bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 23 Aug 2025 16:55:32 +0700
Subject: [PATCH 230/321] =?UTF-8?q?w3m:=200.5.4=20=E2=86=92=200.5.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 7e26071c6dc67..a01d4a0e2829f 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "w3m";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromSourcehut {
     owner = "~rkta";
     repo = "w3m";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A11vHFiyotFncqWRiljRJbHO1wEzmWTEh1DOel803q4=";
+    hash = "sha256-rz9tNkMg5xUqMpMdK2AQlKjCJlCjgLQOkj4A/eyPm0M=";
   };
 
   env = {

From 73468347b58bfb0fe28f174891e116d29f186390 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Fri, 22 Aug 2025 20:11:38 +0200
Subject: [PATCH 231/321] libbpf: 1.6.1 -> 1.6.2

Diff: https://github.com/libbpf/libbpf/compare/v1.6.1...v1.6.2
---
 pkgs/os-specific/linux/libbpf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 37b6bb5578fa0..01806675843e8 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
     rev = "v${version}";
-    hash = "sha256-2AtUwCN17bSM0mJrERTklVluUduMMAX25pOGEwNPjAU=";
+    hash = "sha256-igjjwirg3O5mC3DzGCAO9OgrH2drnE/gV6NH7ZLNnFE=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 3826354ada46746c4099208e3553ff4943566ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 23 Aug 2025 15:21:24 +0200
Subject: [PATCH 232/321] Revert "froide: fix initdb not being in PATH"

This reverts commit ae730b371bcd426f2e2aee4c532d3be76949d855.

The underlying issue was properly fixed in
https://github.com/NixOS/nixpkgs/pull/426704.
The commit this reverts was a temporary workaround.
---
 pkgs/by-name/fr/froide/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index e4cf9a7cbcc2c..8b5e9ffc64d9f 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -135,7 +135,7 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   nativeCheckInputs = with python.pkgs; [
-    (postgresql.withPackages (p: [ p.postgis ])).out
+    (postgresql.withPackages (p: [ p.postgis ]))
     postgresqlTestHook
     pytest-django
     pytest-playwright

From e3fe433bcff5e8c8156fbded6bfccea115131ee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 Aug 2025 19:42:55 +0000
Subject: [PATCH 233/321] liburing: 2.11 -> 2.12

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

diff --git a/pkgs/by-name/li/liburing/package.nix b/pkgs/by-name/li/liburing/package.nix
index 995c1b59ab46f..5709adc826240 100644
--- a/pkgs/by-name/li/liburing/package.nix
+++ b/pkgs/by-name/li/liburing/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liburing";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchFromGitHub {
     owner = "axboe";
     repo = "liburing";
     tag = "liburing-${version}";
-    hash = "sha256-V73QP89WMrL2fkPRbo/TSkfO7GeDsCudlw2Ut5baDzA=";
+    hash = "sha256-sEMzkyjrCc49ogfUnzdgNtEXmW0Tz/PUKo99C965428=";
   };
 
   separateDebugInfo = true;

From 38ba6fb329faf4b9afa2aaedda5d2877abac410a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 Aug 2025 00:02:05 +0200
Subject: [PATCH 234/321] cpython: enable pie

---
 pkgs/development/interpreters/python/cpython/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 3e1d6cc63ff19..f9e07355025c6 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -604,6 +604,8 @@ stdenv.mkDerivation (finalAttrs: {
       export CFLAGS_NODIST="-fno-semantic-interposition"
     '';
 
+  hardeningEnable = [ "pie" ];
+
   setupHook = python-setup-hook sitePackages;
 
   postInstall =

From 957b9c94ebd2d7637e5935645fc5ba332713acb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 02:49:39 +0000
Subject: [PATCH 235/321] krb5: 1.21.3 -> 1.22.1

---
 pkgs/development/libraries/kerberos/krb5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index c150100eba21e..48f6c6b1526ba 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation rec {
   pname = "krb5";
-  version = "1.21.3";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz";
-    hash = "sha256-t6TNXq1n+wi5gLIavRUP9yF+heoyDJ7QxtrdMEhArTU=";
+    hash = "sha256-GogyuMrZI+u/E5T2fi789B46SfRgKFpm41reyPoAU68=";
   };
 
   outputs = [

From 3eec07ec599649009c44abf7db5a5ac24bcda374 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 27 Apr 2025 12:34:00 +0100
Subject: [PATCH 236/321] cc-wrapper: add glibcxxassertions hardening flag

no platforms "unsupported" because we don't have a nice
mechanism for determining a platform's c++ lib and the flag
should be harmlessly ignored by a other c++ libs
---
 doc/redirects.json                            |  3 ++
 doc/stdenv/stdenv.chapter.md                  |  6 ++++
 .../build-support/cc-wrapper/add-hardening.sh |  6 +++-
 pkgs/stdenv/generic/make-derivation.nix       |  1 +
 pkgs/test/cc-wrapper/hardening.nix            | 30 +++++++++++++++++++
 pkgs/top-level/variants.nix                   |  1 +
 6 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index 7b0841c639b74..a6622543e1e88 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -574,6 +574,9 @@
   "strictflexarrays3": [
     "index.html#strictflexarrays3"
   ],
+  "glibcxxassertions": [
+    "index.html#glibcxxassertions"
+  ],
   "tester-shfmt": [
     "index.html#tester-shfmt"
   ],
diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 9cebd8818d03a..e797ef18e6433 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -1688,6 +1688,12 @@ This should be turned off or fixed for build errors such as:
 sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates
 ```
 
+#### `glibcxxassertions` {#glibcxxassertions}
+
+Adds the `-D_GLIBCXX_ASSERTIONS` compiler flag. This flag only has an effect on libstdc++ targets, and when defined, enables extra error checking in the form of precondition assertions, such as bounds checking in c++ strings and null pointer checks when dereferencing c++ smart pointers.
+
+These checks may have an impact on performance in some cases.
+
 #### `pacret` {#pacret}
 
 This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques.
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index 319225a6ed874..4fd6d4b324636 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -52,7 +52,7 @@ fi
 
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
-  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pie pic strictoverflow format trivialautovarinit zerocallusedregs)
+  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pie pic strictoverflow glibcxxassertions format trivialautovarinit zerocallusedregs)
   declare -A hardeningDisableMap=()
 
   # Determine which flags were effectively disabled so we can report below.
@@ -111,6 +111,10 @@ for flag in "${!hardeningEnableMap[@]}"; do
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pacret >&2; fi
       hardeningCFlagsBefore+=('-mbranch-protection=pac-ret')
       ;;
+    glibcxxassertions)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling glibcxxassertions >&2; fi
+      hardeningCFlagsBefore+=('-D_GLIBCXX_ASSERTIONS')
+      ;;
     stackprotector)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
       hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index aed866aa454b9..49a1ebddc07ab 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -150,6 +150,7 @@ let
     "pie"
     "relro"
     "stackprotector"
+    "glibcxxassertions"
     "stackclashprotection"
     "strictoverflow"
     "trivialautovarinit"
diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix
index 9f2de5243278d..f3e8d38d0ee8b 100644
--- a/pkgs/test/cc-wrapper/hardening.nix
+++ b/pkgs/test/cc-wrapper/hardening.nix
@@ -4,6 +4,7 @@
   runCommand,
   runCommandWith,
   runCommandCC,
+  writeText,
   bintools,
   hello,
   debian-devscripts,
@@ -40,6 +41,17 @@ let
 
   flexArrF2ExampleWithStdEnv = writeCBinWithStdenv ./flex-arrays-fortify-example.c;
 
+  checkGlibcxxassertionsWithStdEnv =
+    expectDefined:
+    writeCBinWithStdenv (
+      writeText "main.cpp" ''
+        #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS
+        #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined"
+        #endif
+        int main() {}
+      ''
+    );
+
   # for when we need a slightly more complicated program
   helloWithStdEnv =
     stdenv': env:
@@ -502,6 +514,10 @@ nameDrvAfterAttrName (
       hardeningEnable = [ "shadowstack" ];
     }) false;
 
+    glibcxxassertionsExplicitEnabled = checkGlibcxxassertionsWithStdEnv true stdenv {
+      hardeningEnable = [ "glibcxxassertions" ];
+    };
+
     bindNowExplicitDisabled =
       checkTestBin
         (f2exampleWithStdEnv stdenv {
@@ -697,6 +713,10 @@ nameDrvAfterAttrName (
       hardeningDisable = [ "shadowstack" ];
     }) true;
 
+    glibcxxassertionsExplicitDisabled = checkGlibcxxassertionsWithStdEnv false stdenv {
+      hardeningDisable = [ "glibcxxassertions" ];
+    };
+
     # most flags can't be "unsupported" by compiler alone and
     # binutils doesn't have an accessible hardeningUnsupportedFlags
     # mechanism, so can only test a couple of flags through altered
@@ -897,6 +917,12 @@ nameDrvAfterAttrName (
           expectFailure = true;
         };
 
+    glibcxxassertionsStdenvUnsupp =
+      checkGlibcxxassertionsWithStdEnv false (stdenvUnsupport [ "glibcxxassertions" ])
+        {
+          hardeningEnable = [ "glibcxxassertions" ];
+        };
+
     fortify3EnabledEnvEnablesFortify1 =
       checkTestBin
         (f1exampleWithStdEnv stdenv {
@@ -1107,6 +1133,10 @@ nameDrvAfterAttrName (
       allExplicitDisabledShadowStack = shadowStackTest (f1exampleWithStdEnv stdenv {
         hardeningDisable = [ "all" ];
       }) true;
+
+      glibcxxassertionsExplicitDisabled = checkGlibcxxassertionsWithStdEnv false stdenv {
+        hardeningDisable = [ "all" ];
+      };
     }
   )
 )
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index fb4890910cdfb..b4e970f98a342 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -164,6 +164,7 @@ self: super: {
               "shadowstack"
               "nostrictaliasing"
               "pacret"
+              "glibcxxassertions"
               "trivialautovarinit"
             ]
           ) super'.stdenv;

From 1293be8892244428a5c1356b9e39bbc0b06ec971 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 10 May 2025 23:16:14 +0100
Subject: [PATCH 237/321] arrow-cpp: disable glibcxxassertions hardening flag

---
 pkgs/by-name/ar/arrow-cpp/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index afc3879f6ad67..8c8cdebd117ee 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -178,6 +178,9 @@ stdenv.mkDerivation (finalAttrs: {
     ZSTD_ROOT = zstd.dev;
   };
 
+  # fails tests on glibc with this enabled
+  hardeningDisable = [ "glibcxxassertions" ];
+
   preConfigure = ''
     patchShebangs build-support/
     substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \

From 81fdff5f106aa748187037282665b5e2c77cebfc Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Aug 2025 13:07:47 +0100
Subject: [PATCH 238/321] netpbm: 11.11.0 -> 11.11.1

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

diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix
index 70c18dc05275d..3be0b399a04a8 100644
--- a/pkgs/by-name/ne/netpbm/package.nix
+++ b/pkgs/by-name/ne/netpbm/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
   pname = "netpbm";
-  version = "11.11.0";
+  version = "11.11.1";
 
   outputs = [
     "bin"
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "5101";
-    sha256 = "sha256-/oS+h4VujaNM7AnMq6e5/8A0cVZysJzFSGgJ4p01oJU=";
+    rev = "5104";
+    sha256 = "sha256-zgA3EZPrXD8JOO9O2nuLt4ouPbbUJAlFKlX+2QOz8Uw=";
   };
 
   nativeBuildInputs = [

From ac8ce97fe343bc127e844c6a5859c0f6f6d55591 Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Sun, 24 Aug 2025 14:03:03 -0400
Subject: [PATCH 239/321] sbcl: 2.5.5 -> 2.5.7

---
 pkgs/development/compilers/sbcl/default.nix |  2 +-
 pkgs/top-level/all-packages.nix             | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 1991e52f63cfd..94bb15d58e70d 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -29,8 +29,8 @@ let
     "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg=";
     # By unofficial and very loose convention we keep the latest version of
     # SBCL, and the previous one in case someone quickly needs to roll back.
-    "2.5.4".sha256 = "sha256-XxS07ZKUKp44dZT6wAC5bbdGfpzlYTBn/8CSPfPsIHI=";
     "2.5.5".sha256 = "sha256-ZQJnCvs2G6m+RKL6/pr5tZ57JK5QmnkaZrVIHylVlQs=";
+    "2.5.7".sha256 = "sha256-xPr+t5VpnVvP+QhQkazHYtz15V+FI1Yl89eu8SyJ0dM=";
   };
   # Collection of pre-built SBCL binaries for platforms that need them for
   # bootstrapping. Ideally these are to be avoided.  If ECL (or any other
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3072866de4581..fae5f992daa8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9672,23 +9672,23 @@ with pkgs;
       "3000"
     ];
   };
-  sbcl_2_5_4 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl { version = "2.5.4"; };
+  sbcl_2_5_5 = wrapLisp {
+    pkg = callPackage ../development/compilers/sbcl { version = "2.5.5"; };
     faslExt = "fasl";
     flags = [
       "--dynamic-space-size"
       "3000"
     ];
   };
-  sbcl_2_5_5 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl { version = "2.5.5"; };
+  sbcl_2_5_7 = wrapLisp {
+    pkg = callPackage ../development/compilers/sbcl { version = "2.5.7"; };
     faslExt = "fasl";
     flags = [
       "--dynamic-space-size"
       "3000"
     ];
   };
-  sbcl = sbcl_2_5_5;
+  sbcl = sbcl_2_5_7;
 
   sbclPackages = recurseIntoAttrs sbcl.pkgs;
 

From d1d8b6d8a836ad65581534e9ef97e901dc808696 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 25 Aug 2025 12:29:40 +0200
Subject: [PATCH 240/321] libtiff: apply patch CVE-2024-13978 and CVE-2025-9165

---
 pkgs/by-name/li/libtiff/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index 33bfd037d577a..497b4ddea8e39 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   nix-update-script,
 
   cmake,
@@ -51,6 +52,21 @@ stdenv.mkDerivation (finalAttrs: {
     # libc++abi 11 has an `#include <version>`, this picks up files name
     # `version` in the project's include paths
     ./rename-version.patch
+    (fetchpatch {
+      name = "CVE-2024-13978_1.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/7be20ccaab97455f192de0ac561ceda7cd9e12d1.patch";
+      hash = "sha256-cpsQyIvyP6LkGeQTlLX73iNd1AcPkvZ6Xqfns7G3JBc=";
+    })
+    (fetchpatch {
+      name = "CVE-2024-13978_2.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/2ebfffb0e8836bfb1cd7d85c059cd285c59761a4.patch";
+      hash = "sha256-cZlLTeB7/nvylf5SLzKF7g91aBERhZxpV5fmWEJVrX4=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-9165.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/ed141286a37f6e5ddafb5069347ff5d587e7a4e0.patch";
+      hash = "sha256-DIsk8trbHMMTrj6jP5Ae8ciRjHV4CPHdWCN+VbeFnFo=";
+    })
   ];
 
   postPatch = ''

From 00864e5fe55f57587f47a1daabf79cee6ec5c563 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 25 Aug 2025 22:46:17 +0200
Subject: [PATCH 241/321] libbpf: fix sysinfo redefinition with musl (#436237)

---
 pkgs/os-specific/linux/libbpf/default.nix     |  6 ++++
 ...from-linux-kernel-h-to-linux-const-h.patch | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch

diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 01806675843e8..0f8a08b25789c 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-igjjwirg3O5mC3DzGCAO9OgrH2drnE/gV6NH7ZLNnFE=";
   };
 
+  patches = [
+    # Fix redefinition when using linux/netlink.h from libbpf with musl
+    # https://github.com/libbpf/libbpf/pull/919
+    ./sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch
+  ];
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     elfutils
diff --git a/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch b/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch
new file mode 100644
index 0000000000000..70b17dd218ff8
--- /dev/null
+++ b/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch
@@ -0,0 +1,28 @@
+From 448f3f2e2065a5ef20010133dae58c5311ecc538 Mon Sep 17 00:00:00 2001
+From: Yureka <yuka@yuka.dev>
+Date: Sat, 23 Aug 2025 18:24:07 +0200
+Subject: [PATCH] sync: uapi: move constants from <linux/kernel.h> to
+ <linux/const.h>
+
+This change was applied to the kernel tree in 2020 afaict, to fix redefinition issues with musl-libc.
+
+I ran into this issue while building with the headers included with libbpf, since it seems they were not synced since then.
+
+Signed-off-by: Yureka Lilian <yuka@yuka.dev>
+---
+ include/uapi/linux/netlink.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
+index b857821e3..e900b1f88 100644
+--- a/include/uapi/linux/netlink.h
++++ b/include/uapi/linux/netlink.h
+@@ -2,7 +2,7 @@
+ #ifndef __LINUX_NETLINK_H
+ #define __LINUX_NETLINK_H
+ 
+-#include <linux/kernel.h>
++#include <linux/const.h>
+ #include <linux/socket.h> /* for __kernel_sa_family_t */
+ #include <linux/types.h>
+ 

From 2a3c9d5f53949482c1e0975cfc85d39f48a23487 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 26 Aug 2025 04:07:28 +0200
Subject: [PATCH 242/321] python3Packages.typer-slim: expose from typer package

This is the slim variant, that is more lightweight, because it does not
depend on rich and shellingham.
---
 pkgs/development/python-modules/typer/default.nix | 15 +++++++++++----
 pkgs/top-level/python-packages.nix                |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 337369c869dfa..d4b5380459de3 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -21,10 +21,13 @@
   pytestCheckHook,
   writableTmpDirAsHomeHook,
   procps,
+
+  # typer or typer-slim
+  package ? "typer",
 }:
 
 buildPythonPackage rec {
-  pname = "typer";
+  pname = package;
   version = "0.16.0";
   pyproject = true;
 
@@ -35,15 +38,17 @@ buildPythonPackage rec {
     hash = "sha256-WB9PIxagTHutfk3J+mNTVK8bC7TMDJquu3GLBQgaras=";
   };
 
+  env.TIANGOLO_BUILD_PACKAGE = package;
+
   build-system = [ pdm-backend ];
 
   dependencies = [
     click
     typing-extensions
-    # Build includes the standard optional by default
-    # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72
   ]
-  ++ optional-dependencies.standard;
+  # typer includes the standard optional by default
+  # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72
+  ++ lib.optionals (package == "typer") optional-dependencies.standard;
 
   optional-dependencies = {
     standard = [
@@ -52,6 +57,8 @@ buildPythonPackage rec {
     ];
   };
 
+  doCheck = package == "typer"; # tests expect standard dependencies
+
   nativeCheckInputs = [
     coverage # execs coverage in tests
     pytest-xdist
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1933dcc869dcb..7af56d420bbbe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18683,6 +18683,8 @@ self: super: with self; {
 
   typer-shell = callPackage ../development/python-modules/typer-shell { };
 
+  typer-slim = self.typer.override { package = "typer-slim"; };
+
   types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { };
 
   inherit (callPackage ../development/python-modules/types-aiobotocore-packages { })

From 9a23c9b10329f37018b7cfbdf9d05d7b677dbfed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 03:36:38 +0000
Subject: [PATCH 243/321] umockdev: 0.19.2 -> 0.19.3

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

diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix
index 91d213d7e08cc..56e38d2cc91ee 100644
--- a/pkgs/by-name/um/umockdev/package.nix
+++ b/pkgs/by-name/um/umockdev/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "umockdev";
-  version = "0.19.2";
+  version = "0.19.3";
 
   outputs = [
     "bin"
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-b92mdUTzZslfFVbeDR+C2xPyMbwDYsffA8w0uiaykmg=";
+    hash = "sha256-RuReq29la/wJJDjX4OXfTF9R0Y46gzYMK+aAsgehoLc=";
   };
 
   patches = [

From 69097fa39cac54c6f2053e4ecff2bed4cbfdaff3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 26 Aug 2025 12:03:53 +0200
Subject: [PATCH 244/321] protobuf: 31.1 -> 32.0

Diff: https://github.com/protocolbuffers/protobuf/compare/v31.1...v32.0

Changelog:
https://github.com/protocolbuffers/protobuf/releases/tag/v32.0
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28b09435f944c..3fa632a592853 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8790,7 +8790,7 @@ with pkgs;
 
   prospector = callPackage ../development/tools/prospector { };
 
-  protobuf = protobuf_31;
+  protobuf = protobuf_32;
 
   inherit
     ({

From fb98d9cbf9f2727e787282cf23efca65cfabcf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Aug 2025 14:38:34 +0200
Subject: [PATCH 245/321] searxng: use typer-slim

---
 pkgs/by-name/se/searxng/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 7ec3c8e430cf6..c76917bf2a192 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -25,10 +25,6 @@ python.pkgs.toPythonModule (
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
 
-    pythonRemoveDeps = [
-      "typer-slim" # we use typer instead
-    ];
-
     pythonRelaxDeps = [
       "certifi"
       "httpx-socks"
@@ -79,7 +75,7 @@ python.pkgs.toPythonModule (
         python-dateutil
         pyyaml
         setproctitle
-        typer
+        typer-slim
         uvloop
         valkey
         whitenoise

From 0fec3fb91cf5f6f2a116b58b754065f920818942 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 20 Aug 2025 19:35:15 +0200
Subject: [PATCH 246/321] font-bh-ttf: refactor, move to pkgs/by-name and
 rename from xorg.fontbhttf

relevant changes:
- remove some dependencies that don't seem to be needed
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
---
 pkgs/by-name/fo/font-bh-ttf/package.nix       | 38 ++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bh-ttf/package.nix

diff --git a/pkgs/by-name/fo/font-bh-ttf/package.nix b/pkgs/by-name/fo/font-bh-ttf/package.nix
new file mode 100644
index 0000000000000..384996e99917a
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-ttf/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-ttf";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-ttf-${finalAttrs.version}.tar.xz";
+    hash = "sha256-haX5DQDEjCsG/RJeqK28i47pdCnjB1CByHEJJu/sOlY=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ mkfontscale ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Luxi TrueType fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-ttf";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c8fe23bc9e1b7..a8a2227e1cda4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,6 +3,7 @@
   lib,
   bdftopcf,
   font-alias,
+  font-bh-ttf,
   font-encodings,
   font-util,
   gccmakedep,
@@ -88,6 +89,7 @@ self: with self; {
     ;
   encodings = font-encodings;
   fontalias = font-alias;
+  fontbhttf = font-bh-ttf;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -648,44 +650,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbhttf = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-ttf";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-ttf-1.0.4.tar.xz";
-        sha256 = "0misxkpjc2bir20m01z355sfk3lbpjnshphjzl32p364006zk9c5";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbhtype1 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ae509cd39ed0c..2a8bb3ff67318 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -296,6 +296,7 @@
   lib,
   bdftopcf,
   font-alias,
+  font-bh-ttf,
   font-encodings,
   font-util,
   gccmakedep,
@@ -381,6 +382,7 @@
     ;
   encodings = font-encodings;
   fontalias = font-alias;
+  fontbhttf = font-bh-ttf;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b47078df27119..1f2d895ec9a88 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1189,7 +1189,6 @@ self: super:
       "fontadobeutopia75dpi"
       "fontbhtype1"
       "fontibmtype1"
-      "fontbhttf"
       "fontbh100dpi"
       "fontbh75dpi"
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 790e6a2ec3102..d3124198452ef 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -115,7 +115,6 @@ mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-ttf-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz

From 472fb3da5adfbfe3a1289e020c9b4eb1bcc58514 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 00:29:10 +0200
Subject: [PATCH 247/321] font-bh-type1: refactor, move to pkgs/by-name and
 rename from xorg.fontbhtype1

relevant changes:
- remove some dependencies that don't seem to be needed
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
---
 pkgs/by-name/fo/font-bh-type1/package.nix     | 38 ++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bh-type1/package.nix

diff --git a/pkgs/by-name/fo/font-bh-type1/package.nix b/pkgs/by-name/fo/font-bh-type1/package.nix
new file mode 100644
index 0000000000000..6685aa085356b
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-type1/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-type1";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-type1-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Gd7D7Aar3mvt0QCUV56Si+Dw/DvbT76T9MaczkBtcqY=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ mkfontscale ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Luxi PostScript Type 1 fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-type1";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a8a2227e1cda4..4b9beec3c5eac 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -4,6 +4,7 @@
   bdftopcf,
   font-alias,
   font-bh-ttf,
+  font-bh-type1,
   font-encodings,
   font-util,
   gccmakedep,
@@ -90,6 +91,7 @@ self: with self; {
   encodings = font-encodings;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
+  fontbhtype1 = font-bh-type1;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -650,44 +652,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbhtype1 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-type1";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz";
-        sha256 = "19kjdm0cx766yj9vwkyv7gyg1q4bjag5g500s7nnppmb0vnc7phr";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbitstream100dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 2a8bb3ff67318..923b5519255ad 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -297,6 +297,7 @@
   bdftopcf,
   font-alias,
   font-bh-ttf,
+  font-bh-type1,
   font-encodings,
   font-util,
   gccmakedep,
@@ -383,6 +384,7 @@
   encodings = font-encodings;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
+  fontbhtype1 = font-bh-type1;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 1f2d895ec9a88..39db76965261b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1187,7 +1187,6 @@ self: super:
       "fontadobeutopiatype1"
       "fontadobeutopia100dpi"
       "fontadobeutopia75dpi"
-      "fontbhtype1"
       "fontibmtype1"
       "fontbh100dpi"
       "fontbh75dpi"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index d3124198452ef..23c197139e10a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -115,7 +115,6 @@ mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz

From a525a830f29bbabd662bb322c6eaa09cfb4bfc00 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 01:15:53 +0200
Subject: [PATCH 248/321] font-mutt-misc: refactor, move to pkgs/by-name and
 rename from xorg.fontmuttmisc

relevant changes:
- remove some dependencies that don't seem to be needed
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
---
 pkgs/by-name/fo/font-mutt-misc/package.nix    | 42 +++++++++++++++++++
 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, 46 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-mutt-misc/package.nix

diff --git a/pkgs/by-name/fo/font-mutt-misc/package.nix b/pkgs/by-name/fo/font-mutt-misc/package.nix
new file mode 100644
index 0000000000000..7f49a552d17b7
--- /dev/null
+++ b/pkgs/by-name/fo/font-mutt-misc/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-mutt-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-mutt-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-sSNZ9OEsI7z8tEi5GCl+l1+pG+9Sk9iNPCU0PMdouyQ=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "ClearU pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/mutt-misc";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4b9beec3c5eac..a35d193142691 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -6,6 +6,7 @@
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
+  font-mutt-misc,
   font-util,
   gccmakedep,
   ico,
@@ -92,6 +93,7 @@ self: with self; {
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -1283,46 +1285,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmuttmisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-mutt-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz";
-        sha256 = "095vd33kqd157j6xi4sjxwdsjpwpgqliifa8nkybq8rcw7s5j8xi";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontschumachermisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 923b5519255ad..0f13681e4bddc 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -299,6 +299,7 @@
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
+  font-mutt-misc,
   font-util,
   gccmakedep,
   ico,
@@ -385,6 +386,7 @@
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 23c197139e10a..e857de36a4d2f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -131,7 +131,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-mutt-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz
 mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz

From f84f4e2c0d27331f60cc43542f38a9514d1dbce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 26 Aug 2025 15:38:07 -0700
Subject: [PATCH 249/321] python3Packages.coverage: 7.10.2 -> 7.10.5

Diff: https://github.com/nedbat/coveragepy/compare/7.10.2...7.10.5

Changelog: https://github.com/nedbat/coveragepy/blob/7.10.5/CHANGES.rst
---
 .../python-modules/coverage/default.nix       | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 06eb295484f3b..24b6d0c315725 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.10.2";
+  version = "7.10.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nedbat";
     repo = "coveragepy";
     tag = version;
-    hash = "sha256-OXi5FCLcfhseNDerwHdsVHF31Jy+ZSz2RU05vqPxQis=";
+    hash = "sha256-jsocpziOu0fSmFn075vj2u1SCZkG7M/kuRujaJ1OeH4=";
   };
 
   build-system = [ setuptools ];
@@ -47,23 +47,17 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
-    "test_all_our_source_files"
     "test_doctest"
     "test_files_up_one_level"
     "test_get_encoded_zip_files"
-    "test_metadata"
-    "test_more_metadata"
     "test_multi"
     "test_no_duplicate_packages"
-    "test_xdist_sys_path_nuttiness_is_fixed"
     "test_zipfile"
-  ]
-  ++ lib.optionals (isPy312 && stdenv.hostPlatform.system == "x86_64-darwin") [
-    # substring that may not be in string is part of the pytest output hash, which appears in the string
-    "test_nothing_specified"
-    "test_omit"
-    "test_omit_2"
-    "test_omit_as_string"
+    # tests expect coverage source to be there
+    "test_all_our_source_files"
+    "test_metadata"
+    "test_more_metadata"
+    "test_real_code_regions"
   ];
 
   disabledTestPaths = [

From b7f63e35c912a5c6db109b268714f9a8992bb5da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 26 Aug 2025 15:55:06 -0700
Subject: [PATCH 250/321] python3Packages.multidict: 6.6.3 -> 6.6.4

Diff: https://github.com/aio-libs/multidict/compare/v6.6.3...v6.6.4

Changelog: https://github.com/aio-libs/multidict/blob/v6.6.4/CHANGES.rst
---
 pkgs/development/python-modules/multidict/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index c0c053d498bc2..a35bbdbee805f 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   buildPythonPackage,
   objgraph,
+  psutil,
   pytestCheckHook,
   pytest-codspeed,
   pytest-cov-stub,
@@ -14,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "6.6.3";
+  version = "6.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "multidict";
     tag = "v${version}";
-    hash = "sha256-AB35kVgKizzPi3r4tDVQ7vI50Xsb2BeBp3rFh+UOXQc=";
+    hash = "sha256-Ewxwz+0Y8pXJpHobLxrV7cuA9fsAaawWmW9XoEg7dxU=";
   };
 
   postPatch = ''
@@ -44,6 +45,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     objgraph
+    psutil
     pytestCheckHook
     pytest-codspeed
     pytest-cov-stub

From 8df3b0b499d4e3e30a9801d134742f36455fe9d9 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Mon, 25 Aug 2025 22:28:40 -0500
Subject: [PATCH 251/321] python3Packages.ueberzug: limit to Linux

Starting with 18.2.0, one of ueberzug's headers #errors if __linux__
isn't defined [1]. Set meta.platforms to reflect this.

[1]: https://github.com/ueber-devel/ueberzug/blob/c7c151aec4fe31574a5a42b8b18eb5f80212ac00/ueberzug/X/python.h#L4-L6
---
 pkgs/development/python-modules/ueberzug/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix
index e10e0b5785972..b3fc0543c67f6 100644
--- a/pkgs/development/python-modules/ueberzug/default.nix
+++ b/pkgs/development/python-modules/ueberzug/default.nix
@@ -50,12 +50,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ueberzug" ];
 
-  meta = with lib; {
+  meta = {
     description = "Alternative for w3mimgdisplay";
     homepage = "https://github.com/ueber-devel/ueberzug";
     changelog = "https://github.com/ueber-devel/ueberzug/releases/tag/${version}";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "ueberzug";
-    maintainers = with maintainers; [ Br1ght0ne ];
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
+    platforms = lib.platforms.linux;
   };
 }

From b2de0f2f9c7090f0dc1e973248a14189dd26f1d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 27 Aug 2025 04:37:15 +0200
Subject: [PATCH 252/321] nss_esr: 3.101.2 -> 3.112.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_103.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_104.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_105.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_106.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_107.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_108.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_109.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_110.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_111.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_112.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_112_1.rst
---
 pkgs/development/libraries/nss/esr.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index 63b10c2201528..88b97a28d5458 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "3.101.2";
-  hash = "sha256-i5K47pzQYOiD4vFHBN6VeqXEdPBOM7U1oSK0qSi2M2Y=";
+  version = "3.112.1";
+  hash = "sha256-NpvE/WH+oY231uDKxXJptDojfU4rNsXySpOduWszzjQ=";
   filename = "esr.nix";
-  versionRegex = "NSS_(3)_(101)(?:_(\\d+))?_RTM";
+  versionRegex = "NSS_(3)_(112)(?:_(\\d+))?_RTM";
 }

From 7e3bdcf01634c16dc3ca17d8364d7e48ab38d1fa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 Aug 2025 12:07:16 +0200
Subject: [PATCH 253/321] python3Packages.protobuf: 6.31.1 -> 6.32.0

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

diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix
index 8ec9f8482b47f..500cfc0103482 100644
--- a/pkgs/development/python-modules/protobuf/6.nix
+++ b/pkgs/development/python-modules/protobuf/6.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "6.31.1";
+  version = "6.32.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2MrEyYLwuVek3HOoDi6iT6sI5nnA3p3rg19KEtaaypo=";
+    hash = "sha256-qBQ5BJEnBn/EnsHTbiXG7h0aK3vpMGdfkZJY0DwE59I=";
   };
 
   build-system = [ setuptools ];

From 35b3a97700f4c84b4fffd16fc818acf7b8d82f7c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 27 Aug 2025 17:15:24 +0200
Subject: [PATCH 254/321] gssdp_1_6: disable manpages

Building these doesn't make sense, because the only tool they are
available for - is disabled already. Building them is pointless.

This reduces rebuilds for pandoc / haskell-updates by up to 5k on Linux.
---
 pkgs/development/libraries/gssdp/1.6.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix
index 995f6c5a449dc..1df2fa09627a2 100644
--- a/pkgs/development/libraries/gssdp/1.6.nix
+++ b/pkgs/development/libraries/gssdp/1.6.nix
@@ -7,8 +7,6 @@
   pkg-config,
   gobject-introspection,
   vala,
-  buildPackages,
-  enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable,
   gi-docgen,
   python3,
   libsoup_3,
@@ -44,8 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     vala
     gi-docgen
     python3
-  ]
-  ++ lib.optionals enableManpages [ buildPackages.pandoc ];
+  ];
 
   buildInputs = [
     libsoup_3
@@ -58,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
   mesonFlags = [
     "-Dgtk_doc=true"
     "-Dsniffer=false"
-    (lib.mesonBool "manpages" enableManpages)
+    # This packages only has manpages for gssdp-device-sniffer, which we disabled above.
+    "-Dmanpages=false"
   ];
 
   # On Darwin: Failed to bind socket, Operation not permitted

From 5c99d67b8618876563e7b9eacf7567cc62aeb7fd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 27 Aug 2025 17:43:51 +0300
Subject: [PATCH 255/321] qt6: 6.9.1 -> 6.9.2

---
 pkgs/development/libraries/qt-6/fetch.sh      |   2 +-
 .../libraries/qt-6/modules/qtbase/default.nix |   8 -
 .../qt-6/modules/qtdeclarative/default.nix    |   6 -
 .../libraries/qt-6/modules/qtmqtt.nix         |   4 +-
 .../qt-6/modules/qtwebengine/default.nix      |   9 -
 pkgs/development/libraries/qt-6/srcs.nix      | 312 +++++++++---------
 6 files changed, 159 insertions(+), 182 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 9284b2d2ea80c..87d5916f3e38c 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.1/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.2/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 62b18f42dcb58..df8286ee8f461 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -80,7 +80,6 @@
   libinput,
   # options
   qttranslations ? null,
-  fetchpatch,
 }:
 
 let
@@ -218,13 +217,6 @@ stdenv.mkDerivation rec {
     ./qmlimportscanner-import-path.patch
     # don't pass qtbase's QML directory to qmlimportscanner if it's empty
     ./skip-missing-qml-directory.patch
-
-    # Backport patch recommended by KDE to fix HTTP2 stream corruption issues
-    # FIXME: remove in 6.9.2
-    (fetchpatch {
-      url = "https://invent.kde.org/qt/qt/qtbase/-/commit/904aec2f372e2981af19bf762583a0ef42ec6bb9.diff";
-      hash = "sha256-bSf4TgYUk7Ariu37NHGQKv6wFArVpQLlnHCTbCFzAfI=";
-    })
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index cd69aade83149..4cdc80a4090a5 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -10,7 +10,6 @@
   lib,
   pkgsBuildBuild,
   replaceVars,
-  fetchpatch,
 }:
 
 qtModule {
@@ -38,11 +37,6 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
-    # This should make it into the 6.9.2 release.
-    (fetchpatch {
-      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/672e6777e8e6a8fd.diff";
-      hash = "sha256-nPczX6SHZPcdg7AqpRIwPCrcS3PId+Ibb0iPSiHUdaw=";
-    })
   ];
 
   preConfigure =
diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 0332feb6c04c5..6b7385bd8e71c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.9.1";
+  version = "6.9.2";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     tag = "v${version}";
-    hash = "sha256-nyMsl07pL6mNpg1p7W3cn2NXGmEbm+y9tgMexp6+xYI=";
+    hash = "sha256-/qz93JmMkJW3+lzT+QKvb/VL+xmbg5H8kKaXK+XN2nE=";
   };
 
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index c3e5a058e2b99..7ac7d6f43876e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -7,7 +7,6 @@
   buildPackages,
   bison,
   coreutils,
-  fetchpatch2,
   flex,
   gperf,
   ninja,
@@ -111,14 +110,6 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
-
-    # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
-    (fetchpatch2 {
-      url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch?full_index=1";
-      stripLen = 1;
-      extraPrefix = "src/3rdparty/chromium/";
-      hash = "sha256-wcby9uD8xb4re9+s+rdl1hcpxDcHxuI68vUNAC7Baas=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index 4ad3606a99e07..190e64e037d94 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,315 @@
 
 {
   qt3d = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qt3d-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1127kkbrds6xsd28p47drs51py5x8gsv2rwbllkb6yqlc1x4jilw";
-      name = "qt3d-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qt3d-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0ndn5fbsfj2vbcq3siq1gnk2rgblicd6ri2jrh9g41anicxh4vma";
+      name = "qt3d-everywhere-src-6.9.2.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qt5compat-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0yli7mbsdhksx57n05axr3kkspf9nm56w6bm1rbl0p0d7yn2diwn";
-      name = "qt5compat-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qt5compat-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0q2vly836wgs462czw7lg0ysf2h48iwbdy43wwf2gz49qq2rja6b";
+      name = "qt5compat-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtactiveqt-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0lvd6566yycfid6nq66m5cl3aw5bfzfifbhcpnqangvq1vla2zpx";
-      name = "qtactiveqt-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtactiveqt-everywhere-src-6.9.2.tar.xz";
+      sha256 = "003vgfxswi6cpdp9i8kdzm1n34cbrbzlap4sg9h1ap0i9is51s1w";
+      name = "qtactiveqt-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtbase = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtbase-everywhere-src-6.9.1.tar.xz";
-      sha256 = "13pjmha1jpalpy5qc5gijny7i648clsmcc08c5cik6nchfzyvjj0";
-      name = "qtbase-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtbase-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0h149x8l2ywfr5m034n20z6cjxnldary39x0vv22jhg0ryg9rgj4";
+      name = "qtbase-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtcharts-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1ly3mq4hgl4b20grajqy9bw16cx50d4drjxr3ljfj5n8gbmip1xq";
-      name = "qtcharts-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtcharts-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0jzzlh0jq5fidgs9r4aqpilyj0nan30r1d0pigp1hgz7cigz20cz";
+      name = "qtcharts-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtconnectivity-everywhere-src-6.9.1.tar.xz";
-      sha256 = "05qabslwr7dc7mfkgkr2ikqlb93c0dkfyg2vbvc5lk8h280yb229";
-      name = "qtconnectivity-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtconnectivity-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0qq4d8hn6s8bb9r2gglb6gzq6isbb13knqh7n2s2wsnx8rqwdzwa";
+      name = "qtconnectivity-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdatavis3d-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1irjbdm8ypm01zx18rwq8sp161fq9yjhbx01pcgfdix7y9sqnyac";
-      name = "qtdatavis3d-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdatavis3d-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0p6bvia085hx3jb1la06c2q48m9i897r1a1mf6bi2hbmm2hirzsx";
+      name = "qtdatavis3d-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdeclarative-everywhere-src-6.9.1.tar.xz";
-      sha256 = "15zc9i9d3c9r2bqbcavqn77qk2vwcwlmp5kv73pdg681vxjldffc";
-      name = "qtdeclarative-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdeclarative-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0r16qima008y2999r1djvwry01l295nmwwhqg081d2fr1cn2szs7";
+      name = "qtdeclarative-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtdoc-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1d8sdnwimvy8fi7cihkxzjllri5gsldy39rzqwyxv4nfwnxbw33f";
-      name = "qtdoc-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdoc-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0qng2lsqmrrj8n85aqh8vl4nlzc23va9hynvvf6gqr35anvbpniz";
+      name = "qtdoc-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtgraphs = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtgraphs-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0i1lb7zdvhxyv51g9h667g7wq50h6x11w88v68x5mfyda98dqbgm";
-      name = "qtgraphs-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtgraphs-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0wsa4iar52dhiilyl053j7lmsw3xdn47b0pjrylb5a0ij1izp057";
+      name = "qtgraphs-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtgrpc = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtgrpc-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0l574fwlqszk3zny2mcbka8ipi8bhj8m67jsd7yv129j42g8ck63";
-      name = "qtgrpc-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtgrpc-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0r1z6lbjcsgxhvzylpr8z8wl44ql14ajf99n1hfvf4gy4f43qgd4";
+      name = "qtgrpc-everywhere-src-6.9.2.tar.xz";
     };
   };
   qthttpserver = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qthttpserver-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0lrby1ii7ic0m3wnv1hvb5izzwrk5ryqvbi723qnbhxvw88vbixz";
-      name = "qthttpserver-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qthttpserver-everywhere-src-6.9.2.tar.xz";
+      sha256 = "06a0f7j1b309xffw3rwydz8lpzxnf5jg67savswskzbd3lfzlhqk";
+      name = "qthttpserver-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtimageformats-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0z2py4x0shdn29l9656r63xc8gzk9bgxlgi3qx9bg6xgv8wg5sgb";
-      name = "qtimageformats-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtimageformats-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0fciahs4i0nn5z0j624gkfncqg6byxswj45bw81drpjp5xz3y0la";
+      name = "qtimageformats-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlanguageserver-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1v486kb11mg65bvg88mm306nvq55kg6glnqiwfv9n2vn28v3a5ya";
-      name = "qtlanguageserver-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlanguageserver-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1vlb0qn53y1b4zf7zkpxdvdh5ikr1cidq5gv8blvf6pyw6pnw6vq";
+      name = "qtlanguageserver-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtlocation = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlocation-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0mzg4z0zra13czgygaxim8wn4a2lzndly3w0ymcxwzh4gs8fis60";
-      name = "qtlocation-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlocation-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1ybk3ig69p6zyrxabcfkb4pcyc251gy1m2brkf4q52cmcwcysias";
+      name = "qtlocation-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtlottie-everywhere-src-6.9.1.tar.xz";
-      sha256 = "18lbl6pxvfiwl84y92xwnm4cayxs8rdfgmvrq44n3jbk0wp8rs4f";
-      name = "qtlottie-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlottie-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1iiigsb4p1zwkxm1x9c4pbx5rgwz35krdqi3vkql4nawvp997px4";
+      name = "qtlottie-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtmultimedia-everywhere-src-6.9.1.tar.xz";
-      sha256 = "079r0wp4nwyp4a5cannz3vf99aj4dvydwydvwbw5bvhqjm2kcplm";
-      name = "qtmultimedia-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtmultimedia-everywhere-src-6.9.2.tar.xz";
+      sha256 = "04mbwl1mg4rjgai027chldslpjnqrx52c3jxn20j2hx7ayda3y3v";
+      name = "qtmultimedia-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtnetworkauth-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1jrrfcw3aa93xaq95xhy0iyigldmvgamy5452mpm8d926xdv3bbz";
-      name = "qtnetworkauth-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtnetworkauth-everywhere-src-6.9.2.tar.xz";
+      sha256 = "114c65gyg56v70byyl3if1q7mzhp5kkv1g8sp4y9zaxqirbdjr91";
+      name = "qtnetworkauth-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtpositioning-everywhere-src-6.9.1.tar.xz";
-      sha256 = "09pz0sbzcvhcaag7g7pidcnyvrx2kaxsxr73y2iqq949955p6qkh";
-      name = "qtpositioning-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtpositioning-everywhere-src-6.9.2.tar.xz";
+      sha256 = "06mwzlyprwz11ks6fsvzh03ilk5fxy3scr1gqqb4p85xzw0ri6j8";
+      name = "qtpositioning-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquick3d-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0xwr5kdz1yn0arby4jipbh0j8z1x8ppiqhswddyipmdzizd005pn";
-      name = "qtquick3d-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquick3d-everywhere-src-6.9.2.tar.xz";
+      sha256 = "002888xfnkxmvn8413fllidl3mm2fcwc4gbzdnbvpjlysaq9f3ig";
+      name = "qtquick3d-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtquick3dphysics = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquick3dphysics-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0kx2vj6qwwp05iizfnsmbn2337w70crah4zcdm1ah2f4p1g3ds36";
-      name = "qtquick3dphysics-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquick3dphysics-everywhere-src-6.9.2.tar.xz";
+      sha256 = "12yc0lswcmyaw19yyxzy73j95ncgqw8mlx8svhrwsllgcf2n9z47";
+      name = "qtquick3dphysics-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtquickeffectmaker = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquickeffectmaker-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0caxs6xcm5c7g85xyln5jjvz4b4g6flww7kq9vsl9fs20v21gdir";
-      name = "qtquickeffectmaker-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquickeffectmaker-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1yfq1pp0k2d6438x8pn2y73y29bqwg45bjh6msiy64fldr4z31br";
+      name = "qtquickeffectmaker-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtquicktimeline-everywhere-src-6.9.1.tar.xz";
-      sha256 = "153ji60xg55m85zg0px5nq1wbpkn61xf0whkjghf8y41rbkxpgvq";
-      name = "qtquicktimeline-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquicktimeline-everywhere-src-6.9.2.tar.xz";
+      sha256 = "09n51qw0y8v1q83xs1ybwwm4a49j2qhshqrasdkzz25mij6nhrdw";
+      name = "qtquicktimeline-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtremoteobjects-everywhere-src-6.9.1.tar.xz";
-      sha256 = "040a5s6sx5y0vpxjdmvici63yxr4rn9qisigpbjc4wlggfg0fgr7";
-      name = "qtremoteobjects-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtremoteobjects-everywhere-src-6.9.2.tar.xz";
+      sha256 = "09lby6dqc2sfig1krcszg6fkypgxlz2r7hgjjfi95g7g9gqlwqnz";
+      name = "qtremoteobjects-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtscxml-everywhere-src-6.9.1.tar.xz";
-      sha256 = "10274n4gslgh59sagyijllnskp204i16zm7bdpx58fmk4chdwcqc";
-      name = "qtscxml-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtscxml-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1dpb687zbw4akx42kfpbb5cpdlq3hcqn8l3l0x7sd5i9061z2sp0";
+      name = "qtscxml-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtsensors-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0v4w815698zgxhmk681ygfsjlbp1y4gqdmbb0pz2vm6gr8d16jzh";
-      name = "qtsensors-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtsensors-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0qj4674vim2p34mq3kp99spjyf82qvs75w625namzqp274pshk4n";
+      name = "qtsensors-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtserialbus-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1mq4mghn19m7m0mkbn6llwiprabr4ym8rpd9ks05spsnhd2ww7j9";
-      name = "qtserialbus-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtserialbus-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0xia9xcz7sjrbf1c4m63qnhz3ggdxr06pycslmsnqizlzb10f7lm";
+      name = "qtserialbus-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtserialport-everywhere-src-6.9.1.tar.xz";
-      sha256 = "047z7vchc01rki445i7qh5mqy3xh0i6ww1l34s4swx0c719fv3w0";
-      name = "qtserialport-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtserialport-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0sz2dkas4qjdd6lkfb9g89vi94q18aiq9xdchlqb2yn0qbqb544b";
+      name = "qtserialport-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtshadertools-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0x2b7dpkgdngpbv1g5qc6ffa4lwq4d8g3r3vdi5zp1q8rr6d47jf";
-      name = "qtshadertools-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtshadertools-everywhere-src-6.9.2.tar.xz";
+      sha256 = "158lpzb1nqspwm0n48d3nfr81q85zka1igrjp6xj8cjlv7wqlrqp";
+      name = "qtshadertools-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtspeech = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtspeech-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0a0lgjxkdfisczkaw7njs87a9qffigygn311chgqzvz2ragza1v8";
-      name = "qtspeech-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtspeech-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1cc8l2h1frlraay0m40r5a91nsc7b53n6vksa52pwqqia4vngdmj";
+      name = "qtspeech-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtsvg-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1mdvk8y7dfi8ibv36ccvfbmnsvm2y6dm27l6v6pz47w9zpjmvz1d";
-      name = "qtsvg-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtsvg-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1985asvnkd2ar30nh2zyi490qz0vkz6z1f752lfald33yawcm16r";
+      name = "qtsvg-everywhere-src-6.9.2.tar.xz";
     };
   };
   qttools = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qttools-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0k2b7z7g41pkq0bccvmwpalmn2ryhl0ccd4zv4zh9zfcyiiabi4h";
-      name = "qttools-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qttools-everywhere-src-6.9.2.tar.xz";
+      sha256 = "12d4czfwvh9rfjwnkpsiwzrpx4ga69c6vz85aabhpk3hx7lggdyq";
+      name = "qttools-everywhere-src-6.9.2.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qttranslations-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0hd707fpsij9bzl143615a4ags6y0nkwdplzlzmwsizlanjs2qcp";
-      name = "qttranslations-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qttranslations-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1mky3xj2yhcsrmpz8m28v7pky6ryn7hvdcglakww0rfk3qlbcfy7";
+      name = "qttranslations-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz";
-      sha256 = "07r87pg50drrv2z3b6ldlrvz8261xmq6jfcja9wg0dmqplw9l1c0";
-      name = "qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1qqizh7kyqbqqnrm1mmlf2709rm1rnflbqdl1bi75yms07d00hbv";
+      name = "qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwayland-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0gifjc4l85ilr1gb0p9dy2s2aypskjp8c7wskfqyp03id07fl8bx";
-      name = "qtwayland-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwayland-everywhere-src-6.9.2.tar.xz";
+      sha256 = "10bpxwpam56gvymz9vjxkppbqsj1369ddzl3k4pz2s2maq39imya";
+      name = "qtwayland-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebchannel-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1h7rzjsim2rxdw25sks4yz8r03llr6q8kcc081n43z0a47ch3d0r";
-      name = "qtwebchannel-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebchannel-everywhere-src-6.9.2.tar.xz";
+      sha256 = "0rcf7i1wamdf1qynq3yi88r77ch5dg1jinxywlfjlb2dmlvn72l7";
+      name = "qtwebchannel-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebengine-everywhere-src-6.9.1.tar.xz";
-      sha256 = "0v62j4zzya6yf91630ii6y4m62md69zfs1r21xi6v3rl5gigszbq";
-      name = "qtwebengine-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebengine-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1aq35nkgbvhlsmglnjizbkavr7kb0ymf5n3kkllrpqy2mf90gjwr";
+      name = "qtwebengine-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebsockets-everywhere-src-6.9.1.tar.xz";
-      sha256 = "1xa8yx1v5xk1zn2wc4gssali0k2l0yn6w2ywxsccq0kz7f38rglq";
-      name = "qtwebsockets-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebsockets-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1vh82w96436pqrp4daf324mqs2zjvn51z78b3ksc5mnqgrk3z0xy";
+      name = "qtwebsockets-everywhere-src-6.9.2.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.9.1";
+    version = "6.9.2";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.1/submodules/qtwebview-everywhere-src-6.9.1.tar.xz";
-      sha256 = "19ar1pmf9q39mqvnjkfrxrblgl1vn65zigj194n098ppp3xx96n2";
-      name = "qtwebview-everywhere-src-6.9.1.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebview-everywhere-src-6.9.2.tar.xz";
+      sha256 = "1w8z3d7w7z2xjfb5l15gb37v9w6pa7d71jalkrqda8l2wr5d3ksc";
+      name = "qtwebview-everywhere-src-6.9.2.tar.xz";
     };
   };
 }

From 2a908a09be474683a8b4adcbef87077d099d03fc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 27 Aug 2025 17:51:03 +0300
Subject: [PATCH 256/321] python313Packages.pyside6: 6.9.1 -> 6.9.2

---
 pkgs/development/python-modules/pyside6/default.nix   | 1 +
 pkgs/development/python-modules/shiboken6/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 015b2800e283f..b74bfeea4e906 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -36,6 +36,7 @@ let
     qtsvg
     qtwebchannel
     qtwebsockets
+    qtwebview
     qtpositioning
     qtlocation
     qtshadertools
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index decc00bf12fa6..778a88a397b46 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.9.1";
+  version = "6.9.2";
 
   src = fetchurl {
     url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-BMcSxbkjSt0Nm1qjwBoMrt5kpVtJYSd1H11SojDP90g=";
+    hash = "sha256-nsCHRlNCvcnb5JKjDlj9u8VEhlXerPWYKg/nEj9ZIi0=";
   };
 
   sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";

From 7cba1337e1f5b1a472792477b35064508e73e975 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 27 Aug 2025 16:50:56 +0200
Subject: [PATCH 257/321] flac: build from tarball; always enable man pages

This reduces the number of rebuilds for pandoc / haskell-updates by up
to 14k on linux and 8k on darwin.
---
 pkgs/by-name/fl/flac/package.nix | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix
index 220d7212325fb..bcd2df459fc1b 100644
--- a/pkgs/by-name/fl/flac/package.nix
+++ b/pkgs/by-name/fl/flac/package.nix
@@ -1,7 +1,7 @@
 {
   cmake,
   doxygen,
-  fetchFromGitHub,
+  fetchurl,
   graphviz,
   lib,
   libogg,
@@ -10,17 +10,17 @@
   pkg-config,
   stdenv,
   versionCheckHook,
-  enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "flac";
   version = "1.5.0";
 
-  src = fetchFromGitHub {
-    owner = "xiph";
-    repo = "flac";
-    tag = finalAttrs.version;
-    hash = "sha256-B6XRai5UOAtY/7JXNbI3YuBgazi1Xd2ZOs6vvLq9LIs=";
+  # Building from tarball instead of GitHub to include pre-built manpages.
+  # This prevents huge numbers of rebuilds for pandoc / haskell-updates.
+  # It also enables manpages for platforms where pandoc is not available.
+  src = fetchurl {
+    url = "http://downloads.xiph.org/releases/flac/flac-${finalAttrs.version}.tar.xz";
+    hash = "sha256-8sHHZZKoL//4QTujxKEpm2x6sGxzTe4D/YhjBIXCuSA=";
   };
 
   hardeningDisable = [ "trivialautovarinit" ];
@@ -30,18 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
     doxygen
     graphviz
     pkg-config
-  ]
-  ++ lib.optional enableManpages buildPackages.pandoc;
+  ];
 
   buildInputs = [ libogg ];
 
-  cmakeFlags =
-    lib.optionals (!stdenv.hostPlatform.isStatic) [
-      "-DBUILD_SHARED_LIBS=ON"
-    ]
-    ++ lib.optionals (!enableManpages) [
-      "-DINSTALL_MANPAGES=OFF"
-    ];
+  cmakeFlags = lib.optionals (!stdenv.hostPlatform.isStatic) [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
 
   CFLAGS = [
     "-O3"
@@ -57,8 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
     "doc"
     "out"
-  ]
-  ++ lib.optionals enableManpages [
     "man"
   ];
 

From 09d0bd46196351f0234ca9782788c592ba3291b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 27 Aug 2025 17:02:10 -0700
Subject: [PATCH 258/321] python3Packages.trove-classifiers: 2025.5.9.12 ->
 2025.8.26.11

Changelog: https://github.com/pypa/trove-classifiers/releases/tag/2025.8.6.13
           https://github.com/pypa/trove-classifiers/releases/tag/2025.8.26.11
---
 .../python-modules/trove-classifiers/default.nix    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index fd81fb7153236..5cea96d34d29a 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -4,24 +4,26 @@
   fetchPypi,
   calver,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2025.5.9.12";
+    version = "2025.8.26.11";
     pyproject = true;
 
-    disabled = pythonOlder "3.7";
-
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-fKfIp6duLNMURoxnfGnRLMI1dxH8q0pg+HmUwVieXLU=";
+      hash = "sha256-5z7/8xfEkqeZAJL5wSZ2xwW/bP5AolipP2P0tMmUFDI=";
     };
 
+    postPatch = ''
+      substituteInPlace tests/test_cli.py \
+        --replace-fail "BINDIR = Path(sys.executable).parent" "BINDIR = '$out/bin'"
+    '';
+
     build-system = [
       calver
       setuptools
@@ -40,6 +42,7 @@ let
       homepage = "https://github.com/pypa/trove-classifiers";
       changelog = "https://github.com/pypa/trove-classifiers/releases/tag/${version}";
       license = lib.licenses.asl20;
+      mainProgram = "trove-classifiers";
       maintainers = with lib.maintainers; [ dotlambda ];
     };
   };

From 5cfa0482b151b0f0579d72ed9517d59902016aaa Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 28 Aug 2025 12:52:18 +0300
Subject: [PATCH 259/321] qt6.qtwebengine: revert commit that breaks graphics
 acceleration on Mesa 25.2

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

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 7ac7d6f43876e..43c7aea86f15d 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -64,6 +64,8 @@
   bootstrap_cmds,
   cctools,
   xcbuild,
+
+  fetchpatch,
 }:
 
 qtModule {
@@ -110,6 +112,15 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
+
+    # Revert "Create EGLImage with eglCreateDRMImageMESA() for exporting dma_buf"
+    # Mesa 25.2 dropped eglCreateDRMImageMESA, so this no longer works.
+    # There are better ways to do this, but this is the easy fix for now.
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/ddcd30454aa6338d898c9d20c8feb48f36632e16.diff";
+      revert = true;
+      hash = "sha256-ht7C3GIEaPtmMGLzQKOtMqE9sLKdqqYCgi/W6b430YU=";
+    })
   ];
 
   postPatch = ''

From f8136a0f82e7f36b9e412c75645efc00fb9411d4 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sat, 26 Apr 2025 22:29:51 +0200
Subject: [PATCH 260/321] font-adobe-75dpi: refactor, move to pkgs/by-name and
 rename from xorg.fontadobe75dpi

relevant changes:
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything

this also fixes one occasion i could find in nixpkgs where the font path was relevant
---
 pkgs/by-name/fo/font-adobe-75dpi/package.nix  | 51 +++++++++++++++++++
 pkgs/by-name/xd/xdummy/package.nix            |  2 +-
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 56 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-adobe-75dpi/package.nix

diff --git a/pkgs/by-name/fo/font-adobe-75dpi/package.nix b/pkgs/by-name/fo/font-adobe-75dpi/package.nix
new file mode 100644
index 0000000000000..444c0f4335b68
--- /dev/null
+++ b/pkgs/by-name/fo/font-adobe-75dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-adobe-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-adobe-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-EoGmLb7e0WnklcrhpbSH4fM28rTZcdkpEcWcEDmZuRE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Adobe 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-75dpi";
+    license = lib.licenses.hpndSellVariant; # plus a trademark that doesn't change the license
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix
index 399226c7fc85f..df0911e1299fe 100644
--- a/pkgs/by-name/xd/xdummy/package.nix
+++ b/pkgs/by-name/xd/xdummy/package.nix
@@ -29,7 +29,7 @@ let
       ModulePath "${xorg.xorgserver.out}/lib/xorg/modules"
       ModulePath "${xorg.xf86videodummy}/lib/xorg/modules"
       XkbDir "${xkeyboard_config}/share/X11/xkb"
-      FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi"
+      FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi"
       FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi"
       FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc"
       FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc"
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15acd52e9e485..c13ec42c4435a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2,6 +2,7 @@
 {
   lib,
   bdftopcf,
+  font-adobe-75dpi,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -117,6 +118,7 @@ self: with self; {
     xwud
     ;
   encodings = font-encodings;
+  fontadobe75dpi = font-adobe-75dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
@@ -333,47 +335,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontadobe75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-adobe-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz";
-        sha256 = "04drk4wi176524lxjwfrnkr3dwz1hysabqfajpj6klfypqnsd08j";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontadobeutopia100dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0abd26780af1b..240fd3d930d1a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -318,6 +318,7 @@
 {
   lib,
   bdftopcf,
+  font-adobe-75dpi,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -433,6 +434,7 @@
     xwud
     ;
   encodings = font-encodings;
+  fontadobe75dpi = font-adobe-75dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c9e2c7583076d..01923915607dd 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -93,7 +93,6 @@ 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/driver/xf86-video-wsfb-0.4.0.tar.bz2
-mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz

From 657ebfddbb0365705acaaccec01c48525dd9231e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 21 Aug 2025 04:51:43 +0200
Subject: [PATCH 261/321] font-adobe-100dpi: refactor, move to pkgs/by-name and
 rename from xorg.fontadobe100dpi

relevant changes:
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything

this also fixes one occasion i could find in nixpkgs where the font path was relevant
---
 pkgs/by-name/fo/font-adobe-100dpi/package.nix | 51 +++++++++++++++++++
 pkgs/by-name/xd/xdummy/package.nix            |  2 +-
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 56 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-adobe-100dpi/package.nix

diff --git a/pkgs/by-name/fo/font-adobe-100dpi/package.nix b/pkgs/by-name/fo/font-adobe-100dpi/package.nix
new file mode 100644
index 0000000000000..3acef23346748
--- /dev/null
+++ b/pkgs/by-name/fo/font-adobe-100dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-adobe-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-adobe-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-tnr/RF4FYyjVP5cy05iE9V3Y0wP8Ja89u6M6i6NanM8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Adobe 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-100dpi";
+    license = lib.licenses.hpndSellVariant; # plus a trademark that doesn't change the license
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix
index df0911e1299fe..33b8087ad2259 100644
--- a/pkgs/by-name/xd/xdummy/package.nix
+++ b/pkgs/by-name/xd/xdummy/package.nix
@@ -30,7 +30,7 @@ let
       ModulePath "${xorg.xf86videodummy}/lib/xorg/modules"
       XkbDir "${xkeyboard_config}/share/X11/xkb"
       FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi"
-      FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi"
+      FontPath "${xorg.fontadobe100dpi}/share/fonts/X11/100dpi"
       FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc"
       FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc"
     ${lib.optionalString unfreeFonts ''
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c13ec42c4435a..08de18866e42e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2,6 +2,7 @@
 {
   lib,
   bdftopcf,
+  font-adobe-100dpi,
   font-adobe-75dpi,
   font-alias,
   font-bh-ttf,
@@ -118,6 +119,7 @@ self: with self; {
     xwud
     ;
   encodings = font-encodings;
+  fontadobe100dpi = font-adobe-100dpi;
   fontadobe75dpi = font-adobe-75dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
@@ -294,47 +296,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontadobe100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-adobe-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz";
-        sha256 = "1kwwbaiqnfm3pcysy9gw0g9xhpgmhjcd6clp7zajhqq5br2gyymn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontadobeutopia100dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 240fd3d930d1a..a26b9705523cf 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -318,6 +318,7 @@
 {
   lib,
   bdftopcf,
+  font-adobe-100dpi,
   font-adobe-75dpi,
   font-alias,
   font-bh-ttf,
@@ -434,6 +435,7 @@
     xwud
     ;
   encodings = font-encodings;
+  fontadobe100dpi = font-adobe-100dpi;
   fontadobe75dpi = font-adobe-75dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 01923915607dd..56cb2f8dc545f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -93,7 +93,6 @@ 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/driver/xf86-video-wsfb-0.4.0.tar.bz2
-mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz

From e21431a16558e4b69ebcf187691d9af81bccbfd8 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 26 Aug 2025 14:34:12 +0200
Subject: [PATCH 262/321] font-adobe-utopia-100dpi: refactor, move to
 pkgs/by-name and rename from xorg.fontadobeutopia100dpi

relevant changes:
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
- font is now under the license adobeUtopia (recognised by SPDX) instead
  of unfreeRedistributable
---
 lib/licenses.nix                              |  5 ++
 .../fo/font-adobe-utopia-100dpi/package.nix   | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 6 files changed, 60 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-adobe-utopia-100dpi/package.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 4e42b57a4b13e..dd0123cd9f32d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -64,6 +64,11 @@ lib.mapAttrs mkLicense (
       free = false;
     };
 
+    adobeUtopia = {
+      fullName = "Adobe Utopia Font License";
+      spdxId = "Adobe-Utopia";
+    };
+
     afl20 = {
       spdxId = "AFL-2.0";
       fullName = "Academic Free License v2.0";
diff --git a/pkgs/by-name/fo/font-adobe-utopia-100dpi/package.nix b/pkgs/by-name/fo/font-adobe-utopia-100dpi/package.nix
new file mode 100644
index 0000000000000..1de4bd26fc0e0
--- /dev/null
+++ b/pkgs/by-name/fo/font-adobe-utopia-100dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-adobe-utopia-100dpi";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-+4TsKXqQaXNUjKWbfG2uqtISRL7F0/sefJPfXvQ7Aks=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Adobe Utopia 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi";
+    license = lib.licenses.adobeUtopia;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 08de18866e42e..99ae83504c7fe 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -4,6 +4,7 @@
   bdftopcf,
   font-adobe-100dpi,
   font-adobe-75dpi,
+  font-adobe-utopia-100dpi,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -121,6 +122,7 @@ self: with self; {
   encodings = font-encodings;
   fontadobe100dpi = font-adobe-100dpi;
   fontadobe75dpi = font-adobe-75dpi;
+  fontadobeutopia100dpi = font-adobe-utopia-100dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
@@ -296,47 +298,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontadobeutopia100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-adobe-utopia-100dpi";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz";
-        sha256 = "0jq27gs5xpwkghggply5pr215lmamrnpr6x5iia76schg8lyr17v";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontadobeutopia75dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a26b9705523cf..ea34ad787bf7d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -320,6 +320,7 @@
   bdftopcf,
   font-adobe-100dpi,
   font-adobe-75dpi,
+  font-adobe-utopia-100dpi,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -437,6 +438,7 @@
   encodings = font-encodings;
   fontadobe100dpi = font-adobe-100dpi;
   fontadobe75dpi = font-adobe-75dpi;
+  fontadobeutopia100dpi = font-adobe-utopia-100dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index df416c019038d..83442a2efd067 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1020,7 +1020,6 @@ self: super:
     # unfree but redistributable
     redist = [
       "fontadobeutopiatype1"
-      "fontadobeutopia100dpi"
       "fontadobeutopia75dpi"
       "fontibmtype1"
       "fontbh100dpi"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 56cb2f8dc545f..f39883ed0fdd6 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -94,7 +94,6 @@ 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/driver/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
-mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz

From 98df87ea67a2ef46069c8e5f1a1741026a50af8a Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 26 Aug 2025 14:42:15 +0200
Subject: [PATCH 263/321] font-adobe-utopia-75dpi: refactor, move to
 pkgs/by-name and rename from xorg.fontadobeutopia75dpi

relevant changes:
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
- font is now under the license adobeUtopia (recognised by SPDX) instead
  of unfreeRedistributable
---
 .../fo/font-adobe-utopia-75dpi/package.nix    | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-adobe-utopia-75dpi/package.nix

diff --git a/pkgs/by-name/fo/font-adobe-utopia-75dpi/package.nix b/pkgs/by-name/fo/font-adobe-utopia-75dpi/package.nix
new file mode 100644
index 0000000000000..214197d37e6ef
--- /dev/null
+++ b/pkgs/by-name/fo/font-adobe-utopia-75dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-adobe-utopia-75dpi";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-pyYkWTLQck+gxTjJkoEdY9WX5fU5KPQEjpyvViN5d2A=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Adobe Utopia 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-utopia-75dpi";
+    license = lib.licenses.adobeUtopia;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 99ae83504c7fe..3ff322232da3a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -5,6 +5,7 @@
   font-adobe-100dpi,
   font-adobe-75dpi,
   font-adobe-utopia-100dpi,
+  font-adobe-utopia-75dpi,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -123,6 +124,7 @@ self: with self; {
   fontadobe100dpi = font-adobe-100dpi;
   fontadobe75dpi = font-adobe-75dpi;
   fontadobeutopia100dpi = font-adobe-utopia-100dpi;
+  fontadobeutopia75dpi = font-adobe-utopia-75dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
@@ -298,47 +300,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontadobeutopia75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-adobe-utopia-75dpi";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz";
-        sha256 = "0q3pg4imdbwwiq2g8a1rypjrgmb33n0r5j9qqnh4ywnh69cj89m7";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontadobeutopiatype1 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ea34ad787bf7d..d0a26a230c2c4 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -321,6 +321,7 @@
   font-adobe-100dpi,
   font-adobe-75dpi,
   font-adobe-utopia-100dpi,
+  font-adobe-utopia-75dpi,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -439,6 +440,7 @@
   fontadobe100dpi = font-adobe-100dpi;
   fontadobe75dpi = font-adobe-75dpi;
   fontadobeutopia100dpi = font-adobe-utopia-100dpi;
+  fontadobeutopia75dpi = font-adobe-utopia-75dpi;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 83442a2efd067..35f21c9e15112 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1020,7 +1020,6 @@ self: super:
     # unfree but redistributable
     redist = [
       "fontadobeutopiatype1"
-      "fontadobeutopia75dpi"
       "fontibmtype1"
       "fontbh100dpi"
       "fontbh75dpi"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index f39883ed0fdd6..c3917802f73c8 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -93,7 +93,6 @@ 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/driver/xf86-video-wsfb-0.4.0.tar.bz2
-mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz

From 9ef0609cf31fccaeb2811d939929bba677231e99 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 26 Aug 2025 14:48:15 +0200
Subject: [PATCH 264/321] font-adobe-utopia-type1: refactor, move to
 pkgs/by-name and rename from xorg.fontadobeutopiatype1

relevant changes:
- remove some dependencies that dont't seem to be needed
- font is now in $out/share/fonts/X11 instead of $out/lib/X11/fonts
  i have no idea why fonts would be in lib, so lets see if this breaks
  anything
- font is now under the license adobeUtopia (recognised by SPDX) instead
  of unfreeRedistributable
---
 .../fo/font-adobe-utopia-type1/package.nix    | 38 ++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-adobe-utopia-type1/package.nix

diff --git a/pkgs/by-name/fo/font-adobe-utopia-type1/package.nix b/pkgs/by-name/fo/font-adobe-utopia-type1/package.nix
new file mode 100644
index 0000000000000..8a51ac68b7f39
--- /dev/null
+++ b/pkgs/by-name/fo/font-adobe-utopia-type1/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-adobe-utopia-type1";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-adobe-utopia-type1-${finalAttrs.version}.tar.xz";
+    hash = "sha256-TLKAvEdpOwfF4A/Q5a1XIaq+vAVIw/BndOXMPLz3Vpc=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ mkfontscale ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Adobe Utopia PostScript Type 1 fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/adobe-utopia-type1";
+    license = lib.licenses.adobeUtopia;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3ff322232da3a..d371c97deaeaa 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -6,6 +6,7 @@
   font-adobe-75dpi,
   font-adobe-utopia-100dpi,
   font-adobe-utopia-75dpi,
+  font-adobe-utopia-type1,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -125,6 +126,7 @@ self: with self; {
   fontadobe75dpi = font-adobe-75dpi;
   fontadobeutopia100dpi = font-adobe-utopia-100dpi;
   fontadobeutopia75dpi = font-adobe-utopia-75dpi;
+  fontadobeutopiatype1 = font-adobe-utopia-type1;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
@@ -300,44 +302,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontadobeutopiatype1 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-adobe-utopia-type1";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz";
-        sha256 = "15snyyy3rk75fikz1hs80nybxai1aynybl0gw32hffv98yy81cjc";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontarabicmisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d0a26a230c2c4..793ad3a33e7b0 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -322,6 +322,7 @@
   font-adobe-75dpi,
   font-adobe-utopia-100dpi,
   font-adobe-utopia-75dpi,
+  font-adobe-utopia-type1,
   font-alias,
   font-bh-ttf,
   font-bh-type1,
@@ -441,6 +442,7 @@
   fontadobe75dpi = font-adobe-75dpi;
   fontadobeutopia100dpi = font-adobe-utopia-100dpi;
   fontadobeutopia75dpi = font-adobe-utopia-75dpi;
+  fontadobeutopiatype1 = font-adobe-utopia-type1;
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 35f21c9e15112..13a664b6ed25a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1019,7 +1019,6 @@ self: super:
   let
     # unfree but redistributable
     redist = [
-      "fontadobeutopiatype1"
       "fontibmtype1"
       "fontbh100dpi"
       "fontbh75dpi"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c3917802f73c8..638959f0fdb52 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -93,7 +93,6 @@ 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/driver/xf86-video-wsfb-0.4.0.tar.bz2
-mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz

From f34480c1adab47d82c1223c1d4552fa06b8c12a5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 28 Aug 2025 23:35:29 +0800
Subject: [PATCH 265/321] spidermonkey_128: 128.5.0 -> 128.14.0

https://github.com/mozilla-firefox/firefox/commits/FIREFOX_128_14_0esr_RELEASE/js/src/build
https://github.com/mozilla-firefox/firefox/commits/FIREFOX_128_14_0esr_RELEASE/build
---
 pkgs/development/interpreters/spidermonkey/128.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/128.nix b/pkgs/development/interpreters/spidermonkey/128.nix
index bbf122857d13a..eb40549452816 100644
--- a/pkgs/development/interpreters/spidermonkey/128.nix
+++ b/pkgs/development/interpreters/spidermonkey/128.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "128.5.0";
-  hash = "sha512-/yDxj5LF6c0dnq98OM7GG8qy3KjdKBdRm3ErwfdgtcbikCEqzzKJFSdk5RMOAWJpULfs2TJ7LFh7JKJGWRr9Zw==";
+  version = "128.14.0";
+  hash = "sha512-o88mfoK29auLZJemKxL4Wvt4/K72sSxD73lWTOgnDTMnqHM2jOSPwBjkb+9eBzOcB7mklKX/bCKoQJn5Ofap3g==";
 }

From 6c2fb66f4c7c75c3a825d00aa3cfbd594206cb55 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 28 Aug 2025 21:07:42 +0200
Subject: [PATCH 266/321] python3Packages.python-on-whales: remove unused
 dependencies

Since 2024-10-13, `typer`, `tqdm`, and `requests` are no longer required [1].
Removing them reduces the closure size of python-on-whales.
This drops most of tkinter's reverse dependencies,
and may even make it not be a mass-rebuild.

[1] https://github.com/gabrieldemarmiesse/python-on-whales/pull/633
---
 .../development/python-modules/python-on-whales/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix
index 9b917d59b2ba5..f7634cad9267b 100644
--- a/pkgs/development/python-modules/python-on-whales/default.nix
+++ b/pkgs/development/python-modules/python-on-whales/default.nix
@@ -8,9 +8,6 @@
 
   # dependencies
   pydantic,
-  requests,
-  tqdm,
-  typer,
 }:
 
 buildPythonPackage rec {
@@ -29,9 +26,6 @@ buildPythonPackage rec {
 
   dependencies = [
     pydantic
-    requests
-    tqdm
-    typer
   ];
 
   doCheck = false; # majority of tests require Docker and/or network access

From dffd802d5ed21e041c2b3f95a1166e92488932b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 28 Aug 2025 12:25:47 -0700
Subject: [PATCH 267/321] python3Packages.aiohttp: drop superfluous test
 dependency

We don't run Docker, so we don't need python-on-whales.
---
 pkgs/development/python-modules/aiohttp/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index d39e8318943e2..d7203d4648700 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -42,7 +42,6 @@
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
-  python-on-whales,
   re-assert,
   trustme,
   zlib-ng,
@@ -119,7 +118,6 @@ buildPythonPackage rec {
     pytest-mock
     pytest-xdist
     pytestCheckHook
-    python-on-whales
     re-assert
     trustme
     zlib-ng

From 0a1836ce8346c3408f3d44c093ff359b794e485b Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 27 Aug 2025 23:28:09 +0200
Subject: [PATCH 268/321] nodejs_22: 22.18.0 -> 22.19.0

---
 pkgs/development/web/nodejs/v22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 4300e29637138..19440edf6a8d3 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -17,8 +17,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.18.0";
-  sha256 = "120e0f74419097a9fafae1fd80b9de7791a587e6f1c48c22b193239ccd0f7084";
+  version = "22.19.0";
+  sha256 = "0272acfce50ce9ad060288321b1092719a7f19966f81419835410c59c09daa46";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From 8acc365a8d46e304c994fc79d3a0070e12bd3301 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 23 Aug 2025 19:52:31 -0600
Subject: [PATCH 269/321] python3Packages.flask: 3.1.1 -> 3.1.2

https://github.com/pallets/flask/releases/tag/3.1.2

Diff: https://github.com/pallets/flask/compare/3.1.1...3.1.2
---
 pkgs/development/python-modules/flask/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 0a6be08d1dce2..75e72fd18d4f8 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -32,12 +32,12 @@
 
 buildPythonPackage rec {
   pname = "flask";
-  version = "3.1.1";
+  version = "3.1.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KEx7jy9Yy3N/DPHDD9fq8Mz83hlgmdJOzt4/wgBapZ4=";
+    hash = "sha256-v2VsFcgBkO1iitCM39Oqo1vrCHhV4vSUkQqjd0zE/Yc=";
   };
 
   build-system = [ flit-core ];

From 69ed93c6a7a42aae556105dc7d88bcd08c711afe Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 29 Aug 2025 12:36:11 +0200
Subject: [PATCH 270/321] util-linux: fix build with systemd disabled

Fixes: 025e6374343d ("util-linux: split lastlog into dedicated output")
---
 pkgs/by-name/ut/util-linux/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index b772a9e4abb8d..eb0da7a33da8c 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -188,12 +188,13 @@ stdenv.mkDerivation (finalPackage: rec {
       ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''moveToOutput "lib/security" "$lastlog"''}
       moveToOutput "lib/tmpfiles.d/lastlog2-tmpfiles.conf" "$lastlog"
 
+      moveToOutput "bin/lastlog2" "$lastlog"
+      ln -svf "$lastlog/bin/"* $bin/bin/
+    ''
+    + lib.optionalString (withLastlog && systemdSupport) ''
       moveToOutput "lib/systemd/system/lastlog2-import.service" "$lastlog"
       substituteInPlace $lastlog/lib/systemd/system/lastlog2-import.service \
         --replace-fail "$bin/bin/lastlog2" "$lastlog/bin/lastlog2"
-
-      moveToOutput "bin/lastlog2" "$lastlog"
-      ln -svf "$lastlog/bin/"* $bin/bin/
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
 

From 240d5045b60ff898ce4705d9d816a3b12c80adcd Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 01:58:31 +0200
Subject: [PATCH 271/321] xgamma: 1.0.7 -> 1.0.8, refactor & move to
 pkgs/by-name from xorg namespace

---
 pkgs/by-name/xg/xgamma/package.nix            | 52 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 56 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/xg/xgamma/package.nix

diff --git a/pkgs/by-name/xg/xgamma/package.nix b/pkgs/by-name/xg/xgamma/package.nix
new file mode 100644
index 0000000000000..5f8772e1c4419
--- /dev/null
+++ b/pkgs/by-name/xg/xgamma/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxxf86vm,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xgamma";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xgamma-${finalAttrs.version}.tar.xz";
+    hash = "sha256-mPn2nlOhHDVKZjfqXD12mc61xbH4rW8KFNmTHloQ0Hk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxxf86vm
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to query and alter the gamma correction of a X monitor";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xgamma";
+    license = with lib.licenses; [
+      x11
+      hpndSellVariant
+    ];
+    mainProgram = "xgamma";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d371c97deaeaa..b81d531720f23 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -65,6 +65,7 @@
   xdriinfo,
   xev,
   xfsinfo,
+  xgamma,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -108,6 +109,7 @@ self: with self; {
     xdriinfo
     xev
     xfsinfo
+    xgamma
     xlsatoms
     xlsclients
     xlsfonts
@@ -4920,44 +4922,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xgamma = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      libXxf86vm,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xgamma";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xgamma-1.0.7.tar.xz";
-        sha256 = "13xw2fqp9cs7xj3nqi8khqxv81rk0dd8khp59xgs2lw9bbldly8w";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-        libXxf86vm
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xgc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 793ad3a33e7b0..d5b40c26a9cc8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -381,6 +381,7 @@
   xdriinfo,
   xev,
   xfsinfo,
+  xgamma,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -424,6 +425,7 @@
     xdriinfo
     xev
     xfsinfo
+    xgamma
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 13a664b6ed25a..29e17f2039873 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -965,7 +965,6 @@ self: super:
   xfd = addMainProgram super.xfd { };
   xfontsel = addMainProgram super.xfontsel { };
   xfs = addMainProgram super.xfs { };
-  xgamma = addMainProgram super.xgamma { };
   xgc = addMainProgram super.xgc { };
   xhost = addMainProgram super.xhost { };
   xinput = addMainProgram super.xinput { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 638959f0fdb52..20597d0bcda10 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -22,7 +22,6 @@ mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
-mirror://xorg/individual/app/xgamma-1.0.7.tar.xz
 mirror://xorg/individual/app/xgc-1.0.6.tar.xz
 mirror://xorg/individual/app/xhost-1.0.10.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz

From 47b8e80c55ea416ee98017dba2802f3cac34dab9 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 02:10:51 +0200
Subject: [PATCH 272/321] xgc: 1.0.6 -> 1.0.7, refactor & move to pkgs/by-name
 from xorg namespace

---
 pkgs/by-name/xg/xgc/package.nix               | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 60 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/xg/xgc/package.nix

diff --git a/pkgs/by-name/xg/xgc/package.nix b/pkgs/by-name/xg/xgc/package.nix
new file mode 100644
index 0000000000000..31c0f7167c379
--- /dev/null
+++ b/pkgs/by-name/xg/xgc/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxaw,
+  libxt,
+  wrapWithXFileSearchPathHook,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xgc";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xgc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-2FgljAXqrC0fSLtEgg3C3OCmhgGhT/+XhTxytI0bfQg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    libxaw
+    libxt
+  ];
+
+  installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Demo to show various features of the X11 core protocol graphics primitives";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xgc";
+    license = with lib.licenses; [
+      x11
+      mit
+    ];
+    mainProgram = "xgc";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b81d531720f23..6ecd842152f6d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -66,6 +66,7 @@
   xev,
   xfsinfo,
   xgamma,
+  xgc,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -110,6 +111,7 @@ self: with self; {
     xev
     xfsinfo
     xgamma
+    xgc
     xlsatoms
     xlsclients
     xlsfonts
@@ -4922,46 +4924,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xgc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libXaw,
-      libXt,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xgc";
-      version = "1.0.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xgc-1.0.6.tar.xz";
-        sha256 = "0h5jm2946f5m1g8a3qh1c01h3zrsjjivi09vi9rmij2frvdvp1vv";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libXaw
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xhost = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d5b40c26a9cc8..bf87eaca52337 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -382,6 +382,7 @@
   xev,
   xfsinfo,
   xgamma,
+  xgc,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -426,6 +427,7 @@
     xev
     xfsinfo
     xgamma
+    xgc
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 29e17f2039873..a8fd34acd6a20 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -965,7 +965,6 @@ self: super:
   xfd = addMainProgram super.xfd { };
   xfontsel = addMainProgram super.xfontsel { };
   xfs = addMainProgram super.xfs { };
-  xgc = addMainProgram super.xgc { };
   xhost = addMainProgram super.xhost { };
   xinput = addMainProgram super.xinput { };
   xkbevd = addMainProgram super.xkbevd { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 20597d0bcda10..736c7019f4d75 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -22,7 +22,6 @@ mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
-mirror://xorg/individual/app/xgc-1.0.6.tar.xz
 mirror://xorg/individual/app/xhost-1.0.10.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz
 mirror://xorg/individual/app/xinput-1.6.4.tar.xz

From 744120dbc7899fcbede9e9935306dad692574230 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 02:20:46 +0200
Subject: [PATCH 273/321] xhost: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xh/xhost/package.nix             | 62 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 66 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/xh/xhost/package.nix

diff --git a/pkgs/by-name/xh/xhost/package.nix b/pkgs/by-name/xh/xhost/package.nix
new file mode 100644
index 0000000000000..ed39814e850d9
--- /dev/null
+++ b/pkgs/by-name/xh/xhost/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  gettext,
+  xorgproto,
+  libx11,
+  libxau,
+  libxmu,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xhost";
+  version = "1.0.10";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xhost-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qK/XAFlHnHEpSLiV5Bw1pKi/zt47otWkuFXIi7tyW+E=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxau
+    libxmu
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X server access control program";
+    longDescription = ''
+      xhost is used to manage the list of host names or user names allowed to make connections to
+      the X server.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xhost";
+    license = with lib.licenses; [
+      mit
+      icu
+    ];
+    mainProgram = "xhost";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6ecd842152f6d..2e6881a79d8ea 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -67,6 +67,7 @@
   xfsinfo,
   xgamma,
   xgc,
+  xhost,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -112,6 +113,7 @@ self: with self; {
     xfsinfo
     xgamma
     xgc
+    xhost
     xlsatoms
     xlsclients
     xlsfonts
@@ -4924,50 +4926,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xhost = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXau,
-      libXmu,
-      xorgproto,
-      gettext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xhost";
-      version = "1.0.10";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xhost-1.0.10.tar.xz";
-        sha256 = "1qavfaxqpj2mp2jdb8ivvv7bza546lff95dq90lp3727b40dgbx8";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        gettext
-      ];
-      buildInputs = [
-        libX11
-        libXau
-        libXmu
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xinit = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index bf87eaca52337..4333d158748d8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -383,6 +383,7 @@
   xfsinfo,
   xgamma,
   xgc,
+  xhost,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -428,6 +429,7 @@
     xfsinfo
     xgamma
     xgc
+    xhost
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a8fd34acd6a20..6b260478c7907 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -965,7 +965,6 @@ self: super:
   xfd = addMainProgram super.xfd { };
   xfontsel = addMainProgram super.xfontsel { };
   xfs = addMainProgram super.xfs { };
-  xhost = addMainProgram super.xhost { };
   xinput = addMainProgram super.xinput { };
   xkbevd = addMainProgram super.xkbevd { };
   xkbprint = addMainProgram super.xkbprint { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 736c7019f4d75..b289b16fd8112 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -22,7 +22,6 @@ mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
-mirror://xorg/individual/app/xhost-1.0.10.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz
 mirror://xorg/individual/app/xinput-1.6.4.tar.xz
 mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz

From fea40463335f6a2885d20c59f558268f27b3178b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 02:45:45 +0200
Subject: [PATCH 274/321] xkbutils: refactor and move to pkgs/by-name from xorg
 namespace

---
 lib/licenses.nix                              |  5 ++
 pkgs/by-name/xk/xkbutils/package.nix          | 60 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 69 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/xk/xkbutils/package.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index dd0123cd9f32d..5ef70d24c12fa 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -718,6 +718,11 @@ lib.mapAttrs mkLicense (
       spdxId = "HPND-sell-variant";
     };
 
+    hpndDec = {
+      fullName = "Historical Permission Notice and Disclaimer - DEC variant";
+      spdxId = "HPND-DEC";
+    };
+
     hpndDoc = {
       fullName = "Historical Permission Notice and Disclaimer - documentation variant";
       spdxId = "HPND-doc";
diff --git a/pkgs/by-name/xk/xkbutils/package.nix b/pkgs/by-name/xk/xkbutils/package.nix
new file mode 100644
index 0000000000000..b482caf4b2041
--- /dev/null
+++ b/pkgs/by-name/xk/xkbutils/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxaw,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xkbutils";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xkbutils-${finalAttrs.version}.tar.xz";
+    hash = "sha256-MaK77h4JzLoB3pKJe49UC1Rd6BLzGNMd4HvTpade4l4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxaw
+    libxt
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Collection of small XKB utilities";
+    longDescription = ''
+      xkbutils is a collection of small utilities using the X Keyboard extenison:
+      - xkbbell: generate X Keyboard Extension bell events
+      - xkbvleds: display X Keyboard Extension LED state in a window
+      - xkbwatch: report state changes using the X Keyboard Extension
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbutils";
+    license = with lib.licenses; [
+      hpnd
+      hpndDec
+      mit
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2e6881a79d8ea..cb98edfc02008 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -68,6 +68,7 @@
   xgamma,
   xgc,
   xhost,
+  xkbutils,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -114,6 +115,7 @@ self: with self; {
     xgamma
     xgc
     xhost
+    xkbutils
     xlsatoms
     xlsclients
     xlsfonts
@@ -5118,46 +5120,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xkbutils = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXaw,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xkbutils";
-      version = "1.0.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz";
-        sha256 = "0pp2bsksblvvw0fx667k2bl5sm0baj7pp2cjvq0vmk093vpbp8ii";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXaw
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xkill = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 4333d158748d8..e045903ea3f0c 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -384,6 +384,7 @@
   xgamma,
   xgc,
   xhost,
+  xkbutils,
   xkeyboard-config,
   xlsatoms,
   xlsclients,
@@ -430,6 +431,7 @@
     xgamma
     xgc
     xhost
+    xkbutils
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b289b16fd8112..000de3a90d499 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/app/xinput-1.6.4.tar.xz
 mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz
 mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz
 mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
-mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
 mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz

From 3c24cb60ff576568fa0bbe8c67f38669d8f26490 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 02:54:42 +0200
Subject: [PATCH 275/321] xkill: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xk/xkill/package.nix             | 54 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/xk/xkill/package.nix

diff --git a/pkgs/by-name/xk/xkill/package.nix b/pkgs/by-name/xk/xkill/package.nix
new file mode 100644
index 0000000000000..9577eb13c53b3
--- /dev/null
+++ b/pkgs/by-name/xk/xkill/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxmu,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xkill";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xkill-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5aiqeMR1Z3sRUEZG2o2T2swwdEJYB2ospBiiRDiuuQc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxmu
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to forcibly terminate X11 clients";
+    longDescription = ''
+      xkill is a utility for forcing the X server to close connections to clients.
+      This program is very dangerous, but is useful for aborting programs that have displayed
+      undesired windows on a user's screen.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkill";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xkill";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index cb98edfc02008..c03863a205d9a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -70,6 +70,7 @@
   xhost,
   xkbutils,
   xkeyboard-config,
+  xkill,
   xlsatoms,
   xlsclients,
   xlsfonts,
@@ -116,6 +117,7 @@ self: with self; {
     xgc
     xhost
     xkbutils
+    xkill
     xlsatoms
     xlsclients
     xlsfonts
@@ -5120,44 +5122,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xkill = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXmu,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xkill";
-      version = "1.0.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xkill-1.0.6.tar.xz";
-        sha256 = "01xrmqw498hqlhn6l1sq89s31k6sjf6xlij6a08pnrvmqiwama75";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXmu
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xload = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index e045903ea3f0c..9975b4053e152 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -386,6 +386,7 @@
   xhost,
   xkbutils,
   xkeyboard-config,
+  xkill,
   xlsatoms,
   xlsclients,
   xlsfonts,
@@ -432,6 +433,7 @@
     xgc
     xhost
     xkbutils
+    xkill
     xlsatoms
     xlsclients
     xlsfonts
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6b260478c7907..b3d4af551ea7b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -968,7 +968,6 @@ self: super:
   xinput = addMainProgram super.xinput { };
   xkbevd = addMainProgram super.xkbevd { };
   xkbprint = addMainProgram super.xkbprint { };
-  xkill = addMainProgram super.xkill { };
   xload = addMainProgram super.xload { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 000de3a90d499..b9f495cf71f5f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -27,7 +27,6 @@ mirror://xorg/individual/app/xinput-1.6.4.tar.xz
 mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz
 mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz
 mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
-mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz
 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz

From 0d4577bce493c159d41fdc303eb7455d87e154a0 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 26 Aug 2025 23:51:53 -0400
Subject: [PATCH 276/321] spidermonkey_91: drop

It has been EOL for several years now, and the last dependant(couchdb3)
no longer requires it as of #436932.

I've also removed all conditionals in the common.nix build file that
were for versions older than 115, since we no longer ship any versions
older than that. I would like to remove 115 and 128 soon as well, since
as of commit, they reach end of life in 3 weeks(in fact, 115 is EOL for
all platforms we support afaik)
---
 doc/release-notes/rl-2511.section.md          |  2 +
 .../interpreters/spidermonkey/91.nix          |  4 --
 .../interpreters/spidermonkey/common.nix      | 45 +++----------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 5 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/development/interpreters/spidermonkey/91.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index a3a400bd11652..0856f3a5e55ff 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -42,6 +42,8 @@
 
 - `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.
 
+- `spidermonkey_91` has been removed, as it has been EOL since September 2022.
+
 - `cudaPackages.cudatoolkit-legacy-runfile` has been removed.
 
 - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.
diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix
deleted file mode 100644
index 0ffa5fc287d50..0000000000000
--- a/pkgs/development/interpreters/spidermonkey/91.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "91.13.0";
-  hash = "sha512-OLTMUt4h521gYea6F14cv9iIoWBwqpUfWkQoPy251+lPJQRiHw2nj+rG5xSRptDnA49j3QrhEtytcA6wLpqlFg==";
-}
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index 1dcd6830a2698..beaf34f90777f 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -8,13 +8,14 @@
   fetchpatch,
 
   # build time
+  apple-sdk_14,
+  apple-sdk_15,
   buildPackages,
   cargo,
   m4,
   perl,
   pkg-config,
   python3,
-  python311,
   rust-cbindgen,
   rustPlatform,
   rustc,
@@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches =
-    lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [
+    lib.optionals (lib.versionOlder version "128") [
       # use pkg-config at all systems
       ./always-check-for-pkg-config.patch
       ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch
@@ -56,17 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
       ./always-check-for-pkg-config-128.patch
       ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch
     ]
-    ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [
+    ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
       # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
       ./fix-float-i686.patch
     ]
-    ++ lib.optionals (lib.versionAtLeast version "91" && lib.versionOlder version "102") [
-      # Fix 91 compatibility with python311
-      (fetchpatch {
-        url = "https://src.fedoraproject.org/rpms/mozjs91/raw/e3729167646775e60a3d8c602c0412e04f206baf/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch";
-        hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48=";
-      })
-    ]
     ++ lib.optionals (lib.versionAtLeast version "140") [
       # mozjs-140.pc does not contain -DXP_UNIX on Linux
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994
@@ -81,9 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     m4
     perl
     pkg-config
-    # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves'
-    # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils'
-    (if lib.versionOlder version "115" then python311 else python3)
+    python3
     rustc
     rustc.llvmPackages.llvm # for llvm-objdump
     which
@@ -105,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
+    (if (lib.versionAtLeast version "140") then apple-sdk_15 else apple-sdk_14)
   ];
 
   depsBuildBuild = [
@@ -125,8 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-readline"
     "--enable-release"
     "--enable-shared-js"
-  ]
-  ++ lib.optionals (lib.versionAtLeast version "91") [
     "--disable-debug"
   ]
   ++ lib.optionals (lib.versionAtLeast version "140") [
@@ -151,16 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  postPatch = lib.optionalString (lib.versionOlder version "102") ''
-    # This patch is a manually applied fix of
-    #   https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
-    # Once that bug is fixed, this can be removed.
-    # This is needed in, for example, `zeroad`.
-    substituteInPlace js/public/StructuredClone.h \
-         --replace "class SharedArrayRawBufferRefs {" \
-                   "class JS_PUBLIC_API SharedArrayRawBufferRefs {"
-  '';
-
   preConfigure =
     lib.optionalString (lib.versionAtLeast version "128") ''
       export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild
@@ -168,24 +149,11 @@ stdenv.mkDerivation (finalAttrs: {
     + ''
       export LIBXUL_DIST=$out
       export PYTHON="${buildPackages.python3.interpreter}"
-    ''
-    + lib.optionalString (lib.versionAtLeast version "91") ''
       export M4=m4
       export AWK=awk
       export AS=$CC
       export AC_MACRODIR=$PWD/build/autoconf/
-
-    ''
-    + lib.optionalString (lib.versionAtLeast version "91" && lib.versionOlder version "115") ''
-      pushd js/src
-      sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure
-      chmod +x configure
-      popd
-    ''
-    + lib.optionalString (lib.versionAtLeast version "115") ''
       patchShebangs build/cargo-linker
-    ''
-    + ''
       # We can't build in js/src/, so create a build dir
       mkdir obj
       cd obj/
@@ -217,7 +185,6 @@ stdenv.mkDerivation (finalAttrs: {
       catap
       bobby285271
     ];
-    broken = stdenv.hostPlatform.isDarwin; # 91 is broken, >=115 requires SDK 13.3 (see #242666).
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0d7a513ec2cf3..446764babe3b4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2181,6 +2181,7 @@ mapAliases {
   # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
   spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17
   spidermonkey_78 = throw "'spidermonkey_78' has been removed because it was unused."; # Added 2025-02-02
+  spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26
   spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07
   spotify-unwrapped = spotify; # added 2022-11-06
   spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50805e2e28707..10ea8f8550022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6357,12 +6357,10 @@ with pkgs;
 
   inherit
     ({
-      spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { };
       spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { };
       spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { };
       spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { };
     })
-    spidermonkey_91
     spidermonkey_115
     spidermonkey_128
     spidermonkey_140

From 2dfb14a85a8de21c7221aa364785cf5598664171 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 29 Aug 2025 00:20:36 -0400
Subject: [PATCH 277/321] spidermonkey_140: relax SDK requirements for darwin

Upstream wants SDK 15.5, we only have 15.2, but that works fine.
---
 .../spidermonkey/140-relax-apple-sdk.patch          | 13 +++++++++++++
 .../interpreters/spidermonkey/common.nix            |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch

diff --git a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch b/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch
new file mode 100644
index 0000000000000..c6e28f11be2f1
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch
@@ -0,0 +1,13 @@
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+index 37c00230c853..dd89bea24392 100644
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
+     )
+ 
+     def mac_sdk_min_version():
+-        return "15.5"
++        return "15.2"
+ 
+     @depends(
+         "--with-macos-sdk",
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index beaf34f90777f..c0279b7feac33 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -68,6 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
         hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
       })
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "140" && stdenv.hostPlatform.isDarwin) [
+      ./140-relax-apple-sdk.patch
     ];
 
   nativeBuildInputs = [

From 168959b55be34131b7886cb34f82d56c1ed0f243 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 29 Aug 2025 15:38:31 +0200
Subject: [PATCH 278/321] cpython: disable pie on aarch64-linux minimal

The intermediate pythonMinimal build that uses the glibc from bootstrap
files cannot currently be built with PIE, because the Scrt.o startup
script is missing in there.
---
 pkgs/development/interpreters/python/cpython/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 35938794696a5..083c33cee8385 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -604,7 +604,8 @@ stdenv.mkDerivation (finalAttrs: {
       export CFLAGS_NODIST="-fno-semantic-interposition"
     '';
 
-  hardeningEnable = [ "pie" ];
+  # Our aarch64-linux bootstrap files lack Scrt1.o, which fails the config test
+  hardeningEnable = lib.optionals (!withMinimalDeps && !stdenv.hostPlatform.isAarch64) [ "pie" ];
 
   setupHook = python-setup-hook sitePackages;
 

From 9060afe0d61706f7def31ecb87d66458ed0b499e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 29 Aug 2025 12:30:48 +0800
Subject: [PATCH 279/321] uv: 0.8.13 -> 0.8.14

Release notes: https://github.com/astral-sh/uv/releases/tag/0.8.14
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 0123b748bcc36..0bfb67a0bdc96 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.13";
+  version = "0.8.14";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-U7Y3byjXxRpIZ2QS1QfZC51FF7PnyAKV0DKYC1LImzA=";
+    hash = "sha256-KG6WNaHbrPBasHdSdtWrnvzwMRrvpwukVSIZe3COrUA=";
   };
 
-  cargoHash = "sha256-NDWHG1yU1KFhvydVAO88YwDH+2rkH01S4Lxd1joWHFE=";
+  cargoHash = "sha256-Ow39kxnACXVbEtCPGJJ7SKdTFhYwd9IDPbYAsvNPOKw=";
 
   buildInputs = [
     rust-jemalloc-sys

From ca67e465912d568b5e797886a6d4a472f761e770 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 29 Aug 2025 20:56:23 +0800
Subject: [PATCH 280/321] spidermonkey_140: make apple-sdk patch unconditional

To prevent rotten patches.
---
 pkgs/development/interpreters/spidermonkey/common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index c0279b7feac33..03d9e687a7d1c 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -68,8 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
         hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
       })
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "140" && stdenv.hostPlatform.isDarwin) [
+      # SDK 15.5 is not available in nixpkgs yet
       ./140-relax-apple-sdk.patch
     ];
 

From 25277ab7d28e4059274545f88c0425076fb05d85 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 29 Aug 2025 20:59:26 +0800
Subject: [PATCH 281/321] spidermonkey_115: mark as broken on darwin again

This still does not build.

> DEBUG: Executing: `/nix/store/k4mvgh65zn6xb4f6zs9kypz4lq8sgmk3-clang-wrapper-19.1.7/bin/clang -isysroot /nix/store/qvbwadc5f7akpzaf3psd41wjl5jq8333-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.sdk -mmacosx-version-min=11.3 -std=gnu99 -fuse-ld=lld -Wl,--version`
> ERROR: Failed to find an adequate linker
---
 pkgs/development/interpreters/spidermonkey/common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index 03d9e687a7d1c..d2e542899540c 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -187,6 +187,8 @@ stdenv.mkDerivation (finalAttrs: {
       catap
       bobby285271
     ];
+    # ERROR: Failed to find an adequate linker
+    broken = lib.versionOlder version "128" && stdenv.hostPlatform.isDarwin;
     platforms = platforms.unix;
   };
 })

From 6e8f5691dbddf7c5ec696a6b648dbb773487b760 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 3 Aug 2025 13:05:45 +0200
Subject: [PATCH 282/321] meson: 1.8.3 -> 1.9.0

---
 pkgs/by-name/me/meson/001-fix-rpath.patch | 19 ++++++++++---------
 pkgs/by-name/me/meson/package.nix         |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/me/meson/001-fix-rpath.patch b/pkgs/by-name/me/meson/001-fix-rpath.patch
index 29bec7903ca98..ea72b869317bf 100644
--- a/pkgs/by-name/me/meson/001-fix-rpath.patch
+++ b/pkgs/by-name/me/meson/001-fix-rpath.patch
@@ -1,10 +1,11 @@
---- a/mesonbuild/backend/backends.py
-+++ b/mesonbuild/backend/backends.py
-@@ -723,6 +723,21 @@
-     @staticmethod
-     def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:
+diff --git a/mesonbuild/build.py b/mesonbuild/build.py
+index 9014d09fb..4dda63a96 100644
+--- a/mesonbuild/build.py
++++ b/mesonbuild/build.py
+@@ -1888,6 +1888,20 @@ class BuildTarget(Target):
+     def get_rpath_dirs_from_link_args(cls, args: T.List[str]) -> T.Set[str]:
          dirs: T.Set[str] = set()
-+
+ 
 +        nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
 +        next_is_path = False
 +        # Try to add rpaths set by user or ld-wrapper so that they are not removed.
@@ -19,6 +20,6 @@
 +                    dirs.add(flag)
 +                next_is_path = False
 +
-         # Match rpath formats:
-         # -Wl,-rpath=
-         # -Wl,-rpath,
+         for arg in args:
+             if not arg.startswith('-Wl,'):
+                 continue
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index ca0071b302311..52b186fcf432e 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -16,14 +16,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.8.3";
+  version = "1.9.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     tag = version;
-    hash = "sha256-Htjr/gZ4G53XY/kuGsbToZOo+ptDoNA737aaqDT1AUo=";
+    hash = "sha256-VMLcGtyJIH3jsTkHrIUhCpjwm6ljsRSyRECYhaafjD8=";
   };
 
   patches = [

From fd261cb09446b2c81d710d157e9e7c18c7e53d6d Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Sun, 24 Aug 2025 13:27:49 +0200
Subject: [PATCH 283/321] llvmPackages_{20,21}.libclc: reenable and update
 patches

---
 .../libclc/gnu-install-dirs.patch}            |  0
 .../llvm/20/libclc/use-default-paths.patch    | 22 +++++++++++++++++++
 .../llvm/21/libclc/gnu-install-dirs.patch     |  8 +++++++
 .../compilers/llvm/common/default.nix         |  2 +-
 .../compilers/llvm/common/libclc/default.nix  |  2 +-
 .../compilers/llvm/common/patches.nix         | 16 ++++++++++++++
 6 files changed, 48 insertions(+), 2 deletions(-)
 rename pkgs/development/compilers/llvm/{common/libclc/libclc-gnu-install-dirs.patch => 16/libclc/gnu-install-dirs.patch} (100%)
 create mode 100644 pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch
 create mode 100644 pkgs/development/compilers/llvm/21/libclc/gnu-install-dirs.patch

diff --git a/pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/libclc/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/16/libclc/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch b/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch
new file mode 100644
index 0000000000000..2fbcf56426d6f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch
@@ -0,0 +1,22 @@
+From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001
+From: Tristan Ross <tristan.ross@midstall.com>
+Date: Sat, 24 Aug 2024 19:56:24 -0700
+Subject: [PATCH] [libclc] use default paths with find_program when possible
+
+---
+ libclc/CMakeLists.txt | 4 ++--
+ 1 file changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 02bb859ae8590b..6bcd8ae52a5794 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI
+   # Import required tools
+   if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} )
+     foreach( tool IN ITEMS clang llvm-as llvm-link opt )
+-      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )
++      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} )
+       set( ${tool}_exe ${LLVM_TOOL_${tool}} )
+       set( ${tool}_target )
+     endforeach()
diff --git a/pkgs/development/compilers/llvm/21/libclc/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/21/libclc/gnu-install-dirs.patch
new file mode 100644
index 0000000000000..637e33d981ef1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/21/libclc/gnu-install-dirs.patch
@@ -0,0 +1,8 @@
+--- a/libclc.pc.in
++++ b/libclc.pc.in
+@@ -1,4 +1,4 @@
+-libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc
++libexecdir=@CMAKE_INSTALL_FULL_DATADIR@/clc
+ 
+ Name: libclc
+ Description: Library requirements of the OpenCL C programming language
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 2fc33f5263854..f5c478f88e135 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -484,7 +484,7 @@ let
     }
     //
       lib.optionalAttrs
-        (lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "20")
+        (lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "22")
         {
           libclc = callPackage ./libclc { };
         }
diff --git a/pkgs/development/compilers/llvm/common/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
index 5a3f7d4eba67b..cd407ccf4486d 100644
--- a/pkgs/development/compilers/llvm/common/libclc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    ./libclc-gnu-install-dirs.patch
+    (getVersionFile "libclc/gnu-install-dirs.patch")
   ]
   # LLVM 19 changes how host tools are looked up.
   # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program
diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix
index 4574dd6cea482..21eb8c4471c30 100644
--- a/pkgs/development/compilers/llvm/common/patches.nix
+++ b/pkgs/development/compilers/llvm/common/patches.nix
@@ -236,7 +236,23 @@
   "libclc/use-default-paths.patch" = [
     {
       after = "19";
+      before = "20";
       path = ../19;
     }
+    {
+      after = "20";
+      path = ../20;
+    }
+  ];
+  "libclc/gnu-install-dirs.patch" = [
+    {
+      after = "16";
+      before = "21";
+      path = ../16;
+    }
+    {
+      after = "21";
+      path = ../21;
+    }
   ];
 }

From f86a07aba80db5dac364aa8dbac8b8747da81ace Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Wed, 27 Aug 2025 20:04:16 +0200
Subject: [PATCH 284/321] llvmPackages.libclc: replace lib.optional with
 lib.optionals

---
 pkgs/development/compilers/llvm/common/libclc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/common/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
index cd407ccf4486d..20e79473426d9 100644
--- a/pkgs/development/compilers/llvm/common/libclc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     python3
   ]
-  ++ lib.optional (lib.versionAtLeast release_version "19") [
+  ++ lib.optionals (lib.versionAtLeast release_version "19") [
     clang-only
     buildLlvmTools.llvm
     spirv-llvm-translator

From c027c69af94844208bc94c00d45e4d95e2105f68 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 29 Aug 2025 21:42:18 +0100
Subject: [PATCH 285/321] rl-2511: add note on addition of glibcxxassertions
 hardening flag

---
 doc/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 316d034553bb0..06a9af3df4192 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -140,6 +140,8 @@
 - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables.
   If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`.
 
+- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
+
 - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.
 
 

From 1e7ed3e27d41154fb28170f3f477bbf3cb988ac8 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 18 Aug 2025 15:29:51 +0200
Subject: [PATCH 286/321] nodejs: fix hardcoded values in GYP script

---
 .../nodejs/bypass-darwin-xcrun-node16.patch   | 76 -------------------
 ...p-patches-set-fallback-value-for-CLT.patch | 25 ++++++
 pkgs/development/web/nodejs/gyp-patches.nix   |  8 +-
 pkgs/development/web/nodejs/v20.nix           | 18 ++++-
 pkgs/development/web/nodejs/v22.nix           | 11 ++-
 pkgs/development/web/nodejs/v24.nix           | 19 ++---
 6 files changed, 65 insertions(+), 92 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch
 create mode 100644 pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch

diff --git a/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch b/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch
deleted file mode 100644
index ba998c0510be0..0000000000000
--- a/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Avoids needing xcrun or xcodebuild in PATH for native package builds
-
---- a/tools/gyp/pylib/gyp/xcode_emulation.py
-+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
-@@ -522,7 +522,13 @@ class XcodeSettings:
-         # Since the CLT has no SDK paths anyway, returning None is the
-         # most sensible route and should still do the right thing.
-         try:
--            return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
-+            #return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
-+            return {
-+                "--show-sdk-platform-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform",
-+                "--show-sdk-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
-+                "--show-sdk-build-version": "19A547",
-+                "--show-sdk-version": "10.15"
-+            }[infoitem]
-         except GypError:
-             pass
- 
-@@ -1499,7 +1505,8 @@ def XcodeVersion():
-     version = ""
-     build = ""
-     try:
--        version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
-+        #version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
-+        version_list = []
-         # In some circumstances xcodebuild exits 0 but doesn't return
-         # the right results; for example, a user on 10.7 or 10.8 with
-         # a bogus path set via xcode-select
-@@ -1510,7 +1517,8 @@ def XcodeVersion():
-         version = version_list[0].split()[-1]  # Last word on first line
-         build = version_list[-1].split()[-1]  # Last word on last line
-     except GypError:  # Xcode not installed so look for XCode Command Line Tools
--        version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
-+        #version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
-+        version = "11.0.0.0.1.1567737322"
-         if not version:
-             raise GypError("No Xcode or CLT version detected!")
-     # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-@@ -522,7 +522,13 @@ class XcodeSettings:
-         # Since the CLT has no SDK paths anyway, returning None is the
-         # most sensible route and should still do the right thing.
-         try:
--            return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
-+            #return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
-+            return {
-+                "--show-sdk-platform-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform",
-+                "--show-sdk-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
-+                "--show-sdk-build-version": "19A547",
-+                "--show-sdk-version": "10.15"
-+            }[infoitem]
-         except GypError:
-             pass
- 
-@@ -1499,7 +1505,8 @@ def XcodeVersion():
-     version = ""
-     build = ""
-     try:
--        version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
-+        #version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
-+        version_list = []
-         # In some circumstances xcodebuild exits 0 but doesn't return
-         # the right results; for example, a user on 10.7 or 10.8 with
-         # a bogus path set via xcode-select
-@@ -1510,7 +1517,8 @@ def XcodeVersion():
-         version = version_list[0].split()[-1]  # Last word on first line
-         build = version_list[-1].split()[-1]  # Last word on last line
-     except GypError:  # Xcode not installed so look for XCode Command Line Tools
--        version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
-+        #version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
-+        version = "11.0.0.0.1.1567737322"
-         if not version:
-             raise GypError("No Xcode or CLT version detected!")
-     # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
diff --git a/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch
new file mode 100644
index 0000000000000..cf094fdacc46a
--- /dev/null
+++ b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT.patch
@@ -0,0 +1,25 @@
+Sandboxed builds need a fallback value for the version of the Command Line Tools
+being used.
+
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py
+@@ -1552,7 +1552,7 @@ def CLTVersion():
+         output = GetStdout(["/usr/sbin/softwareupdate", "--history"])
+         return re.search(regex, output).groupdict()["version"]
+     except (GypError, OSError):
+-        return None
++        return "11.0.0.0.1.1567737322"
+ 
+ 
+ def GetStdoutQuiet(cmdlist):
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+@@ -1552,7 +1552,7 @@ def CLTVersion():
+         output = GetStdout(["/usr/sbin/softwareupdate", "--history"])
+         return re.search(regex, output).groupdict()["version"]
+     except (GypError, OSError):
+-        return None
++        return "11.0.0.0.1.1567737322"
+ 
+ 
+ def GetStdoutQuiet(cmdlist):
diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
index 9b8f98f0630fb..b1d074df437f8 100644
--- a/pkgs/development/web/nodejs/gyp-patches.nix
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -5,15 +5,13 @@
   patch_tools ? true,
 }:
 let
-  url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
+  url = "https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.patch?full_index=1";
 in
 lib.optionals patch_tools ([
   # Fixes builds with Nix sandbox on Darwin for gyp.
-  # See https://github.com/NixOS/nixpkgs/issues/261820
-  # and https://github.com/nodejs/gyp-next/pull/216
   (fetchpatch2 {
     inherit url;
-    hash = "sha256-iV9qvj0meZkgRzFNur2v1jtLZahbqvSJ237NoM8pPZc=";
+    hash = "sha256-kvCMpedjrY64BlaC1R0NVjk/vIVivYAGVgWwMEGeP6k=";
     stripLen = 1;
     extraPrefix = "tools/gyp/";
   })
@@ -21,7 +19,7 @@ lib.optionals patch_tools ([
 ++ lib.optionals patch_npm ([
   (fetchpatch2 {
     inherit url;
-    hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo=";
+    hash = "sha256-cXTwmCRHrNhuY1+3cD/EvU0CJ+1Nk4TRh6c3twvfaW8=";
     stripLen = 1;
     extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
   })
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index a00dccfaf9689..90fe7f8b112ac 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -13,7 +13,24 @@ let
   };
 
   gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    # Fixes builds with Nix sandbox on Darwin for gyp.
+    # See https://github.com/NixOS/nixpkgs/issues/261820
+    # and https://github.com/nodejs/gyp-next/pull/216
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
+      hash = "sha256-iV9qvj0meZkgRzFNur2v1jtLZahbqvSJ237NoM8pPZc=";
+      stripLen = 1;
+      extraPrefix = "tools/gyp/";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch?full_index=1";
+      hash = "sha256-1iyeeAprmWpmLafvOOXW45iZ4jWFSloWJxQ0reAKBOo=";
+      stripLen = 1;
+      extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
+    })
+
     ./gyp-patches-pre-v22-import-sys.patch
+    ./gyp-patches-set-fallback-value-for-CLT.patch
   ];
 in
 buildNodejs {
@@ -24,7 +41,6 @@ buildNodejs {
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
-    ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
 
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 47cb3f1702dd3..21c70e049faad 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -14,6 +14,15 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches =
+    if stdenv.buildPlatform.isDarwin then
+      callPackage ./gyp-patches.nix { }
+      ++ [
+        ./gyp-patches-set-fallback-value-for-CLT.patch
+      ]
+    else
+      [ ];
 in
 buildNodejs {
   inherit enableNpm;
@@ -44,10 +53,10 @@ buildNodejs {
         hash = "sha256-hSTLljmVzYmc3WAVeRq9EPYluXGXFeWVXkykufGQPVw=";
       })
     ]
+    ++ gypPatches
     ++ [
       ./configure-armv6-vfpv2.patch
       ./disable-darwin-v8-system-instrumentation-node19.patch
-      ./bypass-darwin-xcrun-node16.patch
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 3e4a128d368be..99ba1a30a3088 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -14,6 +14,15 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches =
+    if stdenv.buildPlatform.isDarwin then
+      callPackage ./gyp-patches.nix { patch_tools = false; }
+      ++ [
+        ./gyp-patches-set-fallback-value-for-CLT.patch
+      ]
+    else
+      [ ];
 in
 buildNodejs {
   inherit enableNpm;
@@ -50,16 +59,8 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
-
-      # TODO: newer GYP versions have been patched to be more compatible with Nix sandbox. We need
-      # to adapt our patch to this newer version, see https://github.com/NixOS/nixpkgs/pull/434742.
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/886e4b3b534a9f3ad2facbc99097419e06615900.patch?full_index=1";
-        hash = "sha256-HFTabl92NPkBwXD0mUGDN+Gzabyi+Ph0kL0FEHHknbk=";
-        revert = true;
-      })
-      ./bypass-darwin-xcrun-node16.patch
     ]
+    ++ gypPatches
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
       # test-icu-env is failing without the reverts
       (fetchpatch2 {

From 8fd955d8599f86bc1f0dd89fae07ef6600e4a8d0 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Fri, 29 Aug 2025 08:25:04 +0200
Subject: [PATCH 287/321] nodejs_20: fix build on staging

---
 pkgs/development/web/nodejs/v20.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index a00dccfaf9689..a84a43edcf4d3 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -29,6 +29,11 @@ buildNodejs {
     ./use-correct-env-in-tests.patch
 
     # TODO: remove when included in a release
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/8caa1dcee63b2c6fd7a9edf9b9a6222b38a2cf62.patch?full_index=1";
+      hash = "sha256-DtN0bpYfo5twHz2GrLLgq4Bu2gFYTkNPMRKhrgeYRyA=";
+      includes = [ "test/parallel/test-setproctitle.js" ];
+    })
     (fetchpatch2 {
       url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
       hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";

From a70ae6cd7f6cdd9567ff6e08ec59d5bad9fd35ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 30 Aug 2025 02:12:53 +0200
Subject: [PATCH 288/321] python3Packages.setuptools-rust: 1.11.1 -> 1.12.0

Changelog: https://github.com/PyO3/setuptools-rust/releases/tag/v1.12.0
---
 pkgs/development/python-modules/setuptools-rust/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 8f24a43562526..087e5026c33b7 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -11,13 +11,11 @@
   setuptools,
   setuptools-rust,
   setuptools-scm,
-  tomli,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "setuptools-rust";
-  version = "1.11.1";
+  version = "1.12.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "setuptools_rust";
     inherit version;
-    hash = "sha256-favEOSJSztMUuAUNYyduBf3F0yOY/H08zh9qasNbdsA=";
+    hash = "sha256-2UqT8Ml3UcFwFFZfB73DJL7kXTls0buoPY56+SuUXww=";
   };
 
   build-system = [

From cbb3c85f0eec1174ea20fe7706a75583a4c2e97f Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Thu, 10 Jul 2025 20:32:11 -0500
Subject: [PATCH 289/321] nodejs: drop v8 instrumentation patch

This is no longer needed now that apple-sdk_11 is the default SDK.
---
 ...darwin-v8-system-instrumentation-node19.patch | 16 ----------------
 pkgs/development/web/nodejs/v20.nix              |  1 -
 pkgs/development/web/nodejs/v22.nix              |  1 -
 pkgs/development/web/nodejs/v24.nix              |  1 -
 4 files changed, 19 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation-node19.patch

diff --git a/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation-node19.patch b/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation-node19.patch
deleted file mode 100644
index 5d56af7849733..0000000000000
--- a/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation-node19.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Disable v8 system instrumentation on Darwin
-
-On Darwin, the v8 system instrumentation requires the header "os/signpost.h"
-which is available since apple_sdk 11+. See: https://github.com/nodejs/node/issues/39584
-
---- old/tools/v8_gypfiles/features.gypi
-+++ new/tools/v8_gypfiles/features.gypi
-@@ -62,7 +62,7 @@
-       }, {
-         'is_component_build': 0,
-       }],
--      ['OS == "win" or OS == "mac"', {
-+      ['OS == "win"', {
-         # Sets -DENABLE_SYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing
-         'v8_enable_system_instrumentation': 1,
-       }, {
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 2323931f99cd3..c79e37c98c39b 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -40,7 +40,6 @@ buildNodejs {
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
-    ./disable-darwin-v8-system-instrumentation-node19.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
 
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 21c70e049faad..0ad029f5a1531 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -56,7 +56,6 @@ buildNodejs {
     ++ gypPatches
     ++ [
       ./configure-armv6-vfpv2.patch
-      ./disable-darwin-v8-system-instrumentation-node19.patch
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 99ba1a30a3088..b8fd3ce679c5c 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -55,7 +55,6 @@ buildNodejs {
     ]
     ++ [
       ./configure-armv6-vfpv2.patch
-      ./disable-darwin-v8-system-instrumentation-node19.patch
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch

From 1bc6e6c0954a2089f067fac8cc43fa65a7d204cc Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Thu, 10 Jul 2025 20:45:15 -0500
Subject: [PATCH 290/321] nodejs: use sigtool's codesign in
 test-macos-app-sandbox

test-macos-app-sandbox uses the system-provided codesign binary
(/usr/bin/codesign) to apply entitlements to an app bundle. This fails
in the sandbox as /usr/bin/codesign is not accessible. Patch the test to
instead use the codesign binary from sigtool. The test was updated to
pass the executable path to codesign as sigtool can't handle the bundle
path.
---
 pkgs/development/web/nodejs/nodejs.nix         |  8 +++++++-
 .../web/nodejs/use-nix-codesign.patch          | 18 ++++++++++++++++++
 pkgs/development/web/nodejs/v20.nix            |  1 +
 pkgs/development/web/nodejs/v22.nix            |  1 +
 pkgs/development/web/nodejs/v24.nix            |  1 +
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/web/nodejs/use-nix-codesign.patch

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b4192a98008b2..08f159b3fbd0b 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -28,6 +28,7 @@
   runtimeShell,
   gnupg,
   installShellFiles,
+  darwin,
 }:
 
 {
@@ -298,6 +299,11 @@ let
 
       inherit patches;
 
+      postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+        substituteInPlace test/parallel/test-macos-app-sandbox.js \
+          --subst-var-by codesign '${darwin.sigtool}/bin/codesign'
+      '';
+
       __darwinAllowLocalNetworking = true; # for tests
 
       doCheck = canExecute;
@@ -391,7 +397,7 @@ let
             ]
             ++ lib.optionals stdenv.buildPlatform.isDarwin [
               # Disable tests that don’t work under macOS sandbox.
-              "test-macos-app-sandbox"
+              # uv_os_setpriority returned EPERM (operation not permitted)
               "test-os"
               "test-os-process-priority"
 
diff --git a/pkgs/development/web/nodejs/use-nix-codesign.patch b/pkgs/development/web/nodejs/use-nix-codesign.patch
new file mode 100644
index 0000000000000..3d95a000d5e29
--- /dev/null
+++ b/pkgs/development/web/nodejs/use-nix-codesign.patch
@@ -0,0 +1,18 @@
+diff --git a/test/parallel/test-macos-app-sandbox.js b/test/parallel/test-macos-app-sandbox.js
+index 60ad67b3db..b6ac0dcef4 100644
+--- a/test/parallel/test-macos-app-sandbox.js
++++ b/test/parallel/test-macos-app-sandbox.js
+@@ -45,11 +45,11 @@ fs.copyFileSync(
+ 
+ // Sign the app bundle with sandbox entitlements:
+ assert.strictEqual(
+-  child_process.spawnSync('/usr/bin/codesign', [
++  child_process.spawnSync('@codesign@', [
+     '--entitlements', fixtures.path(
+       'macos-app-sandbox', 'node_sandboxed.entitlements'),
+     '--force', '-s', '-',
+-    appBundlePath,
++    appExecutablePath,
+   ]).status,
+   0);
+ 
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index c79e37c98c39b..56fc4c4ac2c6e 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -42,6 +42,7 @@ buildNodejs {
     ./configure-armv6-vfpv2.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
+    ./use-nix-codesign.patch
 
     # TODO: remove when included in a release
     (fetchpatch2 {
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 0ad029f5a1531..49066f95d19a1 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -59,6 +59,7 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
+      ./use-nix-codesign.patch
 
       # TODO: remove when included in a release
       (fetchpatch2 {
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index b8fd3ce679c5c..4982172f2ef29 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -58,6 +58,7 @@ buildNodejs {
       ./node-npm-build-npm-package-logic.patch
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
+      ./use-nix-codesign.patch
     ]
     ++ gypPatches
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [

From 8362b1826bfcf4c599adf9f06c593389f76ad930 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Thu, 10 Jul 2025 14:08:47 -0500
Subject: [PATCH 291/321] nodejs: fix `checkPhase` with `sandbox=relaxed` on
 Darwin

The following tests fail on Darwin with the sandbox enabled [1]:

not ok 2612 parallel/test-runner-output
not ok 3053 parallel/test-tls-get-ca-certificates-system
not ok 3054 parallel/test-tls-get-ca-certificates-system-without-flag
not ok 3363 parallel/test-watch-file-shared-dependency
not ok 4057 parallel/test-runner-complex-dependencies
not ok 4058 parallel/test-runner-global-setup-watch-mode
not ok 4228 sequential/test-watch-mode-watch-flags

Node.js uses Security.framework to read the system CA certificates from
the system keychain on Darwin. Fix the tls-get-ca-certificates-system
tests by adding the files and Mach services used by Security.framework
to the sandbox profile. Also allow the FSEvents Mach service as the
runner and watch tests use FSEvents on Darwin.

[1]: https://gist.github.com/al3xtjames/0eb3c30d37c1ebab99968c62ee544300
---
 pkgs/development/web/nodejs/nodejs.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 08f159b3fbd0b..316e7af9550bc 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -427,6 +427,27 @@ let
         }"
       ];
 
+      sandboxProfile = ''
+        (allow file-read*
+          (literal "/Library/Keychains/System.keychain")
+          (literal "/private/var/db/mds/system/mdsDirectory.db")
+          (literal "/private/var/db/mds/system/mdsObject.db"))
+
+        ; Allow files written by Module Directory Services (MDS), which is used
+        ; by Security.framework: https://apple.stackexchange.com/a/411476
+        ; These rules are based on the system sandbox profiles found in
+        ; /System/Library/Sandbox/Profiles.
+        (allow file-write*
+          (regex #"^/private/var/folders/[^/]+/[^/]+/C/mds/mdsDirectory\.db$")
+          (regex #"^/private/var/folders/[^/]+/[^/]+/C/mds/mdsObject\.db_?$")
+          (regex #"^/private/var/folders/[^/]+/[^/]+/C/mds/mds\.lock$"))
+
+        (allow mach-lookup
+          (global-name "com.apple.FSEvents")
+          (global-name "com.apple.SecurityServer")
+          (global-name "com.apple.system.opendirectoryd.membership"))
+      '';
+
       postInstall =
         let
           # nodejs_18 does not have node_js2c, and we don't want to rebuild the other ones

From 39df3445b6f2255a206a56e65ad9a5b08744ed1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 15 Aug 2025 01:31:42 +0200
Subject: [PATCH 292/321] python3Packages.tkinter: build standalone from python
 source tree

Why? python3Full must die.
---
 .../python-modules/tkinter/default.nix        | 106 ++++++++++++++----
 .../python-modules/tkinter/pyproject.toml     |  16 +++
 pkgs/top-level/python-packages.nix            |  11 +-
 3 files changed, 108 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/tkinter/pyproject.toml

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index f1fe4d1a0b252..afc6d765a4986 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -1,34 +1,91 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
+  replaceVars,
+  setuptools,
   python,
-  py,
-  isPyPy,
+  pythonOlder,
+  tcl,
+  tclPackages,
+  tk,
+  tkinter,
+  xvfb-run,
 }:
 
 buildPythonPackage {
   pname = "tkinter";
   version = python.version;
-  src = py;
-  format = "other";
-
-  # tkinter is included in PyPy, making this package a no-op.
-  installPhase = lib.optionalString (!isPyPy) (
-    ''
-      # Move the tkinter module
-      mkdir -p $out/${py.sitePackages}
-      mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      # Update the rpath to point to python without x11Support
-      old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
-      new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
-      patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
-    ''
-  );
-
-  meta = py.meta // {
+  pyproject = true;
+
+  src = python.src;
+
+  prePatch = ''
+    mkdir $NIX_BUILD_TOP/tkinter
+
+    # copy the module bits and pieces from the python source
+    cp -v  Modules/{_tkinter.c,tkinter.h} ../tkinter/
+    cp -rv Modules/clinic ../tkinter/
+    cp -rv Lib/tkinter ../tkinter/
+
+    pushd $NIX_BUILD_TOP/tkinter
+
+    # install our custom pyproject.toml
+    cp ${
+      replaceVars ./pyproject.toml {
+        python_version = python.version;
+        python_internal_dir = "${python}/include/${python.libPrefix}/internal";
+      }
+    } ./pyproject.toml
+
+  ''
+  + lib.optionalString (pythonOlder "3.13") ''
+    substituteInPlace "tkinter/tix.py" --replace-fail \
+      "os.environ.get('TIX_LIBRARY')" \
+      "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
+  '';
+
+  build-system = [ setuptools ];
+
+  buildInputs = [
+    tcl
+    tk
+  ];
+
+  env = {
+    TCLTK_LIBS = toString [
+      "-L${lib.getLib tcl}/lib"
+      "-L${lib.getLib tk}/lib"
+      "-l${tcl.libPrefix}"
+      "-l${tk.libPrefix}"
+    ];
+    TCLTK_CFLAGS = toString [
+      "-I${lib.getDev tcl}/include"
+      "-I${lib.getDev tk}/include"
+    ];
+  };
+
+  doCheck = false;
+
+  nativeCheckInputs = [ xvfb-run ];
+
+  preCheck = ''
+    cd $NIX_BUILD_TOP/Python-*/Lib
+    export HOME=$TMPDIR
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
+      python -m unittest test.test_tkinter
+
+    runHook postCheck
+  '';
+
+  passthru.tests.unittests = tkinter.overridePythonAttrs { doCheck = true; };
+
+  pythonImportsCheck = [ "tkinter" ];
+
+  meta = {
     # Based on first sentence from https://docs.python.org/3/library/tkinter.html
     description = "Standard Python interface to the Tcl/Tk GUI toolkit";
     longDescription = ''
@@ -52,5 +109,10 @@ buildPythonPackage {
       these additions and changes, and refer to the official Tcl/Tk
       documentation for details that are unchanged.
     '';
+    homepage = "https://docs.python.org/3/library/tkinter.html";
+    inherit (python.meta)
+      license
+      maintainers
+      ;
   };
 }
diff --git a/pkgs/development/python-modules/tkinter/pyproject.toml b/pkgs/development/python-modules/tkinter/pyproject.toml
new file mode 100644
index 0000000000000..770331a7ef4f5
--- /dev/null
+++ b/pkgs/development/python-modules/tkinter/pyproject.toml
@@ -0,0 +1,16 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "tkinter"
+version = "@python_version@"
+description = "Tkinter."
+requires-python = ">=@python_version@"
+
+[tool.setuptools]
+packages = ["tkinter"]
+ext-modules = [
+  { name = "_tkinter", sources = ["_tkinter.c"], libraries = ["tcl9.0", "tcl9tk9.0"], include-dirs = ["@python_internal_dir@/"] }
+]
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50e54ac9c3abd..e301ac57187df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18290,9 +18290,14 @@ self: super: with self; {
 
   tivars = callPackage ../development/python-modules/tivars { };
 
-  tkinter = callPackage ../development/python-modules/tkinter {
-    py = python.override (lib.optionalAttrs (!python.isPyPy) { x11Support = true; });
-  };
+  tkinter =
+    if isPyPy then
+      null
+    else
+      callPackage ../development/python-modules/tkinter {
+        tcl = pkgs.tcl-9_0;
+        tk = pkgs.tk-9_0;
+      };
 
   tkinter-gl = callPackage ../development/python-modules/tkinter-gl { };
 

From bba34e2f19e3789a1564753aed7480487ab70aca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 28 Aug 2025 22:41:47 +0200
Subject: [PATCH 293/321] cpython: remove x11support

This is required for tkinter, which we now build standalone as tkinter
in the python package set.
---
 .../interpreters/python/cpython/default.nix   | 23 -------------------
 pkgs/top-level/all-packages.nix               |  6 -----
 2 files changed, 29 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 083c33cee8385..9feaf2a57f063 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -47,12 +47,6 @@
   gdbm,
   withReadline ? !withMinimalDeps && !stdenv.hostPlatform.isWindows,
   readline,
-  x11Support ? false,
-  tcl,
-  tk,
-  tclPackages,
-  libX11,
-  xorgproto,
 
   # splicing/cross
   pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}",
@@ -114,8 +108,6 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-assert x11Support -> tcl != null && tk != null && xorgproto != null && libX11 != null;
-
 assert bluezSupport -> bluez != null;
 
 assert lib.assertMsg (
@@ -280,12 +272,6 @@ let
     ++ optionals withReadline [
       readline
     ]
-    ++ optionals x11Support [
-      libX11
-      tcl
-      tk
-      xorgproto
-    ]
   );
 
   hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@@ -446,11 +432,6 @@ stdenv.mkDerivation (finalAttrs: {
     + optionalString mimetypesSupport ''
       substituteInPlace Lib/mimetypes.py \
         --replace-fail "@mime-types@" "${mailcap}"
-    ''
-    + optionalString (pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) ''
-      substituteInPlace "Lib/tkinter/tix.py" --replace-fail \
-        "os.environ.get('TIX_LIBRARY')" \
-        "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
     '';
 
   env = {
@@ -581,10 +562,6 @@ stdenv.mkDerivation (finalAttrs: {
         if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"
       }'
   ''
-  + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
-    export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
-    export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
-  ''
   + optionalString stdenv.hostPlatform.isWindows ''
     export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
   ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b877a611f968..54dd9f502ab92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6206,37 +6206,31 @@ with pkgs;
     self = python3Full;
     pythonAttr = "python3Full";
     bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-    x11Support = true;
   };
   python310Full = python310.override {
     self = python310Full;
     pythonAttr = "python310Full";
     bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-    x11Support = true;
   };
   python311Full = python311.override {
     self = python311Full;
     pythonAttr = "python311Full";
     bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-    x11Support = true;
   };
   python312Full = python312.override {
     self = python312Full;
     pythonAttr = "python312Full";
     bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-    x11Support = true;
   };
   python313Full = python313.override {
     self = python313Full;
     pythonAttr = "python313Full";
     bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-    x11Support = true;
   };
   python314Full = python314.override {
     self = python314Full;
     pythonAttr = "python314Full";
     bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-    x11Support = true;
   };
 
   # https://py-free-threading.github.io

From fb9155a57662b9c1bbcb7d79fcbe9b1cdcff70dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 29 Aug 2025 01:50:59 +0200
Subject: [PATCH 294/321] bluez-headers: expose bluez header files

This escapes infinite recursion, because Python cannot depend on bluez
due to infinite recursion on multiple paths. But it only wants
bluetooth.h at build time, so this is sufficient.

In 5.84 the source path changes from lib/ to lib/bluetooth, which will
require an update to the install phase.
---
 pkgs/by-name/bl/bluez-headers/package.nix | 44 +++++++++++++++++++++++
 pkgs/by-name/bl/bluez/package.nix         | 21 ++---------
 2 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/by-name/bl/bluez-headers/package.nix

diff --git a/pkgs/by-name/bl/bluez-headers/package.nix b/pkgs/by-name/bl/bluez-headers/package.nix
new file mode 100644
index 0000000000000..e9ee013982e53
--- /dev/null
+++ b/pkgs/by-name/bl/bluez-headers/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
+
+# This package only provides the bluetooth headers from the bluez package
+# for consumption in Python, which cannot consume bluez.dev due to multiple
+# infinite recursion paths.
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bluez-headers";
+  version = "5.83";
+
+  # This package has the source, because of the emulatorAvailable check in the
+  # bluez function args, that causes an infinite recursion with Python on cross
+  # builds.
+  src = fetchurl {
+    url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
+    hash = "sha256-EIUi2QnSIFgTmb/sk9qrYgNVOc7vPdo+eZcHhcY70kw=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/include/bluetooth
+    cp -v lib/*.h "$out/include/bluetooth/"
+  '';
+
+  meta = {
+    homepage = "https://www.bluez.org/";
+    description = "Official Linux Bluetooth protocol stack";
+    changelog = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog?h=${finalAttrs.version}";
+    license = with lib.licenses; [
+      bsd2
+      gpl2Plus
+      lgpl21Plus
+      mit
+    ];
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 7b11f0fefbec2..8228902a3c383 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   alsa-lib,
   autoreconfHook,
+  bluez-headers,
   dbus,
   docutils,
   ell,
@@ -28,12 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bluez";
-  version = "5.83";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EIUi2QnSIFgTmb/sk9qrYgNVOc7vPdo+eZcHhcY70kw=";
-  };
+  inherit (bluez-headers) version src;
 
   patches = [
     (fetchurl {
@@ -186,18 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
     url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git";
   };
 
-  meta = {
-    homepage = "https://www.bluez.org/";
-    description = "Official Linux Bluetooth protocol stack";
-    changelog = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog?h=${finalAttrs.version}";
-    license = with lib.licenses; [
-      bsd2
-      gpl2Plus
-      lgpl21Plus
-      mit
-    ];
+  meta = bluez-headers.meta // {
     mainProgram = "btinfo";
-    maintainers = with lib.maintainers; [ ];
-    platforms = lib.platforms.linux;
   };
 })

From 251d713d0cf1e5b40ca304e6a335e705ee6ede1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 29 Aug 2025 01:52:41 +0200
Subject: [PATCH 295/321] cpython: build with bluetooth support in default
 build

Closes: #341001
---
 .../interpreters/python/cpython/default.nix           | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 9feaf2a57f063..0b2a3e1a59d8d 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -38,8 +38,8 @@
   windows,
 
   # optional dependencies
-  bluezSupport ? false,
-  bluez,
+  bluezSupport ? !withMinimalDeps && stdenv.hostPlatform.isLinux,
+  bluez-headers,
   mimetypesSupport ? !withMinimalDeps,
   mailcap,
   tzdata,
@@ -108,8 +108,6 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-assert bluezSupport -> bluez != null;
-
 assert lib.assertMsg (
   enableFramework -> stdenv.hostPlatform.isDarwin
 ) "Framework builds are only supported on Darwin.";
@@ -155,8 +153,7 @@ let
   passthru =
     let
       # When we override the interpreter we also need to override the spliced versions of the interpreter
-      # bluez is excluded manually to break an infinite recursion.
-      inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs;
+      inputs' = lib.filterAttrs (n: v: n != "passthruFun" && !lib.isDerivation v) inputs;
       # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.
       # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming
       # __splices as an arg and using the cache if populated.
@@ -257,7 +254,7 @@ let
       zstd
     ]
     ++ optionals bluezSupport [
-      bluez
+      bluez-headers
     ]
     ++ optionals stdenv.hostPlatform.isMinGW [
       windows.dlfcn

From 1051e7f28f0b072fe9a9a81d183b688f57cbce5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 29 Aug 2025 02:01:17 +0200
Subject: [PATCH 296/321] openfreebuds: move to default python

The default python now provides bluetooth support.
---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54dd9f502ab92..135449988a439 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15662,10 +15662,6 @@ with pkgs;
     flutter = flutter324;
   };
 
-  openfreebuds = callPackage ../by-name/op/openfreebuds/package.nix {
-    python3Packages = python3Full.pkgs;
-  };
-
   davis = callPackage ../by-name/da/davis/package.nix {
     php = php83; # https://github.com/tchapi/davis/issues/195
   };

From 2877deb8526b39152310af2e1502f8f2e885eab3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 29 Aug 2025 02:02:07 +0200
Subject: [PATCH 297/321] python3Full: drop

Bluetooth support is now built into the default build. The X11 support is
realized outside the Python interpreter by including the tkinter module
from the package set.
---
 doc/release-notes/rl-2511.section.md |  2 ++
 pkgs/top-level/aliases.nix           |  6 ++++++
 pkgs/top-level/all-packages.nix      | 30 ----------------------------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 06a9af3df4192..41138863701c5 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -50,6 +50,8 @@
 
 - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
 
+- `python3Full` and its versioned attributes (python3xxFull) have been removed. Bluetooth support is now enabled in the default python3 attributes. The X11 support built the tkinter module, which is available as a dedicated attribute on the package set.
+
 - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env".
 
 - The default Android NDK version has been raised to 27, and the default SDK version to 35.
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8183554c6803a..be16e2f86ef9e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1985,6 +1985,12 @@ mapAliases {
   python = python2; # Added 2022-01-11
   python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
   pythonFull = python2Full; # Added 2022-01-11
+  python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
   pythonPackages = python.pkgs; # Added 2022-01-11
   pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 135449988a439..3db91d436627a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6202,36 +6202,6 @@ with pkgs;
     pythonAttr = "python27Full";
     x11Support = true;
   };
-  python3Full = python3.override {
-    self = python3Full;
-    pythonAttr = "python3Full";
-    bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-  };
-  python310Full = python310.override {
-    self = python310Full;
-    pythonAttr = "python310Full";
-    bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-  };
-  python311Full = python311.override {
-    self = python311Full;
-    pythonAttr = "python311Full";
-    bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-  };
-  python312Full = python312.override {
-    self = python312Full;
-    pythonAttr = "python312Full";
-    bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-  };
-  python313Full = python313.override {
-    self = python313Full;
-    pythonAttr = "python313Full";
-    bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-  };
-  python314Full = python314.override {
-    self = python314Full;
-    pythonAttr = "python314Full";
-    bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez;
-  };
 
   # https://py-free-threading.github.io
   python313FreeThreading = python313.override {

From 566b38d4acd2ad4f02b164a924e0db07bcb7b0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 30 Aug 2025 18:00:00 +0200
Subject: [PATCH 298/321] doc/redirects.json: amend mismerge from the parent
 commit

---
 doc/redirects.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index ebfcf755d0168..eb2904ce9c7b0 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -625,9 +625,9 @@
   "typst-package-scope-and-usage": [
     "index.html#typst-package-scope-and-usage"
   ],
-  ],
   "var-go-buildTestBinaries": [
     "index.html#var-go-buildTestBinaries"
+  ],
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],

From cd13923e4e961324c8174eb6f2197d7f4d6a641b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 30 Aug 2025 22:16:34 +0300
Subject: [PATCH 299/321] perl540Packages.AlienBuild: don't patchShebangs

Breaks tests
---
 pkgs/top-level/perl-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ab0ef9f47391e..31922c7deb181 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -346,6 +346,10 @@ with self;
       url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.80.tar.gz";
       hash = "sha256-2e3JNrBnBbtcte5aLqi89hEaPogVkU8XfhXjwP7TAfM=";
     };
+
+    # override default postPatch to avoid patchShebangs breaking tests
+    postPatch = "";
+
     propagatedBuildInputs = [
       CaptureTiny
       FFICheckLib

From 11326949fa4606fa2adc861464c05fb93f51119c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 30 Aug 2025 23:49:32 +0200
Subject: [PATCH 300/321] bluez: fix meta.position

---
 pkgs/by-name/bl/bluez/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 8228902a3c383..931888bae65d1 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -182,7 +182,15 @@ stdenv.mkDerivation (finalAttrs: {
     url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git";
   };
 
-  meta = bluez-headers.meta // {
+  meta = {
     mainProgram = "btinfo";
+    inherit (bluez-headers.meta)
+      changelog
+      description
+      homepage
+      license
+      maintainers
+      platforms
+      ;
   };
 })

From cd1056f280e55fa8960559ec61576e537b1e8dbc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 31 Aug 2025 08:47:29 +0300
Subject: [PATCH 301/321] python313Packages.proto-plus: ignore more warnings

---
 pkgs/development/python-modules/proto-plus/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix
index 13120930f0b18..f211febbe5c4e 100644
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -34,6 +34,8 @@ buildPythonPackage rec {
   pytestFlags = [
     # pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
     "-Wignore::DeprecationWarning"
+    # float_precision option is deprecated for json_format error with latest protobuf
+    "-Wignore:float_precision:UserWarning"
   ];
 
   pythonImportsCheck = [ "proto" ];

From 5f65e4580d18200184e276ad22af226902b3f00e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 31 Aug 2025 09:04:24 +0300
Subject: [PATCH 302/321] python313Packages.loguru: skip tests broken by latest
 mypy

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

diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 84ee572792491..22d760edd6a50 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -47,6 +47,10 @@ buildPythonPackage rec {
     "test_file_buffering"
     # Slow test
     "test_time_rotation"
+    # broken on latest mypy, fixed upstream, but does not apply cleanly
+    # https://github.com/Delgan/loguru/commit/7608a014df0fa5c3322dec032345482aa5305a56
+    # FIXME: remove in next update
+    "typesafety"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "test_rotation_and_retention"

From 0d30edcec60c84a608c34b16824259dd32c09db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 23 Aug 2025 11:40:28 +0200
Subject: [PATCH 303/321] Reapply "buildMozillaMach: use nss-esr for 140esr and
 older"

This reverts commit 2b96c79244ded28eafb90b2f7fd2b651a627ff5f.
---
 pkgs/build-support/build-mozilla-mach/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 8dc3dd3b9e40f..86d780979a728 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -575,10 +575,10 @@ buildStdenv.mkDerivation {
       (
         if (lib.versionAtLeast version "143") then
           nss_latest
-        else if (lib.versionAtLeast version "129") then
+        else if (lib.versionAtLeast version "141") then
           nss_3_114
         else
-          nss_esr # 3.90
+          nss_esr
       )
     ]
     ++ lib.optional alsaSupport alsa-lib

From cb93ba8ea379992de068e66712c0e922c7424083 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 31 Aug 2025 09:34:27 +0300
Subject: [PATCH 304/321] python313Packages.google-cloud-storage: add
 pytest-asyncio check input

Tests require it, and pytest finally made this an error instead of a warning.
---
 .../development/python-modules/google-cloud-storage/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index f0eed472c57b5..04b83a3d15e6b 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -11,6 +11,7 @@
   mock,
   protobuf,
   pytestCheckHook,
+  pytest-asyncio,
   pythonOlder,
   requests,
   setuptools,
@@ -49,6 +50,7 @@ buildPythonPackage rec {
     google-cloud-testutils
     mock
     pytestCheckHook
+    pytest-asyncio
   ];
 
   enabledTestPaths = [

From ca3c28d65b4181545936767d28563115c3659c0b Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 1 Sep 2025 12:03:07 +0200
Subject: [PATCH 305/321] nodejs: fix hydra builds

---
 pkgs/development/web/nodejs/gyp-patches.nix | 27 +++++++++++++++++++--
 pkgs/development/web/nodejs/v24.nix         |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
index b1d074df437f8..48b47d19f7dcb 100644
--- a/pkgs/development/web/nodejs/gyp-patches.nix
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -1,13 +1,19 @@
 {
   lib,
+  stdenv,
   fetchpatch2,
   patch_npm ? true,
   patch_tools ? true,
+  patch_npm_catch_oserror ? patch_npm,
+  patch_tools_catch_oserror ? patch_tools,
+  patch_npm_regex_handling ? patch_npm && stdenv.buildPlatform.isDarwin,
+  patch_tools_regex_handling ? patch_tools && stdenv.buildPlatform.isDarwin,
 }:
 let
   url = "https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.patch?full_index=1";
+  url_regex_handling = "https://github.com/nodejs/gyp-next/commit/b21ee3150eea9fc1a8811e910e5ba64f42e1fb77.patch?full_index=1";
 in
-lib.optionals patch_tools ([
+lib.optionals patch_tools_catch_oserror ([
   # Fixes builds with Nix sandbox on Darwin for gyp.
   (fetchpatch2 {
     inherit url;
@@ -16,7 +22,7 @@ lib.optionals patch_tools ([
     extraPrefix = "tools/gyp/";
   })
 ])
-++ lib.optionals patch_npm ([
+++ lib.optionals patch_npm_catch_oserror ([
   (fetchpatch2 {
     inherit url;
     hash = "sha256-cXTwmCRHrNhuY1+3cD/EvU0CJ+1Nk4TRh6c3twvfaW8=";
@@ -24,3 +30,20 @@ lib.optionals patch_tools ([
     extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
   })
 ])
+++ lib.optionals patch_tools_regex_handling ([
+  # Fixes builds with Nix sandbox on Darwin for gyp.
+  (fetchpatch2 {
+    url = url_regex_handling;
+    hash = "sha256-xDZO8GgZLPvCeTrCu6RVVFV5bmbuz9UPgHiaAJE6im0=";
+    stripLen = 1;
+    extraPrefix = "tools/gyp/";
+  })
+])
+++ lib.optionals patch_npm_regex_handling ([
+  (fetchpatch2 {
+    url = url_regex_handling;
+    hash = "sha256-fW5kQh+weCK0g3wzTJLZgAuXxetb14UAf6yxW6bIgbU=";
+    stripLen = 1;
+    extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
+  })
+])
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 4982172f2ef29..948343586419a 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -17,7 +17,7 @@ let
 
   gypPatches =
     if stdenv.buildPlatform.isDarwin then
-      callPackage ./gyp-patches.nix { patch_tools = false; }
+      callPackage ./gyp-patches.nix { patch_tools_catch_oserror = false; }
       ++ [
         ./gyp-patches-set-fallback-value-for-CLT.patch
       ]

From 21f34620be8a6e4746cdb48749854f0b2d623713 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 2 Sep 2025 08:12:14 +0200
Subject: [PATCH 306/321] nodejs: patch away absolute paths from GYP script

---
 ...es-set-fallback-value-for-CLT-darwin.patch | 63 +++++++++++++++++++
 pkgs/development/web/nodejs/gyp-patches.nix   |  4 ++
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch

diff --git a/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch
new file mode 100644
index 0000000000000..028214bc2fbff
--- /dev/null
+++ b/pkgs/development/web/nodejs/gyp-patches-set-fallback-value-for-CLT-darwin.patch
@@ -0,0 +1,63 @@
+Sandboxed builds need a fallback value for the version of the Command Line Tools
+being used.
+
+diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
+index 508f6ccac3e..44bcd988c4c 100644
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py
+@@ -1495,24 +1495,8 @@ def XcodeVersion():
+     global XCODE_VERSION_CACHE
+     if XCODE_VERSION_CACHE:
+         return XCODE_VERSION_CACHE
+-    version = ""
++    version = "11.0.0.0.1.1567737322"
+     build = ""
+-    try:
+-        version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
+-        # In some circumstances xcodebuild exits 0 but doesn't return
+-        # the right results; for example, a user on 10.7 or 10.8 with
+-        # a bogus path set via xcode-select
+-        # In that case this may be a CLT-only install so fall back to
+-        # checking that version.
+-        if len(version_list) < 2:
+-            raise GypError("xcodebuild returned unexpected results")
+-        version = version_list[0].split()[-1]  # Last word on first line
+-        build = version_list[-1].split()[-1]  # Last word on last line
+-    except (GypError, OSError):
+-        # Xcode not installed so look for XCode Command Line Tools
+-        version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
+-        if not version:
+-            raise GypError("No Xcode or CLT version detected!")
+     # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
+     version = version.split(".")[:3]  # Just major, minor, micro
+     version[0] = version[0].zfill(2)  # Add a leading zero if major is one digit
+ 
+ 
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+@@ -1495,24 +1495,8 @@ def XcodeVersion():
+     global XCODE_VERSION_CACHE
+     if XCODE_VERSION_CACHE:
+         return XCODE_VERSION_CACHE
+-    version = ""
++    version = "11.0.0.0.1.1567737322"
+     build = ""
+-    try:
+-        version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
+-        # In some circumstances xcodebuild exits 0 but doesn't return
+-        # the right results; for example, a user on 10.7 or 10.8 with
+-        # a bogus path set via xcode-select
+-        # In that case this may be a CLT-only install so fall back to
+-        # checking that version.
+-        if len(version_list) < 2:
+-            raise GypError("xcodebuild returned unexpected results")
+-        version = version_list[0].split()[-1]  # Last word on first line
+-        build = version_list[-1].split()[-1]  # Last word on last line
+-    except (GypError, OSError):
+-        # Xcode not installed so look for XCode Command Line Tools
+-        version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
+-        if not version:
+-            raise GypError("No Xcode or CLT version detected!")
+     # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
+     version = version.split(".")[:3]  # Just major, minor, micro
+     version[0] = version[0].zfill(2)  # Add a leading zero if major is one digit
diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
index 48b47d19f7dcb..d3939887e0fdc 100644
--- a/pkgs/development/web/nodejs/gyp-patches.nix
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -47,3 +47,7 @@ lib.optionals patch_tools_catch_oserror ([
     extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
   })
 ])
+# TODO: remove the Darwin conditionals from this file
+++ lib.optionals stdenv.buildPlatform.isDarwin ([
+  ./gyp-patches-set-fallback-value-for-CLT-darwin.patch
+])

From 082129233f1eea26d0bd748111d38e4ccffbde6c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 2 Sep 2025 11:45:16 +0300
Subject: [PATCH 307/321] arrow-cpp: pin to protobuf_31

Fails to build on 32.
---
 pkgs/by-name/ar/arrow-cpp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 8c8cdebd117ee..a239b13feed0e 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -37,7 +37,7 @@
   openssl,
   perl,
   pkg-config,
-  protobuf,
+  protobuf_31,
   python3,
   rapidjson,
   re2,
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     libbacktrace
     lz4
     nlohmann_json # alternative JSON parser to rapidjson
-    protobuf # substrait requires protobuf
+    protobuf_31 # substrait requires protobuf
     rapidjson
     re2
     snappy
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableFlight [
     grpc
     openssl
-    protobuf
+    protobuf_31
     sqlite
   ]
   ++ lib.optionals enableS3 [

From 4523b24a08b51ffb20b631a0f21605d48df7002b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 3 Sep 2025 23:01:42 +0200
Subject: [PATCH 308/321] python3Packages.django_4: 4.2.23 -> 4.2.24

https://docs.djangoproject.com/en/4.2/releases/4.2.24/
https://www.djangoproject.com/weblog/2025/sep/03/security-releases/

Fixes: CVE-2025-57833
---
 .../django/3.13.6-html-parser.patch           | 58 -------------------
 pkgs/development/python-modules/django/4.nix  |  9 +--
 2 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django/3.13.6-html-parser.patch

diff --git a/pkgs/development/python-modules/django/3.13.6-html-parser.patch b/pkgs/development/python-modules/django/3.13.6-html-parser.patch
deleted file mode 100644
index 6d986be384782..0000000000000
--- a/pkgs/development/python-modules/django/3.13.6-html-parser.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e0a1e8d549e7be25960b8ad060c63def3dc35d1d Mon Sep 17 00:00:00 2001
-From: Natalia <124304+nessita@users.noreply.github.com>
-Date: Mon, 21 Jul 2025 15:23:32 -0300
-Subject: [PATCH 1/2] Fixed test_utils.tests.HTMLEqualTests.test_parsing_errors
- following Python's HTMLParser fixed parsing.
-
-Further details about Python changes can be found in:
-https://github.com/python/cpython/commit/0243f97cbadec8d985e63b1daec5d1cbc850cae3.
-
-Thank you Clifford Gama for the thorough review!
----
- tests/test_utils/tests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
-index 37e87aa1022c..9c22b61b4ff2 100644
---- a/tests/test_utils/tests.py
-+++ b/tests/test_utils/tests.py
-@@ -962,7 +962,7 @@ def test_parsing_errors(self):
-             "('Unexpected end tag `div` (Line 1, Column 6)', (1, 6))"
-         )
-         with self.assertRaisesMessage(AssertionError, error_msg):
--            self.assertHTMLEqual("< div></ div>", "<div></div>")
-+            self.assertHTMLEqual("< div></div>", "<div></div>")
-         with self.assertRaises(HTMLParseError):
-             parse_html("</p>")
- 
-
-From e8afcf0e644553bcba3e5f931266963bffc46748 Mon Sep 17 00:00:00 2001
-From: Natalia <124304+nessita@users.noreply.github.com>
-Date: Mon, 14 Jul 2025 14:45:03 -0300
-Subject: [PATCH 2/2] Fixed #36499 -- Adjusted
- utils_tests.test_html.TestUtilsHtml.test_strip_tags following Python's
- HTMLParser new behavior.
-
-Python fixed a quadratic complexity processing for HTMLParser in:
-https://github.com/python/cpython/commit/6eb6c5dbfb528bd07d77b60fd71fd05d81d45c41.
----
- tests/utils_tests/test_html.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
-index 284f33aedcfb..51573b81eb9d 100644
---- a/tests/utils_tests/test_html.py
-+++ b/tests/utils_tests/test_html.py
-@@ -142,10 +142,10 @@ def test_strip_tags(self):
-             ("&gotcha&#;<>", "&gotcha&#;<>"),
-             ("<sc<!-- -->ript>test<<!-- -->/script>", "ript>test"),
-             ("<script>alert()</script>&h", "alert()h"),
--            ("><!" + ("&" * 16000) + "D", "><!" + ("&" * 16000) + "D"),
-+            ("><!" + ("&" * 16000) + "D", ">"),
-             ("X<<<<br>br>br>br>X", "XX"),
-             ("<" * 50 + "a>" * 50, ""),
--            (">" + "<a" * 500 + "a", ">" + "<a" * 500 + "a"),
-+            (">" + "<a" * 500 + "a", ">"),
-             ("<a" * 49 + "a" * 951, "<a" * 49 + "a" * 951),
-             ("<" + "a" * 1_002, "<" + "a" * 1_002),
-         )
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 04a73e71871a2..6cba9d6d9b655 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.23";
+  version = "4.2.24";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-h6VkMLg2XAVC0p+ItTs/2EqpYdZn9uNvv6ZwQHXP0bI=";
+    hash = "sha256-zDPK30u2QFbHCqnlTMqF1w9iN2sPDphhyKU1u+Mp5ho=";
   };
 
   patches = [
@@ -81,11 +81,6 @@ buildPythonPackage rec {
     })
 
   ]
-  ++ lib.optionals (pythonAtLeast "3.13") [
-    # https://code.djangoproject.com/ticket/36499
-    # https://github.com/django/django/pull/19639
-    ./3.13.6-html-parser.patch
-  ]
   ++ lib.optionals withGdal [
     (replaceVars ./django_4_set_geos_gdal_lib.patch {
       geos = geos;

From 5d12b6de8648b8075b9c73d7a6816a4a5fb9996c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 4 Sep 2025 13:15:20 +0300
Subject: [PATCH 309/321] perl540Packages.PPI: don't patchShebangs

---
 pkgs/top-level/perl-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 31922c7deb181..f2c0c80b136e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -28499,6 +28499,10 @@ with self;
       url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.277.tar.gz";
       hash = "sha256-h8efg7aHbiBgUZZdUBnSUHxVH4GahnUAgOx+xDsuCvg=";
     };
+
+    # override default postPatch to avoid patchShebangs breaking tests
+    postPatch = "";
+
     buildInputs = [
       ClassInspector
       TestDeep

From 7ba60b48d315a38b43c340c95a9d02fe46f06d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 4 Sep 2025 19:47:45 +0200
Subject: [PATCH 310/321] e2fsprogs: avoid outputChecks on darwin

And the problem is probably the same on other non-glibc platforms, too.
Hydra logs don't show these kind of errors, but here's a build:
https://hydra.nixos.org/build/306371286

/cc the PR that caused the issue: #431959
---
 pkgs/by-name/e2/e2fsprogs/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
index 3acc526b46167..ceb394b1c433e 100644
--- a/pkgs/by-name/e2/e2fsprogs/package.nix
+++ b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -107,7 +107,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  outputChecks = {
+  # non-glibc gettext has issues with this
+  outputChecks = lib.optionalAttrs stdenv.hostPlatform.isGnu {
     bin.disallowedRequisites = [
       bash
       bashNonInteractive

From e84ec1a23cdb2494ca871eebc0edf34a00c351da Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 8 Sep 2025 08:43:13 +0300
Subject: [PATCH 311/321] Revert "go_1_25: 1.25.0 -> 1.25.1"

This reverts commit f68798a02e30b181515eceef1dc867fad7a12ced.

This is a world rebuild now, so we need to land this in the next cycle.
---
 pkgs/development/compilers/go/1.25.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index e0009073167ec..9d7bab15e3ef8 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.25.1";
+  version = "1.25.0";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ=";
+    hash = "sha256-S9AekSlyB7+kUOpA1NWpOxtTGl5DhHOyoG4Y4HciciU=";
   };
 
   strictDeps = true;

From 8fd5914085d49f3b698bd437c94e032609af1f2f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 8 Sep 2025 16:08:59 +1000
Subject: [PATCH 312/321] go_1_24: 1.24.6 -> 1.24.7

Changelog: https://go.dev/doc/devel/release#go1.24
---
 pkgs/development/compilers/go/1.24.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index aed38dafb9d1e..3513bd317ba12 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24.6";
+  version = "1.24.7";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-4ctVgqq1iGaLwEwH3hhogHD2uMmyqvNh+CHhm9R8/b0=";
+    hash = "sha256-Ko9Q2w+IgDYHxQ1+qINNy3vUg8a0KKkeNg/fhiS0ZGQ=";
   };
 
   strictDeps = true;

From bcb65d076b31a894cf13a923ce0dd1e0c4b80e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 8 Sep 2025 18:36:45 +0200
Subject: [PATCH 313/321] python3Packages.pytest-examples: patch the build

https://hydra.nixos.org/build/306511131/nixlog/3/tail
---
 .../python-modules/pytest-examples/default.nix            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix
index a1d0903465439..39e4fd28a34ce 100644
--- a/pkgs/development/python-modules/pytest-examples/default.nix
+++ b/pkgs/development/python-modules/pytest-examples/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   hatchling,
   pytest,
   black,
@@ -21,6 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-ZnDl0B7/oLX6PANrqsWtVJwe4E/+7inCgOpo7oSeZlw=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pydantic/pytest-examples/pull/65/commits/60ae70d05ee345b38c2d2048d36b4a4545c98b6b.diff";
+      hash = "sha256-Rhrg0zVChwwa7Gk+WYrCu44VgUQmxLBeq8pWSF6Nzdo=";
+    })
+  ];
+
   build-system = [
     hatchling
   ];

From 88c1a817fdd6e1bfcbc2e3c320d1c7c0b38e10a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 8 Sep 2025 19:46:47 +0200
Subject: [PATCH 314/321] Revert "python3Packages.dash: 3.0.4 -> 3.2.0"

This reverts commit ef725f0ff8246d51d676aa7cc3d02b2ed008b818.
The update never worked, but noone's checked that
(because auto-update that doesn't verify even building).
---
 pkgs/development/python-modules/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 953eb9064a744..3f185c962a251 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "3.2.0";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "dash";
     tag = "v${version}";
-    hash = "sha256-7wSUPAcPvY5Q5Ws2mLjiY599oZlo5SA6Pa8QnS7pgvg=";
+    hash = "sha256-KCGVdD1L+U2KbktU2GU19BQ6wRcmEeYtC/v8UrFTyto=";
   };
 
   nativeBuildInputs = [

From 93235ae3dbef60df56cd075102e7e0cd91d582b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 8 Sep 2025 20:01:56 +0200
Subject: [PATCH 315/321] arpa2common: 2.6.2 -> 2.6.4

Also tweak to make it build again, e.g. see:
https://hydra.nixos.org/build/306358187/nixlog/4/tail

https://gitlab.com/arpa2/arpa2common/-/blob/v2.6.4/CHANGES
 - Removed last traces of external OpenSSL
 - This library is deprecating our much-needed hard-coded hashes
 - Minor improvements in base85 tooling
---
 pkgs/by-name/ar/arpa2common/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ar/arpa2common/package.nix b/pkgs/by-name/ar/arpa2common/package.nix
index 77f9694e69a96..16a895a433f01 100644
--- a/pkgs/by-name/ar/arpa2common/package.nix
+++ b/pkgs/by-name/ar/arpa2common/package.nix
@@ -11,28 +11,25 @@
   graphviz,
   libsodium,
   lmdb,
-  openssl,
+  krb5,
   pkg-config,
   ragel,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "arpa2common";
-  version = "2.6.2";
+  version = "2.6.4";
 
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "arpa2common";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eWfWaO6URCK2FWQ+NYAoeCONkovgsVDPSRQVCGFnW3s=";
+    hash = "sha256-qqdc+eYLnYQs2Q7sk0D5Trr1GbRTmV1w4sZiVwFwfMw=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.com/arpa2/arpa2common/-/commit/13ea82df60b87a5367db00a8c6f3502e8ecb7298.patch";
-      hash = "sha256-V9Dhr6PeArqXnuXmFuDjcirlGl7xovq7VQZsrbbMFSk=";
-    })
-  ];
+  postPatch = ''
+    sed '1i#include <stddef.h>' -i lib/identity/identity.rl
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -46,10 +43,13 @@ stdenv.mkDerivation (finalAttrs: {
     e2fsprogs
     libsodium
     lmdb
-    openssl
     ragel
   ];
 
+  buildInputs = [
+    krb5
+  ];
+
   meta = {
     changelog = "https://gitlab.com/arpa2/arpa2common/-/blob/v${finalAttrs.version}/CHANGES";
     description = "ARPA2 ID and ACL libraries and other core data structures for ARPA2";

From 33241ea74c6b7abf1d97469c04b803f059e744fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 8 Sep 2025 20:18:04 +0200
Subject: [PATCH 316/321] remctl: ingore a warning to fixup build

https://hydra.nixos.org/build/305939822/nixlog/1/tail
---
 pkgs/by-name/re/remctl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix
index 0a37c90899b44..b9e8c7f6a949f 100644
--- a/pkgs/by-name/re/remctl/package.nix
+++ b/pkgs/by-name/re/remctl/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs tests
     sed -i '\,server/acl/localgroup,d' tests/TESTS
+    substituteInPlace configure.ac --replace "-Werror" ""
   '';
 
   nativeBuildInputs = [

From 1ea2b1bab1b45c79a4b798beebbc55f298ae8edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 8 Sep 2025 20:55:58 +0200
Subject: [PATCH 317/321] python3Packages.docformatter: disable a broken test

https://hydra.nixos.org/build/306497380/nixlog/4/tail
---
 pkgs/development/python-modules/docformatter/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix
index 7e87e8aa5dc9d..6031ee190f688 100644
--- a/pkgs/development/python-modules/docformatter/default.nix
+++ b/pkgs/development/python-modules/docformatter/default.nix
@@ -48,10 +48,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # Disable failing tests until https://github.com/PyCQA/docformatter/issues/274 is fixed upstream
   disabledTests = [
+    # Disable failing tests until https://github.com/PyCQA/docformatter/issues/274 is fixed upstream
     "test_do_format_code.py"
     "test_docformatter.py"
+    # some different issue
+    "test_detect_encoding_with_undetectable_encoding"
   ];
 
   pythonImportsCheck = [ "docformatter" ];

From c3c60fbbd731b5c0d4996c059de13ce59d7f007d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 9 Sep 2025 07:43:55 +0200
Subject: [PATCH 318/321] anki: pin to protobuf 31

https://hydra.nixos.org/build/306839183/nixlog/2/tail
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a56f6a03cd3c..ee5d385d03b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13741,7 +13741,9 @@ with pkgs;
   amoeba = callPackage ../games/amoeba { };
   amoeba-data = callPackage ../games/amoeba/data.nix { };
 
-  anki = callPackage ../games/anki { };
+  anki = callPackage ../games/anki {
+    protobuf = protobuf_31;
+  };
   anki-utils = callPackage ../games/anki/addons/anki-utils.nix { };
   ankiAddons = recurseIntoAttrs (callPackage ../games/anki/addons { });
   anki-bin = callPackage ../games/anki/bin.nix { };

From f982d8382d8a47a6e1f4e693e5e4fc97a634afe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 9 Sep 2025 09:01:36 +0200
Subject: [PATCH 319/321] systemdUkify: fixup build

This is basically a revert of a tiny part of PR #429972.
---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index a04930180b892..32a963e12cd05 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -905,7 +905,7 @@ stdenv.mkDerivation (finalAttrs: {
         )
       );
 
-  disallowedRequisites = [
+  disallowedRequisites = lib.optionals (!withUkify) [
     bash
     bashNonInteractive
   ];

From 931d442e419b56e2c70b2d62e458c74fcc228cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 9 Sep 2025 09:10:38 +0200
Subject: [PATCH 320/321] mesa: fixup build on darwin

https://hydra.nixos.org/build/306674482/nixlog/2/tail
---
 pkgs/development/libraries/mesa/darwin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix
index 9f14b5d79300d..e19d1a0e44a43 100644
--- a/pkgs/development/libraries/mesa/darwin.nix
+++ b/pkgs/development/libraries/mesa/darwin.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation {
     xorg.libX11
     xorg.libXext
     xorg.libXfixes
+    xorg.libxcb
     zlib
   ];
 

From 23f1db638cdd96f479516cfe7aea6eba461d6f8d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 9 Sep 2025 16:32:43 +0200
Subject: [PATCH 321/321] matrix-synapse-unwrapped: allow setuptools_rust 1.12

Matrix has a strict upper bound as a precaution to avoid spurious build
and runtime issues, but the diff[1] looks safe enough for an upgrade.

[1] https://github.com/PyO3/setuptools-rust/compare/v1.11.1...v1.12.0
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index a0791b5ac5f52..435ef1c25ffbe 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -29,6 +29,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-qpgDErV1VVzaUHHQX4ReXCPihdrSKI/4HtbDeQIblR8=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3"
+  '';
+
   build-system = with python3Packages; [
     poetry-core
     setuptools-rust