From 0740efbb32e4e9439e13ce9c1969be1f675c4e21 Mon Sep 17 00:00:00 2001
From: aqxa1 <github.unleveled546@slmails.com>
Date: Mon, 3 Feb 2025 13:48:47 +1100
Subject: [PATCH 01/66] radicale-infcloud: fix radicale >=3.2 compatibility

See: https://github.com/Unrud/RadicaleInfCloud/pull/27
---
 .../python-modules/radicale-infcloud/default.nix         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/radicale-infcloud/default.nix b/pkgs/development/python-modules/radicale-infcloud/default.nix
index 073d5125859e..de2e4fd834e3 100644
--- a/pkgs/development/python-modules/radicale-infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale-infcloud/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   buildPythonPackage,
   radicale,
   setuptools,
@@ -18,6 +19,14 @@ buildPythonPackage {
     hash = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo=";
   };
 
+  patches = [
+    # Radicale >=3.2 compatibility fix: https://github.com/Unrud/RadicaleInfCloud/pull/27
+    (fetchpatch {
+      url = "https://github.com/Unrud/RadicaleInfCloud/commit/c7487d34a544a499b751fdc92b01196edef599c6.patch";
+      sha256 = "sha256-H5cSKFYQhC7+zpdbi0ojU8UlRJnldXtxv6d8gJ8D39w=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ radicale ];

From 45f41ec40a517d588f53beca7cf172d5c814da28 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <vincent.haupert@yaxi.tech>
Date: Sun, 1 Feb 2026 16:47:28 +0100
Subject: [PATCH 02/66] codecov-cli: 10.4.0 -> 11.2.6

Codecov moved the `codecov-cli` code to the getsentry/prevent-cli
project.
---
 pkgs/by-name/co/codecov-cli/package.nix | 35 ++++++++-----------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix
index fe59d237e9d5..676417a9ec6b 100644
--- a/pkgs/by-name/co/codecov-cli/package.nix
+++ b/pkgs/by-name/co/codecov-cli/package.nix
@@ -6,45 +6,32 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "codecov-cli";
-  version = "10.4.0";
+  version = "11.2.6";
   pyproject = true;
 
-  src =
-    (fetchFromGitHub {
-      owner = "codecov";
-      repo = "codecov-cli";
-      tag = "v${version}";
-      hash = "sha256-R1GFQ81N/e2OX01oSs8Xs+PM0JKVZofiUPADVdxCzWk=";
-      fetchSubmodules = true;
-    }).overrideAttrs
-      (_: {
-        env = {
-          GIT_CONFIG_COUNT = 1;
-          GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
-          GIT_CONFIG_VALUE_0 = "git@github.com:";
-        };
-      });
+  src = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "prevent-cli";
+    tag = "v${version}";
+    hash = "sha256-8KBemqwMqiio4pnftsBgnFj69Bgb5jQr5YlMegujPZY=";
+  };
+
+  sourceRoot = "${src.name}/${pname}";
 
   build-system = with python3Packages; [ setuptools ];
 
   pythonRelaxDeps = [
-    "httpx"
+    "click"
     "responses"
-    "test-results-parser"
-    "tree-sitter"
   ];
 
   dependencies = with python3Packages; [
     click
-    httpx
     ijson
     pyyaml
-    regex
     responses
-    test-results-parser
-    tree-sitter
     sentry-sdk
-    wrapt
+    test-results-parser
   ];
 
   meta = {

From 343200028a12c2d0590e9f7053c738d0b01b760c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 7 Feb 2026 22:37:02 +0000
Subject: [PATCH 03/66] nvme-cli: 2.15 -> 2.16

Changes: https://github.com/linux-nvme/nvme-cli/releases/tag/v2.16
---
 pkgs/by-name/nv/nvme-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nv/nvme-cli/package.nix b/pkgs/by-name/nv/nvme-cli/package.nix
index 4c6860c3d15b..f4660672415e 100644
--- a/pkgs/by-name/nv/nvme-cli/package.nix
+++ b/pkgs/by-name/nv/nvme-cli/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvme-cli";
-  version = "2.15";
+  version = "2.16";
 
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zXzNjEpxioqYoSHDzimCnP/tKbi0H+GTH4xZ0g1+XnU=";
+    hash = "sha256-gW95iJF9RnPC1mcoLjS3r+4tZhX+TP4BSOMU0uB256A=";
   };
 
   mesonFlags = [

From 909919201faed696410dc0b8f920a0a1dc12e852 Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Sun, 8 Feb 2026 11:12:01 +0000
Subject: [PATCH 04/66] maintainers: add Kladki

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c111812667dc..b2b361af87a9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13965,6 +13965,13 @@
     github = "kkoniuszy";
     githubId = 120419423;
   };
+  Kladki = {
+    name = "Matthias Ahouansou";
+    email = "matthias@ahouansou.cz";
+    github = "Kladki";
+    githubId = 158313939;
+    matrix = "@matthias:ahouansou.cz";
+  };
   klchen0112 = {
     name = "klchen0112";
     email = "klchen0112@gmail.com";

From 263754a26fb7af826a05e634c886fe0234d30333 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Feb 2026 08:57:59 +0000
Subject: [PATCH 05/66] trealla: 2.89.13 -> 2.90.7

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 719cac56141c..a7e16632c392 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.89.13";
+  version = "2.90.7";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XtZfLjyN3Ve8PiKTzePE7zwyI/wKV2GUMLOn6zQDdyk=";
+    hash = "sha256-0ud5GHkldJ7/86bmeXV1SdShXKLjUIu7oOxZBbB+068=";
   };
 
   postPatch = ''

From f6aa2a624175689cbefbf894978ff655aedf1f4d Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Sun, 8 Feb 2026 11:13:25 +0000
Subject: [PATCH 06/66] emoji-runner: init at 3.0.5

---
 pkgs/by-name/em/emoji-runner/package.nix | 56 ++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/em/emoji-runner/package.nix

diff --git a/pkgs/by-name/em/emoji-runner/package.nix b/pkgs/by-name/em/emoji-runner/package.nix
new file mode 100644
index 000000000000..28d53d956ea2
--- /dev/null
+++ b/pkgs/by-name/em/emoji-runner/package.nix
@@ -0,0 +1,56 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  kdePackages,
+  nix-update-script,
+  gettext,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "emoji-runner";
+  version = "3.0.5";
+
+  src = fetchFromGitHub {
+    owner = "alex1701c";
+    repo = "EmojiRunner";
+    tag = finalAttrs.version;
+    hash = "sha256-Rt7Z0uEbzqRKxV1EpDr//RYaVr3D+Nj+7JS3EAO+hsM=";
+  };
+
+  dontWrapQtApps = true;
+
+  buildInputs = with kdePackages; [
+    ki18n
+    kservice
+    krunner
+    ktextwidgets
+    kcmutils
+    kconfigwidgets
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    gettext
+    kdePackages.extra-cmake-modules
+  ];
+
+  strictDeps = true;
+
+  cmakeFlags = [
+    "-DBUILD_TESTING=OFF"
+    "-DBUILD_WITH_QT6=ON"
+    "-DQT_MAJOR_VERSION=6"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/alex1701c/EmojiRunner/releases/tag/${finalAttrs.version}";
+    description = "Search for emojis in Krunner and copy/paste them";
+    homepage = "https://github.com/alex1701c/EmojiRunner";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ Kladki ];
+    inherit (kdePackages.krunner.meta) platforms;
+  };
+})

From b4b592a9837874f79d709ae4e47d953ec4f23029 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Feb 2026 05:20:16 +0000
Subject: [PATCH 07/66] orthanc: 1.12.9 -> 1.12.10

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

diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index ca8e98654831..3cc9566507eb 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -28,12 +28,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "orthanc";
-  version = "1.12.9";
+  version = "1.12.10";
 
   src = fetchhg {
     url = "https://orthanc.uclouvain.be/hg/orthanc/";
     rev = "Orthanc-${finalAttrs.version}";
-    hash = "sha256-IBULO03og+aXmpYAXZdsesTFkc7HkeXol+A7yzDzcfQ=";
+    hash = "sha256-+y+99NKyAWoQmvgCfubNuGiJ68uUwUvE2O64gZ/3uNA=";
   };
 
   outputs = [

From be0a3d100ca107e72473f55808860ae07a5b89cc Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Tue, 10 Feb 2026 08:34:57 -0800
Subject: [PATCH 08/66] llvmPackages_22: 22.1.0-rc2 -> 22.1.0-rc3

---
 pkgs/development/compilers/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 3547aee2af9d..fdb5dd923cde 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -26,7 +26,7 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
-    "22.1.0-rc2".officialRelease.sha256 = "sha256-j0KSuTANrwLh/siEcztSqCYQQDYHmdBCgVCsPsDCQ+I=";
+    "22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
     "23.0.0-git".gitRelease = {
       rev = "dc152f0d2d085dcfb7542d0e71e19ebfa1aa3794";
       rev-version = "23.0.0-unstable-2026-02-01";

From 0e94b069eea70f3ff2ea36b8b04788a0f2ed6cb5 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 6 Feb 2026 13:59:08 +0100
Subject: [PATCH 09/66] opentrack: 2026.1.0-unstable-2026-01-03 ->
 2026.1.0-unstable-2026-01-24

Also adds fusion as a dependency introduced in
opentrack/opentrack@f24a58e
---
 pkgs/by-name/op/opentrack/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index f66c08ec2a67..4de60523bedb 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentrack";
-  version = "2026.1.0-unstable-2026-01-03";
+  version = "2026.1.0-unstable-2026-01-24";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "opentrack";
-    rev = "0779d3ce9da19d46919e909d0a1a252d67122db9";
-    hash = "sha256-n7XCNNXgfwU4q27Q7ss9tgc2Z/tmzcRxUP4chwpPN38=";
+    rev = "2d3ab7a61d2514ce51c9656908d33465a788763e";
+    hash = "sha256-+Xb3zlybQrrc1AiTdYXxDhuFNN7g7u7ryM7da2EJpaY=";
   };
 
   aruco = callPackage ./aruco.nix { };
@@ -40,6 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
     meta.license = lib.licenses.free;
   };
 
+  fusion = fetchFromGitHub {
+    owner = "xioTechnologies";
+    repo = "Fusion";
+    tag = "v1.2.11";
+    hash = "sha256-9bqqP+6kfdRWIRnnP+R0lXSQs6OmZoNlbCjqiJeJjpk=";
+  };
+
   patches = [
     # calls `app.setDesktopFileName("opentrack");` - distros that don't wrap the binary apparently don't need this.
     ./desktop-filename.patch
@@ -69,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_AHRSFUSION" "${finalAttrs.fusion}")
     (lib.cmakeFeature "OPENTRACK_COMMIT" "opentrack-${finalAttrs.version}")
     (lib.cmakeBool "SDK_WINE" withWine)
     (lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a")

From 2c2cb1f49dc1398cc145a7d2212dad2b641c1497 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 6 Feb 2026 14:02:20 +0100
Subject: [PATCH 10/66] opentrack: provide v4l-utils on `PATH`

Used to open webcam camera settings:
https://github.com/opentrack/opentrack/blob/2d3ab7a61d2514ce51c9656908d33465a788763e/video-opencv/video-property-page.cpp#L150-L160
---
 pkgs/by-name/op/opentrack/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index 4de60523bedb..57cb9562ff9a 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -18,6 +18,7 @@
   wineWow64Packages,
   onnxruntime,
   nix-update-script,
+  v4l-utils,
   withWine ? stdenv.targetPlatform.isx86_64,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -90,7 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
   # manually wrap just the main binary
   dontWrapQtApps = true;
   preFixup = ''
-    wrapQtApp $out/bin/opentrack
+    wrapQtApp $out/bin/opentrack \
+      --prefix PATH : ${lib.makeBinPath [ v4l-utils ]}
   '';
 
   desktopItems = [

From c45e849e7d94fa11a6c2b8fa596e74d8c11880e1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 11 Feb 2026 11:03:03 +0100
Subject: [PATCH 11/66] ruby: move NROFF variable into env for structuredAttrs

---
 .../development/interpreters/ruby/default.nix | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 73896c892d47..da0a77dc608d 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -129,9 +129,6 @@ let
             inherit hash;
           };
 
-          # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-          NROFF = if docSupport then "${groff}/bin/nroff" else null;
-
           outputs = [ "out" ] ++ lib.optional docSupport "devdoc";
 
           strictDeps = true;
@@ -174,12 +171,17 @@ let
           ];
           propagatedBuildInputs = op jemallocSupport jemalloc;
 
-          env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {
-            # The ruby build system will use a bare `rust` command by default for its rust.
-            # We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds
-            # for cross-compilation output for the build target by default.
-            NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";
-          };
+          env =
+            lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {
+              # The ruby build system will use a bare `rust` command by default for its rust.
+              # We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds
+              # for cross-compilation output for the build target by default.
+              NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";
+            }
+            // lib.optionalAttrs docSupport {
+              # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+              NROFF = "${groff}/bin/nroff";
+            };
 
           enableParallelBuilding = true;
           # /build/ruby-2.7.7/lib/fileutils.rb:882:in `chmod':

From db10d2ecc8266ff75b880c890b762c0c9018746f Mon Sep 17 00:00:00 2001
From: Petingoso <92183955+Petingoso@users.noreply.github.com>
Date: Thu, 12 Feb 2026 00:10:00 +0000
Subject: [PATCH 12/66] tmuxPlugins.lazy-restore: 0.1.1 -> 0.1.2

Simple version bump for fixing issue as described here "https://github.com/bcampolo/tmux-lazy-restore/issues/1#issuecomment-3652841793"
---
 pkgs/misc/tmux-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 4148f77b408c..dae31401916e 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -445,12 +445,12 @@ in
   lazy-restore = mkTmuxPlugin rec {
     pluginName = "lazy-restore";
     rtpFilePath = "tmux-lazy-restore.tmux";
-    version = "0.1.1";
+    version = "0.1.2";
     src = fetchFromGitHub {
       owner = "bcampolo";
       repo = "tmux-lazy-restore";
       tag = "v${version}";
-      hash = "sha256-rI9KhV6CiAHTErOKuTla+xVbpiP8RK9wu6goxCKhKiA=";
+      hash = "sha256-LLXGXJzIB2I0NMbWTh2DtLTAyC+JMzNM//SbKtFd9nM=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = ''

From fb93e33a725cd3f31a40f50344c8ee86ba7b99a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Feb 2026 06:56:46 +0000
Subject: [PATCH 13/66] numbat: 1.20.0 -> 1.23.0

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

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index 4805481ad3db..80aa04bcece1 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "numbat";
-  version = "1.20.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "numbat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wh7HmE9UPu7+/aguaqON2/pmEHulYw69O0YjoKeDuRg=";
+    hash = "sha256-xezYRtIzP3MHme/7DwaM0hMgGTcio6iABuNREOOh6HU=";
   };
 
-  cargoHash = "sha256-F8fjrkQVWmDKGXNYG1e1Fvu9z1EgHC/2zuqN3O/2exE=";
+  cargoHash = "sha256-oNGq00Znh5WLc+y2NEWZL7Bl17gIaSY7PXYLel9Ucjg=";
 
   env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
 

From 57804578fb80eb5d8cc4c7d235458164a0f4629c Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Fri, 13 Feb 2026 21:15:02 +1100
Subject: [PATCH 14/66] calibre: apply fix for CVE-2026-25635

CVE: https://nvd.nist.gov/vuln/detail/CVE-2026-25635
Upstream advisory: GHSA-32vh-whvh-9fxr
Nix security tracking issue: https://tracker.security.nixos.org/issues/NIXPKGS-2026-0156

Fixes #488046
---
 pkgs/by-name/ca/calibre/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index b9aca5aeb332..b7a3af7b4a16 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -61,6 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${finalAttrs.version}+${debian-source}/debian/patches/hardening/0007-Hardening-Qt-code.patch";
         hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U=";
       })
+      # Fix CVE-2026-25635
+      # http://tracker.security.nixos.org/issues/NIXPKGS-2026-0156
+      # https://github.com/NixOS/nixpkgs/issues/488046
+      # Fixed upstream in 9.2.0.
+      (fetchpatch {
+        name = "CVE-2026-25635.patch";
+        url = "https://github.com/kovidgoyal/calibre/commit/9739232fcb029ac15dfe52ccd4fdb4a07ebb6ce9.patch";
+        hash = "sha256-fzotxhfMF/DCMvpIfMSOGY8iVOybsYymRQvhXf7jQyc=";
+      })
       # Fix CVE-2026-25636
       # http://tracker.security.nixos.org/issues/NIXPKGS-2026-0160
       # https://github.com/NixOS/nixpkgs/issues/488052

From c2b957ed5a04a50dbcb711393eb86ef5402f7eea Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Fri, 13 Feb 2026 21:18:06 +1100
Subject: [PATCH 15/66] calibre: apply fix for CVE-2026-25731

CVE: https://nvd.nist.gov/vuln/detail/CVE-2026-25731
Upstream advisory: GHSA-xrh9-w7qx-3gcc
Nix security tracking issue: https://tracker.security.nixos.org/issues/NIXPKGS-2026-0155

Fixes #488045
---
 pkgs/by-name/ca/calibre/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index b7a3af7b4a16..a706eff0e343 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -86,6 +86,15 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/kovidgoyal/calibre/commit/9484ea82c6ab226c18e6ca5aa000fa16de598726.patch";
         hash = "sha256-hpWFSQXyOAVRqou0v+5oT5zIrBbyP2Uv2z1Vg811ZG0=";
       })
+      # Fix CVE-2026-25731
+      # http://tracker.security.nixos.org/issues/NIXPKGS-2026-0155
+      # https://github.com/NixOS/nixpkgs/issues/488045
+      # Fixed upstream in 9.2.0.
+      (fetchpatch {
+        name = "CVE-2026-25731.patch";
+        url = "https://github.com/kovidgoyal/calibre/commit/f0649b27512e987b95fcab2e1e0a3bcdafc23379.patch";
+        hash = "sha256-G9H6hEN5cyFIqDmJZv+bgt+6ZF6/K2t9npYjksjcxTo=";
+      })
     ]
     ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 

From 0de20cac2875d7d867149b4551b70e5b64e72fde Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 13 Feb 2026 11:50:33 +0100
Subject: [PATCH 16/66] maven.buildMavenPackage: move JAVA_HOME into env for
 structuredAttrs

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

diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 98b0f927ad37..8672419322f5 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -52,7 +52,7 @@ let
       ]
       ++ args.nativeBuildInputs or [ ];
 
-      JAVA_HOME = mvnJdk;
+      env.JAVA_HOME = mvnJdk;
 
       impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
@@ -131,7 +131,7 @@ stdenv.mkDerivation (
       maven
     ];
 
-    JAVA_HOME = mvnJdk;
+    env.JAVA_HOME = mvnJdk;
 
     buildPhase = ''
       runHook preBuild

From 5e2f678782380c83ffcbf422078195d9f7508d70 Mon Sep 17 00:00:00 2001
From: Ben Lovell <ben.j.lovell@gmail.com>
Date: Thu, 27 Jun 2024 18:05:51 +0200
Subject: [PATCH 17/66] maintainers: add socksy

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 38c0a30d311a..3cb9955c8ece 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24967,6 +24967,12 @@
     githubId = 55726;
     name = "Stanislav Ochotnický";
   };
+  socksy = {
+    email = "ben.j.lovell@gmail.com";
+    github = "socksy";
+    githubId = 511549;
+    name = "Ben Lovell";
+  };
   sodagunz = {
     name = "sodagunz";
     github = "sodagunz";

From 8129a2d1fa58534c855665faddd4608e19e7a0bb Mon Sep 17 00:00:00 2001
From: Tony Wasserka <neobrain@users.noreply.github.com>
Date: Tue, 27 Jan 2026 13:20:04 +0100
Subject: [PATCH 18/66] nixos/grafana: Drop hardcoded default secret

This reflects the upstream change https://github.com/grafana/grafana/pull/115676 .
It is too easy to accidentally ship this key in a production setup, so just
require the user to provide it instead.
---
 nixos/modules/services/monitoring/grafana.nix | 10 ++++++++--
 nixos/tests/grafana/basic.nix                 |  1 +
 nixos/tests/grafana/provision/default.nix     |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 4b30eac4bdfb..9f458792c34b 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -876,13 +876,19 @@ in
 
             secret_key = mkOption {
               description = ''
-                Secret key used for signing. Please note that the contents of this option
+                Secret key used for signing data source settings like secrets and passwords.
+                Set this to a unique, random string in production, generated for example by running `openssl rand -hex 32`.
+
+                If you change this later you will need to update data source settings to re-encode them.
+
+                <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key>
+
+                Please note that the contents of this option
                 will end up in a world-readable Nix store. Use the file provider
                 pointing at a reasonably secured file in the local filesystem
                 to work around that. Look at the documentation for details:
                 <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider>
               '';
-              default = "SW2YcwTIb9zpOOhoPsMm";
               type = types.str;
             };
 
diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix
index dbb211537447..27887bdb339c 100644
--- a/nixos/tests/grafana/basic.nix
+++ b/nixos/tests/grafana/basic.nix
@@ -18,6 +18,7 @@ import ../make-test-python.nix (
           security = {
             admin_user = "testadmin";
             admin_password = "snakeoilpwd";
+            secret_key = "11111111111111111111";
           };
         };
       };
diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix
index d4a1e29ed7c2..550b2c4189e0 100644
--- a/nixos/tests/grafana/provision/default.nix
+++ b/nixos/tests/grafana/provision/default.nix
@@ -19,6 +19,7 @@ import ../../make-test-python.nix (
           security = {
             admin_user = "testadmin";
             admin_password = "$__file{${pkgs.writeText "pwd" "snakeoilpwd"}}";
+            secret_key = "11111111111111111111";
           };
         };
       };

From 9aebd52d44996e0de3545f956f1a1411946ce416 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Feb 2026 23:01:06 +0000
Subject: [PATCH 19/66] laravel: 5.24.4 -> 5.24.5

---
 pkgs/by-name/la/laravel/composer.lock | 58 +++++++++++++--------------
 pkgs/by-name/la/laravel/package.nix   |  6 +--
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock
index faa550706460..c8d3a6439a78 100644
--- a/pkgs/by-name/la/laravel/composer.lock
+++ b/pkgs/by-name/la/laravel/composer.lock
@@ -167,16 +167,16 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "b4bbe2a929aaacf0ade3bec535f1f8fac6e6ed38"
+                "reference": "1fd7db2203ce5a935fffd2ad40955248fb9f581c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/b4bbe2a929aaacf0ade3bec535f1f8fac6e6ed38",
-                "reference": "b4bbe2a929aaacf0ade3bec535f1f8fac6e6ed38",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/1fd7db2203ce5a935fffd2ad40955248fb9f581c",
+                "reference": "1fd7db2203ce5a935fffd2ad40955248fb9f581c",
                 "shasum": ""
             },
             "require": {
@@ -223,11 +223,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-02-01T16:38:26+00:00"
+            "time": "2026-02-09T13:43:38+00:00"
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -273,7 +273,7 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
@@ -321,16 +321,16 @@
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "8cad07cf6004a7cd0a876c6ad2136a1511c2bb58"
+                "reference": "62c225e046a4c469779c0855dce7abd8c0b1fa1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/8cad07cf6004a7cd0a876c6ad2136a1511c2bb58",
-                "reference": "8cad07cf6004a7cd0a876c6ad2136a1511c2bb58",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/62c225e046a4c469779c0855dce7abd8c0b1fa1e",
+                "reference": "62c225e046a4c469779c0855dce7abd8c0b1fa1e",
                 "shasum": ""
             },
             "require": {
@@ -384,11 +384,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-01-19T15:15:34+00:00"
+            "time": "2026-02-09T20:42:48+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -434,7 +434,7 @@
         },
         {
             "name": "illuminate/reflection",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/reflection.git",
@@ -485,16 +485,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v12.50.0",
+            "version": "v12.51.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "411a11401406e7d542aa67a4b400feed6bedef0c"
+                "reference": "fcc84cf4fba138f1835d6a5978ac4434f11a55aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/411a11401406e7d542aa67a4b400feed6bedef0c",
-                "reference": "411a11401406e7d542aa67a4b400feed6bedef0c",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/fcc84cf4fba138f1835d6a5978ac4434f11a55aa",
+                "reference": "fcc84cf4fba138f1835d6a5978ac4434f11a55aa",
                 "shasum": ""
             },
             "require": {
@@ -561,20 +561,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-02-04T15:14:59+00:00"
+            "time": "2026-02-10T16:02:09+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.12",
+            "version": "v0.3.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "4861ded9003b7f8a158176a0b7666f74ee761be8"
+                "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/4861ded9003b7f8a158176a0b7666f74ee761be8",
-                "reference": "4861ded9003b7f8a158176a0b7666f74ee761be8",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/ed8c466571b37e977532fb2fd3c272c784d7050d",
+                "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d",
                 "shasum": ""
             },
             "require": {
@@ -618,9 +618,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.12"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.13"
             },
-            "time": "2026-02-03T06:57:26+00:00"
+            "time": "2026-02-06T12:17:10+00:00"
         },
         {
             "name": "nesbot/carbon",
@@ -2495,11 +2495,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.38",
+            "version": "2.1.39",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dfaf1f530e1663aa167bc3e52197adb221582629",
-                "reference": "dfaf1f530e1663aa167bc3e52197adb221582629",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224",
+                "reference": "c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224",
                 "shasum": ""
             },
             "require": {
@@ -2544,7 +2544,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-01-30T17:12:46+00:00"
+            "time": "2026-02-11T14:48:56+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix
index 5b82a626af69..c2ee374e6f15 100644
--- a/pkgs/by-name/la/laravel/package.nix
+++ b/pkgs/by-name/la/laravel/package.nix
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "laravel";
-  version = "5.24.4";
+  version = "5.24.5";
 
   src = fetchFromGitHub {
     owner = "laravel";
     repo = "installer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tPbw0OV8ffWEaXVzoZ4ZffoulAO4IUhUElxAKoYNlnw=";
+    hash = "sha256-wFyXg92bW7hZBKubj4Gf6nXnFpEpD3aUXv7mF7XbYQw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-wj3mCF/cSgPTJ/riYQ+k7vooP7Im+ibjSqYthUjPuEs=";
+  vendorHash = "sha256-hEr7VX4ZwuS7HUSNOvWCy+FOufTE1fMpJih37ZReoro=";
 
   # Adding npm (nodejs) and php composer to path
   postInstall = ''

From 786876dc1e45ee3771432d5f152029f8e24d08e4 Mon Sep 17 00:00:00 2001
From: Ben Lovell <ben.j.lovell@gmail.com>
Date: Thu, 27 Jun 2024 18:06:47 +0200
Subject: [PATCH 20/66] friction-graphics: init at 1.0.0-rc.3

---
 doc/packages/friction-graphics.section.md     |  14 +++
 doc/packages/index.md                         |   1 +
 doc/redirects.json                            |   6 ++
 pkgs/by-name/fr/friction-graphics/package.nix | 102 ++++++++++++++++++
 4 files changed, 123 insertions(+)
 create mode 100644 doc/packages/friction-graphics.section.md
 create mode 100644 pkgs/by-name/fr/friction-graphics/package.nix

diff --git a/doc/packages/friction-graphics.section.md b/doc/packages/friction-graphics.section.md
new file mode 100644
index 000000000000..82ebbaf60e6c
--- /dev/null
+++ b/doc/packages/friction-graphics.section.md
@@ -0,0 +1,14 @@
+# Friction {#friction-graphics}
+
+[Friction](https://friction.graphics/) is an open-source vector motion graphics application for creating animations for web and video platforms.
+
+## Wayland support {#friction-graphics-wayland}
+
+Upstream explicitly forces X11 (XCB) on Linux due to incomplete Wayland support (fullscreen does not work, some mouse interactions are broken).
+This means the application runs under XWayland by default and does not respect compositor-level HiDPI scaling.
+
+To enable native Wayland support, removing the forced X11 override:
+
+```nix
+friction-graphics.override { enableWayland = true; }
+```
diff --git a/doc/packages/index.md b/doc/packages/index.md
index 553b3d800193..45ef55f75a80 100644
--- a/doc/packages/index.md
+++ b/doc/packages/index.md
@@ -10,6 +10,7 @@ eclipse.section.md
 elm.section.md
 emacs.section.md
 firefox.section.md
+friction-graphics.section.md
 fish.section.md
 fuse.section.md
 geant4.section.md
diff --git a/doc/redirects.json b/doc/redirects.json
index 4fd8f57e75bb..253007c51710 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -119,6 +119,12 @@
   "ex-testEqualArrayOrMap-test-function-add-cowbell": [
     "index.html#ex-testEqualArrayOrMap-test-function-add-cowbell"
   ],
+  "friction-graphics": [
+    "index.html#friction-graphics"
+  ],
+  "friction-graphics-wayland": [
+    "index.html#friction-graphics-wayland"
+  ],
   "ghc-deprecation-policy": [
     "index.html#ghc-deprecation-policy"
   ],
diff --git a/pkgs/by-name/fr/friction-graphics/package.nix b/pkgs/by-name/fr/friction-graphics/package.nix
new file mode 100644
index 000000000000..48992d94c809
--- /dev/null
+++ b/pkgs/by-name/fr/friction-graphics/package.nix
@@ -0,0 +1,102 @@
+{
+  lib,
+  clangStdenv,
+  cmake,
+  expat,
+  fetchFromGitHub,
+  ffmpeg_4,
+  fontconfig,
+  freetype,
+  glib,
+  harfbuzzFull,
+  libGL,
+  libGLU,
+  libjpeg_turbo,
+  libpng,
+  libsForQt5,
+  libunwind,
+  libwebp,
+  ninja,
+  pcre2,
+  pkg-config,
+  python3,
+  libx11,
+  zlib,
+  enableWayland ? false,
+}:
+
+clangStdenv.mkDerivation rec {
+  pname = "friction";
+  version = "1.0.0-rc.3";
+  src = fetchFromGitHub {
+    owner = "friction2d";
+    repo = "friction";
+    rev = "v${version}";
+    hash = "sha256-JUDqjUhtYiDll7bTNmYCItT8eQHS5pV38OwqiTXKowM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    python3
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    expat
+    ffmpeg_4
+    fontconfig
+    freetype
+    glib
+    harfbuzzFull
+    libGL
+    libGLU
+    libjpeg_turbo
+    libpng
+    libsForQt5.qscintilla
+    libsForQt5.qtbase
+    libsForQt5.qtdeclarative
+    libsForQt5.qtmultimedia
+    libsForQt5.qtwayland
+    libunwind
+    libwebp
+    pcre2
+    zlib
+  ]
+  ++ lib.optionals (!clangStdenv.hostPlatform.isDarwin) [
+    libx11
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DQSCINTILLA_INCLUDE_DIRS=${libsForQt5.qscintilla}/include"
+    "-DQSCINTILLA_LIBRARIES_DIRS=${libsForQt5.qscintilla}/lib/"
+    "-DQSCINTILLA_LIBRARIES=${
+      if clangStdenv.hostPlatform.isDarwin then "libqscintilla2.dylib" else "libqscintilla2.so"
+    }"
+    "-DCMAKE_INSTALL_RPATH=${lib.makeLibraryPath buildInputs}"
+  ]
+  ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
+    "-DCMAKE_OSX_DEPLOYMENT_TARGET=12.7"
+    "-DMAC_DEPLOY=ON"
+  ];
+
+  postPatch = ''
+    grep -rl 'hb' src/skia | xargs sed -Ei 's/(["<])(hb.*\.h)/\1harfbuzz\/\2/'
+  ''
+  + lib.optionalString enableWayland ''
+    sed -i '/qputenv("QT_QPA_PLATFORM", "xcb")/d' src/core/appsupport.cpp
+  '';
+
+  meta = {
+    description = "Vector motion graphics program";
+    longDescription = "Friction is a powerful and versatile motion graphics application that allows you to create stunning vector and raster animations for web and video platforms with ease.";
+    homepage = "https://friction.graphics/";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ socksy ];
+    mainProgram = "friction";
+  };
+}

From cb5224838d4f25c0fc18a4f7cfeaea2bce7cb4b5 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 7 Feb 2026 09:34:27 +0100
Subject: [PATCH 21/66] maintainers: drop michelk

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 maintainers/maintainer-list.nix      | 6 ------
 pkgs/by-name/cm/cmark/package.nix    | 2 +-
 pkgs/by-name/la/laszip/package.nix   | 2 +-
 pkgs/by-name/la/laszip_2/package.nix | 2 +-
 pkgs/by-name/li/liblas/package.nix   | 2 +-
 pkgs/by-name/sa/saga/package.nix     | 1 -
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ee27343f4fb3..f57c5698308e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17273,12 +17273,6 @@
     githubId = 4366292;
     name = "Michal Rus";
   };
-  michelk = {
-    email = "michel@kuhlmanns.info";
-    github = "michelk";
-    githubId = 1404919;
-    name = "Michel Kuhlmann";
-  };
   michojel = {
     email = "mic.liamg@gmail.com";
     github = "michojel";
diff --git a/pkgs/by-name/cm/cmark/package.nix b/pkgs/by-name/cm/cmark/package.nix
index 6b47f12b93d3..b6ae12831e3f 100644
--- a/pkgs/by-name/cm/cmark/package.nix
+++ b/pkgs/by-name/cm/cmark/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cmark";
     homepage = "https://github.com/commonmark/cmark";
     changelog = "https://github.com/commonmark/cmark/raw/${finalAttrs.version}/changelog.txt";
-    maintainers = [ lib.maintainers.michelk ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     license = lib.licenses.bsd2;
   };
diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix
index 4b4250ec37db..63cac46b7522 100644
--- a/pkgs/by-name/la/laszip/package.nix
+++ b/pkgs/by-name/la/laszip/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://laszip.org";
     changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.lgpl2;
-    maintainers = [ lib.maintainers.michelk ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/la/laszip_2/package.nix b/pkgs/by-name/la/laszip_2/package.nix
index 9217909f878f..d4782e55d53b 100644
--- a/pkgs/by-name/la/laszip_2/package.nix
+++ b/pkgs/by-name/la/laszip_2/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
     homepage = "https://laszip.org";
     license = lib.licenses.lgpl2;
-    maintainers = with lib.maintainers; [ michelk ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/liblas/package.nix b/pkgs/by-name/li/liblas/package.nix
index 3826a46af7ed..ad61379d71c5 100644
--- a/pkgs/by-name/li/liblas/package.nix
+++ b/pkgs/by-name/li/liblas/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://liblas.org";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ michelk ];
+    maintainers = [ ];
     teams = with lib.teams; [ geospatial ];
   };
 })
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 3b8259ddc95d..d69310d26e7f 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      michelk
       mpickering
     ];
     teams = [ lib.teams.geospatial ];

From b791579b2b88cb91d9affa29a94d300641b84a1b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 14 Feb 2026 16:11:38 +0100
Subject: [PATCH 22/66] expr: 1.17.7 -> 1.17.8

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

diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix
index df90da0087af..e118495b7e5c 100644
--- a/pkgs/by-name/ex/expr/package.nix
+++ b/pkgs/by-name/ex/expr/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "expr";
-  version = "1.17.7";
+  version = "1.17.8";
 
   src = fetchFromGitHub {
     owner = "expr-lang";
     repo = "expr";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-OKKbEgJgQWL5jP+E8ZuxdVjZ89QjLy6AAPRepe4jWsk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MJM7ezZtSdDaUewNGACOKvWc+ZOPVScTuW+d6n1K5jo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/repl";
 
-  vendorHash = "sha256-NIcHf9P2/1Me+LuWA3BEjA2mOgdSzXFQJPrhAT7uPoo=";
+  vendorHash = "sha256-GH7rn0q/YuGBx0rrfHa2EMCsynQ3Pgtz1yDsD/NIKsU=";
 
   ldflags = [
     "-s"
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Expression language and expression evaluation for Go";
     homepage = "https://github.com/expr-lang/expr";
-    changelog = "https://github.com/expr-lang/expr/releases/tag/${finalAttrs.src.rev}";
+    changelog = "https://github.com/expr-lang/expr/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "expr";

From ffd30ea893c9892b75229415dd5519e09eda60da Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 14 Feb 2026 16:12:15 +0100
Subject: [PATCH 23/66] expr: add hythera as maintainer

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

diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix
index e118495b7e5c..d5946f09c988 100644
--- a/pkgs/by-name/ex/expr/package.nix
+++ b/pkgs/by-name/ex/expr/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/expr-lang/expr";
     changelog = "https://github.com/expr-lang/expr/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
     mainProgram = "expr";
   };
 })

From 83b160882e61e43f92ac0c58170a47ad45c8852c Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Sat, 14 Feb 2026 16:23:35 +0100
Subject: [PATCH 24/66] nix-index-unwrapped: 0.1.9 -> 0.1.9-unstable-2026-02-05

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

diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 5ac4b98cea72..3c952f49dc2f 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-index";
-  version = "0.1.9";
+  version = "0.1.9-unstable-2026-02-05";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-kOVmgST/D3zNOcGVu1ReuPuVrUx41iRK4rs59lqYX74=";
+    rev = "8c84f67a33c4c26ec12f166cb5f63a77fafebe21";
+    hash = "sha256-8ZMKtBbsBPbccEWH1XHCYsxXX4hckHXwQNr5OzGrU0Q=";
   };
 
   cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";

From ca99ac1ee3dc6e4786773f880e0232bb964d2499 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:07:18 +0100
Subject: [PATCH 25/66] doctave: drop

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

diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
deleted file mode 100644
index 5c92b889e3ce..000000000000
--- a/pkgs/by-name/do/doctave/package.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "doctave";
-  version = "0.4.2";
-
-  src = fetchFromGitHub {
-    owner = "doctave";
-    repo = "doctave";
-    rev = finalAttrs.version;
-    hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
-  };
-
-  cargoHash = "sha256-3gyYls1+5eVM3eLlFNmULvIbc5VgoWpfnpO4nmoDMAI=";
-
-  meta = {
-    description = "Batteries-included developer documentation site generator";
-    homepage = "https://github.com/doctave/doctave";
-    changelog = "https://github.com/doctave/doctave/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    mainProgram = "doctave";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 799908d96917..8ce4a6270ed4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -593,6 +593,7 @@ mapAliases {
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
+  doctave = throw "'doctave' has been removed as it has been unmaintained upstream since April 2022"; # Added 2026-02-07
   docui = throw "'docui' has removed as it was deprecated and archived upstream. Consider using lazydocker instead"; # Added 2026-01-16
   dogdns = throw "'dogdns' has been removed as it is unmaintained upstream and vendors insecure dependencies. Consider switching to 'doggo', a similar tool."; # Added 2025-12-31
   dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27

From b952a39b0751c9bb5c53633b2e78f8d308874ab6 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:10:11 +0100
Subject: [PATCH 26/66] done: drop

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

diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix
deleted file mode 100644
index 12607d4e80b0..000000000000
--- a/pkgs/by-name/do/done/package.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cargo,
-  glib,
-  meson,
-  ninja,
-  pkg-config,
-  rustPlatform,
-  rustc,
-  wrapGAppsHook4,
-  gdk-pixbuf,
-  gtk4,
-  libadwaita,
-  libsecret,
-  openssl,
-  sqlite,
-  gettext,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "done";
-  version = "0.2.2";
-
-  src = fetchFromGitHub {
-    owner = "done-devs";
-    repo = "done";
-    rev = "v${version}";
-    hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc=";
-  };
-
-  nativeBuildInputs = [
-    cargo
-    glib
-    meson
-    ninja
-    pkg-config
-    rustPlatform.cargoSetupHook
-    rustc
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    gdk-pixbuf
-    gtk4
-    libadwaita
-    libsecret
-    openssl
-    sqlite
-  ];
-
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    GETTEXT_DIR = gettext;
-  };
-
-  meta = {
-    description = "Ultimate task management solution for seamless organization and efficiency";
-    homepage = "https://done.edfloreshz.dev/";
-    changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md";
-    license = lib.licenses.mpl20;
-    mainProgram = "done";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8ce4a6270ed4..3c2081a49b5b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -597,6 +597,7 @@ mapAliases {
   docui = throw "'docui' has removed as it was deprecated and archived upstream. Consider using lazydocker instead"; # Added 2026-01-16
   dogdns = throw "'dogdns' has been removed as it is unmaintained upstream and vendors insecure dependencies. Consider switching to 'doggo', a similar tool."; # Added 2025-12-31
   dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27
+  done = throw "'done' has been removed as it was marked discontinued upstream since April 2024"; # Added 2026-02-07
   dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   dotnetfx35 = throw "'dotnetfx35' has been removed because it was unmaintained in Nixpkgs"; # Added 2026-01-27

From c87bd60cec7b0efcf1819bfe1f4483515d5cd14f Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:15:52 +0100
Subject: [PATCH 27/66] epick: drop

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

diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix
deleted file mode 100644
index 57b4a5736d7f..000000000000
--- a/pkgs/by-name/ep/epick/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  stdenv,
-  pkg-config,
-  expat,
-  fontconfig,
-  freetype,
-  libGL,
-  libxrandr,
-  libxi,
-  libxcursor,
-  libx11,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "epick";
-  version = "0.9.0";
-
-  src = fetchFromGitHub {
-    owner = "vv9k";
-    repo = "epick";
-    # Upstream has rewritten tags on multiple occasions.
-    rev = "14ee92e049780406fffdc1e4a83bf1433775663f";
-    sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4=";
-  };
-
-  cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA=";
-
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    pkg-config
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    expat
-    fontconfig
-    freetype
-    libx11
-    libxcursor
-    libxi
-    libxrandr
-  ];
-
-  postInstall = ''
-    install -Dm444 assets/epick.desktop -t $out/share/applications
-    install -Dm444 assets/icon.svg $out/share/icons/hicolor/scalable/apps/epick.svg
-    install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png
-  '';
-
-  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]}
-  '';
-
-  meta = {
-    description = "Simple color picker that lets the user create harmonic palettes with ease";
-    homepage = "https://github.com/vv9k/epick";
-    changelog = "https://github.com/vv9k/epick/blob/${finalAttrs.version}/CHANGELOG.md";
-    license = lib.licenses.gpl3Only;
-    maintainers = [ ];
-    mainProgram = "epick";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3c2081a49b5b..3d6e1e019ea7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -643,6 +643,7 @@ mapAliases {
   encodings = font-encodings; # Added 2026-01-19
   enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27
   epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15
+  epick = throw "'epick' has been removed as it has been unmaintained upstream since November 2022"; # Added 2026-02-07
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02

From c3427767c9e8b52d3768499e95af1bf8429b41ed Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:18:16 +0100
Subject: [PATCH 28/66] esbuild-config: drop

---
 pkgs/by-name/es/esbuild-config/package.nix | 27 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/es/esbuild-config/package.nix

diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix
deleted file mode 100644
index 6b33ad79e5e3..000000000000
--- a/pkgs/by-name/es/esbuild-config/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "esbuild-config";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "bpierre";
-    repo = "esbuild-config";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co=";
-  };
-
-  cargoHash = "sha256-OQ7zlcWVu3sS/u0B+Ew6VUS4zxntKU2LF63ZcPRUKW0=";
-
-  meta = {
-    description = "Config files for esbuild";
-    homepage = "https://github.com/bpierre/esbuild-config";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    mainProgram = "esbuild-config";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3d6e1e019ea7..ef76fea57b25 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -647,6 +647,7 @@ mapAliases {
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
+  esbuild-config = throw "'esbuild-config' has been removed as it has been unmaintained upstream since September 2022"; # Added 2026-02-07
   etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08
   ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28
   ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31

From 333cae62d9fa3395ef1447a554b7364b9834952d Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:21:30 +0100
Subject: [PATCH 29/66] eureka-ideas: drop

---
 pkgs/by-name/eu/eureka-ideas/package.nix | 43 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/by-name/eu/eureka-ideas/package.nix

diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix
deleted file mode 100644
index 204d71d86a64..000000000000
--- a/pkgs/by-name/eu/eureka-ideas/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  stdenv,
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  libgit2,
-  openssl,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "eureka-ideas";
-  version = "2.0.0";
-
-  src = fetchFromGitHub {
-    owner = "simeg";
-    repo = "eureka";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
-  };
-
-  cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag=";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    libgit2
-    openssl
-  ];
-
-  useNextest = true;
-
-  meta = {
-    description = "CLI tool to input and store your ideas without leaving the terminal";
-    homepage = "https://github.com/simeg/eureka";
-    changelog = "https://github.com/simeg/eureka/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    mainProgram = "eureka";
-    # The last successful Darwin Hydra build was in 2024
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ef76fea57b25..46f7961c4823 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -651,6 +651,7 @@ mapAliases {
   etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08
   ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28
   ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
+  eureka-ideas = throw "'eureka-ideas' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07
   evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25
   eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
   f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18

From 4bf8f9db31b1fb16ec8aff1343b39bde71b461a8 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:25:53 +0100
Subject: [PATCH 30/66] fcp: drop

---
 .../fc/fcp/0001-update-Cargo.lock.patch       | 889 ------------------
 .../0002-trailing-semicolon-in-macro.patch    |  13 -
 pkgs/by-name/fc/fcp/package.nix               |  57 --
 pkgs/top-level/aliases.nix                    |   1 +
 4 files changed, 1 insertion(+), 959 deletions(-)
 delete mode 100644 pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch
 delete mode 100644 pkgs/by-name/fc/fcp/0002-trailing-semicolon-in-macro.patch
 delete mode 100644 pkgs/by-name/fc/fcp/package.nix

diff --git a/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch b/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch
deleted file mode 100644
index 0119e5c20adf..000000000000
--- a/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch
+++ /dev/null
@@ -1,889 +0,0 @@
-From ffb3ab5b45301a7848ccd53ab077e37d0e8382c3 Mon Sep 17 00:00:00 2001
-From: wxt <3264117476@qq.com>
-Date: Sat, 28 Sep 2024 10:09:27 +0800
-Subject: [PATCH] update Cargo.lock
-
----
- Cargo.lock | 465 +++++++++++++++++++++++++++++------------------------
- 1 file changed, 254 insertions(+), 211 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 6829f6f..8ae6c05 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2,6 +2,15 @@
- # It is not intended for manual editing.
- version = 3
- 
-+[[package]]
-+name = "aho-corasick"
-+version = "1.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-+dependencies = [
-+ "memchr",
-+]
-+
- [[package]]
- name = "atty"
- version = "0.2.14"
-@@ -15,48 +24,42 @@ dependencies = [
- 
- [[package]]
- name = "autocfg"
--version = "1.0.1"
-+version = "1.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
- 
- [[package]]
- name = "bitflags"
--version = "1.2.1"
-+version = "1.3.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
- 
- [[package]]
--name = "bstr"
--version = "0.2.16"
-+name = "bumpalo"
-+version = "3.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
--dependencies = [
-- "lazy_static",
-- "memchr",
-- "regex-automata",
-- "serde",
--]
-+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
- 
- [[package]]
--name = "bumpalo"
--version = "3.7.0"
-+name = "byteorder"
-+version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
-+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
- 
- [[package]]
- name = "cast"
--version = "0.2.7"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
--dependencies = [
-- "rustc_version",
--]
-+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
- 
- [[package]]
- name = "cc"
--version = "1.0.69"
-+version = "1.1.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
-+checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
-+dependencies = [
-+ "shlex",
-+]
- 
- [[package]]
- name = "cfg-if"
-@@ -66,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
- 
- [[package]]
- name = "clap"
--version = "2.33.3"
-+version = "2.34.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
- dependencies = [
-  "bitflags",
-  "textwrap",
-@@ -77,16 +80,16 @@ dependencies = [
- 
- [[package]]
- name = "criterion"
--version = "0.3.4"
-+version = "0.3.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
-+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
- dependencies = [
-  "atty",
-  "cast",
-  "clap",
-  "criterion-plot",
-  "csv",
-- "itertools 0.10.1",
-+ "itertools",
-  "lazy_static",
-  "num-traits",
-  "oorandom",
-@@ -103,65 +106,45 @@ dependencies = [
- 
- [[package]]
- name = "criterion-plot"
--version = "0.4.3"
-+version = "0.4.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
-+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
- dependencies = [
-  "cast",
-- "itertools 0.9.0",
--]
--
--[[package]]
--name = "crossbeam-channel"
--version = "0.5.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
--dependencies = [
-- "cfg-if",
-- "crossbeam-utils",
-+ "itertools",
- ]
- 
- [[package]]
- name = "crossbeam-deque"
--version = "0.8.0"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
-+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
- dependencies = [
-- "cfg-if",
-  "crossbeam-epoch",
-  "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.5"
-+version = "0.9.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
-+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
- dependencies = [
-- "cfg-if",
-  "crossbeam-utils",
-- "lazy_static",
-- "memoffset",
-- "scopeguard",
- ]
- 
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.5"
-+version = "0.8.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
--dependencies = [
-- "cfg-if",
-- "lazy_static",
--]
-+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
- 
- [[package]]
- name = "csv"
--version = "1.1.6"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
- dependencies = [
-- "bstr",
-  "csv-core",
-  "itoa",
-  "ryu",
-@@ -170,9 +153,9 @@ dependencies = [
- 
- [[package]]
- name = "csv-core"
--version = "0.1.10"
-+version = "0.1.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
- dependencies = [
-  "memchr",
- ]
-@@ -192,9 +175,9 @@ dependencies = [
- 
- [[package]]
- name = "either"
--version = "1.6.1"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
- 
- [[package]]
- name = "fcp"
-@@ -208,9 +191,9 @@ dependencies = [
- 
- [[package]]
- name = "getrandom"
--version = "0.2.3"
-+version = "0.2.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
- dependencies = [
-  "cfg-if",
-  "libc",
-@@ -219,9 +202,9 @@ dependencies = [
- 
- [[package]]
- name = "half"
--version = "1.7.1"
-+version = "1.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
-+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
- 
- [[package]]
- name = "hermit-abi"
-@@ -234,78 +217,66 @@ dependencies = [
- 
- [[package]]
- name = "itertools"
--version = "0.9.0"
-+version = "0.10.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
--dependencies = [
-- "either",
--]
--
--[[package]]
--name = "itertools"
--version = "0.10.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
-+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
- dependencies = [
-  "either",
- ]
- 
- [[package]]
- name = "itoa"
--version = "0.4.7"
-+version = "1.0.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
-+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
- 
- [[package]]
- name = "js-sys"
--version = "0.3.51"
-+version = "0.3.70"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
-+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
- dependencies = [
-  "wasm-bindgen",
- ]
- 
- [[package]]
- name = "lazy_static"
--version = "1.4.0"
-+version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
- 
- [[package]]
- name = "libc"
--version = "0.2.98"
-+version = "0.2.159"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
-+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
- 
- [[package]]
- name = "log"
--version = "0.4.14"
-+version = "0.4.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
--dependencies = [
-- "cfg-if",
--]
-+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
- 
- [[package]]
- name = "memchr"
--version = "2.4.0"
-+version = "2.7.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
-+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
- 
- [[package]]
- name = "memoffset"
--version = "0.6.4"
-+version = "0.6.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
-+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
- dependencies = [
-  "autocfg",
- ]
- 
- [[package]]
- name = "nix"
--version = "0.22.0"
-+version = "0.22.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
-+checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
- dependencies = [
-  "bitflags",
-  "cc",
-@@ -316,34 +287,30 @@ dependencies = [
- 
- [[package]]
- name = "num-traits"
--version = "0.2.14"
-+version = "0.2.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
- dependencies = [
-  "autocfg",
- ]
- 
- [[package]]
--name = "num_cpus"
--version = "1.13.0"
-+name = "once_cell"
-+version = "1.19.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
--dependencies = [
-- "hermit-abi",
-- "libc",
--]
-+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
- 
- [[package]]
- name = "oorandom"
--version = "11.1.3"
-+version = "11.1.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
- 
- [[package]]
- name = "plotters"
--version = "0.3.1"
-+version = "0.3.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
-+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
- dependencies = [
-  "num-traits",
-  "plotters-backend",
-@@ -354,53 +321,55 @@ dependencies = [
- 
- [[package]]
- name = "plotters-backend"
--version = "0.3.2"
-+version = "0.3.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
-+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
- 
- [[package]]
- name = "plotters-svg"
--version = "0.3.1"
-+version = "0.3.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
-+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
- dependencies = [
-  "plotters-backend",
- ]
- 
- [[package]]
- name = "ppv-lite86"
--version = "0.2.10"
-+version = "0.2.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-+dependencies = [
-+ "zerocopy",
-+]
- 
- [[package]]
- name = "proc-macro2"
--version = "1.0.27"
-+version = "1.0.86"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
-+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
- dependencies = [
-- "unicode-xid",
-+ "unicode-ident",
- ]
- 
- [[package]]
- name = "quote"
--version = "1.0.9"
-+version = "1.0.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
- dependencies = [
-  "proc-macro2",
- ]
- 
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
- dependencies = [
-  "libc",
-  "rand_chacha",
-  "rand_core",
-- "rand_hc",
- ]
- 
- [[package]]
-@@ -415,22 +384,13 @@ dependencies = [
- 
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
- dependencies = [
-  "getrandom",
- ]
- 
--[[package]]
--name = "rand_hc"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
--dependencies = [
-- "rand_core",
--]
--
- [[package]]
- name = "rand_pcg"
- version = "0.3.1"
-@@ -442,64 +402,58 @@ dependencies = [
- 
- [[package]]
- name = "rayon"
--version = "1.5.1"
-+version = "1.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
-+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
- dependencies = [
-- "autocfg",
-- "crossbeam-deque",
-  "either",
-  "rayon-core",
- ]
- 
- [[package]]
- name = "rayon-core"
--version = "1.9.1"
-+version = "1.12.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
-+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
- dependencies = [
-- "crossbeam-channel",
-  "crossbeam-deque",
-  "crossbeam-utils",
-- "lazy_static",
-- "num_cpus",
- ]
- 
- [[package]]
- name = "regex"
--version = "1.5.4"
-+version = "1.10.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
-+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
- dependencies = [
-+ "aho-corasick",
-+ "memchr",
-+ "regex-automata",
-  "regex-syntax",
- ]
- 
- [[package]]
- name = "regex-automata"
--version = "0.1.10"
-+version = "0.4.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-+dependencies = [
-+ "aho-corasick",
-+ "memchr",
-+ "regex-syntax",
-+]
- 
- [[package]]
- name = "regex-syntax"
--version = "0.6.25"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
--
--[[package]]
--name = "rustc_version"
--version = "0.4.0"
-+version = "0.8.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
--dependencies = [
-- "semver",
--]
-+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
- 
- [[package]]
- name = "ryu"
--version = "1.0.5"
-+version = "1.0.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
- 
- [[package]]
- name = "same-file"
-@@ -510,32 +464,20 @@ dependencies = [
-  "winapi-util",
- ]
- 
--[[package]]
--name = "scopeguard"
--version = "1.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
--
--[[package]]
--name = "semver"
--version = "1.0.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe"
--
- [[package]]
- name = "serde"
--version = "1.0.126"
-+version = "1.0.210"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
-+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
- dependencies = [
-  "serde_derive",
- ]
- 
- [[package]]
- name = "serde_cbor"
--version = "0.11.1"
-+version = "0.11.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
-+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
- dependencies = [
-  "half",
-  "serde",
-@@ -543,9 +485,9 @@ dependencies = [
- 
- [[package]]
- name = "serde_derive"
--version = "1.0.126"
-+version = "1.0.210"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
-+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -554,24 +496,31 @@ dependencies = [
- 
- [[package]]
- name = "serde_json"
--version = "1.0.64"
-+version = "1.0.128"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
-+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
- dependencies = [
-  "itoa",
-+ "memchr",
-  "ryu",
-  "serde",
- ]
- 
-+[[package]]
-+name = "shlex"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-+
- [[package]]
- name = "syn"
--version = "1.0.73"
-+version = "2.0.79"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
-+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "unicode-xid",
-+ "unicode-ident",
- ]
- 
- [[package]]
-@@ -594,53 +543,53 @@ dependencies = [
- ]
- 
- [[package]]
--name = "unicode-width"
--version = "0.1.8"
-+name = "unicode-ident"
-+version = "1.0.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
- 
- [[package]]
--name = "unicode-xid"
--version = "0.2.2"
-+name = "unicode-width"
-+version = "0.1.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
- 
- [[package]]
- name = "walkdir"
--version = "2.3.2"
-+version = "2.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
- dependencies = [
-  "same-file",
-- "winapi",
-  "winapi-util",
- ]
- 
- [[package]]
- name = "wasi"
--version = "0.10.2+wasi-snapshot-preview1"
-+version = "0.11.0+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
- 
- [[package]]
- name = "wasm-bindgen"
--version = "0.2.74"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
-+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
- dependencies = [
-  "cfg-if",
-+ "once_cell",
-  "wasm-bindgen-macro",
- ]
- 
- [[package]]
- name = "wasm-bindgen-backend"
--version = "0.2.74"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
-+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
- dependencies = [
-  "bumpalo",
-- "lazy_static",
-  "log",
-+ "once_cell",
-  "proc-macro2",
-  "quote",
-  "syn",
-@@ -649,9 +598,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro"
--version = "0.2.74"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
-+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
- dependencies = [
-  "quote",
-  "wasm-bindgen-macro-support",
-@@ -659,9 +608,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro-support"
--version = "0.2.74"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
-+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -672,15 +621,15 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-shared"
--version = "0.2.74"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
-+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
- 
- [[package]]
- name = "web-sys"
--version = "0.3.51"
-+version = "0.3.70"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
-+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
- dependencies = [
-  "js-sys",
-  "wasm-bindgen",
-@@ -704,11 +653,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
- 
- [[package]]
- name = "winapi-util"
--version = "0.1.5"
-+version = "0.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
- dependencies = [
-- "winapi",
-+ "windows-sys",
- ]
- 
- [[package]]
-@@ -716,3 +665,97 @@ name = "winapi-x86_64-pc-windows-gnu"
- version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+
-+[[package]]
-+name = "windows-sys"
-+version = "0.59.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-+dependencies = [
-+ "windows-targets",
-+]
-+
-+[[package]]
-+name = "windows-targets"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-+dependencies = [
-+ "windows_aarch64_gnullvm",
-+ "windows_aarch64_msvc",
-+ "windows_i686_gnu",
-+ "windows_i686_gnullvm",
-+ "windows_i686_msvc",
-+ "windows_x86_64_gnu",
-+ "windows_x86_64_gnullvm",
-+ "windows_x86_64_msvc",
-+]
-+
-+[[package]]
-+name = "windows_aarch64_gnullvm"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-+
-+[[package]]
-+name = "windows_aarch64_msvc"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-+
-+[[package]]
-+name = "windows_i686_gnu"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-+
-+[[package]]
-+name = "windows_i686_gnullvm"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-+
-+[[package]]
-+name = "windows_i686_msvc"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-+
-+[[package]]
-+name = "windows_x86_64_gnu"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-+
-+[[package]]
-+name = "windows_x86_64_gnullvm"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-+
-+[[package]]
-+name = "windows_x86_64_msvc"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-+
-+[[package]]
-+name = "zerocopy"
-+version = "0.7.35"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-+dependencies = [
-+ "byteorder",
-+ "zerocopy-derive",
-+]
-+
-+[[package]]
-+name = "zerocopy-derive"
-+version = "0.7.35"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+]
--- 
-2.46.0
-
diff --git a/pkgs/by-name/fc/fcp/0002-trailing-semicolon-in-macro.patch b/pkgs/by-name/fc/fcp/0002-trailing-semicolon-in-macro.patch
deleted file mode 100644
index 829ad178ab70..000000000000
--- a/pkgs/by-name/fc/fcp/0002-trailing-semicolon-in-macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/filesystem.rs b/src/filesystem.rs
-index 28c2a01..cfc8fcb 100644
---- a/src/filesystem.rs
-+++ b/src/filesystem.rs
-@@ -44,7 +44,7 @@ wrap2!(copy, fs, u64);
- 
- macro_rules! make_error_message {
-     ($path:ident) => {
--        |err| Error::new(format!("{}: {}", $path.display(), err));
-+        |err| Error::new(format!("{}: {}", $path.display(), err))
-     };
- }
- 
diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix
deleted file mode 100644
index 46cbb6560fb2..000000000000
--- a/pkgs/by-name/fc/fcp/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  expect,
-  fetchFromGitHub,
-  lib,
-  rustPlatform,
-  stdenv,
-  fetchpatch,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "fcp";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "svetlitski";
-    repo = "fcp";
-    tag = "v${finalAttrs.version}";
-    sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
-  };
-
-  patches = [
-    ./0002-trailing-semicolon-in-macro.patch
-  ];
-
-  cargoPatches = [
-    (fetchpatch {
-      url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch";
-      hash = "sha256-fafpy1tviT1rV+jv1Yxg6xEsFZ9qXWQi5LykagDA5xI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/Svetlitski/fcp/commit/89bcfc9aa1055dcf541da7a6477ffd3107023f48.patch";
-      hash = "sha256-NJ9MMeWf6Ywu+p5uDSWWpAcb01PoMbuSAZ3Qxl9jEaY=";
-    })
-    ./0001-update-Cargo.lock.patch
-  ];
-
-  cargoHash = "sha256-WcbrHAgFTP5OtLI+T0d0BoIxG0MBJzPgjjgCWL2nPus=";
-
-  nativeBuildInputs = [ expect ];
-
-  # character_device fails with "File name too long" on darwin
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  postPatch = ''
-    patchShebangs tests/*.exp
-  '';
-
-  meta = {
-    description = "Significantly faster alternative to the classic Unix cp(1) command";
-    homepage = "https://github.com/svetlitski/fcp";
-    changelog = "https://github.com/svetlitski/fcp/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.unix;
-    maintainers = [ ];
-    mainProgram = "fcp";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 46f7961c4823..e83e5deaa834 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -667,6 +667,7 @@ mapAliases {
   fcitx5-skk-qt = throw "'fcitx5-skk-qt' has been renamed to/replaced by 'qt6Packages.fcitx5-skk-qt'"; # Converted to throw 2025-10-27
   fcitx5-unikey = throw "'fcitx5-unikey' has been renamed to/replaced by 'qt6Packages.fcitx5-unikey'"; # Converted to throw 2025-10-27
   fcitx5-with-addons = throw "'fcitx5-with-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-with-addons'"; # Converted to throw 2025-10-27
+  fcp = throw "'fcp' has been removed as it has been unmaintained upstream since August 2022"; # Added 2026-02-07
   fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08
   fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17

From 106542e96e07b200562013f122bfa8d88101c8b7 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 7 Feb 2026 13:27:44 +0100
Subject: [PATCH 31/66] fontfinder: drop

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

diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix
deleted file mode 100644
index e510bb3232d8..000000000000
--- a/pkgs/by-name/fo/fontfinder/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cargo,
-  pkg-config,
-  rustPlatform,
-  rustc,
-  wrapGAppsHook3,
-  gdk-pixbuf,
-  gtk3,
-  libsoup_3,
-  webkitgtk_4_1,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "fontfinder";
-  version = "2.1.0";
-
-  src = fetchFromGitHub {
-    owner = "mmstick";
-    repo = "fontfinder";
-    rev = version;
-    hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU=";
-  };
-
-  nativeBuildInputs = [
-    cargo
-    pkg-config
-    rustPlatform.cargoSetupHook
-    rustc
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gdk-pixbuf
-    gtk3
-    libsoup_3
-    webkitgtk_4_1
-  ];
-
-  makeFlags = [
-    "prefix=$(out)"
-  ];
-
-  meta = {
-    description = "GTK application for browsing and installing fonts from Google's font archive";
-    homepage = "https://github.com/mmstick/fontfinder";
-    changelog = "https://github.com/mmstick/fontfinder/releases/tag/${src.rev}";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    mainProgram = "fontfinder-gtk";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e83e5deaa834..5490384179c5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -722,6 +722,7 @@ mapAliases {
   fontcursormisc = font-cursor-misc; # Added 2026-01-19
   fontdaewoomisc = font-daewoo-misc; # Added 2026-01-19
   fontdecmisc = font-dec-misc; # Added 2026-01-19
+  fontfinder = throw "'fontfinder' has been remved as it has been unmaintained upstream since April 2023"; # Added 2026-02-07
   fontibmtype1 = font-ibm-type1; # Added 2026-01-19
   fontisasmisc = font-isas-misc; # Added 2026-01-19
   fontjismisc = font-jis-misc; # Added 2026-01-19

From d0c88d0d72dd9609b3c9a8df39234be1fa22f9d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Feb 2026 20:12:27 +0000
Subject: [PATCH 32/66] python3Packages.unicodedata2: 17.0.0 -> 17.0.1

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

diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix
index eb7473d69187..d4a809922cab 100644
--- a/pkgs/development/python-modules/unicodedata2/default.nix
+++ b/pkgs/development/python-modules/unicodedata2/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "unicodedata2";
-  version = "17.0.0";
+  version = "17.0.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "sha256-/6Lw1oNGQv6ZbTVuco2ohyAVM7tUCXSuesl15m7MDjo=";
+    sha256 = "sha256-15lD0VP19r++P1Wl7GEZhRhL2jf87bPsx1Mi2CrmrTs=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From 2ab79e962d104c327ff86922b07133b9570f1460 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Feb 2026 20:20:52 +0000
Subject: [PATCH 33/66] etcd: 3.6.7 -> 3.6.8

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

diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
index 4d705d1426ea..a5202dbd7769 100644
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -11,11 +11,11 @@
 }:
 
 let
-  version = "3.6.7";
-  etcdSrcHash = "sha256-i8VZlK76OQQeojKHo9sdkyNR0Hdiofx0TLUDWKiXOTU=";
-  etcdCtlVendorHash = "sha256-jN+oNoIxNYM2Wm3s+/zDyacyXxVWaHl9t7sot8PL9xk=";
-  etcdUtlVendorHash = "sha256-A2rYstzlBlS3ta5yJVP/RTjgBz+9Y0I79ITr77GrqOo=";
-  etcdServerVendorHash = "sha256-hUFUcoXaOKTkoJ7YUwljpg7EZRhXi5tXcE2bteVRBE0=";
+  version = "3.6.8";
+  etcdSrcHash = "sha256-dNoQ+KKHZoi9GAqjyKPOpEJUwN6FID1tKfMiMknG7Dc=";
+  etcdCtlVendorHash = "sha256-lxFvpEGsp/HS0p54JrjBps7C/c7QR2QFQXU81sO9cPU=";
+  etcdUtlVendorHash = "sha256-6vzClDji9O2SGnKL3lsv3AUbCt/BicsDy1sPeuPdGXk=";
+  etcdServerVendorHash = "sha256-4vz63r05uZOzFQYA9jz9HLsQEDFL30cOETmV/AZanmY=";
 
   src = applyPatches {
     src = fetchFromGitHub {

From c67098549c5fea18f310ab3a2eec03689d56717e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 14 Feb 2026 15:07:48 -0600
Subject: [PATCH 34/66] luaPackages: update on 2026-02-14

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../lua-modules/generated-packages.nix        | 192 +++++++++---------
 pkgs/development/lua-modules/overrides.nix    |   4 +-
 2 files changed, 97 insertions(+), 99 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index f5bdb2613776..7c2c4ddbebc1 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -31,7 +31,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "cheusov";
         repo = "lua-alt-getopt";
-        rev = "0.8.0";
+        tag = "0.8.0";
         hash = "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=";
       };
 
@@ -224,7 +224,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "busted";
-        rev = "v2.3.0";
+        tag = "v2.3.0";
         hash = "sha256-ZSfnbsDiaIo/abVpwb/LV5Ktp5wFSZQNO0OdbnjqVSs=";
       };
 
@@ -265,7 +265,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hishamhm";
         repo = "busted-htest";
-        rev = "1.0.0";
+        tag = "1.0.0";
         hash = "sha256-tGAQUSeDt+OV/TBAJo/JFdyeBRRZaIQEJG+SKcCaQhs=";
       };
 
@@ -297,7 +297,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "sile-typesetter";
         repo = "cassowary.lua";
-        rev = "v2.3.2";
+        tag = "v2.3.2";
         hash = "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=";
       };
 
@@ -332,7 +332,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "alerque";
         repo = "cldr-lua";
-        rev = "v0.3.0";
+        tag = "v0.3.0";
         hash = "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=";
       };
 
@@ -429,7 +429,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mascarenhas";
         repo = "cosmo";
-        rev = "v16.06.04";
+        tag = "v16.06.04";
         hash = "sha256-mJE5GkDnfZ3qAQyyyKj+aXOtlITeYs8lerGJSTzU/Tk=";
       };
 
@@ -460,7 +460,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "keplerproject";
         repo = "coxpcall";
-        rev = "v1_17_0";
+        tag = "v1_17_0";
         hash = "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=";
       };
 
@@ -523,7 +523,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "cyan";
-        rev = "v0.4.1";
+        tag = "v0.4.1";
         hash = "sha256-jvBmOC1SMnuwgwtK6sPCDma+S5RyhItc6YjzMPULzSw=";
       };
 
@@ -560,7 +560,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hishamhm";
         repo = "datafile";
-        rev = "v0.11";
+        tag = "v0.11";
         hash = "sha256-aHdxFJ2IB9v9UMK7vqk7tUA0rLmfvRd0nzhc9JO8AlQ=";
       };
 
@@ -594,7 +594,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "astoff";
         repo = "digestif";
-        rev = "v0.6";
+        tag = "v0.6";
         hash = "sha256-sGwKt9suRVNrbRJlhNMHzc5r4sK/fvUc7smxmxmrn8Y=";
       };
 
@@ -660,7 +660,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "bakpakin";
         repo = "Fennel";
-        rev = "1.6.1";
+        tag = "1.6.1";
         hash = "sha256-MLXLkRKlxqvEOogM5I4uHxnlRLjK8Pbeq9b1+kAgqFg=";
       };
 
@@ -754,7 +754,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "alerque";
         repo = "fluent-lua";
-        rev = "v0.2.0";
+        tag = "v0.2.0";
         hash = "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=";
       };
 
@@ -814,15 +814,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2459-1";
+      version = "0.0.2475-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2459-1.rockspec";
-          sha256 = "0qz1r8vm7szd7z6gicxiblc40y8pw9w91g5qnvax4qmzhyyw4zcq";
+          url = "mirror://luarocks/fzf-lua-0.0.2475-1.rockspec";
+          sha256 = "0lpmyffc5g7sl1smb59pqmd8zrkcp367mgsiarscqbqc6yilrvky";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/36d60dd59cd9bc0442352119fc0e45e1c9011e03.zip";
-        sha256 = "0lr4rk0fqdw12vhnmrjy197ai2d5ld16rwpcwxw4ay1dnaaq2f3x";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/739330f48ca64b4283f5228e9dc9c0c8f9a37110.zip";
+        sha256 = "1pwzaak9q7cacw2qvcs80qxqfpxc60jvspw4ykmws6sh3rbi5c36";
       };
 
       disabled = luaOlder "5.1";
@@ -937,15 +937,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "haskell-tools.nvim";
-      version = "7.0.0-1";
+      version = "7.0.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/haskell-tools.nvim-7.0.0-1.rockspec";
-          sha256 = "03zrib07g6fxzf9gj52f8v5bvllqv7zsvn7z473grwsq6w26dpdy";
+          url = "mirror://luarocks/haskell-tools.nvim-7.0.1-1.rockspec";
+          sha256 = "0iy3c8zdj5m0mcj11vw91458dgh4g7y7yz3pc312gbbjq89pi07h";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.0.zip";
-        sha256 = "1jxbdqh4sgh00lx7abrb7rww62x1dafzxncsr0pjlmly53vwrw5r";
+        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.1.zip";
+        sha256 = "0ibd2cdmfagmdi0v0m0l4yssnx9pfvw0cgs0gz0zlb403jsgm394";
       };
 
       disabled = luaOlder "5.1";
@@ -1057,7 +1057,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "kmarius";
         repo = "jsregexp";
-        rev = "v0.0.7";
+        tag = "v0.0.7";
         hash = "sha256-aXRGmo6w7jgKlR2BwKhbFGHC0mOTwHfYsh+lvqNuFtQ=";
       };
 
@@ -1123,7 +1123,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "ldoc";
-        rev = "v1.5.0";
+        tag = "v1.5.0";
         hash = "sha256-Me2LT+UzO8G2vHqG7DjjoCRAtLmhiJHlSEYQGkprxTw=";
       };
 
@@ -1158,7 +1158,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "pavouk";
         repo = "lgi";
-        rev = "0.9.2";
+        tag = "0.9.2";
         hash = "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=";
       };
 
@@ -1250,7 +1250,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "jeffzi";
         repo = "llscheck";
-        rev = "v0.8.0";
+        tag = "v0.8.0";
         hash = "sha256-edUS6EQLiU4Slob2PagmPE5h7Co+XNRYb3fNeC4COsI=";
       };
 
@@ -1345,7 +1345,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "leafo";
         repo = "loadkit";
-        rev = "v1.1.0";
+        tag = "v1.1.0";
         hash = "sha256-fw+aoP9+yDpme4qXupE07cV1QGZjb2aU7IOHapG+ihU=";
       };
 
@@ -1466,7 +1466,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        rev = "rel-2-9-2";
+        tag = "rel-2-9-2";
         hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
       };
 
@@ -1498,7 +1498,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        rev = "rel-2-9-2";
+        tag = "rel-2-9-2";
         hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
       };
 
@@ -1531,7 +1531,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        rev = "rel-2-9-2";
+        tag = "rel-2-9-2";
         hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
       };
 
@@ -1563,7 +1563,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        rev = "rel-2-9-2";
+        tag = "rel-2-9-2";
         hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
       };
 
@@ -1626,7 +1626,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-cjson";
-        rev = "2.1.0.10";
+        tag = "2.1.0.10";
         hash = "sha256-/SeQro0FaJn91bAGjsVIin+mJF89VUm/G0KyJkV9Qps=";
       };
 
@@ -1658,7 +1658,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "antirez";
         repo = "lua-cmsgpack";
-        rev = "0.4.0";
+        tag = "0.4.0";
         hash = "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=";
       };
 
@@ -1721,7 +1721,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hamishforbes";
         repo = "lua-ffi-zlib";
-        rev = "v0.6";
+        tag = "v0.6";
         hash = "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=";
       };
 
@@ -1785,7 +1785,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "Alloyed";
         repo = "lua-lsp";
-        rev = "v0.1.0";
+        tag = "v0.1.0";
         hash = "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=";
       };
 
@@ -1851,7 +1851,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "starwing";
         repo = "lua-protobuf";
-        rev = "0.5.3";
+        tag = "0.5.3";
         hash = "sha256-9vAv/Rhf9xrQnbd0nkaxGrcTRKkUSlpYRAJe2zpdIiY=";
       };
 
@@ -1884,7 +1884,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "ledgetech";
         repo = "lua-resty-http";
-        rev = "v0.17.2";
+        tag = "v0.17.2";
         hash = "sha256-Ph3PpzQYKYMvPvjYwx4TeZ9RYoryMsO6mLpkAq/qlHY=";
       };
 
@@ -1917,7 +1917,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "cdbattags";
         repo = "lua-resty-jwt";
-        rev = "v0.2.3";
+        tag = "v0.2.3";
         hash = "sha256-m8UbvKk2DR8yCYX9Uv5HjXcZDVyVeRlUKp7UiaN/SkA=";
       };
 
@@ -1953,7 +1953,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "zmartzone";
         repo = "lua-resty-openidc";
-        rev = "v1.8.0";
+        tag = "v1.8.0";
         hash = "sha256-LSkNWebMF1L1a66QszugAxcHsW5o9uxQZHWituFFgJs=";
       };
 
@@ -1989,7 +1989,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "fffonion";
         repo = "lua-resty-openssl";
-        rev = "1.7.1";
+        tag = "1.7.1";
         hash = "sha256-Zj4neqIptfg8Qckj6BOoHpnVlxCNmJuIgg1kcuqt6pw=";
       };
 
@@ -2021,7 +2021,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "bungle";
         repo = "lua-resty-session";
-        rev = "v4.1.5";
+        tag = "v4.1.5";
         hash = "sha256-qwXNEWU0i3PUJK5cUChkcH43HnBCz4EEVPDQQ10Je+Q=";
       };
 
@@ -2139,7 +2139,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "jonstoler";
         repo = "lua-toml";
-        rev = "v2.0.1";
+        tag = "v2.0.1";
         hash = "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=";
       };
 
@@ -2202,7 +2202,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "brimworks";
         repo = "lua-yajl";
-        rev = "v2.1";
+        tag = "v2.1";
         hash = "sha256-zHBNedJkGEm47HpbeJvcm6JNUUfA1OunLHPJulR8rF8=";
       };
 
@@ -2235,7 +2235,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "brimworks";
         repo = "lua-zlib";
-        rev = "v1.4";
+        tag = "v1.4";
         hash = "sha256-z25OtHroEVUFraeFwajbmIiyD3hlZ12FnWs5uUBLm2Y=";
       };
 
@@ -2268,7 +2268,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "lua_cliargs";
-        rev = "v3.0.2";
+        tag = "v3.0.2";
         hash = "sha256-wL3qBQ8Lu3q8DK2Kaeo1dgzIHd8evaxFYJg47CcQiSg=";
       };
 
@@ -2330,7 +2330,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luacheck";
-        rev = "v1.2.0";
+        tag = "v1.2.0";
         hash = "sha256-6aDXZRLq2c36dbasyVzcecQKoMvY81RIGYasdF211UY=";
       };
 
@@ -2358,17 +2358,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luacov";
-      version = "0.16.0-1";
+      version = "0.17.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luacov-0.16.0-1.rockspec";
-          sha256 = "1yn056pd2x142lc1s2admnhjnv5hpqwlq6d5sr2ckj5g83x55dvx";
+          url = "mirror://luarocks/luacov-0.17.0-1.rockspec";
+          sha256 = "042jp0nfy3hcnbywlfp4jkrm9xpxrkggs57q616p4win9ibxcqjy";
         }).outPath;
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luacov";
-        rev = "v0.16.0";
-        hash = "sha256-GoJqiFyXH4chQ/k/qBPttnh/V4vUSfR2Lg8rt3CPKoY=";
+        tag = "v0.17.0";
+        hash = "sha256-UI+6+0g3ldbKUsXCAgYll8v25gwEUn5A102Pn/H0c60=";
       };
 
       disabled = luaOlder "5.1";
@@ -2401,7 +2401,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mwild1";
         repo = "luadbi";
-        rev = "v0.7.4";
+        tag = "v0.7.4";
         hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
       };
 
@@ -2435,7 +2435,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mwild1";
         repo = "luadbi";
-        rev = "v0.7.4";
+        tag = "v0.7.4";
         hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
       };
 
@@ -2470,7 +2470,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mwild1";
         repo = "luadbi";
-        rev = "v0.7.4";
+        tag = "v0.7.4";
         hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
       };
 
@@ -2505,7 +2505,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mwild1";
         repo = "luadbi";
-        rev = "v0.7.4";
+        tag = "v0.7.4";
         hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
       };
 
@@ -2540,7 +2540,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "siffiejoe";
         repo = "lua-luaepnf";
-        rev = "v0.3";
+        tag = "v0.3";
         hash = "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=";
       };
 
@@ -2602,7 +2602,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luaexpat";
-        rev = "1.4.1";
+        tag = "1.4.1";
         hash = "sha256-SnI+a7555R/EFFdnrvJohP6uzwQiMNQPqgp0jxAI178=";
       };
 
@@ -2670,7 +2670,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "keplerproject";
         repo = "luafilesystem";
-        rev = "v1_8_0";
+        tag = "v1_8_0";
         hash = "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=";
       };
 
@@ -2703,7 +2703,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lualdap";
         repo = "lualdap";
-        rev = "v1.4.0";
+        tag = "v1.4.0";
         hash = "sha256-u91T7RlRa87CbYXZLhrzcpVvZWsCnQObmbS86kfsAHc=";
       };
 
@@ -2768,7 +2768,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "lualogging";
-        rev = "v1.8.2";
+        tag = "v1.8.2";
         hash = "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=";
       };
 
@@ -2862,7 +2862,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "dpapavas";
         repo = "luaprompt";
-        rev = "v0.9";
+        tag = "v0.9";
         hash = "sha256-S6bzlIY1KlMK3wy01wGuRujGFgPxcNWmCaISQ87EBGs=";
       };
 
@@ -2924,7 +2924,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "luarocks";
         repo = "luarocks";
-        rev = "v3.13.0";
+        tag = "v3.13.0";
         hash = "sha256-ETVoDpeFSsW7ld2z31Vog3RKsMquoxd7c8m9y7Fb1wk=";
       };
 
@@ -2957,7 +2957,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mlua-rs";
         repo = "luarocks-build-rust-mlua";
-        rev = "0.2.7";
+        tag = "0.2.7";
         hash = "sha256-Zf/Ey5utsgzXqR8zlDse7KsyWA0RGx3hyvnJ36qhKG8=";
       };
 
@@ -3055,7 +3055,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "brunoos";
         repo = "luasec";
-        rev = "v1.3.2";
+        tag = "v1.3.2";
         hash = "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=";
       };
 
@@ -3121,7 +3121,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luasocket";
-        rev = "v3.1.0";
+        tag = "v3.1.0";
         hash = "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=";
       };
 
@@ -3144,17 +3144,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luasql-sqlite3";
-      version = "2.7.0-1";
+      version = "2.8.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luasql-sqlite3-2.7.0-1.rockspec";
-          sha256 = "0fsx3r1hfdkvy07ki7rmmn23w0578mss8rfzz5fi668f0f35lywg";
+          url = "mirror://luarocks/luasql-sqlite3-2.8.0-1.rockspec";
+          sha256 = "1zqcs211idnji4fzyh5g6yn4ca13z690fx0i84gmbibvi5w9rqnl";
         }).outPath;
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luasql";
-        rev = "2.7.0";
-        hash = "sha256-vtL/ynlnZYNP3CQSxMR7o3xWx10rDHI9fIQazrtNfQE=";
+        tag = "2.8.0";
+        hash = "sha256-7FQa62eGe+bGkDF9+yte0JMcONPjoy5Zn5nohJG1KLA=";
       };
 
       disabled = luaOlder "5.1";
@@ -3186,7 +3186,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luassert";
-        rev = "v1.9.0";
+        tag = "v1.9.0";
         hash = "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=";
       };
 
@@ -3219,7 +3219,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luasystem";
-        rev = "v0.6.3";
+        tag = "v0.6.3";
         hash = "sha256-8d2835/EcyDJX9yTn6MTfaZryjY1wkSP+IIIKGPDXMk=";
       };
 
@@ -3251,7 +3251,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "f4z3r";
         repo = "luatext";
-        rev = "v1.2.1";
+        tag = "v1.2.1";
         hash = "sha256-StxCmjSSy3ok0hNkKTQyq4yS1LfX980R5pULCUjLPek=";
       };
 
@@ -3376,7 +3376,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mpeterv";
         repo = "luazip";
-        rev = "1.2.7";
+        tag = "1.2.7";
         hash = "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=";
       };
 
@@ -3409,7 +3409,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "svermeulen";
         repo = "lusc_luv";
-        rev = "main";
+        tag = "main";
         hash = "sha256-xT3so0QHtzzLRNRb7yqfaRMwkl2bt1MP1xh8BkHKqqo=";
       };
 
@@ -3664,7 +3664,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "leafo";
         repo = "magick";
-        rev = "v1.6.0";
+        tag = "v1.6.0";
         hash = "sha256-gda+vLrWyMQ553jVCIRl1qYTS/rXsGhxrBsrJyI8EN4=";
       };
 
@@ -3698,7 +3698,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "mpeterv";
         repo = "markdown";
-        rev = "0.33";
+        tag = "0.33";
         hash = "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=";
       };
 
@@ -3788,7 +3788,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "lua-mimetypes";
-        rev = "v1.1.0";
+        tag = "v1.1.0";
         hash = "sha256-9uuhMerMqE/AtFFGNIWxGBN0BQ+FE+NgZa3g041lesE=";
       };
 
@@ -4051,7 +4051,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "MunifTanjim";
         repo = "nui.nvim";
-        rev = "0.4.0";
+        tag = "0.4.0";
         hash = "sha256-SJc9nfV6cnBKYwRWsv0iHy+RbET8frNV85reICf+pt8=";
       };
 
@@ -4302,7 +4302,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "penlight";
-        rev = "1.15.0";
+        tag = "1.15.0";
         hash = "sha256-yEkzr4v8avygFxp+NUvffg2fRxQJWTpRdIvluh/QBpY=";
       };
 
@@ -4393,7 +4393,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "xpol";
         repo = "lua-rapidjson";
-        rev = "v0.7.2";
+        tag = "v0.7.2";
         hash = "sha256-WdfGIgbwlMMItsasN+ZITd/iqSeHC0EVeYoUcolb1MU=";
       };
 
@@ -4685,7 +4685,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "say";
-        rev = "v1.4.1";
+        tag = "v1.4.1";
         hash = "sha256-IjNkK1leVtYgbEjUqguVMjbdW+0BHAOCE0pazrVuF50=";
       };
 
@@ -4718,7 +4718,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "pkulchenko";
         repo = "serpent";
-        rev = "0.30";
+        tag = "0.30";
         hash = "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=";
       };
 
@@ -4756,7 +4756,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "f4z3r";
         repo = "sofa";
-        rev = "v0.8.0";
+        tag = "v0.8.0";
         hash = "sha256-MWGp0kbLaXQV3ElSgPTFoVuWk4+ujktG0xh20kQPex4=";
       };
 
@@ -4795,7 +4795,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "tami5";
         repo = "sqlite.lua";
-        rev = "v1.2.2";
+        tag = "v1.2.2";
         hash = "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=";
       };
 
@@ -5035,7 +5035,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "gptlang";
         repo = "lua-tiktoken";
-        rev = "v0.2.5";
+        tag = "v0.2.5";
         hash = "sha256-V3dpFS590QkJQRIAeEgxakvoOGrilolWHutKn9zlOsg=";
       };
 
@@ -5071,7 +5071,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "tl";
-        rev = "v0.24.8";
+        tag = "v0.24.8";
         hash = "sha256-bjk/e+FuW0pSaVkRXIiYWhaNGU08Mgyvb7U7lc+8k2w=";
       };
 
@@ -5099,22 +5099,22 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "toml-edit";
-      version = "0.6.1-1";
+      version = "0.7.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/toml-edit-0.6.1-1.rockspec";
-          sha256 = "0crvmigffka3n7583r1a7fgcjfq5b0819a7d155q50m52b7afc4z";
+          url = "mirror://luarocks/toml-edit-0.7.0-1.rockspec";
+          sha256 = "174kjw3j6p1q5wxd34929wlm4hsv5s7ma44nccy3l0b52g453afg";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.1.zip";
-        sha256 = "03gxfj2km4j08cx8yv70wvzwynnlwai6cdprrxnbf76mwy877hpg";
+        url = "https://github.com/lumen-oss/toml-edit.lua/archive/v0.7.0.zip";
+        sha256 = "03wg6mwmj802a5iv4fklz0zwd9slpw9hjzwj5068gf2lihkkwjzh";
       };
 
       disabled = luaOlder "5.1";
       nativeBuildInputs = [ luarocks-build-rust-mlua ];
 
       meta = {
-        homepage = "https://github.com/nvim-neorocks/toml-edit.lua";
+        homepage = "https://github.com/lumen-oss/toml-edit.lua";
         description = "TOML Parser + Formatting and Comment-Preserving Editor";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "MIT";
@@ -5233,7 +5233,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "ToxicFrog";
         repo = "vstruct";
-        rev = "v2.1.1";
+        tag = "v2.1.1";
         hash = "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=";
       };
 
@@ -5265,7 +5265,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "notomo";
         repo = "vusted";
-        rev = "v2.5.3";
+        tag = "v2.5.3";
         hash = "sha256-b07aSgDgSNpALs5en8ZXLEd/ThLEWX/dTME8Rg1K15I=";
       };
 
@@ -5300,7 +5300,7 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "manoelcampos";
         repo = "xml2lua";
-        rev = "v1.6-2";
+        tag = "v1.6-2";
         hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0=";
       };
 
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index b657f56eed47..92b12d039847 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -1080,10 +1080,9 @@ in
   });
 
   toml-edit = prev.toml-edit.overrideAttrs (old: {
-
     cargoDeps = rustPlatform.fetchCargoVendor {
       inherit (old) src;
-      hash = "sha256-ow0zefFFrU91Q2PJww2jtd6nqUjwXUtfQzjkzl/AXuo=";
+      hash = "sha256-8lYvdraKEd1nf8dkZuSDQRVJvX56gHCcTZVtyoy/0IM=";
     };
 
     NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (
@@ -1095,7 +1094,6 @@ in
       rustPlatform.cargoSetupHook
       lua.pkgs.luarocks-build-rust-mlua
     ];
-
   });
 
   tree-sitter-http = prev.tree-sitter-http.overrideAttrs (old: {

From 809e6c53de3f9c6f86b76f170cbad6ee01949c0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Feb 2026 21:54:25 +0000
Subject: [PATCH 35/66] halo: 2.22.13 -> 2.22.14

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

diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index d3f76f1a6042..01b3c949931a 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "halo";
-  version = "2.22.13";
+  version = "2.22.14";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar";
-    hash = "sha256-SYpO+A7si9k/zTyNXpZpxuHbbOv3JofBQv0fISfDRaQ=";
+    hash = "sha256-8AAiR8EVG/3mHpRr85O6zRcrxu5/P+VK2+QaV9ARAJ8=";
   };
 
   nativeBuildInputs = [

From b8c53d20c550df022dbcd3d22951933326dcba76 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 14 Feb 2026 23:47:35 +0100
Subject: [PATCH 36/66] cel-go: 0.21.0 -> 0.27.0

---
 pkgs/by-name/ce/cel-go/package.nix | 42 +++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index df3c11d397cf..242b261a581f 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -3,21 +3,41 @@
   buildGoModule,
   fetchFromGitHub,
 }:
+let
+  cel-spec = buildGoModule (finalAttrs: {
+    pname = "cel-spec";
+    version = "0.25.1";
 
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "cel-spec";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-D9NHnQerquU2nDhDIheHmzV2FUwKi+MfTO+sehMXudg=";
+    };
+
+    vendorHash = "sha256-7Ngemih4jRO6VHSH2QxU/p1Q/E/ukUZ5wuUbZzRj6kA=";
+
+    installPhase = ''
+      runHook preInstall
+      cp -r . $out
+      runHook postInstall
+    '';
+  });
+in
 buildGoModule (finalAttrs: {
   pname = "cel-go";
-  version = "0.21.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cel-go";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-t451e3Pkkt4pmBvS0DBSHOVg7P8ipJd28XyiQ6P/QIQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gry3Kwx9SKFxLrUCVpg4hxv5J1R6HzHWW9W0OG7dpKA=";
   };
 
   modRoot = "repl";
 
-  vendorHash = "sha256-t/GEbpnqpLQ79ETqS9TAgy+2z9FoifAmkHbfKUxDBZA=";
+  vendorHash = "sha256-J0O3yGBYsX+9Eel0O5crUJxk0DNLxob/Tsue57O9Toc=";
 
   subPackages = [
     "main"
@@ -28,16 +48,26 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
+  postPatch = ''
+    substituteInPlace repl/go.mod \
+      --replace-fail "../../cel-spec" "./cel-spec"
+  '';
+
+  preBuild = ''
+    mkdir cel-spec
+    cp -r ${cel-spec}/* cel-spec
+  '';
+
   postInstall = ''
     mv $out/bin/{main,cel-go}
   '';
 
   meta = {
+    changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.tag}";
     description = "Fast, portable, non-Turing complete expression evaluation with gradual typing";
-    mainProgram = "cel-go";
     homepage = "https://github.com/google/cel-go";
-    changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.asl20;
+    mainProgram = "cel-go";
     maintainers = [ ];
   };
 })

From 31ec694bbfaf721af2cc436886fb674e55b319df Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 14 Feb 2026 23:47:59 +0100
Subject: [PATCH 37/66] cel-go: add hythera as maintanier

---
 pkgs/by-name/ce/cel-go/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index 242b261a581f..7561eb642de7 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -68,6 +68,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/google/cel-go";
     license = lib.licenses.asl20;
     mainProgram = "cel-go";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
   };
 })

From 77ca080475df714d3ea0f2d438eb1494efb208ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Feb 2026 01:19:11 +0100
Subject: [PATCH 38/66] python310: drop

Reaches end of life before NixOS 26.05 and therefore has to leave early.
---
 doc/languages-frameworks/python.section.md    |  11 +-
 .../services/security/pass-secret-service.nix |   2 +-
 .../science/math/caffe/default.nix            |   3 +-
 .../python/cpython/3.10/no-ldconfig.patch     |  52 ----
 .../3.7/python-3.x-distutils-C++.patch        | 248 ------------------
 .../python/cpython/3.8/no-ldconfig.patch      | 106 --------
 .../python/cpython/3.9/darwin-tcl-tk.patch    |  15 --
 .../python/cpython/3.9/no-ldconfig.patch      |  51 ----
 .../interpreters/python/cpython/default.nix   |   8 +-
 .../interpreters/python/default.nix           |  12 -
 .../interpreters/python/passthrufun.nix       |   4 -
 .../interpreters/python/pypy/default.nix      |   7 -
 .../python/python-packages-base.nix           |   4 -
 .../python-modules/aiohttp/default.nix        |   6 -
 .../python-modules/fastavro/default.nix       |   4 -
 pkgs/top-level/aliases.nix                    |   1 -
 pkgs/top-level/all-packages.nix               |   2 -
 pkgs/top-level/python-aliases.nix             |   2 -
 18 files changed, 8 insertions(+), 530 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index ce7ac04dd9b1..bafa9fe12b91 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -50,7 +50,6 @@ sets are
 
 * `pkgs.python27Packages`
 * `pkgs.python3Packages`
-* `pkgs.python310Packages`
 * `pkgs.python311Packages`
 * `pkgs.python312Packages`
 * `pkgs.python313Packages`
@@ -897,7 +896,7 @@ on NixOS.
   # ...
 
   environment.systemPackages = with pkgs; [
-    (python310.withPackages (
+    (python314.withPackages (
       ps: with ps; [
         numpy
         toolz
@@ -1683,7 +1682,7 @@ with import <nixpkgs> { };
           });
         };
       in
-      pkgs.python310.override { inherit packageOverrides; };
+      pkgs.python313.override { inherit packageOverrides; };
 
   in
   python.withPackages (ps: [ ps.pandas ])
@@ -1707,7 +1706,7 @@ with import <nixpkgs> { };
   let
     packageOverrides = self: super: { scipy = super.scipy_0_17; };
   in
-  (pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
+  (pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
 ).env
 ```
 
@@ -1723,13 +1722,13 @@ let
   newpkgs = import pkgs.path {
     overlays = [
       (self: super: {
-        python310 =
+        python313 =
           let
             packageOverrides = python-self: python-super: {
               numpy = python-super.numpy_1_18;
             };
           in
-          super.python310.override { inherit packageOverrides; };
+          super.python313.override { inherit packageOverrides; };
       })
     ];
   };
diff --git a/nixos/modules/services/security/pass-secret-service.nix b/nixos/modules/services/security/pass-secret-service.nix
index 7dc21b44a6f9..0a74b2dbf5d3 100644
--- a/nixos/modules/services/security/pass-secret-service.nix
+++ b/nixos/modules/services/security/pass-secret-service.nix
@@ -12,7 +12,7 @@ in
     enable = lib.mkEnableOption "pass secret service";
 
     package = lib.mkPackageOption pkgs "pass-secret-service" {
-      example = "pass-secret-service.override { python3 = pkgs.python310 }";
+      example = "pass-secret-service.override { python3 = pkgs.python315 }";
     };
   };
 
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index f755ad43abe9..24f00b3a4bce 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -175,8 +175,7 @@ stdenv.mkDerivation rec {
     homepage = "http://caffe.berkeleyvision.org/";
     maintainers = [ ];
     broken =
-      (pythonSupport && (python.isPy310))
-      || !(leveldbSupport -> (leveldb != null && snappy != null))
+      !(leveldbSupport -> (leveldb != null && snappy != null))
       || !(pythonSupport -> (python != null && numpy != null));
     license = lib.licenses.bsd2;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
deleted file mode 100644
index e65883ab895a..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001
-From: Jonathan Ringer <jonringer117@gmail.com>
-Date: Mon, 9 Nov 2020 10:24:35 -0800
-Subject: [PATCH] CPython: Don't use ldconfig
-
----
- Lib/ctypes/util.py | 77 ++--------------------------------------------
- 1 file changed, 2 insertions(+), 75 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 0c2510e..7fb98af 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -268,34 +222,7 @@ elif os.name == "posix":
-     else:
- 
-         def _findSoname_ldconfig(name):
--            import struct
--            if struct.calcsize('l') == 4:
--                machine = os.uname().machine + '-32'
--            else:
--                machine = os.uname().machine + '-64'
--            mach_map = {
--                'x86_64-64': 'libc6,x86-64',
--                'ppc64-64': 'libc6,64bit',
--                'sparc64-64': 'libc6,64bit',
--                's390x-64': 'libc6,64bit',
--                'ia64-64': 'libc6,IA-64',
--                }
--            abi_type = mach_map.get(machine, 'libc6')
--
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
--            regex = os.fsencode(regex % (re.escape(name), abi_type))
--            try:
--                with subprocess.Popen(['/sbin/ldconfig', '-p'],
--                                      stdin=subprocess.DEVNULL,
--                                      stderr=subprocess.DEVNULL,
--                                      stdout=subprocess.PIPE,
--                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
--                    res = re.search(regex, p.stdout.read())
--                    if res:
--                        return os.fsdecode(res.group(1))
--            except OSError:
--                pass
-+            return None
- 
-         def _findLib_ld(name):
-             # See issue #9998 for why this is needed
--- 
-2.28.0
-
diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
deleted file mode 100644
index 243313f76548..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch
+++ /dev/null
@@ -1,248 +0,0 @@
---- a/Lib/_osx_support.py
-+++ b/Lib/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
---- a/Lib/distutils/cygwinccompiler.py
-+++ b/Lib/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -170,9 +170,11 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cxxflags = cflags
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -187,19 +189,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = cflags + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -208,13 +218,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
---- a/Lib/distutils/unixccompiler.py
-+++ b/Lib/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["cc"],
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
-
-     if sys.platform[:6] == "darwin":
-@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler):
-
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
-
-@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--
--                    if os.path.basename(linker[i]) == 'ld_so_aix':
--                        # AIX platforms prefix the compiler with the ld_so_aix
--                        # script, so we need to adjust our linker index
--                        offset = 1
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-                     else:
--                        offset = 0
--
--                    linker[i+offset] = self.compiler_cxx[i]
-+                        linker = self.linker_so[:]
-
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
- 	    *\ -s*|s*) quiet="-q";; \
- 	    *) quiet="";; \
- 	esac; \
--	echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-+	echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
--	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-+	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
deleted file mode 100644
index 41d3ab52345b..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
-From: Greg Roodt <greg@canva.com>
-Date: Wed, 9 Dec 2020 17:59:24 +1100
-Subject: [PATCH] Don't use ldconfig
-
----
- Lib/ctypes/util.py | 77 ++--------------------------------------------
- 1 file changed, 2 insertions(+), 75 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 0c2510e161..7fb98af308 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -100,53 +100,7 @@ elif os.name == "posix":
-             return thefile.read(4) == elf_header
-
-     def _findLib_gcc(name):
--        # Run GCC's linker with the -t (aka --trace) option and examine the
--        # library name it prints out. The GCC command will fail because we
--        # haven't supplied a proper program with main(), but that does not
--        # matter.
--        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
--
--        c_compiler = shutil.which('gcc')
--        if not c_compiler:
--            c_compiler = shutil.which('cc')
--        if not c_compiler:
--            # No C compiler available, give up
--            return None
--
--        temp = tempfile.NamedTemporaryFile()
--        try:
--            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
--
--            env = dict(os.environ)
--            env['LC_ALL'] = 'C'
--            env['LANG'] = 'C'
--            try:
--                proc = subprocess.Popen(args,
--                                        stdout=subprocess.PIPE,
--                                        stderr=subprocess.STDOUT,
--                                        env=env)
--            except OSError:  # E.g. bad executable
--                return None
--            with proc:
--                trace = proc.stdout.read()
--        finally:
--            try:
--                temp.close()
--            except FileNotFoundError:
--                # Raised if the file was already removed, which is the normal
--                # behaviour of GCC if linking fails
--                pass
--        res = re.findall(expr, trace)
--        if not res:
--            return None
--
--        for file in res:
--            # Check if the given file is an elf file: gcc can report
--            # some files that are linker scripts and not actual
--            # shared objects. See bpo-41976 for more details
--            if not _is_elf(file):
--                continue
--            return os.fsdecode(file)
-+        return None
-
-
-     if sys.platform == "sunos5":
-@@ -268,34 +222,7 @@ elif os.name == "posix":
-     else:
-
-         def _findSoname_ldconfig(name):
--            import struct
--            if struct.calcsize('l') == 4:
--                machine = os.uname().machine + '-32'
--            else:
--                machine = os.uname().machine + '-64'
--            mach_map = {
--                'x86_64-64': 'libc6,x86-64',
--                'ppc64-64': 'libc6,64bit',
--                'sparc64-64': 'libc6,64bit',
--                's390x-64': 'libc6,64bit',
--                'ia64-64': 'libc6,IA-64',
--                }
--            abi_type = mach_map.get(machine, 'libc6')
--
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
--            regex = os.fsencode(regex % (re.escape(name), abi_type))
--            try:
--                with subprocess.Popen(['/sbin/ldconfig', '-p'],
--                                      stdin=subprocess.DEVNULL,
--                                      stderr=subprocess.DEVNULL,
--                                      stdout=subprocess.PIPE,
--                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
--                    res = re.search(regex, p.stdout.read())
--                    if res:
--                        return os.fsdecode(res.group(1))
--            except OSError:
--                pass
-+            return None
-
-         def _findLib_ld(name):
-             # See issue #9998 for why this is needed
---
-2.24.3 (Apple Git-128)
diff --git a/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch b/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch
deleted file mode 100644
index a9b0c0677c5e..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 04eb6b2..2e1160d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext):
-         # Rather than complicate the code below, detecting and building
-         # AquaTk is a separate method. Only one Tkinter will be built on
-         # Darwin - either AquaTk, if it is found, or X11 based Tk.
--        if (MACOS and self.detect_tkinter_darwin()):
--            return True
-+        # if (MACOS and self.detect_tkinter_darwin()):
-+        #     return True
- 
-         # Assume we haven't found any of the libraries or include files
-         # The versions with dots are used on Unix, and the versions without
diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
deleted file mode 100644
index 1a5eccb9eca8..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
-From: Greg Roodt <greg@canva.com>
-Date: Wed, 9 Dec 2020 17:59:24 +1100
-Subject: [PATCH] Don't use ldconfig
-
----
- Lib/ctypes/util.py | 77 ++--------------------------------------------
- 1 file changed, 2 insertions(+), 75 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 0c2510e161..7fb98af308 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -268,34 +222,7 @@ elif os.name == "posix":
-     else:
-
-         def _findSoname_ldconfig(name):
--            import struct
--            if struct.calcsize('l') == 4:
--                machine = os.uname().machine + '-32'
--            else:
--                machine = os.uname().machine + '-64'
--            mach_map = {
--                'x86_64-64': 'libc6,x86-64',
--                'ppc64-64': 'libc6,64bit',
--                'sparc64-64': 'libc6,64bit',
--                's390x-64': 'libc6,64bit',
--                'ia64-64': 'libc6,IA-64',
--                }
--            abi_type = mach_map.get(machine, 'libc6')
--
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
--            regex = os.fsencode(regex % (re.escape(name), abi_type))
--            try:
--                with subprocess.Popen(['/sbin/ldconfig', '-p'],
--                                      stdin=subprocess.DEVNULL,
--                                      stderr=subprocess.DEVNULL,
--                                      stdout=subprocess.PIPE,
--                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
--                    res = re.search(regex, p.stdout.read())
--                    if res:
--                        return os.fsdecode(res.group(1))
--            except OSError:
--                pass
-+            return None
-
-         def _findLib_ld(name):
-             # See issue #9998 for why this is needed
---
-2.24.3 (Apple Git-128)
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 13ede05bf2b7..433872f443ec 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -368,19 +368,13 @@ stdenv.mkDerivation (finalAttrs: {
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
   ]
-  ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
-    # Stop checking for TCL/TK in global macOS locations
-    ./3.9/darwin-tcl-tk.patch
-  ]
   ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
     # Fix for http://bugs.python.org/issue1222585
     # Upstream distutils is calling C compiler to compile C++ code, which
     # only works for GCC and Apple Clang. This makes distutils to call C++
     # compiler when needed.
     (
-      if pythonAtLeast "3.7" && pythonOlder "3.11" then
-        ./3.7/python-3.x-distutils-C++.patch
-      else if pythonAtLeast "3.11" then
+      if pythonAtLeast "3.11" then
         ./3.11/python-3.x-distutils-C++.patch
       else
         fetchpatch {
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 7b0a4bfd8591..dcefe50b516d 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -42,18 +42,6 @@
       inherit passthruFun;
     };
 
-    python310 = callPackage ./cpython {
-      self = __splicedPackages.python310;
-      sourceVersion = {
-        major = "3";
-        minor = "10";
-        patch = "19";
-        suffix = "";
-      };
-      hash = "sha256-yPSlllciAdgd19+R9w4XfhmnDx1ImWi1S1+78pqXwHY=";
-      inherit passthruFun;
-    };
-
     python311 = callPackage ./cpython {
       self = __splicedPackages.python311;
       sourceVersion = {
diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix
index 8b930de5f394..e302e9b6bdc0 100644
--- a/pkgs/development/interpreters/python/passthrufun.nix
+++ b/pkgs/development/interpreters/python/passthrufun.nix
@@ -110,10 +110,6 @@ let
 in
 rec {
   isPy27 = pythonVersion == "2.7";
-  isPy37 = pythonVersion == "3.7";
-  isPy38 = pythonVersion == "3.8";
-  isPy39 = pythonVersion == "3.9";
-  isPy310 = pythonVersion == "3.10";
   isPy311 = pythonVersion == "3.11";
   isPy312 = pythonVersion == "3.12";
   isPy313 = pythonVersion == "3.13";
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 41240a3decc3..bee93cf1451f 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -353,13 +353,6 @@ stdenv.mkDerivation rec {
         "test_inspect"
         "test_pydoc"
         "test_warnings"
-      ]
-      ++ lib.optionals isPy310 [
-        "test_contextlib_async"
-        "test_future"
-        "test_lzma"
-        "test_module"
-        "test_typing"
       ];
     in
     ''
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 77ac26630161..6fbeb7301215 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -168,10 +168,6 @@ in
   inherit lib pkgs stdenv;
   inherit (python.passthru)
     isPy27
-    isPy37
-    isPy38
-    isPy39
-    isPy310
     isPy311
     isPy312
     isPy313
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 11c3ded60602..1055fc0ffbe6 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   replaceVars,
-  isPy310,
   isPyPy,
   pythonOlder,
 
@@ -141,11 +140,6 @@ buildPythonPackage rec {
     # Cannot connect to host example.com:443 ssl:default [Could not contact DNS servers]
     "test_tcp_connector_ssl_shutdown_timeout_passed_to_create_connection"
   ]
-  # these tests fail with python310 but succeeds with 11+
-  ++ lib.optionals isPy310 [
-    "test_https_proxy_unsupported_tls_in_tls"
-    "test_tcp_connector_raise_connector_ssl_error"
-  ]
   ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index a2534c60fdd0..c344a09d0c12 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   cython,
   fetchFromGitHub,
-  isPy38,
   lib,
   lz4,
   numpy,
@@ -60,9 +59,6 @@ buildPythonPackage rec {
   # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676.
   disabledTests = [ "test_cython_python" ];
 
-  # CLI tests are broken on Python 3.8. See https://github.com/fastavro/fastavro/issues/558.
-  disabledTestPaths = lib.optionals isPy38 [ "tests/test_main_cli.py" ];
-
   pythonImportsCheck = [ "fastavro" ];
 
   meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 68c5cba26d7a..72d2a7872b4f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1608,7 +1608,6 @@ mapAliases {
   pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27
   pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27
   python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
-  python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2500b65d51..1b33a67a270e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5253,7 +5253,6 @@ with pkgs;
   pythonInterpreters = callPackage ./../development/interpreters/python { };
   inherit (pythonInterpreters)
     python27
-    python310
     python311
     python312
     python313
@@ -5270,7 +5269,6 @@ with pkgs;
 
   # Python package sets.
   python27Packages = python27.pkgs;
-  python310Packages = python310.pkgs;
   python311Packages = python311.pkgs;
   python312Packages = python312.pkgs;
   python313Packages = recurseIntoAttrs python313.pkgs;
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 75982d6ec036..a857b821c257 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -38,13 +38,11 @@ mapAliases {
   python2Packages = throw "do not use python2Packages when building Python packages, specify each used package as a separate argument"; # do not remove
   python27Packages = throw "do not use python27Packages when building Python packages, specify each used package as a separate argument"; # do not remove
   python3Packages = throw "do not use python3Packages when building Python packages, specify each used package as a separate argument"; # do not remove
-  python310Packages = throw "do not use python310Packages when building Python packages, specify each used package as a separate argument"; # do not remove
   python311Packages = throw "do not use python311Packages when building Python packages, specify each used package as a separate argument"; # do not remove
   python312Packages = throw "do not use python312Packages when building Python packages, specify each used package as a separate argument"; # do not remove
   python313Packages = throw "do not use python313Packages when building Python packages, specify each used package as a separate argument"; # do not remove
   python2 = throw "do not use python2 when building Python packages, use the generic python parameter instead"; # do not remove
   python3 = throw "do not use python3 when building Python packages, use the generic python parameter instead"; # do not remove
-  python310 = throw "do not use python310 when building Python packages, use the generic python parameter instead"; # do not remove
   python311 = throw "do not use python311 when building Python packages, use the generic python parameter instead"; # do not remove
   python312 = throw "do not use python312 when building Python packages, use the generic python parameter instead"; # do not remove
   python313 = throw "do not use python313 when building Python packages, use the generic python parameter instead"; # do not remove

From 6ce5b9040da15cc74871d8a18559b48874d60587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Feb 2026 19:18:51 -0800
Subject: [PATCH 39/66] flare-signal: 0.18.1 -> 0.18.3

Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.18.1...0.18.3

Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.18.3/CHANGELOG.md
---
 pkgs/by-name/fl/flare-signal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index d0af3557304e..e7237fb2869e 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -23,19 +23,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.18.1";
+  version = "0.18.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-BJAmIdkJhyfZRQLUZp34c5reuBleXWpmFJhNMFYTEXw=";
+    hash = "sha256-+25nDG/xw82Iv6gGYWmGHUBf4CbTLBTzrOqKdrCFIMQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-MD7YPO3q2WlFgAacvPHtj6UTnFogbC6T62mNic5955w=";
+    hash = "sha256-nY+rxWzZJoQRB+Pn4yjof+fCcI2GU2+QFCN73kgRLZ0=";
   };
 
   nativeBuildInputs = [

From 8ea6bde88dd8ac77d9d81135d71a075d5d691c87 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Feb 2026 03:11:13 +0100
Subject: [PATCH 40/66] treewide: prune pythonOlder 3.10/3.11

This is a post 3.10 removal cleanup.
---
 .../inkscape/extensions/inkstitch/default.nix | 44 +++++++++----------
 pkgs/by-name/au/autosuspend/package.nix       |  2 -
 pkgs/by-name/cr/cruft/package.nix             | 15 +++----
 pkgs/by-name/gc/gcovr/package.nix             | 17 +++----
 pkgs/by-name/pg/pgsrip/package.nix            |  2 -
 pkgs/by-name/po/poetry/unwrapped.nix          |  5 ---
 pkgs/by-name/pr/prefect/package.nix           |  3 +-
 pkgs/by-name/py/pyrosimple/package.nix        |  3 --
 pkgs/by-name/sc/scriv/package.nix             | 21 ++++-----
 pkgs/by-name/sn/snakefmt/package.nix          |  2 -
 pkgs/by-name/sq/sqlite3-to-mysql/package.nix  | 35 +++++++--------
 .../interpreters/python/cpython/default.nix   |  5 ---
 .../python/mk-python-derivation.nix           | 17 +++----
 .../python-modules/aemet-opendata/default.nix |  3 --
 .../python-modules/agate/default.nix          |  1 -
 .../python-modules/ailment/default.nix        |  3 --
 .../aioairzone-cloud/default.nix              |  3 --
 .../python-modules/aioambient/default.nix     |  3 --
 .../python-modules/aiobtclientrpc/default.nix |  3 +-
 .../python-modules/aioconsole/default.nix     |  1 -
 .../python-modules/aiodiscover/default.nix    |  5 ---
 .../aioelectricitymaps/default.nix            |  3 --
 .../python-modules/aioguardian/default.nix    |  3 --
 .../python-modules/aiohttp-socks/default.nix  |  3 +-
 .../python-modules/aiohttp/default.nix        |  3 --
 .../python-modules/aiojobs/default.nix        |  4 --
 .../python-modules/aiolyric/default.nix       |  3 --
 .../python-modules/aiomcache/default.nix      |  4 +-
 .../python-modules/aionut/default.nix         |  3 --
 .../python-modules/aiooncue/default.nix       |  3 --
 .../aioopenexchangerates/default.nix          |  3 --
 .../python-modules/aioslimproto/default.nix   |  3 --
 .../python-modules/aiosonos/default.nix       |  3 --
 .../python-modules/aiosql/default.nix         |  1 -
 .../aiotankerkoenig/default.nix               |  3 --
 .../python-modules/aiovlc/default.nix         |  3 --
 .../python-modules/aiowaqi/default.nix        |  3 --
 .../python-modules/aiowebostv/default.nix     |  3 --
 .../python-modules/aiowithings/default.nix    |  3 --
 .../python-modules/airgradient/default.nix    |  3 --
 .../python-modules/alarmdecoder/default.nix   |  1 -
 .../python-modules/allantools/default.nix     |  1 -
 .../allure-python-commons/default.nix         |  1 -
 .../python-modules/angr/default.nix           |  3 --
 .../python-modules/anyio/default.nix          |  3 --
 .../apple-weatherkit/default.nix              |  3 --
 .../python-modules/arcam-fmj/default.nix      |  3 --
 .../argparse-manpage/default.nix              |  7 +--
 .../python-modules/array-record/default.nix   |  3 +-
 .../python-modules/astroid/default.nix        |  4 --
 .../python-modules/astropy/default.nix        |  3 --
 .../python-modules/async-lru/default.nix      |  4 --
 .../python-modules/async-stagger/default.nix  |  3 --
 .../python-modules/asyncpg/default.nix        |  6 ---
 .../python-modules/asyncwhois/default.nix     |  3 +-
 .../python-modules/atproto/default.nix        |  1 -
 .../python-modules/autoflake/default.nix      |  4 +-
 .../python-modules/autopep8/default.nix       |  4 +-
 .../default.nix                               |  3 --
 .../azure-mgmt-iothub/default.nix             |  3 --
 .../azure-mgmt-recoveryservices/default.nix   |  3 --
 .../python-modules/bellows/default.nix        |  1 -
 .../python-modules/bentoml/default.nix        |  5 +--
 .../python-modules/black/default.nix          |  7 ---
 .../bleak-retry-connector/default.nix         |  1 -
 .../python-modules/bleak/default.nix          |  4 --
 .../bluecurrent-api/default.nix               |  3 --
 .../bluemaestro-ble/default.nix               |  3 --
 .../bluetooth-auto-recovery/default.nix       |  5 ---
 .../bluetooth-sensor-state-data/default.nix   |  3 --
 .../python-modules/bork/default.nix           |  5 +--
 .../python-modules/bqplot/default.nix         |  1 -
 .../python-modules/build/default.nix          |  5 +--
 .../python-modules/bundlewrap/default.nix     |  5 +--
 .../python-modules/cattrs/default.nix         |  5 ---
 .../python-modules/cbor2/default.nix          |  1 -
 .../python-modules/check-manifest/default.nix |  5 +--
 .../python-modules/checkdmarc/default.nix     |  1 -
 .../python-modules/claripy/default.nix        |  3 --
 .../python-modules/cle/default.nix            |  3 --
 .../python-modules/cleanit/default.nix        |  3 --
 .../python-modules/clldutils/default.nix      |  1 -
 .../python-modules/cloudpathlib/default.nix   |  8 ----
 .../python-modules/configshell-fb/default.nix |  1 -
 .../python-modules/constantly/default.nix     |  3 +-
 .../python-modules/corallium/default.nix      |  3 --
 .../python-modules/coverage/default.nix       |  8 ----
 .../python-modules/ctypesgen/default.nix      |  3 --
 .../python-modules/cx-freeze/default.nix      |  5 ---
 .../dataclass-wizard/default.nix              |  1 -
 .../python-modules/datalad/default.nix        |  6 +--
 .../python-modules/dendropy/default.nix       |  1 -
 .../dicomweb-client/default.nix               |  1 -
 .../django-modeltranslation/default.nix       |  3 --
 .../python-modules/django-stubs/default.nix   |  5 +--
 .../python-modules/docformatter/default.nix   |  1 -
 .../python-modules/docutils/default.nix       |  1 -
 .../python-modules/dparse/default.nix         |  4 +-
 .../drf-spectacular/default.nix               |  1 -
 .../python-modules/dropmqttapi/default.nix    |  3 --
 .../python-modules/easyenergy/default.nix     |  3 --
 .../python-modules/edlib/default.nix          |  1 -
 .../python-modules/eiswarnung/default.nix     |  3 --
 .../python-modules/elgato/default.nix         |  3 --
 .../python-modules/energyzero/default.nix     |  3 --
 .../entry-points-txt/default.nix              |  1 -
 .../python-modules/executing/default.nix      |  1 -
 .../extension-helpers/default.nix             |  4 +-
 .../fast-array-utils/default.nix              |  1 -
 .../python-modules/findpython/default.nix     |  1 -
 .../python-modules/flake8-bugbear/default.nix |  1 -
 .../python-modules/flask-admin/default.nix    |  5 ---
 .../python-modules/flit-scm/default.nix       |  8 +---
 .../python-modules/forecast-solar/default.nix |  3 --
 .../python-modules/fyta-cli/default.nix       |  3 --
 .../genie-partner-sdk/default.nix             |  3 --
 .../python-modules/glances-api/default.nix    |  3 --
 .../python-modules/glom/default.nix           |  3 --
 .../google-api-core/default.nix               |  1 -
 .../google-cloud-storage/default.nix          |  1 -
 .../python-modules/gotailwind/default.nix     |  3 --
 .../gotenberg-client/default.nix              |  3 --
 .../python-modules/gremlinpython/default.nix  |  1 -
 .../python-modules/gridnet/default.nix        |  3 --
 .../python-modules/h5netcdf/default.nix       |  1 -
 .../python-modules/ha-ffmpeg/default.nix      |  6 ---
 .../python-modules/habluetooth/default.nix    |  3 --
 .../python-modules/hacking/default.nix        |  1 -
 .../python-modules/hakuin/default.nix         |  3 --
 .../python-modules/hap-python/default.nix     |  1 -
 .../hatch-fancy-pypi-readme/default.nix       |  5 +--
 .../hatch-jupyter-builder/default.nix         |  5 +--
 .../python-modules/hatch-odoo/default.nix     |  5 ---
 .../python-modules/hatchling/default.nix      |  5 +--
 .../home-assistant-bluetooth/default.nix      |  3 --
 .../home-assistant-chip-wheels/default.nix    |  1 -
 .../python-modules/httpx-socks/default.nix    |  3 +-
 .../development/python-modules/hy/default.nix |  1 -
 .../python-modules/hypercorn/default.nix      |  3 --
 .../python-modules/hypothesis/default.nix     |  5 +--
 .../python-modules/idstools/default.nix       |  3 --
 .../python-modules/ifcopenshell/default.nix   |  1 -
 .../python-modules/incremental/default.nix    |  4 +-
 .../python-modules/inequality/default.nix     |  2 -
 .../inline-snapshot/default.nix               |  4 --
 .../python-modules/instructor/default.nix     |  1 -
 .../intensity-normalization/default.nix       |  3 --
 .../python-modules/ipdb/default.nix           |  7 ---
 .../python-modules/itemadapter/default.nix    |  1 -
 .../python-modules/jeepney/default.nix        |  5 ---
 .../python-modules/jellyfish/default.nix      |  3 --
 .../python-modules/jsonconversion/default.nix |  3 --
 .../python-modules/jupyterlab/default.nix     |  5 +--
 .../python-modules/jupytext/default.nix       |  5 +--
 .../python-modules/keba-kecontact/default.nix |  3 --
 .../python-modules/knocki/default.nix         |  3 --
 .../python-modules/lacuscore/default.nix      |  5 +--
 .../python-modules/leaone-ble/default.nix     |  3 --
 .../python-modules/led-ble/default.nix        |  3 --
 .../python-modules/libsavitar/default.nix     |  1 -
 .../python-modules/lifelines/default.nix      |  1 -
 .../python-modules/lomond/default.nix         |  1 -
 .../python-modules/macholib/default.nix       |  5 ---
 .../python-modules/marimo/default.nix         |  5 +--
 .../python-modules/marshmallow/default.nix    | 10 -----
 .../python-modules/mashumaro/default.nix      |  4 +-
 .../python-modules/meson-python/default.nix   |  8 +---
 .../meteoswiss-async/default.nix              |  3 --
 .../python-modules/misaki/default.nix         |  1 -
 .../python-modules/mistune/default.nix        |  6 ---
 .../mkdocs-awesome-nav/default.nix            |  1 -
 .../python-modules/momepy/default.nix         |  2 -
 .../python-modules/monai-deploy/default.nix   |  1 -
 .../python-modules/monai/default.nix          |  1 -
 .../python-modules/msgspec/default.nix        |  7 +--
 .../python-modules/multidict/default.nix      |  6 ---
 .../python-modules/mypy/default.nix           |  4 +-
 .../python-modules/napari-npe2/default.nix    |  6 ---
 .../python-modules/neo4j/default.nix          |  1 -
 .../python-modules/niaarm/default.nix         |  5 +--
 .../python-modules/nipype/default.nix         |  1 -
 .../python-modules/notus-scanner/default.nix  |  5 +--
 .../python-modules/nox/default.nix            |  3 --
 .../python-modules/numba/default.nix          |  1 -
 pkgs/development/python-modules/numpy/2.nix   |  3 --
 .../python-modules/nvchecker/default.nix      |  4 +-
 .../nvidia-dlprof-pytorch-nvtx/default.nix    |  1 -
 .../python-modules/odp-amsterdam/default.nix  |  3 --
 .../python-modules/omnikinverter/default.nix  |  3 --
 .../python-modules/open-meteo/default.nix     |  3 --
 .../python-modules/openwebifpy/default.nix    |  3 --
 .../python-modules/optype/default.nix         |  3 --
 .../python-modules/p1monitor/default.nix      |  3 --
 .../python-modules/pandas/default.nix         |  3 +-
 .../python-modules/parsedatetime/default.nix  |  1 -
 .../pdm-build-locked/default.nix              |  4 --
 .../python-modules/photutils/default.nix      |  3 --
 .../python-modules/pikepdf/default.nix        |  1 -
 .../python-modules/pip-tools/default.nix      |  5 +--
 .../python-modules/pipx/default.nix           |  5 +--
 .../pixel-font-builder/default.nix            |  3 --
 .../python-modules/pkg-about/default.nix      |  3 --
 .../python-modules/platformdirs/default.nix   |  1 -
 .../python-modules/podman/default.nix         |  1 -
 .../pre-commit-hooks/default.nix              |  4 +-
 .../python-modules/prisma/default.nix         |  5 +--
 .../python-modules/propcache/default.nix      |  7 ---
 .../python-modules/psycopg/default.nix        |  5 ---
 .../python-modules/pueblo/default.nix         |  3 --
 .../python-modules/pvo/default.nix            |  3 --
 .../python-modules/py-libnuma/default.nix     |  1 -
 .../python-modules/pyasynchat/default.nix     | 12 +----
 .../python-modules/pyatmo/default.nix         |  3 --
 .../python-modules/pybids/default.nix         |  3 +-
 .../python-modules/pycfdns/default.nix        |  3 --
 .../python-modules/pychromecast/default.nix   |  3 --
 .../python-modules/pycrdt/default.nix         |  4 +-
 .../python-modules/pydaikin/default.nix       |  3 --
 .../python-modules/pydeako/default.nix        |  3 --
 .../python-modules/pydiscovergy/default.nix   |  3 --
 .../python-modules/pydocstyle/default.nix     |  3 +-
 .../python-modules/pydrawise/default.nix      |  3 --
 .../pyecotrend-ista/default.nix               |  3 --
 .../python-modules/pygments/default.nix       |  1 -
 .../python-modules/pyinfra/default.nix        |  5 +--
 .../python-modules/pyipma/default.nix         |  3 --
 .../python-modules/pyipp/default.nix          |  5 +--
 .../python-modules/pykka/default.nix          |  1 -
 .../python-modules/pylaunches/default.nix     |  3 --
 .../python-modules/pylint/default.nix         |  5 +--
 .../python-modules/pylsp-mypy/default.nix     |  5 +--
 .../pylutron-caseta/default.nix               |  8 +---
 .../python-modules/pynamodb/default.nix       |  4 +-
 .../python-modules/pyogrio/default.nix        |  3 +-
 .../python-modules/pypdf/default.nix          |  6 ---
 .../python-modules/pyppeteer-ng/default.nix   |  1 -
 .../python-modules/pyproj/default.nix         |  3 --
 .../python-modules/pyproject-api/default.nix  |  4 +-
 .../pyproject-hooks/default.nix               |  4 --
 .../pyproject-metadata/default.nix            |  4 +-
 .../pyps4-2ndscreen/default.nix               |  7 ++-
 .../python-modules/pysensibo/default.nix      |  3 --
 .../python-modules/pysml/default.nix          |  3 --
 .../python-modules/pytest-asyncio/default.nix | 11 ++---
 .../pytest-resource-path/default.nix          |  1 -
 pkgs/development/python-modules/pytest/7.nix  |  7 ---
 .../development/python-modules/pytest/8_3.nix |  7 ---
 .../python-modules/pytest/default.nix         |  7 ---
 .../python-modules/python-awair/default.nix   |  1 -
 .../python-modules/python-binance/default.nix |  3 --
 .../python-modules/python-box/default.nix     |  4 +-
 .../default.nix                               |  3 --
 .../python-lsp-black/default.nix              |  3 +-
 .../python-lsp-ruff/default.nix               |  5 +--
 .../python-modules/python-ndn/default.nix     |  3 --
 .../python-opendata-transport/default.nix     |  3 --
 .../python-modules/python-opensky/default.nix |  3 --
 .../python-modules/python-socks/default.nix   |  2 -
 .../python-swiftclient/default.nix            |  1 -
 .../python-technove/default.nix               |  3 --
 .../python-modules/python-vlc/default.nix     |  1 -
 .../python-modules/pytibber/default.nix       |  3 --
 .../python-modules/pytoolconfig/default.nix   |  4 +-
 .../python-modules/pyupgrade/default.nix      |  1 -
 .../python-modules/pyvera/default.nix         |  3 --
 .../python-modules/pyversasense/default.nix   |  3 +-
 .../python-modules/pyvex/default.nix          |  3 --
 .../python-modules/pyvisa-sim/default.nix     |  1 -
 .../python-modules/pywaze/default.nix         |  3 --
 .../python-modules/qcs-sdk-python/default.nix |  1 -
 .../python-modules/quart-trio/default.nix     |  5 +--
 .../python-modules/radios/default.nix         |  3 --
 .../python-modules/rdflib/default.nix         |  5 +--
 .../python-modules/responses/default.nix      |  5 +--
 .../python-modules/romy/default.nix           |  3 --
 .../python-modules/rstcheck-core/default.nix  |  1 -
 .../python-modules/safehttpx/default.nix      |  1 -
 .../python-modules/safety/default.nix         |  1 -
 .../scikit-build-core/default.nix             | 12 +----
 .../python-modules/scikit-build/default.nix   |  5 +--
 .../python-modules/scipy-stubs/default.nix    |  3 --
 .../python-modules/sensai-utils/default.nix   |  3 --
 .../python-modules/sensoterra/default.nix     |  3 --
 .../setuptools-generate/default.nix           |  5 +--
 .../setuptools-git-versioning/default.nix     |  5 +--
 .../python-modules/setuptools-scm/default.nix | 16 ++-----
 .../python-modules/shapely/default.nix        |  2 -
 .../python-modules/sip/default.nix            |  5 +--
 .../python-modules/skodaconnect/default.nix   |  3 --
 .../python-modules/skops/default.nix          |  1 -
 .../python-modules/solo-python/default.nix    |  1 -
 .../python-modules/soxr/default.nix           |  5 ---
 .../python-modules/sphinx/default.nix         |  7 +--
 .../python-modules/statmake/default.nix       |  5 +--
 .../python-modules/sunwatcher/default.nix     |  1 -
 .../systembridgemodels/default.nix            |  3 --
 .../python-modules/tabcmd/default.nix         |  1 -
 .../python-modules/tailscale/default.nix      |  3 --
 .../python-modules/temporalio/default.nix     |  5 +--
 .../terminaltables3/default.nix               |  3 --
 .../python-modules/tianshou/default.nix       |  3 --
 .../todoist-api-python/default.nix            |  1 -
 .../python-modules/torch/bin/default.nix      |  3 +-
 .../python-modules/torchaudio/bin.nix         |  3 +-
 .../python-modules/torchvision/bin.nix        |  3 +-
 .../python-modules/towncrier/default.nix      |  5 +--
 .../python-modules/tox/default.nix            |  7 ---
 .../python-modules/trakit/default.nix         |  3 --
 .../python-modules/trio-asyncio/default.nix   |  5 +--
 .../python-modules/trio-websocket/default.nix |  5 +--
 .../python-modules/trio/default.nix           |  4 +-
 .../python-modules/twentemilieu/default.nix   |  3 --
 .../python-modules/typed-settings/default.nix |  8 +---
 .../universal-silabs-flasher/default.nix      |  3 --
 .../python-modules/upb-lib/default.nix        |  3 --
 .../python-modules/uplink/default.nix         |  1 -
 .../python-modules/uvicorn/default.nix        |  5 +--
 .../python-modules/uvloop/default.nix         |  4 --
 .../vacuum-map-parser-base/default.nix        |  3 --
 .../vacuum-map-parser-roborock/default.nix    |  3 --
 .../python-modules/valkey/default.nix         |  5 ---
 .../python-modules/vdirsyncer/default.nix     |  1 -
 .../python-modules/vehicle/default.nix        |  3 --
 .../python-modules/versioneer/default.nix     |  8 +---
 .../python-modules/versioningit/default.nix   |  5 +--
 .../python-modules/virtualenv/default.nix     |  2 -
 .../python-modules/vulture/default.nix        |  4 --
 .../python-modules/w1thermsensor/default.nix  |  3 --
 .../python-modules/websockets/default.nix     |  5 ---
 .../python-modules/whool/default.nix          |  5 +--
 .../python-modules/wled/default.nix           |  3 --
 .../xarray-dataclass/default.nix              |  1 -
 .../python-modules/xarray/default.nix         |  3 --
 .../python-modules/xformers/default.nix       |  1 -
 .../python-modules/xnatpy/default.nix         |  1 -
 .../yalesmartalarmclient/default.nix          |  3 --
 .../python-modules/yeelight/default.nix       |  4 +-
 .../python-modules/zeroconf/default.nix       |  4 +-
 .../python-modules/zigpy-cc/default.nix       |  3 +-
 .../python-modules/zigpy-znp/default.nix      |  5 ---
 .../python-modules/zigpy/default.nix          |  5 +--
 .../python-modules/zm-py/default.nix          |  3 --
 342 files changed, 161 insertions(+), 1120 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index 7ad563339584..0024092cfcd5 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -8,30 +8,26 @@
 let
   version = "3.2.2";
 
-  dependencies =
-    with python3.pkgs;
-    [
-      pyembroidery
-      inkex
-      wxpython
-      networkx
-      platformdirs
-      shapely
-      lxml
-      appdirs
-      numpy
-      jinja2
-      requests
-      colormath2
-      flask
-      fonttools
-      trimesh
-      scipy
-      diskcache
-      flask-cors
-    ]
-    # Inkstitch uses the builtin tomllib instead when Python >=3.11
-    ++ lib.optional (pythonOlder "3.11") tomli;
+  dependencies = with python3.pkgs; [
+    pyembroidery
+    inkex
+    wxpython
+    networkx
+    platformdirs
+    shapely
+    lxml
+    appdirs
+    numpy
+    jinja2
+    requests
+    colormath2
+    flask
+    fonttools
+    trimesh
+    scipy
+    diskcache
+    flask-cors
+  ];
   pyEnv = python3.withPackages (_: dependencies);
 in
 python3.pkgs.buildPythonApplication {
diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix
index 3c3ba6659938..2f8862c465d9 100644
--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@@ -10,8 +10,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   version = "9.0.1";
   pyproject = true;
 
-  disabled = python3.pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "languitar";
     repo = "autosuspend";
diff --git a/pkgs/by-name/cr/cruft/package.nix b/pkgs/by-name/cr/cruft/package.nix
index 103bfa81345b..cfff76b9e84c 100644
--- a/pkgs/by-name/cr/cruft/package.nix
+++ b/pkgs/by-name/cr/cruft/package.nix
@@ -28,15 +28,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pytest7CheckHook
   ];
 
-  dependencies =
-    with python3Packages;
-    [
-      click
-      cookiecutter
-      gitpython
-      typer
-    ]
-    ++ lib.optional (pythonOlder "3.11") python3Packages.toml;
+  dependencies = with python3Packages; [
+    click
+    cookiecutter
+    gitpython
+    typer
+  ];
 
   pythonImportsCheck = "cruft";
 
diff --git a/pkgs/by-name/gc/gcovr/package.nix b/pkgs/by-name/gc/gcovr/package.nix
index e2e0948687fa..13c1a542e91c 100644
--- a/pkgs/by-name/gc/gcovr/package.nix
+++ b/pkgs/by-name/gc/gcovr/package.nix
@@ -35,17 +35,12 @@ python3Packages.buildPythonPackage (finalAttrs: {
       --replace-fail "hatch-vcs==0.4.0" "hatch-vcs>=0.4.0"
   '';
 
-  dependencies =
-    with python3Packages;
-    (
-      [
-        colorlog
-        jinja2
-        lxml
-        pygments
-      ]
-      ++ lib.optionals (pythonOlder "3.11") [ tomli ]
-    );
+  dependencies = with python3Packages; [
+    colorlog
+    jinja2
+    lxml
+    pygments
+  ];
 
   pythonImportsCheck = [
     "gcovr"
diff --git a/pkgs/by-name/pg/pgsrip/package.nix b/pkgs/by-name/pg/pgsrip/package.nix
index b5dbfa9743ce..44080d62d5e4 100644
--- a/pkgs/by-name/pg/pgsrip/package.nix
+++ b/pkgs/by-name/pg/pgsrip/package.nix
@@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
   version = "0.1.12";
   pyproject = true;
 
-  disabled = python3Packages.pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "pgsrip";
diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix
index 3c8591cc2c2e..9e631c2f11d7 100644
--- a/pkgs/by-name/po/poetry/unwrapped.nix
+++ b/pkgs/by-name/po/poetry/unwrapped.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   findpython,
   installShellFiles,
@@ -26,7 +25,6 @@
   trove-classifiers,
   virtualenv,
   xattr,
-  tomli,
   deepdiff,
   pytestCheckHook,
   httpretty,
@@ -85,9 +83,6 @@ buildPythonPackage rec {
   ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     xattr
   ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
-  ]
   ++ cachecontrol.optional-dependencies.filecache
   ++ pbs-installer.optional-dependencies.download
   ++ pbs-installer.optional-dependencies.install;
diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix
index 7c9776d635e6..c23de54e11c9 100644
--- a/pkgs/by-name/pr/prefect/package.nix
+++ b/pkgs/by-name/pr/prefect/package.nix
@@ -94,8 +94,7 @@ python3Packages.buildPythonApplication rec {
       semver
     ]
     ++ sqlalchemy.optional-dependencies.asyncio
-    ++ httpx.optional-dependencies.http2
-    ++ python-socks.optional-dependencies.asyncio;
+    ++ httpx.optional-dependencies.http2;
 
   optional-dependencies = with python3Packages; {
     aws = [
diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix
index bbf255fa50aa..f206e410b6e0 100644
--- a/pkgs/by-name/py/pyrosimple/package.nix
+++ b/pkgs/by-name/py/pyrosimple/package.nix
@@ -46,9 +46,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       python-box
       tomli-w
     ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      tomli
-    ]
     ++ lib.optional withInotify inotify;
 
   nativeCheckInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/sc/scriv/package.nix b/pkgs/by-name/sc/scriv/package.nix
index e7c40364a384..f04aa710ae47 100644
--- a/pkgs/by-name/sc/scriv/package.nix
+++ b/pkgs/by-name/sc/scriv/package.nix
@@ -29,19 +29,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   build-system = with python3.pkgs; [ setuptools ];
 
-  dependencies =
-    with python3.pkgs;
-    [
-      attrs
-      click
-      click-log
-      jinja2
-      markdown-it-py
-      requests
-    ]
-    ++ lib.optionals (python3.pythonOlder "3.11") [
-      tomli
-    ];
+  dependencies = with python3.pkgs; [
+    attrs
+    click
+    click-log
+    jinja2
+    markdown-it-py
+    requests
+  ];
 
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix
index 5bc3805f96fc..a27061d35b07 100644
--- a/pkgs/by-name/sn/snakefmt/package.nix
+++ b/pkgs/by-name/sn/snakefmt/package.nix
@@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   version = "0.11.4";
   pyproject = true;
 
-  disabled = python3.pythonOlder "3.11";
-
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y=";
diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
index fda6fb875e66..688412aa6593 100644
--- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
+++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
@@ -24,25 +24,22 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hatchling
   ];
 
-  dependencies =
-    with python3Packages;
-    [
-      click
-      mysql-connector
-      pytimeparse2
-      pymysql
-      pymysqlsa
-      simplejson
-      sqlalchemy
-      sqlalchemy-utils
-      tqdm
-      tabulate
-      unidecode
-      packaging
-      mysql80
-      python-dateutil
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  dependencies = with python3Packages; [
+    click
+    mysql-connector
+    pytimeparse2
+    pymysql
+    pymysqlsa
+    simplejson
+    sqlalchemy
+    sqlalchemy-utils
+    tqdm
+    tabulate
+    unidecode
+    packaging
+    mysql80
+    python-dateutil
+  ];
 
   pythonRelaxDeps = [
     "mysql-connector-python"
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 433872f443ec..68077e4dce2e 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -794,11 +794,6 @@ stdenv.mkDerivation (finalAttrs: {
       inherit src;
       name = "python${pythonVersion}-${version}-doc";
 
-      postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") ''
-        substituteInPlace Doc/tools/extensions/pyspecific.py \
-          --replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator"
-      '';
-
       dontConfigure = true;
 
       dontBuild = true;
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 0fb0a1326025..2a04623cdee5 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -82,17 +82,12 @@ let
     "installer"
   ];
 
-  isBootstrapPackage' = flip elem (
-    [
-      "build"
-      "packaging"
-      "pyproject-hooks"
-      "wheel"
-    ]
-    ++ optionals (python.pythonOlder "3.11") [
-      "tomli"
-    ]
-  );
+  isBootstrapPackage' = flip elem [
+    "build"
+    "packaging"
+    "pyproject-hooks"
+    "wheel"
+  ];
 
   isSetuptoolsDependency' = flip elem [
     "setuptools"
diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix
index cda44af11dca..2ef3e4997a97 100644
--- a/pkgs/development/python-modules/aemet-opendata/default.nix
+++ b/pkgs/development/python-modules/aemet-opendata/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   geopy,
-  pythonOlder,
   setuptools,
 }:
 
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "0.6.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "AEMET-OpenData";
diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
index 2f21eb0610a3..d21337899238 100644
--- a/pkgs/development/python-modules/agate/default.nix
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -13,7 +13,6 @@
   pyicu,
   pytestCheckHook,
   python-slugify,
-  pythonOlder,
   pytimeparse,
   setuptools,
 }:
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index faea5891ddec..43d9ff3f99e7 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pyvex,
   setuptools,
   typing-extensions,
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "9.2.154";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "angr";
     repo = "ailment";
diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix
index 9883a1c77e50..8f8e6d0d51ea 100644
--- a/pkgs/development/python-modules/aioairzone-cloud/default.nix
+++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix
@@ -3,7 +3,6 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
 }:
 
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.7.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "aioairzone-cloud";
diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix
index 8331268a1415..6553e5e80836 100644
--- a/pkgs/development/python-modules/aioambient/default.nix
+++ b/pkgs/development/python-modules/aioambient/default.nix
@@ -11,7 +11,6 @@
   pytestCheckHook,
   python-engineio,
   python-socketio,
-  pythonOlder,
   websockets,
   yarl,
 }:
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "2025.02.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aioambient";
diff --git a/pkgs/development/python-modules/aiobtclientrpc/default.nix b/pkgs/development/python-modules/aiobtclientrpc/default.nix
index c0fcd7472142..631e1cabbb24 100644
--- a/pkgs/development/python-modules/aiobtclientrpc/default.nix
+++ b/pkgs/development/python-modules/aiobtclientrpc/default.nix
@@ -45,8 +45,7 @@ buildPythonPackage (finalAttrs: {
     httpx-socks
     python-socks
     rencode
-  ]
-  ++ python-socks.optional-dependencies.asyncio;
+  ];
 
   nativeCheckInputs = [
     proxy-py
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index f25c181fde24..ad2d5cf3fd52 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -6,7 +6,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index 92ca881060e7..6b5ad40fb2bc 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   aiodns,
-  async-timeout,
   buildPythonPackage,
   cached-ipaddress,
   fetchFromGitHub,
@@ -12,7 +11,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -35,9 +33,6 @@ buildPythonPackage rec {
     ifaddr
     netifaces
     pyroute2
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix
index 3155a9eb443e..3405e724358c 100644
--- a/pkgs/development/python-modules/aioelectricitymaps/default.nix
+++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
 }:
 
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "aioelectricitymaps";
diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index 68eefa41a963..2527a31b9eea 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -10,7 +10,6 @@
   pytest-aiohttp,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   voluptuous,
   typing-extensions,
   yarl,
@@ -21,8 +20,6 @@ buildPythonPackage (finalAttrs: {
   version = "2026.01.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aioguardian";
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index 87ce910a3644..13b2c634fe3f 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -23,8 +23,7 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     python-socks
-  ]
-  ++ python-socks.optional-dependencies.asyncio;
+  ];
 
   # Checks needs internet access
   doCheck = false;
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 1055fc0ffbe6..615c17b38ca5 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -95,9 +95,6 @@ buildPythonPackage rec {
     propcache
     yarl
   ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
-  ]
   ++ optional-dependencies.speedups;
 
   optional-dependencies.speedups = [
diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix
index 7c8b5a084264..379bc6ad3144 100644
--- a/pkgs/development/python-modules/aiojobs/default.nix
+++ b/pkgs/development/python-modules/aiojobs/default.nix
@@ -1,13 +1,11 @@
 {
   lib,
   aiohttp,
-  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
   pytest-aiohttp,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -25,8 +23,6 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ];
-
   optional-dependencies = {
     aiohttp = [ aiohttp ];
   };
diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix
index 70bd17312027..fe77e9b2a321 100644
--- a/pkgs/development/python-modules/aiolyric/default.nix
+++ b/pkgs/development/python-modules/aiolyric/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   incremental,
-  pythonOlder,
   pytest-asyncio,
   pytestCheckHook,
   setuptools,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "2.0.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "aiolyric";
diff --git a/pkgs/development/python-modules/aiomcache/default.nix b/pkgs/development/python-modules/aiomcache/default.nix
index f4122d34ab2f..38b4bbe13a62 100644
--- a/pkgs/development/python-modules/aiomcache/default.nix
+++ b/pkgs/development/python-modules/aiomcache/default.nix
@@ -2,14 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   setuptools,
 
   # dependencies
   python-memcached,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -26,7 +24,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ python-memcached ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  dependencies = [ python-memcached ];
 
   doCheck = false; # executes memcached in docker
 
diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix
index 808ef7513651..e16ca31d3daf 100644
--- a/pkgs/development/python-modules/aionut/default.nix
+++ b/pkgs/development/python-modules/aionut/default.nix
@@ -6,7 +6,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "4.3.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aionut";
diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix
index db8031800ba8..02f32768d0c6 100644
--- a/pkgs/development/python-modules/aiooncue/default.nix
+++ b/pkgs/development/python-modules/aiooncue/default.nix
@@ -3,7 +3,6 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
 }:
 
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.3.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiooncue";
diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index 3e6f1fa45992..12ecf2f9b239 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -9,7 +9,6 @@
   pytest-aiohttp,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "0.6.21";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aioopenexchangerates";
diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index 5ca2a02a6435..3c8efb5eae08 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pillow,
-  pythonOlder,
   setuptools,
 }:
 
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "3.1.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioslimproto";
diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix
index 4c0793a299e9..ae3ca97a8b6d 100644
--- a/pkgs/development/python-modules/aiosonos/default.nix
+++ b/pkgs/development/python-modules/aiosonos/default.nix
@@ -7,7 +7,6 @@
   brotli,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "0.1.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "aiosonos";
diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index 511466c5c3ad..8dcda91cbe91 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-postgresql,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   setuptools-scm,
   sphinx-rtd-theme,
diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix
index 102be8f760e0..2116f1c96d33 100644
--- a/pkgs/development/python-modules/aiotankerkoenig/default.nix
+++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "0.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "aiotankerkoenig";
diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix
index 0c57466754c7..857cba015c20 100644
--- a/pkgs/development/python-modules/aiovlc/default.nix
+++ b/pkgs/development/python-modules/aiovlc/default.nix
@@ -7,7 +7,6 @@
   pytest-cov-stub,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
   typer,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "0.6.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aiovlc";
diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix
index 9d79de96384e..01fc555be2df 100644
--- a/pkgs/development/python-modules/aiowaqi/default.nix
+++ b/pkgs/development/python-modules/aiowaqi/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "3.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-waqi";
diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix
index 2157dd1028db..7ffa4ddb205b 100644
--- a/pkgs/development/python-modules/aiowebostv/default.nix
+++ b/pkgs/development/python-modules/aiowebostv/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   aiohttp,
 }:
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.7.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aiowebostv";
diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix
index e58cd3644d3a..5e9e6f7ac3c5 100644
--- a/pkgs/development/python-modules/aiowithings/default.nix
+++ b/pkgs/development/python-modules/aiowithings/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "3.1.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-withings";
diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix
index ab0d2aa1a7e1..e54989874a6b 100644
--- a/pkgs/development/python-modules/airgradient/default.nix
+++ b/pkgs/development/python-modules/airgradient/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "0.9.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "airgradienthq";
     repo = "python-airgradient";
diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix
index 92894369c2b9..a0ed8c3d2baf 100644
--- a/pkgs/development/python-modules/alarmdecoder/default.nix
+++ b/pkgs/development/python-modules/alarmdecoder/default.nix
@@ -7,7 +7,6 @@
   pyopenssl,
   pyserial,
   pytestCheckHook,
-  pythonOlder,
   pyusb,
   setuptools-scm,
 }:
diff --git a/pkgs/development/python-modules/allantools/default.nix b/pkgs/development/python-modules/allantools/default.nix
index ea30c65cad47..bee02d49a251 100644
--- a/pkgs/development/python-modules/allantools/default.nix
+++ b/pkgs/development/python-modules/allantools/default.nix
@@ -8,7 +8,6 @@
   numpydoc,
   pytest,
   scipy,
-  pythonOlder,
   pytestCheckHook,
 }:
 
diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix
index db71edb157fa..c1a123d561fa 100644
--- a/pkgs/development/python-modules/allure-python-commons/default.nix
+++ b/pkgs/development/python-modules/allure-python-commons/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  pythonOlder,
   attrs,
   pluggy,
   six,
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 782b1c9ccc63..775f71cd9ea4 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -24,7 +24,6 @@
   pycparser,
   pyformlang,
   pydemumble,
-  pythonOlder,
   pyvex,
   rich,
   rpyc,
@@ -41,8 +40,6 @@ buildPythonPackage rec {
   version = "9.2.154";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "angr";
     repo = "angr";
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index a7ac1fd494ce..b1354fe1e497 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -51,9 +51,6 @@ buildPythonPackage rec {
   ]
   ++ lib.optionals (pythonOlder "3.13") [
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix
index cd38737c53c5..a9afaa51b4b3 100644
--- a/pkgs/development/python-modules/apple-weatherkit/default.nix
+++ b/pkgs/development/python-modules/apple-weatherkit/default.nix
@@ -5,7 +5,6 @@
   poetry-core,
   aiohttp,
   aiohttp-retry,
-  pythonOlder,
   pyjwt,
 }:
 
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "1.1.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "tjhorner";
     repo = "python-weatherkit";
diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index f94fb291c401..869a7f59d763 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   pythonAtLeast,
-  pythonOlder,
   fetchFromGitHub,
   setuptools,
   aiohttp,
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "elupus";
     repo = "arcam_fmj";
diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix
index 81c73582462d..f7eb657af2f6 100644
--- a/pkgs/development/python-modules/argparse-manpage/default.nix
+++ b/pkgs/development/python-modules/argparse-manpage/default.nix
@@ -2,10 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   packaging,
-  tomli,
   pytestCheckHook,
   pip,
 }:
@@ -25,10 +23,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     setuptools
     packaging
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
-
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix
index ff4d552842b2..bdf5d67d6312 100644
--- a/pkgs/development/python-modules/array-record/default.nix
+++ b/pkgs/development/python-modules/array-record/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   pythonAtLeast,
   python,
   fetchPypi,
@@ -14,7 +13,7 @@ buildPythonPackage rec {
   version = "0.8.3";
   format = "wheel";
 
-  disabled = pythonOlder "3.11" || pythonAtLeast "3.15";
+  disabled = pythonAtLeast "3.15";
 
   src =
     let
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 16293f1b8a6a..0403878fb70e 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -2,9 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
-  typing-extensions,
   pip,
   pylint,
   pytestCheckHook,
@@ -24,8 +22,6 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
-
   nativeCheckInputs = [
     pip
     pytestCheckHook
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index d07f43684f89..dd969d710c0a 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build time
   stdenv,
@@ -58,8 +57,6 @@ buildPythonPackage rec {
   version = "7.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "astropy";
diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix
index 3c0f1ded70ae..726476979bec 100644
--- a/pkgs/development/python-modules/async-lru/default.nix
+++ b/pkgs/development/python-modules/async-lru/default.nix
@@ -1,11 +1,9 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   fetchpatch2,
   setuptools,
-  typing-extensions,
   pytestCheckHook,
   pytest-asyncio,
   pytest-cov-stub,
@@ -35,8 +33,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
-
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
diff --git a/pkgs/development/python-modules/async-stagger/default.nix b/pkgs/development/python-modules/async-stagger/default.nix
index 66911a84e4f8..3f545c3e5f95 100644
--- a/pkgs/development/python-modules/async-stagger/default.nix
+++ b/pkgs/development/python-modules/async-stagger/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   pytestCheckHook,
   pytest-asyncio,
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "0.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "twisteroidambassador";
     repo = "async_stagger";
diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix
index bbfec550744d..c392c34b557a 100644
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/pkgs/development/python-modules/asyncpg/default.nix
@@ -2,12 +2,10 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  async-timeout,
   cython,
   libpq,
   uvloop,
   postgresql,
-  pythonOlder,
   pytest-xdist,
   pytestCheckHook,
   setuptools,
@@ -29,10 +27,6 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  # required for compatibility with Python versions older than 3.11
-  # see https://github.com/MagicStack/asyncpg/blob/v0.29.0/asyncpg/_asyncio_compat.py#L13
-  dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ];
-
   nativeCheckInputs = [
     libpq.pg_config
     uvloop
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index 052d8d31002a..e3302683a2c7 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -31,8 +31,7 @@ buildPythonPackage rec {
     python-socks
     tldextract
     whodap
-  ]
-  ++ python-socks.optional-dependencies.asyncio;
+  ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix
index 4e180ed4314f..8d6ffc08b509 100644
--- a/pkgs/development/python-modules/atproto/default.nix
+++ b/pkgs/development/python-modules/atproto/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
   nix-update-script,
 
   # build-system
diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix
index fe0a567801cd..88f59f4436cd 100644
--- a/pkgs/development/python-modules/autoflake/default.nix
+++ b/pkgs/development/python-modules/autoflake/default.nix
@@ -5,8 +5,6 @@
   hatchling,
   pyflakes,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
 }:
 buildPythonPackage rec {
   pname = "autoflake";
@@ -20,7 +18,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ hatchling ];
 
-  propagatedBuildInputs = [ pyflakes ] ++ lib.optional (pythonOlder "3.11") tomli;
+  propagatedBuildInputs = [ pyflakes ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 423671330af7..dc599ac6af13 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -5,9 +5,7 @@
   glibcLocales,
   pycodestyle,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -24,7 +22,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  propagatedBuildInputs = [ pycodestyle ];
 
   nativeCheckInputs = [
     glibcLocales
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 2bef3696e7f3..a21b7d319dd2 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -6,7 +6,6 @@
   azure-common,
   azure-mgmt-core,
   setuptools,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "4.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "azure_mgmt_applicationinsights";
     inherit version;
diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index 70b68479f2e4..1f8119d6ccaf 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
-  pythonOlder,
   setuptools,
 }:
 
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "azure_mgmt_iothub";
     inherit version;
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index cdbcfee0fd35..1a3a47688a40 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
-  pythonOlder,
   setuptools,
 }:
 
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "azure_mgmt_recoveryservices";
     inherit version;
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index d5ea3c88bdc2..3f85644f13bc 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -7,7 +7,6 @@
   pytest-asyncio,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   voluptuous,
   zigpy,
diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 691f92c7372f..c1d89f818571 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -53,7 +53,6 @@
   python-dateutil,
   python-json-logger,
   python-multipart,
-  pythonOlder,
   pyyaml,
   questionary,
   rich,
@@ -62,7 +61,6 @@
   simple-di,
   starlette,
   tomli-w,
-  tomli,
   tritonclient,
   uv,
   uvicorn,
@@ -205,8 +203,7 @@ buildPythonPackage {
     uv
     uvicorn
     watchfiles
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   inherit optional-dependencies;
 
diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index c406f2f361c6..ea56257d981f 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchPypi,
   fetchpatch,
-  pythonOlder,
   pytestCheckHook,
   aiohttp,
   click,
@@ -19,8 +18,6 @@
   parameterized,
   platformdirs,
   tokenize-rt,
-  tomli,
-  typing-extensions,
   uvloop,
 }:
 
@@ -64,10 +61,6 @@ buildPythonPackage rec {
     packaging
     pathspec
     platformdirs
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
-    typing-extensions
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index a4f9b495b621..a15eeaf5da4e 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -9,7 +9,6 @@
   pytestCheckHook,
   pytest-asyncio,
   pytest-cov-stub,
-  pythonOlder,
   stdenv,
 }:
 
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index ca5d23fe6221..13e38b84069f 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -16,7 +16,6 @@
   pyobjc-framework-CoreBluetooth,
   pyobjc-framework-libdispatch,
   typing-extensions,
-  async-timeout,
 
   pytest-asyncio,
   pytest-cov-stub,
@@ -61,9 +60,6 @@ buildPythonPackage rec {
   ]
   ++ lib.optionals (pythonOlder "3.12") [
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix
index 4d6cf2ca2a29..fcc9c6619a32 100644
--- a/pkgs/development/python-modules/bluecurrent-api/default.nix
+++ b/pkgs/development/python-modules/bluecurrent-api/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   setuptools,
   pytz,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.3.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "bluecurrent";
     repo = "HomeAssistantAPI";
diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix
index 490df29f727f..f82d98d94150 100644
--- a/pkgs/development/python-modules/bluemaestro-ble/default.nix
+++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix
@@ -7,7 +7,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluemaestro-ble";
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index 30df366c2791..c122b644d9ac 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   bluetooth-adapters,
   btsocket,
   buildPythonPackage,
@@ -10,7 +9,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   usb-devices,
 }:
 
@@ -33,9 +31,6 @@ buildPythonPackage rec {
     btsocket
     pyric
     usb-devices
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
index 9a6376896df1..764278e52dca 100644
--- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
@@ -6,7 +6,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "1.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-sensor-state-data";
diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix
index a56dd1481871..eceafe8de5af 100644
--- a/pkgs/development/python-modules/bork/default.nix
+++ b/pkgs/development/python-modules/bork/default.nix
@@ -4,14 +4,12 @@
   callPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
 
   setuptools,
   build,
   coloredlogs,
   packaging,
   pip,
-  toml,
   urllib3,
 }:
 
@@ -43,8 +41,7 @@ buildPythonPackage rec {
     packaging
     pip
     urllib3
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ toml ];
+  ];
 
   pythonImportsCheck = [
     "bork"
diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix
index 09e8ba7da7a0..b743da34f1d4 100644
--- a/pkgs/development/python-modules/bqplot/default.nix
+++ b/pkgs/development/python-modules/bqplot/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   jupyter-packaging,
   jupyterlab,
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 7e98cf4bc4ae..ca49dc3d76db 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -12,9 +12,7 @@
   pytest-rerunfailures,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
-  tomli,
   virtualenv,
   wheel,
 }:
@@ -38,8 +36,7 @@ buildPythonPackage rec {
   dependencies = [
     packaging
     pyproject-hooks
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   # We need to disable tests because this package is part of the bootstrap chain
   # and its test dependencies cannot be built yet when this is being built.
diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix
index 0aaeee120721..70cd0c90cf46 100644
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
   cryptography,
   jinja2,
   librouteros,
@@ -11,7 +10,6 @@
   passlib,
   pyyaml,
   requests,
-  rtoml,
   setuptools,
   tomlkit,
   pytestCheckHook,
@@ -44,8 +42,7 @@ buildPythonPackage {
     requests
     tomlkit
     librouteros
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ rtoml ];
+  ];
 
   pythonImportsCheck = [ "bundlewrap" ];
 
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 670f51a6ea90..078a9fc50324 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   cbor2,
   fetchFromGitHub,
-  exceptiongroup,
   hatchling,
   hatch-vcs,
   hypothesis,
@@ -16,7 +15,6 @@
   pytest-xdist,
   pytestCheckHook,
   pythonAtLeast,
-  pythonOlder,
   pyyaml,
   tomlkit,
   typing-extensions,
@@ -43,9 +41,6 @@ buildPythonPackage rec {
   dependencies = [
     attrs
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index 698d88e2c5bf..237b721e8c1f 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -5,7 +5,6 @@
   hypothesis,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools-scm,
   setuptools,
   withCExtensions ? true,
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 32d860d2d01d..60a11b371a55 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -8,8 +8,6 @@
   pep517,
   pytestCheckHook,
   setuptools,
-  tomli,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -30,8 +28,7 @@ buildPythonPackage rec {
     build
     pep517
     setuptools
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     git
diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix
index 7aa4c13c52b4..529da0fe4228 100644
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@@ -12,7 +12,6 @@
   pyleri,
   pyopenssl,
   pytestCheckHook,
-  pythonOlder,
   requests,
   timeout-decorator,
   xmltodict,
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 39aa73fe70f2..2aa1a7708dad 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   pysmt,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   typing-extensions,
   z3-solver,
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "9.2.154";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "angr";
     repo = "claripy";
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 5f4c316f116d..fa07d7d0cd77 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -8,7 +8,6 @@
   pefile,
   pyelftools,
   pytestCheckHook,
-  pythonOlder,
   pyvex,
   setuptools,
   sortedcontainers,
@@ -32,8 +31,6 @@ buildPythonPackage rec {
   inherit version;
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "angr";
     repo = "cle";
diff --git a/pkgs/development/python-modules/cleanit/default.nix b/pkgs/development/python-modules/cleanit/default.nix
index 931bc897bd7c..8e75a5d3c140 100644
--- a/pkgs/development/python-modules/cleanit/default.nix
+++ b/pkgs/development/python-modules/cleanit/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build dependencies
   poetry-core,
@@ -25,8 +24,6 @@ buildPythonPackage rec {
   version = "0.4.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "cleanit";
diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 0004a7baa5fa..602a1584d9b3 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -15,7 +15,6 @@
   pytest-mock,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   setuptools,
   tabulate,
 }:
diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index e73068f90685..8de827a9f176 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -6,10 +6,6 @@
   # build-system
   flit-core,
 
-  # dependencies
-  pythonOlder,
-  typing-extensions,
-
   # optional-dependencies
   azure-storage-blob,
   azure-storage-file-datalake,
@@ -50,10 +46,6 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [
-    typing-extensions
-  ];
-
   optional-dependencies = {
     all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3;
     azure = [
diff --git a/pkgs/development/python-modules/configshell-fb/default.nix b/pkgs/development/python-modules/configshell-fb/default.nix
index f8fd938781ed..29f81c7fa220 100644
--- a/pkgs/development/python-modules/configshell-fb/default.nix
+++ b/pkgs/development/python-modules/configshell-fb/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
   hatchling,
   hatch-vcs,
   pyparsing,
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 87fecf3b4c6b..fb56132d0425 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -27,8 +27,7 @@ let
     nativeBuildInputs = [
       setuptools
       versioneer
-    ]
-    ++ versioneer.optional-dependencies.toml;
+    ];
 
     # would create dependency loop with twisted
     doCheck = false;
diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix
index 70713da7d733..0f3b69a06a22 100644
--- a/pkgs/development/python-modules/corallium/default.nix
+++ b/pkgs/development/python-modules/corallium/default.nix
@@ -29,9 +29,6 @@ buildPythonPackage rec {
     beartype
     pydantic
     rich
-  ]
-  ++ lib.optionals (python.pythonOlder "3.11") [
-    tomli
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index b29febab24a9..78b6cf110d96 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -8,9 +8,7 @@
   hypothesis,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -27,12 +25,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  optional-dependencies = {
-    toml = lib.optionals (pythonOlder "3.11") [
-      tomli
-    ];
-  };
-
   nativeCheckInputs = [
     flaky
     hypothesis
diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix
index 768a02a46e55..b7893b007d6c 100644
--- a/pkgs/development/python-modules/ctypesgen/default.nix
+++ b/pkgs/development/python-modules/ctypesgen/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools-scm,
   setuptools,
   toml,
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ctypesgen";
     repo = "ctypesgen";
diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index 8fca41d9b161..fb553b042f2e 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -10,10 +10,8 @@
   # dependencies
   filelock,
   packaging,
-  tomli,
 
   distutils,
-  pythonOlder,
   ncurses,
   patchelf,
   dmgbuild,
@@ -65,9 +63,6 @@ buildPythonPackage rec {
     packaging
     setuptools
   ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
-  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     dmgbuild
   ];
diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix
index c67c9d8b5a16..8f093ae406a9 100644
--- a/pkgs/development/python-modules/dataclass-wizard/default.nix
+++ b/pkgs/development/python-modules/dataclass-wizard/default.nix
@@ -6,7 +6,6 @@
   pytestCheckHook,
   python-dotenv,
   pythonAtLeast,
-  pythonOlder,
   pytimeparse,
   pyyaml,
   setuptools,
diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index dc52efe7ac36..2acee398b154 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -37,9 +37,6 @@
   distro,
   # win
   colorama,
-  # python-version-dependent
-  pythonOlder,
-  typing-extensions,
   # tests
   pytest-retry,
   pytest-xdist,
@@ -95,8 +92,7 @@ buildPythonPackage (finalAttrs: {
       annexremote
       looseversion
     ]
-    ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
-    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+    ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ];
     downloaders = [
       boto3
       keyrings-alt
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index fed1a487d2bb..730fc5c9cc75 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   nix-update-script,
   setuptools,
   paup-cli,
diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix
index 5faf8e97db99..fc9ed97a2582 100644
--- a/pkgs/development/python-modules/dicomweb-client/default.nix
+++ b/pkgs/development/python-modules/dicomweb-client/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   hatchling,
   uv-dynamic-versioning,
   pytestCheckHook,
diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index 7a38cf70b885..8b443a689702 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -8,7 +8,6 @@
   pytest-cov-stub,
   pytest-django,
   pytestCheckHook,
-  pythonOlder,
   hatchling,
   hatch-vcs,
 }:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "0.19.19";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "deschler";
     repo = "django-modeltranslation";
diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index a66dcefb497f..fc3a8538e907 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -10,8 +10,6 @@
   pytest-mypy-plugins,
   oracledb,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
   types-pytz,
   types-pyyaml,
   types-redis,
@@ -38,8 +36,7 @@ buildPythonPackage rec {
     types-pytz
     types-pyyaml
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   optional-dependencies = {
     compatible-mypy = [ mypy ];
diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix
index 09f0c930c4f9..8a912144d29f 100644
--- a/pkgs/development/python-modules/docformatter/default.nix
+++ b/pkgs/development/python-modules/docformatter/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   poetry-core,
   charset-normalizer,
diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix
index 2c9f3da24333..4d1758c3ab44 100644
--- a/pkgs/development/python-modules/docutils/default.nix
+++ b/pkgs/development/python-modules/docutils/default.nix
@@ -5,7 +5,6 @@
   flit-core,
   pillow,
   python,
-  pythonOlder,
 }:
 
 # Note: this package is used to build LLVM’s documentation, which is part of the Darwin stdenv.
diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix
index 847974b5cbcf..e8f663ebc3af 100644
--- a/pkgs/development/python-modules/dparse/default.nix
+++ b/pkgs/development/python-modules/dparse/default.nix
@@ -1,11 +1,9 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   hatchling,
   packaging,
-  tomli,
   pyyaml,
   pytestCheckHook,
 }:
@@ -24,7 +22,7 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [ packaging ];
 
   optional-dependencies = {
     # FIXME pipenv = [ pipenv ];
diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix
index a66e2050af80..ce4df410f095 100644
--- a/pkgs/development/python-modules/drf-spectacular/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular/default.nix
@@ -24,7 +24,6 @@
   psycopg2,
   pytest-django,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   setuptools,
   uritemplate,
diff --git a/pkgs/development/python-modules/dropmqttapi/default.nix b/pkgs/development/python-modules/dropmqttapi/default.nix
index 4c9a92b78bf6..e5ce17029249 100644
--- a/pkgs/development/python-modules/dropmqttapi/default.nix
+++ b/pkgs/development/python-modules/dropmqttapi/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
 }:
 
@@ -11,8 +10,6 @@ buildPythonPackage rec {
   version = "1.0.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ChandlerSystems";
     repo = "dropmqttapi";
diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix
index 16fed014475d..876a30e16942 100644
--- a/pkgs/development/python-modules/easyenergy/default.nix
+++ b/pkgs/development/python-modules/easyenergy/default.nix
@@ -9,7 +9,6 @@
   pytest-cov-stub,
   pytest-freezer,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "2.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-easyenergy";
diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix
index 2a464b1565b3..dc8a167e3020 100644
--- a/pkgs/development/python-modules/edlib/default.nix
+++ b/pkgs/development/python-modules/edlib/default.nix
@@ -1,6 +1,5 @@
 {
   buildPythonPackage,
-  pythonOlder,
   edlib,
   cython,
   python,
diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix
index 23bcc41fb4b5..17bd4da5b040 100644
--- a/pkgs/development/python-modules/eiswarnung/default.nix
+++ b/pkgs/development/python-modules/eiswarnung/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   pytz,
   yarl,
 }:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-eiswarnung";
diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix
index 8d437d7d54e9..780dcf69ad57 100644
--- a/pkgs/development/python-modules/elgato/default.nix
+++ b/pkgs/development/python-modules/elgato/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "5.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-elgato";
diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix
index 576281b92091..94a3fe441a1b 100644
--- a/pkgs/development/python-modules/energyzero/default.nix
+++ b/pkgs/development/python-modules/energyzero/default.nix
@@ -9,7 +9,6 @@
   pytest-cov-stub,
   pytest-freezer,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "4.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-energyzero";
diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix
index 0ead5fc63ee3..f0274f997831 100644
--- a/pkgs/development/python-modules/entry-points-txt/default.nix
+++ b/pkgs/development/python-modules/entry-points-txt/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pythonOlder,
   pytestCheckHook,
   pytest-cov-stub,
   hatchling,
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 5d1e75b7d830..b9e53f4471c5 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonAtLeast,
-  pythonOlder,
 
   # build-system
   setuptools,
diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix
index 55b0c47fdc86..c8a18ff01540 100644
--- a/pkgs/development/python-modules/extension-helpers/default.nix
+++ b/pkgs/development/python-modules/extension-helpers/default.nix
@@ -7,10 +7,8 @@
   findutils,
   pip,
   pytestCheckHook,
-  pythonOlder,
   setuptools-scm,
   setuptools,
-  tomli,
   wheel,
 }:
 
@@ -31,7 +29,7 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [ setuptools ];
 
   nativeCheckInputs = [
     build
diff --git a/pkgs/development/python-modules/fast-array-utils/default.nix b/pkgs/development/python-modules/fast-array-utils/default.nix
index 4d3815c78c26..cbdbf12883c5 100644
--- a/pkgs/development/python-modules/fast-array-utils/default.nix
+++ b/pkgs/development/python-modules/fast-array-utils/default.nix
@@ -108,7 +108,6 @@ buildPythonPackage (finalAttrs: {
       pytest-doctestplus
       pytest-xdist
     ]
-    ++ coverage.optional-dependencies.toml
     ++ self.sparse
     ++ self.testing;
     testing = [
diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix
index 8f093abaca8c..59a7383da442 100644
--- a/pkgs/development/python-modules/findpython/default.nix
+++ b/pkgs/development/python-modules/findpython/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build time
   pdm-backend,
diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix
index 892b41adde05..e79c0d69677c 100644
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@@ -5,7 +5,6 @@
   attrs,
   flake8,
   pytestCheckHook,
-  pythonOlder,
   hypothesis,
   hypothesmith,
   setuptools,
diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix
index d0912717ab72..0ce8626d7114 100644
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@@ -3,14 +3,12 @@
   fetchFromGitHub,
   flit-core,
   lib,
-  pythonOlder,
   # dependencies
   flask,
   jinja2,
   markupsafe,
   werkzeug,
   wtforms,
-  typing-extensions,
   # optional dependencies
   # sqlalchemy
   flask-sqlalchemy,
@@ -70,9 +68,6 @@ buildPythonPackage rec {
     markupsafe
     werkzeug
     wtforms
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    typing-extensions
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix
index 60eb80034910..fa5247de6baf 100644
--- a/pkgs/development/python-modules/flit-scm/default.nix
+++ b/pkgs/development/python-modules/flit-scm/default.nix
@@ -2,10 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  pythonOlder,
   flit-core,
   setuptools-scm,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -23,14 +21,12 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     flit-core
     setuptools-scm
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   propagatedBuildInputs = [
     flit-core
     setuptools-scm
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [ "flit_scm" ];
 
diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix
index 3c45f13453c3..4965722508e0 100644
--- a/pkgs/development/python-modules/forecast-solar/default.nix
+++ b/pkgs/development/python-modules/forecast-solar/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   aiodns,
   aiohttp,
   aresponses,
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "4.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "forecast_solar";
diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix
index d2212c275a26..4c2d82655349 100644
--- a/pkgs/development/python-modules/fyta-cli/default.nix
+++ b/pkgs/development/python-modules/fyta-cli/default.nix
@@ -8,7 +8,6 @@
   mashumaro,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "0.7.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "dontinelli";
     repo = "fyta_cli";
diff --git a/pkgs/development/python-modules/genie-partner-sdk/default.nix b/pkgs/development/python-modules/genie-partner-sdk/default.nix
index 6d5eb32c95e8..6596ca006a4c 100644
--- a/pkgs/development/python-modules/genie-partner-sdk/default.nix
+++ b/pkgs/development/python-modules/genie-partner-sdk/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   hatchling,
   aiohttp,
   fetchPypi,
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "1.0.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     inherit version;
     pname = "genie_partner_sdk";
diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index 8d4964880105..f63a3b036fe3 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -7,7 +7,6 @@
   pytest-asyncio,
   pytest-httpx,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "0.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-glances-api";
diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index 587dd553f853..3f0012ed0a52 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -7,10 +7,8 @@
   fetchPypi,
   pytestCheckHook,
   pythonAtLeast,
-  pythonOlder,
   pyyaml,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -32,7 +30,6 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    toml = lib.optionals (pythonOlder "3.11") [ tomli ];
     yaml = [ pyyaml ];
   };
 
diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 7cb99ac62011..b67721431018 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -12,7 +12,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   requests,
   setuptools,
 }:
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 521c9769bc7d..d6c158e67dd9 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -12,7 +12,6 @@
   protobuf,
   pytestCheckHook,
   pytest-asyncio,
-  pythonOlder,
   requests,
   setuptools,
 }:
diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix
index ce90484d09bc..2b26bb0995a6 100644
--- a/pkgs/development/python-modules/gotailwind/default.nix
+++ b/pkgs/development/python-modules/gotailwind/default.nix
@@ -12,7 +12,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   typer,
   yarl,
@@ -24,8 +23,6 @@ buildPythonPackage rec {
   version = "0.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-gotailwind";
diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 197c9246b085..1570fd1e254a 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -2,10 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   hatchling,
   httpx,
-  typing-extensions,
 }:
 buildPythonPackage rec {
   pname = "gotenberg-client";
@@ -24,7 +22,6 @@ buildPythonPackage rec {
   dependencies = [
     httpx
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
   ++ httpx.optional-dependencies.http2;
 
   # requires running gotenberg service
diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index 370b702f14de..4464edfac965 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -8,7 +8,6 @@
   isodate,
   nest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   mock,
   pyhamcrest,
   pyyaml,
diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix
index b53d9a7ba67d..6a784b868760 100644
--- a/pkgs/development/python-modules/gridnet/default.nix
+++ b/pkgs/development/python-modules/gridnet/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "5.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-gridnet";
diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index 733cabe24d75..debef02bde26 100644
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@@ -5,7 +5,6 @@
   h5py,
   pytestCheckHook,
   netcdf4,
-  pythonOlder,
   setuptools,
   setuptools-scm,
 }:
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 80ab9e8bf0ae..45a25ac23b29 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -2,8 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  async-timeout,
   setuptools,
 }:
 
@@ -25,10 +23,6 @@ buildPythonPackage rec {
     "async_timeout"
   ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [
-    async-timeout
-  ];
-
   # only manual tests
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix
index 5cbd2f92221c..ada4eec695c2 100644
--- a/pkgs/development/python-modules/habluetooth/default.nix
+++ b/pkgs/development/python-modules/habluetooth/default.nix
@@ -15,7 +15,6 @@
   pytest-codspeed,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -24,8 +23,6 @@ buildPythonPackage rec {
   version = "5.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "habluetooth";
diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix
index cbc65e8b9a47..770856ea976c 100644
--- a/pkgs/development/python-modules/hacking/default.nix
+++ b/pkgs/development/python-modules/hacking/default.nix
@@ -5,7 +5,6 @@
   fetchPypi,
   flake8,
   pbr,
-  pythonOlder,
   setuptools,
   stestr,
   testscenarios,
diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix
index 4f9ba766166e..e85410908061 100644
--- a/pkgs/development/python-modules/hakuin/default.nix
+++ b/pkgs/development/python-modules/hakuin/default.nix
@@ -6,7 +6,6 @@
   hatchling,
   jinja2,
   nltk,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "0.1.10";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "pruzko";
     repo = "hakuin";
diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index b9b23ac771e1..54e5514dc137 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -12,7 +12,6 @@
   pytest-timeout,
   pytestCheckHook,
   pythonAtLeast,
-  pythonOlder,
   setuptools,
   zeroconf,
 }:
diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
index b25ec89a35f9..1c9db048ceb9 100644
--- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
+++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix
@@ -3,10 +3,8 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
-  pythonOlder,
   build,
   hatchling,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -24,8 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     hatchling
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     build
diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
index 07ca89dc15f9..89b6d0e6c9ae 100644
--- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
+++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
@@ -5,9 +5,7 @@
   hatchling,
   pytest-mock,
   pytestCheckHook,
-  tomli,
   twine,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -30,8 +28,7 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     twine
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   disabledTests = [
     # tests pip install, which unsurprisingly fails
diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix
index 59f08ef09335..f11adc8c8513 100644
--- a/pkgs/development/python-modules/hatch-odoo/default.nix
+++ b/pkgs/development/python-modules/hatch-odoo/default.nix
@@ -5,8 +5,6 @@
   hatchling,
   lib,
   manifestoo-core,
-  pythonOlder,
-  tomli,
 }:
 buildPythonPackage rec {
   pname = "hatch-odoo";
@@ -25,9 +23,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     hatchling
     manifestoo-core
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index d119bdf1169f..a6d6271f4df3 100644
--- a/pkgs/development/python-modules/hatchling/default.nix
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -2,14 +2,12 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # runtime
   editables,
   packaging,
   pathspec,
   pluggy,
-  tomli,
   trove-classifiers,
 
   # tests
@@ -36,8 +34,7 @@ buildPythonPackage rec {
     pathspec
     pluggy
     trove-classifiers
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [
     "hatchling"
diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
index d1ea3bd04662..e3e97d5e5e2d 100644
--- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
+++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   poetry-core,
@@ -22,8 +21,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "home-assistant-bluetooth";
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index d40e7f97ebc8..9fe4467205ff 100644
--- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -44,7 +44,6 @@
   python,
   python-daemon,
   python-path,
-  pythonOlder,
   pyyaml,
   requests,
   setuptools,
diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix
index 36ff4ad8ac55..0c7db7a34750 100644
--- a/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/pkgs/development/python-modules/httpx-socks/default.nix
@@ -37,8 +37,7 @@ buildPythonPackage rec {
     httpx
     httpcore
     python-socks
-  ]
-  ++ python-socks.optional-dependencies.asyncio;
+  ];
 
   optional-dependencies = {
     asyncio = [ async-timeout ];
diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix
index 5e994c93ca33..fc66a397da43 100644
--- a/pkgs/development/python-modules/hy/default.nix
+++ b/pkgs/development/python-modules/hy/default.nix
@@ -7,7 +7,6 @@
   hy,
   pytestCheckHook,
   python,
-  pythonOlder,
   setuptools,
   testers,
 }:
diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix
index 36b3bc2a572e..a3867e07900b 100644
--- a/pkgs/development/python-modules/hypercorn/default.nix
+++ b/pkgs/development/python-modules/hypercorn/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   aioquic,
   cacert,
   h11,
@@ -23,8 +22,6 @@ buildPythonPackage rec {
   version = "0.17.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11"; # missing taskgroup dependency
-
   src = fetchFromGitHub {
     owner = "pgjones";
     repo = "Hypercorn";
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index ce6f3671a2ae..1c8850d91f0d 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   setuptools,
   attrs,
-  exceptiongroup,
   pexpect,
   doCheck ? true,
   pytestCheckHook,
@@ -14,7 +13,6 @@
   sortedcontainers,
   stdenv,
   pythonAtLeast,
-  pythonOlder,
   sphinxHook,
   sphinx-rtd-theme,
   sphinx-hoverxref,
@@ -54,8 +52,7 @@ buildPythonPackage rec {
   dependencies = [
     attrs
     sortedcontainers
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ];
 
   nativeCheckInputs = [
     pexpect
diff --git a/pkgs/development/python-modules/idstools/default.nix b/pkgs/development/python-modules/idstools/default.nix
index 54528caddb65..2aa3a41a3f0b 100644
--- a/pkgs/development/python-modules/idstools/default.nix
+++ b/pkgs/development/python-modules/idstools/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   setuptools,
   sphinx,
   sphinxcontrib-programoutput,
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "0.6.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "jasonish";
     repo = "py-idstools";
diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index 084bf0db9a53..5668aed0c0da 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   testers,
   buildPythonPackage,
-  pythonOlder,
   python,
   pytestCheckHook,
   # fetchers
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index eb28003c170a..c9699aa9cca4 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -4,8 +4,6 @@
   hatchling,
   lib,
   packaging,
-  pythonOlder,
-  tomli,
   twisted,
 }:
 
@@ -24,7 +22,7 @@ let
 
     build-system = [ hatchling ];
 
-    dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+    dependencies = [ packaging ];
 
     # escape infinite recursion with twisted
     doCheck = false;
diff --git a/pkgs/development/python-modules/inequality/default.nix b/pkgs/development/python-modules/inequality/default.nix
index 80fc679f5b6a..8f09bdeebe40 100644
--- a/pkgs/development/python-modules/inequality/default.nix
+++ b/pkgs/development/python-modules/inequality/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
 
   libpysal,
   mapclassify,
@@ -18,7 +17,6 @@ buildPythonPackage rec {
   pname = "inequality";
   version = "1.1.2";
   pyproject = true;
-  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "pysal";
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index 24b9e580be6f..ab00215125f0 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -16,7 +16,6 @@
   pytest-subtests,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   rich,
   time-machine,
   toml,
@@ -41,9 +40,6 @@ buildPythonPackage rec {
     executing
     rich
     toml
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    toml
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index 1ceff8bee53e..9cb8219ab095 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   hatchling,
diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix
index 686d27bfe575..dcc802fd5051 100644
--- a/pkgs/development/python-modules/intensity-normalization/default.nix
+++ b/pkgs/development/python-modules/intensity-normalization/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   pytestCheckHook,
   pytest-cov-stub,
   hatchling,
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "3.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "intensity_normalization";
     inherit version;
diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index af764033e1d5..aa920e42c15d 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -3,12 +3,9 @@
   buildPythonPackage,
   fetchPypi,
   pythonAtLeast,
-  pythonOlder,
   decorator,
   ipython,
   isPyPy,
-  exceptiongroup,
-  tomli,
   setuptools,
   pytestCheckHook,
   pytest-timeout,
@@ -31,10 +28,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     ipython
     decorator
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
-    tomli
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix
index 5c0b0b888985..c1268553e0f9 100644
--- a/pkgs/development/python-modules/itemadapter/default.nix
+++ b/pkgs/development/python-modules/itemadapter/default.nix
@@ -5,7 +5,6 @@
   fetchPypi,
   hatchling,
   pydantic,
-  pythonOlder,
   scrapy,
 }:
 
diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix
index b66d5e8d7abf..31d38872be86 100644
--- a/pkgs/development/python-modules/jeepney/default.nix
+++ b/pkgs/development/python-modules/jeepney/default.nix
@@ -3,9 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitLab,
-  pythonOlder,
   flit-core,
-  async-timeout,
   dbus,
   pytest,
   pytest-trio,
@@ -35,9 +33,6 @@ buildPythonPackage rec {
     pytest-asyncio
     testpath
     trio
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
   ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix
index e442e9d87f9d..44e5a50d1bd1 100644
--- a/pkgs/development/python-modules/jellyfish/default.nix
+++ b/pkgs/development/python-modules/jellyfish/default.nix
@@ -4,7 +4,6 @@
   cargo,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   rustc,
   rustPlatform,
   unicodecsv,
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "jamesturk";
     repo = "jellyfish";
diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix
index 31187551459b..be1040d97b23 100644
--- a/pkgs/development/python-modules/jsonconversion/default.nix
+++ b/pkgs/development/python-modules/jsonconversion/default.nix
@@ -6,7 +6,6 @@
   pdm-backend,
   pytestCheckHook,
   pythonAtLeast,
-  pythonOlder,
   setuptools,
 }:
 
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "DLR-RM";
     repo = "python-jsonconversion";
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index f97b5c86cd1d..5a4c9bbfb203 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -17,10 +17,8 @@
   notebook-shim,
   packaging,
   setuptools,
-  tomli,
   tornado,
   traitlets,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -73,8 +71,7 @@ buildPythonPackage rec {
     setuptools
     tornado
     traitlets
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   makeWrapperArgs = [
     "--set"
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index c886b68a480a..0d21d83fff6c 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -17,8 +17,6 @@
   nbformat,
   packaging,
   pyyaml,
-  pythonOlder,
-  tomli,
 
   # tests
   addBinToPathHook,
@@ -85,8 +83,7 @@ buildPythonPackage rec {
     nbformat
     packaging
     pyyaml
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     addBinToPathHook
diff --git a/pkgs/development/python-modules/keba-kecontact/default.nix b/pkgs/development/python-modules/keba-kecontact/default.nix
index 94e1c74fdf2d..d6ffd64a2194 100644
--- a/pkgs/development/python-modules/keba-kecontact/default.nix
+++ b/pkgs/development/python-modules/keba-kecontact/default.nix
@@ -6,7 +6,6 @@
   hatchling,
   ifaddr,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "4.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "dannerph";
     repo = "keba-kecontact";
diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix
index 4ed68700afc5..6073ba2b48c4 100644
--- a/pkgs/development/python-modules/knocki/default.nix
+++ b/pkgs/development/python-modules/knocki/default.nix
@@ -7,7 +7,6 @@
   mashumaro,
   orjson,
   poetry-core,
-  pythonOlder,
   pytestCheckHook,
   pytest-aiohttp,
   pytest-cov-stub,
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "0.4.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "swan-solutions";
     repo = "knocki-homeassistant";
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 1ed8f6bb91cf..fd787acd71cb 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   defang,
   dnspython,
@@ -9,7 +8,6 @@
   playwrightcapture,
   poetry-core,
   pydantic,
-  pythonOlder,
   redis,
   requests,
   ua-parser,
@@ -49,8 +47,7 @@ buildPythonPackage rec {
   ]
   ++ playwrightcapture.optional-dependencies.recaptcha
   ++ redis.optional-dependencies.hiredis
-  ++ ua-parser.optional-dependencies.regex
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ++ ua-parser.optional-dependencies.regex;
 
   # Module has no tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix
index dbd505950bcc..3be90e6502fa 100644
--- a/pkgs/development/python-modules/leaone-ble/default.nix
+++ b/pkgs/development/python-modules/leaone-ble/default.nix
@@ -8,7 +8,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "leaone-ble";
diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix
index ef0d4d160303..bac9dc029567 100644
--- a/pkgs/development/python-modules/led-ble/default.nix
+++ b/pkgs/development/python-modules/led-ble/default.nix
@@ -8,7 +8,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.1.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "led-ble";
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index 671198862028..027ee4cae84e 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   python,
-  pythonOlder,
   fetchFromGitHub,
   cmake,
   sip4,
diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix
index f7c2cc852471..26b13d4b2ee4 100644
--- a/pkgs/development/python-modules/lifelines/default.nix
+++ b/pkgs/development/python-modules/lifelines/default.nix
@@ -13,7 +13,6 @@
   pandas,
   psutil,
   pytestCheckHook,
-  pythonOlder,
   scikit-learn,
   scipy,
   setuptools,
diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix
index c5468e91a754..f5be74561e70 100644
--- a/pkgs/development/python-modules/lomond/default.nix
+++ b/pkgs/development/python-modules/lomond/default.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   lib,
   pythonAtLeast,
-  pythonOlder,
 
   # runtime
   six,
diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix
index 7efe8a3d717a..4f19dfdc8e3a 100644
--- a/pkgs/development/python-modules/macholib/default.nix
+++ b/pkgs/development/python-modules/macholib/default.nix
@@ -3,11 +3,9 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   unittestCheckHook,
   altgraph,
   setuptools,
-  typing-extensions,
   pyinstaller,
 }:
 
@@ -27,9 +25,6 @@ buildPythonPackage rec {
 
   dependencies = [
     altgraph
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    typing-extensions
   ];
 
   # Checks assume to find darwin specific libraries
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 9cea49c6c646..b93886a5f17a 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchpatch2,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   uv-build,
@@ -24,7 +23,6 @@
   ruff,
   starlette,
   tomlkit,
-  typing-extensions,
   uvicorn,
   websockets,
 
@@ -72,8 +70,7 @@ buildPythonPackage rec {
     tomlkit
     uvicorn
     websockets
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ];
 
   pythonImportsCheck = [ "marimo" ];
 
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 2b3d7b7deee8..e6cae12601b0 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -3,15 +3,10 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   flit-core,
 
-  # dependencies
-  backports-datetime-fromisoformat,
-  typing-extensions,
-
   # tests
   pytestCheckHook,
   simplejson,
@@ -31,11 +26,6 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [
-    backports-datetime-fromisoformat
-    typing-extensions
-  ];
-
   nativeCheckInputs = [
     pytestCheckHook
     simplejson
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index fec7525ca49d..2a490f7d6e2c 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -8,10 +8,8 @@
   pendulum,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   setuptools,
-  tomli,
   tomli-w,
   typing-extensions,
 }:
@@ -36,7 +34,7 @@ buildPythonPackage rec {
     orjson = [ orjson ];
     msgpack = [ msgpack ];
     yaml = [ pyyaml ];
-    toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+    toml = [ tomli-w ];
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix
index 96c7b369004c..261d58b12e41 100644
--- a/pkgs/development/python-modules/meson-python/default.nix
+++ b/pkgs/development/python-modules/meson-python/default.nix
@@ -4,13 +4,11 @@
   buildPythonPackage,
   fetchPypi,
   fetchpatch,
-  pythonOlder,
 
   # build-system, dependencies
   meson,
   ninja,
   pyproject-metadata,
-  tomli,
 
   # tests
   cython,
@@ -42,15 +40,13 @@ buildPythonPackage rec {
     meson
     ninja
     pyproject-metadata
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   dependencies = [
     meson
     ninja
     pyproject-metadata
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     cython
diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix
index f52736c52568..da875e91208f 100644
--- a/pkgs/development/python-modules/meteoswiss-async/default.nix
+++ b/pkgs/development/python-modules/meteoswiss-async/default.nix
@@ -8,7 +8,6 @@
   pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "0.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "albertomontesg";
     repo = "meteoswiss-async";
diff --git a/pkgs/development/python-modules/misaki/default.nix b/pkgs/development/python-modules/misaki/default.nix
index d4a65f30e26b..4a11832b131a 100644
--- a/pkgs/development/python-modules/misaki/default.nix
+++ b/pkgs/development/python-modules/misaki/default.nix
@@ -16,7 +16,6 @@
   phonemizer,
   pip,
   pypinyin,
-  pythonOlder,
   regex,
   replaceVars,
   spacy-curated-transformers,
diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix
index a1e6e5940b55..724fe7fbbbd0 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/pkgs/development/python-modules/mistune/default.nix
@@ -3,9 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -20,10 +18,6 @@ buildPythonPackage rec {
     hash = "sha256-mCqOcLrgLtUL1le82Y+QVqqXGq+n0ZY76hqtyJsCKhE=";
   };
 
-  dependencies = lib.optionals (pythonOlder "3.11") [
-    typing-extensions
-  ];
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
index cfb577a75aa2..9745d865e24a 100644
--- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
+++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
@@ -10,7 +10,6 @@
   natsort,
   pydantic,
   pytestCheckHook,
-  pythonOlder,
   wcmatch,
 
 }:
diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix
index 40e17a6ef446..6ff60ac39ab8 100644
--- a/pkgs/development/python-modules/momepy/default.nix
+++ b/pkgs/development/python-modules/momepy/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
 
   geopandas,
   inequality,
@@ -21,7 +20,6 @@ buildPythonPackage rec {
   pname = "momepy";
   version = "0.10.0";
   pyproject = true;
-  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "pysal";
diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix
index f3b5d6657ae2..a32d6ae8918a 100644
--- a/pkgs/development/python-modules/monai-deploy/default.nix
+++ b/pkgs/development/python-modules/monai-deploy/default.nix
@@ -7,7 +7,6 @@
   numpy,
   pytest-lazy-fixture,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   tritonclient,
   typeguard,
diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix
index 6bc4d44b9621..e13ec4ca0b37 100644
--- a/pkgs/development/python-modules/monai/default.nix
+++ b/pkgs/development/python-modules/monai/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   ninja,
   numpy,
   packaging,
diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index c50e38749d6a..703260e1e041 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   attrs,
   coverage,
   furo,
@@ -17,7 +16,6 @@
   sphinx,
   sphinx-copybutton,
   sphinx-design,
-  tomli,
   tomli-w,
 }:
 
@@ -62,10 +60,7 @@ buildPythonPackage rec {
     ]
     ++ optional-dependencies.yaml
     ++ optional-dependencies.toml;
-    toml = [
-      tomli-w
-    ]
-    ++ lib.optional (pythonOlder "3.11") tomli;
+    toml = [ tomli-w ];
     yaml = [ pyyaml ];
   };
 
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 286c7395781e..c2e2f86000ad 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -8,9 +8,7 @@
   pytestCheckHook,
   pytest-codspeed,
   pytest-cov-stub,
-  pythonOlder,
   setuptools,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -33,10 +31,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [
-    typing-extensions
-  ];
-
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
   };
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 6c61c08f53fb..7912af69d1a3 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -6,7 +6,6 @@
   fetchpatch,
   gitUpdater,
   pythonAtLeast,
-  pythonOlder,
   isPyPy,
 
   # build-system
@@ -73,8 +72,7 @@ buildPythonPackage rec {
     mypy-extensions
     pathspec
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   optional-dependencies = {
     dmypy = [ psutil ];
diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix
index 00a70ad03454..47970169b677 100644
--- a/pkgs/development/python-modules/napari-npe2/default.nix
+++ b/pkgs/development/python-modules/napari-npe2/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   hatchling,
@@ -18,8 +17,6 @@
   rich,
   tomli-w,
   typer,
-  # python<3.11 only
-  tomli,
 
   # tests
   imagemagick,
@@ -61,9 +58,6 @@ buildPythonPackage (finalAttrs: {
     rich
     tomli-w
     typer
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
   ];
 
   pythonImportsCheck = [ "npe2" ];
diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index 8817d524e4ee..804ba43b9d95 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -5,7 +5,6 @@
   numpy,
   pandas,
   pyarrow,
-  pythonOlder,
   pytz,
   setuptools,
 }:
diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix
index 15078af0a068..541553419422 100644
--- a/pkgs/development/python-modules/niaarm/default.nix
+++ b/pkgs/development/python-modules/niaarm/default.nix
@@ -14,8 +14,6 @@
   pandas,
   plotly,
   scikit-learn,
-  pythonOlder,
-  tomli,
 
   # tests
   pytestCheckHook,
@@ -49,8 +47,7 @@ buildPythonPackage rec {
     pandas
     plotly
     scikit-learn
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 8a656cf0c78d..0552ca8896e6 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   # python dependencies
   click,
   python-dateutil,
diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index b84f1d47b852..70290ed9a5ca 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -7,9 +7,7 @@
   psutil,
   pytestCheckHook,
   python-gnupg,
-  pythonOlder,
   sentry-sdk,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -37,8 +35,7 @@ buildPythonPackage rec {
     psutil
     python-gnupg
     sentry-sdk
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index c59f6ae26b00..706868312c06 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -51,9 +51,6 @@ buildPythonPackage rec {
     humanize
     packaging
     virtualenv
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 8ef25f126700..6feebfa49809 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   pythonAtLeast,
-  pythonOlder,
   fetchFromGitHub,
   fetchpatch2,
   python,
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 778bcdbc6f21..f61e0710f6c5 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -6,7 +6,6 @@
   python,
   numpy_2,
   pythonAtLeast,
-  pythonOlder,
   buildPythonPackage,
   writeTextFile,
 
@@ -64,8 +63,6 @@ buildPythonPackage rec {
   version = "2.3.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "numpy";
     repo = "numpy";
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 72b85f9558f4..77f0fbf89911 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -18,7 +18,6 @@
   pythonOlder,
   setuptools,
   structlog,
-  tomli,
   tornado,
   zstandard,
 }:
@@ -49,8 +48,7 @@ buildPythonPackage rec {
     platformdirs
     tornado
     pycurl
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   optional-dependencies = {
     # vercmp = [ pyalpm ];
diff --git a/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix b/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix
index 72b9bdb5072e..1b3e9b93f0dd 100644
--- a/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix
+++ b/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchurl,
-  pythonOlder,
   numpy,
   torch,
 }:
diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix
index 984862d5e65a..0f43639f4f20 100644
--- a/pkgs/development/python-modules/odp-amsterdam/default.nix
+++ b/pkgs/development/python-modules/odp-amsterdam/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  pythonOlder,
   pytest-asyncio,
   pytestCheckHook,
   pytz,
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "6.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-odp-amsterdam";
diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix
index a2114a4ba10e..3fe0a3d9d5c3 100644
--- a/pkgs/development/python-modules/omnikinverter/default.nix
+++ b/pkgs/development/python-modules/omnikinverter/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-omnikinverter";
diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix
index 4d4ab4b21b1d..562433ab6272 100644
--- a/pkgs/development/python-modules/open-meteo/default.nix
+++ b/pkgs/development/python-modules/open-meteo/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "0.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-open-meteo";
diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix
index 50044a66b6a9..2aa4e74aed37 100644
--- a/pkgs/development/python-modules/openwebifpy/default.nix
+++ b/pkgs/development/python-modules/openwebifpy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   hatchling,
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "4.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-FaynJT+bR63nIwLEwXjTjwPXZ3Q5/X+zpx0gTA3Pqo8=";
diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix
index 1477f354290b..a39616345d0a 100644
--- a/pkgs/development/python-modules/optype/default.nix
+++ b/pkgs/development/python-modules/optype/default.nix
@@ -8,7 +8,6 @@
   numpy-typing-compat,
   beartype,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage {
@@ -23,8 +22,6 @@ buildPythonPackage {
     hash = "sha256-52cY+u0wjhJFQDLsjND/h6cfln4rCTtcy+HqaoH/re0=";
   };
 
-  disabled = pythonOlder "3.11";
-
   build-system = [
     uv-build
   ];
diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix
index b737908c1797..9779c0f5cb07 100644
--- a/pkgs/development/python-modules/p1monitor/default.nix
+++ b/pkgs/development/python-modules/p1monitor/default.nix
@@ -9,7 +9,6 @@
   pytest-cov-stub,
   pytestCheckHook,
   syrupy,
-  pythonOlder,
   yarl,
 }:
 
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "3.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-p1monitor";
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 1b6138529d56..23858cc70ba4 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -97,8 +97,7 @@ let
       pkg-config
       versioneer
       wheel
-    ]
-    ++ versioneer.optional-dependencies.toml;
+    ];
 
     enableParallelBuilding = true;
 
diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix
index d604adcf6162..ec04a946e276 100644
--- a/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/pkgs/development/python-modules/parsedatetime/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   pytestCheckHook,
   setuptools,
 }:
diff --git a/pkgs/development/python-modules/pdm-build-locked/default.nix b/pkgs/development/python-modules/pdm-build-locked/default.nix
index dc7945ac7472..669d95db81af 100644
--- a/pkgs/development/python-modules/pdm-build-locked/default.nix
+++ b/pkgs/development/python-modules/pdm-build-locked/default.nix
@@ -2,9 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pdm-backend,
-  tomli,
   build,
   hatchling,
   pkginfo,
@@ -31,8 +29,6 @@ buildPythonPackage rec {
 
   build-system = [ pdm-backend ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ tomli ];
-
   pythonImportsCheck = [ "pdm_build_locked" ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix
index f59df6139a9e..f440f0b626c6 100644
--- a/pkgs/development/python-modules/photutils/default.nix
+++ b/pkgs/development/python-modules/photutils/default.nix
@@ -9,7 +9,6 @@
   gwcs,
   matplotlib,
   numpy,
-  pythonOlder,
   rasterio,
   scikit-image,
   scikit-learn,
@@ -26,8 +25,6 @@ buildPythonPackage rec {
   version = "2.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "photutils";
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index eb1817e99b9c..d2608ce2d957 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   hypothesis,
-  pythonOlder,
   jbig2dec,
   deprecated,
   lxml,
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 73c8e6cbfb5b..d9ced756487e 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -9,10 +9,8 @@
   pyproject-hooks,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   setuptools-scm,
-  tomli,
   tomli-w,
   wheel,
 }:
@@ -42,8 +40,7 @@ buildPythonPackage rec {
     pyproject-hooks
     setuptools
     wheel
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index c67167f8f2ba..e9466f46a184 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -9,8 +9,6 @@
   packaging,
   platformdirs,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
   userpath,
   git,
 }:
@@ -37,8 +35,7 @@ buildPythonPackage rec {
     packaging
     platformdirs
     userpath
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix
index c7035184bb96..fdbd963b4080 100644
--- a/pkgs/development/python-modules/pixel-font-builder/default.nix
+++ b/pkgs/development/python-modules/pixel-font-builder/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   pytestCheckHook,
   nix-update-script,
   hatchling,
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "0.0.39";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "pixel_font_builder";
     inherit version;
diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index e6eb6e04bb7a..7bedbd047309 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   docutils,
   fetchPypi,
-  pythonOlder,
   importlib-metadata,
   importlib-resources,
   setuptools,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "2.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "pkg_about";
     inherit version;
diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 6ea5d6b7361e..bc07d4c4948d 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -7,7 +7,6 @@
   hatchling,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix
index 7dcd0c97c734..ab013cd8caee 100644
--- a/pkgs/development/python-modules/podman/default.nix
+++ b/pkgs/development/python-modules/podman/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   fixtures,
   pytestCheckHook,
-  pythonOlder,
   requests,
   requests-mock,
   rich,
diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index a846223148d0..aa4d247b2922 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -5,10 +5,8 @@
   fetchFromGitHub,
   gitMinimal,
   pytestCheckHook,
-  pythonOlder,
   ruamel-yaml,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -25,7 +23,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [ ruamel-yaml ];
 
   nativeCheckInputs = [
     gitMinimal
diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix
index 15ba349a04ed..8cbe2e3afffd 100644
--- a/pkgs/development/python-modules/prisma/default.nix
+++ b/pkgs/development/python-modules/prisma/default.nix
@@ -8,9 +8,7 @@
   nodeenv,
   pydantic,
   python-dotenv,
-  pythonOlder,
   setuptools,
-  strenum,
   tomlkit,
   typing-extensions,
 }:
@@ -38,8 +36,7 @@ buildPythonPackage rec {
     python-dotenv
     tomlkit
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ strenum ];
+  ];
 
   # Building the client requires network access
   doCheck = false;
diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix
index 6402596f8333..d7d7db06793c 100644
--- a/pkgs/development/python-modules/propcache/default.nix
+++ b/pkgs/development/python-modules/propcache/default.nix
@@ -8,9 +8,7 @@
   pytest-cov-stub,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -18,8 +16,6 @@ buildPythonPackage rec {
   version = "0.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "propcache";
@@ -36,9 +32,6 @@ buildPythonPackage rec {
     cython
     expandvars
     setuptools
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 91b8f29d7e92..f877a8cd4e67 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchurl,
-  pythonOlder,
   replaceVars,
 
   # build
@@ -16,7 +15,6 @@
 
   # psycopg-c
   cython,
-  tomli,
 
   # docs
   furo,
@@ -76,9 +74,6 @@ let
     build-system = [
       cython
       setuptools
-    ]
-    ++ lib.optional (pythonOlder "3.11") [
-      tomli
     ];
 
     nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix
index 6f5c97680fe4..202976b7d992 100644
--- a/pkgs/development/python-modules/pueblo/default.nix
+++ b/pkgs/development/python-modules/pueblo/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   setuptools,
   versioningit,
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "0.0.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   # This tarball doesn't include tests unfortunately, and the GitHub tarball
   # could have been an alternative, but versioningit fails to detect the
   # version of it correctly, even with setuptools-scm and
diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index c8927b9b19b3..62b3a7d5eab4 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -9,7 +9,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "2.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-pvoutput";
diff --git a/pkgs/development/python-modules/py-libnuma/default.nix b/pkgs/development/python-modules/py-libnuma/default.nix
index 90310b81b4c3..dce6b1905773 100644
--- a/pkgs/development/python-modules/py-libnuma/default.nix
+++ b/pkgs/development/python-modules/py-libnuma/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   numactl,
 }:
diff --git a/pkgs/development/python-modules/pyasynchat/default.nix b/pkgs/development/python-modules/pyasynchat/default.nix
index acc707492916..409cf37d9a0f 100644
--- a/pkgs/development/python-modules/pyasynchat/default.nix
+++ b/pkgs/development/python-modules/pyasynchat/default.nix
@@ -5,7 +5,6 @@
   setuptools,
   pyasyncore,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -30,16 +29,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  preCheck =
-    if (pythonOlder "3.11") then
-      ''
-        substituteInPlace tests/test_asynchat.py \
-          --replace-fail "asynchat = warnings_helper.import_deprecated('asynchat')" 'import asynchat' \
-          --replace-fail "asyncore = warnings_helper.import_deprecated('asyncore')" 'import asyncore' \
-          --replace-fail 'support.requires_working_socket(module=True)' ""
-      ''
-    else
-      null;
+  preCheck = null;
 
   pythonImportsCheck = [
     "asynchat"
diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index 6d13ac9859b7..0d8a31ad0d79 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   requests,
   requests-oauthlib,
   requests-mock,
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "9.2.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "jabesq";
     repo = "pyatmo";
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index f885c209492a..6adaa0bc65fc 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -43,8 +43,7 @@ buildPythonPackage rec {
   build-system = [
     setuptools
     versioneer
-  ]
-  ++ versioneer.optional-dependencies.toml;
+  ];
 
   dependencies = [
     bids-validator
diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix
index a9c5627d4d5d..3ad4b1c12ed1 100644
--- a/pkgs/development/python-modules/pycfdns/default.nix
+++ b/pkgs/development/python-modules/pycfdns/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "3.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pycfdns";
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index c44a2d3c5461..f9f8bb47b0bd 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   casttube,
   fetchFromGitHub,
-  pythonOlder,
   protobuf,
   setuptools,
   zeroconf,
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "14.0.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "pychromecast";
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 01f3033dd36c..789fed9ec6e2 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -8,8 +8,6 @@
 
   # dependencies
   anyio,
-  pythonOlder,
-  exceptiongroup,
 
   # tests
   objsize,
@@ -43,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     rustPlatform.maturinBuildHook
   ];
 
-  dependencies = [ anyio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  dependencies = [ anyio ];
 
   pythonImportsCheck = [ "pycrdt" ];
 
diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index 073bd963bca6..292c43d00a4b 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -8,7 +8,6 @@
   netifaces,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   urllib3,
   setuptools,
   tenacity,
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "2.18.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "fredrike";
     repo = "pydaikin";
diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
index b272f1c7c7e1..8b8f632e0b7c 100644
--- a/pkgs/development/python-modules/pydeako/default.nix
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -5,7 +5,6 @@
   mock,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   zeroconf,
 }:
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "0.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "DeakoLights";
     repo = "pydeako";
diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix
index eeda31a4a536..af1a140222c7 100644
--- a/pkgs/development/python-modules/pydiscovergy/default.nix
+++ b/pkgs/development/python-modules/pydiscovergy/default.nix
@@ -11,7 +11,6 @@
   pytest-httpx,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   respx,
 }:
 
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "3.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "pydiscovergy";
diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix
index 6fe939ff927d..ae631517be94 100644
--- a/pkgs/development/python-modules/pydocstyle/default.nix
+++ b/pkgs/development/python-modules/pydocstyle/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   fetchpatch2,
   poetry-core,
@@ -38,7 +37,7 @@ buildPythonPackage rec {
       --replace 'version = "0.0.0-dev"' 'version = "${version}"'
   '';
 
-  propagatedBuildInputs = [ snowballstemmer ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  propagatedBuildInputs = [ snowballstemmer ];
 
   optional-dependencies.toml = [ tomli ];
 
diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix
index 87be70bd1ae9..06de33708cb2 100644
--- a/pkgs/development/python-modules/pydrawise/default.nix
+++ b/pkgs/development/python-modules/pydrawise/default.nix
@@ -10,7 +10,6 @@
   graphql-core,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   requests,
   setuptools,
   setuptools-scm,
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "2025.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "dknowles2";
     repo = "pydrawise";
diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix
index 02db06776127..c281eb080388 100644
--- a/pkgs/development/python-modules/pyecotrend-ista/default.nix
+++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   setuptools-scm,
   dataclasses-json,
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "3.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Ludy87";
     repo = "pyecotrend-ista";
diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix
index c3552daa7e20..94d10ee0aa75 100644
--- a/pkgs/development/python-modules/pygments/default.nix
+++ b/pkgs/development/python-modules/pygments/default.nix
@@ -9,7 +9,6 @@
   # tests
   pytestCheckHook,
   wcag-contrast-ratio,
-  pythonOlder,
 }:
 
 let
diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index 62ef21d8a46f..4266d6f60096 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -16,9 +16,7 @@
   pytest-testinfra,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   typeguard,
-  typing-extensions,
   uv-dynamic-versioning,
 }:
 
@@ -63,8 +61,7 @@ buildPythonPackage rec {
     pydantic
     python-dateutil
     typeguard
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ];
 
   nativeCheckInputs = [
     freezegun
diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix
index 407e80d4710b..628254991592 100644
--- a/pkgs/development/python-modules/pyipma/default.nix
+++ b/pkgs/development/python-modules/pyipma/default.nix
@@ -9,7 +9,6 @@
   geopy,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "3.0.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "dgomes";
     repo = "pyipma";
diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix
index b8e72303e60d..47ddb9033b3f 100644
--- a/pkgs/development/python-modules/pyipp/default.nix
+++ b/pkgs/development/python-modules/pyipp/default.nix
@@ -2,7 +2,6 @@
   lib,
   aiohttp,
   aresponses,
-  async-timeout,
   awesomeversion,
   backoff,
   buildPythonPackage,
@@ -12,7 +11,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -42,8 +40,7 @@ buildPythonPackage rec {
     backoff
     deepmerge
     yarl
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ];
 
   nativeCheckInputs = [
     aresponses
diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index 3d74dbf3f918..35954461182e 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   hatchling,
   pydantic,
diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix
index cac5fd54914c..96d739a9a48a 100644
--- a/pkgs/development/python-modules/pylaunches/default.nix
+++ b/pkgs/development/python-modules/pylaunches/default.nix
@@ -7,7 +7,6 @@
   poetry-core,
   pytestCheckHook,
   pytest-asyncio,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pylaunches";
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 6f018ebd3939..99bcf2293409 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -14,10 +14,8 @@
   pytest-xdist,
   pytest7CheckHook,
   pythonAtLeast,
-  pythonOlder,
   requests,
   setuptools,
-  tomli,
   tomlkit,
   typing-extensions,
   writableTmpDirAsHomeHook,
@@ -44,8 +42,7 @@ buildPythonPackage (finalAttrs: {
     mccabe
     platformdirs
     tomlkit
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     gitpython
diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index ca6c4ad055d0..6df0b94614f9 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -11,7 +10,6 @@
   mypy,
   pytestCheckHook,
   python-lsp-server,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -31,8 +29,7 @@ buildPythonPackage rec {
   dependencies = [
     mypy
     python-lsp-server
-  ]
-  ++ lib.optional (pythonOlder "3.11") tomli;
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index 8a6212b1745c..69b15906de54 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   click,
   cryptography,
@@ -10,7 +9,6 @@
   pytest-asyncio,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
   xdg,
   zeroconf,
 }:
@@ -32,8 +30,7 @@ buildPythonPackage rec {
   dependencies = [
     cryptography
     orjson
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ];
 
   optional-dependencies = {
     cli = [
@@ -47,8 +44,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-timeout
     pytestCheckHook
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ];
 
   pytestFlags = [ "--asyncio-mode=auto" ];
 
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index bd4b41bae529..65bb58d1e48e 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -8,9 +8,7 @@
   pytest-env,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -27,7 +25,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ botocore ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  dependencies = [ botocore ];
 
   optional-dependencies = {
     signal = [ blinker ];
diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index 6b8786fa5bc5..15602490840c 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -37,8 +37,7 @@ buildPythonPackage rec {
     setuptools
     versioneer
     wheel
-  ]
-  ++ versioneer.optional-dependencies.toml;
+  ];
 
   buildInputs = [ gdal ];
 
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 35f7065a71dd..fb364148bcf5 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   flit-core,
@@ -12,9 +11,6 @@
   sphinx-rtd-theme,
   myst-parser,
 
-  # propagates
-  typing-extensions,
-
   # optionals
   cryptography,
   pillow,
@@ -57,8 +53,6 @@ buildPythonPackage rec {
     myst-parser
   ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
-
   optional-dependencies = rec {
     full = crypto ++ image;
     crypto = [ cryptography ];
diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix
index 5e2168a8f1cb..135c4ec30ffc 100644
--- a/pkgs/development/python-modules/pyppeteer-ng/default.nix
+++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix
@@ -26,7 +26,6 @@
   pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   readme-renderer,
   sphinx,
   sphinxcontrib-asyncio,
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 9cdefcf89b99..fe3f754b0ea6 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   replaceVars,
 
   certifi,
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "3.7.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "pyproj4";
     repo = "pyproj";
diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix
index 8af34616e46e..611f79a8bd20 100644
--- a/pkgs/development/python-modules/pyproject-api/default.nix
+++ b/pkgs/development/python-modules/pyproject-api/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build time
   hatchling,
@@ -10,7 +9,6 @@
 
   # runtime
   packaging,
-  tomli,
 
   # docs
   sphinxHook,
@@ -51,7 +49,7 @@ buildPythonPackage rec {
     sphinx-autodoc-typehints
   ];
 
-  dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [ packaging ];
 
   nativeCheckInputs = [
     pytest-mock
diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix
index b1cf6a1628d2..09ff87c3c6df 100644
--- a/pkgs/development/python-modules/pyproject-hooks/default.nix
+++ b/pkgs/development/python-modules/pyproject-hooks/default.nix
@@ -5,10 +5,8 @@
   flit-core,
   pyproject-hooks,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   testpath,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -24,8 +22,6 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ flit-core ];
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ];
-
   # We need to disable tests because this package is part of the bootstrap chain
   # and its test dependencies cannot be built yet when this is being built.
   doCheck = false;
diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix
index c78c0041a040..6175dddef22c 100644
--- a/pkgs/development/python-modules/pyproject-metadata/default.nix
+++ b/pkgs/development/python-modules/pyproject-metadata/default.nix
@@ -5,8 +5,6 @@
   flit-core,
   packaging,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -24,7 +22,7 @@ buildPythonPackage rec {
 
   dependencies = [ packaging ];
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   # Many broken tests, and missing test files
   doCheck = false;
diff --git a/pkgs/development/python-modules/pyps4-2ndscreen/default.nix b/pkgs/development/python-modules/pyps4-2ndscreen/default.nix
index 15ac17012048..6d6a6f51fd9a 100644
--- a/pkgs/development/python-modules/pyps4-2ndscreen/default.nix
+++ b/pkgs/development/python-modules/pyps4-2ndscreen/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
-  pythonOlder,
   setuptools,
   aiohttp,
   click,
@@ -44,15 +43,15 @@ buildPythonPackage rec {
     pycryptodomex
   ];
 
+  # All require asynctest, which is unsupported on 3.11+
+  doCheck = false;
+
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
     asynctest
   ];
 
-  # Disable tests for Python 3.11+ since they all require asynctest
-  doCheck = pythonOlder "3.11";
-
   pythonImportsCheck = [ "pyps4_2ndscreen" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix
index f11b613c9f27..c4ffb082a756 100644
--- a/pkgs/development/python-modules/pysensibo/default.nix
+++ b/pkgs/development/python-modules/pysensibo/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchPypi,
   poetry-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-Otk5W3VTbOAeZOVnXvW8VSxU1nHa8zUvmvduRTdlwVs=";
diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix
index 1085eb814046..e59b5a018ebf 100644
--- a/pkgs/development/python-modules/pysml/default.nix
+++ b/pkgs/development/python-modules/pysml/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   poetry-core,
   pyserial-asyncio-fast,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "0.1.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "mtdcr";
     repo = "pysml";
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 0b060ebe243e..2808d27182f5 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -6,7 +6,6 @@
   pythonOlder,
   pytest,
   setuptools-scm,
-  backports-asyncio-runner,
   typing-extensions,
 }:
 
@@ -31,13 +30,9 @@ buildPythonPackage rec {
 
   buildInputs = [ pytest ];
 
-  dependencies =
-    lib.optionals (pythonOlder "3.11") [
-      backports-asyncio-runner
-    ]
-    ++ lib.optionals (pythonOlder "3.13") [
-      typing-extensions
-    ];
+  dependencies = lib.optionals (pythonOlder "3.13") [
+    typing-extensions
+  ];
 
   postInstall = ''
     mkdir $testout
diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix
index 92573dfdcb0a..811bb87e5968 100644
--- a/pkgs/development/python-modules/pytest-resource-path/default.nix
+++ b/pkgs/development/python-modules/pytest-resource-path/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   colorama,
   pytest,
diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix
index 5f66d14c1944..6641f4097222 100644
--- a/pkgs/development/python-modules/pytest/7.nix
+++ b/pkgs/development/python-modules/pytest/7.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   callPackage,
-  pythonOlder,
   fetchPypi,
   writeText,
 
@@ -12,11 +11,9 @@
 
   # dependencies
   attrs,
-  exceptiongroup,
   iniconfig,
   packaging,
   pluggy,
-  tomli,
 
   # optional-dependencies
   argcomplete,
@@ -52,10 +49,6 @@ let
       iniconfig
       packaging
       pluggy
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [
-      exceptiongroup
-      tomli
     ];
 
     optional-dependencies = {
diff --git a/pkgs/development/python-modules/pytest/8_3.nix b/pkgs/development/python-modules/pytest/8_3.nix
index db07a7aee84a..aff92f835c6d 100644
--- a/pkgs/development/python-modules/pytest/8_3.nix
+++ b/pkgs/development/python-modules/pytest/8_3.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   callPackage,
-  pythonOlder,
   fetchPypi,
   writeText,
 
@@ -12,11 +11,9 @@
 
   # dependencies
   attrs,
-  exceptiongroup,
   iniconfig,
   packaging,
   pluggy,
-  tomli,
 
   # optional-dependencies
   argcomplete,
@@ -52,10 +49,6 @@ buildPythonPackage rec {
     packaging
     pluggy
     pygments
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
-    tomli
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 4d5618cb16a4..a9e44aba5833 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   callPackage,
-  pythonOlder,
   fetchPypi,
   writeText,
 
@@ -12,11 +11,9 @@
 
   # dependencies
   attrs,
-  exceptiongroup,
   iniconfig,
   packaging,
   pluggy,
-  tomli,
 
   # optional-dependencies
   argcomplete,
@@ -52,10 +49,6 @@ buildPythonPackage rec {
     packaging
     pluggy
     pygments
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
-    tomli
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix
index d4a04a62a4f0..53bf3102f2eb 100644
--- a/pkgs/development/python-modules/python-awair/default.nix
+++ b/pkgs/development/python-modules/python-awair/default.nix
@@ -7,7 +7,6 @@
   pytest-asyncio,
   pytest-aiohttp,
   pytestCheckHook,
-  pythonOlder,
   voluptuous,
   vcrpy,
 }:
diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
index 29905cfd5ac0..dce3327300aa 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -8,7 +8,6 @@
   pycryptodome,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   requests-mock,
   requests,
   six,
@@ -22,8 +21,6 @@ buildPythonPackage rec {
   version = "1.0.34";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "sammchardy";
     repo = "python-binance";
diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix
index 2b7b479fd0da..24cc7b78aa33 100644
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@@ -5,12 +5,10 @@
   fetchFromGitHub,
   msgpack,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   ruamel-yaml,
   setuptools,
   toml,
-  tomli,
   tomli-w,
 }:
 
@@ -40,7 +38,7 @@ buildPythonPackage rec {
     yaml = [ ruamel-yaml ];
     ruamel-yaml = [ ruamel-yaml ];
     PyYAML = [ pyyaml ];
-    tomli = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+    tomli = [ tomli-w ];
     toml = [ toml ];
     msgpack = [ msgpack ];
   };
diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
index 7a4f248d3637..ae64842dd512 100644
--- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
+++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   poetry-core,
@@ -26,8 +25,6 @@ buildPythonPackage rec {
   version = "0.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-homeassistant-analytics";
diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index afdf7094eeaf..e129a26a5f2f 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -48,8 +48,7 @@ buildPythonPackage rec {
   dependencies = [
     black
     python-lsp-server
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [ "pylsp_black" ];
 
diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix
index ded4e7073e8b..08f2d8b1fbd5 100644
--- a/pkgs/development/python-modules/python-lsp-ruff/default.nix
+++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   ruff,
@@ -10,7 +9,6 @@
   cattrs,
   lsprotocol,
   python-lsp-server,
-  tomli,
 
   # checks
   pytestCheckHook,
@@ -65,8 +63,7 @@ buildPythonPackage rec {
     cattrs
     lsprotocol
     python-lsp-server
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix
index 4c044c69b1cf..df695bb88631 100644
--- a/pkgs/development/python-modules/python-ndn/default.nix
+++ b/pkgs/development/python-modules/python-ndn/default.nix
@@ -10,7 +10,6 @@
   pycryptodomex,
   pygtrie,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -27,8 +26,6 @@ buildPythonPackage rec {
     hash = "sha256-8fcBIcZ2l6mkKe9YQe5+5fh7+vK9qxzBO2kLRUONumQ=";
   };
 
-  disabled = pythonOlder "3.11";
-
   nativeBuildInputs = [
     setuptools
     poetry-core
diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix
index 89e9b10c2089..03387302dbb1 100644
--- a/pkgs/development/python-modules/python-opendata-transport/default.nix
+++ b/pkgs/development/python-modules/python-opendata-transport/default.nix
@@ -3,7 +3,6 @@
   aiohttp,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   setuptools,
   urllib3,
 }:
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "0.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     pname = "python_opendata_transport";
     inherit version;
diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix
index 2dac54dac914..49391b7b032e 100644
--- a/pkgs/development/python-modules/python-opensky/default.nix
+++ b/pkgs/development/python-modules/python-opensky/default.nix
@@ -9,7 +9,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "1.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-opensky";
diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index 3e844a037dc9..dafade0eb522 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -8,7 +8,6 @@
   flask,
   pytest-asyncio,
   pytest-trio,
-  pythonOlder,
   pytestCheckHook,
   setuptools,
   trio,
@@ -39,7 +38,6 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    asyncio = lib.optionals (pythonOlder "3.11") [ async-timeout ];
     trio = [ trio ];
     curio = [ curio ];
     anyio = [ anyio ];
diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix
index b227c7a7b368..af7def06f0c7 100644
--- a/pkgs/development/python-modules/python-swiftclient/default.nix
+++ b/pkgs/development/python-modules/python-swiftclient/default.nix
@@ -7,7 +7,6 @@
   openstacksdk,
   pbr,
   python-keystoneclient,
-  pythonOlder,
   stestr,
 }:
 
diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix
index 64070ae59ef4..3dab7d937419 100644
--- a/pkgs/development/python-modules/python-technove/default.nix
+++ b/pkgs/development/python-modules/python-technove/default.nix
@@ -11,7 +11,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Moustachauve";
     repo = "pytechnove";
diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix
index ce09a610ef29..07c817909c6c 100644
--- a/pkgs/development/python-modules/python-vlc/default.nix
+++ b/pkgs/development/python-modules/python-vlc/default.nix
@@ -5,7 +5,6 @@
   setuptools,
   libvlc,
   replaceVars,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 4f2eda82a2c1..9ec7637b3e83 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -6,7 +6,6 @@
   gql,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   websockets,
 }:
@@ -16,8 +15,6 @@ buildPythonPackage (finalAttrs: {
   version = "0.35.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyTibber";
diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix
index ea0754a71728..0f5ef30d7c15 100644
--- a/pkgs/development/python-modules/pytoolconfig/default.nix
+++ b/pkgs/development/python-modules/pytoolconfig/default.nix
@@ -8,13 +8,11 @@
   platformdirs,
   pydantic,
   pytestCheckHook,
-  pythonOlder,
   sphinx,
   sphinx-autodoc-typehints,
   sphinx-rtd-theme,
   sphinxHook,
   tabulate,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -47,7 +45,7 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.doc;
 
-  propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  propagatedBuildInputs = [ packaging ];
 
   optional-dependencies = {
     validation = [ pydantic ];
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index 683da1aab617..b655596b1450 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pytestCheckHook,
   setuptools,
   tokenize-rt,
diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix
index 445b79fa65cf..4ff15a35dedc 100644
--- a/pkgs/development/python-modules/pyvera/default.nix
+++ b/pkgs/development/python-modules/pyvera/default.nix
@@ -8,7 +8,6 @@
   pytest-timeout,
   responses,
   pytestCheckHook,
-  pythonOlder,
   requests,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "0.3.16";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "pavoni";
     repo = "pyvera";
diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix
index 2d0fb02fe512..98e2c8d74f40 100644
--- a/pkgs/development/python-modules/pyversasense/default.nix
+++ b/pkgs/development/python-modules/pyversasense/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ aiohttp ];
 
-  doCheck = pythonOlder "3.11"; # asynctest unsupported on python3.11
+  doCheck = false; # asynctest unsupported on 3.11+
 
   nativeCheckInputs = [
     asynctest
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 26282b0bbf8b..e707085be503 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -7,7 +7,6 @@
   cffi,
   fetchPypi,
   pycparser,
-  pythonOlder,
   setuptools,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "9.2.154";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-a3ei2w66v18QKAofpPvDUoM42zHRHPrNQic+FE+rLKY=";
diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix
index cc41d2b02efe..598b93924c0d 100644
--- a/pkgs/development/python-modules/pyvisa-sim/default.nix
+++ b/pkgs/development/python-modules/pyvisa-sim/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchPypi,
-  pythonOlder,
   buildPythonPackage,
   pyvisa,
   pyyaml,
diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix
index d53460dc4717..5e5e3d7f09ee 100644
--- a/pkgs/development/python-modules/pywaze/default.nix
+++ b/pkgs/development/python-modules/pywaze/default.nix
@@ -7,7 +7,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   respx,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "pywaze";
diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix
index 830020beb023..a87642a979e1 100644
--- a/pkgs/development/python-modules/qcs-sdk-python/default.nix
+++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix
@@ -7,7 +7,6 @@
   opentelemetry-sdk,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   qcs-api-client-common,
   quil,
   rustPlatform,
diff --git a/pkgs/development/python-modules/quart-trio/default.nix b/pkgs/development/python-modules/quart-trio/default.nix
index 67170265ca70..584249b8d107 100644
--- a/pkgs/development/python-modules/quart-trio/default.nix
+++ b/pkgs/development/python-modules/quart-trio/default.nix
@@ -40,10 +40,7 @@ buildPythonPackage rec {
     quart
     trio
   ]
-  ++ hypercorn.optional-dependencies.trio
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
-  ];
+  ++ hypercorn.optional-dependencies.trio;
 
   pythonImportsCheck = [
     "quart_trio"
diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix
index 599f90c0258a..ed4ec2d5cb0e 100644
--- a/pkgs/development/python-modules/radios/default.nix
+++ b/pkgs/development/python-modules/radios/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   poetry-core,
   aiodns,
@@ -24,8 +23,6 @@ buildPythonPackage rec {
   version = "0.3.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-radios";
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 79b19a0ed0db..af9c31f30eec 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -3,13 +3,11 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # builds
   poetry-core,
 
   # propagates
-  isodate,
   pyparsing,
 
   # extras: networkx
@@ -41,8 +39,7 @@ buildPythonPackage rec {
 
   dependencies = [
     pyparsing
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ isodate ];
+  ];
 
   optional-dependencies = {
     html = [ html5lib ];
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 2c731ad8f304..81e69eb00e78 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -5,11 +5,9 @@
   pytest-asyncio,
   pytest-httpserver,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   requests,
   setuptools,
-  tomli,
   tomli-w,
   types-pyyaml,
   types-toml,
@@ -45,8 +43,7 @@ buildPythonPackage rec {
     pytest-httpserver
     pytestCheckHook
     tomli-w
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [ "responses" ];
 
diff --git a/pkgs/development/python-modules/romy/default.nix b/pkgs/development/python-modules/romy/default.nix
index c09b537da86a..bf334ecca73b 100644
--- a/pkgs/development/python-modules/romy/default.nix
+++ b/pkgs/development/python-modules/romy/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  pythonOlder,
   aiohttp,
 }:
 
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.0.10";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "xeniter";
     repo = "romy";
diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix
index 0554f2018c64..912d1b52c390 100644
--- a/pkgs/development/python-modules/rstcheck-core/default.nix
+++ b/pkgs/development/python-modules/rstcheck-core/default.nix
@@ -8,7 +8,6 @@
   pydantic,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   setuptools-scm,
 }:
diff --git a/pkgs/development/python-modules/safehttpx/default.nix b/pkgs/development/python-modules/safehttpx/default.nix
index 95614467399f..52b03022a64f 100644
--- a/pkgs/development/python-modules/safehttpx/default.nix
+++ b/pkgs/development/python-modules/safehttpx/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   hatchling,
   httpx,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index e28902e92a67..692bc4c80694 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   hatchling,
   setuptools,
diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index cc493c1a75c3..7a2bfd7d9d48 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   hatch-vcs,
@@ -13,7 +12,6 @@
   # dependencies
   packaging,
   pathspec,
-  exceptiongroup,
 
   # tests
   build,
@@ -23,7 +21,6 @@
   pytest-subprocess,
   pytestCheckHook,
   setuptools,
-  tomli,
   virtualenv,
   wheel,
 }:
@@ -40,10 +37,7 @@ buildPythonPackage rec {
     hash = "sha256-4DwODJw1U/0+K/d7znYtDO2va71lzp1gDm4Bg9OBjQY=";
   };
 
-  postPatch = lib.optionalString (pythonOlder "3.11") ''
-    substituteInPlace pyproject.toml \
-      --replace-fail '"error",' '"error", "ignore::UserWarning",'
-  '';
+  postPatch = "";
 
   build-system = [
     hatch-vcs
@@ -53,10 +47,6 @@ buildPythonPackage rec {
   dependencies = [
     packaging
     pathspec
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    exceptiongroup
-    tomli
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 221eeff0da87..31f0a1d2b65f 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   fetchpatch2,
   hatch-fancy-pypi-readme,
@@ -11,7 +10,6 @@
   packaging,
   setuptools,
   wheel,
-  tomli,
   # Test Inputs
   cmake,
   cython,
@@ -61,8 +59,7 @@ buildPythonPackage rec {
     packaging
     setuptools
     wheel
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     cmake
diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix
index 9c5d7f197456..ea35166924a6 100644
--- a/pkgs/development/python-modules/scipy-stubs/default.nix
+++ b/pkgs/development/python-modules/scipy-stubs/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   uv-build,
   optype,
   scipy,
@@ -25,8 +24,6 @@ buildPythonPackage rec {
       --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build"
   '';
 
-  disabled = pythonOlder "3.11";
-
   build-system = [
     uv-build
   ];
diff --git a/pkgs/development/python-modules/sensai-utils/default.nix b/pkgs/development/python-modules/sensai-utils/default.nix
index 8364f07a5577..ddf21ca0a25c 100644
--- a/pkgs/development/python-modules/sensai-utils/default.nix
+++ b/pkgs/development/python-modules/sensai-utils/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "1.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "opcode81";
     repo = "sensAI-utils";
diff --git a/pkgs/development/python-modules/sensoterra/default.nix b/pkgs/development/python-modules/sensoterra/default.nix
index a592bd652fc3..da398e4e0510 100644
--- a/pkgs/development/python-modules/sensoterra/default.nix
+++ b/pkgs/development/python-modules/sensoterra/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   requests,
   setuptools,
 }:
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "2.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04=";
diff --git a/pkgs/development/python-modules/setuptools-generate/default.nix b/pkgs/development/python-modules/setuptools-generate/default.nix
index 9f8baf22be04..adb0cec964a7 100644
--- a/pkgs/development/python-modules/setuptools-generate/default.nix
+++ b/pkgs/development/python-modules/setuptools-generate/default.nix
@@ -2,13 +2,11 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools-scm,
   click,
   help2man,
   markdown-it-py,
   shtab,
-  tomli,
   pytestCheckHook,
 }:
 
@@ -31,8 +29,7 @@ buildPythonPackage rec {
     help2man
     markdown-it-py
     shtab
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix
index 37708bda7d3d..477be6ebacf0 100644
--- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix
+++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix
@@ -8,10 +8,8 @@
   packaging,
   pytestCheckHook,
   pytest-rerunfailures,
-  pythonOlder,
   setuptools,
   toml,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -41,8 +39,7 @@ buildPythonPackage rec {
   dependencies = [
     packaging
     setuptools
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [ "setuptools_git_versioning" ];
 
diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix
index bde5a8ac60a7..1c165bb9c498 100644
--- a/pkgs/development/python-modules/setuptools-scm/default.nix
+++ b/pkgs/development/python-modules/setuptools-scm/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   callPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -11,7 +10,6 @@
   # dependencies
   packaging,
   typing-extensions,
-  tomli,
 
   # optional-dependencies
   rich,
@@ -28,23 +26,15 @@ buildPythonPackage rec {
     hash = "sha256-RuHPfooJZSthP5uk/ptV8vSW56Iz5OANJafLQflMPAs=";
   };
 
-  postPatch =
-    if (pythonOlder "3.11") then
-      ''
-        substituteInPlace pyproject.toml \
-          --replace-fail 'tomli<=2.0.2' 'tomli'
-      ''
-    else
-      null;
+  postPatch = null;
 
-  build-system = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  build-system = [ setuptools ];
 
   dependencies = [
     packaging
     setuptools
     typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   optional-dependencies = {
     rich = [ rich ];
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index f7fdef8685ed..bd44c37972cb 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
 
   cython,
   geos,
@@ -18,7 +17,6 @@ buildPythonPackage rec {
   pname = "shapely";
   version = "2.1.2";
   pyproject = true;
-  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "shapely";
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 59f0a75f3ed6..a19b177b0f65 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,11 +2,9 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   setuptools,
   setuptools-scm,
   packaging,
-  tomli,
 
   # tests
   poppler-qt5,
@@ -32,8 +30,7 @@ buildPythonPackage rec {
   dependencies = [
     packaging
     setuptools
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   # There aren't tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index 92c21fb86c5a..cff4d35bfb18 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -8,7 +8,6 @@
   flit-core,
   lxml,
   pyjwt,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.3.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "lendy007";
     repo = "skodaconnect";
diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index 80860f51a307..27784318853d 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -12,7 +12,6 @@
   prettytable,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   rich,
   scikit-learn,
diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix
index 6c43296561df..98619aa26173 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/pkgs/development/python-modules/solo-python/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   flit,
   click,
   cryptography,
diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index 0b4829d4a741..17973333df6b 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   cmake,
@@ -11,7 +10,6 @@
   scikit-build-core,
   setuptools,
   setuptools-scm,
-  typing-extensions,
 
   # native dependencies
   libsoxr,
@@ -53,9 +51,6 @@ buildPythonPackage rec {
     nanobind
     setuptools
     setuptools-scm
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    typing-extensions
   ];
 
   buildInputs = [ libsoxr ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 655b36b081bd..9ccb4eae1e6e 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   pythonAtLeast,
-  pythonOlder,
   fetchFromGitHub,
   isPyPy,
 
@@ -27,7 +26,6 @@
   sphinxcontrib-qthelp,
   sphinxcontrib-serializinghtml,
   sphinxcontrib-websupport,
-  tomli,
 
   # check phase
   defusedxml,
@@ -47,8 +45,6 @@ buildPythonPackage rec {
   version = "8.2.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "sphinx-doc";
     repo = "sphinx";
@@ -84,8 +80,7 @@ buildPythonPackage rec {
     sphinxcontrib-serializinghtml
     # extra[docs]
     sphinxcontrib-websupport
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index 8518632fcae6..d9345f82b5c3 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -3,13 +3,11 @@
   attrs,
   buildPythonPackage,
   cattrs,
-  exceptiongroup,
   fetchFromGitHub,
   fonttools,
   fs,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   ufo2ft,
   ufolib2,
   hatchling,
@@ -41,8 +39,7 @@ buildPythonPackage rec {
     fonttools
     # required by fonttools[ufo]
     fs
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/sunwatcher/default.nix b/pkgs/development/python-modules/sunwatcher/default.nix
index 0a3d7a1a1bd6..b0d11070116a 100644
--- a/pkgs/development/python-modules/sunwatcher/default.nix
+++ b/pkgs/development/python-modules/sunwatcher/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   requests,
   setuptools,
 }:
diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix
index 151fcd1f3cf0..a548b08957d5 100644
--- a/pkgs/development/python-modules/systembridgemodels/default.nix
+++ b/pkgs/development/python-modules/systembridgemodels/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   setuptools,
   pytestCheckHook,
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "5.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "system-bridge-models";
diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix
index f31b7e20df8d..b2282677ee3b 100644
--- a/pkgs/development/python-modules/tabcmd/default.nix
+++ b/pkgs/development/python-modules/tabcmd/default.nix
@@ -9,7 +9,6 @@
   pytest-order,
   pytestCheckHook,
   python,
-  pythonOlder,
   requests,
   setuptools,
   setuptools-scm,
diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix
index 65f69562e5fa..43163090bad9 100644
--- a/pkgs/development/python-modules/tailscale/default.nix
+++ b/pkgs/development/python-modules/tailscale/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "0.6.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-tailscale";
diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index a755fe339a21..3546f2b8701d 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -13,8 +13,6 @@
   protobuf,
   types-protobuf,
   typing-extensions,
-  pythonOlder,
-  python-dateutil,
 
   # nativeBuildInputs
   cargo,
@@ -61,8 +59,7 @@ buildPythonPackage rec {
     protobuf
     types-protobuf
     typing-extensions
-  ]
-  ++ lib.optional (pythonOlder "3.11") python-dateutil;
+  ];
 
   nativeBuildInputs = [
     cargo
diff --git a/pkgs/development/python-modules/terminaltables3/default.nix b/pkgs/development/python-modules/terminaltables3/default.nix
index 6f7b82e329d6..5ddd2375ba28 100644
--- a/pkgs/development/python-modules/terminaltables3/default.nix
+++ b/pkgs/development/python-modules/terminaltables3/default.nix
@@ -8,7 +8,6 @@
   pytest-cov-stub,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   termcolor,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "4.0.0-unstable-2024-07-21";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "matthewdeanmartin";
     repo = "terminaltables3";
diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix
index a63bb89cd38e..4cb4ac39635f 100644
--- a/pkgs/development/python-modules/tianshou/default.nix
+++ b/pkgs/development/python-modules/tianshou/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -50,8 +49,6 @@ buildPythonPackage rec {
   version = "1.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "thu-ml";
     repo = "tianshou";
diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix
index 3946537df1cf..100a41ef5a6b 100644
--- a/pkgs/development/python-modules/todoist-api-python/default.nix
+++ b/pkgs/development/python-modules/todoist-api-python/default.nix
@@ -7,7 +7,6 @@
   hatchling,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   requests,
   responses,
 }:
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index 3d2b37967128..c395192d0b30 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   python,
   buildPythonPackage,
-  pythonOlder,
   pythonAtLeast,
   fetchurl,
 
@@ -45,7 +44,7 @@ buildPythonPackage {
 
   format = "wheel";
 
-  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
+  disabled = pythonAtLeast "3.15";
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 2e9e5bd3f533..119635676d7e 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   python,
   fetchurl,
-  pythonOlder,
   pythonAtLeast,
 
   # buildInputs
@@ -34,7 +33,7 @@ buildPythonPackage (finalAttrs: {
     in
     fetchurl srcs;
 
-  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
+  disabled = pythonAtLeast "3.15";
 
   buildInputs = [
     # We need to patch lib/torio/_torio_ffmpeg6
diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index d689cf36db58..468d28515e20 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -4,7 +4,6 @@
   python,
   buildPythonPackage,
   fetchurl,
-  pythonOlder,
   pythonAtLeast,
 
   # buildInputs
@@ -34,7 +33,7 @@ buildPythonPackage {
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
-  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
+  disabled = pythonAtLeast "3.15";
 
   # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support.
   buildInputs =
diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix
index dccb5ba0ecf3..12120c516745 100644
--- a/pkgs/development/python-modules/towncrier/default.nix
+++ b/pkgs/development/python-modules/towncrier/default.nix
@@ -9,8 +9,6 @@
   jinja2,
   mock,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
   twisted,
 }:
 
@@ -30,8 +28,7 @@ buildPythonPackage rec {
     click
     incremental
     jinja2
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   preCheck = ''
     export PATH=$out/bin:$PATH
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 8d14f48a2268..2676888849e7 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -2,11 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   packaging,
   pluggy,
   virtualenv,
-  tomli,
   filelock,
   hatchling,
   hatch-vcs,
@@ -17,7 +15,6 @@
   cachetools,
   testers,
   tox,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -47,10 +44,6 @@ buildPythonPackage rec {
     pluggy
     pyproject-api
     virtualenv
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    tomli
-    typing-extensions
   ];
 
   doCheck = false; # infinite recursion via devpi-client
diff --git a/pkgs/development/python-modules/trakit/default.nix b/pkgs/development/python-modules/trakit/default.nix
index d5db7f459427..d6fd6f95c356 100644
--- a/pkgs/development/python-modules/trakit/default.nix
+++ b/pkgs/development/python-modules/trakit/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build dependencies
   poetry-core,
@@ -22,8 +21,6 @@ buildPythonPackage rec {
   version = "0.2.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ratoaq2";
     repo = "trakit";
diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix
index e29d707ab897..739fb0c2d3ee 100644
--- a/pkgs/development/python-modules/trio-asyncio/default.nix
+++ b/pkgs/development/python-modules/trio-asyncio/default.nix
@@ -7,11 +7,9 @@
   trio,
   outcome,
   sniffio,
-  exceptiongroup,
   pytest-trio,
   pytestCheckHook,
   pythonAtLeast,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -41,8 +39,7 @@ buildPythonPackage rec {
     trio
     outcome
     sniffio
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ];
 
   pytestFlags = [
     # RuntimeWarning: Can't run the Python asyncio tests because they're not installed
diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix
index 150a62bc9ce1..544d767cbdf4 100644
--- a/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/pkgs/development/python-modules/trio-websocket/default.nix
@@ -3,9 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
-  exceptiongroup,
   pytest-trio,
   pytestCheckHook,
   trio,
@@ -30,8 +28,7 @@ buildPythonPackage rec {
   dependencies = [
     trio
     wsproto
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ];
 
   nativeCheckInputs = [
     pytest-trio
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 15b78e9bdef1..7bfd2857a611 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -9,7 +9,6 @@
 
   # dependencies
   attrs,
-  exceptiongroup,
   idna,
   outcome,
   sniffio,
@@ -54,8 +53,7 @@ buildPythonPackage rec {
     outcome
     sniffio
     sortedcontainers
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
+  ];
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix
index a70016ff0763..9698aa8c9b02 100644
--- a/pkgs/development/python-modules/twentemilieu/default.nix
+++ b/pkgs/development/python-modules/twentemilieu/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "2.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-twentemilieu";
diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 933a37720917..d49e81aa09dd 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -15,11 +15,8 @@
   pytestCheckHook,
   python-dotenv,
   pythonAtLeast,
-  pythonOlder,
   rich-click,
   sybil,
-  tomli,
-  typing-extensions,
 }:
 buildPythonPackage rec {
   pname = "typed-settings";
@@ -34,8 +31,6 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ tomli ];
-
   optional-dependencies = {
     all = [
       attrs
@@ -66,8 +61,7 @@ buildPythonPackage rec {
     rich-click
     sybil
   ]
-  ++ (lib.optional (pythonOlder "3.11") typing-extensions)
-  ++ (lib.concatAttrValues optional-dependencies);
+  ++ lib.concatAttrValues optional-dependencies;
 
   enabledTestPaths = [ "tests" ];
 
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index 087cfdc531e4..27c60f8db34e 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -3,13 +3,11 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   setuptools,
 
   # dependencies
-  async-timeout,
   bellows,
   click,
   coloredlogs,
@@ -55,7 +53,6 @@ buildPythonPackage rec {
     typing-extensions
     zigpy
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix
index ea49f861becd..49755902d145 100644
--- a/pkgs/development/python-modules/upb-lib/default.nix
+++ b/pkgs/development/python-modules/upb-lib/default.nix
@@ -5,7 +5,6 @@
   hatchling,
   pyserial-asyncio-fast,
   pytestCheckHook,
-  pythonOlder,
   pytz,
 }:
 
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "0.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "gwww";
     repo = "upb-lib";
diff --git a/pkgs/development/python-modules/uplink/default.nix b/pkgs/development/python-modules/uplink/default.nix
index b63878a65280..3098da9500ca 100644
--- a/pkgs/development/python-modules/uplink/default.nix
+++ b/pkgs/development/python-modules/uplink/default.nix
@@ -14,7 +14,6 @@
   pytest-asyncio,
   pytest-twisted,
   twisted,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 7735b19c1402..e1675593cf99 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -8,12 +8,10 @@
   httptools,
   python-dotenv,
   pyyaml,
-  typing-extensions,
   uvloop,
   watchfiles,
   websockets,
   hatchling,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -38,8 +36,7 @@ buildPythonPackage rec {
   dependencies = [
     click
     h11
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
+  ];
 
   optional-dependencies.standard = [
     httptools
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 6354d3b3d49e..b917ea456f33 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   fetchpatch,
 
@@ -74,9 +73,6 @@ buildPythonPackage rec {
     # https://github.com/MagicStack/uvloop/issues/709
     "tests/test_process.py::TestAsyncio_AIO_Process::test_cancel_post_init"
   ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    "tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"
-  ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
     # Segmentation fault
     "tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename"
diff --git a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix
index 544ba4356012..1c600d96ff5c 100644
--- a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix
+++ b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   poetry-core,
   pillow,
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.1.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "PiotrMachowski";
     repo = "Python-package-${pname}";
diff --git a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix
index 9c2b794d149c..d23520cd2871 100644
--- a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix
+++ b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   poetry-core,
   pillow,
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "0.1.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "PiotrMachowski";
     repo = "Python-package-${pname}";
diff --git a/pkgs/development/python-modules/valkey/default.nix b/pkgs/development/python-modules/valkey/default.nix
index 3ea3640deebf..7df38212e42f 100644
--- a/pkgs/development/python-modules/valkey/default.nix
+++ b/pkgs/development/python-modules/valkey/default.nix
@@ -9,9 +9,6 @@
   # build-system
   setuptools,
 
-  # dependencies
-  async-timeout,
-
   # optional-dependencies
   cryptography,
   pyopenssl,
@@ -51,8 +48,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ];
-
   optional-dependencies = {
     # TODO: libvalkey = [ libvalkey ];
     ocsp = [
diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index 9c82e064c2a8..2b31b2e4b0f7 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   fetchpatch,
-  pythonOlder,
   click,
   click-log,
   click-threading,
diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix
index 62302b0dc854..69e753c08bdf 100644
--- a/pkgs/development/python-modules/vehicle/default.nix
+++ b/pkgs/development/python-modules/vehicle/default.nix
@@ -10,7 +10,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   syrupy,
   yarl,
 }:
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "2.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-vehicle";
diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix
index a138a9a92906..762d086ac3dc 100644
--- a/pkgs/development/python-modules/versioneer/default.nix
+++ b/pkgs/development/python-modules/versioneer/default.nix
@@ -2,9 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -19,11 +17,7 @@ buildPythonPackage rec {
     hash = "sha256-3b7Wfhd24Vym5XCeN/M1832Q1VzvlWi3quTRaZrID2s=";
   };
 
-  nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
-
-  optional-dependencies = {
-    toml = lib.optionals (pythonOlder "3.11") [ tomli ];
-  };
+  nativeBuildInputs = [ setuptools ];
 
   # Couldn't get tests to work because, for instance, they used virtualenv and pip
   doCheck = false;
diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index edd16726c0f2..9c7ea7bfd6df 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -1,10 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   packaging,
-  tomli,
   pytestCheckHook,
   build,
   hatchling,
@@ -35,8 +33,7 @@ buildPythonPackage rec {
 
   dependencies = [
     packaging
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 6b0469c80823..a51ae2bbd75e 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   isPyPy,
   distlib,
   fetchFromGitHub,
@@ -57,7 +56,6 @@ buildPythonPackage rec {
     # Network access
     "test_seed_link_via_app_data"
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ "test_help" ]
   ++ lib.optionals isPyPy [
     # encoding problems
     "test_bash"
diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix
index c03c83595a59..2697107a10b0 100644
--- a/pkgs/development/python-modules/vulture/default.nix
+++ b/pkgs/development/python-modules/vulture/default.nix
@@ -5,10 +5,8 @@
   pint,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   toml,
-  tomli,
 }:
 
 buildPythonPackage rec {
@@ -23,8 +21,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = lib.optionals (pythonOlder "3.11") [ tomli ];
-
   nativeCheckInputs = [
     pint
     pytest-cov-stub
diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix
index f4868058e570..4a9f32a0edba 100644
--- a/pkgs/development/python-modules/w1thermsensor/default.nix
+++ b/pkgs/development/python-modules/w1thermsensor/default.nix
@@ -5,11 +5,9 @@
   setuptools,
   aiofiles,
   click,
-  tomli,
   pytest-mock,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -42,7 +40,6 @@ buildPythonPackage rec {
     pytest-asyncio
     pytestCheckHook
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ]
   ++ lib.concatAttrValues optional-dependencies;
 
   pythonImportsCheck = [ "w1thermsensor" ];
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 3dbd0299ece2..031c44f2a9bf 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   unittestCheckHook,
   pythonAtLeast,
-  pythonOlder,
   setuptools,
   werkzeug,
 }:
@@ -38,10 +37,6 @@ buildPythonPackage rec {
   ++ lib.optionals (pythonAtLeast "3.13") [
     # https://github.com/python-websockets/websockets/issues/1569
     "test_writing_in_send_context_fails"
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError
-    "test_reject_invalid_server_certificate"
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix
index 2d040d4dcf72..229615d56113 100644
--- a/pkgs/development/python-modules/whool/default.nix
+++ b/pkgs/development/python-modules/whool/default.nix
@@ -6,8 +6,6 @@
   lib,
   manifestoo-core,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
   wheel,
 }:
 
@@ -28,8 +26,7 @@ buildPythonPackage rec {
   dependencies = [
     manifestoo-core
     wheel
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  ];
 
   pythonImportsCheck = [ "whool" ];
 
diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index 7fcd69029332..eba545151ebe 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -14,7 +14,6 @@
   pytest-cov-stub,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   typer,
   yarl,
   zeroconf,
@@ -25,8 +24,6 @@ buildPythonPackage rec {
   version = "0.21.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-wled";
diff --git a/pkgs/development/python-modules/xarray-dataclass/default.nix b/pkgs/development/python-modules/xarray-dataclass/default.nix
index c55b3e974e2b..c4e47a2a39b0 100644
--- a/pkgs/development/python-modules/xarray-dataclass/default.nix
+++ b/pkgs/development/python-modules/xarray-dataclass/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   hatchling,
   pytestCheckHook,
   numpy,
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 5b501200dc82..5ae515b7c5fd 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -41,8 +40,6 @@ buildPythonPackage rec {
   version = "2025.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "pydata";
     repo = "xarray";
diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 8054520520d9..ddceea21ff0d 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   which,
   setuptools,
diff --git a/pkgs/development/python-modules/xnatpy/default.nix b/pkgs/development/python-modules/xnatpy/default.nix
index c96b0f87fd63..9a73b35d35fa 100644
--- a/pkgs/development/python-modules/xnatpy/default.nix
+++ b/pkgs/development/python-modules/xnatpy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   hatchling,
   versioningit,
   click,
diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
index 048b48436e2e..ec620caedb6d 100644
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  pythonOlder,
   requests,
 }:
 
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.4.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "domwillcode";
     repo = "yale-smart-alarm-client";
diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix
index 0f5dd64cf846..8f1e44e38a4c 100644
--- a/pkgs/development/python-modules/yeelight/default.nix
+++ b/pkgs/development/python-modules/yeelight/default.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   fetchFromGitLab,
   flit-core,
   ifaddr,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +21,7 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  dependencies = [ ifaddr ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index b25b93bc1c05..a5ca2aba1590 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   cython,
-  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
   ifaddr,
@@ -10,7 +9,6 @@
   pytest-codspeed,
   pytest-cov-stub,
   pytest-timeout,
-  pythonOlder,
   pytestCheckHook,
   setuptools,
 }:
@@ -33,7 +31,7 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  dependencies = [ ifaddr ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix
index b391ab3a2ff0..51f8b9c3958a 100644
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -6,7 +6,6 @@
   pyserial-asyncio,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   zigpy,
 }:
 
@@ -31,7 +30,7 @@ buildPythonPackage rec {
     zigpy
   ];
 
-  doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11
+  doCheck = false; # asynctest unsupported on 3.11+
 
   nativeCheckInputs = [
     asynctest
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index ce72e4f7a79a..11e2fce0a079 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   coloredlogs,
   fetchFromGitHub,
@@ -11,7 +10,6 @@
   pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   voluptuous,
   zigpy,
@@ -43,9 +41,6 @@ buildPythonPackage rec {
     jsonschema
     voluptuous
     zigpy
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index ea68845857a4..eea2a720a25d 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -4,7 +4,6 @@
   aiohttp,
   aioresponses,
   aiosqlite,
-  async-timeout,
   attrs,
   buildPythonPackage,
   crccheck,
@@ -18,7 +17,6 @@
   pytest-asyncio_0,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   typing-extensions,
   voluptuous,
@@ -55,8 +53,7 @@ buildPythonPackage rec {
     pyserial-asyncio-fast
     typing-extensions
     voluptuous
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ];
 
   nativeCheckInputs = [
     aioresponses
diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix
index 16163ea3de5a..38d6b5c705c0 100644
--- a/pkgs/development/python-modules/zm-py/default.nix
+++ b/pkgs/development/python-modules/zm-py/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   requests,
 }:
 
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "0.5.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "rohankapoorcom";
     repo = "zm-py";

From 9a6802027908effde392070e0ae9a55880081146 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 04:30:10 +0000
Subject: [PATCH 41/66] vscodium: 1.108.20787 -> 1.109.31074

---
 pkgs/applications/editors/vscode/vscodium.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 7e519017a2a1..05491edbd750 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -27,12 +27,12 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-lBCwKNJv9iNQyuEvg+Ht4haFZG/lozm2KgCguKYIwYI=";
-      x86_64-darwin = "sha256-29oFrRfdxcMkzppYkQDkKP0DmnzjwbSciKvGwDhf8q0=";
-      aarch64-linux = "sha256-53t+UvvECTANRzHnyMbmff7aS5cocpRC8QaSkLRQcLw=";
-      aarch64-darwin = "sha256-fIp2NH2AtpQ3KXFXvDFIw4Jx2QlXnwHE4WskJ0bLwNE=";
-      armv7l-linux = "sha256-+y4b1/2C2YTmF2kc16xvzM8MzU64OxMK9xEORwkfBWw=";
-      loongarch64-linux = "sha256-VKzGJytrcMjXihWIM/qjLeZzXHb/xxHnftnXQn8erfA=";
+      x86_64-linux = "sha256-vijpAKlBP0dS40YlKMRCPZsgu7T+FiPgLJAgpE39BHA=";
+      x86_64-darwin = "sha256-EQDLzLJwVQFWe+aez3PLS2uJXgYyocjH28R7v/n86sY=";
+      aarch64-linux = "sha256-Or1SLzmaqCwde71e9AfQkQDUV4tAA8cYFBk5iqi562M=";
+      aarch64-darwin = "sha256-j8gbLW+czhFkaPOmcJBTaeWm7cxAYtvebGihQ9tWVC8=";
+      armv7l-linux = "sha256-7L9Pu+roEietJlwNoh7uEIkr2q5Mi8Y1uorv3TkvE3M=";
+      loongarch64-linux = "sha256-/KEKLDaRPX2ZM3qn3T2nqV16aG5wtuzpDWs2EdLtzZU=";
     }
     .${system} or throwSystem;
 
@@ -43,7 +43,7 @@ buildVscode rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.108.20787";
+  version = "1.109.31074";
   pname = "vscodium";
 
   executableName = "codium";

From 5959f08716588fbd0f8afb8f422a69b9a9dbc1f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 04:37:19 +0000
Subject: [PATCH 42/66] nzbhydra2: 8.4.1 -> 8.5.1

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

diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index 9bdb950421c3..9b9a0bcfb5d4 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -35,13 +35,13 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "nzbhydra2";
-  version = "8.4.1";
+  version = "8.5.1";
 
   src = fetchFromGitHub {
     owner = "theotherp";
     repo = "nzbhydra2";
     tag = "v${version}";
-    hash = "sha256-Ov8knlZdUQITECqNf8dhiPAVgtyQa1QkFNQntjBUUt0=";
+    hash = "sha256-idLki0UB8uqtRUvxzwvJuJJyG3+EUUJ5D4Ui41YbMPw=";
   };
 
   mvnHash = "sha256-dodZT40zNqfaPd8VxfNYY10VrFNlL4xESDdTrgcFaaY=";

From b9bc94b7d6879ece77ec41c6d4bb2d29e37df503 Mon Sep 17 00:00:00 2001
From: Coca <me@coca.codes>
Date: Sun, 15 Feb 2026 05:24:10 +0000
Subject: [PATCH 43/66] uiua: 0.18.0 -> 0.18.1

Changelog: https://github.com/uiua-lang/uiua/blob/refs/tags/0.18.1/changelog.md
Diff: https://github.com/uiua-lang/uiua/compare/0.18.0...0.18.1
---
 pkgs/by-name/ui/uiua/stable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix
index 4d20fce4691d..a3968b29eeda 100644
--- a/pkgs/by-name/ui/uiua/stable.nix
+++ b/pkgs/by-name/ui/uiua/stable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.18.0";
+  version = "0.18.1";
   tag = version;
-  hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
-  cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
+  hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
+  cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
   updateScript = ./update-stable.sh;
 }

From 9186b3f69c8b2a5387fc4c2dfd0585820e7a1439 Mon Sep 17 00:00:00 2001
From: Coca <me@coca.codes>
Date: Sun, 15 Feb 2026 05:27:23 +0000
Subject: [PATCH 44/66] uiua-unstable: 0.18.0 -> 0.18.1

Changelog: https://github.com/uiua-lang/uiua/blob/refs/tags/0.18.1/changelog.md

Diff: https://github.com/uiua-lang/uiua/compare/0.18.0...0.18.1
---
 pkgs/by-name/ui/uiua/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index ce655cd5b93f..2d471223ea82 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.18.0";
+  version = "0.18.1";
   tag = version;
-  hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
-  cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
+  hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
+  cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
   updateScript = ./update-unstable.sh;
 }

From 2653cd141c8a96abfa7147a67f34aecdf3482454 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 06:30:46 +0000
Subject: [PATCH 45/66] cheat: 4.4.2 -> 4.5.0

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

diff --git a/pkgs/by-name/ch/cheat/package.nix b/pkgs/by-name/ch/cheat/package.nix
index 2405425ed33d..7d5ace6aa359 100644
--- a/pkgs/by-name/ch/cheat/package.nix
+++ b/pkgs/by-name/ch/cheat/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cheat";
-  version = "4.4.2";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "cheat";
     repo = "cheat";
     tag = finalAttrs.version;
-    sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
+    sha256 = "sha256-RDfOdyQL9QICXZmgYCmz532iTuPdCW8GixajvEXmaUQ=";
   };
 
   subPackages = [ "cmd/cheat" ];

From a46c5ac951e0deb6fc2f813c353185d9b690f824 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 08:43:26 +0000
Subject: [PATCH 46/66] furtherance: 26.1.1 -> 26.7.0

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

diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix
index fc370f63110a..88d16f3e5f46 100644
--- a/pkgs/by-name/fu/furtherance/package.nix
+++ b/pkgs/by-name/fu/furtherance/package.nix
@@ -16,16 +16,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "furtherance";
-  version = "26.1.1";
+  version = "26.7.0";
 
   src = fetchFromGitHub {
     owner = "unobserved-io";
     repo = "Furtherance";
     rev = finalAttrs.version;
-    hash = "sha256-VG1Ghhi74tkPU9bgauV98Gp5kVoZJ1cJUqWLWnrUAOU=";
+    hash = "sha256-UMkFEbLdwZsSJviO29FNmLYLL5/HofhriMptpjSAYuY=";
   };
 
-  cargoHash = "sha256-6S0L8FHI5eCTzhxlew35pK7TewMplKKJDaqJdtoYRnM=";
+  cargoHash = "sha256-fdslQutVEGq1EG+Q8QAYKf9XfoostvHKWZrr4YwEowQ=";
 
   nativeBuildInputs = [
     pkg-config

From cadce7741ba8d88e71ba7aede87e7288643d7191 Mon Sep 17 00:00:00 2001
From: robert jakub <rj@project2.pl>
Date: Sun, 15 Feb 2026 12:59:57 +0100
Subject: [PATCH 47/66] lgpio: fix build

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

diff --git a/pkgs/by-name/lg/lgpio/package.nix b/pkgs/by-name/lg/lgpio/package.nix
index 21051bcfa660..c3fb1caf639d 100644
--- a/pkgs/by-name/lg/lgpio/package.nix
+++ b/pkgs/by-name/lg/lgpio/package.nix
@@ -36,6 +36,8 @@ mkDerivation rec {
     swig
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   preConfigure = lib.optionalString (pyProject != "") ''
     cd ${pyProject}
   '';

From f9aabcc2ac2f27e0594645820f825195a4e1fb49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 12:16:31 +0000
Subject: [PATCH 48/66] cursor-cli: 0-unstable-2026-01-28 ->
 0-unstable-2026-02-13

---
 pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 46356e6f5d17..6ee478bc1f33 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-Nj6q11iaa++b5stsEu1eBRAYUFRPft84XcHuTCZL5D0=";
+      url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-mJPEmBNbmsTfgt0b7abrSHJLI52WfLny5Es4uGyDwew=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-6oajVZw599vzy2c1olEzoIlqbmfZRK1atb85fiR72y0=";
+      url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-ncXdGxOYlwud4Z3w5DMOmXUZ2hEcI/q4stm0yACuvy4=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-G23LC7Sl1GjfaECndSuyCxHK4drkJKG3B1U2k5SAHJA=";
+      url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-KcmGT6WCEc97qKqtZknFsUo9RX2SOuyjv6Jyfnrv3Os=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-R5kEfd84IaUXuN+PIzpGD1NGPzD6xxM9NAXAAt6d0N8=";
+      url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-ib0ZsXVc2YqAkPuMie4kwWIFrmNcD+1vX3tcvyA/PJw=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2026-01-28";
+  version = "0-unstable-2026-02-13";
 
   src = sources.${hostPlatform.system};
 

From e279e557c89067326cc0a1029d3988c52262d7b5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Feb 2026 09:49:22 +0100
Subject: [PATCH 49/66] python313Packages.iamdata: 0.1.202602131 ->
 0.1.202602141

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202602131...v0.1.202602141

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202602141
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index efd6b6dd758d..cf1ed2844b3c 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202602131";
+  version = "0.1.202602141";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-52/atyFcRD9isvqVL2aIzSAB/U18aCKNJq9n/BZpDRw=";
+    hash = "sha256-x51f35pTyCnqLC7lQv1cIti+hXKK3TLzz0IUR/5durI=";
   };
 
   __darwinAllowLocalNetworking = true;

From d645ce61c9262291bd2ace2aae128f1827443552 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Feb 2026 13:29:24 +0100
Subject: [PATCH 50/66] python313Packages.iamdata: 0.1.202602141 ->
 0.1.202602151

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202602141...v0.1.202602151

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202602151
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index cf1ed2844b3c..8c3a55bb1c50 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202602141";
+  version = "0.1.202602151";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x51f35pTyCnqLC7lQv1cIti+hXKK3TLzz0IUR/5durI=";
+    hash = "sha256-u/CfbeZ4gb+tyomAA5fsXAY7qs5nOBDC8Vz5mNnWnho=";
   };
 
   __darwinAllowLocalNetworking = true;

From ce95f3aea90f593b679d4729a08a9260e727fc89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 12:54:13 +0000
Subject: [PATCH 51/66] zipline: 4.4.1 -> 4.4.2

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

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index eb732bbfbb33..c0a8197983e9 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -36,13 +36,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9+r3padIhpmLNfiL68eut7e+VemhsqhvRcJhyOdA7+k=";
+    hash = "sha256-RFajEXewnOCkp4xz/fhugVEt+BPNrrQY4Oeqt6Gg6p0=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head

From 50614d94b29fa3ea94ed3cebc009b503292e2bed Mon Sep 17 00:00:00 2001
From: c6rg0 <gdrozbik08@gmail.com>
Date: Sun, 15 Feb 2026 13:23:29 +0000
Subject: [PATCH 52/66] teams-for-linux: 2.7.4 -> 2.7.5

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

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 3a4cf839ef58..cb6298030ee4 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.7.4";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-Wld0Unf2Rk/6/UXocxHn7vdkFgaNtiBybe4snJF7W2E=";
+    hash = "sha256-TOoaH5F1Ji5UvonqFu/26OMckZ+l71UF0lQf7jEoStg=";
   };
 
-  npmDepsHash = "sha256-wSK20nCrAp184iPxlfxUvub8vynPKEQxNLkkN8FuWwA=";
+  npmDepsHash = "sha256-apw2Dg7MmcC+eOrYS+FpHuNIBH564BAUWefNBs/frU0=";
 
   nativeBuildInputs = [
     makeWrapper

From 07280ffbf5bed3780996cc23971104349f531509 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Sun, 15 Feb 2026 14:36:58 +0100
Subject: [PATCH 53/66] libp11: 0.4.13 -> 0.4.17

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

diff --git a/pkgs/by-name/li/libp11/package.nix b/pkgs/by-name/li/libp11/package.nix
index fa3f23959744..f6c6e6898026 100644
--- a/pkgs/by-name/li/libp11/package.nix
+++ b/pkgs/by-name/li/libp11/package.nix
@@ -10,17 +10,18 @@
 
 stdenv.mkDerivation rec {
   pname = "libp11";
-  version = "0.4.13";
+  version = "0.4.17";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
     rev = "${pname}-${version}";
-    sha256 = "sha256-xH5Ic8HpWB5O2MWXf2A9FUiV10VZajDdPqEVF0Hs6u0=";
+    sha256 = "sha256-ST1st+bktGu4G7m8BXuUk+WsTDBj7BcfNFGiiZt1obU=";
   };
 
   configureFlags = [
     "--with-enginesdir=${placeholder "out"}/lib/engines"
+    "--with-modulesdir=${placeholder "out"}/lib/ossl-module"
   ];
 
   nativeBuildInputs = [

From 2aff7804840bc5d14c79d9d01532f1b257877dfa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 15 Feb 2026 13:32:51 +0000
Subject: [PATCH 54/66] obs-studio-plugins.obs-media-controls: fix build

---
 .../video/obs-studio/plugins/default.nix      |  2 +-
 .../default.nix}                              |  6 +++++
 .../obs-media-controls/fix-cmake.patch        | 25 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 rename pkgs/applications/video/obs-studio/plugins/{obs-media-controls.nix => obs-media-controls/default.nix} (83%)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 91a0459854bf..1d6eb5b49f79 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -52,7 +52,7 @@
 
   obs-markdown = callPackage ./obs-markdown.nix { };
 
-  obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { };
+  obs-media-controls = qt6Packages.callPackage ./obs-media-controls { };
 
   obs-move-transition = callPackage ./obs-move-transition.nix { };
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
similarity index 83%
rename from pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
index c4d970a15d92..61a1936ae9b0 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CElK9e+wpnMiup6DwdQpQfVMm6atXvz+JYHsGnv3lFo=";
   };
 
+  patches = [
+    # Fix cmake build with qt 6.10
+    # Submitted upstream: https://github.com/exeldro/obs-media-controls/pull/28
+    ./fix-cmake.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch
new file mode 100644
index 000000000000..19f06388ca20
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95172a0..3be0ec3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ else()
+   target_link_libraries(${PROJECT_NAME} PRIVATE OBS::frontend-api)
+ endif()
+ 
+-find_package(Qt6 COMPONENTS Widgets Core)
++find_package(Qt6 REQUIRED COMPONENTS Widgets Core)
+ if(BUILD_OUT_OF_TREE)
+   if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
+     find_package(Qt6 REQUIRED Gui)
+@@ -33,8 +33,9 @@ if(BUILD_OUT_OF_TREE)
+ endif()
+ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
+ 
+-if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt_VERSION VERSION_LESS "6.9.0")
+-	target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
++if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt6_VERSION VERSION_LESS "6.9.0")
++  find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
++  target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
+ endif()
+ 
+ target_compile_options(

From ff25676eed6425496f710b6db06e85af1eb9cad0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 14:19:34 +0000
Subject: [PATCH 55/66] 
 home-assistant-custom-lovelace-modules.advanced-camera-card: 7.27.0 -> 7.27.2

---
 .../custom-lovelace-modules/advanced-camera-card/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
index b22b3720ac74..997baca15cb0 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "advanced-camera-card";
-  version = "7.27.0";
+  version = "7.27.2";
 
   src = fetchzip {
     url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-t41bbAqQOuGhUJ3Tu0uh9FsBzc09iJylghQkqt6632k=";
+    hash = "sha256-NNWjDV0tKtFHkg2Zob86J0rtTYV/LKwhNTL8cvqS+Ns=";
   };
 
   # TODO: build from source once yarn berry support lands in nixpkgs

From 5f2aeeea1e491996c3950df8eaf7232b1e05a429 Mon Sep 17 00:00:00 2001
From: mana-byte <manaikilaut@gmail.com>
Date: Sun, 15 Feb 2026 15:04:42 +0100
Subject: [PATCH 56/66] xray: 25.10.15 -> 26.2.6

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

diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index d8624f5e5be7..ea06d72f6ba7 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   symlinkJoin,
-  buildGoModule,
+  buildGo126Module,
   makeWrapper,
   nix-update-script,
   v2ray-geoip,
@@ -13,18 +13,18 @@
   ],
 }:
 
-buildGoModule (finalAttrs: {
+buildGo126Module (finalAttrs: {
   pname = "xray";
-  version = "26.1.13";
+  version = "26.2.6";
 
   src = fetchFromGitHub {
     owner = "XTLS";
     repo = "Xray-core";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Sb9Q+HUDdvyDIMpKaNWvc4BipAxmITeGkOl09dPLs9k=";
+    hash = "sha256-WTCehvvk/f2/IemzGDq3Y0dM/n0iKAH8CeVyoTimFqQ=";
   };
 
-  vendorHash = "sha256-mWZwzuEYbmNcrpRGvvZVJ7be7nRQLo7m2MM1OM3Lqzs=";
+  vendorHash = "sha256-JOstg2Q7UTFn904MMjqk+BCRd7opfNDj+WI0sCSHbDA=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From bd66006c655a770c9599a6eccf340ef1a751eb4c Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Thu, 5 Feb 2026 19:30:12 +0100
Subject: [PATCH 57/66] neovim: set provider configuration to initrc

as an attempt to simplify configuration:
instead of having wrapping arguments + an optional neovim configuration
let's always generate a neovim configuration.
The change should be transparent for most users, and require
intervention for users that fulfill both conditions:
- using remote plugins (rare already)
- that set `wrapRc = false` in wrapNeovimUnstable without loading later
  the generated luaRcContent

The fix is then to pass as wrapping arguments the wrapper's generated config via

(wrapNeovimUnstable neovim-unwrapped { } ).overrideAttrs(oa: { wrapperArgs = oa.wrapperArgs ++ [ ''--cmd "lua dofile('${writeText "init.lua" oa.luaRcContent}')"'' ]; })

neovim: avoid creating empty newlines
---
 doc/release-notes/rl-2605.section.md         |  2 ++
 pkgs/applications/editors/neovim/wrapper.nix | 26 +++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 14daa0dafbfa..45a5fccfafd4 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -183,6 +183,8 @@
 - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.
   Some existing OpenRGB plugins may be incompatible or require updates.
 
+- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false.
+
 - We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.
 
 ## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index e8f04ad30fc3..ccb7c47f1f56 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -104,13 +104,16 @@ let
         packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage;
         finalPackdir = neovimUtils.packDir packpathDirs;
 
-        rcContent = ''
-          ${luaRcContent}
-        ''
-        + lib.optionalString (neovimRcContent' != "") ''
-          vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
-        ''
-        + lib.optionalString autoconfigure (lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua);
+        rcContent = lib.concatStringsSep "\n" (
+          [
+            providerLuaRc
+          ]
+          ++ lib.optional (luaRcContent != "") luaRcContent
+          ++ lib.optional (neovimRcContent' != "") ''
+            vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
+          ''
+          ++ lib.optionals autoconfigure vimPackageInfo.pluginAdvisedLua
+        );
 
         python3Env =
           lib.warnIf (attrs ? python3Env)
@@ -125,12 +128,7 @@ let
 
         wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;
 
-        generatedWrapperArgs = [
-          # vim accepts a limited number of commands so we join all the provider ones
-          "--add-flags"
-          ''--cmd "lua ${providerLuaRc}"''
-        ]
-        ++
+        generatedWrapperArgs =
           lib.optionals
             (
               finalAttrs.packpathDirs.myNeovimPackages.start != [ ]
@@ -181,7 +179,7 @@ let
         ++ lib.optionals finalAttrs.wrapRc [
           "--set-default"
           "VIMINIT"
-          "lua dofile('${writeText "init.lua" rcContent}')"
+          "lua dofile('${writeText "init.lua" finalAttrs.luaRcContent}')"
         ]
         ++ finalAttrs.generatedWrapperArgs;
 

From 28b5fc1ae9a483b64aa5c02abf027c8d84f9ee35 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Thu, 5 Feb 2026 20:11:15 +0100
Subject: [PATCH 58/66] neovim: formatter updated

---
 pkgs/applications/editors/neovim/wrapper.nix | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index ccb7c47f1f56..6c97a6f22377 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -140,17 +140,17 @@ let
               "--add-flags"
               ''--cmd "set rtp^=${finalPackdir}"''
             ]
-        ++ lib.optionals finalAttrs.withRuby [
-          "--set"
-          "GEM_HOME"
-          "${rubyEnv}/${rubyEnv.ruby.gemPath}"
-        ]
-        ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [
-          "--suffix"
-          "PATH"
-          ":"
-          (lib.makeBinPath finalAttrs.runtimeDeps)
-        ];
+          ++ lib.optionals finalAttrs.withRuby [
+            "--set"
+            "GEM_HOME"
+            "${rubyEnv}/${rubyEnv.ruby.gemPath}"
+          ]
+          ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [
+            "--suffix"
+            "PATH"
+            ":"
+            (lib.makeBinPath finalAttrs.runtimeDeps)
+          ];
 
         providerLuaRc = neovimUtils.generateProviderRc {
           inherit (finalAttrs)

From 988002cd4160b3b6803249c8fbf0c5152c359265 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Mon, 2 Feb 2026 00:02:20 +0100
Subject: [PATCH 59/66] josm: 19439 -> 19481

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

diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix
index 882672bbc36b..7a9e4355b326 100644
--- a/pkgs/by-name/jo/josm/package.nix
+++ b/pkgs/by-name/jo/josm/package.nix
@@ -11,15 +11,15 @@
 }:
 let
   pname = "josm";
-  version = "19439";
+  version = "19481";
   srcs = {
     jar = fetchurl {
       url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-      hash = "sha256-EuboKKNpApYlh9b78oB5AbtOM38oMe3NEa4fovA78Uk=";
+      hash = "sha256-Hl3ZJ4VWU7xthes4dxS1TFPMFWGQfC/kN7BGE10RuF4=";
     };
     macosx = fetchurl {
-      url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
-      hash = "sha256-b38Xd0qx0ceNtJ5UIWDJkGOvaHSB/46onPbd6LJ6siY=";
+      url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java24.zip";
+      hash = "sha256-FGnhyXYN3AyVDjL7aZBgHZ0eb61g2jUJjT5DQ3FUkb0=";
     };
     pkg = fetchsvn {
       url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

From 672ecdc3f471e0d794a7695206e035ddd43cecce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Feb 2026 16:10:04 +0100
Subject: [PATCH 60/66] home-assistant-custom-components.luxer_one:
 0-unstable-2023-03-27 -> 0.2.0

https://github.com/tjhorner/home-assistant-luxer-one/releases/tag/v0.2.0
---
 .../custom-components/luxer_one/package.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
index f36f2283c505..c339419bda25 100644
--- a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
@@ -2,22 +2,22 @@
   lib,
   fetchFromGitHub,
   buildHomeAssistantComponent,
-  ruff,
 }:
 
-buildHomeAssistantComponent {
+buildHomeAssistantComponent rec {
   owner = "tjhorner";
   domain = "luxer";
-  version = "0-unstable-2023-03-27";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "tjhorner";
     repo = "home-assistant-luxer-one";
-    rev = "f6a810034ab76e6a8635de755c4a1750e86b1674";
-    hash = "sha256-WmsL0NLe2ICqNGbEQ4vg1EzcZgIGi++G9aDyKjnmJMs=";
+    tag = "v${version}";
+    hash = "sha256-D92PhI23iGbSqvc1Myi9+KHYXpeArivXwFS5bGLn8Tk=";
   };
 
   meta = {
+    changelog = "https://github.com/tjhorner/home-assistant-luxer-one/releases/tag/${src.tag}";
     description = "Home Assistant integration for Luxer One";
     homepage = "https://github.com/tjhorner/home-assistant-luxer-one";
     license = lib.licenses.mit;

From 0953f55780d1bbf296b0a49c8aa42271eac143db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 15:48:37 +0000
Subject: [PATCH 61/66] _1password-gui: 8.12.0 -> 8.12.2

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 7f995fc5c65f..69de260c1915 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,28 +1,28 @@
 {
   "stable": {
     "linux": {
-      "version": "8.12.0",
+      "version": "8.12.2",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.0.x64.tar.gz",
-          "hash": "sha256-EiSrZHWXvBLhS+Gx519AvUmRH582P4/cF0huj+RHcMI="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.2.x64.tar.gz",
+          "hash": "sha256-vJ+GwQjlDCn6723q1+/xFUFkN9XjI9/0eCftmYQgS1s="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.0.arm64.tar.gz",
-          "hash": "sha256-/ykSp+//5SvLFH0BsjPNwAEapoBUTqxfaRKJw4R7eis="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.2.arm64.tar.gz",
+          "hash": "sha256-V639cHbGZD/Fvaqa4c5jpei3jF9kNPST8LeYogS4fr8="
         }
       }
     },
     "darwin": {
-      "version": "8.12.0",
+      "version": "8.12.2",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.12.0-x86_64.zip",
-          "hash": "sha256-JcSNA9oEeEJk9bHxTwF08/KrJNu+UOSC5r0VJGmds+Y="
+          "url": "https://downloads.1password.com/mac/1Password-8.12.2-x86_64.zip",
+          "hash": "sha256-IYxOVYoeKBsuDo5pS/LcjFNZsdyUL7Jb1QORj2BEB3Y="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.12.0-aarch64.zip",
-          "hash": "sha256-fpu+CZ3iLXcGevWHLh/HVa2uoS/a1w/m0s4+awBzNI0="
+          "url": "https://downloads.1password.com/mac/1Password-8.12.2-aarch64.zip",
+          "hash": "sha256-Z4h2E8dCNA1O+SZGtguueZ36mHbJ11yxMSYiNTpM25U="
         }
       }
     }

From d1579787d218424eef0e009398f6d87de843064a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 16:23:55 +0000
Subject: [PATCH 62/66] roave-backward-compatibility-check: 8.17.0 -> 8.19.0

---
 .../ro/roave-backward-compatibility-check/package.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 43208ea79eb2..fd39c5c590da 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.17.0";
+  version = "8.19.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     tag = finalAttrs.version;
-    hash = "sha256-+LoAR7pViUnzIICRUUWa7Z5DvSBXo+lr4bjFrTSwq0g=";
+    hash = "sha256-lqOxEhZlx9rFLvWbjoRXd2dqYtaYqarXx5woQZXntAI=";
   };
 
-  vendorHash = "sha256-q3n3VIxGlIz+xI5h/JNq40CvXFbShXeVoQ5VoIjk21I=";
+  vendorHash = "sha256-xsa87iBiUa0jFV0+Myee3Ddo1ICLh3C89Unj9QN0OF4=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From bdf038a51a84d5282b5c3b312da9b9d0ae9f3eee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Feb 2026 17:01:59 +0000
Subject: [PATCH 63/66] remnote: 1.22.77 -> 1.23.3

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 43cf3b29b4f2..71c979017014 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.22.77";
+  version = "1.23.3";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-L8HXfKfmyYg8NkTryNhWfAyVgX3NH83A9EOsBmrck/M=";
+    hash = "sha256-NYbYlxSp8gAHz8pbX025uTAio33Nf6xyjIsR/EaRGSY=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From 960aa42951f38e22abc0967e6bbddbc6debfd72b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 15 Feb 2026 18:06:52 +0100
Subject: [PATCH 64/66] python3Packages.immutabledict: 4.3.0 -> 4.3.1

https://github.com/corenting/immutabledict/blob/v4.3.1/CHANGELOG.md
---
 pkgs/development/python-modules/immutabledict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix
index 4628776bfcd1..a0a699eff087 100644
--- a/pkgs/development/python-modules/immutabledict/default.nix
+++ b/pkgs/development/python-modules/immutabledict/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "immutabledict";
-  version = "4.3.0";
+  version = "4.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corenting";
     repo = "immutabledict";
     tag = "v${version}";
-    hash = "sha256-Ap0Z0RCL+sjPTySa/At+SDRdCmSkooSekybugZdvUX0=";
+    hash = "sha256-BZ3qiYZtw5YcWTy2rtlDZE3J1Hia9/Yniy+I7xhq7AE=";
   };
 
   build-system = [ poetry-core ];

From 44bf6738d83af65e357ca7d3140a2fae16ac6510 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Sun, 15 Feb 2026 09:32:09 -0800
Subject: [PATCH 65/66] python3Packages.keyboard: add maintainer ulysseszhan

---
 pkgs/development/python-modules/keyboard/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix
index 3fa11c3a7646..13df8fdb9e69 100644
--- a/pkgs/development/python-modules/keyboard/default.nix
+++ b/pkgs/development/python-modules/keyboard/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     description = "Hook and simulate keyboard events on Windows and Linux";
     homepage = "https://github.com/boppreh/keyboard";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ulysseszhan ];
     platforms = lib.platforms.linux;
   };
 }

From 2ecb74d7731f5cf47107475cce845f4c8c073e29 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Sun, 15 Feb 2026 09:32:59 -0800
Subject: [PATCH 66/66] python3Packages.keyboard: 0.13.5 ->
 0.13.5-unstable-2023-01-31

---
 .../python-modules/keyboard/default.nix          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix
index 13df8fdb9e69..7d59269338c7 100644
--- a/pkgs/development/python-modules/keyboard/default.nix
+++ b/pkgs/development/python-modules/keyboard/default.nix
@@ -2,20 +2,25 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "keyboard";
-  version = "0.13.5";
-  format = "setuptools";
+  # the commit tagged v0.13.5 on github actually has version 0.13.4,
+  # and fetchPypi reports 404 error; very strange!
+  version = "0.13.5-unstable-2023-01-31";
 
   src = fetchFromGitHub {
     owner = "boppreh";
     repo = "keyboard";
-    rev = "v${version}";
-    hash = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM=";
+    rev = "d232de09bda50ecb5211ebcc59b85bc6da6aaa24";
+    hash = "sha256-Xk419Zvx9pDgMcaWZn52WD41cFaXXzJlvmPGxaWdR0k=";
   };
 
+  pyproject = true;
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "keyboard" ];
 
   # Specific OS tests are being run for other OS, like
@@ -26,6 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Hook and simulate keyboard events on Windows and Linux";
     homepage = "https://github.com/boppreh/keyboard";
+    changelog = "https://github.com/boppreh/keyboard/releases";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ulysseszhan ];
     platforms = lib.platforms.linux;