From 814378b3f4cd1180b89f25d4094012d5d2bd7967 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 07:25:57 +0000
Subject: [PATCH 001/204] libspnav: 1.1 -> 1.2

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

diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix
index 7937320acfda..b6fbbc4001cc 100644
--- a/pkgs/by-name/li/libspnav/package.nix
+++ b/pkgs/by-name/li/libspnav/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libspnav";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "libspnav";
     tag = "v${version}";
-    hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ=";
+    hash = "sha256-4ESzH2pMTGoDI/AAX8Iz/MVhxQD8q5cg9I91ryUi5Ys=";
   };
 
   buildInputs = [ libX11 ];

From edb9c458e89a9a039f7bc11b4c29d0fcab78465d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 09:41:34 +0000
Subject: [PATCH 002/204] libinput: 1.27.1 -> 1.28.1

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 046823ae7c75..c31e7f8420c0 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -49,7 +49,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.27.1";
+  version = "1.28.1";
 
   outputs = [
     "bin"
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     owner = "libinput";
     repo = "libinput";
     rev = version;
-    hash = "sha256-3U+2a/uSoSj1t34uz7xO2QQtJExygKOhBL7BUGP0Fbo=";
+    hash = "sha256-kte5BzGEz7taW/ccnxmkJjXn3FeikzuD6Hm10l+X7c0=";
   };
 
   patches = [

From 281c0c16c9c6e2e44e78334f55bbd43dc51c0d70 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 26 Apr 2025 06:18:42 +0100
Subject: [PATCH 003/204] gcc15, gccgo15, gfortran15, gnat15: init at 15.1.0

Changes: https://gcc.gnu.org/gcc-15/changes.html
Porting guide: https://gcc.gnu.org/gcc-15/porting_to.html
---
 pkgs/by-name/gf/gfortran15/package.nix      | 10 +++++
 pkgs/development/compilers/gcc/versions.nix |  2 +
 pkgs/top-level/all-packages.nix             | 48 ++++++++++++++++++++-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/gf/gfortran15/package.nix

diff --git a/pkgs/by-name/gf/gfortran15/package.nix b/pkgs/by-name/gf/gfortran15/package.nix
new file mode 100644
index 000000000000..45b1581e0f9a
--- /dev/null
+++ b/pkgs/by-name/gf/gfortran15/package.nix
@@ -0,0 +1,10 @@
+{ wrapCC, gcc15 }:
+wrapCC (
+  gcc15.cc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+  }
+)
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index aff229a2df7f..3f9debb2d742 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -1,5 +1,6 @@
 let
   majorMinorToVersionMap = {
+    "15" = "15.1.0";
     "14" = "14.2.1.20250322";
     "13" = "13.3.0";
     "12" = "12.4.0";
@@ -16,6 +17,7 @@ let
     {
       # 3 digits: releases (14.2.0)
       # 4 digits: snapshots (14.2.1.20250322)
+      "15.1.0" = "sha256-4rCewhZg8B/s/7cV4BICZSFpQ/A40OSKmGhxPlTwbOo=";
       "14.2.1.20250322" = "sha256-I3ROhiU4jYaB2aci2Z3B/mvLLTjBBoCF1CL7uiHTmUM=";
       "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM=";
       "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dab2faedb7d..372b4e573d7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5967,6 +5967,7 @@ with pkgs;
   gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
   gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13;
   gcc14Stdenv = overrideCC gccStdenv buildPackages.gcc14;
+  gcc15Stdenv = overrideCC gccStdenv buildPackages.gcc15;
 
   # This is not intended for use in nixpkgs but for providing a faster-running
   # compiler to nixpkgs users by building gcc with reproducibility-breaking
@@ -6071,9 +6072,10 @@ with pkgs;
     gcc12
     gcc13
     gcc14
+    gcc15
     ;
 
-  gcc_latest = gcc14;
+  gcc_latest = gcc15;
 
   libgccjit = gcc.cc.override {
     name = "libgccjit";
@@ -6199,6 +6201,34 @@ with pkgs;
     }
   );
 
+  gnat15 = wrapCC (
+    gcc15.cc.override {
+      name = "gnat";
+      langC = true;
+      langCC = false;
+      langAda = true;
+      profiledCompiler = false;
+      # As per upstream instructions building a cross compiler
+      # should be done with a (native) compiler of the same version.
+      # If we are cross-compiling GNAT, we may as well do the same.
+      gnat-bootstrap =
+        if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
+          buildPackages.gnat-bootstrap14
+        else
+          buildPackages.gnat15;
+      stdenv =
+        if
+          stdenv.hostPlatform == stdenv.targetPlatform
+          && stdenv.buildPlatform == stdenv.hostPlatform
+          && stdenv.buildPlatform.isDarwin
+          && stdenv.buildPlatform.isx86_64
+        then
+          overrideCC stdenv gnat-bootstrap14
+        else
+          stdenv;
+    }
+  );
+
   gnat-bootstrap = gnat-bootstrap12;
   gnat-bootstrap11 = wrapCC (
     callPackage ../development/compilers/gnat-bootstrap { majorVersion = "11"; }
@@ -6231,6 +6261,7 @@ with pkgs;
   gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; });
   gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
   gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
+  gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });
   gnatPackages = gnat13Packages;
 
   inherit (gnatPackages)
@@ -6298,6 +6329,21 @@ with pkgs;
     }
   );
 
+  gccgo15 = wrapCC (
+    gcc15.cc.override {
+      name = "gccgo";
+      langCC = true; # required for go.
+      langC = true;
+      langGo = true;
+      langJit = true;
+      profiledCompiler = false;
+    }
+    // {
+      # not supported on darwin: https://github.com/golang/go/issues/463
+      meta.broken = stdenv.hostPlatform.isDarwin;
+    }
+  );
+
   ghdl-mcode = callPackage ../by-name/gh/ghdl/package.nix { backend = "mcode"; };
 
   ghdl-gcc = callPackage ../by-name/gh/ghdl/package.nix { backend = "gcc"; };

From e4633ab264548740d9f4663114aeddd8e1c536e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 May 2025 01:33:27 +0000
Subject: [PATCH 004/204] mlt: 7.30.0 -> 7.32.0

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

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 9997857befc4..052bed2b64e2 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mlt";
-  version = "7.30.0";
+  version = "7.32.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4=";
+    hash = "sha256-8T5FXXGs7SxL6nD+R1Q/0Forsdp5Xux4S3VLvgqXzw8=";
     # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
     # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
     # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545

From 9b3a7f3047479d709aaac7d4da0eaacd93f6000a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 May 2025 22:59:52 +0000
Subject: [PATCH 005/204] linuxPackages.ena: 2.13.3 -> 2.14.0

---
 pkgs/os-specific/linux/ena/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 654bdfa3de7c..bd2af199128b 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -8,7 +8,7 @@
 }:
 let
   rev-prefix = "ena_linux_";
-  version = "2.13.3";
+  version = "2.14.0";
 in
 stdenv.mkDerivation {
   inherit version;
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "${rev-prefix}${version}";
-    hash = "sha256-rxogTQ2zNyzuOY5P87NGZQHVJPvv1T+g5nwh6SLLf50=";
+    hash = "sha256-1XL1X7Sv3w3zBe7rJyPiUXtREBWg6LRPs2T0CQ5YpdE=";
   };
 
   hardeningDisable = [ "pic" ];

From a21f9ef2300283be055f21cb306249e2ea243f8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 12:05:45 +0000
Subject: [PATCH 006/204] python3Packages.fontparts: 0.12.3 -> 0.12.5

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

diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index de4ab03b5086..efcdcad0f044 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "fontparts";
-  version = "0.12.3";
+  version = "0.12.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lmzLIqP1qFFqkVNzhFlo/C6kOmuddJ3U1eYLNN2h+d4=";
+    hash = "sha256-cD7ppaYLnKOLyBMlSlF+ham74yid8MBunxgVkyE3I0I=";
     extension = "zip";
   };
 

From f56e9aa4f9f9e74f4bb53cca1728e99bbfc4e949 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 18:23:13 +0000
Subject: [PATCH 007/204] python3Packages.pygit2: 1.17.0 -> 1.18.0

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 04e641b11cc5..50cf47eee03c 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.17.0";
+  version = "1.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+ivAULLC0+c7VNbVQceSF4Vho0TwfkCfUy1buXrHuJQ=";
+    hash = "sha256-+9AdBKTSziiaqgLPhYBDZ5vw3R+YVca4jtlTgsH1ARo=";
   };
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 2b0f385fabbf7b605470d995543801bcadd92759 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 03:21:17 +0000
Subject: [PATCH 008/204] python3Packages.markdownify: 0.14.1 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix
index 51f81b9525f1..643176eca276 100644
--- a/pkgs/development/python-modules/markdownify/default.nix
+++ b/pkgs/development/python-modules/markdownify/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "markdownify";
-  version = "0.14.1";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "matthewwithanm";
     repo = "python-markdownify";
     tag = version;
-    hash = "sha256-YJdR1wV72f9/tWQhuhGwScuRcE243fCP+wnYAzBOoV8=";
+    hash = "sha256-eU0F3nc96q2U/3PGM/gnrRCmetIqutDugz6q+PIb8CU=";
   };
 
   build-system = [
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "HTML to Markdown converter";
     homepage = "https://github.com/matthewwithanm/python-markdownify";
-    changelog = "https://github.com/matthewwithanm/python-markdownify/releases/tag/${version}";
+    changelog = "https://github.com/matthewwithanm/python-markdownify/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ McSinyx ];
     mainProgram = "markdownify";

From dde3e32b28bca8586148e14d8e273e0f538cadc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 May 2025 11:01:34 +0000
Subject: [PATCH 009/204] python3Packages.ijson: 3.3.0 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index c23fc8ad870f..b218535ed433 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "ijson";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fxcua6G+4NTI+OvWOVd7/kKd7g8/lndaBnuLrkSS2KA=";
+    hash = "sha256-X3TcutnVksQo08o5V/cRWkJonufulBRYhgkAI2rpuxM=";
   };
 
   build-system = [ setuptools ];

From c621135365c6be1f9dca22ca06a967c6eafce221 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 May 2025 13:27:08 +0000
Subject: [PATCH 010/204] tiledb: 2.27.2 -> 2.28.0

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

diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix
index 5454d074713a..e31a44de573c 100644
--- a/pkgs/by-name/ti/tiledb/package.nix
+++ b/pkgs/by-name/ti/tiledb/package.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "tiledb";
-  version = "2.27.2";
+  version = "2.28.0";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
     tag = version;
-    hash = "sha256-zk4jkXJMh6wpuEKaCvuKUDod+F8B/6W5Lw8gwelcPEM=";
+    hash = "sha256-jNKnc8IPkXDxRUY9QJ+35qt2na1nO6RPeCVWBLb7lME=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ];

From 8ad53eba468737af64f98d068e1894f619faf597 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 May 2025 19:35:17 +0000
Subject: [PATCH 011/204] netavark: 1.14.1 -> 1.15.0

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

diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 394f8d73afab..0392ef6e3145 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "netavark";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
     rev = "v${version}";
-    hash = "sha256-kAJOfZ4Q1EQ+JV1izXoLe/Z/qgxbzz3WbczM4fVhxfU=";
+    hash = "sha256-V+JwfKWo8gqVq/lF0MMt8sovPRyb3saBxsUhdMo4C5g=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-MdKTGLNf+7SzdkQNLOWgfmSE9TNLYzPFU0oXh6MnW5w=";
+  cargoHash = "sha256-C2+N3jPdqh/cmJ2efrUnScXo1rFBEec6w4r8M6OfcPo=";
 
   nativeBuildInputs = [
     installShellFiles

From 98ad8444d1ff85e79d4fcf81a115336f52f4704d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 May 2025 21:43:04 +0000
Subject: [PATCH 012/204] pixelorama: 1.1 -> 1.1.1

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

diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix
index 2d4553403e37..b72e322f0ee3 100644
--- a/pkgs/by-name/pi/pixelorama/package.nix
+++ b/pkgs/by-name/pi/pixelorama/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pixelorama";
-  version = "1.1";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "Orama-Interactive";
     repo = "Pixelorama";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-UJ9sQ9igB2YAtkeHRUPvA60lbR2OXd4tqBDFxf9YTnI=";
+    hash = "sha256-HXCfZ/ePqEMnaEN+fxGVoaFWsO1isTAyYoRpLY6opRg=";
   };
 
   strictDeps = true;

From 80eaabf92838903945860ed1cebdb278be8a61de Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 15 May 2025 15:23:36 +0200
Subject: [PATCH 013/204] lomiri.lomiri-system-settings-unwrapped: 1.3.0 ->
 1.3.2

---
 .../lomiri-system-settings/default.nix        | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 9dfb27913bea..5c771772e58a 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   accountsservice,
@@ -49,13 +48,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-system-settings-unwrapped";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-system-settings";
-    rev = finalAttrs.version;
-    hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4=";
+    tag = finalAttrs.version;
+    hash = "sha256-bVBxJgOy1eXqwzcgBRUTlFoJxxw9I1Qc+Wn92U0QzA4=";
   };
 
   outputs = [
@@ -64,14 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Fixes compat with newer ICU
-    # Remove when version > 1.3.0
-    (fetchpatch {
-      name = "0001-lomiri-system-settings-unwrapped-Unpin-Cxx-standard.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/c0b1c773237b28ea50850810b8844033b13fb666.patch";
-      hash = "sha256-M73gQxstKyuzzx1VxdOiNYyfQbSZPIy2gxiCtKcdS1M=";
-    })
-
     ./2000-Support-wrapping-for-Nixpkgs.patch
   ];
 
@@ -80,8 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \
 
     # Port from lomiri-keyboard to maliit-keyboard
-    substituteInPlace plugins/language/CMakeLists.txt \
-      --replace-fail 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"''${CMAKE_INSTALL_FULL_LIBDIR}/lomiri-keyboard/plugins\"' 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages\"'
     substituteInPlace plugins/language/{PageComponent,SpellChecking,ThemeValues}.qml plugins/language/onscreenkeyboard-plugin.cpp plugins/sound/PageComponent.qml \
       --replace-fail 'com.lomiri.keyboard.maliit' 'org.maliit.keyboard.maliit'
 
@@ -164,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_LIBDEVICEINFO" true)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeFeature "LOMIRI_KEYBOARD_PLUGIN_PATH" "${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages")
   ];
 
   # The linking for this normally ignores missing symbols, which is inconvenient for figuring out why subpages may be
@@ -207,7 +197,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "System Settings application for Lomiri";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings";
-    changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = licenses.gpl3Only;
     mainProgram = "lomiri-system-settings";
     teams = [ teams.lomiri ];

From 3ae75c4bab39831a1829ac3aad53199f3e9037a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 14:43:30 +0000
Subject: [PATCH 014/204] containerd: 2.0.5 -> 2.1.0

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

diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index ad25a106c215..3d2016a256cd 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -16,7 +16,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "2.0.5";
+  version = "2.1.0";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     tag = "v${version}";
-    hash = "sha256-BY6lIzTlJbBbeIxCtSd7NcYVEWta3VNMmHmH97ksGsE=";
+    hash = "sha256-5Fd9LrpJUf5MEtfQaRM6zo5C8RUsOasR2NHCDj8vMBk=";
   };
 
   postPatch = "patchShebangs .";

From 4f6f1dfeedbec7cd15626f424499da06f6651f22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 18:41:01 +0000
Subject: [PATCH 015/204] python3Packages.makefun: 1.15.6 -> 1.16.0

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

diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix
index dfbf49de3da6..2a234b829c68 100644
--- a/pkgs/development/python-modules/makefun/default.nix
+++ b/pkgs/development/python-modules/makefun/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "makefun";
-  version = "1.15.6";
+  version = "1.16.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JrxjRCphgvt17+2LUXQd0tHbLxdr7Ixk4gpYYla48Uk=";
+    hash = "sha256-4UYBgxVwv/H21+aIKLzTDS9YVvJLrV3gzLIpIc7ryUc=";
   };
 
   postPatch = ''

From 22bdef776e9efdc55755ebea70a5b422a6307e68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 09:36:34 +0000
Subject: [PATCH 016/204] python3Packages.types-pytz: 2025.2.0.20250326 ->
 2025.2.0.20250516

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

diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix
index e6771acefb51..35d6c4e1d2f5 100644
--- a/pkgs/development/python-modules/types-pytz/default.nix
+++ b/pkgs/development/python-modules/types-pytz/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-pytz";
-  version = "2025.2.0.20250326";
+  version = "2025.2.0.20250516";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_pytz";
     inherit version;
-    hash = "sha256-3toC3iT1JwZvyNahnihKs/OucWpCtK22tA515AjAjTY=";
+    hash = "sha256-4SFjBvjA1dptr9ZJLnLrCAyaFmFx+oDdehmQ/Yvnp7M=";
   };
 
   build-system = [ setuptools ];

From ebdfe024c292dde8e42ae6d3724a8860efc563c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 10:01:13 +0000
Subject: [PATCH 017/204] python3Packages.bokeh: 3.7.2 -> 3.7.3

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

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index ac3e495b6d33..62f0badbdc7b 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -46,14 +46,14 @@
 buildPythonPackage rec {
   pname = "bokeh";
   # update together with panel which is not straightforward
-  version = "3.7.2";
+  version = "3.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gMIYhc7CdkMazU25L4McceuZnqmVRwznd+DFd7DPwdg=";
+    hash = "sha256-cKian3l7ED1e5q0V+3lErdoRXPDamW7Qt1z7phyxLys=";
   };
 
   patches = [

From 854f73bf8fd267d342ddc9fc0a29a19b1b04d26e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 10:31:29 +0000
Subject: [PATCH 018/204] python3Packages.langchain-core: 0.3.59 -> 0.3.60

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

diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 2ae93d91c052..57e2c99e7fdc 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-core";
-  version = "0.3.59";
+  version = "0.3.60";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-core==${version}";
-    hash = "sha256-qfNt6rH2nHIFfzqZCTsIhWfXntRXvSKnzfQrNS3LWcs=";
+    hash = "sha256-K/dQb1+mwcN6drp8pKy8Qt9aFxffJSgHJ2cvEw6Mx8s=";
   };
 
   sourceRoot = "${src.name}/libs/core";

From cf910d7cabd27a3f403a483eabe42f1d66c823bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 17:52:00 +0000
Subject: [PATCH 019/204] xtf: 0-unstable-2024-11-01 -> 0-unstable-2025-05-19

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

diff --git a/pkgs/by-name/xt/xtf/package.nix b/pkgs/by-name/xt/xtf/package.nix
index 6bcd5787901a..9bcf4cb8c823 100644
--- a/pkgs/by-name/xt/xtf/package.nix
+++ b/pkgs/by-name/xt/xtf/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation {
   pname = "xtf";
-  version = "0-unstable-2024-11-01";
+  version = "0-unstable-2025-05-19";
 
   outputs = [
     "out" # xtf-runner and test suite.
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://xenbits.xenproject.org/git-http/xtf.git";
-    rev = "294532089d5251170abfd65a6620c8247cea729d";
-    hash = "sha256-CQK7300nepZ3bNiHEJ5jrS9wkipr5JUbvtL5DNrULGI=";
+    rev = "419daf21e0685a1c9ca519bb744f4aadf992e007";
+    hash = "sha256-yCBEUd+0c6D5InoO67p1Ip1bi8qpwPG9CKQtXN7pDIg=";
   };
 
   nativeBuildInputs =

From ad2824979b418caa0299f7ccc1abb13b51210322 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 May 2025 20:39:40 +0000
Subject: [PATCH 020/204] python3Packages.pypdf: 5.4.0 -> 5.5.0

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

diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 6bfa4c2d1758..df070615d6bc 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "5.4.0";
+  version = "5.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     tag = version;
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-Do697G3CH3itIF+LFFr7h+mohIuzx2JZpGPnbVQ3sOw=";
+    hash = "sha256-L/dj8yJIkGLsDdsZ1xFK46yyAVJ14F3RSh7HLhEcVhI=";
   };
 
   outputs = [

From 0e11c494801f43cc09cb7c557cf7b2fcf8112e13 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Mon, 19 May 2025 21:44:10 +0100
Subject: [PATCH 021/204] paretosecurity: 0.2.17 -> 0.2.23

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

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 13a848fc5880..0fa9e08fa4ce 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.17";
+  version = "0.2.23";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-2Ev6LJWa+iPV7/Y/o9HrNf4vR4dbnIOim+qb4HdRXqU=";
+    hash = "sha256-jqjfaTvbwp/3P3E7eYv8CFaaYNjPfnbrFIzD6JcccV4=";
   };
 
-  vendorHash = "sha256-YnyACP/hJYxi4AWMwr0We4YUTbWwahKAIYN6RnHmzls=";
+  vendorHash = "sha256-v9M1CX6mIK8MdaI5TVa0Uc+HnIy+oCg+vYlH3eU809Q=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From f535dd19070d80a17cc22e3a6373d93a30edd4ca Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 20 May 2025 00:38:49 +0200
Subject: [PATCH 022/204] python313Packages.trimesh: 4.6.9 -> 4.6.10

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

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index ffe6753f7c21..34b53e868a5d 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.6.9";
+  version = "4.6.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "mikedh";
     repo = "trimesh";
     tag = version;
-    hash = "sha256-VxChu4QOoySCs/PAuVD6T+oFxkxvNGziwnkNdE6xSD0=";
+    hash = "sha256-tlIsRZLmnRCqVHcLQOh6Jmne3rZGS95QudnvJHMu1qs=";
   };
 
   build-system = [ setuptools ];

From 47ad31e33a5a5bf49723e0a8e62c130612519d95 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 04:31:05 +0800
Subject: [PATCH 023/204] pageedit: 2.0.0 -> 2.4.0

Diff: https://github.com/Sigil-Ebook/pageedit/compare/2.0.0...2.4.0
---
 pkgs/applications/office/PageEdit/default.nix | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix
index fc2d43bb2fb2..d090520684db 100644
--- a/pkgs/applications/office/PageEdit/default.nix
+++ b/pkgs/applications/office/PageEdit/default.nix
@@ -9,15 +9,15 @@
   qttools,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pageedit";
-  version = "2.0.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "Sigil-Ebook";
-    repo = pname;
-    rev = version;
-    hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q=";
+    repo = "pageedit";
+    tag = finalAttrs.version;
+    hash = "sha256-BsK+agn8O2WeftiEHfT5B1hzsP5Av4DkIZqVKoQxb70=";
   };
 
   nativeBuildInputs = [
@@ -25,10 +25,12 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
     qttools
   ];
+
   propagatedBuildInputs = [
     qtsvg
     qtwebengine
   ];
+
   cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
 
   installPhase =
@@ -45,12 +47,12 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  meta = with lib; {
+  meta = {
     description = "ePub XHTML Visual Editor";
     mainProgram = "pageedit";
     homepage = "https://sigil-ebook.com/pageedit/";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.pasqui23 ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.pasqui23 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 198ea1b474a6..5bf54b47ca36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4093,7 +4093,7 @@ with pkgs;
 
   padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
 
-  pageedit = libsForQt5.callPackage ../applications/office/PageEdit { };
+  pageedit = qt6Packages.callPackage ../applications/office/PageEdit { };
 
   pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
 

From 646caed84fc41f912334f057d16621b9eaefa757 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 May 2025 21:26:06 +0000
Subject: [PATCH 024/204] python3Packages.condense-json: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/development/python-modules/condense-json/default.nix b/pkgs/development/python-modules/condense-json/default.nix
index 422aa5dacf2d..3c81a79b3cf5 100644
--- a/pkgs/development/python-modules/condense-json/default.nix
+++ b/pkgs/development/python-modules/condense-json/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "condense-json";
-  version = "0.1.2";
+  version = "0.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "condense-json";
     tag = version;
-    hash = "sha256-eZ8d8N7k8VL7dFkORHmp7JmHM1/11Km8BCriWw/LiwE=";
+    hash = "sha256-vMh6GLWqae0Ave3FmrGQuVCgFzYMGCIe76mGNDMrBdU=";
   };
 
   build-system = [

From 7c51c47e645e8d24b970204dfcbe934454e30d06 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 May 2025 01:08:25 +0200
Subject: [PATCH 025/204] webdav: 5.7.5 -> 5.8.0

Diff: https://github.com/hacdias/webdav/compare/refs/tags/v5.7.5...refs/tags/v5.8.0

Changelog: https://github.com/hacdias/webdav/releases/tag/v5.8.0
---
 pkgs/by-name/we/webdav/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 1079a147df69..075254605ab4 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "webdav";
-  version = "5.7.5";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${version}";
-    hash = "sha256-iXU3ePALas/Z4caB1uhc5yW88zV/4iqv7qpOw4ZgZ3g=";
+    hash = "sha256-6G9NlQVYFDLuIxKJXq0Rcixx1AiDhTHUekumMNqXi44=";
   };
 
   vendorHash = "sha256-B78O13FPpkcuE808c2hLiIDPQdS5qlaw1dWLc9T7hvM=";

From 7062080823125e81da5132751e3b6b77511ddbf8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 21 May 2025 12:32:14 +0200
Subject: [PATCH 026/204] zipline: 4.0.2 -> 4.1.0

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

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 2bb0d44e7c5e..2bc70110809f 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pnpm_9,
-  nodejs,
+  pnpm_10,
+  nodejs_24,
   makeWrapper,
-  pkgs,
+  prisma-engines,
   ffmpeg,
   openssl,
   vips,
@@ -15,22 +15,6 @@
 }:
 
 let
-  prisma-engines = pkgs.prisma-engines.overrideAttrs (
-    finalAttrs: prevAttrs: {
-      version = "6.5.0";
-      src = fetchFromGitHub {
-        inherit (prevAttrs.src) owner repo;
-        rev = finalAttrs.version;
-        hash = "sha256-m3LBIMIVMI5GlY0+QNw/nTlNWt2rGOZ28z+CfdP51cY=";
-      };
-      cargoHash = "sha256-yG+omKAS1eWq3sFgKXMoZWhTP4M34dVRes7OhhTUyTQ=";
-      cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
-        inherit (finalAttrs) pname version src;
-        hash = finalAttrs.cargoHash;
-      };
-    }
-  );
-
   environment = {
     NEXT_TELEMETRY_DISABLED = "1";
     FFMPEG_PATH = lib.getExe ffmpeg;
@@ -45,25 +29,25 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.0.2";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-waUc2DzD7oQ/ZuPKvUwu3Yj6uxrZauR4phcQwh7YfKw=";
+    hash = "sha256-5qa2K17RmWHO5mrkz/Imoxv4ODEaJow3BMUBNzl7Dg8=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Q1PHXoiqUorAGcpIvM5iBvPINLRv+dAo0awhG4gvsrI=";
+    hash = "sha256-xFe1Fdsp8Tpz0r+xvPSYuPR8gXTts6iWTq0a9u+Xh3U=";
   };
 
   buildInputs = [ vips ];
 
   nativeBuildInputs = [
-    pnpm_9.configHook
-    nodejs
+    pnpm_10.configHook
+    nodejs_24
     makeWrapper
   ];
 
@@ -82,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/{bin,share/zipline}
 
-    cp -r build node_modules prisma .next mimes.json code.json package.json $out/share/zipline
+    cp -r build generated node_modules prisma .next mimes.json code.json package.json $out/share/zipline
 
     mkBin() {
-      makeWrapper ${lib.getExe nodejs} "$out/bin/$1" \
+      makeWrapper ${lib.getExe nodejs_24} "$out/bin/$1" \
         --chdir "$out/share/zipline" \
         --set NODE_ENV production \
         --prefix PATH : ${lib.makeBinPath [ openssl ]} \

From e01f9b378277fd79bfcf32f3eaddcac5ee87dd29 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 20 May 2025 00:36:35 +0200
Subject: [PATCH 027/204] sdl3: passthru sdl3-{image,ttf}, sdl2-compat and
 SDL_compat tests

---
 pkgs/by-name/sd/sdl3/package.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index eb06643b1326..96cf932d29a5 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -33,6 +33,11 @@
   wayland-scanner,
   xorg,
   zenity,
+  # for passthru.tests
+  SDL_compat,
+  sdl2-compat,
+  sdl3-image,
+  sdl3-ttf,
   alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   drmSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
@@ -204,7 +209,15 @@ stdenv.mkDerivation (finalAttrs: {
     });
 
     tests =
-      {
+      SDL_compat.tests
+      // sdl2-compat.tests
+      // {
+        inherit
+          SDL_compat
+          sdl2-compat
+          sdl3-image
+          sdl3-ttf
+          ;
         pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
         inherit (finalAttrs.passthru) debug-text-example;
       }

From e32b9fce64f7051979ca9078d5ac276383c0cf9e Mon Sep 17 00:00:00 2001
From: p0lyw0lf <p0lyw0lf@protonmail.com>
Date: Wed, 21 May 2025 21:01:02 -0400
Subject: [PATCH 028/204] python313Packages.sanic: 24.12.0 -> 25.3.0

---
 pkgs/development/python-modules/sanic/default.nix   |  8 ++------
 .../sanic/websockets-14.2-compat.patch              | 13 -------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/python-modules/sanic/websockets-14.2-compat.patch

diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index b794cd283159..4b429d529a29 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -5,7 +5,6 @@
   aioquic,
   beautifulsoup4,
   buildPythonPackage,
-  cacert,
   fetchFromGitHub,
   gunicorn,
   html5tagger,
@@ -27,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "sanic";
-  version = "24.12.0";
+  version = "25.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -36,12 +35,9 @@ buildPythonPackage rec {
     owner = "sanic-org";
     repo = "sanic";
     tag = "v${version}";
-    hash = "sha256-17Nr0iNeZC1sHm0JETIufdMVqrhORts1WxCh8cukCKg=";
+    hash = "sha256-tucLXWYPpALQrPYf+aiovKHYf2iouu6jezvNdukEu9w=";
   };
 
-  # https://github.com/sanic-org/sanic/issues/3031
-  patches = [ ./websockets-14.2-compat.patch ];
-
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch
deleted file mode 100644
index 9acf47757335..000000000000
--- a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sanic/server/protocols/websocket_protocol.py b/sanic/server/protocols/websocket_protocol.py
-index beee1d26..5a3e70f2 100644
---- a/sanic/server/protocols/websocket_protocol.py
-+++ b/sanic/server/protocols/websocket_protocol.py
-@@ -147,7 +147,7 @@ class WebSocketProtocol(HttpProtocol):
-                 "".join([f"{k}: {v}\r\n" for k, v in resp.headers.items()])
-             ).encode()
-             rbody += b"\r\n"
--            if resp.body is not None:
-+            if resp.body:
-                 rbody += resp.body
-                 rbody += b"\r\n\r\n"
-             await super().send(rbody)

From dff26b810ac18f2bdd82a74adf5576da8a0984ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 15:09:59 +0000
Subject: [PATCH 029/204] oci-cli: 3.55.0 -> 3.56.1

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

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 5061eb018613..c7599f674d20 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.55.0";
+  version = "3.56.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-+XKoB8lychQJXjrYA536TSYYYSeRsSAfgi6ER2tLaqA=";
+    hash = "sha256-KvyhQ8MM74MYR8gf18XVYZrOSEKcOqdmyITg2UyNqp8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 10f39b09369595278caae7e61e91b004932186b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 20:37:58 +0000
Subject: [PATCH 030/204] bpftrace: 0.23.2 -> 0.23.3

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

diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 98ad818b4868..7c9174dec0d8 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpftrace";
-  version = "0.23.2";
+  version = "0.23.3";
 
   src = fetchFromGitHub {
     owner = "bpftrace";
     repo = "bpftrace";
     rev = "v${version}";
-    hash = "sha256-AIjWF+MRnzEwvi1+XBxeiyJIX6059Hy8GgVwjZum2cc=";
+    hash = "sha256-Jvl8Up3IH2/G0QMb0pZmQ2SSXOmjTj08KXoJXOR3Z48=";
   };
 
   buildInputs = with llvmPackages; [

From 7a7887ba54d1496c88aa675ab6e4c9b328b899b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 00:20:22 +0000
Subject: [PATCH 031/204] quarkus: 3.22.2 -> 3.22.3

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

diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index 30426a750e08..ceeb7471ac7a 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.22.2";
+  version = "3.22.3";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-RCWkaPoE3Purq9VG1xhlakMxqXhnxi+q10YcgOyScqg=";
+    hash = "sha256-kUIjIsVK7hn2tNOpuqfNdwuX1ZQewcY8SItAknG7cRk=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ce7762236b590b7877c2d070192faca6bc1c4db8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 23 May 2025 17:40:09 +0800
Subject: [PATCH 032/204] naev: 0.11.5 -> 0.12.4

---
 pkgs/by-name/na/naev/package.nix | 55 ++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix
index e94414ba8bc2..655f5b1725b4 100644
--- a/pkgs/by-name/na/naev/package.nix
+++ b/pkgs/by-name/na/naev/package.nix
@@ -1,9 +1,14 @@
 {
   lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  unzip,
+  pkg-config,
+  python3,
   SDL2,
   SDL2_image,
   enet,
-  fetchFromGitHub,
   freetype,
   glpk,
   intltool,
@@ -19,21 +24,39 @@
   openblas,
   pcre2,
   physfs,
-  pkg-config,
-  python3,
-  stdenv,
   suitesparse,
+  libyaml,
+  cmark,
+  dbus,
 }:
 
-stdenv.mkDerivation rec {
+let
+  lyaml = fetchFromGitHub {
+    owner = "gvvaughan";
+    repo = "lyaml";
+    tag = "v6.2.8";
+    hash = "sha256-ADLXi38sAs9ifQ4HJoYzgdp/dw0axGmVCtqJjpqWcmQ=";
+  };
+  nativefiledialog-extended = fetchFromGitHub {
+    owner = "btzy";
+    repo = "nativefiledialog-extended";
+    tag = "v1.2.1";
+    hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY=";
+  };
+  nativefiledialog-extended-patch = fetchurl {
+    url = "https://wrapdb.mesonbuild.com/v2/nativefiledialog-extended_1.2.1-1/get_patch";
+    hash = "sha256-BEouiB2HTVWokrYc9VOqdnjRwPBs+us5obQ/NMqXawk=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "naev";
-  version = "0.11.5";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
-    rev = "v${version}";
-    hash = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CnpxgHliJK29H4QKDvRp/e0tssTuIZy8hcwQO0tInbg=";
     fetchSubmodules = true;
   };
 
@@ -54,6 +77,9 @@ stdenv.mkDerivation rec {
     pcre2
     physfs
     suitesparse
+    libyaml
+    cmark
+    dbus
   ];
 
   nativeBuildInputs = [
@@ -67,6 +93,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     intltool
+    unzip
   ];
 
   mesonFlags = [
@@ -76,13 +103,21 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py
+    patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py dat/naevpedia/ships/ships.py dat/naevpedia/outfits/outfits.py
 
     # Add a missing include to fix the build against luajit-2.1.1741730670.
     # Otherwise the build fails as:
     #   src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function)
     # TODO: drop after 0.12.3 release
     sed -i '1i#include <limits.h>' src/lutf8lib.c
+    cp -r ${lyaml} subprojects/lyaml-6.2.8
+    chmod -R +w subprojects/lyaml-6.2.8
+    cp -r subprojects/packagefiles/lyaml/* subprojects/lyaml-6.2.8
+    cp -r ${nativefiledialog-extended} subprojects/nativefiledialog-extended-1.2.1
+    chmod -R +w subprojects/nativefiledialog-extended-1.2.1
+    tmp=$(mktemp -d)
+    unzip ${nativefiledialog-extended-patch} -d $tmp
+    cp -r $tmp/*/* subprojects/nativefiledialog-extended-1.2.1
   '';
 
   meta = {
@@ -93,4 +128,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ ralismark ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 982c068a64b0aeaf7389f45f743de88dff91742e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 11:42:35 +0000
Subject: [PATCH 033/204] python3Packages.xcffib: 1.7.1 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix
index f83ce85defb4..093118aa92fb 100644
--- a/pkgs/development/python-modules/xcffib/default.nix
+++ b/pkgs/development/python-modules/xcffib/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "xcffib";
-  version = "1.7.1";
+  version = "1.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-M3dcHQRh8ZJV/FTiLOkU4QoT+2W8e7oOq6/ufwh4z9s=";
+    hash = "sha256-K6xgY2lnVOiHHC9AcwR7Uz792Cx33fhnYgEWcJfMUlM=";
   };
 
   postPatch = ''

From 089eeb4610c279c53aea84488802fe5920717a9a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 15 May 2025 10:26:51 +0200
Subject: [PATCH 034/204] lomiri.lomiri-mediaplayer-app: 1.1.0 -> 1.1.1

---
 .../lomiri-mediaplayer-app/default.nix        | 46 +++----------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
index 98cb45d6dbe9..bbb9050e6bec 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   cmake,
@@ -23,50 +22,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-mediaplayer-app";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-mediaplayer-app";
-    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-Pq1TA7eoHDRRzr6zT2cmIye91uz/0YsmQ8Qp79244wg=";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-A1tAXQXDwVZ3ILFcJKCtbOm1iNxPFOXQIS6p7fPbqwM=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/35 merged & in release
-    (fetchpatch {
-      name = "0001-lomiri-mediaplayer-app-Fix-GNUInstallDirs-usage.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/baaa0ea7cba2a9f8bc7f223246857eba1cd5d8e4.patch";
-      hash = "sha256-RChPRi4zrAWJEl4Urznh5FRYuTnxCFzG+gZurrF7Ym0=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/36 merged & in release
-    (fetchpatch {
-      name = "0002-lomiri-mediaplayer-app-Drop-NO_DEFAULT_PATH-for-qmltestrunner.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/3bf4ebae7eb59176af984d07ad72b67ee0bd1b8f.patch";
-      hash = "sha256-dJCW0dKe7Tq1Mg9CSdVQHamObVrPS7COXsdv41SWnHg=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/37 merged & in release
-    (fetchpatch {
-      name = "0003-lomiri-mediaplayer-app-BUILD_TESTING.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/df1aadb82d73177133bc096307ec1ef1e2b0c2ed.patch";
-      hash = "sha256-dvkGjG0ptCmLDIAWzDjOzu+Q/5bgVdb/+RmE6v8fV0Q=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/38 merged & in release
-    (fetchpatch {
-      name = "0004-lomiri-mediaplayer-app-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/bd927e823205214f9ea01dfb1f93171a8952ecf9.patch";
-      hash = "sha256-/lg0elv9weNnRGq1oD94/sE511EZ0TmXZsURcauQobI=";
-    })
-    (fetchpatch {
-      name = "0005-lomiri-mediaplayer-app-Fix-title-localisation.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/c4cba819dd55e7e85c4ea496626bed9aa78470a5.patch";
-      hash = "sha256-EiUxaCa5ANnRSciB8IodQOGnmG4rE/g/M+K4XcyqTI8=";
-    })
-  ];
-
   postPatch = ''
     # We don't want absolute paths in desktop files
     substituteInPlace data/lomiri-mediaplayer-app.desktop.in.in \
@@ -154,7 +118,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Media Player application for Ubuntu Touch devices";
     homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app";
-    changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = with lib.licenses; [
       gpl3Only
       cc-by-sa-30

From 3ce945c042c6a5a2d346d2562c992f87daef1b4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 19:56:08 +0000
Subject: [PATCH 035/204] mdbook: 0.4.49 -> 0.4.50

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

diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index c08a936952c3..f7863c67f4a4 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -7,7 +7,7 @@
   installShellFiles,
 }:
 let
-  version = "0.4.49";
+  version = "0.4.50";
 in
 rustPlatform.buildRustPackage rec {
   inherit version;
@@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "mdBook";
     tag = "v${version}";
-    hash = "sha256-X+ptqzAOjCX2Tt5jDfH/jdUy99WrITGfzDj+F2DoI5w=";
+    hash = "sha256-ooXfYXqE12wTxrrHKF0IO8JNY7P4sPplrnhVJ6kEUyI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZPJkSMcxyTOivfwThPfaO6oRkfewH048rrCDCwCtE8c=";
+  cargoHash = "sha256-kyk7fwuR5A0GEGUw+W81IjwDNsa3I2DT3SFnT75IvLs=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e49bc99039571d3fe9304339aa2572f5996e5c12 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 21 May 2025 17:29:47 -0700
Subject: [PATCH 036/204] python3Packages.google-genai: 1.15.0 -> 1.16.1

changelog: https://github.com/googleapis/python-genai/releases/tag/v1.16.1

diff: https://github.com/googleapis/python-genai/compare/v1.15.0...v1.16.1
---
 pkgs/development/python-modules/google-genai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index e639ddf21ad4..634683d16678 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.15.0";
+  version = "1.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-UKd4imkUIuhhj+7v5vT3ZQkz9qk3dAo3q5WBOqppFAc=";
+    hash = "sha256-P37dGIfpr02aO7N6Y3jGWXTjwz8IZPuZQYG0uJqeek4=";
   };
 
   build-system = [

From f49642dccc26790506173ad72af67d1faff77c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:11:32 -0600
Subject: [PATCH 037/204] linux-rt_5_15: 5.15.179-rt84 -> 5.15.183-rt85

---
 pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index d7724c5d1046..0db95f0059c7 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.15.179-rt84"; # updated by ./update-rt.sh
+  version = "5.15.183-rt85"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck";
+      sha256 = "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0p2yq4ahv0rwynivvlldhalpw65ka6hmjxh26p3pi5qrv3rbwja1";
+            sha256 = "1jlrnjr2cwlfqxzq27wzz0r57bpissxs0s3nbdaj4bk92cd527c3";
           };
         };
       in

From 35ab705fff6f4c1b2dca0125347db3d80b358e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:14:44 -0600
Subject: [PATCH 038/204] linux_latest-libre: 19792 -> 19795

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 3420af2b3188..62ea09bef719 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -5,8 +5,8 @@
   linux,
   scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19792";
-    sha256 = "1ygpb3i0m6zi2jhxl9kasf54blygsv7qh45nafv4shfk8bg80sn6";
+    rev = "19795";
+    sha256 = "1gcg9n5b2yyd3nhzf4v8xiy7xxnizmk33bwnp6c768vckxbzmhdh";
   },
   ...
 }@args:

From ddde68fb87909d89f57196ac33f00498670a56b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:14:54 -0600
Subject: [PATCH 039/204] linux/hardened/patches/5.15: v5.15.182-hardened1 ->
 v5.15.183-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 1acd79c2ca82..d9569142c25d 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -12,12 +12,12 @@
     "5.15": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.15.182-hardened1.patch",
-            "sha256": "1q6sm4542lb8zcgybxz9gjckvpll1nfyf87yqx9h5rn6a9mlwyl0",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.182-hardened1/linux-hardened-v5.15.182-hardened1.patch"
+            "name": "linux-hardened-v5.15.183-hardened1.patch",
+            "sha256": "135ab4z2a1rs94ysf8jgdy8p51n776y88lmwgyf75pbdpiac5wgd",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.183-hardened1/linux-hardened-v5.15.183-hardened1.patch"
         },
-        "sha256": "07m3yrkqpmh4cmsmhz8i6da0h7xlprc7r4hb0xcy812s659zmaxn",
-        "version": "5.15.182"
+        "sha256": "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh",
+        "version": "5.15.183"
     },
     "5.4": {
         "patch": {

From 39e8a0516816f96f35f9d0b139b11a9dd9c460a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:14:59 -0600
Subject: [PATCH 040/204] linux/hardened/patches/6.1: v6.1.138-hardened1 ->
 v6.1.139-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index d9569142c25d..34a062b9e601 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -32,12 +32,12 @@
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.138-hardened1.patch",
-            "sha256": "1llqkxp7kch0ryf6n658z06mv7a7igp0zpxcl3kiqysilm3f93nr",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.138-hardened1/linux-hardened-v6.1.138-hardened1.patch"
+            "name": "linux-hardened-v6.1.139-hardened1.patch",
+            "sha256": "055640hrki8br3g4ka8y0lg4zqnrjab3cm0y06p8lpk1bnmsdhms",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.139-hardened1/linux-hardened-v6.1.139-hardened1.patch"
         },
-        "sha256": "04br4ln81skk4lgrgxqhpn2qjvkifi4bm360rfw9zfj9j2xsa6g3",
-        "version": "6.1.138"
+        "sha256": "064zzk7kwkq7i5160s0alzkz16pp89wcq07s9jhzhv4bxvgzyspn",
+        "version": "6.1.139"
     },
     "6.12": {
         "patch": {

From f07903a00be7a017533534318a53ae982e719f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:15:04 -0600
Subject: [PATCH 041/204] linux/hardened/patches/6.12: v6.12.28-hardened1 ->
 v6.12.29-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 34a062b9e601..1a5ca5690207 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.28-hardened1.patch",
-            "sha256": "1l0r20i72p6x362a7i74qjrlf2c7yc92cgla7s1lflcb87yynnzl",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.28-hardened1/linux-hardened-v6.12.28-hardened1.patch"
+            "name": "linux-hardened-v6.12.29-hardened1.patch",
+            "sha256": "0ccg5vr9sfyxd5yhj3zw129ga46x3vvcglcsdsz39hzvi1dmgq5j",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.29-hardened1/linux-hardened-v6.12.29-hardened1.patch"
         },
-        "sha256": "07kpsl6lbsr0zw6p8bglgbchdrv1jivcwwnyh7vwzbk24lc9k878",
-        "version": "6.12.28"
+        "sha256": "0k86nmmpg0jsx11w34vlj20cxpxavip4y5g7dp4bkk1q4dzfrcp8",
+        "version": "6.12.29"
     },
     "6.13": {
         "patch": {

From 6dfe996ec1e246e173b73194a8be0533bf982663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:15:09 -0600
Subject: [PATCH 042/204] linux/hardened/patches/6.14: v6.14.6-hardened1 ->
 v6.14.7-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 1a5ca5690207..8f6d4c0fe349 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -62,12 +62,12 @@
     "6.14": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.14.6-hardened1.patch",
-            "sha256": "0ph6kkgbc0pk83xisggk7xsacryqlzkxgc1nxx590lg285bh33ld",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.6-hardened1/linux-hardened-v6.14.6-hardened1.patch"
+            "name": "linux-hardened-v6.14.7-hardened1.patch",
+            "sha256": "03ca9s4ricjdyk4k0i3zfrih1jxhwyqpvl1kc6z1fk14cj727h4y",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.7-hardened1/linux-hardened-v6.14.7-hardened1.patch"
         },
-        "sha256": "1acpjxscw5nvgp19jzd29zhl1c6wdzx0bxp4yy0hy8z2k0cpz091",
-        "version": "6.14.6"
+        "sha256": "0wj9yl0ymzjx3ig0l3wdl5dqqiylvjk0j8adm5bnj23dq8mj04l1",
+        "version": "6.14.7"
     },
     "6.6": {
         "patch": {

From b061acba4cedb739faa773ffe001d38af088333d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 23 May 2025 15:15:13 -0600
Subject: [PATCH 043/204] linux/hardened/patches/6.6: v6.6.90-hardened1 ->
 v6.6.91-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 8f6d4c0fe349..16bbc6e7e32f 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -72,11 +72,11 @@
     "6.6": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.90-hardened1.patch",
-            "sha256": "0w43dv0179drcg7w7j6gq8l6di0aj4rhfphyz7xlkx6x54jlxbvv",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.90-hardened1/linux-hardened-v6.6.90-hardened1.patch"
+            "name": "linux-hardened-v6.6.91-hardened1.patch",
+            "sha256": "08dhn42n73gx7inkczq1q3qass91imqkxs2r423z9g7dh0hgjgxk",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.91-hardened1/linux-hardened-v6.6.91-hardened1.patch"
         },
-        "sha256": "0kh1ax0j0vl0n267cpij5lf170ab1fg0j6gjzvzc2a8ncx46g1gz",
-        "version": "6.6.90"
+        "sha256": "1x2lwaaqzlgszk41cy6k5j9dcbxxkca5xjaznb82r987ahbkv3fh",
+        "version": "6.6.91"
     }
 }

From ed9dc2ff6815b4a5ddbb5488421c7c2b98583bdf Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 23 May 2025 19:31:29 +0200
Subject: [PATCH 044/204] jasp-desktop: 0.19.1 -> 0.19.3

---
 pkgs/by-name/ja/jasp-desktop/cmake.patch | 73 +++++++++++++++++-------
 pkgs/by-name/ja/jasp-desktop/modules.nix | 47 ++++++++++++++-
 pkgs/by-name/ja/jasp-desktop/package.nix | 52 ++++++++---------
 3 files changed, 122 insertions(+), 50 deletions(-)

diff --git a/pkgs/by-name/ja/jasp-desktop/cmake.patch b/pkgs/by-name/ja/jasp-desktop/cmake.patch
index b6de8bc55269..60cf1814a031 100644
--- a/pkgs/by-name/ja/jasp-desktop/cmake.patch
+++ b/pkgs/by-name/ja/jasp-desktop/cmake.patch
@@ -1,5 +1,5 @@
 diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
-index cc4681a..f484013 100644
+index a95ef78..6ee84cd 100644
 --- a/Tools/CMake/Libraries.cmake
 +++ b/Tools/CMake/Libraries.cmake
 @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
@@ -11,36 +11,67 @@ index cc4681a..f484013 100644
  find_package(
    Boost 1.78 REQUIRED
    COMPONENTS filesystem
-@@ -178,10 +178,10 @@ if(LINUX)
-     set(LIBREADSTAT_INCLUDE_DIRS /app/include)
-     set(LIBREADSTAT_LIBRARY_DIRS /app/lib)
-   else()
--    set(LIBREADSTAT_INCLUDE_DIRS /usr/local/include /usr/include)
-+    set(LIBREADSTAT_INCLUDE_DIRS @readstat@/include /usr/include)
-     # The last two library paths handle the two most common multiarch cases.
-     # Other multiarch-compliant paths may come up but should be rare.
--    set(LIBREADSTAT_LIBRARY_DIRS /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu)
-+    set(LIBREADSTAT_LIBRARY_DIRS @readstat@/lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu)
+@@ -185,7 +185,7 @@ if(LINUX)
    endif()
  
    message(CHECK_START "Looking for libreadstat.so")
+-  find_file(LIBREADSTAT_LIBRARIES libreadstat.so
++  find_library(LIBREADSTAT_LIBRARIES libreadstat.so
+             HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED)
+ 
+   if(EXISTS ${LIBREADSTAT_LIBRARIES})
 diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake
-index dbd089d..ef6857a 100644
+index bfdc8dc..af5ac03 100644
 --- a/Tools/CMake/Programs.cmake
 +++ b/Tools/CMake/Programs.cmake
-@@ -39,6 +39,7 @@ endif()
+@@ -38,8 +38,9 @@ if(NOT WIN32)
+ endif()
  
  # ------ Linux Tools/Programs
- 
-+#[[
- if(LINUX)
+-
+-if(LINUX)
++# We don't need to check for any dependencies that are used to build R packages
++# since we build them separately
++if(false)
  
    message(CHECK_START "Looking for 'gfortran'")
-@@ -81,6 +82,7 @@ if(LINUX)
-   endif()
+   find_program(
+diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake
+index 9ae27d4..64fd96a 100644
+--- a/Tools/CMake/R.cmake
++++ b/Tools/CMake/R.cmake
+@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}")
+ configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in
+                 ${SCRIPT_DIRECTORY}/setup_renv.R @ONLY)
  
- endif()
-+]]#
+-execute_process(
+-  COMMAND_ECHO STDOUT
+-  #ERROR_QUIET OUTPUT_QUIET
+-  WORKING_DIRECTORY ${R_HOME_PATH}
+-  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R)
  
- # ----------------------
+ if(APPLE)
+   # Patch renv
+@@ -867,11 +862,6 @@ endif()
+ configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in
+                 ${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY)
+ 
+-execute_process(
+-  COMMAND_ECHO STDOUT
+-  #ERROR_QUIET OUTPUT_QUIET
+-  WORKING_DIRECTORY ${R_HOME_PATH}
+-  COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R)
+ 
+ if(APPLE)
+   # Patch RInside and RCpp
+@@ -892,8 +882,8 @@ endif()
+ 
+ include(FindRPackagePath)
+ 
+-find_package_path(RCPP_PATH       ${R_CPP_INCLUDES_LIBRARY} "Rcpp")
+-find_package_path(RINSIDE_PATH    ${R_CPP_INCLUDES_LIBRARY} "RInside")
++find_package_path(RCPP_PATH       ${R_LIBRARY_PATH} "Rcpp")
++find_package_path(RINSIDE_PATH    ${R_LIBRARY_PATH} "RInside")
+ 
+ set(RENV_PATH "${RENV_LIBRARY}/renv")
  
diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index 46dd282c6f38..c211946d76d9 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -165,6 +165,12 @@ let
       src = jasp-src;
       sourceRoot = "${jasp-src.name}/Modules/${name}";
       propagatedBuildInputs = deps;
+
+      # some packages have a .Rprofile that tries to activate renv
+      # we disable this by removing .Rprofile
+      postPatch = ''
+        rm -f .Rprofile
+      '';
     };
 in
 {
@@ -229,6 +235,20 @@ in
       jaspGraphs
       jaspSem
     ];
+    jaspBFF = buildJaspModule "jaspBFF" [
+      BFF
+      jaspBase
+      jaspGraphs
+    ];
+    jaspBfpack = buildJaspModule "jaspBfpack" [
+      BFpack
+      bain
+      ggplot2
+      stringr
+      coda
+      jaspBase
+      jaspGraphs
+    ];
     jaspBsts = buildJaspModule "jaspBsts" [
       Boom
       bsts
@@ -305,6 +325,7 @@ in
       conting'
       multibridge
       ggplot2
+      interp
       jaspBase
       jaspGraphs
       plyr
@@ -353,6 +374,8 @@ in
       ggforce
       tidyr
       igraph
+      HDInterval
+      metafor
     ];
     jaspMachineLearning = buildJaspModule "jaspMachineLearning" [
       kknn
@@ -375,6 +398,7 @@ in
       jaspBase
       jaspGraphs
       MASS
+      mclust
       mvnormalTest
       neuralnet
       network
@@ -385,6 +409,7 @@ in
       ROCR
       Rtsne
       signal
+      VGAM
     ];
     jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [
       dplyr
@@ -406,6 +431,12 @@ in
       metamisc
       ggmcmc
       pema
+      clubSandwich
+      CompQuadForm
+      sp
+      dfoptim
+      nleqslv
+      patchwork
     ];
     jaspMixedModels = buildJaspModule "jaspMixedModels" [
       afex
@@ -459,6 +490,8 @@ in
       BART
       EBMAforecast
       imputeTS
+      scoringRules
+      scoringutils
     ];
     jaspProcess = buildJaspModule "jaspProcess" [
       blavaan
@@ -543,6 +576,7 @@ in
       lme4
       MASS
       psych
+      mirt
     ];
     jaspRobustTTests = buildJaspModule "jaspRobustTTests" [
       RoBTT
@@ -553,16 +587,17 @@ in
     jaspSem = buildJaspModule "jaspSem" [
       forcats
       ggplot2
-      jaspBase
-      jaspGraphs
       lavaan
       cSEM
       reshape2
+      jaspBase
+      jaspGraphs
       semPlot
       semTools
       stringr
       tibble
       tidyr
+      SEMsens
     ];
     jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [
       BayesFactor
@@ -579,7 +614,7 @@ in
     ];
     jaspSurvival = buildJaspModule "jaspSurvival" [
       survival
-      survminer
+      ggsurvfit
       jaspBase
       jaspGraphs
     ];
@@ -593,6 +628,12 @@ in
       plotrix
       plyr
     ];
+    jaspTestModule = buildJaspModule "jaspTestModule" [
+      jaspBase
+      jaspGraphs
+      svglite
+      stringi
+    ];
     jaspTimeSeries = buildJaspModule "jaspTimeSeries" [
       jaspBase
       jaspGraphs
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 2fb25136e503..3f9a4010d945 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -1,31 +1,34 @@
 {
   lib,
   stdenv,
+
   fetchFromGitHub,
-  fetchpatch,
+
   buildEnv,
   linkFarm,
-  replaceVars,
-  R,
-  rPackages,
+
   cmake,
   ninja,
   pkg-config,
+
   boost,
+  freexl,
   libarchive,
-  readstat,
   qt6,
+  R,
+  readstat,
+  rPackages,
 }:
 
 let
-  version = "0.19.1";
+  version = "0.19.3";
 
   src = fetchFromGitHub {
     owner = "jasp-stats";
     repo = "jasp-desktop";
-    rev = "v${version}";
-    hash = "sha256-SACGyNVxa6rFjloRQrEVtUgujEEF7WYL8Qhw6ZqLwdQ=";
+    tag = "v${version}";
     fetchSubmodules = true;
+    hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo=";
   };
 
   moduleSet = import ./modules.nix {
@@ -58,25 +61,19 @@ stdenv.mkDerivation {
   inherit version src;
 
   patches = [
-    # remove unused cmake deps, ensure boost is dynamically linked, patch readstat path
-    (replaceVars ./cmake.patch {
-      inherit readstat;
-    })
-
-    (fetchpatch {
-      name = "fix-qt-6.8-crash.patch";
-      url = "https://github.com/jasp-stats/jasp-desktop/commit/d96a35d262312f72081ac3f96ae8c2ae7c796b0.patch";
-      hash = "sha256-KcsFy1ImPTHwDKN5Umfoa9CbtQn7B3FNu/Srr0dEJGA=";
-    })
+    # - ensure boost is linked dynamically
+    # - fix readstat's find logic
+    # - disable some of the renv logic
+    # - dont't check for dependencies required for building modules
+    ./cmake.patch
   ];
 
   cmakeFlags = [
-    "-DGITHUB_PAT=dummy"
-    "-DGITHUB_PAT_DEF=dummy"
-    "-DINSTALL_R_FRAMEWORK=OFF"
-    "-DLINUX_LOCAL_BUILD=OFF"
-    "-DINSTALL_R_MODULES=OFF"
-    "-DCUSTOM_R_PATH=${customREnv}"
+    (lib.cmakeFeature "GITHUB_PAT" "dummy")
+    (lib.cmakeFeature "GITHUB_PAT_DEF" "dummy")
+    (lib.cmakeBool "LINUX_LOCAL_BUILD" false)
+    (lib.cmakeBool "INSTALL_R_MODULES" false)
+    (lib.cmakeFeature "CUSTOM_R_PATH" "${customREnv}")
   ];
 
   nativeBuildInputs = [
@@ -87,10 +84,12 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    customREnv
     boost
+    customREnv
+    freexl
     libarchive
     readstat
+
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qtwebengine
@@ -98,6 +97,7 @@ stdenv.mkDerivation {
     qt6.qt5compat
   ];
 
+  # needed so that JASPEngine can find libRInside.so
   env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";
 
   postInstall = ''
@@ -107,7 +107,7 @@ stdenv.mkDerivation {
     # Remove flatpak proxy script
     rm $out/bin/org.jaspstats.JASP
     substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \
-        --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"
+      --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"
 
     # symlink modules from the store
     ln -s ${modulesDir} $out/Modules

From ae1a9fd15dabcf9f226fc95374a7d6099fe8fb7b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 24 May 2025 01:52:45 +0200
Subject: [PATCH 045/204] python313Packages.py-synologydsm-api: 2.7.1 -> 2.7.2

https://github.com/mib1185/py-synologydsm-api/releases/tag/v2.7.2
---
 .../development/python-modules/py-synologydsm-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index db4d5cbca45f..e6a202f12159 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "py-synologydsm-api";
-  version = "2.7.1";
+  version = "2.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "mib1185";
     repo = "py-synologydsm-api";
     tag = "v${version}";
-    hash = "sha256-Wra0H43eS6kVamavR1lUeonqSIz/BAJBlhoWshDDhZ0=";
+    hash = "sha256-I9Ew3rBmgG+FuT66e8VgMa0WzAwr+ng5R8uYMzSyYyg=";
   };
 
   build-system = [ setuptools ];

From 7d7e1dd5a3e911498e5ef680e975edb497326855 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 24 May 2025 01:52:57 +0200
Subject: [PATCH 046/204] python313Packages.pylamarzocco: 2.0.3 -> 2.0.4

https://github.com/zweckj/pylamarzocco/releases/tag/v2.0.4
---
 pkgs/development/python-modules/pylamarzocco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index db12c570a113..7440a43e76db 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "2.0.3";
+  version = "2.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     tag = "v${version}";
-    hash = "sha256-zQbE+GMXwmdUSOd4xqgiC2QENFdLvcUS3JLKTz4rq8s=";
+    hash = "sha256-ING00Xz+ipEnwX+u4M6upN5aYX2JrKZS/ho6b72QyFw=";
   };
 
   build-system = [ setuptools ];

From 2e09de2007eca924bb45e4f3328d77cde71bc8a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 24 May 2025 01:53:00 +0200
Subject: [PATCH 047/204] python313Packages.pysqueezebox: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
index 3c141bfc2fa1..6a0828f0a6b3 100644
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
-  version = "0.12.0";
+  version = "0.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "rajlaud";
     repo = "pysqueezebox";
     tag = "v${version}";
-    hash = "sha256-WZrj9YNVQSS1M+PKLkX1zyERVmcvJGnHal6JKgl/fC0=";
+    hash = "sha256-Bi809OzIoQ2TJH77kZlsSSPEmDNgz6hAybmOXbFn3LM=";
   };
 
   build-system = [ setuptools ];

From 6edb0dd30bca2b69a2003becee5310b1883c9fd0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 24 May 2025 01:53:05 +0200
Subject: [PATCH 048/204] python313Packages.deebot-client: 13.2.0 -> 13.2.1

https://github.com/DeebotUniverse/client.py/releases/tag/13.2.1
---
 pkgs/development/python-modules/deebot-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 2ed542631881..1c0af2da2344 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "deebot-client";
-  version = "13.2.0";
+  version = "13.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -29,12 +29,12 @@ buildPythonPackage rec {
     owner = "DeebotUniverse";
     repo = "client.py";
     tag = version;
-    hash = "sha256-0DGOdfr6vqtgYwabhJWfxV2kACzixiCnqPNssPHyLhw=";
+    hash = "sha256-6R9ihxe63YMVgVk+5R9pDNT3a/c9lK28wNleVb5NcRA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-A/axIsDfpWNLQXeExshzlJfKWh5yFZYqxDQYPn1+fHg=";
+    hash = "sha256-GNqoP/Zz5xHl2cLz7AqRKXsfLXgdLbgXSK8EdBWtOAU=";
   };
 
   pythonRelaxDeps = [

From cd3db0e7a79fc08c2cdfd931fbce857716752ef6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 00:03:41 +0000
Subject: [PATCH 049/204] thunderbird-esr-bin-unwrapped: 128.10.1esr ->
 128.10.2esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 926 +++++++++++++-----
 1 file changed, 661 insertions(+), 265 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index 01c6dbaded12..e879a9482ab6 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,797 +1,1193 @@
 {
-  version = "128.10.1esr";
+  version = "128.10.2esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/af/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/af/thunderbird-128.10.2esr.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "c66c686e94343eeb53ad0e202127becfb529cb3da2dca1b77b2420419e1fbe73";
+      sha256 = "32ac45687bc7ac6687325123956030e3b5638eb5b6ba39e4b7c6ce291e0a7c3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ar/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ar/thunderbird-128.10.2esr.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "326c20ed0e8bea525cbfe385236efbddde2db7b5aabbda09081ff3a5aa21ddc9";
+      sha256 = "59e2aa5f85c69b99d9fa30de35dbd81c4b549deb98beb15c3a3fe913f63a05e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ast/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ast/thunderbird-128.10.2esr.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "d01bff98fda18ff648ddd57601c5f26e8b11e9df410f01192fbf7ba57732184e";
+      sha256 = "b989c0979f2708d30c275cb03c7055d3758a6c21be3aac85ea0f4613e18c48ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/be/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/be/thunderbird-128.10.2esr.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "c485a68ca28fedd45ce93e17180ef3122305d3ebac49028e001bf91c466fa701";
+      sha256 = "b7ada50a52b826821c24e5ddcd48b0f93bc723cf7cb1807f5414f65f9a0f0574";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/bg/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/bg/thunderbird-128.10.2esr.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "f31be4e8e2da5ae9390a99adce920b579db0bbb55d7ae9a0aee552af02149f10";
+      sha256 = "5656c1761dec960f2dcf12655594c9efcd987097664e4a3f8ca3ad84e1a15f10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/br/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/br/thunderbird-128.10.2esr.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "134cbb02c9023c66a46b3083b6f5751f6865f1d19b3e068571a92b341a264a8b";
+      sha256 = "c953f8bc188049807b2a52308f63ebe92528634a1f1fbdc356c194d2c78a239a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ca/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ca/thunderbird-128.10.2esr.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "2b81952163805134cc65b21151958e1fd6c1ce3fb312917769ced340735baa48";
+      sha256 = "37d64068cf3de591c7339d58e2a87a6e37a6efadf33b16b427afa775d16ab01e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/cak/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cak/thunderbird-128.10.2esr.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "9c0156e6ff149c311d755123bd9f92d98e8cb41f05d54159d1fe12ce9a1c8f46";
+      sha256 = "997d42a67385057cd2c913c97cf1b0ca2d7359c4e90958935e28d3a670bda908";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/cs/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cs/thunderbird-128.10.2esr.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "76017bfa968079e3b48e36525e2d19f01a40b854a8d6ce2494a654d442296a6d";
+      sha256 = "583a97c5725b1cd102ee862a795146d8e07b82831c66cc2aeba04983335569f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/cy/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cy/thunderbird-128.10.2esr.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "067388baab68d54aca5fd4b105350871b4ed89e42763641b29e728c87312412c";
+      sha256 = "100be8be3f2af0f974bd0c970a2e9a119d2789c3178b18f615ab26a8a5da732e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/da/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/da/thunderbird-128.10.2esr.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "452e57612838e0d6a65162a66bd5347a694f46fb06f00ad522e6d331f314fe7a";
+      sha256 = "3ba04f8108ca983444b6c9cf029d1be0a2b8a03283cc628c38a1754d252b2e36";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/de/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/de/thunderbird-128.10.2esr.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "bda05607655b09504f07888e42e670346c4fb75c5105f4f01123fd9e0f2e5136";
+      sha256 = "34251009f64852e02acf2a7780e03b37e41238a738ff739fd0689def677d055b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/dsb/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/dsb/thunderbird-128.10.2esr.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "1040cfbe784ce251a0ae00a210b5d3d6c9ef388f2292d1f4a855b4ec2e1158d8";
+      sha256 = "378e3b2b0666985eadd85699be9f48b6b6fd01b92116c21abe3deadccd6bc025";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/el/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/el/thunderbird-128.10.2esr.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "28b9c47b2ee873b2fdec84bff22ff834a86f90c85f7057711c79001e95d39ac5";
+      sha256 = "495dd2886f5569a5517ed74fbc23c8c7c5d73f8da02d4616470c518cd0182582";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/en-CA/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-CA/thunderbird-128.10.2esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "3d8b86bf5e774503a1d05ff94bd56d763c1c858b139f980faacfe23dff14f105";
+      sha256 = "02fab5f0f675326a8da132a5d1edf4676754739bcaac81202f00537a2586de40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/en-GB/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-GB/thunderbird-128.10.2esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "c6bcf2b3bbf223c3a5fb90889945fd7da17431b9f545ca65c48bc617b2b8febb";
+      sha256 = "a161eb8e8fc8fcf9c01d0df61c0b1e2942ba91c88e942b46b5b4ba6d5508fa94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/en-US/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-US/thunderbird-128.10.2esr.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "5eec0dd693b7fc90712c885bcad230eccd7f3450b46d87963b7782b07a79c02b";
+      sha256 = "d13d05ccdd81ce74acaabcafd930cc8ac401074d5076e566c52d713f78fbed84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/es-AR/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-AR/thunderbird-128.10.2esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "9d419222115f4a44d8043abc53c76e68c36971a3c9d81a668c716495446dd505";
+      sha256 = "81c96dcf22cb9f9a754cbe577476e2c3ad2a0c4b97362fa5a39ae9535b8a3fd8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/es-ES/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-ES/thunderbird-128.10.2esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "9ad29f1a7b2025fa00b2a16f4dbddd07a4c6c589e92be458215e909493d64d71";
+      sha256 = "fff28b92e2ef78ae96021fa11d9f64a83a511d03d48456c38e7e979c654f9f41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/es-MX/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-MX/thunderbird-128.10.2esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "8aed538779e334bedb084d8e23c76424f8c38c59f924fc616a216dff0f466572";
+      sha256 = "fee9e9ded630da598162cfe13b2e9ab8437bed55ebee916e93319a39ed39c0b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/et/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/et/thunderbird-128.10.2esr.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "d6fe82c59bbd7f22ff2e14459f5730d04a81bd066d04a35872223d598c46f8ef";
+      sha256 = "5e6b90bbbbe5b88db5475b506f44afef401b7d7abaea19f01d5bae69ccb2ea82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/eu/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/eu/thunderbird-128.10.2esr.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "2d46d7e535dfc8ca89cfec8e646e2ca1bd0ca67cfea4ed489ef50c7403e44cc8";
+      sha256 = "3904b86d5911e124671a36614d68801f0a702dd14c76deff1001084712d82ef2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/fi/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fi/thunderbird-128.10.2esr.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "6ffe726c6221ea49cf45f0eab6887a6c4c4ede2efaa8776ecf990c52f2dddd2b";
+      sha256 = "4d2637e90731ad0438c391c23a163557f7a8f392bec0fa777caa1864a566b296";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/fr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fr/thunderbird-128.10.2esr.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "7bbd0326d37d529631030fa8e9990ebaeec188014704dc3c2494514337cb5209";
+      sha256 = "3451a88c03c8609d0bba49403747adfdc104ade529a41aa0ea69c26d7d20e238";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/fy-NL/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fy-NL/thunderbird-128.10.2esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "63812daf0ef31b5906bc99e30369d268eb95e0c7c7e9754d4ff203106b891c9e";
+      sha256 = "04ef53f52451b1a9cb9cbf8d24e58c1eadad6e355fde1d40584ec35fd729f37e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ga-IE/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ga-IE/thunderbird-128.10.2esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "a8694a13da1a05930746ce240c88c8c4a015bf4d81a0e013f27a2b86426fb421";
+      sha256 = "065f54dfa31af305456d6adabe104aee8b36614b436e2f507304532f60282f4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/gd/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/gd/thunderbird-128.10.2esr.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "56dcd6b3d652508e3fa81b29171c7b108a878364e3e18d53d0d2a762ac0bfa71";
+      sha256 = "8f5be4d85b29a964492155b551c1a1d2d8aae519b9ec3ae6c4deea3ce6c3118b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/gl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/gl/thunderbird-128.10.2esr.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "e3bc784bc66dcabc874ef29ccc129c2b6ed658f8babb963207087a84b70341c1";
+      sha256 = "d8d436272b00d3bb417a2ed9557473a51bb7ad8cb124b6f3adcb48a044d20139";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/he/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/he/thunderbird-128.10.2esr.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "2423696c56c56210b8a0f3d29b8813317d5eaf8ceb366a02134f33454a8b77dc";
+      sha256 = "4e9d21a0300b3d5fc0c22b4578029f7891eb198d3899a41a97e43e31b5744456";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hr/thunderbird-128.10.2esr.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "56f8fd040b2ef3d116e3eed9e8a59d7831d11d366a398f2019486bddfc9a2798";
+      sha256 = "f9f471729cd9174292310370ee884dc64a3d3bb007c0a90c0e51a3da603e6441";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hsb/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hsb/thunderbird-128.10.2esr.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "2b3acab919c76d89a51601e6363697ab83c2c90c45c3b81b9da7c294907df776";
+      sha256 = "d919b79430d951386d9e340066f030c66574e4cc800e8986277849133c075630";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hu/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hu/thunderbird-128.10.2esr.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "6945c86d683259e113be15938749165ea388152550ca25c7757c7f0561365596";
+      sha256 = "b86531fad71c2b7287f9cf4eedee394bc8df4fa5fae69983b371449f7037f517";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/hy-AM/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hy-AM/thunderbird-128.10.2esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "535162246c252993dab09118458fe9100138cda68e0864d0f74b607517d67ed5";
+      sha256 = "a34d67d0feef03ca29c6e18361e2240016a8dab99d4088ceb1856def9c032103";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/id/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/id/thunderbird-128.10.2esr.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "60e05c5848428f87f5c2506fae299a1501482ff1d59e38bea37037f5352f048f";
+      sha256 = "dbf37b9933fad9455e4369315288bd0b27d5a35a3cd7f287064740516e7b0ffc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/is/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/is/thunderbird-128.10.2esr.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "5f71154d1a5c0fa2979b27dab349d0818ba47d4a98c1ff1dc8981542682dc46f";
+      sha256 = "18f2bc1194fb3bbddf369812c39820c9d2f18acd48bc8d9b0ff18b8607cbd3a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/it/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/it/thunderbird-128.10.2esr.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "9d53fcea9a6b7a530a418ed7dce16edf6e5e4380e24063a8596bfde39bfb1649";
+      sha256 = "502731138817eacd40b39c1bd4fa8bd99229322379a4f943889a98112686c56d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ja/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ja/thunderbird-128.10.2esr.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "a0b26ef38e894fab1e9ba61e8f91fb40fa8e7fe98e612541ce41c637a01cfff0";
+      sha256 = "5a25e8b6ca621834569535b112018f537713c6840bb790bfb9eef10f60ea1979";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ka/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ka/thunderbird-128.10.2esr.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "6a9a3b21ecb587ca7c551b266f85daaa8f67c9a4dc4d848e0797aa5d7345c5e9";
+      sha256 = "468da54c2eddac0b0b62284b6112e7ebad18f20ce94ee9ce7640501c7b4eefa3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/kab/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/kab/thunderbird-128.10.2esr.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "ca407f60e6c72ad586169b75c2423fd4494a514eae24d11e3dcc3c8ba0e20e13";
+      sha256 = "3a80a0d11535e220ffccbd4009d70919d0e51e243cea9838dee713e0c48622bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/kk/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/kk/thunderbird-128.10.2esr.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "43cb9688f7135044915b6b0d6f3d1d9ae72d99477a488b1d921e00f342e2277e";
+      sha256 = "27f24eebe0c8944a4378fa79b94934ab1d52151f33e17ddb79882efefdc2ecd4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ko/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ko/thunderbird-128.10.2esr.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "0d7ca9cda728fa9d1bbd7698ba02a209ed9e78ac077d1eedfbf979f00fb942e7";
+      sha256 = "1c5ece914d5c2fefad92b86826a51dfd14fc6b1dc10c98cc1e6111c75023369c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/lt/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/lt/thunderbird-128.10.2esr.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "327829ce42e78a417a84d285a356ed3ac7c8d09ca755da7f8473eb226cdc6162";
+      sha256 = "fde7c5990d66185b314d76ceb8c333ff64099ffc07e63a332c5fca6c00ba1f14";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/lv/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/lv/thunderbird-128.10.2esr.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "05674ac21a82566afafd3da5b15c5b59f18a24b198c4c9dd33af2f1ca28c3e8f";
+      sha256 = "37fe3860e71c18ca6ae3d2676a59551b730a4d8e4c86dfb54c45caa23092e996";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ms/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ms/thunderbird-128.10.2esr.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "ebbca65958ca8355066f9d57885140fedecf8d3a661b387016f3459e3d3c2f25";
+      sha256 = "acb16c973cbeb2df79ef47b81d8dcf34244fc47356a9de4f02056553bab176b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/nb-NO/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nb-NO/thunderbird-128.10.2esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "a6735c6517e0450f275f6efeed060d08e8dbbf0879e9158ad87f6e32eb31cd72";
+      sha256 = "cee8d13a7a5d740f7bd3816ced07f3c5b15f57890000786fa30971ca877852ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/nl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nl/thunderbird-128.10.2esr.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "1064929fae022194bdc0d413e2c61f92b019da274c30d355bd2f445bee0395ba";
+      sha256 = "8a357e8863854549e34f568bd3f13e8ea764469a42bbb4f77e3b34bdf30a27c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/nn-NO/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nn-NO/thunderbird-128.10.2esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b87d37697efd424b6e5eee73566bda7d90be61794f2db48b9ff37ae14e309c2c";
+      sha256 = "307b17af7bd1f49e4ca53a32515b37a25b5cf5c438ccf14340add0043eb7f090";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pa-IN/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pa-IN/thunderbird-128.10.2esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "851f84982228db5f2100d38cc641d1dbb676efcff5df120dfa7aa7b048ff78eb";
+      sha256 = "246c22a85f5774f6255bf18c893131abb4366631b0adf6c17ef0eb52a2d9fb67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pl/thunderbird-128.10.2esr.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "793a8f56f6a0ba9f9a848d1752d22cf7fffc45737ae37190467a9c3de3586b1e";
+      sha256 = "a77097830b70ad7359032ac1c665ccc8336fb1c73dc9edd515439c191508ac43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pt-BR/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pt-BR/thunderbird-128.10.2esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "149c387b3209434d17baee97c89527c3ee428f418ebc561c58f86d74cba297eb";
+      sha256 = "25683e5114e047bd971ee110fc2a2deca4eb05895585bee19d9febe6daedfec9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/pt-PT/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pt-PT/thunderbird-128.10.2esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "e525d2ef04133448f6dd261d87c7f53e528af1ccfe0b7367a643525efbb4f811";
+      sha256 = "314669c2e16bdcb921edf2c7d4a05bc1d3c079cab571913b229f8fbda6b9a0c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/rm/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/rm/thunderbird-128.10.2esr.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "e081b4ec691b8abdd1470a0ba7712f2cbb65aebcaadf1b3a6f52e2a7f3d2b6d2";
+      sha256 = "bddc21e319f78f91e10f9fb670103c62fddb7e342fc69cf6cd9ba1414f813dbe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ro/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ro/thunderbird-128.10.2esr.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "140d956ff1e311d39e7abe3b5e1ee4cfad4262f9bf649b0554f103596140a6b6";
+      sha256 = "fcefb28c153e60f93b64b31e3a5214b0e3feac182cb2c6abee9b81954a8e8f3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/ru/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ru/thunderbird-128.10.2esr.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "c4fcc311d93215086b0e2e920ae03b4f89fbc1ea2a624987989fbafb1a1db88c";
+      sha256 = "7fbf7fdaf651279f7da0ba0ace7c84b283851f1c66d28cc4e80ae995d13c950e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sk/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sk/thunderbird-128.10.2esr.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "ef2f660a4a60fdab36ffe91786bf11caebc2b1886eb6e075da3e03b89335579a";
+      sha256 = "bf1555bb22dd49e884801b7c2206d23511373fa1bb0b41b51c3def0b2fd61080";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sl/thunderbird-128.10.2esr.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "6be2fce1cc5b0c16b897b8d027c6492b49e34239b44765a14bc30bdd7bf49a40";
+      sha256 = "8d5c9a36f43f7b01f50dd331191851f84871369aae51ec2aa35cf1b3a6c5db2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sq/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sq/thunderbird-128.10.2esr.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "151a5223e5dbe923d93dcd9ac580c719ee0fa32b52afb3adfe1ba61f8aea7948";
+      sha256 = "ec2e4438939c531f0cb9a7259587c2b34741e35e1f048f8afc32da21702cf48d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sr/thunderbird-128.10.2esr.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "49e855e882a95a961d1bc28e71660e1c5fe60fd86ed3b24a07a56687607e28b9";
+      sha256 = "5b4497554d608437a8b30838a7fb69225c9ee278294ac0001ef81f423a89f749";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/sv-SE/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sv-SE/thunderbird-128.10.2esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "820a5c60c3b451b1f0771cd9fd65e21a5c47b9a3ecce96dbc6aea6814396884c";
+      sha256 = "52f0c7d3dcc0436f5b7e5ec1d6931c492d1d4ca22c1e0d8283953eedc953d075";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/th/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/th/thunderbird-128.10.2esr.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "0296358fe306d8b072a603c8fe8b1d63047b2c60dbb04437ea8608b32217bef7";
+      sha256 = "e0e2ab100b2377a4a36f6316bfd10b2b710192e6140473c5a7f632f25a826e75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/tr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/tr/thunderbird-128.10.2esr.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "1291db7b68decfa7fabf948f011c3d21882a1585eb8084560269f3e97e856306";
+      sha256 = "9d004357fd63aee822743c5b512b607a42a58ee602a6cb9b2d49649e21de62c8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/uk/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/uk/thunderbird-128.10.2esr.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "dd73ee6027c1d15c4231adc7eb1a7fb8cf2a482541e3bb53ad06d3027c59ff51";
+      sha256 = "17f199833b8a68334fecc3fe9e2bbe0640df1edcaa5b73099b9ac3450639e7ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/uz/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/uz/thunderbird-128.10.2esr.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "786cd211a5775d41df5c3a9afd454f7e0f4e2af3daa0b94f2d097fe9a9b50a7b";
+      sha256 = "b7110c93ec4a371751d59e4f53b70fa0b7ecb8ce37c39338f4290b67bfaf57bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/vi/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/vi/thunderbird-128.10.2esr.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "4b19b4ddc22173654c58f272a32deb17ee60ca3b57b83043ffb7d2697b5264e1";
+      sha256 = "a65d2d75efe893ff70fdf8066a2fc9c2e01335bf888018138f8ea3305023b988";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/zh-CN/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/zh-CN/thunderbird-128.10.2esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "4afe9daa8c5c45488385bbb25dc6653b4371d92c36878247f52c81eec5abbc0b";
+      sha256 = "67e5388a5104db522656a8a71ec981aa66738e224cae387ec20ea16907bb156c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-x86_64/zh-TW/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/zh-TW/thunderbird-128.10.2esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "b290660b0dbbb0b7a73ba02a0e63c9314a5e739bdde4af14fe2f22dff6848fd5";
+      sha256 = "d1c0f54b1ed4c774e448f639de527c3d8aad7ae4fc9a208831f9ed24c096aad6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/af/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/af/thunderbird-128.10.2esr.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "3120f8ac696695c340f7958bf34a08c459d9c058cc82e0042aa1470c75800a17";
+      sha256 = "554d279e12a5eb69026515927cec8d52f413ed135abdbdad4ce4c74beabc3ff8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ar/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ar/thunderbird-128.10.2esr.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "98298b3a274d6324845317b87eb16a3013c5f571bf4aa153f92519b808b1c9ab";
+      sha256 = "0368bdb472973f90852a3a1d48110a80a011e1a10aca7c79a69abf2f6450aa0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ast/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ast/thunderbird-128.10.2esr.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "cf570ea3dda592063a3ac3c94b0e19589957fb41e2d0d9876a911bfe0d093a5e";
+      sha256 = "84b219380fc971949ff5439c725c2e4c3f9fee45d3c21a89c5e1e792f16230ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/be/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/be/thunderbird-128.10.2esr.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "54f5cbe1eb765a1f3a5044b15995247d93af65d52d77575978a4266e8c92dfa1";
+      sha256 = "9517508abf59a3808a72a6cff8340fc0f6b513bc3e0a6c25f5a3161545df9831";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/bg/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/bg/thunderbird-128.10.2esr.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "e6ed815e487bbb3cbcda3521e7e5dc2155cda8c2403712d5312ea479ee910689";
+      sha256 = "1174c9d5e8e4eb15c3dc706573a26508e9166f569b524bb72a4722d3580622c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/br/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/br/thunderbird-128.10.2esr.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "f86cf16e950897632b5ee19069e0ea270a432dae64c6ee2808cad28dfc4c9891";
+      sha256 = "4fd4aeaf463cfe51edaccebfc5002ad2b0707d95c34a7507079c0a9c05e235ba";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ca/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ca/thunderbird-128.10.2esr.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "4f04ba3090f600e7634d88f29c8568eb8ccd20998cb8bd196eea3e1b14b2301f";
+      sha256 = "e5ea1ee6183f22afb5d82037c02f113780b934742b2bf34f45d6c933548166c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/cak/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cak/thunderbird-128.10.2esr.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "f0f6d125325922bb5bdd8c66b14d9fe879918798fdf156f0526e9825f37435e7";
+      sha256 = "03bc4a5836a1c53e63928aa353fd139131f563f0cac57fb756a90031635102d0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/cs/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cs/thunderbird-128.10.2esr.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "da7718c38abfb5c64c0f3f75cc4d4c3c5c510532f0a5e4ff4cba0f9bf6fce42d";
+      sha256 = "b0045dc51487acae65a19859eaf77da0d46bfb802fa47de8b9928a63cdc0b8b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/cy/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cy/thunderbird-128.10.2esr.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "830c07d56bd642c291f1c3deb7650c565e620a4d17c33f561fc20b8f6c5fba43";
+      sha256 = "24784b3d632cbd0406d3f49bd59b91bb58090437fd5df3a779a5408271ec4ef3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/da/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/da/thunderbird-128.10.2esr.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "93f7b3cf5ea839f120a20f9a8accbf801676a2644d6f9bb74c0854da8c1c8be2";
+      sha256 = "344b2f94ef3bf421de9a080e746cbcf0ecee452e087b0367fa154dd1fc739af1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/de/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/de/thunderbird-128.10.2esr.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "f224696b2b5b9a68d139d8262441cf03c166e9cc99d9bf9cbda526eb834bf467";
+      sha256 = "0417f7ecefaa36f4bd71649b763438337f622574717a5f14ed95f8ce3df89fa2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/dsb/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/dsb/thunderbird-128.10.2esr.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "6816f08e9f4df65be9606ed7e14b629f94023207d381636402473e91de632659";
+      sha256 = "04ebe59e2b011e6a730fcd1b69111afadc074ec50ea6e59618ba4a0d0a6f06fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/el/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/el/thunderbird-128.10.2esr.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "02150793596918b5080fccc8790ee28f1711ceb146d93cadc241dc870647f68e";
+      sha256 = "4dd04548a217bec07da4d895868abc120d88e302c019c685fbc1c36cd0d229f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/en-CA/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-CA/thunderbird-128.10.2esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "da1cb2b3f036c36eb54c599f198d6f6362b8f58979f637effd3468894820ce63";
+      sha256 = "d56e986ac4c5480816796e23f929eb5184bd901039e663f6e9bf901b489a9086";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/en-GB/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-GB/thunderbird-128.10.2esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "35155fc9cbaaa5cda207cfa2ee7919a7a74f63cef37ebd9d3f6aced65af61d9e";
+      sha256 = "d5ba719a84000c14daa25132d64fd321aea901ff9f9e939a94ef6a93bec4481c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/en-US/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-US/thunderbird-128.10.2esr.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "0b0041736a42409810dcfefaaa842058f2ca31adba240e63ea996e5a51d08aa3";
+      sha256 = "c6ce95eba101ee2551d79e59b677ad13628c97b7a3e601c99962fb6b385e9474";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/es-AR/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-AR/thunderbird-128.10.2esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "5941f02ecc5891569619d8d2f5aa05dc64ae4a26e53b335ca48ea0d208da6ae7";
+      sha256 = "2d91e16dfcc286be656201914aa62704161f491048ae892821f00d1ffd36ec0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/es-ES/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-ES/thunderbird-128.10.2esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "144a8bc1710bad7cab3c06e274ecd9fdef8029dcf0253368264eec9bea3c3101";
+      sha256 = "a7a839b57ce0879cfb33ee70b54bce0a3f9052b3b6a2a9b2268f01610fee01ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/es-MX/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-MX/thunderbird-128.10.2esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "df8768efbdfe3be8add56d2347428465bb1510cb98ecada28996c1a1f671ac02";
+      sha256 = "2dab61fe7ef7ac8b8614bf7111cc7a2dea4243ffa0dc37595f462d9b879bb4d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/et/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/et/thunderbird-128.10.2esr.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "8eb4caec1b71fc19061d4217f50e623bd10114e0ffeca84f2cb5d15f270a81b4";
+      sha256 = "538af624c7d96901899de0faed1091519f7ac5fad4f260ab40feee24689331d6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/eu/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/eu/thunderbird-128.10.2esr.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "c976f0c92887eeb78044f9aad071d9bf91abdb18152134c76c88d07f0eb352fb";
+      sha256 = "25eaa899a5f0e5e1787e856e3f7a7973d968db2bc6948445d058c4c7a43afe04";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/fi/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fi/thunderbird-128.10.2esr.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "781f489050cce136fd3f044c6f117825bd792a393798571a2286d2a428d10599";
+      sha256 = "393ee4e73b1a6906ab36191a387c657723795857df5ef5af3206f5bcaae8150b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/fr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fr/thunderbird-128.10.2esr.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "6669e5f865255ec0518980dae774acd169630e396e5473ea291d1dedcf872f99";
+      sha256 = "ca8a858a80e64f83a06a3900a6aa9dc445854fd6e78b7e8b9cd8ea0e161c547d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/fy-NL/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fy-NL/thunderbird-128.10.2esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "0c022a1c0b15f2cf33878aec58d96af20c0edea3ba219e1b1f6f4659607e8899";
+      sha256 = "c94884eaa33c589d51d3f50db142b6da46c721e9967f4f38c5e888c465e73d59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ga-IE/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ga-IE/thunderbird-128.10.2esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "5d254425d10ec0eb250368cc64415a08888e4d36fb5a96115daae20c5b568601";
+      sha256 = "1dff069ff686f802a9a4f994d951562b95672b7e622190f7ea68c72100260004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/gd/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/gd/thunderbird-128.10.2esr.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "d7f72b5564c7d6d3b0479494c5db39b43ba6c97ea891b4724a5ab879a7443673";
+      sha256 = "3ba96213640608e651a3399b11f549e937a8934942fc7b2ccb5211eaf308bb10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/gl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/gl/thunderbird-128.10.2esr.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "9962bdc0865fe15c128ec930e06eadbfa61eb3e922f3ff01e2d7ea4b1d263637";
+      sha256 = "be563f8931f6d4c2d2884954918695e45954a17cc1ed918632ae374f8a72e31c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/he/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/he/thunderbird-128.10.2esr.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "835ed155d2ee97845b8c53767875940713fd712657c9a1254671061026baf089";
+      sha256 = "0907587fbf48098d8893e584ee5b95084be62c2e9a201a2f76cffebdd184cd60";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hr/thunderbird-128.10.2esr.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "6381cd944832df7b023773c53ebf6170b1852b8723a43260ee2f1f87b97889d3";
+      sha256 = "3fbb591beb65c487e343fb8b95576df8a034ddf60c5e022c98e2bc51ceeeaefe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hsb/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hsb/thunderbird-128.10.2esr.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "b142d349ee7910d3932c266f0f8f19b90709c87938f7d0e254cfe5cbf5070d6d";
+      sha256 = "d36e0fc30948362447e15a3ddbe5b7753cbb4f6047aa50a605e31d0869541736";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hu/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hu/thunderbird-128.10.2esr.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "3520b52f83dc364e587f80e8074bc3814f5b4d7c0dbe0c6e8261f8e78b9983a9";
+      sha256 = "de307687acfd84ccfb2c4e07778a56738ca1d07a5d91099f1d6ee0c031c889fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/hy-AM/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hy-AM/thunderbird-128.10.2esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "1b58df19a19a955d52ea0b54944ce2a83d29a012eff58064eed0ca22ecd89343";
+      sha256 = "fd487b9bfc7e0a0be153cdec4d46a67a9fbfddd21746836d138f1c6170ecadce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/id/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/id/thunderbird-128.10.2esr.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "f4bada34a7953b14d7c59ec335541d75f3b5f749aaccf15f86e26e7b82ac4700";
+      sha256 = "28829aec9940b2cf497ccfbf00011cf05da3093b7fbf7733314b29b0c2370964";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/is/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/is/thunderbird-128.10.2esr.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "47a45bf4c9be0d8c7cffb386e507319e9cef741eedd8f94d21a46133e745a5d9";
+      sha256 = "df72777dc77c19b79d7f2c0575daea73ddcf797aff95ab89d8e284ca911c93f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/it/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/it/thunderbird-128.10.2esr.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "ed7ed6804e7b088699e40fb0afc2da260f4a6dd920d40fb7caae57a2823bea48";
+      sha256 = "f8afa4bdfba62e4827f5ad6542e96b77135191caca4604d719ca3518475ab7f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ja/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ja/thunderbird-128.10.2esr.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "e5f5677a0f10c281d04c32d17eb8c4cd7832bab665d4bd0b5bc4301b81fe86ac";
+      sha256 = "f76939f1ded154bbb0bde163529236ffae3a4d12b9fb2cd606334bc862506e8b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ka/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ka/thunderbird-128.10.2esr.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "96cde5975473758908acc179ff99f8b2309b8187a8f4e5a10361e27c27f8a28c";
+      sha256 = "89de590ac0b7d90557c3197d3a56d01553fd9611640ab18115d8c8e1d6a43eaa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/kab/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/kab/thunderbird-128.10.2esr.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "94f716b78c04609de727aa700019e6b22df2b3ee95597138d4c513891b930c68";
+      sha256 = "dee0d7fd820c95bf174ade270517cdef450fa849c467cce8564c966ece6f339b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/kk/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/kk/thunderbird-128.10.2esr.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "b33ce1636d5d4a550ee752430273bf29dca5cf51f5d8ea2c9295a53a6b774659";
+      sha256 = "e1478b260477e4d464ced10dabb22d1ed0750e3c6f43be1fb3ae61a1162a67a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ko/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ko/thunderbird-128.10.2esr.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "834e2fef5417538c9b1c04329ea95a51685ffe196e12c7b92b115f1d6ef89845";
+      sha256 = "56790b48cc32d739ca730288cdccce25f54424e21c91424eb8324943afae2aa4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/lt/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/lt/thunderbird-128.10.2esr.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "7a0f1cf847a088dbbe3a57a11e953530169974016321c0d8661872bee41b3568";
+      sha256 = "753c27fe095768054e25e1dce5d85e8242357ea859d79691ee8ac42adb2e147d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/lv/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/lv/thunderbird-128.10.2esr.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "2bec40989bf5a78a6635df103dba0d95b816a0baed1a52804cf144cfd1203a27";
+      sha256 = "c8451f012ebf33d1869397f00b200280ad86aa38d49e9d3c9a1125e4fcf755ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ms/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ms/thunderbird-128.10.2esr.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "aefd6fe512f45dde9d429ad69e776006e1be7266d140e6501414cf9610f71ec4";
+      sha256 = "9bc0113511a56339cf8e9e8fc1c35a685b0a5afa01c62a7db4449678a3b8dac7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/nb-NO/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nb-NO/thunderbird-128.10.2esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "dcc352bac76311990eecae929219a48647972837a0251b22ecd1bc282ad97721";
+      sha256 = "9f02a3feb0db4d1e79b3c347f022b97bde01f4005b02997170eaa2b429b5be4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/nl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nl/thunderbird-128.10.2esr.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "341b5d01749e8755820cc689b624b6d38520e80b79b644f529afd077d438c5a6";
+      sha256 = "ce88dedc9da2f2ab2851fddbd44c00cbe4fc74003f969f9613e691c9de5ccbc9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/nn-NO/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nn-NO/thunderbird-128.10.2esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "53b878080dce821a4b843e50ab4fe96517e1fe7cbf2a100746b6f94f2f73098d";
+      sha256 = "413cb0d84dbba0c3526f7c481fee6259cb8091bfd4f15d93aad0859b9efa5c30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pa-IN/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pa-IN/thunderbird-128.10.2esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "753e4cc0548e6c457ca15d85126ec98d9b01eb1656dcc08d6223812d60141925";
+      sha256 = "cd27f82b0c424271f72713280691a0822454cc34359102b3bb3746da4c0e12fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pl/thunderbird-128.10.2esr.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "9635b166c9b176b4afd64fe3595ab9f9597520549aaa04e467eb9b53b33398c4";
+      sha256 = "6319af7ae44e5c7c70447eaff2d08c40c94bd148b12ee503cb46ec60ed67ecec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pt-BR/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pt-BR/thunderbird-128.10.2esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "350b85a3392484604beb5bd7be1bdf9c451090bb769346605a922ae5cbceb8b1";
+      sha256 = "8c7795b78e5b33e796c62d3cf6b14923f800dff9780586cf5b5e09c4a08bd1b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/pt-PT/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pt-PT/thunderbird-128.10.2esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "e7d34eec2294663aa0393aa075a352ade8ea77a24853cf312c80a510229b0b7b";
+      sha256 = "537275194481b434b4da764f531982b3cddc65026772c6eca4bab7716324bcd7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/rm/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/rm/thunderbird-128.10.2esr.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "78cd5c7efb68b006ff90061a6daa81e49edeb010980d2759cc09d339b04e5158";
+      sha256 = "9184a43ea9278cd8e21a87a9e01e798a87fd4c5f16bb726dfddd388691381e02";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ro/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ro/thunderbird-128.10.2esr.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "4d4b27ed02fbc0c50cdb48ef1c4b31978365ad11067893d78c1c1602f6379da5";
+      sha256 = "872af950a18ad098b7451bb9a5e3db9e59ef4a4dc6397f745bc33498c65c0123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/ru/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ru/thunderbird-128.10.2esr.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "13db14980489b69efbf5958b0344591cc499c9cebd150b94acfbd52f7cc05fa1";
+      sha256 = "2fa2eed44bb13725e284f48e48a258d1c94cc703a1e828dd0dddb68ab71275cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sk/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sk/thunderbird-128.10.2esr.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "9569c6a344593ef330c0a474faee7481339ce5f47ec9e7a46d7676b736c3dc33";
+      sha256 = "2b42255b7b46701a3d36a63402aba2897d92feda5264b4b815054f51aabf1c26";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sl/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sl/thunderbird-128.10.2esr.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "0adf5e860d7c044c1044da715472b5e7524c34398ec376f68048c3e7e861835f";
+      sha256 = "5d624398004e5057e70f27032b65556617b5f523916d63dd06912d909d79570b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sq/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sq/thunderbird-128.10.2esr.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "f4b37f6f8f8522f06bd30444c73c08e57cf8618180768e1958aebb4a6c29dbc1";
+      sha256 = "d18adc705068b99e1a8db93fcf61354cf9d7e635242d040a6df999f75db47534";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sr/thunderbird-128.10.2esr.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "f1b6f5fa94ba80b3e0d14a53207e1ca70ffca67ee0305ee6c1b1f22c067d4135";
+      sha256 = "b88f6abf7f6b07221f218b1ec37598b9aa01dd9e2d0438f2de64ecb75a741aa4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/sv-SE/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sv-SE/thunderbird-128.10.2esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "4c8d109285e12ba5a3b7f3096337426874de46da653d21f87f794859c362a8d3";
+      sha256 = "54605b5dfdd075d90a47df2bf2b0de2e4d09efc69d94978e9602c703c11cee3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/th/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/th/thunderbird-128.10.2esr.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "b8ecad961311e092a46388db028ed794c2f9ce61bad661f371e7886c157ee41e";
+      sha256 = "bbfbb4c2054b83dcb5eb8d462b3e5f1a3484718107ab76209c10b38036b2fbb7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/tr/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/tr/thunderbird-128.10.2esr.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "bf5cc9251b3b6c7979aa4f14e4365ec9c04c737df943c03346563429fd8a0e00";
+      sha256 = "7e680d399821d1c598539f96e8620230fc3189f4db4e69726ac4f5290cac5847";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/uk/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/uk/thunderbird-128.10.2esr.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "aebf3219802af5e6e8697dc1c6a9bee89b0166627844ec45b11d469debac780b";
+      sha256 = "30ba8c50de9f3fadbbb6f2e8f266d23a4a2a3fa790017eca5a6cdd20ee0ab2cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/uz/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/uz/thunderbird-128.10.2esr.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "4da45bae60f6b5f2b129f5795f4b7128afd590eb7615d0c9e5e674513c32f49f";
+      sha256 = "6e58618fe41416118fa64b2ed39673c288ae201bc6d79b3babf91d92bc1ae52d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/vi/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/vi/thunderbird-128.10.2esr.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "1fe9e15fb4b825884e0b0a1daa1857ec387833694e180800cde206dda6d33f31";
+      sha256 = "278150ef1e4da83135d923bf6946e055429c1b868b6497e2883e73829420ec52";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/zh-CN/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/zh-CN/thunderbird-128.10.2esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "0146dfc5ee0b29a3c34d655c66451a3ee1887e71add898ef36b5dd415726d62e";
+      sha256 = "1aadf0d5c77ca3953c69a0ee83d50b5478d6ee0a104727808915daf6ef510e0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.1esr/linux-i686/zh-TW/thunderbird-128.10.1esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/zh-TW/thunderbird-128.10.2esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "af6b63b013ea7b518e2e950cf9a824d3cf451bd1fd9aaeca4f19ca8356bc67bd";
+      sha256 = "927a901e7cb354a70a019def25a083acd69d24ef818413baf0b40a37cd4e26ce";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/af/Thunderbird%20128.10.2esr.dmg";
+      locale = "af";
+      arch = "mac";
+      sha256 = "22ca7995531360cf6e04e7b2c3bfac9f3c3893d3a81babd97554d2a0dce08c4f";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ar/Thunderbird%20128.10.2esr.dmg";
+      locale = "ar";
+      arch = "mac";
+      sha256 = "415f3d70a41725d05501664af3fbe49baa22993b3c58b13b2a7753d9dedd581e";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ast/Thunderbird%20128.10.2esr.dmg";
+      locale = "ast";
+      arch = "mac";
+      sha256 = "ed97924c303731cc3f51b8a6eec6cc7fc301ca0343ddc0b2795090145742f1b9";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/be/Thunderbird%20128.10.2esr.dmg";
+      locale = "be";
+      arch = "mac";
+      sha256 = "233dbc1b8cc02a148dc8edb0af5c7330f032f926756a2fa724f70757a76d6d6b";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/bg/Thunderbird%20128.10.2esr.dmg";
+      locale = "bg";
+      arch = "mac";
+      sha256 = "92c6566551fca5783fcdff48c144884e3e11fc86df70e09255dda0d3ff55e4d2";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/br/Thunderbird%20128.10.2esr.dmg";
+      locale = "br";
+      arch = "mac";
+      sha256 = "8dff7c98c95a3d8c88e5c1a08ed1b186fc87814a611639174eb21264d551e1ab";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ca/Thunderbird%20128.10.2esr.dmg";
+      locale = "ca";
+      arch = "mac";
+      sha256 = "d259d8ba72b06118bb80d363a72419c11d4ba2fd598ecb263426a00ea9984f33";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cak/Thunderbird%20128.10.2esr.dmg";
+      locale = "cak";
+      arch = "mac";
+      sha256 = "5209334c9054da4367140e218596ab6cbcec6e6ef9845d2efad82bf34243fdf4";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cs/Thunderbird%20128.10.2esr.dmg";
+      locale = "cs";
+      arch = "mac";
+      sha256 = "3d8584c0fd7c98df5ea5e816b88d5a8d3e030ecf2d698733d973de1b93416582";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cy/Thunderbird%20128.10.2esr.dmg";
+      locale = "cy";
+      arch = "mac";
+      sha256 = "ffc4c090213902fbd1bf1bb0669cac59c2977db112fb2c6209c95b3826f23fd2";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/da/Thunderbird%20128.10.2esr.dmg";
+      locale = "da";
+      arch = "mac";
+      sha256 = "78333c27a23b07df19e3432dcc495d7b4e5213135d46de580a044e551ba24db5";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/de/Thunderbird%20128.10.2esr.dmg";
+      locale = "de";
+      arch = "mac";
+      sha256 = "cf64fb1dff251b9be08d2c292b3bbb5bf3bf21934d4fd36fb8e86cc1871ea2cf";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/dsb/Thunderbird%20128.10.2esr.dmg";
+      locale = "dsb";
+      arch = "mac";
+      sha256 = "aff968d157a7205389f190187e6f75037312eaf68388662159095d7e1f9edac3";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/el/Thunderbird%20128.10.2esr.dmg";
+      locale = "el";
+      arch = "mac";
+      sha256 = "3e4cafc655fdbc05875cc9bd228a1bcfb66c04c6f3c619f2019c16e21505e95d";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-CA/Thunderbird%20128.10.2esr.dmg";
+      locale = "en-CA";
+      arch = "mac";
+      sha256 = "fb0ca3007309d3185f88027ef1e15839b570c6e9560cc5bd2978035279908b0b";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-GB/Thunderbird%20128.10.2esr.dmg";
+      locale = "en-GB";
+      arch = "mac";
+      sha256 = "caa3e8b45758357221dab746f37b86bf619fac54eb8d5805a9f66569e2d04df8";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-US/Thunderbird%20128.10.2esr.dmg";
+      locale = "en-US";
+      arch = "mac";
+      sha256 = "ba9e09dd0def5c75735722243e4b8d7da5ba2b11dd3b8994d1d930c9c0add1e6";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-AR/Thunderbird%20128.10.2esr.dmg";
+      locale = "es-AR";
+      arch = "mac";
+      sha256 = "25c5aded50b3fb96260c475c552e7658425a5ca8c72a132a2ab1b125e40fe39f";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-ES/Thunderbird%20128.10.2esr.dmg";
+      locale = "es-ES";
+      arch = "mac";
+      sha256 = "c9bbc6a4426ade7e37c2bd3bfb4bfdb61ab4dd1de93f7a0431663496eacc0d6e";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-MX/Thunderbird%20128.10.2esr.dmg";
+      locale = "es-MX";
+      arch = "mac";
+      sha256 = "7348b0c7216b3291e4b38f28164377aae4c661c1ceb054a2d9230dd6588059f5";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/et/Thunderbird%20128.10.2esr.dmg";
+      locale = "et";
+      arch = "mac";
+      sha256 = "5dcaa2f42d9622ab70fefb8d0ad628b755db7089521760942fd2ce4ef657841f";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/eu/Thunderbird%20128.10.2esr.dmg";
+      locale = "eu";
+      arch = "mac";
+      sha256 = "a07eb1c197c794de75dd775e28de9d22c475bb9a307bf1907b3c79352dfe21d7";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fi/Thunderbird%20128.10.2esr.dmg";
+      locale = "fi";
+      arch = "mac";
+      sha256 = "432fed748bb7f6e6e208a5bb5df1473c02fa907c3b8e29ec533b5c941cbd4875";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fr/Thunderbird%20128.10.2esr.dmg";
+      locale = "fr";
+      arch = "mac";
+      sha256 = "85102f7fa7354b8ef9781818f7652bc44022a9f63a38ce9b9d19badf65b0c444";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fy-NL/Thunderbird%20128.10.2esr.dmg";
+      locale = "fy-NL";
+      arch = "mac";
+      sha256 = "0964debe3d588a2225e71d5ad80dc0eb1feb1ef36e62c90bad2bb130b98c1b8e";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ga-IE/Thunderbird%20128.10.2esr.dmg";
+      locale = "ga-IE";
+      arch = "mac";
+      sha256 = "e10a02e2fcd554e0c909ca742123fa643533cd4e9e39a346321a1d7dabb85fd4";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/gd/Thunderbird%20128.10.2esr.dmg";
+      locale = "gd";
+      arch = "mac";
+      sha256 = "9c5717d49db87fe568bf886768b87609fd3e5a10715d4eb62959e096d7af254c";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/gl/Thunderbird%20128.10.2esr.dmg";
+      locale = "gl";
+      arch = "mac";
+      sha256 = "c7b0811dd4fab566df241e36f66db7e102b8f890a052fa9bd200fa98a9213f11";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/he/Thunderbird%20128.10.2esr.dmg";
+      locale = "he";
+      arch = "mac";
+      sha256 = "6aee90447ba014314aa57329b4276e9a72212283d1ef940c5107b81e167eede4";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hr/Thunderbird%20128.10.2esr.dmg";
+      locale = "hr";
+      arch = "mac";
+      sha256 = "1b4a9f58301104832d2aed47e18e55a76f98be0de0c410586a3314bce0b264d7";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hsb/Thunderbird%20128.10.2esr.dmg";
+      locale = "hsb";
+      arch = "mac";
+      sha256 = "a16ee92d77c6fc479b90eb1e72ee545389c0fb811384f772f50a5e3ca25cdf0a";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hu/Thunderbird%20128.10.2esr.dmg";
+      locale = "hu";
+      arch = "mac";
+      sha256 = "fd406f8f4ca98767e8bbecd8240a9e426f08499ae22c1d144279d6f8685f9b32";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hy-AM/Thunderbird%20128.10.2esr.dmg";
+      locale = "hy-AM";
+      arch = "mac";
+      sha256 = "64f481062e8b9706dbd59432f33a288451eb3e7366ee261f750eaf710c142694";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/id/Thunderbird%20128.10.2esr.dmg";
+      locale = "id";
+      arch = "mac";
+      sha256 = "f567578b4de2d52d589b5be3bb00935f2bdf7b5b9aedbf527c5c3549976e1b66";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/is/Thunderbird%20128.10.2esr.dmg";
+      locale = "is";
+      arch = "mac";
+      sha256 = "d3fdf81c1679d7ca1dd3ad0b436238d74074142c02fd3998621de287273a27ce";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/it/Thunderbird%20128.10.2esr.dmg";
+      locale = "it";
+      arch = "mac";
+      sha256 = "e75713c79859185182a47d599881af6d5612259c0023bb48fdff6ed0e05d3bcc";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ja-JP-mac/Thunderbird%20128.10.2esr.dmg";
+      locale = "ja-JP-mac";
+      arch = "mac";
+      sha256 = "265eaf1f69d69baad642450e9e10855d23713533c61dc4a8122aa4d1f82b886e";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ka/Thunderbird%20128.10.2esr.dmg";
+      locale = "ka";
+      arch = "mac";
+      sha256 = "43fa6cbdd7003ca5c553fa719ef997a55d030bef4477fa6e070be8ea5ab7c34c";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/kab/Thunderbird%20128.10.2esr.dmg";
+      locale = "kab";
+      arch = "mac";
+      sha256 = "bbef2ca1a0b93856a5804f493f99e9cdb48d997951c7a26ea8d9653d1a137caa";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/kk/Thunderbird%20128.10.2esr.dmg";
+      locale = "kk";
+      arch = "mac";
+      sha256 = "029111db6f6e2a4743203a199642d79b2bf53821b80cba64536f0d3b7b69252d";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ko/Thunderbird%20128.10.2esr.dmg";
+      locale = "ko";
+      arch = "mac";
+      sha256 = "4928a32a552ed8cc06290688bd408e8210d624576bee90a0f815803807923dcd";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/lt/Thunderbird%20128.10.2esr.dmg";
+      locale = "lt";
+      arch = "mac";
+      sha256 = "c25faed290d8854a541f045847b6bd1c84566e83a8dc3e8c58fec37e227fd8df";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/lv/Thunderbird%20128.10.2esr.dmg";
+      locale = "lv";
+      arch = "mac";
+      sha256 = "2a6a0ca0d81aad713836bc869835912fc15fc48d39710e6d183957c4ff1a3cb1";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ms/Thunderbird%20128.10.2esr.dmg";
+      locale = "ms";
+      arch = "mac";
+      sha256 = "2de77b4ed730b3a4e45e46e8a32b21d8324a7eb65aff02c80c00d56c204b5dca";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nb-NO/Thunderbird%20128.10.2esr.dmg";
+      locale = "nb-NO";
+      arch = "mac";
+      sha256 = "ad9c66bc8743fd389d8ee8267f77a5ef2490ec5ccf8ec779d3476286771a6ab3";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nl/Thunderbird%20128.10.2esr.dmg";
+      locale = "nl";
+      arch = "mac";
+      sha256 = "f4de8cb671f64ecb48824c47f289be3913939f9b9983be396a85445be1dbd3b7";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nn-NO/Thunderbird%20128.10.2esr.dmg";
+      locale = "nn-NO";
+      arch = "mac";
+      sha256 = "331290030cfd61b5e2989f53a05772f1a240a4ee3940371ebabb95ced714f105";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pa-IN/Thunderbird%20128.10.2esr.dmg";
+      locale = "pa-IN";
+      arch = "mac";
+      sha256 = "a461a8fff8c71a3a2b1b4515c56f478500cbfc14c658a22605393e7e84b122b0";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pl/Thunderbird%20128.10.2esr.dmg";
+      locale = "pl";
+      arch = "mac";
+      sha256 = "89c236463e94ef52dabef54509ff06fd65d428840673b27d50aa9e942654f819";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pt-BR/Thunderbird%20128.10.2esr.dmg";
+      locale = "pt-BR";
+      arch = "mac";
+      sha256 = "d4e7bd32a5631194269fd4bec820f1ada537b4ac9b52a0d591924c18ea56e39d";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pt-PT/Thunderbird%20128.10.2esr.dmg";
+      locale = "pt-PT";
+      arch = "mac";
+      sha256 = "8b70f7d6d1e42ccb19cf444177feb5076179db00be8edae67228b50b9fe25ed2";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/rm/Thunderbird%20128.10.2esr.dmg";
+      locale = "rm";
+      arch = "mac";
+      sha256 = "cd6a878f277c14c8676a924457f9ec34fb8814424bc07ba315ac0da61cffdf75";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ro/Thunderbird%20128.10.2esr.dmg";
+      locale = "ro";
+      arch = "mac";
+      sha256 = "a9d7c416d1c5088e30c3e29fcdddeeb649853527f29f02c93640d69225904b25";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ru/Thunderbird%20128.10.2esr.dmg";
+      locale = "ru";
+      arch = "mac";
+      sha256 = "db02e46e3e43e48993fc83b325510ddcd06a24f0eccf854ccd58dd2543ab54a9";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sk/Thunderbird%20128.10.2esr.dmg";
+      locale = "sk";
+      arch = "mac";
+      sha256 = "efb821a174b4d6fe67b47bf27fa08fb2a8a73e4de91d1c711fad1cb9daedfefd";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sl/Thunderbird%20128.10.2esr.dmg";
+      locale = "sl";
+      arch = "mac";
+      sha256 = "0cb4bd37456a94e86080e30273e4adc3b99d0a99ab48e9cc21dc418dbe586c26";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sq/Thunderbird%20128.10.2esr.dmg";
+      locale = "sq";
+      arch = "mac";
+      sha256 = "4c6b8553cebe0aa7ad69cefe62dad07a41903a538fd0dfaabe8fefe683e0784c";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sr/Thunderbird%20128.10.2esr.dmg";
+      locale = "sr";
+      arch = "mac";
+      sha256 = "c8da386ae81e591dcc21cbcb7e551213e0b708d9e2afdfdd37de748924dcb738";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sv-SE/Thunderbird%20128.10.2esr.dmg";
+      locale = "sv-SE";
+      arch = "mac";
+      sha256 = "2be8d7b3b3ea9e01f58e51c6fe57ee9d03e808af76f6ddd2245dc8ab168732da";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/th/Thunderbird%20128.10.2esr.dmg";
+      locale = "th";
+      arch = "mac";
+      sha256 = "c5d80526f220ddd839c99520c71998e7bcdf7a895420e9b620ce8c2ea35167f0";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/tr/Thunderbird%20128.10.2esr.dmg";
+      locale = "tr";
+      arch = "mac";
+      sha256 = "e7fa77ee37073102a567de924ca861eaf85ca0acc07ca30dc206fd84c206f9bd";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/uk/Thunderbird%20128.10.2esr.dmg";
+      locale = "uk";
+      arch = "mac";
+      sha256 = "bae90b1cea274b5a82d65e136106bb862790811801d9a79638f45bdf60d01836";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/uz/Thunderbird%20128.10.2esr.dmg";
+      locale = "uz";
+      arch = "mac";
+      sha256 = "9c2ce9163edc102c8a024418d8e173619c345ea8c293a3c6fe3e9d88cc75717a";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/vi/Thunderbird%20128.10.2esr.dmg";
+      locale = "vi";
+      arch = "mac";
+      sha256 = "7ed5db39e6cd01d14bcac8b19f57f35e13dc6f18bf2be0544b397b06ca919677";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/zh-CN/Thunderbird%20128.10.2esr.dmg";
+      locale = "zh-CN";
+      arch = "mac";
+      sha256 = "257172a2f75feeae7d182c1104b8cc7638121f2cb5f4115566398555d69f90ce";
+    }
+    {
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/zh-TW/Thunderbird%20128.10.2esr.dmg";
+      locale = "zh-TW";
+      arch = "mac";
+      sha256 = "7e06ef23770ce86947bb0953c2594ae0ef2ab517a9ba44534c05507fb3081007";
     }
   ];
 }

From 2bfe49e3973641f38e0b6f8a8b37f17f4d3a3dee Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 24 May 2025 01:56:34 +0200
Subject: [PATCH 050/204] home-assistant: 2025.5.2 -> 2025.5.3

https://github.com/home-assistant/core/releases/tag/2025.5.3
---
 .../home-assistant/component-packages.nix     | 15 +++++++++++-
 pkgs/servers/home-assistant/default.nix       | 23 +++++++++++++------
 pkgs/servers/home-assistant/tests.nix         | 10 +++++---
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b58753f2464e..24a0bc183ba3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.5.2";
+  version = "2025.5.3";
   components = {
     "3_day_blinds" =
       ps: with ps; [
@@ -4087,7 +4087,19 @@
       ];
     "onedrive" =
       ps: with ps; [
+        aiohasupervisor
+        cronsim
+        ha-ffmpeg
+        hass-nabucasa
+        hassil
+        home-assistant-intents
+        mutagen
         onedrive-personal-sdk
+        pymicro-vad
+        pyspeex-noise
+        python-matter-server
+        pyturbojpeg
+        securetar
       ];
     "onewire" =
       ps: with ps; [
@@ -6899,6 +6911,7 @@
     "elgato"
     "elkm1"
     "elmax"
+    "elvia"
     "emoncms"
     "emonitor"
     "emulated_hue"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 37069221a449..002257de09c3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -163,12 +163,12 @@ let
         };
       });
 
-      openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec {
-        version = "2.2";
+      mcp = super.mcp.overridePythonAttrs (oldAttrs: rec {
+        version = "1.5.0";
         src = fetchFromGitHub {
           inherit (oldAttrs.src) owner repo;
-          rev = "refs/tags/${version}";
-          hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw=";
+          tag = "v${version}";
+          hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o=";
         };
       });
 
@@ -194,6 +194,15 @@ let
         doCheck = false; # no tests
       });
 
+      openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec {
+        version = "2.2";
+        src = fetchFromGitHub {
+          inherit (oldAttrs.src) owner repo;
+          rev = "refs/tags/${version}";
+          hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw=";
+        };
+      });
+
       plexapi = super.plexapi.overrideAttrs (oldAttrs: rec {
         version = "4.15.16";
         src = fetchFromGitHub {
@@ -377,7 +386,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.5.2";
+  hassVersion = "2025.5.3";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -398,13 +407,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-el5s82R4MuTjUnMVXRQj4PhPxJxHoL6Jqvc6XRnJl8w=";
+    hash = "sha256-qqPO7dr+Sb1RKYoOV7MhT2E1FcW7lAKTTB0T+UzLwzk=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-lddnAM3fja9enPYRSonwSe1aG8t55jSJQNveWPwrhOE=";
+    hash = "sha256-8WusUfZEyoBPltVrDpDQVkbIFEHn1GGdA4Pt0Zb1+Fo=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 303aff68c116..a2bb4400aa68 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -63,6 +63,10 @@ let
   };
 
   extraDisabledTests = {
+    forecast_solar = [
+      # language fixture mismatch
+      "test_enabling_disable_by_default"
+    ];
     sensor = [
       # Failed: Translation not found for sensor
       "test_validate_unit_change_convertible"
@@ -78,9 +82,9 @@ let
       # tries to retrieve file from github
       "test_non_text_stdout_capture"
     ];
-    stream = [
-      # crashes with x265>=4.0
-      "test_h265_video_is_hvc1"
+    smartthings = [
+      # outdated snapshots
+      "test_all_entities"
     ];
     websocket_api = [
       # AssertionError: assert 'unknown_error' == 'template_error'

From 5ac5726b8034c59c763308718645875fdaf0972a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 01:39:03 +0000
Subject: [PATCH 051/204] morgen: 3.6.13 -> 3.6.14

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

diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix
index fff6c79404f1..19753dd8bf84 100644
--- a/pkgs/by-name/mo/morgen/package.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "3.6.13";
+  version = "3.6.14";
 
   src = fetchurl {
     name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-a7IkEHRAwa7SnsPcK6psho6E+o1aOlQPPFHaDPrrXxw=";
+    hash = "sha256-ouSXOOTf+7FxSj8iyYyGN2WnsZ5EtvbW/XECfBA4UVc=";
   };
 
   nativeBuildInputs = [

From babb4f7fe7d809138126470eef373c23004752d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 24 May 2025 04:38:57 +0200
Subject: [PATCH 052/204] python313Packages.homeassistant-stubs: 2025.5.2 ->
 2025.5.3

https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.5.3
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 3882398665d1..7aae398e2d13 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.5.2";
+  version = "2025.5.3";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-jvXsGWVXviwC2KjMuRPdLy2uY5fkqsMALG1RZ3XvzvU=";
+    hash = "sha256-9RL6p68L3lvH5h/kBekiu1pqJ1mXEUB6nmp+qe0sAsg=";
   };
 
   build-system = [

From f3d50d54764475ce675ffb9291365c4a732089ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 23 May 2025 22:16:17 -0700
Subject: [PATCH 053/204] 
 home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.245 ->
 0.13.246

Diff: https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/compare/refs/tags/0.13.245...refs/tags/0.13.246

Changelog: https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.246/CHANGELOG.md
---
 .../home-assistant/pytest-homeassistant-custom-component.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 13d0d1e5df06..77e202cccae4 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.245";
+  version = "0.13.246";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     rev = "refs/tags/${version}";
-    hash = "sha256-l/NStiw2tajXydNv9EDqRZ1ku2CeRdDOsHDFIEA9vdM=";
+    hash = "sha256-FTEDKnVVr6rNvUoSxOkyZrDfNYIUQGKmFt6eNKHI8FM=";
   };
 
   build-system = [ setuptools ];

From 729ef65de7009d2f9f5ad342ec8a93ce3f0d667f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 06:06:14 +0000
Subject: [PATCH 054/204] gensio: 2.8.14 -> 2.8.15

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

diff --git a/pkgs/by-name/ge/gensio/package.nix b/pkgs/by-name/ge/gensio/package.nix
index e22de3e9956b..587fe5eb0ac0 100644
--- a/pkgs/by-name/ge/gensio/package.nix
+++ b/pkgs/by-name/ge/gensio/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gensio";
-  version = "2.8.14";
+  version = "2.8.15";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vxa1r0vloiqMrGhXriIbBfJC6wmm54YWg0nCnB8MDG0=";
+    sha256 = "sha256-EDa95r8x5yIXibJigJXR3PCYTTvJlqB6XBN1RZHq6KM=";
   };
 
   passthru = {

From dd0483dd6db54e60ba6798a469bf7c4125e18374 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 24 May 2025 15:41:27 +0800
Subject: [PATCH 055/204] alist: 3.44.0 -> 3.45.0

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

diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 77805b365d33..d9232e75c2a9 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -11,14 +11,14 @@
 }:
 buildGoModule rec {
   pname = "alist";
-  version = "3.44.0";
-  webVersion = "3.44.0";
+  version = "3.45.0";
+  webVersion = "3.45.0";
 
   src = fetchFromGitHub {
     owner = "AlistGo";
     repo = "alist";
     tag = "v${version}";
-    hash = "sha256-zaIS2DYB7x76SCHCX9aJ0/8Lejwy3/AlLbnztSNJtSc=";
+    hash = "sha256-h8oWeTX3z3xye5O4+s7LA7Wm36JOrsU+UdKGZXaDKXk=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -32,11 +32,11 @@ buildGoModule rec {
   };
   web = fetchzip {
     url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
-    hash = "sha256-YPqbEPpwRVTWwH/LOq7cGsYju6YqdFCOseD52OsnkSk=";
+    hash = "sha256-rNVa+dr/SX2aYHBzeV8QdD5XYCFyelhbqkTpvhF+S2g=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-eBIlBtO+AlW2TE4xgxktePb2bm1lIYiuZ4+AUd1bdW8=";
+  vendorHash = "sha256-IMoLVAgOaVM1xIFDe8BGOpzyBnDMfD9Q6VogFfOWFzU=";
 
   buildInputs = [ fuse ];
 

From afda1127d595e6c76859e6ecb3b56ec5a6765c49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 07:53:35 +0000
Subject: [PATCH 056/204] gradle: 8.14 -> 8.14.1

---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 7e2c0bd43cde..fa48f16d9972 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -225,8 +225,8 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_8 = gen {
-    version = "8.14";
-    hash = "sha256-Ya0xDTx9Pl2hMbdrvyK1pMB4bp2JLa6MFljUtITePKo=";
+    version = "8.14.1";
+    hash = "sha256-hFlSqdavp4PbcLs7Dv+q5FrlVCyiu3kpYZ6K9Jy2NM8=";
     defaultJava = jdk21;
   };
 

From a19f555474d399e0f0fe951adbfba3237a339803 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 24 May 2025 14:23:57 +0200
Subject: [PATCH 057/204] pixelorama: Unpin godot version

Godot was pinned to 4.3, I am not sure why.
At the same time, Pixelorama clearly uses methods that were introduced
in 4.4.

Unpin the godot version to use 4.*.
---
 pkgs/by-name/pi/pixelorama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix
index 2d4553403e37..11c4fcee66e7 100644
--- a/pkgs/by-name/pi/pixelorama/package.nix
+++ b/pkgs/by-name/pi/pixelorama/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  godot_4_3,
+  godot_4,
   nix-update-script,
 }:
 
@@ -16,7 +16,7 @@ let
     presets.${stdenv.hostPlatform.system}
       or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  godot = godot_4_3;
+  godot = godot_4;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pixelorama";

From 5a749d80df533b7674ac8055be850e8d68a48373 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 14:34:12 +0200
Subject: [PATCH 058/204] cubeb: add update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 434945d371b5..00f9fb041966 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  unstableGitUpdater,
   cmake,
   pkg-config,
   alsa-lib,
@@ -60,6 +61,7 @@ stdenv.mkDerivation {
   passthru = {
     # For downstream users when lazyLoad is true
     backendLibs = lib.optionals lazyLoad backendLibs;
+    updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };
 
   postInstall = ''

From f604499d5491b8a84f330eb36befd4805d417a78 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 14:50:33 +0200
Subject: [PATCH 059/204] cubeb: unstable-2022-10-18 -> 0-unstable-2025-04-02

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 00f9fb041966..f7fbe0c796f3 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "cubeb";
-  version = "unstable-2022-10-18";
+  version = "0-unstable-2025-04-02";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "27d2a102b0b75d9e49d43bc1ea516233fb87d778";
-    hash = "sha256-q+uz1dGU4LdlPogL1nwCR/KuOX4Oy3HhMdA6aJylBRk=";
+    rev = "975a727e5e308a04cfb9ecdf7ddaf1150ea3f733";
+    hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo=";
   };
 
   nativeBuildInputs = [

From d3f538587bdcd76efd9c13640aa3d80b0111b59a Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 24 May 2025 14:56:02 +0200
Subject: [PATCH 060/204] tremor-language-server: 0.12.4 -> 0.13.0-rc.11

---
 pkgs/tools/misc/tremor-rs/ls.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix
index 88f0db427d56..d53b9a85eec1 100644
--- a/pkgs/tools/misc/tremor-rs/ls.nix
+++ b/pkgs/tools/misc/tremor-rs/ls.nix
@@ -3,22 +3,23 @@
   rustPlatform,
   fetchFromGitHub,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "tremor-language-server";
-  version = "0.12.4";
+  version = "0.13.0-rc.11";
 
   src = fetchFromGitHub {
     owner = "tremor-rs";
     repo = "tremor-language-server";
     rev = "v${version}";
-    sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA=";
+    sha256 = "sha256-gooHNSBEcqyTMOSBG7T01kSdCWKK98dbE8+nuwvQkS0=";
   };
 
-  nativeBuildInputs = [ rustPlatform.bindgenHook ];
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+  ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Hl0TY/xZaDybYjrGiRftZhFx8dns+ONuNcxzl8lBUMM=";
+  cargoHash = "sha256-tMs5DRuWuMXIpj5YU4bR4mAlzv7nWycmzDOqMuihj7M=";
 
   meta = with lib; {
     description = "Tremor Language Server (Trill)";

From 66654e9fc97ce272979d7f5796df53b6497f2d69 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Sat, 24 May 2025 15:03:51 +0200
Subject: [PATCH 061/204] nodePackages.prettier: Add version test

Should avoid issues like
<https://github.com/NixOS/nixpkgs/pull/362151#issuecomment-2896354830>.
---
 pkgs/development/node-packages/overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 6609200b9aef..70cc6a000113 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -231,6 +231,12 @@ final: prev: {
     };
   };
 
+  prettier = prev.prettier.override {
+    passthru.tests.version = pkgs.testers.testVersion {
+      package = final.prettier;
+    };
+  };
+
   wavedrom-cli = prev.wavedrom-cli.override {
     nativeBuildInputs = [
       pkgs.pkg-config

From 961f336e8cc6c37f79ca65f26ca375c0ceca45e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 13:33:04 +0000
Subject: [PATCH 062/204] exaile: 4.1.3 -> 4.1.4

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

diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index 2c6178c8fc0c..e9810139b3c0 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exaile";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "exaile";
     repo = "exaile";
     rev = version;
-    sha256 = "sha256-9SK0nvGdz2j6qp1JTmSuLezxX/kB93CZReSfAnfKZzg=";
+    sha256 = "sha256-iyK2txutlWe67CyfKuyesBrYQypkS5FOf1ZWUkRCq24=";
   };
 
   nativeBuildInputs =

From 9007ca07f5ceace0b1567b691edd29ab01518285 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 21:20:27 +0800
Subject: [PATCH 063/204] xfce.xfce4-timer-plugin: 1.7.3 -> 1.8.0

https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/compare/xfce4-timer-plugin-1.7.3...xfce4-timer-plugin-1.8.0
---
 .../xfce4-timer-plugin/default.nix            | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
index fd379a3e2d9d..8d8f64079a5a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
@@ -3,31 +3,32 @@
   stdenv,
   fetchurl,
   gettext,
+  meson,
+  ninja,
   pkg-config,
   libxfce4util,
   xfce4-panel,
   libxfce4ui,
   glib,
   gtk3,
-  hicolor-icon-theme,
   gitUpdater,
 }:
 
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-timer-plugin";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-rPTIYa+IYIuegCp2pLBYRr0wGJ4AhegmaAzBebbfTNM=";
+    url = "mirror://xfce/src/panel-plugins/xfce4-timer-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-timer-plugin-${finalAttrs.version}.tar.xz";
+    hash = "sha256-HTrDqixDRUAMAlZCd452Q6q0EEdiK6+c3AC7rHjon5k=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     gettext
+    meson
+    ninja
     pkg-config
   ];
 
@@ -37,21 +38,18 @@ stdenv.mkDerivation rec {
     xfce4-panel
     glib
     gtk3
-    hicolor-icon-theme
   ];
 
-  hardeningDisable = [ "format" ];
-
   passthru.updateScript = gitUpdater {
-    url = "https://gitlab.xfce.org/panel-plugins/${pname}";
-    rev-prefix = "${pname}-";
+    url = "https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin";
+    rev-prefix = "xfce4-timer-plugin-";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin";
     description = "Simple countdown and alarm plugin for the Xfce panel";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    teams = [ teams.xfce ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
   };
-}
+})

From b9ad8620b1b87e8356a527c8eba61e097b0f5db8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 21:25:48 +0800
Subject: [PATCH 064/204] xfce.xfce4-verve-plugin: 2.0.4 -> 2.1.0

https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/compare/xfce4-verve-plugin-2.0.4...xfce4-verve-plugin-2.1.0
---
 .../xfce4-verve-plugin/default.nix            | 42 +++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
index e14c710b2edc..eb046b9fd660 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
@@ -1,19 +1,40 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
   glib,
   gtk3,
   libxfce4ui,
   libxfce4util,
   pcre2,
   xfce4-panel,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "panel-plugins";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-verve-plugin";
-  version = "2.0.4";
-  sha256 = "sha256-j0uKYj9PeLEVaocHRw87Dz+YFqDr1BImejEpDPYObQg=";
+  version = "2.1.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-verve-plugin";
+    tag = "xfce4-verve-plugin-${finalAttrs.version}";
+    hash = "sha256-mxSjYBeBc2HjdTFVdZSVdspAQTEyS+uQA6K17lJoLlc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     glib
@@ -24,8 +45,13 @@ mkXfceDerivation {
     xfce4-panel
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-verve-plugin-"; };
+
+  meta = {
     description = "Command-line plugin";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From e68f1b45d4d241adc798535a232c4a455fc8baa2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 21:34:31 +0800
Subject: [PATCH 065/204] xfce.xfce4-weather-plugin: 0.11.3 -> 0.12.0

https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/compare/xfce4-weather-plugin-0.11.3...xfce4-weather-plugin-0.12.0
---
 .../xfce4-weather-plugin/default.nix          | 51 ++++++++-----------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
index 5c1e2de1533c..78fbe1ed57fc 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
@@ -4,8 +4,9 @@
   fetchurl,
   fetchpatch,
   gettext,
+  meson,
+  ninja,
   pkg-config,
-  xfce4-dev-tools,
   glib,
   gtk3,
   json_c,
@@ -19,36 +20,32 @@
   gitUpdater,
 }:
 
-let
-  category = "panel-plugins";
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-weather-plugin";
-  version = "0.11.3";
+  version = "0.12.0";
 
   src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc=";
+    url = "mirror://xfce/src/panel-plugins/xfce4-weather-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-weather-plugin-${finalAttrs.version}.tar.xz";
+    hash = "sha256-XdkLAywG70tkuBgCMVTvlGOixpSgKQ5X80EilsdUX/Y=";
   };
 
   patches = [
-    # Port to libsoup-3.0
-    # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/28
+    # meson-build: Add missing HAVE_UPOWER_GLIB definition
+    # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/37
     (fetchpatch {
-      url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/c0653a903c6f2cecdf41ac9eaeba4f4617656ffe.patch";
-      hash = "sha256-wAowm4ppBSKvYwOowZbbs5pnTh9EQ9XX05lA81wtsRM=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/279c975dc1f95bd1ce9152eee1d19122e7deb9a8.patch";
-      hash = "sha256-gVfyXkE0bjBfvcQU9fDp+Gm59bD3VbAam04Jak8i31k=";
+      url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/1d8e5e5dbbc4d53e4b810f9b01a460197cd47b64.patch";
+      hash = "sha256-g9AIp1iBcA3AxD1tpnv32PvxxulXYjFvQh3EqD1gmHg=";
     })
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     gettext
+    glib # glib-compile-resources
+    meson
+    ninja
     pkg-config
-    xfce4-dev-tools
   ];
 
   buildInputs = [
@@ -64,20 +61,16 @@ stdenv.mkDerivation rec {
     xfconf
   ];
 
-  configureFlags = [ "--enable-maintainer-mode" ];
-
-  enableParallelBuilding = true;
-
   passthru.updateScript = gitUpdater {
-    url = "https://gitlab.xfce.org/panel-plugins/${pname}";
-    rev-prefix = "${pname}-";
+    url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin";
+    rev-prefix = "xfce4-weather-plugin-";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin";
     description = "Weather plugin for the Xfce desktop environment";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    teams = [ teams.xfce ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.xfce ];
   };
-}
+})

From 09540994a0bb30cdad850cde92f40896d06da969 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 21:39:14 +0800
Subject: [PATCH 066/204] xfce.xfce4-whiskermenu-plugin: 2.9.2 -> 2.10.0

https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/compare/v2.9.2...xfce4-whiskermenu-plugin-2.10.0
---
 .../xfce4-whiskermenu-plugin/default.nix      | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index 7491f8cf28e3..ca30bb25da43 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -1,11 +1,15 @@
 {
-  mkXfceDerivation,
+  stdenv,
   lib,
-  cmake,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
   accountsservice,
   exo,
   garcon,
-  gettext,
   glib,
   gtk-layer-shell,
   gtk3,
@@ -13,25 +17,35 @@
   libxfce4util,
   xfce4-panel,
   xfconf,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "panel-plugins";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-whiskermenu-plugin";
-  version = "2.9.2";
-  rev-prefix = "v";
-  odd-unstable = false;
-  sha256 = "sha256-M9eraJwArCrASrLz+URUOmYtulWPNxR39Sn+alfWoy4=";
+  version = "2.10.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-whiskermenu-plugin";
+    tag = "xfce4-whiskermenu-plugin-${finalAttrs.version}";
+    hash = "sha256-2FACsP6mKx0k91xG3DaVS6hdvdLrjLu9Y9rVOW6PZ3M=";
+  };
+
+  strictDeps = true;
 
   nativeBuildInputs = [
-    cmake
+    gettext
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
   ];
 
   buildInputs = [
     accountsservice
     exo
     garcon
-    gettext
     glib
     gtk-layer-shell
     gtk3
@@ -41,9 +55,14 @@ mkXfceDerivation {
     xfconf
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-whiskermenu-plugin-"; };
+
+  meta = {
     description = "Alternate application launcher for Xfce";
     mainProgram = "xfce4-popup-whiskermenu";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 68d2dfa8d67db7b598075a8b18ffb3b735be925c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 21:45:59 +0800
Subject: [PATCH 067/204] xfce.xfce4-windowck-plugin: 0.5.2 -> 0.6.0

https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/compare/xfce4-windowck-plugin-0.5.2...xfce4-windowck-plugin-0.6.0
---
 .../xfce4-windowck-plugin/default.nix         | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
index 54a32c99b5b3..409f196e9b34 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@@ -3,7 +3,10 @@
   lib,
   fetchurl,
   gettext,
+  meson,
+  ninja,
   pkg-config,
+  python3,
   glib,
   gtk3,
   libwnck,
@@ -14,19 +17,24 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-windowck-plugin";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchurl {
-    # Use dist tarballs to avoid pulling extra deps and generating images ourselves.
-    url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2";
-    sha256 = "sha256-3E7V3JS9Bd5UlUQfDKuyYKs+H2ziex+skuN/kJwM/go=";
+    url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-windowck-plugin-${finalAttrs.version}.tar.xz";
+    hash = "sha256-dJeSszth86ICe2VHBW5JOYqNajPgeg66hYOvnF9hdj8=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     gettext
+    glib # glib-compile-resources
+    meson
+    ninja
     pkg-config
+    python3
   ];
 
   buildInputs = [
@@ -44,11 +52,11 @@ stdenv.mkDerivation rec {
     rev-prefix = "xfce4-windowck-plugin-";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Xfce panel plugin for displaying window title and buttons";
     homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.xfce ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.xfce ];
   };
-}
+})

From fd6f086ce306085ab4dfeead6fe681a51713aa5f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 21:53:03 +0800
Subject: [PATCH 068/204] xfce.xfce4-xkb-plugin: 0.8.5 -> 0.9.0

https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/compare/xfce4-xkb-plugin-0.8.5...xfce4-xkb-plugin-0.9.0
---
 .../xfce4-xkb-plugin/default.nix              | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index 036f9c1eadcd..e10dc5a10631 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
@@ -1,6 +1,12 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  glib,
   gtk3,
   libnotify,
   librsvg,
@@ -11,18 +17,35 @@
   libxfce4util,
   xfce4-panel,
   xfconf,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "panel-plugins";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-xkb-plugin";
-  version = "0.8.5";
-  sha256 = "sha256-oG3+OudjJIXfGII16bYaIGy4QMno00HX3kX+8H0VUcU=";
+  version = "0.9.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-xkb-plugin";
+    tag = "xfce4-xkb-plugin-${finalAttrs.version}";
+    hash = "sha256-yLlUKp7X8bylJs7ioQJ36mfqFlsiZXOgFXa0ZP7AG1E=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     garcon
+    glib
     gtk3
-    libnotify # optional notification support
+    libnotify
     librsvg
     libxfce4ui
     libxfce4util
@@ -32,8 +55,13 @@ mkXfceDerivation {
     xfconf
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-xkb-plugin-"; };
+
+  meta = {
     description = "Allows you to setup and use multiple keyboard layouts";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 19855938fc607e36c1c7209a7eda1651981f3523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 23 May 2025 23:28:46 -0700
Subject: [PATCH 069/204] nototools: move to top-level

---
 .../no/noto-fonts-color-emoji/package.nix     | 12 ++----
 .../no/nototools/package.nix}                 | 43 +++----------------
 .../tw/twitter-color-emoji/package.nix        | 12 ++----
 .../wh/whatsapp-emoji-font/package.nix        |  4 +-
 pkgs/top-level/python-packages.nix            |  2 -
 5 files changed, 14 insertions(+), 59 deletions(-)
 rename pkgs/{development/python-modules/nototools/default.nix => by-name/no/nototools/package.nix} (68%)

diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
index 39862609e894..d5a9874ded54 100644
--- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
+++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix
@@ -7,18 +7,11 @@
   cairo,
   imagemagick,
   zopfli,
+  nototools,
   pngquant,
   which,
 }:
 
-let
-  emojiPythonEnv = buildPackages.python3.withPackages (
-    p: with p; [
-      fonttools
-      nototools
-    ]
-  );
-in
 stdenvNoCC.mkDerivation rec {
   pname = "noto-fonts-color-emoji";
   version = "2.047";
@@ -39,9 +32,10 @@ stdenvNoCC.mkDerivation rec {
   nativeBuildInputs = [
     imagemagick
     zopfli
+    nototools
     pngquant
     which
-    emojiPythonEnv
+    buildPackages.python3.pkgs.fonttools
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/nototools/default.nix b/pkgs/by-name/no/nototools/package.nix
similarity index 68%
rename from pkgs/development/python-modules/nototools/default.nix
rename to pkgs/by-name/no/nototools/package.nix
index 3f8c679d2a4b..26d1e7348b5f 100644
--- a/pkgs/development/python-modules/nototools/default.nix
+++ b/pkgs/by-name/no/nototools/package.nix
@@ -1,45 +1,14 @@
 {
   fetchFromGitHub,
   lib,
-  buildPythonPackage,
-  pythonOlder,
-  afdko,
-  appdirs,
-  attrs,
-  booleanoperations,
-  brotlipy,
-  click,
-  defcon,
-  fontmath,
-  fontparts,
-  fontpens,
-  fonttools,
-  lxml,
-  mutatormath,
-  pathspec,
-  psautohint,
-  pyclipper,
-  pytz,
-  regex,
-  scour,
-  toml,
-  typed-ast,
-  ufonormalizer,
-  ufoprocessor,
-  unicodedata2,
-  zopfli,
-  pillow,
-  six,
   bash,
-  setuptools-scm,
+  python3Packages,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "nototools";
   version = "0.2.20";
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "nototools";
@@ -51,9 +20,9 @@ buildPythonPackage rec {
     sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
   '';
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = with python3Packages; [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     afdko
     appdirs
     attrs
@@ -82,8 +51,8 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pillow
-    six
+    python3Packages.pillow
+    python3Packages.six
     bash
   ];
 
diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix
index 5ddcb8a7d613..ae999224b791 100644
--- a/pkgs/by-name/tw/twitter-color-emoji/package.nix
+++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix
@@ -7,6 +7,7 @@
   fetchFromGitHub,
   cairo,
   imagemagick,
+  nototools,
   pkg-config,
   pngquant,
   python3,
@@ -25,14 +26,6 @@ let
     rev = "v${version}";
     hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
   };
-
-  pythonEnv = python3.withPackages (
-    ps: with ps; [
-      fonttools
-      nototools
-    ]
-  );
-
 in
 stdenv.mkDerivation rec {
   pname = "twitter-color-emoji";
@@ -52,10 +45,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cairo
+    python3.pkgs.fonttools
     imagemagick
+    nototools
     pkg-config
     pngquant
-    pythonEnv
     which
     zopfli
   ];
diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
index d83050188c99..cde77df69bcd 100644
--- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
+++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   imagemagick,
   nix-update-script,
+  nototools,
   pngquant,
-  python3Packages,
   which,
   zopfli,
 }:
@@ -29,8 +29,8 @@ stdenvNoCC.mkDerivation rec {
 
   nativeBuildInputs = [
     imagemagick
+    nototools
     pngquant
-    python3Packages.nototools
     which
     zopfli
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 764bab2093a5..48f36fe8e1eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10123,8 +10123,6 @@ self: super: with self; {
 
   notobuilder = callPackage ../development/python-modules/notobuilder { };
 
-  nototools = callPackage ../development/python-modules/nototools { };
-
   notus-scanner = callPackage ../development/python-modules/notus-scanner { };
 
   nox = callPackage ../development/python-modules/nox { };

From 245edb755d351b3a33ae3e3e0f292b9794ee1cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 24 May 2025 07:37:30 -0700
Subject: [PATCH 070/204] nototools: remove unused dependency

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

diff --git a/pkgs/by-name/no/nototools/package.nix b/pkgs/by-name/no/nototools/package.nix
index 26d1e7348b5f..5900d8c3c5bf 100644
--- a/pkgs/by-name/no/nototools/package.nix
+++ b/pkgs/by-name/no/nototools/package.nix
@@ -22,6 +22,11 @@ python3Packages.buildPythonApplication rec {
 
   build-system = with python3Packages; [ setuptools-scm ];
 
+  pythonRemoveDeps = [
+    # https://github.com/notofonts/nototools/pull/901
+    "typed-ast"
+  ];
+
   dependencies = with python3Packages; [
     afdko
     appdirs
@@ -43,7 +48,6 @@ python3Packages.buildPythonApplication rec {
     regex
     scour
     toml
-    typed-ast
     ufonormalizer
     ufoprocessor
     unicodedata2

From 6c3175a04289d9564cc1572a6b336ae8430591a3 Mon Sep 17 00:00:00 2001
From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com>
Date: Sat, 24 May 2025 16:57:44 +0200
Subject: [PATCH 071/204] smatch: fix build by applying custom fix

---
 pkgs/by-name/sm/smatch/package.nix        |  1 +
 pkgs/by-name/sm/smatch/remove_const.patch | 32 +++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/sm/smatch/remove_const.patch

diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index b373f462a365..fe6514e15d92 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ pkg-config ];
+  patches = [ ./remove_const.patch ];
 
   buildInputs =
     [
diff --git a/pkgs/by-name/sm/smatch/remove_const.patch b/pkgs/by-name/sm/smatch/remove_const.patch
new file mode 100644
index 000000000000..6f2416d69187
--- /dev/null
+++ b/pkgs/by-name/sm/smatch/remove_const.patch
@@ -0,0 +1,32 @@
+diff --git a/smatch.h b/smatch.h
+index 36ae3497..ceb1907c 100644
+--- a/smatch.h
++++ b/smatch.h
+@@ -1375,7 +1375,7 @@ bool buf_comp_has_bytes(struct expression *buf, struct expression *var);
+ bool buf_comp2_has_bytes(struct expression *buf_expr, struct expression *var);
+ 
+ /* smatch_untracked_param.c */
+-void mark_untracked(struct expression *expr, int param, const char *key, const char *value);
++void mark_untracked(struct expression *expr, int param, char *key, char *value);
+ void add_untracked_param_hook(void (func)(struct expression *call, int param));
+ void add_lost_param_hook(void (func)(struct expression *call, int param));
+ void mark_all_params_untracked(int return_id, char *return_ranges, struct expression *expr);
+diff --git a/smatch_untracked_param.c b/smatch_untracked_param.c
+index 4bb3c244..d24958e7 100644
+--- a/smatch_untracked_param.c
++++ b/smatch_untracked_param.c
+@@ -120,12 +120,12 @@ free:
+ 
+ }
+ 
+-void mark_untracked(struct expression *expr, int param, const char *key, const char *value)
++void mark_untracked(struct expression *expr, int param, char *key, char *value)
+ {
+ 	mark_untracked_lost(expr, param, key, UNTRACKED_PARAM);
+ }
+ 
+-void mark_lost(struct expression *expr, int param, const char *key, const char *value)
++void mark_lost(struct expression *expr, int param, char *key, char *value)
+ {
+ 	mark_untracked_lost(expr, param, key, LOST_PARAM);
+ }

From af93b70ddcccc8cb429f486d7938cba33d8b6401 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Wed, 19 Jun 2024 10:07:22 +0800
Subject: [PATCH 072/204] nixos/boot: add boot.tmp.useZram options

---
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/system/boot/zram-as-tmp.nix | 105 ++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 nixos/modules/system/boot/zram-as-tmp.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 04c6cd103a49..15292d355c47 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1807,6 +1807,7 @@
   ./system/boot/uki.nix
   ./system/boot/unl0kr.nix
   ./system/boot/uvesafb.nix
+  ./system/boot/zram-as-tmp.nix
   ./system/etc/etc-activation.nix
   ./tasks/auto-upgrade.nix
   ./tasks/bcache.nix
diff --git a/nixos/modules/system/boot/zram-as-tmp.nix b/nixos/modules/system/boot/zram-as-tmp.nix
new file mode 100644
index 000000000000..2fcf7c73971c
--- /dev/null
+++ b/nixos/modules/system/boot/zram-as-tmp.nix
@@ -0,0 +1,105 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.boot.tmp;
+in
+{
+  options = {
+    boot.tmp = {
+      useZram = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Whether to mount a zram device on {file}`/tmp` during boot.
+
+          ::: {.note}
+          Large Nix builds can fail if the mounted zram device is not large enough.
+          In such a case either increase the zramSettings.zram-size or disable this option.
+          :::
+        '';
+      };
+
+      zramSettings = {
+        zram-size = lib.mkOption {
+          type = lib.types.str;
+          default = "ram * 0.5";
+          example = "min(ram / 2, 4096)";
+          description = ''
+            The size of the zram device, as a function of MemTotal, both in MB.
+            For example, if the machine has 1 GiB, and zram-size=ram/4,
+            then the zram device will have 256 MiB.
+            Fractions in the range 0.1–0.5 are recommended
+
+            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+          '';
+        };
+
+        compression-algorithm = lib.mkOption {
+          type = lib.types.str;
+          default = "zstd";
+          example = "lzo-rle";
+          description = ''
+            The compression algorithm to use for the zram device.
+
+            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+          '';
+        };
+
+        fs-type = lib.mkOption {
+          type = lib.types.str;
+          default = "ext4";
+          example = "ext2";
+          description = ''
+            The file system to put on the device.
+
+            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+          '';
+        };
+
+        options = lib.mkOption {
+          type = lib.types.str;
+          default = "X-mount.mode=1777,discard";
+          description = ''
+            By default, file systems and swap areas are trimmed on-the-go
+            by setting "discard".
+            Setting this to the empty string clears the option.
+
+            See: https://github.com/systemd/zram-generator/blob/main/zram-generator.conf.example
+          '';
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf (cfg.useZram) {
+    assertions = [
+      {
+        assertion = !cfg.useTmpfs;
+        message = "boot.tmp.useTmpfs is unnecessary if useZram=true";
+      }
+    ];
+
+    services.zram-generator.enable = true;
+    services.zram-generator.settings =
+      let
+        cfgz = cfg.zramSettings;
+      in
+      {
+        "zram${toString (if config.zramSwap.enable then config.zramSwap.swapDevices else 0)}" = {
+          mount-point = "/tmp";
+          zram-size = cfgz.zram-size;
+          compression-algorithm = cfgz.compression-algorithm;
+          options = cfgz.options;
+          fs-type = cfgz.fs-type;
+        };
+      };
+    systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ] ++ config.system.fsPackages;
+
+  };
+}

From 55b8857bc1384237bfdb0289b5a6fc094473da23 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 23:25:26 +0800
Subject: [PATCH 073/204] pantheon.elementary-notifications: 8.0.0 -> 8.1.0

https://github.com/elementary/notifications/compare/8.0.0...8.1.0
---
 .../pantheon/services/elementary-notifications/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index e34ba7924d85..29786e6ef51d 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-notifications";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "notifications";
     rev = version;
-    sha256 = "sha256-40STrDpMx1WFaTriJNrvkkbzAM0DeBaPdc8o8URItQI=";
+    sha256 = "sha256-2+LV3O2V42gI+ysVoeO9KpLqmAj/Zk5F8LzO2RNZ1ZY=";
   };
 
   nativeBuildInputs = [

From 77353d78711d7496f282f7330b471b0c5e5a6023 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 May 2025 23:47:58 +0800
Subject: [PATCH 074/204] mint-themes: 2.2.3 -> 2.2.6

https://github.com/linuxmint/mint-themes/compare/2.2.3...2.2.6
---
 pkgs/by-name/mi/mint-themes/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix
index 29d3e4ba3948..e9f7044f0f26 100644
--- a/pkgs/by-name/mi/mint-themes/package.nix
+++ b/pkgs/by-name/mi/mint-themes/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-themes";
-  version = "2.2.3";
+  version = "2.2.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-themes";
     rev = version;
-    hash = "sha256-QCf0hF1qtTiYo9F/M3UiCrGj6EPSrrSWZaLXqH0UNWs=";
+    hash = "sha256-O1ky967RWrd5L2RGl7SC2ZsvaM8FMmSmroJKcItD+ck=";
   };
 
   nativeBuildInputs = [

From c9caba6f7d6d0d768246ff72f877733be5f35a60 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 13:39:51 +0200
Subject: [PATCH 075/204] python3Packages.nltk: add bengsparks to maintainers

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

diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 4493348bb6da..30496070153b 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     mainProgram = "nltk";
     homepage = "http://nltk.org/";
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.bengsparks ];
   };
 }

From 9562488efb1b8e2d60e60203e9ea752c131cad2c Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 15:51:49 +0200
Subject: [PATCH 076/204] python3Packages.nltk.data: access `nltk-data`
 packages via `passthru`

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

diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 30496070153b..55831f7708ae 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  pkgs,
   fetchPypi,
   buildPythonPackage,
   pythonOlder,
@@ -38,6 +39,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "nltk" ];
 
+  passthru = {
+    data = pkgs.nltk-data;
+  };
+
   meta = with lib; {
     description = "Natural Language Processing ToolKit";
     mainProgram = "nltk";

From aee430ee47e1e80e4d555722e3d6ba1bf7899c00 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 16:02:39 +0200
Subject: [PATCH 077/204] python3Packages.nltk.dataDir: init

Add helper function to install NLTK data packages like `wordnet` and `punkt-tab`.
Should be used in conjunction with `makeWrapperArgs`,
e.g. `makeWrapperArgs = [ "--set" "NLTK_DATA" "${nltk.dataDir(d: [ d.wordnet d.punkt-tab ])}" ];`
---
 pkgs/development/python-modules/nltk/data-dir.nix | 15 +++++++++++++++
 pkgs/development/python-modules/nltk/default.nix  |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/python-modules/nltk/data-dir.nix

diff --git a/pkgs/development/python-modules/nltk/data-dir.nix b/pkgs/development/python-modules/nltk/data-dir.nix
new file mode 100644
index 000000000000..d18ab730597b
--- /dev/null
+++ b/pkgs/development/python-modules/nltk/data-dir.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  pkgs,
+  python3Packages,
+}:
+lib.makeOverridable (
+  { ... }@nltkDataPkgs:
+  f:
+  pkgs.symlinkJoin {
+    inherit (python3Packages.nltk) meta;
+    name = "nltk-data-dir";
+
+    paths = f nltkDataPkgs;
+  }
+) python3Packages.nltk.data
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 55831f7708ae..bdb79081ec81 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -41,6 +41,7 @@ buildPythonPackage rec {
 
   passthru = {
     data = pkgs.nltk-data;
+    dataDir = pkgs.callPackage ./data-dir.nix { };
   };
 
   meta = with lib; {

From acc6352eeb3e1b4fb10f6d17954bc0eb4edf07f7 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 16:32:59 +0200
Subject: [PATCH 078/204] python3Packages.nltk: propagatedBuildInputs ->
 dependencies

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

diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index bdb79081ec81..be7a461af3ef 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     hash = "sha256-h9EnvT3kvYmk+BJl5fpZyxsZmydEAXU3D3QX0rx66Gg=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
     joblib
     regex

From 279f2c0308682c2177595cc3af6d1e26fc084160 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 24 May 2025 18:26:51 +0200
Subject: [PATCH 079/204] python3Packages.nltk: run tests

---
 .../python-modules/nltk/default.nix           | 69 +++++++++++++++++--
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index be7a461af3ef..4571f85bf23a 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -8,6 +8,16 @@
   joblib,
   regex,
   tqdm,
+
+  # preInstallCheck
+  nltk,
+
+  # nativeCheckInputs
+  matplotlib,
+  numpy,
+  pyparsing,
+  pytestCheckHook,
+  pytest-mock,
 }:
 
 buildPythonPackage rec {
@@ -29,13 +39,58 @@ buildPythonPackage rec {
     tqdm
   ];
 
-  # Tests require some data, the downloading of which is impure. It would
-  # probably make sense to make the data another derivation, but then feeding
-  # that into the tests (given that we need nltk itself to download the data,
-  # unless there's an easy way to download it without nltk's downloader) might
-  # be complicated. For now let's just disable the tests and hope for the
-  # best.
-  doCheck = false;
+  # Use new passthru function to pass dependencies required for testing
+  preInstallCheck = ''
+    export NLTK_DATA=${
+      nltk.dataDir (
+        d: with d; [
+          averaged-perceptron-tagger-eng
+          averaged-perceptron-tagger-rus
+          brown
+          cess-cat
+          cess-esp
+          conll2007
+          floresta
+          gutenberg
+          inaugural
+          indian
+          large-grammars
+          nombank-1-0
+          omw-1-4
+          pl196x
+          porter-test
+          ptb
+          punkt-tab
+          rte
+          sinica-treebank
+          stopwords
+          tagsets-json
+          treebank
+          twitter-samples
+          udhr
+          universal-tagset
+          wmt15-eval
+          wordnet
+          wordnet-ic
+          words
+        ]
+      )
+    }
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    matplotlib
+    numpy
+    pyparsing
+    pytest-mock
+
+    pkgs.which
+  ];
+
+  disabledTestPaths = [
+    "nltk/test/unit/test_downloader.py" # Touches network
+  ];
 
   pythonImportsCheck = [ "nltk" ];
 

From 0bb5be9addc86bff92d3ede45ec094755055cba5 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 24 May 2025 18:51:58 +0200
Subject: [PATCH 080/204] unstructured-api: pkgs.symlinkJoin ->
 python.pkgs.nltk.dataDir

---
 pkgs/by-name/un/unstructured-api/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix
index adf9fa83dd96..ba94ad44bed4 100644
--- a/pkgs/by-name/un/unstructured-api/package.nix
+++ b/pkgs/by-name/un/unstructured-api/package.nix
@@ -5,8 +5,6 @@
   python3,
   makeWrapper,
   nix-update-script,
-  symlinkJoin,
-  nltk-data,
 }:
 let
   pythonEnv = python3.withPackages (
@@ -147,14 +145,10 @@ let
     ++ unstructured.optional-dependencies.all-docs
   );
   version = "0.0.82";
-  unstructured_api_nltk_data = symlinkJoin {
-    name = "unstructured_api_nltk_data";
-
-    paths = [
-      nltk-data.punkt
-      nltk-data.averaged-perceptron-tagger
-    ];
-  };
+  unstructured_api_nltk_data = python3.pkgs.nltk.dataDir (d: [
+    d.punkt
+    d.averaged-perceptron-tagger
+  ]);
 in
 stdenvNoCC.mkDerivation {
   pname = "unstructured-api";

From 8aa49dac246c0ff3657823556fd6b52534cf6aed Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 24 May 2025 18:53:56 +0200
Subject: [PATCH 081/204] python3Packages.aider-chat: pkgs.symlinkJoin ->
 python3Packages.nltk.dataDir

---
 .../python-modules/aider-chat/default.nix           | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index bc4534b8da61..3d961c34a4fd 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -6,8 +6,6 @@
   gitMinimal,
   portaudio,
   playwright-driver,
-  symlinkJoin,
-  nltk-data,
   pythonOlder,
   pythonAtLeast,
   setuptools-scm,
@@ -122,13 +120,10 @@
 }:
 
 let
-  aider-nltk-data = symlinkJoin {
-    name = "aider-nltk-data";
-    paths = [
-      nltk-data.punkt-tab
-      nltk-data.stopwords
-    ];
-  };
+  aider-nltk-data = nltk.dataDir (d: [
+    d.punkt-tab
+    d.stopwords
+  ]);
 
   version = "0.83.1";
   aider-chat = buildPythonPackage {

From 020c1daaf9062c0066f43646bd8b86b562b412a7 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 24 May 2025 18:56:48 +0200
Subject: [PATCH 082/204] python3Packages.type-infer: pkgs.symlinkJoin ->
 python3Packages.nltk.dataDir

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

diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index 4b8ef9e99d5e..371708f7d0d0 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -16,18 +16,13 @@
   python-dateutil,
   scipy,
   toml,
-  nltk-data,
-  symlinkJoin,
 }:
 let
-  testNltkData = symlinkJoin {
-    name = "nltk-test-data";
-    paths = [
-      nltk-data.punkt
-      nltk-data.punkt-tab
-      nltk-data.stopwords
-    ];
-  };
+  testNltkData = nltk.dataDir (d: [
+    d.punkt
+    d.punkt-tab
+    d.stopwords
+  ]);
 
   version = "0.0.21";
   tag = "v${version}";

From a5a7b272ee007aabade4b6e89c7609bc9ac88b0f Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 24 May 2025 19:06:55 +0200
Subject: [PATCH 083/204] komikku: 1.76.1 -> 1.77.0

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

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 0c6ba902535d..02f7d84fb77a 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.76.1";
+  version = "1.77.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-js9mywNlv13ZDmvoBt9yuXJePaSuKOimek3uNlVIeHM=";
+    hash = "sha256-UTAK8gzgOEuYw1S4htoInr8pCkx5s+/cblOfk/F6a4M=";
   };
 
   nativeBuildInputs = [

From 3f90d5b9065e1d481da76205fa807e56b6892933 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 18:45:12 +0000
Subject: [PATCH 084/204] touchegg: 2.0.17 -> 2.0.18

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

diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index 9612a91f01c5..ceb7da0e9b52 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "touchegg";
-  version = "2.0.17";
+  version = "2.0.18";
 
   src = fetchFromGitHub {
     owner = "JoseExposito";
     repo = "touchegg";
     rev = version;
-    sha256 = "sha256-he6ERl6ZNWuD5StUqQWsUjeJ35nD0b8KddIAvntqlOI=";
+    sha256 = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
   };
 
   patches = lib.optionals withPantheon [

From e9f87be223fda88844f60930af32480a329958ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 18:46:23 +0000
Subject: [PATCH 085/204] tflint: 0.57.0 -> 0.58.0

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

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 120a480387e7..5f586cac6606 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "tflint";
-  version = "0.57.0";
+  version = "0.58.0";
 in
 buildGoModule {
   inherit pname version;
@@ -20,10 +20,10 @@ buildGoModule {
     owner = "terraform-linters";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-mmrXP81CVyFObmzLveqZNwHbRTnDyKfoTPFlq1WyxxE=";
+    hash = "sha256-AaY2UghPvYveZ4xtUphPOnnoA6FcyO9Y2Uzz3bN8Q8I=";
   };
 
-  vendorHash = "sha256-ljJnMAD+cvlq7NxrbrbE53+uPWknRqN5KD8SYqqjZ9w=";
+  vendorHash = "sha256-lmV23xDzBaMxV4MQeatX4sF0UwDZBlekdW21CMGtIqs=";
 
   doCheck = false;
 

From e380e29c67e4da103e50eca6ef9cff24ddbb8353 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 19:56:39 +0000
Subject: [PATCH 086/204] ghostfolio: 2.161.0 -> 2.162.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 7fcc7a04514b..fd4951c0a97a 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.161.0";
+  version = "2.162.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-fN901bpiFz1sAEBv9MKzpgfr7TFa6s3ghT9v44bXZzM=";
+    hash = "sha256-2j7haypj1Bl0T0ppBCo+KDaMup+1dOuI2xouaJuVtec=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-vaIQ6SdsBGfiIkvz+dE9wR/KToobFyWaZOuFHPgLk94=";
+  npmDepsHash = "sha256-IYHV7PEyfkGtwpROHITulqBEC6NgA5CumIykKtoamU8=";
 
   nativeBuildInputs = [
     prisma

From 0622d5fd0245fa0c0962f8cdcd4440232df772ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 19:59:36 +0000
Subject: [PATCH 087/204] sleek: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/by-name/sl/sleek/package.nix b/pkgs/by-name/sl/sleek/package.nix
index 3a1fbfda5a4b..b5424eb16d67 100644
--- a/pkgs/by-name/sl/sleek/package.nix
+++ b/pkgs/by-name/sl/sleek/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sleek";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "nrempel";
     repo = "sleek";
     rev = "v${version}";
-    hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8=";
+    hash = "sha256-U1ujR+6wW3SKUnjqs/+DrEhu0XRBB8hxGC2pxe3LVbw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vq4e/2+YfMw2n8ZMYPa/3HtNk9pCtXWN/u1MzhBkZJQ=";
+  cargoHash = "sha256-2P47kVNQPksKyWPtk1XEpVEjFfz7cEvWX0VvlT3nKOc=";
 
   meta = with lib; {
     description = "CLI tool for formatting SQL";

From e7f1f6f7e165d118e43a9eaf60aca78429717cea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 20:51:03 +0000
Subject: [PATCH 088/204] rattler-build: 0.41.0 -> 0.42.1

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

diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index 60a2dddaddd9..aa7a1f65b4e6 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rattler-build";
-  version = "0.41.0";
+  version = "0.42.1";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6N4YHrwzFTBShitAW7BMjEMzigB37Om5lICb94wEvlQ=";
+    hash = "sha256-HeqE4FqkRBQNtJlirkLo6aVBo4S6QpKD8o6/B2DEya8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-fslC+e3d2tVFOWag7NZ1mTnjG3iMMezodpNQ+2LVRxU=";
+  cargoHash = "sha256-/R4m3uApdFHJe2fJbdox2awO0Qbt496C1gTz7B0Owso=";
 
   doCheck = false; # test requires network access
 

From 86e581ec89b428924132400a29ad945527da17c6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 May 2025 23:38:47 +0200
Subject: [PATCH 089/204] python313Packages.mcpadapt: 0.1.5 -> 0.1.9

Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.1.5...refs/tags/v0.1.9

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

diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix
index 46fef3318315..9fc6a0e2ea92 100644
--- a/pkgs/development/python-modules/mcpadapt/default.nix
+++ b/pkgs/development/python-modules/mcpadapt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "mcpadapt";
-  version = "0.1.5";
+  version = "0.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "grll";
     repo = "mcpadapt";
     tag = "v${version}";
-    hash = "sha256-crxruowqZ5/tLH61w+M/862rbwELEnUktFuiZCOEBfw=";
+    hash = "sha256-sczXScP1wDUntAwVEfiGfJe0ghBpqPQH1YaXhFGj97Y=";
   };
 
   build-system = [ hatchling ];

From e2928d8bc9d13ef8bfb9c14ae3e282dae0a2e921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 24 May 2025 15:23:48 -0700
Subject: [PATCH 090/204] python3Packages.aiosonic: remove unused dependencies

---
 .../python-modules/aiosonic/default.nix       | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix
index 29c7ad646fa3..4a7872e14464 100644
--- a/pkgs/development/python-modules/aiosonic/default.nix
+++ b/pkgs/development/python-modules/aiosonic/default.nix
@@ -10,26 +10,13 @@
   h2,
   onecache,
   # test dependencies
-  asgiref,
-  black,
-  django,
-  click,
   httpx,
-  proxy-py,
   pytest-aiohttp,
-  pytest-asyncio,
   pytest-cov-stub,
-  pytest-django,
   pytest-mock,
-  pytest-sugar,
-  pytest-timeout,
   uvicorn,
-  httptools,
-  typed-ast,
-  uvloop,
   requests,
   aiohttp,
-  aiodns,
   pytestCheckHook,
   stdenv,
 }:
@@ -66,27 +53,13 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aiohttp
-    aiodns
-    asgiref
-    black
-    django
-    click
     httpx
-    proxy-py
     pytest-aiohttp
-    pytest-asyncio
     pytest-cov-stub
-    pytest-django
     pytest-mock
-    pytest-sugar
-    pytest-timeout
     uvicorn
-    httptools
-    typed-ast
-    uvloop
     requests
     pytestCheckHook
-    nodejs
   ];
 
   pythonImportsCheck = [ "aiosonic" ];

From fb7f603d2db140375fe9ba774fa0147e888ff52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 24 May 2025 15:25:39 -0700
Subject: [PATCH 091/204] python3Packages.typed-ast: drop

https://github.com/python/typed_ast/issues/179
---
 .../python-modules/typed-ast/default.nix      | 48 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/development/python-modules/typed-ast/default.nix

diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
deleted file mode 100644
index da5da6112d83..000000000000
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  pythonAtLeast,
-  fetchFromGitHub,
-  setuptools,
-  pytest,
-}:
-
-buildPythonPackage rec {
-  pname = "typed-ast";
-  version = "1.5.5";
-  pyproject = true;
-
-  # error: unknown type name ‘PyFutureFeatures’
-  disabled = pythonAtLeast "3.13";
-
-  src = fetchFromGitHub {
-    owner = "python";
-    repo = "typed_ast";
-    tag = version;
-    hash = "sha256-A/FA6ngu8/bbpKW9coJ7unm9GQezGuDhgBWjOhAxm2o=";
-  };
-
-  build-system = [
-    setuptools
-  ];
-
-  nativeCheckInputs = [ pytest ];
-
-  preCheck = ''
-    rm -rf typed_ast
-  '';
-
-  pythonImportsCheck = [
-    "typed_ast"
-    "typed_ast.ast27"
-    "typed_ast.ast3"
-    "typed_ast.conversions"
-  ];
-
-  meta = {
-    description = "Python AST modules with type comment support";
-    homepage = "https://github.com/python/typed_ast";
-    license = lib.licenses.asl20;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7bdfd480f5c8..21eeda71469b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -777,6 +777,7 @@ mapAliases ({
   twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14
   twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14
   twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14
+  typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
   types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
   types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
   types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48f36fe8e1eb..f381d8c2b9ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17909,8 +17909,6 @@ self: super: with self; {
     inherit (pkgs) file zlib;
   };
 
-  typed-ast = callPackage ../development/python-modules/typed-ast { };
-
   typed-settings = callPackage ../development/python-modules/typed-settings { };
 
   typedunits = callPackage ../development/python-modules/typedunits { };

From 813189a99f1836b48b86340b672659bd24498003 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 25 May 2025 00:27:38 +0200
Subject: [PATCH 092/204] nixosTests.lomiri-mediaplayer-app: Optimise OCR

---
 nixos/tests/lomiri-mediaplayer-app.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/lomiri-mediaplayer-app.nix b/nixos/tests/lomiri-mediaplayer-app.nix
index e1f20a4cc203..0a6cbac41a11 100644
--- a/nixos/tests/lomiri-mediaplayer-app.nix
+++ b/nixos/tests/lomiri-mediaplayer-app.nix
@@ -54,30 +54,39 @@ in
 
     with subtest("lomiri mediaplayer launches"):
         machine.succeed("lomiri-mediaplayer-app >&2 &")
+        machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided")
+        machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided") # Emitted twice
         machine.sleep(10)
         machine.send_key("alt-f10")
-        machine.wait_for_text("Choose from")
+        machine.sleep(5)
+        machine.wait_for_text(r"(Choose|Sorry|provide|content)")
         machine.screenshot("lomiri-mediaplayer_open")
 
     machine.succeed("pkill -f lomiri-mediaplayer-app")
 
     with subtest("lomiri mediaplayer plays video"):
         machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &")
+        machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided") # Only once here
+        machine.wait_for_console_text("qml: onPositionChanged")
         machine.sleep(10)
         machine.send_key("alt-f10")
+        machine.sleep(5)
         machine.wait_for_text("${ocrContent}")
         machine.screenshot("lomiri-mediaplayer_playback")
 
     machine.succeed("pkill -f lomiri-mediaplayer-app")
 
     with subtest("lomiri mediaplayer localisation works"):
-        # OCR struggles with finding identifying the translated window title, and lomiri-content-hub QML isn't translated
+        # OCR struggles with finding the translated window title, and lomiri-content-hub QML isn't translated
         # Cause an error, and look for the error popup
         machine.succeed("touch invalid.mp4")
         machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &")
+        machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided")
+        machine.wait_for_console_text("Der Datenstrom enthält keine Daten")
         machine.sleep(10)
         machine.send_key("alt-f10")
-        machine.wait_for_text("Fehler")
+        machine.sleep(5)
+        machine.wait_for_text(r"(Fehler|Abspielen|fehlgeschlagen)")
         machine.screenshot("lomiri-mediaplayer_localised")
   '';
 }

From a66500f738266333c6f5fcc963f110a8417b0830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 24 May 2025 15:27:54 -0700
Subject: [PATCH 093/204] python3Packages.types-typed-ast: drop

---
 .../types-typed-ast/default.nix               | 28 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/development/python-modules/types-typed-ast/default.nix

diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix
deleted file mode 100644
index 13713c669519..000000000000
--- a/pkgs/development/python-modules/types-typed-ast/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "types-typed-ast";
-  version = "1.5.8.7";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-93lfb51ZezUhIxQEC5k/ZhO1HYFzjtzjweOj6e9lUSQ=";
-  };
-
-  # Module doesn't have tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "typed_ast-stubs" ];
-
-  meta = with lib; {
-    description = "Typing stubs for typed-ast";
-    homepage = "https://github.com/python/typeshed";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ veehaitch ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 21eeda71469b..7cd7e7c6dd88 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -781,6 +781,7 @@ mapAliases ({
   types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
   types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
   types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
+  types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
   ufoLib2 = ufolib2; # added 2024-01-07
   ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
   unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f381d8c2b9ec..55aa2d3acf04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18353,8 +18353,6 @@ self: super: with self; {
 
   types-tqdm = callPackage ../development/python-modules/types-tqdm { };
 
-  types-typed-ast = callPackage ../development/python-modules/types-typed-ast { };
-
   types-ujson = callPackage ../development/python-modules/types-ujson { };
 
   types-urllib3 = callPackage ../development/python-modules/types-urllib3 { };

From 851756b3afb512d0a201be9f5fa04c70d5fe8db7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 25 May 2025 00:46:15 +0200
Subject: [PATCH 094/204] treewide: remove unreferenced patch files

---
 .../wxWidgets-Makefile.in-fix.patch           |  112 --
 pkgs/by-name/at/atf/pr-85.patch               | 1529 -----------------
 .../ed/edopro/ocgcore-lua-symbols.patch       |   29 -
 pkgs/by-name/ki/kikit/drop-versioneer.patch   |   14 -
 .../patches/fix-standalone-check.patch        |   19 -
 pkgs/by-name/ze/zellij/rust-1.86.patch        |  109 --
 .../python/cpython/CVE-2025-0938.patch        |  200 ---
 .../MouseX-Getopt-gld-tests.patch             |  143 --
 .../bytewax/remove-docs-test.patch            |   12 -
 .../pythreejs/fix-re.error.patch              |   13 -
 .../fix-incompatible-function-pointers.patch  |   79 -
 .../quickbms/0002-disable-openssl.patch       |   10 -
 12 files changed, 2269 deletions(-)
 delete mode 100644 pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch
 delete mode 100644 pkgs/by-name/at/atf/pr-85.patch
 delete mode 100644 pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
 delete mode 100644 pkgs/by-name/ki/kikit/drop-versioneer.patch
 delete mode 100644 pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch
 delete mode 100644 pkgs/by-name/ze/zellij/rust-1.86.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch
 delete mode 100644 pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch
 delete mode 100644 pkgs/development/python-modules/bytewax/remove-docs-test.patch
 delete mode 100644 pkgs/development/python-modules/pythreejs/fix-re.error.patch
 delete mode 100644 pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch
 delete mode 100644 pkgs/tools/archivers/quickbms/0002-disable-openssl.patch

diff --git a/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch b/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch
deleted file mode 100644
index aadf9765882d..000000000000
--- a/pkgs/applications/misc/prusa-slicer/wxWidgets-Makefile.in-fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 8f33aa2ff4..39928382da 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
- 	monodll_msw_utils.o \
- 	monodll_utilsexc.o \
- 	monodll_fswatcher.o \
--	monodll_msw_secretstore.o
-+	monodll_msw_secretstore.o \
- 	monodll_msw_uilocale.o
- @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
- @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
-@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
- 	monodll_uuid.o \
- 	monodll_msw_evtloop.o \
- 	monodll_access.o \
--	monodll_dark_mode.o
-+	monodll_dark_mode.o \
- 	monodll_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
-@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
- 	monodll_uuid.o \
- 	monodll_msw_evtloop.o \
- 	monodll_access.o \
--	monodll_dark_mode.o
-+	monodll_dark_mode.o \
- 	monodll_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
-@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
- 	monolib_msw_utils.o \
- 	monolib_utilsexc.o \
- 	monolib_fswatcher.o \
--	monolib_msw_secretstore.o
-+	monolib_msw_secretstore.o \
- 	monolib_msw_uilocale.o
- @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
- @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
-@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
- 	monolib_uuid.o \
- 	monolib_msw_evtloop.o \
- 	monolib_access.o \
--	monolib_dark_mode.o
-+	monolib_dark_mode.o \
- 	monolib_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
-@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
- 	monolib_uuid.o \
- 	monolib_msw_evtloop.o \
- 	monolib_access.o \
--	monolib_dark_mode.o
-+	monolib_dark_mode.o \
- 	monolib_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
-@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
- 	basedll_msw_utils.o \
- 	basedll_utilsexc.o \
- 	basedll_fswatcher.o \
--	basedll_msw_secretstore.o
-+	basedll_msw_secretstore.o \
- 	basedll_msw_uilocale.o
- @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
- @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
-@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
- 	baselib_msw_utils.o \
- 	baselib_utilsexc.o \
- 	baselib_fswatcher.o \
--	baselib_msw_secretstore.o
-+	baselib_msw_secretstore.o \
- 	baselib_msw_uilocale.o
- @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
- @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
-@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
- 	coredll_uuid.o \
- 	coredll_msw_evtloop.o \
- 	coredll_access.o \
--	coredll_dark_mode.o
-+	coredll_dark_mode.o \
- 	coredll_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
-@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
- 	coredll_uuid.o \
- 	coredll_msw_evtloop.o \
- 	coredll_access.o \
--	coredll_dark_mode.o
-+	coredll_dark_mode.o \
- 	coredll_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
-@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
- 	corelib_uuid.o \
- 	corelib_msw_evtloop.o \
- 	corelib_access.o \
--	corelib_dark_mode.o
-+	corelib_dark_mode.o \
- 	corelib_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
-@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
- 	corelib_uuid.o \
- 	corelib_msw_evtloop.o \
- 	corelib_access.o \
--	corelib_dark_mode.o
-+	corelib_dark_mode.o \
- 	corelib_msw_bmpbndl.o
- @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
- @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
diff --git a/pkgs/by-name/at/atf/pr-85.patch b/pkgs/by-name/at/atf/pr-85.patch
deleted file mode 100644
index d438ce16b048..000000000000
--- a/pkgs/by-name/at/atf/pr-85.patch
+++ /dev/null
@@ -1,1529 +0,0 @@
-From 1f0ee71c000074ca48c2d9edc94f152747835e20 Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Thu, 5 Dec 2024 23:07:18 -0800
-Subject: [PATCH 1/9] Garbage collect stray reference to auto_array
-
-This entry should have been removed in the referenced commit.
-
-Fixes:	6639d083e7d5b4b478397cc416cd42a756d17b0c
----
- atf-c++/detail/Makefile.am.inc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/atf-c++/detail/Makefile.am.inc b/atf-c++/detail/Makefile.am.inc
-index b3181346..29b41c3f 100644
---- a/atf-c++/detail/Makefile.am.inc
-+++ b/atf-c++/detail/Makefile.am.inc
-@@ -25,7 +25,6 @@
- 
- libatf_c___la_SOURCES += atf-c++/detail/application.cpp \
-                          atf-c++/detail/application.hpp \
--                         atf-c++/detail/auto_array.hpp \
-                          atf-c++/detail/env.cpp \
-                          atf-c++/detail/env.hpp \
-                          atf-c++/detail/exceptions.cpp \
-
-From bb58a4dfbc98e95c365be8033f9778571f35ef9d Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Thu, 5 Dec 2024 23:25:26 -0800
-Subject: [PATCH 2/9] Require C++-14 at bare minimum
-
-This change imports ac_cxx_compile_stdcxx.m4 from gnu,org and makes use
-of the `AX_CXX_COMPILE_STDCXX` macro in configure.ac to ensure that the
-compiler specified supports C++-14 (at bare minimum). This is being done
-to quell some issues reported by scan-build about the code using C++
-range-based for-loops (a feature added in C++-11).
----
- configure.ac                |    3 +-
- m4/ac_cxx_compile_stdcxx.m4 | 1070 +++++++++++++++++++++++++++++++++++
- 2 files changed, 1072 insertions(+), 1 deletion(-)
- create mode 100644 m4/ac_cxx_compile_stdcxx.m4
-
-diff --git a/configure.ac b/configure.ac
-index c37aca44..6d802144 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,8 +58,9 @@ AM_PROG_CC_C_O
- dnl The C compiler check automatically aborts if the compiler does not work.
- dnl Nothing to do here.
- 
--AC_LANG(C++)
- AC_PROG_CXX
-+AC_LANG_COMPILER(C++)
-+AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
- AC_CACHE_CHECK([whether the C++ compiler works],
-                [atf_cv_prog_cxx_works],
-                [AC_LANG_PUSH([C++])
-diff --git a/m4/ac_cxx_compile_stdcxx.m4 b/m4/ac_cxx_compile_stdcxx.m4
-new file mode 100644
-index 00000000..fe6ae17e
---- /dev/null
-+++ b/m4/ac_cxx_compile_stdcxx.m4
-@@ -0,0 +1,1070 @@
-+# ===========================================================================
-+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-+#
-+# DESCRIPTION
-+#
-+#   Check for baseline language coverage in the compiler for the specified
-+#   version of the C++ standard.  If necessary, add switches to CXX and
-+#   CXXCPP to enable support.  VERSION may be '11', '14', '17', '20', or
-+#   '23' for the respective C++ standard version.
-+#
-+#   The second argument, if specified, indicates whether you insist on an
-+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-+#   -std=c++11).  If neither is specified, you get whatever works, with
-+#   preference for no added switch, and then for an extended mode.
-+#
-+#   The third argument, if specified 'mandatory' or if left unspecified,
-+#   indicates that baseline support for the specified C++ standard is
-+#   required and that the macro should error out if no mode with that
-+#   support is found.  If specified 'optional', then configuration proceeds
-+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-+#   supporting mode is found.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-+#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
-+#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
-+#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
-+#   Copyright (c) 2021, 2024 Jörn Heusipp <osmanx@problemloesungsmaschine.de>
-+#   Copyright (c) 2015, 2022, 2023, 2024 Olly Betts
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved.  This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 25
-+
-+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-+dnl  (serial version number 13).
-+
-+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-+  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-+        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-+        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-+        [$1], [20], [ax_cxx_compile_alternatives="20"],
-+        [$1], [23], [ax_cxx_compile_alternatives="23"],
-+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-+  m4_if([$2], [], [],
-+        [$2], [ext], [],
-+        [$2], [noext], [],
-+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-+  AC_LANG_PUSH([C++])dnl
-+  ac_success=no
-+
-+  m4_if([$2], [], [dnl
-+    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-+		   ax_cv_cxx_compile_cxx$1,
-+      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+        [ax_cv_cxx_compile_cxx$1=yes],
-+        [ax_cv_cxx_compile_cxx$1=no])])
-+    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-+      ac_success=yes
-+    fi])
-+
-+  m4_if([$2], [noext], [], [dnl
-+  if test x$ac_success = xno; then
-+    for alternative in ${ax_cxx_compile_alternatives}; do
-+      switch="-std=gnu++${alternative}"
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXX="$CXX"
-+         CXX="$CXX $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXX="$ac_save_CXX"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXX="$CXX $switch"
-+        if test -n "$CXXCPP" ; then
-+          CXXCPP="$CXXCPP $switch"
-+        fi
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+
-+  m4_if([$2], [ext], [], [dnl
-+  if test x$ac_success = xno; then
-+    dnl HP's aCC needs +std=c++11 according to:
-+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-+    dnl Cray's crayCC needs "-h std=c++11"
-+    dnl MSVC needs -std:c++NN for C++17 and later (default is C++14)
-+    for alternative in ${ax_cxx_compile_alternatives}; do
-+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do
-+        if test x"$switch" = xMSVC; then
-+          dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide
-+          dnl with -std=c++17.  We suffix the cache variable name with _MSVC to
-+          dnl avoid this.
-+          switch=-std:c++${alternative}
-+          cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC])
-+        else
-+          cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+        fi
-+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+                       $cachevar,
-+          [ac_save_CXX="$CXX"
-+           CXX="$CXX $switch"
-+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+            [eval $cachevar=yes],
-+            [eval $cachevar=no])
-+           CXX="$ac_save_CXX"])
-+        if eval test x\$$cachevar = xyes; then
-+          CXX="$CXX $switch"
-+          if test -n "$CXXCPP" ; then
-+            CXXCPP="$CXXCPP $switch"
-+          fi
-+          ac_success=yes
-+          break
-+        fi
-+      done
-+      if test x$ac_success = xyes; then
-+        break
-+      fi
-+    done
-+  fi])
-+  AC_LANG_POP([C++])
-+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-+    if test x$ac_success = xno; then
-+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-+    fi
-+  fi
-+  if test x$ac_success = xno; then
-+    HAVE_CXX$1=0
-+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-+  else
-+    HAVE_CXX$1=1
-+    AC_DEFINE(HAVE_CXX$1,1,
-+              [define if the compiler supports basic C++$1 syntax])
-+  fi
-+  AC_SUBST(HAVE_CXX$1)
-+])
-+
-+
-+dnl  Test body for checking C++11 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11]
-+)
-+
-+dnl  Test body for checking C++14 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14]
-+)
-+
-+dnl  Test body for checking C++17 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17]
-+)
-+
-+dnl  Test body for checking C++20 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20],
-+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_20]
-+)
-+
-+dnl  Test body for checking C++23 support
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_23],
-+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_20
-+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_23]
-+)
-+
-+
-+dnl  Tests for new features in C++11
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-+
-+// If the compiler admits that it is not ready for C++11, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+// MSVC always sets __cplusplus to 199711L in older versions; newer versions
-+// only set it correctly if /Zc:__cplusplus is specified as well as a
-+// /std:c++NN switch:
-+//
-+// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
-+//
-+// The value __cplusplus ought to have is available in _MSVC_LANG since
-+// Visual Studio 2015 Update 3:
-+//
-+// https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros
-+//
-+// This was also the first MSVC version to support C++14 so we can't use the
-+// value of either __cplusplus or _MSVC_LANG to quickly rule out MSVC having
-+// C++11 or C++14 support, but we can check _MSVC_LANG for C++17 and later.
-+#elif __cplusplus < 201103L && !defined _MSC_VER
-+
-+#error "This is not a C++11 compiler"
-+
-+#else
-+
-+namespace cxx11
-+{
-+
-+  namespace test_static_assert
-+  {
-+
-+    template <typename T>
-+    struct check
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+  }
-+
-+  namespace test_final_override
-+  {
-+
-+    struct Base
-+    {
-+      virtual ~Base() {}
-+      virtual void f() {}
-+    };
-+
-+    struct Derived : public Base
-+    {
-+      virtual ~Derived() override {}
-+      virtual void f() override {}
-+    };
-+
-+  }
-+
-+  namespace test_double_right_angle_brackets
-+  {
-+
-+    template < typename T >
-+    struct check {};
-+
-+    typedef check<void> single_type;
-+    typedef check<check<void>> double_type;
-+    typedef check<check<check<void>>> triple_type;
-+    typedef check<check<check<check<void>>>> quadruple_type;
-+
-+  }
-+
-+  namespace test_decltype
-+  {
-+
-+    int
-+    f()
-+    {
-+      int a = 1;
-+      decltype(a) b = 2;
-+      return a + b;
-+    }
-+
-+  }
-+
-+  namespace test_type_deduction
-+  {
-+
-+    template < typename T1, typename T2 >
-+    struct is_same
-+    {
-+      static const bool value = false;
-+    };
-+
-+    template < typename T >
-+    struct is_same<T, T>
-+    {
-+      static const bool value = true;
-+    };
-+
-+    template < typename T1, typename T2 >
-+    auto
-+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-+    {
-+      return a1 + a2;
-+    }
-+
-+    int
-+    test(const int c, volatile int v)
-+    {
-+      static_assert(is_same<int, decltype(0)>::value == true, "");
-+      static_assert(is_same<int, decltype(c)>::value == false, "");
-+      static_assert(is_same<int, decltype(v)>::value == false, "");
-+      auto ac = c;
-+      auto av = v;
-+      auto sumi = ac + av + 'x';
-+      auto sumf = ac + av + 1.0;
-+      static_assert(is_same<int, decltype(ac)>::value == true, "");
-+      static_assert(is_same<int, decltype(av)>::value == true, "");
-+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-+      return (sumf > 0.0) ? sumi : add(c, v);
-+    }
-+
-+  }
-+
-+  namespace test_noexcept
-+  {
-+
-+    int f() { return 0; }
-+    int g() noexcept { return 0; }
-+
-+    static_assert(noexcept(f()) == false, "");
-+    static_assert(noexcept(g()) == true, "");
-+
-+  }
-+
-+  namespace test_constexpr
-+  {
-+
-+    template < typename CharT >
-+    unsigned long constexpr
-+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-+    {
-+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-+    }
-+
-+    template < typename CharT >
-+    unsigned long constexpr
-+    strlen_c(const CharT *const s) noexcept
-+    {
-+      return strlen_c_r(s, 0UL);
-+    }
-+
-+    static_assert(strlen_c("") == 0UL, "");
-+    static_assert(strlen_c("1") == 1UL, "");
-+    static_assert(strlen_c("example") == 7UL, "");
-+    static_assert(strlen_c("another\0example") == 7UL, "");
-+
-+  }
-+
-+  namespace test_rvalue_references
-+  {
-+
-+    template < int N >
-+    struct answer
-+    {
-+      static constexpr int value = N;
-+    };
-+
-+    answer<1> f(int&)       { return answer<1>(); }
-+    answer<2> f(const int&) { return answer<2>(); }
-+    answer<3> f(int&&)      { return answer<3>(); }
-+
-+    void
-+    test()
-+    {
-+      int i = 0;
-+      const int c = 0;
-+      static_assert(decltype(f(i))::value == 1, "");
-+      static_assert(decltype(f(c))::value == 2, "");
-+      static_assert(decltype(f(0))::value == 3, "");
-+    }
-+
-+  }
-+
-+  namespace test_uniform_initialization
-+  {
-+
-+    struct test
-+    {
-+      static const int zero {};
-+      static const int one {1};
-+    };
-+
-+    static_assert(test::zero == 0, "");
-+    static_assert(test::one == 1, "");
-+
-+  }
-+
-+  namespace test_lambdas
-+  {
-+
-+    void
-+    test1()
-+    {
-+      auto lambda1 = [](){};
-+      auto lambda2 = lambda1;
-+      lambda1();
-+      lambda2();
-+    }
-+
-+    int
-+    test2()
-+    {
-+      auto a = [](int i, int j){ return i + j; }(1, 2);
-+      auto b = []() -> int { return '0'; }();
-+      auto c = [=](){ return a + b; }();
-+      auto d = [&](){ return c; }();
-+      auto e = [a, &b](int x) mutable {
-+        const auto identity = [](int y){ return y; };
-+        for (auto i = 0; i < a; ++i)
-+          a += b--;
-+        return x + identity(a + b);
-+      }(0);
-+      return a + b + c + d + e;
-+    }
-+
-+    int
-+    test3()
-+    {
-+      const auto nullary = [](){ return 0; };
-+      const auto unary = [](int x){ return x; };
-+      using nullary_t = decltype(nullary);
-+      using unary_t = decltype(unary);
-+      const auto higher1st = [](nullary_t f){ return f(); };
-+      const auto higher2nd = [unary](nullary_t f1){
-+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-+      };
-+      return higher1st(nullary) + higher2nd(nullary)(unary);
-+    }
-+
-+  }
-+
-+  namespace test_variadic_templates
-+  {
-+
-+    template <int...>
-+    struct sum;
-+
-+    template <int N0, int... N1toN>
-+    struct sum<N0, N1toN...>
-+    {
-+      static constexpr auto value = N0 + sum<N1toN...>::value;
-+    };
-+
-+    template <>
-+    struct sum<>
-+    {
-+      static constexpr auto value = 0;
-+    };
-+
-+    static_assert(sum<>::value == 0, "");
-+    static_assert(sum<1>::value == 1, "");
-+    static_assert(sum<23>::value == 23, "");
-+    static_assert(sum<1, 2>::value == 3, "");
-+    static_assert(sum<5, 5, 11>::value == 21, "");
-+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-+
-+  }
-+
-+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-+  // because of this.
-+  namespace test_template_alias_sfinae
-+  {
-+
-+    struct foo {};
-+
-+    template<typename T>
-+    using member = typename T::member_type;
-+
-+    template<typename T>
-+    void func(...) {}
-+
-+    template<typename T>
-+    void func(member<T>*) {}
-+
-+    void test();
-+
-+    void test() { func<foo>(0); }
-+
-+  }
-+
-+}  // namespace cxx11
-+
-+#endif  // __cplusplus >= 201103L
-+
-+]])
-+
-+
-+dnl  Tests for new features in C++14
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-+
-+// If the compiler admits that it is not ready for C++14, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif __cplusplus < 201402L && !defined _MSC_VER
-+
-+#error "This is not a C++14 compiler"
-+
-+#else
-+
-+namespace cxx14
-+{
-+
-+  namespace test_polymorphic_lambdas
-+  {
-+
-+    int
-+    test()
-+    {
-+      const auto lambda = [](auto&&... args){
-+        const auto istiny = [](auto x){
-+          return (sizeof(x) == 1UL) ? 1 : 0;
-+        };
-+        const int aretiny[] = { istiny(args)... };
-+        return aretiny[0];
-+      };
-+      return lambda(1, 1L, 1.0f, '1');
-+    }
-+
-+  }
-+
-+  namespace test_binary_literals
-+  {
-+
-+    constexpr auto ivii = 0b0000000000101010;
-+    static_assert(ivii == 42, "wrong value");
-+
-+  }
-+
-+  namespace test_generalized_constexpr
-+  {
-+
-+    template < typename CharT >
-+    constexpr unsigned long
-+    strlen_c(const CharT *const s) noexcept
-+    {
-+      auto length = 0UL;
-+      for (auto p = s; *p; ++p)
-+        ++length;
-+      return length;
-+    }
-+
-+    static_assert(strlen_c("") == 0UL, "");
-+    static_assert(strlen_c("x") == 1UL, "");
-+    static_assert(strlen_c("test") == 4UL, "");
-+    static_assert(strlen_c("another\0test") == 7UL, "");
-+
-+  }
-+
-+  namespace test_lambda_init_capture
-+  {
-+
-+    int
-+    test()
-+    {
-+      auto x = 0;
-+      const auto lambda1 = [a = x](int b){ return a + b; };
-+      const auto lambda2 = [a = lambda1(x)](){ return a; };
-+      return lambda2();
-+    }
-+
-+  }
-+
-+  namespace test_digit_separators
-+  {
-+
-+    constexpr auto ten_million = 100'000'000;
-+    static_assert(ten_million == 100000000, "");
-+
-+  }
-+
-+  namespace test_return_type_deduction
-+  {
-+
-+    auto f(int& x) { return x; }
-+    decltype(auto) g(int& x) { return x; }
-+
-+    template < typename T1, typename T2 >
-+    struct is_same
-+    {
-+      static constexpr auto value = false;
-+    };
-+
-+    template < typename T >
-+    struct is_same<T, T>
-+    {
-+      static constexpr auto value = true;
-+    };
-+
-+    int
-+    test()
-+    {
-+      auto x = 0;
-+      static_assert(is_same<int, decltype(f(x))>::value, "");
-+      static_assert(is_same<int&, decltype(g(x))>::value, "");
-+      return x;
-+    }
-+
-+  }
-+
-+}  // namespace cxx14
-+
-+#endif  // __cplusplus >= 201402L
-+
-+]])
-+
-+
-+dnl  Tests for new features in C++17
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-+
-+// If the compiler admits that it is not ready for C++17, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L
-+
-+#error "This is not a C++17 compiler"
-+
-+#else
-+
-+#include <initializer_list>
-+#include <utility>
-+#include <type_traits>
-+
-+namespace cxx17
-+{
-+
-+  namespace test_constexpr_lambdas
-+  {
-+
-+    constexpr int foo = [](){return 42;}();
-+
-+  }
-+
-+  namespace test::nested_namespace::definitions
-+  {
-+
-+  }
-+
-+  namespace test_fold_expression
-+  {
-+
-+    template<typename... Args>
-+    int multiply(Args... args)
-+    {
-+      return (args * ... * 1);
-+    }
-+
-+    template<typename... Args>
-+    bool all(Args... args)
-+    {
-+      return (args && ...);
-+    }
-+
-+  }
-+
-+  namespace test_extended_static_assert
-+  {
-+
-+    static_assert (true);
-+
-+  }
-+
-+  namespace test_auto_brace_init_list
-+  {
-+
-+    auto foo = {5};
-+    auto bar {5};
-+
-+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-+    static_assert(std::is_same<int, decltype(bar)>::value);
-+  }
-+
-+  namespace test_typename_in_template_template_parameter
-+  {
-+
-+    template<template<typename> typename X> struct D;
-+
-+  }
-+
-+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-+  {
-+
-+    int f1()
-+    {
-+      return 42;
-+    }
-+
-+    [[nodiscard]] int f2()
-+    {
-+      [[maybe_unused]] auto unused = f1();
-+
-+      switch (f1())
-+      {
-+      case 17:
-+        f1();
-+        [[fallthrough]];
-+      case 42:
-+        f1();
-+      }
-+      return f1();
-+    }
-+
-+  }
-+
-+  namespace test_extended_aggregate_initialization
-+  {
-+
-+    struct base1
-+    {
-+      int b1, b2 = 42;
-+    };
-+
-+    struct base2
-+    {
-+      base2() {
-+        b3 = 42;
-+      }
-+      int b3;
-+    };
-+
-+    struct derived : base1, base2
-+    {
-+        int d;
-+    };
-+
-+    derived d1 {{1, 2}, {}, 4};  // full initialization
-+    derived d2 {{}, {}, 4};      // value-initialized bases
-+
-+  }
-+
-+  namespace test_general_range_based_for_loop
-+  {
-+
-+    struct iter
-+    {
-+      int i;
-+
-+      int& operator* ()
-+      {
-+        return i;
-+      }
-+
-+      const int& operator* () const
-+      {
-+        return i;
-+      }
-+
-+      iter& operator++()
-+      {
-+        ++i;
-+        return *this;
-+      }
-+    };
-+
-+    struct sentinel
-+    {
-+      int i;
-+    };
-+
-+    bool operator== (const iter& i, const sentinel& s)
-+    {
-+      return i.i == s.i;
-+    }
-+
-+    bool operator!= (const iter& i, const sentinel& s)
-+    {
-+      return !(i == s);
-+    }
-+
-+    struct range
-+    {
-+      iter begin() const
-+      {
-+        return {0};
-+      }
-+
-+      sentinel end() const
-+      {
-+        return {5};
-+      }
-+    };
-+
-+    void f()
-+    {
-+      range r {};
-+
-+      for (auto i : r)
-+      {
-+        [[maybe_unused]] auto v = i;
-+      }
-+    }
-+
-+  }
-+
-+  namespace test_lambda_capture_asterisk_this_by_value
-+  {
-+
-+    struct t
-+    {
-+      int i;
-+      int foo()
-+      {
-+        return [*this]()
-+        {
-+          return i;
-+        }();
-+      }
-+    };
-+
-+  }
-+
-+  namespace test_enum_class_construction
-+  {
-+
-+    enum class byte : unsigned char
-+    {};
-+
-+    byte foo {42};
-+
-+  }
-+
-+  namespace test_constexpr_if
-+  {
-+
-+    template <bool cond>
-+    int f ()
-+    {
-+      if constexpr(cond)
-+      {
-+        return 13;
-+      }
-+      else
-+      {
-+        return 42;
-+      }
-+    }
-+
-+  }
-+
-+  namespace test_selection_statement_with_initializer
-+  {
-+
-+    int f()
-+    {
-+      return 13;
-+    }
-+
-+    int f2()
-+    {
-+      if (auto i = f(); i > 0)
-+      {
-+        return 3;
-+      }
-+
-+      switch (auto i = f(); i + 4)
-+      {
-+      case 17:
-+        return 2;
-+
-+      default:
-+        return 1;
-+      }
-+    }
-+
-+  }
-+
-+  namespace test_template_argument_deduction_for_class_templates
-+  {
-+
-+    template <typename T1, typename T2>
-+    struct pair
-+    {
-+      pair (T1 p1, T2 p2)
-+        : m1 {p1},
-+          m2 {p2}
-+      {}
-+
-+      T1 m1;
-+      T2 m2;
-+    };
-+
-+    void f()
-+    {
-+      [[maybe_unused]] auto p = pair{13, 42u};
-+    }
-+
-+  }
-+
-+  namespace test_non_type_auto_template_parameters
-+  {
-+
-+    template <auto n>
-+    struct B
-+    {};
-+
-+    B<5> b1;
-+    B<'a'> b2;
-+
-+  }
-+
-+  namespace test_structured_bindings
-+  {
-+
-+    int arr[2] = { 1, 2 };
-+    std::pair<int, int> pr = { 1, 2 };
-+
-+    auto f1() -> int(&)[2]
-+    {
-+      return arr;
-+    }
-+
-+    auto f2() -> std::pair<int, int>&
-+    {
-+      return pr;
-+    }
-+
-+    struct S
-+    {
-+      int x1 : 2;
-+      volatile double y1;
-+    };
-+
-+    S f3()
-+    {
-+      return {};
-+    }
-+
-+    auto [ x1, y1 ] = f1();
-+    auto& [ xr1, yr1 ] = f1();
-+    auto [ x2, y2 ] = f2();
-+    auto& [ xr2, yr2 ] = f2();
-+    const auto [ x3, y3 ] = f3();
-+
-+  }
-+
-+  namespace test_exception_spec_type_system
-+  {
-+
-+    struct Good {};
-+    struct Bad {};
-+
-+    void g1() noexcept;
-+    void g2();
-+
-+    template<typename T>
-+    Bad
-+    f(T*, T*);
-+
-+    template<typename T1, typename T2>
-+    Good
-+    f(T1*, T2*);
-+
-+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-+
-+  }
-+
-+  namespace test_inline_variables
-+  {
-+
-+    template<class T> void f(T)
-+    {}
-+
-+    template<class T> inline T g(T)
-+    {
-+      return T{};
-+    }
-+
-+    template<> inline void f<>(int)
-+    {}
-+
-+    template<> int g<>(int)
-+    {
-+      return 5;
-+    }
-+
-+  }
-+
-+}  // namespace cxx17
-+
-+#endif  // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L
-+
-+]])
-+
-+
-+dnl  Tests for new features in C++20
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L
-+
-+#error "This is not a C++20 compiler"
-+
-+#else
-+
-+#include <version>
-+
-+namespace cxx20
-+{
-+
-+// As C++20 supports feature test macros in the standard, there is no
-+// immediate need to actually test for feature availability on the
-+// Autoconf side.
-+
-+}  // namespace cxx20
-+
-+#endif  // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L
-+
-+]])
-+
-+
-+dnl  Tests for new features in C++23
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_23], [[
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L
-+
-+#error "This is not a C++23 compiler"
-+
-+#else
-+
-+#include <version>
-+
-+namespace cxx23
-+{
-+
-+// As C++23 supports feature test macros in the standard, there is no
-+// immediate need to actually test for feature availability on the
-+// Autoconf side.
-+
-+}  // namespace cxx23
-+
-+#endif  // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L
-+
-+]])
-
-From e00b7f9250e0b7dae44e6b9191be0aa31d8cb668 Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Sat, 7 Dec 2024 18:18:02 -0800
-Subject: [PATCH 3/9] Stop shipping atf-*-api(3) manpages
-
-These manpages have been deprecated for at least a release. Remove them
-and all of the logic associated with them.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- Makefile.am  | 8 --------
- configure.ac | 3 ---
- 2 files changed, 11 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 913910c2..d202fd1d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -114,12 +114,4 @@ clean-all:
- 
- .PHONY: $(PHONY_TARGETS)
- 
--# TODO(jmmv): Remove after atf 0.22.
--install-data-hook:
--	cd $(DESTDIR)$(man3dir) && \
--	for binding in c c++ sh; do \
--	    rm -f "atf-$${binding}-api.3"; \
--	    $(LN_S) "atf-$${binding}.3" "atf-$${binding}-api.3"; \
--	done
--
- # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-diff --git a/configure.ac b/configure.ac
-index 6d802144..a2d68cee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,9 +74,6 @@ fi
- 
- KYUA_DEVELOPER_MODE([C,C++])
- 
--dnl TODO(jmmv): Remove once the atf-*-api.3 symlinks are removed.
--AC_PROG_LN_S
--
- ATF_MODULE_APPLICATION
- ATF_MODULE_DEFS
- ATF_MODULE_ENV
-
-From aa0fe99ef3de0f31dbaefb5268015258478d0ba4 Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Sat, 7 Dec 2024 18:20:47 -0800
-Subject: [PATCH 4/9] Expose WCOREDUMP(..) in a deterministic manner
-
-WCOREDUMP is considered an extension to the POSIX spec on multiple
-platforms, and thus is not automatically exposed on all platforms. Add the
-relevant preprocessor defines to config.h via autoconf, then leverage them
-in atf-c(3).
-
-This helps ensure that the platforms which support WCOREDUMP properly
-expose the macro.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- atf-c/detail/process.c | 2 ++
- configure.ac           | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/atf-c/detail/process.c b/atf-c/detail/process.c
-index 567d28ec..84bb4882 100644
---- a/atf-c/detail/process.c
-+++ b/atf-c/detail/process.c
-@@ -23,6 +23,8 @@
-  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
- 
-+#include "config.h"
-+
- #include "atf-c/detail/process.h"
- 
- #include <sys/types.h>
-diff --git a/configure.ac b/configure.ac
-index a2d68cee..3a88354b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,6 +58,8 @@ AM_PROG_CC_C_O
- dnl The C compiler check automatically aborts if the compiler does not work.
- dnl Nothing to do here.
- 
-+AC_USE_SYSTEM_EXTENSIONS
-+
- AC_PROG_CXX
- AC_LANG_COMPILER(C++)
- AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
-
-From deee8f2628847e3fff6fd2af04f163fadee4c61c Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Tue, 10 Dec 2024 14:26:58 -0800
-Subject: [PATCH 5/9] Add compiler feature detection for
- `__attribute__((nonnull))`
-
-This feature is being detected so several functions can be appropriately
-marked as taking non-NULL/-nullptr parameters, and the compiler and static
-analyzers can (in turn) make intelligent decisions when optimizing and
-analyzing code, respectively.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- atf-c/defs.h.in   |  1 +
- m4/module-defs.m4 | 21 +++++++++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/atf-c/defs.h.in b/atf-c/defs.h.in
-index 6059e7fd..5346e56a 100644
---- a/atf-c/defs.h.in
-+++ b/atf-c/defs.h.in
-@@ -27,6 +27,7 @@
- #define ATF_C_DEFS_H
- 
- #define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@
-+#define ATF_DEFS_ATTRIBUTE_NONNULL @ATTRIBUTE_NONNULL@
- #define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@
- #define ATF_DEFS_ATTRIBUTE_UNUSED @ATTRIBUTE_UNUSED@
- 
-diff --git a/m4/module-defs.m4 b/m4/module-defs.m4
-index b1c9cc84..feb3df27 100644
---- a/m4/module-defs.m4
-+++ b/m4/module-defs.m4
-@@ -54,6 +54,26 @@ test_printf(const char *format, ...)
-     AC_SUBST([ATTRIBUTE_FORMAT_PRINTF], [${value}])
- ])
- 
-+AC_DEFUN([ATF_ATTRIBUTE_NONNULL], [
-+    AC_CACHE_CHECK(
-+        [whether __attribute__((nonnull)) is supported],
-+        [kyua_cv_attribute_nonnull], [
-+        AC_COMPILE_IFELSE(
-+            [AC_LANG_PROGRAM([
-+void	func(char *foo __attribute__((nonnull)));
-+])],
-+        [kyua_cv_attribute_nonnull=yes],
-+	[kyua_cv_attribute_nonnull=no])
-+    ])
-+    if test x"${kyua_cv_attribute_nonnull}" = xyes; then
-+        value="__attribute__((nonnull))"
-+    else
-+        value=""
-+    fi
-+    AC_SUBST([ATTRIBUTE_NONNULL], [${value}])
-+])
-+
-+
- AC_DEFUN([ATF_ATTRIBUTE_NORETURN], [
-     dnl XXX This check is overly simple and should be fixed.  For example,
-     dnl Sun's cc does support the noreturn attribute but CC (the C++
-@@ -103,6 +123,7 @@ function(int a __attribute__((__unused__)))
- 
- AC_DEFUN([ATF_MODULE_DEFS], [
-     ATF_ATTRIBUTE_FORMAT_PRINTF
-+    ATF_ATTRIBUTE_NONNULL
-     ATF_ATTRIBUTE_NORETURN
-     ATF_ATTRIBUTE_UNUSED
- ])
-
-From 1ca4688b87e8bcb3bfc5c05ef61b385d59019383 Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Wed, 25 Dec 2024 11:31:12 -0800
-Subject: [PATCH 6/9] Restore AC_PROG_CPP
-
-This was accidentally deleted post-0.21 release. It's still needed by
-tests and build infrastructure.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 3a88354b..e42ee5e1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,6 +62,7 @@ AC_USE_SYSTEM_EXTENSIONS
- 
- AC_PROG_CXX
- AC_LANG_COMPILER(C++)
-+AC_PROG_CPP
- AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
- AC_CACHE_CHECK([whether the C++ compiler works],
-                [atf_cv_prog_cxx_works],
-
-From bff968f5a164a81819046c55881e6083a7607dcf Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Sat, 7 Dec 2024 18:12:02 -0800
-Subject: [PATCH 7/9] atf-c/detail/env.c: remove unnecessary complexity
-
-The libcalls used have been in the POSIX standard since 2008.1. Require
-them to be present instead of conditionally hoping they're present.
-
-This fixes an issue where the autoconf code was messing up with a
-combination of clang tools, which resulted in the autoconf code failing
-to properly determine whether or not the functions were available.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- atf-c/detail/env.c | 41 +++--------------------------------------
- configure.ac       |  1 -
- m4/module-env.m4   | 28 ----------------------------
- 3 files changed, 3 insertions(+), 67 deletions(-)
- delete mode 100644 m4/module-env.m4
-
-diff --git a/atf-c/detail/env.c b/atf-c/detail/env.c
-index 8ee3d697..36de217c 100644
---- a/atf-c/detail/env.c
-+++ b/atf-c/detail/env.c
-@@ -25,10 +25,6 @@
- 
- #include "atf-c/detail/env.h"
- 
--#if defined(HAVE_CONFIG_H)
--#include "config.h"
--#endif
--
- #include <errno.h>
- #include <stdlib.h>
- 
-@@ -65,25 +61,11 @@ atf_env_set(const char *name, const char *val)
- {
-     atf_error_t err;
- 
--#if defined(HAVE_SETENV)
-     if (setenv(name, val, 1) == -1)
--        err = atf_libc_error(errno, "Cannot set environment variable "
--                             "'%s' to '%s'", name, val);
-+        err = atf_libc_error(errno,
-+            "Cannot set environment variable '%s' to '%s'", name, val);
-     else
-         err = atf_no_error();
--#elif defined(HAVE_PUTENV)
--    char *buf;
--
--    err = atf_text_format(&buf, "%s=%s", name, val);
--    if (!atf_is_error(err)) {
--        if (putenv(buf) == -1)
--            err = atf_libc_error(errno, "Cannot set environment variable "
--                                 "'%s' to '%s'", name, val);
--        free(buf);
--    }
--#else
--#   error "Don't know how to set an environment variable."
--#endif
- 
-     return err;
- }
-@@ -91,24 +73,7 @@ atf_env_set(const char *name, const char *val)
- atf_error_t
- atf_env_unset(const char *name)
- {
--    atf_error_t err;
- 
--#if defined(HAVE_UNSETENV)
-     unsetenv(name);
--    err = atf_no_error();
--#elif defined(HAVE_PUTENV)
--    char *buf;
--
--    err = atf_text_format(&buf, "%s=", name);
--    if (!atf_is_error(err)) {
--        if (putenv(buf) == -1)
--            err = atf_libc_error(errno, "Cannot unset environment variable"
--                                 " '%s'", name);
--        free(buf);
--    }
--#else
--#   error "Don't know how to unset an environment variable."
--#endif
--
--    return err;
-+    return (atf_no_error());
- }
-diff --git a/configure.ac b/configure.ac
-index e42ee5e1..00ee124c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,7 +79,6 @@ KYUA_DEVELOPER_MODE([C,C++])
- 
- ATF_MODULE_APPLICATION
- ATF_MODULE_DEFS
--ATF_MODULE_ENV
- ATF_MODULE_FS
- 
- ATF_RUNTIME_TOOL([ATF_BUILD_CC],
-diff --git a/m4/module-env.m4 b/m4/module-env.m4
-deleted file mode 100644
-index 963aab38..00000000
---- a/m4/module-env.m4
-+++ /dev/null
-@@ -1,28 +0,0 @@
--dnl Copyright (c) 2007 The NetBSD Foundation, Inc.
--dnl All rights reserved.
--dnl
--dnl Redistribution and use in source and binary forms, with or without
--dnl modification, are permitted provided that the following conditions
--dnl are met:
--dnl 1. Redistributions of source code must retain the above copyright
--dnl    notice, this list of conditions and the following disclaimer.
--dnl 2. Redistributions in binary form must reproduce the above copyright
--dnl    notice, this list of conditions and the following disclaimer in the
--dnl    documentation and/or other materials provided with the distribution.
--dnl
--dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
--dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
--dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
--dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
--dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
--dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
--dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
--dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
--dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
--dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--AC_DEFUN([ATF_MODULE_ENV], [
--    AC_CHECK_FUNCS([putenv setenv unsetenv])
--])
-
-From 402b9362d01448074c4d2d91a8c770e591577167 Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Wed, 25 Dec 2024 17:19:28 -0800
-Subject: [PATCH 8/9] Remove ATF_BUILD_CXX require.progs check
-
-This particular check unfortunately doesn't work when ATF_BUILD_CXX
-contains multiple CXXFLAGS, or contains a path with spaces in it. Remove
-this check to unbreak the dependent tests
-post-793d4640031dc06ce8a239ffa9ab61322104c4ca.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- atf-c++/detail/test_helpers.hpp | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/atf-c++/detail/test_helpers.hpp b/atf-c++/detail/test_helpers.hpp
-index c1171801..1c4c316f 100644
---- a/atf-c++/detail/test_helpers.hpp
-+++ b/atf-c++/detail/test_helpers.hpp
-@@ -45,8 +45,6 @@
-     { \
-         set_md_var("descr", "Tests that the " hdrname " file can be " \
-             "included on its own, without any prerequisites"); \
--        const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \
--        set_md_var("require.progs", cxx); \
-     } \
-     ATF_TEST_CASE_BODY(name) \
-     { \
-@@ -58,8 +56,6 @@
-     ATF_TEST_CASE_HEAD(name) \
-     { \
-         set_md_var("descr", descr); \
--        const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \
--        set_md_var("require.progs", cxx); \
-     } \
-     ATF_TEST_CASE_BODY(name) \
-     { \
-
-From f054eebc616577d973fa6f3b4ec440bb29671c20 Mon Sep 17 00:00:00 2001
-From: Enji Cooper <ngie@FreeBSD.org>
-Date: Wed, 25 Dec 2024 20:17:15 -0800
-Subject: [PATCH 9/9] Remove redundant C++ toolchain check
-
-The C++ toolchain is sanity checked when C++14 conformance is checked;
-there's no reason why we need to check whether or not the C++ toolchain
-works again.
-
-Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
----
- configure.ac | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 00ee124c..e36f9817 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,16 +64,6 @@ AC_PROG_CXX
- AC_LANG_COMPILER(C++)
- AC_PROG_CPP
- AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
--AC_CACHE_CHECK([whether the C++ compiler works],
--               [atf_cv_prog_cxx_works],
--               [AC_LANG_PUSH([C++])
--                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
--                               [atf_cv_prog_cxx_works=yes],
--                               [atf_cv_prog_cxx_works=no])
--                AC_LANG_POP])
--if test "${atf_cv_prog_cxx_works}" = no; then
--    AC_MSG_ERROR([C++ compiler cannot create executables])
--fi
- 
- KYUA_DEVELOPER_MODE([C,C++])
- 
diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
deleted file mode 100644
index 253051ebf0f7..000000000000
--- a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Mon, 21 Oct 2024 17:42:24 +0200
-Subject: [PATCH] Mark Lua symbols as C symbols
-
-Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols.
----
- interpreter.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/interpreter.h b/interpreter.h
-index 6c405a1..c471ecb 100644
---- a/interpreter.h
-+++ b/interpreter.h
-@@ -9,9 +9,11 @@
- #define INTERPRETER_H_
- 
- // Due to longjmp behaviour, we must build Lua as C++ to avoid UB
-+extern "C" {
- #include <lua.h>
- #include <lualib.h>
- #include <lauxlib.h>
-+}
- 
- #include "common.h"
- #include <unordered_map>
--- 
-2.44.1
-
diff --git a/pkgs/by-name/ki/kikit/drop-versioneer.patch b/pkgs/by-name/ki/kikit/drop-versioneer.patch
deleted file mode 100644
index efddd64c7f23..000000000000
--- a/pkgs/by-name/ki/kikit/drop-versioneer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 9351fc9..75dfb2c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -66,9 +66,6 @@
-         "solidpython>=1.1.2",
-         "commentjson>=0.9"
-     ],
--    setup_requires=[
--        "versioneer"
--    ],
-     extras_require={
-         "dev": ["pytest"],
-     },
diff --git a/pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch b/pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch
deleted file mode 100644
index 2c8495908060..000000000000
--- a/pkgs/by-name/vp/vpkedit/patches/fix-standalone-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/gui/utility/Options.cpp
-+++ b/src/gui/utility/Options.cpp
-@@ -13,15 +13,7 @@
- QSettings* opts = nullptr;
- 
- bool Options::isStandalone() {
--#ifdef VPKEDIT_BUILD_FOR_STRATA_SOURCE
--	// Standalone mode is only used to check if we should write a physical config file.
--	// If we're building for a Strata Source game, we should just use the system registry.
--	// No need to pollute the bin folder!
--	return false;
--#else
--	QFileInfo nonportable(QApplication::applicationDirPath() + "/.nonportable");
--	return !(nonportable.exists() && nonportable.isFile());
--#endif
-+	return true;
- }
- 
- void Options::setupOptions(QSettings& options) {
diff --git a/pkgs/by-name/ze/zellij/rust-1.86.patch b/pkgs/by-name/ze/zellij/rust-1.86.patch
deleted file mode 100644
index bf938bfb3604..000000000000
--- a/pkgs/by-name/ze/zellij/rust-1.86.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 95ea43f1969d9f9ee50a701023b5f90cf36d3967 Mon Sep 17 00:00:00 2001
-From: tranzystorekk <tranzystorek.io@protonmail.com>
-Date: Thu, 3 Apr 2025 17:36:02 +0200
-Subject: [PATCH] fix(deps): fix --locked build on rust 1.86
-
----
- Cargo.lock | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 4b7bebbc67..83298ba165 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4084,7 +4084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5"
- dependencies = [
-  "leb128",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
- ]
- 
- [[package]]
-@@ -4099,9 +4099,9 @@ dependencies = [
- 
- [[package]]
- name = "wasmparser"
--version = "0.221.2"
-+version = "0.221.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083"
-+checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185"
- dependencies = [
-  "bitflags 2.5.0",
-  "hashbrown 0.15.2",
-@@ -4129,7 +4129,7 @@ checksum = "a80742ff1b9e6d8c231ac7c7247782c6fc5bce503af760bca071811e5fc9ee56"
- dependencies = [
-  "anyhow",
-  "termcolor",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
- ]
- 
- [[package]]
-@@ -4172,7 +4172,7 @@ dependencies = [
-  "target-lexicon",
-  "trait-variant",
-  "wasm-encoder 0.221.2",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
-  "wasmtime-asm-macros",
-  "wasmtime-cache",
-  "wasmtime-component-macro",
-@@ -4260,7 +4260,7 @@ dependencies = [
-  "smallvec",
-  "target-lexicon",
-  "thiserror 1.0.61",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
-  "wasmtime-environ",
-  "wasmtime-versioned-export-macros",
- ]
-@@ -4287,7 +4287,7 @@ dependencies = [
-  "smallvec",
-  "target-lexicon",
-  "wasm-encoder 0.221.2",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
-  "wasmprinter",
-  "wasmtime-component-util",
- ]
-@@ -4398,7 +4398,7 @@ dependencies = [
-  "gimli 0.31.1",
-  "object 0.36.7",
-  "target-lexicon",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
-  "wasmtime-cranelift",
-  "wasmtime-environ",
-  "winch-codegen",
-@@ -4635,7 +4635,7 @@ dependencies = [
-  "smallvec",
-  "target-lexicon",
-  "thiserror 1.0.61",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
-  "wasmtime-cranelift",
-  "wasmtime-environ",
- ]
-@@ -4893,9 +4893,9 @@ dependencies = [
- 
- [[package]]
- name = "wit-parser"
--version = "0.221.2"
-+version = "0.221.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbe1538eea6ea5ddbe5defd0dc82539ad7ba751e1631e9185d24a931f0a5adc8"
-+checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac"
- dependencies = [
-  "anyhow",
-  "id-arena",
-@@ -4906,7 +4906,7 @@ dependencies = [
-  "serde_derive",
-  "serde_json",
-  "unicode-xid",
-- "wasmparser 0.221.2",
-+ "wasmparser 0.221.3",
- ]
- 
- [[package]]
diff --git a/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch b/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch
deleted file mode 100644
index 4bd6916a6297..000000000000
--- a/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 6204ab9f989be3841c8c47e1e2cfe6a658fe16d5 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <seth@python.org>
-Date: Tue, 28 Jan 2025 14:09:00 -0600
-Subject: [PATCH 1/4] gh-105704: Disallow square brackets ( and ) in domain
- names for parsed URLs
-
----
- Lib/test/test_urlparse.py                     | 14 +++++++++++++
- Lib/urllib/parse.py                           | 20 +++++++++++++++++--
- ...-01-28-14-08-03.gh-issue-105704.EnhHxu.rst |  4 ++++
- 3 files changed, 36 insertions(+), 2 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-
-diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
-index 4516bdea6adb19..0f15a0998ff2ea 100644
---- a/Lib/test/test_urlparse.py
-+++ b/Lib/test/test_urlparse.py
-@@ -1412,6 +1412,20 @@ def test_invalid_bracketed_hosts(self):
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af::2309::fae7:1234]/Path?Query')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af:2309::fae7:1234:2342:438e:192.0.2.146]/Path?Query')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@]v6a.ip[/Path')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]/')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix/')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]?')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix?')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]/')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix')
- 
-     def test_splitting_bracketed_hosts(self):
-         p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query')
-diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
-index c412c729852272..9d51f4c6812b57 100644
---- a/Lib/urllib/parse.py
-+++ b/Lib/urllib/parse.py
-@@ -439,6 +439,23 @@ def _checknetloc(netloc):
-             raise ValueError("netloc '" + netloc + "' contains invalid " +
-                              "characters under NFKC normalization")
- 
-+def _check_bracketed_netloc(netloc):
-+    # Note that this function must mirror the splitting
-+    # done in NetlocResultMixins._hostinfo().
-+    hostname_and_port = netloc.rpartition('@')[2]
-+    before_bracket, have_open_br, bracketed = hostname_and_port.partition('[')
-+    if have_open_br:
-+        # No data is allowed before a bracket.
-+        if before_bracket:
-+            raise ValueError("Invalid IPv6 URL")
-+        hostname, _, port = bracketed.partition(']')
-+        # No data is allowed after the bracket but before the port delimiter.
-+        if port and not port.startswith(":"):
-+            raise ValueError("Invalid IPv6 URL")
-+    else:
-+        hostname, _, port = hostname_and_port.partition(':')
-+    _check_bracketed_host(hostname)
-+
- # Valid bracketed hosts are defined in
- # https://www.rfc-editor.org/rfc/rfc3986#page-49 and https://url.spec.whatwg.org/
- def _check_bracketed_host(hostname):
-@@ -505,8 +522,7 @@ def _urlsplit(url, scheme=None, allow_fragments=True):
-                 (']' in netloc and '[' not in netloc)):
-             raise ValueError("Invalid IPv6 URL")
-         if '[' in netloc and ']' in netloc:
--            bracketed_host = netloc.partition('[')[2].partition(']')[0]
--            _check_bracketed_host(bracketed_host)
-+            _check_bracketed_netloc(netloc)
-     if allow_fragments and '#' in url:
-         url, fragment = url.split('#', 1)
-     if '?' in url:
-diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-new file mode 100644
-index 00000000000000..aaeac71678de87
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-@@ -0,0 +1,4 @@
-+When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would
-+not reject domain names containing square brackets (``[`` and ``]``). Square
-+brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986
-+Section 3.2.2 <https://www.rfc-editor.org/rfc/rfc3986#section-3.2.2>`__.
-
-From 3ab35e8d890e2c5d4e6b0c0299f94775a3ded9ae Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <sethmichaellarson@gmail.com>
-Date: Thu, 30 Jan 2025 09:50:14 -0600
-Subject: [PATCH 2/4] Use Sphinx references
-
-Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
----
- .../Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst     | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-index aaeac71678de87..fb8674f558db59 100644
---- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-@@ -1,4 +1,4 @@
--When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would
-+When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would
- not reject domain names containing square brackets (``[`` and ``]``). Square
- brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986
- Section 3.2.2 <https://www.rfc-editor.org/rfc/rfc3986#section-3.2.2>`__.
-
-From ebf92bb4d323d41778e5de6df177b26f18ecf7f9 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <seth@python.org>
-Date: Thu, 30 Jan 2025 11:10:35 -0600
-Subject: [PATCH 3/4] Add mismatched bracket test cases, fix news format
-
----
- Lib/test/test_urlparse.py                              | 10 ++++++++++
- .../2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst     |  8 ++++----
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
-index 0f15a0998ff2ea..f8ce61b2b49621 100644
---- a/Lib/test/test_urlparse.py
-+++ b/Lib/test/test_urlparse.py
-@@ -1426,6 +1426,16 @@ def test_invalid_bracketed_hosts(self):
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip]')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip[')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip].suffix')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip[suffix')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix')
- 
-     def test_splitting_bracketed_hosts(self):
-         p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query')
-diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-index fb8674f558db59..bff1bc6b0d609c 100644
---- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst
-@@ -1,4 +1,4 @@
--When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would
--not reject domain names containing square brackets (``[`` and ``]``). Square
--brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986
--Section 3.2.2 <https://www.rfc-editor.org/rfc/rfc3986#section-3.2.2>`__.
-+When using :func:`urllib.parse.urlsplit` and :func:`urllib.parse.urlparse` host
-+parsing would not reject domain names containing square brackets (``[`` and
-+``]``). Square brackets are only valid for IPv6 and IPvFuture hosts according to
-+`RFC 3986 Section 3.2.2 <https://www.rfc-editor.org/rfc/rfc3986#section-3.2.2>`__.
-
-From 2817b2e29c8b28a24f9eb97abce1e1b60b1162fa Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <seth@python.org>
-Date: Thu, 30 Jan 2025 13:01:19 -0600
-Subject: [PATCH 4/4] Add more test coverage for ports
-
----
- Lib/test/test_urlparse.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
-index f8ce61b2b49621..b51cc006b73280 100644
---- a/Lib/test/test_urlparse.py
-+++ b/Lib/test/test_urlparse.py
-@@ -1424,6 +1424,15 @@ def test_invalid_bracketed_hosts(self):
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a1')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a1')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:1a')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:1a')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:/')
-+        self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:?')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix')
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip')
-@@ -1438,14 +1447,16 @@ def test_invalid_bracketed_hosts(self):
-         self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix')
- 
-     def test_splitting_bracketed_hosts(self):
--        p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query')
-+        p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]:1234/path?query')
-         self.assertEqual(p1.hostname, 'v6a.ip')
-         self.assertEqual(p1.username, 'user')
-         self.assertEqual(p1.path, '/path')
-+        self.assertEqual(p1.port, 1234)
-         p2 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query')
-         self.assertEqual(p2.hostname, '0439:23af:2309::fae7%test')
-         self.assertEqual(p2.username, 'user')
-         self.assertEqual(p2.path, '/path')
-+        self.assertIs(p2.port, None)
-         p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query')
-         self.assertEqual(p3.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test')
-         self.assertEqual(p3.username, 'user')
diff --git a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch
deleted file mode 100644
index 6ca6e8309462..000000000000
--- a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Sat, 13 Mar 2021 17:46:57 +0000
-Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106
-
-GLD is now outputting text with wrapping depending on the terminal
-width. This update is enough to get the tests to pass when running
-within "expect", which provides a PTY. It's almost certainly not
-enough for general use.
----
- t/104_override_usage.t           |  8 ++++++++
- t/107_no_auto_help.t             |  2 +-
- t/109_help_flag.t                |  2 +-
- t/110_sort_usage_by_attr_order.t | 12 ++++++++++++
- 4 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/t/104_override_usage.t b/t/104_override_usage.t
-index bc45029..6641540 100644
---- a/t/104_override_usage.t
-+++ b/t/104_override_usage.t
-@@ -61,9 +61,17 @@ use Test::Exception;
- \t--foo INT          A foo
- }
-         :
-+         $Getopt::Long::Descriptive::VERSION < 0.106 ?
-          qq{usage: 104_override_usage.t [-?] [long options...]
- \t-? --[no-]usage --[no-]help       Prints this usage information.
- \t--foo INT                         A foo
-+}
-+        :
-+         qq{usage: 104_override_usage.t [-?] [long options...]
-+\t--[no-]help (or -?)  Prints
-+\t             this usage information.
-+\t             aka --usage
-+\t--foo INT    A foo
- }
- 
-      ];
-diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t
-index 27f87f5..103df43 100644
---- a/t/107_no_auto_help.t
-+++ b/t/107_no_auto_help.t
-@@ -60,7 +60,7 @@ END {
- warning_like {
-     throws_ok { Class->new_with_options }
-            #usage: 107_no_auto_help.t [-?] [long options...]
--        qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --\E(\[no-\])?usage --(\[no-\])?\Qhelp\E\s+\QPrints this usage information.\E.\s+--configfile/ms,
-+        qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?\Qhelp\E(\Q (or -?)\E)?\s+\QPrints this usage information.\E.(\s+\Qaka --usage\E.)?\s+--configfile/ms,
-         'usage information looks good';
-     }
-     qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/,
-diff --git a/t/109_help_flag.t b/t/109_help_flag.t
-index 8c658e2..58dbca6 100644
---- a/t/109_help_flag.t
-+++ b/t/109_help_flag.t
-@@ -40,7 +40,7 @@ foreach my $args ( ['--help'], ['--usage'], ['--?'], ['-?'] )
-     local @ARGV = @$args;
- 
-     throws_ok { MyClass->new_with_options() }
--        qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\t\Q-? --\E(\[no-\])?usage --(\[no-\])?help\s+\QPrints this usage information.\E$/ms,
-+        qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?help(\Q (or -?)\E)?\s+Prints ?(.\s+)?\Qthis usage information.\E.(\s+\Qaka --usage\E.)?$/ms,
-         'Help request detected; usage information properly printed';
- }
- 
-diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t
-index e7dd177..7ec0c99 100644
---- a/t/110_sort_usage_by_attr_order.t
-+++ b/t/110_sort_usage_by_attr_order.t
-@@ -64,6 +64,18 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
-     --baz STR                         Documentation for "baz"
- USAGE
- }
-+if ( $Getopt::Long::Descriptive::VERSION >= 0.106 )
-+{
-+$expected = <<'USAGE';
-+usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
-+    --[no-]help (or -?)  Prints
-+                 this usage information.
-+                 aka --usage
-+    --foo STR    Documentation for "foo"
-+    --bar STR    Documentation for "bar"
-+    --baz STR    Documentation for "baz"
-+USAGE
-+}
- $expected =~ s/^[ ]{4}/\t/xmsg;
- is($obj->usage->text, $expected, 'Usage text has nicely sorted options');
- 
-
-From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Mon, 15 Mar 2021 10:43:14 +0000
-Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107
-
-GLD's use of Term::ReadKey has been reverted, so this update should now
-work reliably. Use with GLD 0.106 is not supported.
----
- t/104_override_usage.t           | 6 +++---
- t/110_sort_usage_by_attr_order.t | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/t/104_override_usage.t b/t/104_override_usage.t
-index 6641540..f7c6a31 100644
---- a/t/104_override_usage.t
-+++ b/t/104_override_usage.t
-@@ -61,15 +61,15 @@ use Test::Exception;
- \t--foo INT          A foo
- }
-         :
--         $Getopt::Long::Descriptive::VERSION < 0.106 ?
-+         # Note: Getopt::Long::Descriptive 0.106 not supported
-+         $Getopt::Long::Descriptive::VERSION < 0.107 ?
-          qq{usage: 104_override_usage.t [-?] [long options...]
- \t-? --[no-]usage --[no-]help       Prints this usage information.
- \t--foo INT                         A foo
- }
-         :
-          qq{usage: 104_override_usage.t [-?] [long options...]
--\t--[no-]help (or -?)  Prints
--\t             this usage information.
-+\t--[no-]help (or -?)  Prints this usage information.
- \t             aka --usage
- \t--foo INT    A foo
- }
-diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t
-index 7ec0c99..16cdaa1 100644
---- a/t/110_sort_usage_by_attr_order.t
-+++ b/t/110_sort_usage_by_attr_order.t
-@@ -64,12 +64,12 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
-     --baz STR                         Documentation for "baz"
- USAGE
- }
--if ( $Getopt::Long::Descriptive::VERSION >= 0.106 )
-+# Note: Getopt::Long::Descriptive 0.106 not supported
-+if ( $Getopt::Long::Descriptive::VERSION >= 0.107 )
- {
- $expected = <<'USAGE';
- usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
--    --[no-]help (or -?)  Prints
--                 this usage information.
-+    --[no-]help (or -?)  Prints this usage information.
-                  aka --usage
-     --foo STR    Documentation for "foo"
-     --bar STR    Documentation for "bar"
diff --git a/pkgs/development/python-modules/bytewax/remove-docs-test.patch b/pkgs/development/python-modules/bytewax/remove-docs-test.patch
deleted file mode 100644
index 93b2adad18dc..000000000000
--- a/pkgs/development/python-modules/bytewax/remove-docs-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 107cab8..34cc544 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -66,7 +66,6 @@ long_description_content_type = "text/markdown"
- addopts = "-v --doctest-modules"
- doctest_optionflags = "NORMALIZE_WHITESPACE"
- testpaths = [
--    "docs",
-     "pysrc",
-     "pytests",
- ]
diff --git a/pkgs/development/python-modules/pythreejs/fix-re.error.patch b/pkgs/development/python-modules/pythreejs/fix-re.error.patch
deleted file mode 100644
index 74e75676e7cb..000000000000
--- a/pkgs/development/python-modules/pythreejs/fix-re.error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setupbase.py b/setupbase.py
-index 0ce0ac8..7762e23 100644
---- a/setupbase.py
-+++ b/setupbase.py
-@@ -659,7 +659,7 @@ def _translate_glob(pat):
-         translated_parts.append(_translate_glob_part(part))
-     os_sep_class = '[%s]' % re.escape(SEPARATORS)
-     res = _join_translated(translated_parts, os_sep_class)
--    return '{res}\\Z(?ms)'.format(res=res)
-+    return '(?ms){res}\\Z'.format(res=res)
- 
- 
- def _join_translated(translated_parts, os_sep_class):
diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch b/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch
deleted file mode 100644
index 99debf22e5ae..000000000000
--- a/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Based on https://sourceforge.net/p/ruamel-yaml-clib/code/merge-requests/4/ with additions
-for `input_handler` and `output_handler`.
-
---- a/_ruamel_yaml.pxd
-+++ b/_ruamel_yaml.pxd
-@@ -2,15 +2,15 @@
- cdef extern from "_ruamel_yaml.h":
- 
-     void malloc(int l)
--    void memcpy(char *d, char *s, int l)
-+    void memcpy(unsigned char *d, char *s, int l)
-     int strlen(char *s)
-     int PyString_CheckExact(object o)
-     int PyUnicode_CheckExact(object o)
-     char *PyString_AS_STRING(object o)
-     int PyString_GET_SIZE(object o)
--    object PyString_FromStringAndSize(char *v, int l)
-+    object PyString_FromStringAndSize(unsigned char *v, size_t l)
-     object PyUnicode_FromString(char *u)
--    object PyUnicode_DecodeUTF8(char *u, int s, char *e)
-+    object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e)
-     object PyUnicode_AsUTF8String(object o)
-     int PY_MAJOR_VERSION
- 
-@@ -85,11 +85,11 @@
-         YAML_MAPPING_START_EVENT
-         YAML_MAPPING_END_EVENT
- 
--    ctypedef int yaml_read_handler_t(void *data, char *buffer,
--            int size, int *size_read) except 0
--
--    ctypedef int yaml_write_handler_t(void *data, char *buffer,
--            int size) except 0
-+    ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer,
-+            size_t size, size_t *size_read) except 0
-+
-+    ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer,
-+            size_t size) except 0
- 
-     ctypedef struct yaml_mark_t:
-         int index
-@@ -112,7 +112,7 @@
-         char *handle
-         char *suffix
-     ctypedef struct _yaml_token_scalar_data_t:
--        char *value
-+        unsigned char *value
-         int length
-         yaml_scalar_style_t style
-     ctypedef struct _yaml_token_version_directive_data_t:
-@@ -151,7 +151,7 @@
-     ctypedef struct _yaml_event_scalar_data_t:
-         char *anchor
-         char *tag
--        char *value
-+        unsigned char *value
-         int length
-         int plain_implicit
-         int quoted_implicit
---- a/_ruamel_yaml.pyx
-+++ b/_ruamel_yaml.pyx
-@@ -904,7 +904,7 @@
-                 raise error
-         return 1
-
--cdef int input_handler(void *data, char *buffer, int size, int *read) except 0:
-+cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0:
-     cdef CParser parser
-     parser = <CParser>data
-     if parser.stream_cache is None:
-@@ -1514,7 +1514,7 @@
-             self.ascend_resolver()
-         return 1
-
--cdef int output_handler(void *data, char *buffer, int size) except 0:
-+cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0:
-     cdef CEmitter emitter
-     emitter = <CEmitter>data
-     if emitter.dump_unicode == 0:
diff --git a/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch b/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch
deleted file mode 100644
index 3d77f45e3f86..000000000000
--- a/pkgs/tools/archivers/quickbms/0002-disable-openssl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile	2023-05-25 18:16:56.000296653 +0900
-+++ src/Makefile	2023-05-25 18:17:00.772272861 +0900
-@@ -23,7 +23,6 @@
- EXTRA_TARGETS  = libs/amiga/amiga.s libs/powzix/*.cpp
- CFLAGS += -msse2
- endif
--USE_OPENSSL	= 1
- endif
- 
- # -liconv and -fPIC are necessary on Android

From e5782299ea225ff7ab238495edbfcee857df6d1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 23:39:03 +0000
Subject: [PATCH 095/204] glamoroustoolkit: 1.1.22 -> 1.1.24

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

diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix
index 965d3dc66c34..94debf50ed1f 100644
--- a/pkgs/by-name/gl/glamoroustoolkit/package.nix
+++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix
@@ -27,12 +27,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glamoroustoolkit";
-  version = "1.1.22";
+  version = "1.1.24";
 
   src = fetchzip {
     url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
     stripRoot = false;
-    hash = "sha256-+YFQU7qCj2hpRuBpUn0hn5GNq+T0DHQFZwEoLu1FY4c=";
+    hash = "sha256-dTJ2YMNZwpZj3ZDWegjFr9aiaUtTpN8gY1wq5SAoVvs=";
   };
 
   nativeBuildInputs = [

From 0fc682e4800021335ae1efa18a853c364fc1e8b6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 25 May 2025 03:23:20 +0200
Subject: [PATCH 096/204] treewide: substitute pname for strings
 (python3Packages.[j-r].*)

---
 pkgs/development/python-modules/jax-jumpy/default.nix       | 2 +-
 pkgs/development/python-modules/jc/default.nix              | 2 +-
 pkgs/development/python-modules/jieba/default.nix           | 2 +-
 pkgs/development/python-modules/jishaku/default.nix         | 2 +-
 pkgs/development/python-modules/jmp/default.nix             | 2 +-
 pkgs/development/python-modules/jpylyzer/default.nix        | 2 +-
 pkgs/development/python-modules/jsonlines/default.nix       | 2 +-
 pkgs/development/python-modules/jsonrpc-async/default.nix   | 2 +-
 pkgs/development/python-modules/jsonschema-spec/default.nix | 2 +-
 pkgs/development/python-modules/jsonstreams/default.nix     | 2 +-
 pkgs/development/python-modules/junitparser/default.nix     | 2 +-
 pkgs/development/python-modules/justbackoff/default.nix     | 2 +-
 pkgs/development/python-modules/justbases/default.nix       | 2 +-
 pkgs/development/python-modules/justbytes/default.nix       | 2 +-
 pkgs/development/python-modules/kajiki/default.nix          | 2 +-
 .../python-modules/kaldi-active-grammar/default.nix         | 2 +-
 .../python-modules/karton-asciimagic/default.nix            | 2 +-
 .../python-modules/karton-config-extractor/default.nix      | 2 +-
 .../development/python-modules/karton-dashboard/default.nix | 2 +-
 .../python-modules/karton-mwdb-reporter/default.nix         | 2 +-
 .../python-modules/karton-yaramatcher/default.nix           | 2 +-
 pkgs/development/python-modules/keyboard/default.nix        | 2 +-
 pkgs/development/python-modules/kiss-headers/default.nix    | 2 +-
 pkgs/development/python-modules/klaus/default.nix           | 2 +-
 pkgs/development/python-modules/kml2geojson/default.nix     | 2 +-
 pkgs/development/python-modules/kornia/default.nix          | 4 ++--
 pkgs/development/python-modules/lanms-neo/default.nix       | 2 +-
 pkgs/development/python-modules/laszip/default.nix          | 2 +-
 pkgs/development/python-modules/libnacl/default.nix         | 2 +-
 pkgs/development/python-modules/lightparam/default.nix      | 2 +-
 pkgs/development/python-modules/limiter/default.nix         | 2 +-
 pkgs/development/python-modules/lineedit/default.nix        | 2 +-
 pkgs/development/python-modules/linkify-it-py/default.nix   | 2 +-
 pkgs/development/python-modules/liquidctl/default.nix       | 4 ++--
 pkgs/development/python-modules/livelossplot/default.nix    | 2 +-
 .../python-modules/lm-format-enforcer/default.nix           | 2 +-
 pkgs/development/python-modules/loca/default.nix            | 2 +-
 .../development/python-modules/logging-journald/default.nix | 2 +-
 pkgs/development/python-modules/logster/default.nix         | 2 +-
 pkgs/development/python-modules/loguru/default.nix          | 2 +-
 pkgs/development/python-modules/luddite/default.nix         | 2 +-
 pkgs/development/python-modules/luhn/default.nix            | 2 +-
 pkgs/development/python-modules/lyricwikia/default.nix      | 2 +-
 pkgs/development/python-modules/lzallright/default.nix      | 2 +-
 pkgs/development/python-modules/macholib/default.nix        | 2 +-
 pkgs/development/python-modules/macropy/default.nix         | 2 +-
 .../development/python-modules/markdown-include/default.nix | 2 +-
 pkgs/development/python-modules/markdown-it-py/default.nix  | 2 +-
 pkgs/development/python-modules/matchpy/default.nix         | 2 +-
 pkgs/development/python-modules/mbstrdecoder/default.nix    | 2 +-
 pkgs/development/python-modules/mcstatus/default.nix        | 2 +-
 .../python-modules/mdformat-beautysh/default.nix            | 2 +-
 .../python-modules/mdformat-footnote/default.nix            | 2 +-
 .../python-modules/mdformat-simple-breaks/default.nix       | 2 +-
 pkgs/development/python-modules/mdformat-tables/default.nix | 2 +-
 pkgs/development/python-modules/mdformat-toc/default.nix    | 2 +-
 pkgs/development/python-modules/mdit-py-plugins/default.nix | 2 +-
 pkgs/development/python-modules/mdurl/default.nix           | 2 +-
 pkgs/development/python-modules/mdutils/default.nix         | 2 +-
 pkgs/development/python-modules/meep/default.nix            | 2 +-
 pkgs/development/python-modules/mercantile/default.nix      | 2 +-
 pkgs/development/python-modules/meteocalc/default.nix       | 2 +-
 pkgs/development/python-modules/mhcgnomes/default.nix       | 4 ++--
 .../python-modules/midea-beautiful-air/default.nix          | 2 +-
 pkgs/development/python-modules/midea-local/default.nix     | 2 +-
 pkgs/development/python-modules/minimock/default.nix        | 2 +-
 .../development/python-modules/mkdocs-redirects/default.nix | 2 +-
 pkgs/development/python-modules/mkdocs/default.nix          | 4 ++--
 pkgs/development/python-modules/mock-open/default.nix       | 2 +-
 pkgs/development/python-modules/mongoengine/default.nix     | 2 +-
 pkgs/development/python-modules/moonraker-api/default.nix   | 2 +-
 .../development/python-modules/motioneye-client/default.nix | 2 +-
 .../python-modules/mpl-scatter-density/default.nix          | 2 +-
 pkgs/development/python-modules/mpldatacursor/default.nix   | 2 +-
 pkgs/development/python-modules/multimethod/default.nix     | 2 +-
 pkgs/development/python-modules/multiprocess/default.nix    | 2 +-
 pkgs/development/python-modules/mutf8/default.nix           | 2 +-
 pkgs/development/python-modules/mwdblib/default.nix         | 2 +-
 pkgs/development/python-modules/myhome/default.nix          | 2 +-
 pkgs/development/python-modules/myst-parser/default.nix     | 2 +-
 pkgs/development/python-modules/name-that-hash/default.nix  | 2 +-
 pkgs/development/python-modules/names/default.nix           | 2 +-
 .../python-modules/napari-plugin-engine/default.nix         | 2 +-
 pkgs/development/python-modules/nbclient/default.nix        | 2 +-
 pkgs/development/python-modules/ndspy/default.nix           | 2 +-
 pkgs/development/python-modules/nh3/default.nix             | 2 +-
 pkgs/development/python-modules/nmapthon2/default.nix       | 2 +-
 pkgs/development/python-modules/notify-py/default.nix       | 2 +-
 pkgs/development/python-modules/nptyping/default.nix        | 2 +-
 pkgs/development/python-modules/nsz/default.nix             | 2 +-
 pkgs/development/python-modules/numdifftools/default.nix    | 2 +-
 pkgs/development/python-modules/nxt-python/default.nix      | 2 +-
 pkgs/development/python-modules/oasatelematics/default.nix  | 2 +-
 pkgs/development/python-modules/ofxtools/default.nix        | 2 +-
 pkgs/development/python-modules/oletools/default.nix        | 2 +-
 pkgs/development/python-modules/opcua-widgets/default.nix   | 2 +-
 .../python-modules/openapi-schema-validator/default.nix     | 2 +-
 pkgs/development/python-modules/opensimplex/default.nix     | 2 +-
 pkgs/development/python-modules/opuslib/default.nix         | 4 ++--
 pkgs/development/python-modules/ormar/default.nix           | 2 +-
 pkgs/development/python-modules/oscrypto/default.nix        | 2 +-
 pkgs/development/python-modules/ospd/default.nix            | 2 +-
 pkgs/development/python-modules/ossfs/default.nix           | 2 +-
 pkgs/development/python-modules/ovmfvartool/default.nix     | 4 ++--
 pkgs/development/python-modules/palace/default.nix          | 2 +-
 pkgs/development/python-modules/param/default.nix           | 2 +-
 pkgs/development/python-modules/pathable/default.nix        | 2 +-
 pkgs/development/python-modules/pathos/default.nix          | 2 +-
 pkgs/development/python-modules/patiencediff/default.nix    | 2 +-
 pkgs/development/python-modules/patool/default.nix          | 2 +-
 pkgs/development/python-modules/pcapy-ng/default.nix        | 2 +-
 pkgs/development/python-modules/pcodedmp/default.nix        | 2 +-
 pkgs/development/python-modules/pem/default.nix             | 2 +-
 pkgs/development/python-modules/perfplot/default.nix        | 2 +-
 pkgs/development/python-modules/pescea/default.nix          | 4 ++--
 pkgs/development/python-modules/piccata/default.nix         | 2 +-
 pkgs/development/python-modules/picobox/default.nix         | 2 +-
 pkgs/development/python-modules/picosvg/default.nix         | 2 +-
 pkgs/development/python-modules/pilkit/default.nix          | 2 +-
 pkgs/development/python-modules/pims/default.nix            | 2 +-
 pkgs/development/python-modules/pinboard/default.nix        | 2 +-
 .../python-modules/pip-requirements-parser/default.nix      | 2 +-
 pkgs/development/python-modules/pip/default.nix             | 2 +-
 pkgs/development/python-modules/pipetools/default.nix       | 4 ++--
 pkgs/development/python-modules/pkce/default.nix            | 2 +-
 pkgs/development/python-modules/plac/default.nix            | 2 +-
 .../python-modules/plantuml-markdown/default.nix            | 2 +-
 pkgs/development/python-modules/pleroma-bot/default.nix     | 2 +-
 pkgs/development/python-modules/plotext/default.nix         | 2 +-
 pkgs/development/python-modules/plyer/default.nix           | 2 +-
 pkgs/development/python-modules/pmdsky-debug-py/default.nix | 2 +-
 .../python-modules/poetry-dynamic-versioning/default.nix    | 2 +-
 .../python-modules/polarizationsolver/default.nix           | 4 ++--
 pkgs/development/python-modules/polyline/default.nix        | 2 +-
 pkgs/development/python-modules/pomegranate/default.nix     | 2 +-
 pkgs/development/python-modules/powerline/default.nix       | 4 ++--
 .../development/python-modules/pre-commit-hooks/default.nix | 2 +-
 pkgs/development/python-modules/pretend/default.nix         | 2 +-
 pkgs/development/python-modules/prodict/default.nix         | 2 +-
 pkgs/development/python-modules/prompthub-py/default.nix    | 2 +-
 .../development/python-modules/protonvpn-nm-lib/default.nix | 2 +-
 pkgs/development/python-modules/psautohint/default.nix      | 2 +-
 pkgs/development/python-modules/psd-tools/default.nix       | 2 +-
 pkgs/development/python-modules/psygnal/default.nix         | 2 +-
 pkgs/development/python-modules/pulp/default.nix            | 2 +-
 pkgs/development/python-modules/pvextractor/default.nix     | 2 +-
 pkgs/development/python-modules/py-air-control/default.nix  | 2 +-
 pkgs/development/python-modules/py-canary/default.nix       | 2 +-
 pkgs/development/python-modules/py-cid/default.nix          | 2 +-
 pkgs/development/python-modules/py-cpuinfo/default.nix      | 2 +-
 pkgs/development/python-modules/py-desmume/default.nix      | 2 +-
 .../python-modules/py-dormakaba-dkey/default.nix            | 2 +-
 pkgs/development/python-modules/py-libzfs/default.nix       | 2 +-
 pkgs/development/python-modules/py-multiaddr/default.nix    | 2 +-
 pkgs/development/python-modules/py-multicodec/default.nix   | 2 +-
 pkgs/development/python-modules/py-multihash/default.nix    | 2 +-
 pkgs/development/python-modules/py-nightscout/default.nix   | 2 +-
 pkgs/development/python-modules/py-ubjson/default.nix       | 2 +-
 pkgs/development/python-modules/pyaftership/default.nix     | 2 +-
 pkgs/development/python-modules/pyahocorasick/default.nix   | 2 +-
 pkgs/development/python-modules/pyaxmlparser/default.nix    | 2 +-
 pkgs/development/python-modules/pyblackbird/default.nix     | 2 +-
 pkgs/development/python-modules/pybluez/default.nix         | 6 +++---
 pkgs/development/python-modules/pybravia/default.nix        | 2 +-
 pkgs/development/python-modules/pycapnp/default.nix         | 2 +-
 pkgs/development/python-modules/pycarwings2/default.nix     | 2 +-
 pkgs/development/python-modules/pycec/default.nix           | 2 +-
 pkgs/development/python-modules/pycfdns/default.nix         | 2 +-
 pkgs/development/python-modules/pychannels/default.nix      | 2 +-
 pkgs/development/python-modules/pycketcasts/default.nix     | 2 +-
 pkgs/development/python-modules/pyclimacell/default.nix     | 2 +-
 pkgs/development/python-modules/pyclip/default.nix          | 2 +-
 pkgs/development/python-modules/pycm/default.nix            | 2 +-
 pkgs/development/python-modules/pycyphal/default.nix        | 2 +-
 pkgs/development/python-modules/pydiscourse/default.nix     | 2 +-
 pkgs/development/python-modules/pydruid/default.nix         | 2 +-
 pkgs/development/python-modules/pyduke-energy/default.nix   | 2 +-
 pkgs/development/python-modules/pyeverlights/default.nix    | 2 +-
 pkgs/development/python-modules/pyevilgenius/default.nix    | 2 +-
 pkgs/development/python-modules/pyevmasm/default.nix        | 2 +-
 pkgs/development/python-modules/pyflexit/default.nix        | 2 +-
 pkgs/development/python-modules/pyflic/default.nix          | 2 +-
 pkgs/development/python-modules/pyfzf/default.nix           | 2 +-
 pkgs/development/python-modules/pyhcl/default.nix           | 2 +-
 pkgs/development/python-modules/pyhepmc/default.nix         | 2 +-
 pkgs/development/python-modules/pyhocon/default.nix         | 2 +-
 pkgs/development/python-modules/pyhomepilot/default.nix     | 2 +-
 pkgs/development/python-modules/pyialarm/default.nix        | 2 +-
 pkgs/development/python-modules/pyicloud/default.nix        | 2 +-
 .../python-modules/pyinstaller-versionfile/default.nix      | 2 +-
 pkgs/development/python-modules/pyinstrument/default.nix    | 2 +-
 pkgs/development/python-modules/pyjsparser/default.nix      | 4 ++--
 pkgs/development/python-modules/pykka/default.nix           | 2 +-
 pkgs/development/python-modules/pykostalpiko/default.nix    | 2 +-
 pkgs/development/python-modules/pykulersky/default.nix      | 2 +-
 pkgs/development/python-modules/pyld/default.nix            | 2 +-
 pkgs/development/python-modules/pylibdmtx/default.nix       | 2 +-
 pkgs/development/python-modules/pylint-celery/default.nix   | 2 +-
 pkgs/development/python-modules/pylru/default.nix           | 2 +-
 pkgs/development/python-modules/pyls-spyder/default.nix     | 2 +-
 pkgs/development/python-modules/pymailgunner/default.nix    | 2 +-
 pkgs/development/python-modules/pymanopt/default.nix        | 4 ++--
 pkgs/development/python-modules/pymarshal/default.nix       | 2 +-
 pkgs/development/python-modules/pymata-express/default.nix  | 2 +-
 pkgs/development/python-modules/pymorphy3/default.nix       | 2 +-
 pkgs/development/python-modules/pymysensors/default.nix     | 2 +-
 pkgs/development/python-modules/pynello/default.nix         | 2 +-
 pkgs/development/python-modules/pynetgear/default.nix       | 2 +-
 pkgs/development/python-modules/pynrrd/default.nix          | 2 +-
 pkgs/development/python-modules/pyobihai/default.nix        | 2 +-
 pkgs/development/python-modules/pyosf/default.nix           | 2 +-
 pkgs/development/python-modules/pypandoc/default.nix        | 2 +-
 pkgs/development/python-modules/pyparsing/default.nix       | 2 +-
 pkgs/development/python-modules/pyparted/default.nix        | 2 +-
 pkgs/development/python-modules/pypcap/default.nix          | 4 ++--
 pkgs/development/python-modules/pyprusalink/default.nix     | 2 +-
 pkgs/development/python-modules/pypsrp/default.nix          | 2 +-
 pkgs/development/python-modules/pyqvrpro/default.nix        | 2 +-
 pkgs/development/python-modules/pyrad/default.nix           | 4 ++--
 pkgs/development/python-modules/pyrituals/default.nix       | 2 +-
 pkgs/development/python-modules/pyrmvtransport/default.nix  | 2 +-
 pkgs/development/python-modules/pysaj/default.nix           | 2 +-
 pkgs/development/python-modules/pyscf/default.nix           | 2 +-
 pkgs/development/python-modules/pyschemes/default.nix       | 4 ++--
 pkgs/development/python-modules/pyshark/default.nix         | 2 +-
 pkgs/development/python-modules/pyshp/default.nix           | 2 +-
 pkgs/development/python-modules/pysmappee/default.nix       | 2 +-
 pkgs/development/python-modules/pysmartapp/default.nix      | 2 +-
 pkgs/development/python-modules/pysmt/default.nix           | 2 +-
 pkgs/development/python-modules/pysnooz/default.nix         | 2 +-
 pkgs/development/python-modules/pysnow/default.nix          | 2 +-
 pkgs/development/python-modules/pysonos/default.nix         | 2 +-
 pkgs/development/python-modules/pyspcwebgw/default.nix      | 2 +-
 pkgs/development/python-modules/pyspf/default.nix           | 2 +-
 pkgs/development/python-modules/pyspinel/default.nix        | 4 ++--
 pkgs/development/python-modules/pyspnego/default.nix        | 2 +-
 pkgs/development/python-modules/pysubs2/default.nix         | 2 +-
 pkgs/development/python-modules/pysvg-py3/default.nix       | 2 +-
 pkgs/development/python-modules/pytaglib/default.nix        | 2 +-
 pkgs/development/python-modules/pytautulli/default.nix      | 2 +-
 pkgs/development/python-modules/pyte/default.nix            | 2 +-
 pkgs/development/python-modules/pytesseract/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-cid/default.nix      | 2 +-
 .../development/python-modules/pytest-datafiles/default.nix | 2 +-
 .../python-modules/pytest-error-for-skips/default.nix       | 2 +-
 pkgs/development/python-modules/pytest-golden/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-isort/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-logdog/default.nix   | 2 +-
 .../python-modules/pytest-mockservers/default.nix           | 2 +-
 pkgs/development/python-modules/pytest-parallel/default.nix | 2 +-
 .../python-modules/pytest-param-files/default.nix           | 2 +-
 pkgs/development/python-modules/pytest-raises/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-randomly/default.nix | 2 +-
 .../python-modules/pytest-resource-path/default.nix         | 2 +-
 pkgs/development/python-modules/pytest-snapshot/default.nix | 2 +-
 pkgs/development/python-modules/pytest-testmon/default.nix  | 2 +-
 .../development/python-modules/pytest-tornasync/default.nix | 4 ++--
 pkgs/development/python-modules/pytest-trio/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-vcr/default.nix      | 2 +-
 pkgs/development/python-modules/python-ctags3/default.nix   | 2 +-
 pkgs/development/python-modules/python-decouple/default.nix | 2 +-
 .../python-modules/python-frontmatter/default.nix           | 2 +-
 .../python-modules/python-fullykiosk/default.nix            | 2 +-
 pkgs/development/python-modules/python-gammu/default.nix    | 2 +-
 .../python-modules/python-ironicclient/default.nix          | 2 +-
 .../python-modules/python-lsp-jsonrpc/default.nix           | 2 +-
 pkgs/development/python-modules/python-ndn/default.nix      | 2 +-
 pkgs/development/python-modules/python-pam/default.nix      | 2 +-
 pkgs/development/python-modules/python-pkcs11/default.nix   | 2 +-
 .../development/python-modules/python-rabbitair/default.nix | 2 +-
 pkgs/development/python-modules/python-twitter/default.nix  | 2 +-
 pkgs/development/python-modules/python-utils/default.nix    | 2 +-
 .../python-modules/python3-application/default.nix          | 2 +-
 pkgs/development/python-modules/pytimeparse2/default.nix    | 2 +-
 pkgs/development/python-modules/pytm/default.nix            | 2 +-
 pkgs/development/python-modules/pytomlpp/default.nix        | 2 +-
 pkgs/development/python-modules/pytricia/default.nix        | 4 ++--
 pkgs/development/python-modules/pyu2f/default.nix           | 2 +-
 pkgs/development/python-modules/pyupgrade/default.nix       | 2 +-
 pkgs/development/python-modules/pyuptimerobot/default.nix   | 2 +-
 pkgs/development/python-modules/pyversasense/default.nix    | 2 +-
 pkgs/development/python-modules/pyvis/default.nix           | 2 +-
 pkgs/development/python-modules/pyvmomi/default.nix         | 2 +-
 pkgs/development/python-modules/pywaterkotte/default.nix    | 2 +-
 .../python-modules/pyweatherflowrest/default.nix            | 2 +-
 pkgs/development/python-modules/pywizlight/default.nix      | 2 +-
 pkgs/development/python-modules/pyws66i/default.nix         | 2 +-
 pkgs/development/python-modules/pyxbe/default.nix           | 2 +-
 pkgs/development/python-modules/pyxdg/default.nix           | 2 +-
 pkgs/development/python-modules/pyxl3/default.nix           | 4 ++--
 pkgs/development/python-modules/pyzerproc/default.nix       | 2 +-
 pkgs/development/python-modules/qasync/default.nix          | 2 +-
 pkgs/development/python-modules/qpageview/default.nix       | 2 +-
 pkgs/development/python-modules/qtawesome/default.nix       | 2 +-
 pkgs/development/python-modules/qualysclient/default.nix    | 2 +-
 pkgs/development/python-modules/quantulum3/default.nix      | 2 +-
 pkgs/development/python-modules/questionary/default.nix     | 2 +-
 pkgs/development/python-modules/radian/default.nix          | 2 +-
 pkgs/development/python-modules/radiotherm/default.nix      | 2 +-
 pkgs/development/python-modules/rainbowstream/default.nix   | 4 ++--
 pkgs/development/python-modules/rank-bm25/default.nix       | 2 +-
 pkgs/development/python-modules/ratelimit/default.nix       | 2 +-
 pkgs/development/python-modules/rchitect/default.nix        | 2 +-
 pkgs/development/python-modules/recommonmark/default.nix    | 2 +-
 pkgs/development/python-modules/regional/default.nix        | 4 ++--
 pkgs/development/python-modules/releases/default.nix        | 2 +-
 pkgs/development/python-modules/reolink/default.nix         | 2 +-
 .../development/python-modules/requests-credssp/default.nix | 2 +-
 .../python-modules/requests-http-signature/default.nix      | 2 +-
 .../python-modules/requests-kerberos/default.nix            | 2 +-
 pkgs/development/python-modules/resampy/default.nix         | 2 +-
 pkgs/development/python-modules/responses/default.nix       | 2 +-
 pkgs/development/python-modules/retry-decorator/default.nix | 2 +-
 pkgs/development/python-modules/rfc6555/default.nix         | 2 +-
 .../development/python-modules/ripe-atlas-sagan/default.nix | 2 +-
 pkgs/development/python-modules/riscof/default.nix          | 2 +-
 pkgs/development/python-modules/riscv-isac/default.nix      | 2 +-
 .../python-modules/robotframework-requests/default.nix      | 2 +-
 pkgs/development/python-modules/rpi-bad-power/default.nix   | 2 +-
 pkgs/development/python-modules/rtoml/default.nix           | 2 +-
 pkgs/development/python-modules/ruffus/default.nix          | 2 +-
 pkgs/development/python-modules/rxv/default.nix             | 2 +-
 322 files changed, 345 insertions(+), 345 deletions(-)

diff --git a/pkgs/development/python-modules/jax-jumpy/default.nix b/pkgs/development/python-modules/jax-jumpy/default.nix
index 1fbda8b2cd3e..ac15b08f9203 100644
--- a/pkgs/development/python-modules/jax-jumpy/default.nix
+++ b/pkgs/development/python-modules/jax-jumpy/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
-    repo = pname;
+    repo = "jumpy";
     rev = version;
     hash = "sha256-tPQ/v2AVnAEC+08BVAvvgJ8Pj89nXZSn2tQ6nxXuSfA=";
   };
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index f4cc175118ee..5f2175449c48 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
-    repo = pname;
+    repo = "jc";
     tag = "v${version}";
     hash = "sha256-tv466jVjLtmn2U8t3sSyQLuzGcVf0RHtE+cFd8j8T5k=";
   };
diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix
index f1a80c7419ae..e67942b68207 100644
--- a/pkgs/development/python-modules/jieba/default.nix
+++ b/pkgs/development/python-modules/jieba/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # no tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "fxsjy";
-    repo = pname;
+    repo = "jieba";
     rev = "v${version}";
     sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk";
   };
diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix
index 5d3138f58234..aad075020bda 100644
--- a/pkgs/development/python-modules/jishaku/default.nix
+++ b/pkgs/development/python-modules/jishaku/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Gorialis";
-    repo = pname;
+    repo = "jishaku";
     tag = version;
     hash = "sha256-+J8Tr8jPN9K3eHLOuJTaP3We5A1kiyn9/yI1KChbuMY=";
   };
diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix
index 8ca03df1fe0f..4cfd27d57a8f 100644
--- a/pkgs/development/python-modules/jmp/default.nix
+++ b/pkgs/development/python-modules/jmp/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "deepmind";
-    repo = pname;
+    repo = "jmp";
     tag = "v${version}";
     hash = "sha256-+PefZU1209vvf1SfF8DXiTvKYEnZ4y8iiIr8yKikx9Y=";
   };
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix
index 951ce91ce43c..43803a6d67b3 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/pkgs/development/python-modules/jpylyzer/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "openpreserve";
-    repo = pname;
+    repo = "jpylyzer";
     rev = version;
     hash = "sha256-P42qAks8suI/Xknwd8WAkymbGE7RApRa/a11J/V4LA0=";
   };
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index b5f3da6150ff..ba7b8bebcdc8 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "wbolster";
-    repo = pname;
+    repo = "jsonlines";
     rev = version;
     hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE=";
   };
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 52224a0b8dcd..bed256951ca9 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "emlove";
-    repo = pname;
+    repo = "jsonrpc-async";
     rev = version;
     hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI=";
   };
diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix
index a3439ea1b824..eb6bb1030e62 100644
--- a/pkgs/development/python-modules/jsonschema-spec/default.nix
+++ b/pkgs/development/python-modules/jsonschema-spec/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "p1c2u";
-    repo = pname;
+    repo = "jsonschema-spec";
     tag = version;
     hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo=";
   };
diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix
index 49ffcee24b82..9367c986e06c 100644
--- a/pkgs/development/python-modules/jsonstreams/default.nix
+++ b/pkgs/development/python-modules/jsonstreams/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dcbaker";
-    repo = pname;
+    repo = "jsonstreams";
     rev = version;
     sha256 = "0qw74wz9ngz9wiv89vmilbifsbvgs457yn1bxnzhrh7g4vs2wcav";
   };
diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix
index 2ff93168391a..8833775b8074 100644
--- a/pkgs/development/python-modules/junitparser/default.nix
+++ b/pkgs/development/python-modules/junitparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "weiwei";
-    repo = pname;
+    repo = "junitparser";
     rev = version;
     hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw=";
   };
diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix
index e8c680a89d37..b41a856afb02 100644
--- a/pkgs/development/python-modules/justbackoff/default.nix
+++ b/pkgs/development/python-modules/justbackoff/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alexferl";
-    repo = pname;
+    repo = "justbackoff";
     rev = "v${version}";
     sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l";
   };
diff --git a/pkgs/development/python-modules/justbases/default.nix b/pkgs/development/python-modules/justbases/default.nix
index 98225e212d5d..d234eb3b7457 100644
--- a/pkgs/development/python-modules/justbases/default.nix
+++ b/pkgs/development/python-modules/justbases/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mulkieran";
-    repo = pname;
+    repo = "justbases";
     tag = "v${version}";
     hash = "sha256-XraUh3beI2JqKPRHYN5W3Tn3gg0GJCwhnhHIOFdzh6U=";
   };
diff --git a/pkgs/development/python-modules/justbytes/default.nix b/pkgs/development/python-modules/justbytes/default.nix
index cc662510a4a2..250744ffec64 100644
--- a/pkgs/development/python-modules/justbytes/default.nix
+++ b/pkgs/development/python-modules/justbytes/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mulkieran";
-    repo = pname;
+    repo = "justbytes";
     tag = "v${version}";
     hash = "sha256-+jwIK1ZU+j58VoOfZAm7GdFy7KHU28khwzxhYhcws74=";
   };
diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index ea26abeba91e..1632d83f1af9 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jackrosenthal";
-    repo = pname;
+    repo = "kajiki";
     tag = "v${version}";
     hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg=";
   };
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
index c26bbabb60c7..154809e96f76 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "daanzu";
-    repo = pname;
+    repo = "kaldi-active-grammar";
     rev = "v${version}";
     sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk";
   };
diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix
index 03abd44841fd..cfba1810c0bf 100644
--- a/pkgs/development/python-modules/karton-asciimagic/default.nix
+++ b/pkgs/development/python-modules/karton-asciimagic/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
-    repo = pname;
+    repo = "karton-asciimagic";
     tag = "v${version}";
     hash = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k=";
   };
diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix
index 36433de8852c..369eb4659fa4 100644
--- a/pkgs/development/python-modules/karton-config-extractor/default.nix
+++ b/pkgs/development/python-modules/karton-config-extractor/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
-    repo = pname;
+    repo = "karton-config-extractor";
     tag = "v${version}";
     hash = "sha256-a9wSw25q0blgAkR2s3brW7jGHJSLjx1yXjMmhMJNUFk=";
   };
diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix
index 7ea83ea1381b..d2b74a54e626 100644
--- a/pkgs/development/python-modules/karton-dashboard/default.nix
+++ b/pkgs/development/python-modules/karton-dashboard/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
-    repo = pname;
+    repo = "karton-dashboard";
     tag = "v${version}";
     hash = "sha256-VzBC7IATF8QBtTXMv4vmorAzBlImEsayjenQ2Uz5jIo=";
   };
diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
index 3fbfc306e6f4..9c63036226ac 100644
--- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
+++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
-    repo = pname;
+    repo = "karton-mwdb-reporter";
     tag = "v${version}";
     hash = "sha256-KJh9uJzVGYEEk1ed56ynKA/+dK9ouDB7L06xERjfjdc=";
   };
diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix
index cd98c09815b6..523dba33e895 100644
--- a/pkgs/development/python-modules/karton-yaramatcher/default.nix
+++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
-    repo = pname;
+    repo = "karton-yaramatcher";
     tag = "v${version}";
     hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U=";
   };
diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix
index 7620e272ea71..169d3c068318 100644
--- a/pkgs/development/python-modules/keyboard/default.nix
+++ b/pkgs/development/python-modules/keyboard/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "boppreh";
-    repo = pname;
+    repo = "keyboard";
     rev = "v${version}";
     hash = "sha256-U4GWhPp28azBE3Jn9xpLxudOKx0PjnYO77EM2HsJ9lM=";
   };
diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix
index 47b98e771175..3263941c69b6 100644
--- a/pkgs/development/python-modules/kiss-headers/default.nix
+++ b/pkgs/development/python-modules/kiss-headers/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Ousret";
-    repo = pname;
+    repo = "kiss-headers";
     tag = version;
     hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk=";
   };
diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index c120217683c6..640ea71d1f77 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jonashaag";
-    repo = pname;
+    repo = "klaus";
     rev = version;
     hash = "sha256-GflSDhBmMsQ34o3ApraEJ6GmlXXP2kK6WW3lsfr6b7g=";
   };
diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix
index 3b392a227aae..7674d73770f0 100644
--- a/pkgs/development/python-modules/kml2geojson/default.nix
+++ b/pkgs/development/python-modules/kml2geojson/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mrcagney";
-    repo = pname;
+    repo = "kml2geojson";
     rev = version;
     hash = "sha256-iJEcXpvy+Y3MkxAF2Q1Tkcx8GxUVjeVzv6gl134zdiI=";
   };
diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix
index d149caec9d0c..943bcf4931ac 100644
--- a/pkgs/development/python-modules/kornia/default.nix
+++ b/pkgs/development/python-modules/kornia/default.nix
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "kornia";
+    repo = "kornia";
     tag = "v${version}";
     hash = "sha256-pMCGL33DTnMLlxRbhBhRuR/ZA575+kbUJ59N3nuqpdI=";
   };
diff --git a/pkgs/development/python-modules/lanms-neo/default.nix b/pkgs/development/python-modules/lanms-neo/default.nix
index b4d734e5cda1..d829be9a0b3e 100644
--- a/pkgs/development/python-modules/lanms-neo/default.nix
+++ b/pkgs/development/python-modules/lanms-neo/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "gen-ko";
-    repo = pname;
+    repo = "lanms-neo";
     rev = "6510e19e731a1e105d42b2fbda64de41c169ce2e";
     hash = "sha256-0fs4RNN1ptiir7GfR9B8HK0VqTkk5PbVJxgKiDId3po=";
   };
diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix
index 461102cc69db..eb09169ae560 100644
--- a/pkgs/development/python-modules/laszip/default.nix
+++ b/pkgs/development/python-modules/laszip/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tmontaigu";
-    repo = pname;
+    repo = "laszip-python";
     rev = version;
     hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw=";
   };
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 265bfeab5443..863c624368e4 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "saltstack";
-    repo = pname;
+    repo = "libnacl";
     rev = "v${version}";
     hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo=";
   };
diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix
index 635827b45669..70467aadfc02 100644
--- a/pkgs/development/python-modules/lightparam/default.nix
+++ b/pkgs/development/python-modules/lightparam/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "portugueslab";
-    repo = pname;
+    repo = "lightparam";
     rev = "v${version}";
     sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i";
   };
diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix
index 4da1afdb4f88..ab7dc2851c51 100644
--- a/pkgs/development/python-modules/limiter/default.nix
+++ b/pkgs/development/python-modules/limiter/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alexdelorenzo";
-    repo = pname;
+    repo = "limiter";
     rev = "v${version}";
     hash = "sha256-2Et4ozVf9t+tp2XtLbDk/LgLIU+jQAEAlU8hA5lpxdk=";
   };
diff --git a/pkgs/development/python-modules/lineedit/default.nix b/pkgs/development/python-modules/lineedit/default.nix
index 51f5e5a83407..dd892eca9981 100644
--- a/pkgs/development/python-modules/lineedit/default.nix
+++ b/pkgs/development/python-modules/lineedit/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "randy3k";
-    repo = pname;
+    repo = "lineedit";
     rev = "v${version}";
     sha256 = "fq2NpjIQkIq1yzXEUxi6cz80kutVqcH6MqJXHtpTFsk=";
   };
diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix
index 6ca3fd64c917..2f4bb1c01422 100644
--- a/pkgs/development/python-modules/linkify-it-py/default.nix
+++ b/pkgs/development/python-modules/linkify-it-py/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tsutsu3";
-    repo = pname;
+    repo = "linkify-it-py";
     tag = "v${version}";
     hash = "sha256-BLwIityUZDVdSbvTpLf6QUlZUavWzG/45Nfffn18/vU=";
   };
diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix
index 64652c948c67..89baf11fa20c 100644
--- a/pkgs/development/python-modules/liquidctl/default.nix
+++ b/pkgs/development/python-modules/liquidctl/default.nix
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "liquidctl";
+    repo = "liquidctl";
     tag = "v${version}";
     hash = "sha256-ifYPUAF0lR9aCwiseNQZXbq+d+CXD/MwnZQhAM1TRLI=";
   };
diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix
index 80ef631363e9..7fb95e0b8d2e 100644
--- a/pkgs/development/python-modules/livelossplot/default.nix
+++ b/pkgs/development/python-modules/livelossplot/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stared";
-    repo = pname;
+    repo = "livelossplot";
     tag = "v${version}";
     hash = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA=";
   };
diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix
index 26764b305987..c44943046550 100644
--- a/pkgs/development/python-modules/lm-format-enforcer/default.nix
+++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "noamgat";
-    repo = pname;
+    repo = "lm-format-enforcer";
     tag = "v${version}";
     hash = "sha256-8BsfA1R/X+wA0H0MqQKn+CljUIT8VdoInoczSGvu74o=";
   };
diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix
index 73b88dee28e9..87969790bb89 100644
--- a/pkgs/development/python-modules/loca/default.nix
+++ b/pkgs/development/python-modules/loca/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromSourcehut {
     owner = "~cnx";
-    repo = pname;
+    repo = "loca";
     rev = version;
     sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g";
   };
diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix
index 14b1ac2ce6fc..3dd36d8d1b2b 100644
--- a/pkgs/development/python-modules/logging-journald/default.nix
+++ b/pkgs/development/python-modules/logging-journald/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mosquito";
-    repo = pname;
+    repo = "logging-journald";
     tag = version;
     hash = "sha256-RQ9opkAOZfhYuqOXJ2Mtnig8soL+lCveYH2YdXL1AGM=";
   };
diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix
index 19fa5b64b9ed..0db0a88dacb6 100644
--- a/pkgs/development/python-modules/logster/default.nix
+++ b/pkgs/development/python-modules/logster/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "etsy";
-    repo = pname;
+    repo = "logster";
     rev = version;
     sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q";
   };
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 5fa1a0251bc5..062e33372d36 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Delgan";
-    repo = pname;
+    repo = "loguru";
     tag = version;
     hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4=";
   };
diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix
index 435db8725cd0..5a421d68218a 100644
--- a/pkgs/development/python-modules/luddite/default.nix
+++ b/pkgs/development/python-modules/luddite/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jumptrading";
-    repo = pname;
+    repo = "luddite";
     tag = "v${version}";
     hash = "sha256-iJ3h1XRBzLd4cBKFPNOlIV5Z5XJ/miscfIdkpPIpbJ8=";
   };
diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix
index b0407235fe0a..888d0913ba06 100644
--- a/pkgs/development/python-modules/luhn/default.nix
+++ b/pkgs/development/python-modules/luhn/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mmcloughlin";
-    repo = pname;
+    repo = "luhn";
     rev = version;
     hash = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18=";
   };
diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix
index a465014b5951..24b46b47a25b 100644
--- a/pkgs/development/python-modules/lyricwikia/default.nix
+++ b/pkgs/development/python-modules/lyricwikia/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "enricobacis";
-    repo = pname;
+    repo = "lyricwikia";
     tag = version;
     hash = "sha256-P88DrRAa2zptt8JLy0/PLi0oZ/BghF/XGSP0kOObi7E=";
   };
diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix
index 9c6bd3cf1c60..fe9a2212b62e 100644
--- a/pkgs/development/python-modules/lzallright/default.nix
+++ b/pkgs/development/python-modules/lzallright/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vlaci";
-    repo = pname;
+    repo = "lzallright";
     rev = "v${version}";
     hash = "sha256-E4Eaah58JCbxXfmpqFS2Emi1/eo2L3qyJP+vWH3PHPg=";
   };
diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix
index 6bf2ec3eeeb7..d1fd68b020e7 100644
--- a/pkgs/development/python-modules/macholib/default.nix
+++ b/pkgs/development/python-modules/macholib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
-    repo = pname;
+    repo = "macholib";
     rev = "v${version}";
     hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY=";
   };
diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix
index d87d2de44bb5..6a9de5a4f57c 100644
--- a/pkgs/development/python-modules/macropy/default.nix
+++ b/pkgs/development/python-modules/macropy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "lihaoyi";
-    repo = pname;
+    repo = "macropy";
     rev = "v${version}";
     sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf";
   };
diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix
index 69da5c6ae1c6..a1797b5ecd8d 100644
--- a/pkgs/development/python-modules/markdown-include/default.nix
+++ b/pkgs/development/python-modules/markdown-include/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # only wheel on pypi
   src = fetchFromGitHub {
     owner = "cmacmackin";
-    repo = pname;
+    repo = "markdown-include";
     tag = "v${version}";
     hash = "sha256-1MEk0U00a5cpVhqnDZkwBIk4NYgsRXTVsI/ANNQ/OH0=";
   };
diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix
index 8aa6678241f2..4ccd9e7b5bcd 100644
--- a/pkgs/development/python-modules/markdown-it-py/default.nix
+++ b/pkgs/development/python-modules/markdown-it-py/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "executablebooks";
-    repo = pname;
+    repo = "markdown-it-py";
     tag = "v${version}";
     hash = "sha256-cmjLElJA61EysTUFMVY++Kw0pI4wOIXOyCY3To9fpQc=";
   };
diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix
index 304f143b884b..d582af3fbecf 100644
--- a/pkgs/development/python-modules/matchpy/default.nix
+++ b/pkgs/development/python-modules/matchpy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "HPAC";
-    repo = pname;
+    repo = "matchpy";
     rev = version;
     hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA=";
   };
diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix
index b9bb0227dc35..c914816defa5 100644
--- a/pkgs/development/python-modules/mbstrdecoder/default.nix
+++ b/pkgs/development/python-modules/mbstrdecoder/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "mbstrdecoder";
     tag = "v${version}";
     hash = "sha256-rJ3Q7/xYPO0jBuzhYm2aIhPar2tbJIxHnHR0y0HWtik=";
   };
diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index a58c2aad44b7..92912f5f477a 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "py-mine";
-    repo = pname;
+    repo = "mcstatus";
     tag = "v${version}";
     hash = "sha256-P8Su5P/ztyoXZBVvm5uCMDn4ezeg11oRSQ0QCyIJbVw=";
   };
diff --git a/pkgs/development/python-modules/mdformat-beautysh/default.nix b/pkgs/development/python-modules/mdformat-beautysh/default.nix
index b0015e740382..2b5d8fd23fab 100644
--- a/pkgs/development/python-modules/mdformat-beautysh/default.nix
+++ b/pkgs/development/python-modules/mdformat-beautysh/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hukkin";
-    repo = pname;
+    repo = "mdformat-beautysh";
     tag = version;
     hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw=";
   };
diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix
index a5cdee5cfcea..47f7dfe3e1f7 100644
--- a/pkgs/development/python-modules/mdformat-footnote/default.nix
+++ b/pkgs/development/python-modules/mdformat-footnote/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "executablebooks";
-    repo = pname;
+    repo = "mdformat-footnote";
     tag = "v${version}";
     hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo=";
   };
diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
index 9da3ed6de832..0f7c36fc86b2 100644
--- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
+++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "csala";
-    repo = pname;
+    repo = "mdformat-simple-breaks";
     tag = "v${version}";
     hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0=";
   };
diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix
index c1bf086d863b..c600efbb2f72 100644
--- a/pkgs/development/python-modules/mdformat-tables/default.nix
+++ b/pkgs/development/python-modules/mdformat-tables/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "executablebooks";
-    repo = pname;
+    repo = "mdformat-tables";
     tag = "v${version}";
     hash = "sha256-7MbpGBGprhGrQ9P31HUU2h0bjyHWap6DETVN/dCDA1w=";
   };
diff --git a/pkgs/development/python-modules/mdformat-toc/default.nix b/pkgs/development/python-modules/mdformat-toc/default.nix
index 325c85a67c29..1b2fd6af0164 100644
--- a/pkgs/development/python-modules/mdformat-toc/default.nix
+++ b/pkgs/development/python-modules/mdformat-toc/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hukkin";
-    repo = pname;
+    repo = "mdformat-toc";
     tag = version;
     hash = "sha256-3EX6kGez408tEYiR9VSvi3GTrb4ds+HJwpFflv77nkg=";
   };
diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix
index 92362d5e02fc..e15183ec07f2 100644
--- a/pkgs/development/python-modules/mdit-py-plugins/default.nix
+++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "executablebooks";
-    repo = pname;
+    repo = "mdit-py-plugins";
     tag = "v${version}";
     hash = "sha256-aY2DMLh1OkWVcN6A29FLba1ETerf/EOqSjHVpsdE21M=";
   };
diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix
index 6a5e3a7cdc73..8e053530f396 100644
--- a/pkgs/development/python-modules/mdurl/default.nix
+++ b/pkgs/development/python-modules/mdurl/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hukkin";
-    repo = pname;
+    repo = "mdurl";
     rev = version;
     hash = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM=";
   };
diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix
index 49334a6e54a7..d6ff38e1a6ed 100644
--- a/pkgs/development/python-modules/mdutils/default.nix
+++ b/pkgs/development/python-modules/mdutils/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "didix21";
-    repo = pname;
+    repo = "mdutils";
     tag = "v${version}";
     hash = "sha256-xF6z63CjL/qSBQsm/fSTQhwpg9yJU4qrY06cjn1PbCk=";
   };
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 3db5517dafeb..16920fd860be 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "NanoComp";
-    repo = pname;
+    repo = "meep";
     tag = "v${version}";
     hash = "sha256-9cQHvwUAeop5dRMVvedph+KQvTcmnkHdfqPQlSY280c=";
   };
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 7fd6e040a2af..9d8f59cbef96 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mapbox";
-    repo = pname;
+    repo = "mercantile";
     rev = version;
     hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
   };
diff --git a/pkgs/development/python-modules/meteocalc/default.nix b/pkgs/development/python-modules/meteocalc/default.nix
index 38c39d7d42ca..75008e31fd1a 100644
--- a/pkgs/development/python-modules/meteocalc/default.nix
+++ b/pkgs/development/python-modules/meteocalc/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "malexer";
-    repo = pname;
+    repo = "meteocalc";
     rev = version;
     hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk=";
   };
diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix
index 9a1a470d7a72..f409daef50ec 100644
--- a/pkgs/development/python-modules/mhcgnomes/default.nix
+++ b/pkgs/development/python-modules/mhcgnomes/default.nix
@@ -7,14 +7,14 @@
   serializable,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "mhcgnomes";
   version = "1.8.6";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pirl-unc";
-    repo = pname;
+    repo = "mhcgnomes";
     # See https://github.com/pirl-unc/mhcgnomes/issues/20. As of 2023-07-13,
     # they do no have version tags.
     rev = "c7e779b60e35a031f6e0f0ea6ae70e8a8e7671c6";
diff --git a/pkgs/development/python-modules/midea-beautiful-air/default.nix b/pkgs/development/python-modules/midea-beautiful-air/default.nix
index 628675325a23..22cbfb5fbd99 100644
--- a/pkgs/development/python-modules/midea-beautiful-air/default.nix
+++ b/pkgs/development/python-modules/midea-beautiful-air/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nbogojevic";
-    repo = pname;
+    repo = "midea-beautiful-air";
     tag = "v${version}";
     hash = "sha256-786Q085bv8Zsm0c55I4XalRhEfwElRTJds5qnb0cWhk=";
   };
diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix
index b0dfd7746e42..47d827f46c82 100644
--- a/pkgs/development/python-modules/midea-local/default.nix
+++ b/pkgs/development/python-modules/midea-local/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "midea-lan";
-    repo = pname;
+    repo = "midea-local";
     tag = "v${version}";
     hash = "sha256-zXOxgPFX6TRdFnQ0OqqEu1sy9MmlfxEg7KedQWxYv48=";
   };
diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix
index 63e8ef0b3778..a10fa1f89a7f 100644
--- a/pkgs/development/python-modules/minimock/default.nix
+++ b/pkgs/development/python-modules/minimock/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "lowks";
-    repo = pname;
+    repo = "minimock";
     rev = "v${version}";
     hash = "sha256-Ut3iKc7Sr28uGgWCV3K3CS+gBta2icvbUPMjjo4fflU=";
   };
diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix
index 6a2d973b1af6..db31a2076db7 100644
--- a/pkgs/development/python-modules/mkdocs-redirects/default.nix
+++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mkdocs";
-    repo = pname;
+    repo = "mkdocs-redirects";
     tag = "v${version}";
     hash = "sha256-YsMA00yajeGSqSB6CdKxGqyClC9Cgc3ImRBTucHEHhs=";
   };
diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix
index 2a2a49fd9b91..8151b8728526 100644
--- a/pkgs/development/python-modules/mkdocs/default.nix
+++ b/pkgs/development/python-modules/mkdocs/default.nix
@@ -42,8 +42,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "mkdocs";
+    repo = "mkdocs";
     tag = version;
     hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak=";
   };
diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix
index 3cf1095b20ea..ee0cade32736 100644
--- a/pkgs/development/python-modules/mock-open/default.nix
+++ b/pkgs/development/python-modules/mock-open/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # no tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "nivbend";
-    repo = pname;
+    repo = "mock-open";
     rev = "v${version}";
     sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm";
   };
diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
index 1d273556bc06..a65c74c5c27e 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "MongoEngine";
-    repo = pname;
+    repo = "mongoengine";
     tag = "v${version}";
     hash = "sha256-trWCKmCa+q+qtzF0HKCZMnko1cvvpwJvczLFuKtB83E=";
   };
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index a733f70a824c..f45195078d38 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cmroche";
-    repo = pname;
+    repo = "moonraker-api";
     tag = "v${version}";
     hash = "sha256-AwSHF9BbxKBXIQdG4OX1vYYP/ST4jSz3uMMDUx0MSEg=";
   };
diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index 487de3c3228c..8af5521584c1 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dermotduffy";
-    repo = pname;
+    repo = "motioneye-client";
     rev = "v${version}";
     hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8=";
   };
diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix
index f8b4444ec0d8..bbf5d732b29c 100644
--- a/pkgs/development/python-modules/mpl-scatter-density/default.nix
+++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "astrofrog";
-    repo = pname;
+    repo = "mpl-scatter-density";
     tag = "v${version}";
     hash = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE=";
   };
diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix
index 4b33f34b93ed..ca1721ea8ecf 100644
--- a/pkgs/development/python-modules/mpldatacursor/default.nix
+++ b/pkgs/development/python-modules/mpldatacursor/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "joferkington";
-    repo = pname;
+    repo = "mpldatacursor";
     rev = "v${version}";
     sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda";
   };
diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix
index 048ed3cd91a2..e8f3d7fe965b 100644
--- a/pkgs/development/python-modules/multimethod/default.nix
+++ b/pkgs/development/python-modules/multimethod/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "coady";
-    repo = pname;
+    repo = "multimethod";
     tag = "v${version}";
     hash = "sha256-/91re2K+nVKULJOjDoimpOukQlLlsMS9blkVQWit2eI=";
   };
diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix
index 520f9d2846bf..b6d7620a4aef 100644
--- a/pkgs/development/python-modules/multiprocess/default.nix
+++ b/pkgs/development/python-modules/multiprocess/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "uqfoundation";
-    repo = pname;
+    repo = "multiprocess";
     tag = version;
     hash = "sha256-TKD0iQv5Go4PrKWtVOF6FJG1tkvs3APxPlhDVEs7YXE=";
   };
diff --git a/pkgs/development/python-modules/mutf8/default.nix b/pkgs/development/python-modules/mutf8/default.nix
index c7d2afdd1308..ab7bde62fc6b 100644
--- a/pkgs/development/python-modules/mutf8/default.nix
+++ b/pkgs/development/python-modules/mutf8/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "TkTech";
-    repo = pname;
+    repo = "mutf8";
     rev = "v${version}";
     hash = "sha256-4Ojn3t0EbOVdrYEiY8JegJuvW9sz8jt9tKFwOluiGQo=";
   };
diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix
index a987296aaf89..154d2eba925f 100644
--- a/pkgs/development/python-modules/mwdblib/default.nix
+++ b/pkgs/development/python-modules/mwdblib/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
-    repo = pname;
+    repo = "mwdblib";
     tag = "v${version}";
     hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag=";
   };
diff --git a/pkgs/development/python-modules/myhome/default.nix b/pkgs/development/python-modules/myhome/default.nix
index ce22d1a25c63..a8a1485522ef 100644
--- a/pkgs/development/python-modules/myhome/default.nix
+++ b/pkgs/development/python-modules/myhome/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "speijnik";
-    repo = pname;
+    repo = "myhome";
     rev = "v${version}";
     hash = "sha256-DJzwvgvSA9Q0kpueUoQV64pdDDNA7WzGu7r+g5aqutk=";
   };
diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index 8e1ab236ac48..ca8edc4a3720 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "executablebooks";
-    repo = pname;
+    repo = "myst-parser";
     tag = "v${version}";
     hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0=";
   };
diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix
index ae094b0a142c..27aeb4255e84 100644
--- a/pkgs/development/python-modules/name-that-hash/default.nix
+++ b/pkgs/development/python-modules/name-that-hash/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "HashPals";
-    repo = pname;
+    repo = "name-that-hash";
     rev = version;
     hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8=";
   };
diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix
index c4648e171a72..4b6467ddad18 100644
--- a/pkgs/development/python-modules/names/default.nix
+++ b/pkgs/development/python-modules/names/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "treyhunner";
-    repo = pname;
+    repo = "names";
     rev = version;
     sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611";
   };
diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix
index 6fcabe6ffd2c..194575643117 100644
--- a/pkgs/development/python-modules/napari-plugin-engine/default.nix
+++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "napari";
-    repo = pname;
+    repo = "napari-plugin-engine";
     tag = "v${version}";
     hash = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE=";
   };
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index a6be3e24a047..cb594e483203 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -27,7 +27,7 @@ let
 
     src = fetchFromGitHub {
       owner = "jupyter";
-      repo = pname;
+      repo = "nbclient";
       tag = "v${version}";
       hash = "sha256-+qSed6yy4YVZ25GigNTap+kMaoDiMYSJO85wurbzeDs=";
     };
diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix
index ea749eda1e9d..f769f2132561 100644
--- a/pkgs/development/python-modules/ndspy/default.nix
+++ b/pkgs/development/python-modules/ndspy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "RoadrunnerWMC";
-    repo = pname;
+    repo = "ndspy";
     tag = "v${version}";
     hash = "sha256-PQONVEuh5Fg2LHr4gq0XTGcOpps/s9FSgoyDn4BCcik=";
   };
diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix
index cd0725bc5eb6..3c774de642b7 100644
--- a/pkgs/development/python-modules/nh3/default.nix
+++ b/pkgs/development/python-modules/nh3/default.nix
@@ -12,7 +12,7 @@ let
   version = "0.2.21";
   src = fetchFromGitHub {
     owner = "messense";
-    repo = pname;
+    repo = "nh3";
     rev = "v${version}";
     hash = "sha256-DskjcKjdz1HmKzmA568zRCjh4UK1/LBD5cSIu7Rfwok=";
   };
diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix
index 0a518c29013c..3bc59c632991 100644
--- a/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/pkgs/development/python-modules/nmapthon2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cblopez";
-    repo = pname;
+    repo = "nmapthon2";
     rev = "v${version}";
     hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY=";
   };
diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
index 16f48f3725e7..76e334c8ba9c 100644
--- a/pkgs/development/python-modules/notify-py/default.nix
+++ b/pkgs/development/python-modules/notify-py/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ms7m";
-    repo = pname;
+    repo = "notify-py";
     tag = "v${version}";
     hash = "sha256-4PJ/0dLG3bWDuF1G/qUmvNaIUFXgPP2S/0uhZz86WRA=";
   };
diff --git a/pkgs/development/python-modules/nptyping/default.nix b/pkgs/development/python-modules/nptyping/default.nix
index d09c3daf59af..a27dadeb48fc 100644
--- a/pkgs/development/python-modules/nptyping/default.nix
+++ b/pkgs/development/python-modules/nptyping/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ramonhagenaars";
-    repo = pname;
+    repo = "nptyping";
     tag = "v${version}";
     hash = "sha256-hz4YrcvARCAA7TXapmneIwle/F4pzcIYLPSmiFHC0VQ=";
   };
diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix
index 9f1a3089fc60..368cfc25151a 100644
--- a/pkgs/development/python-modules/nsz/default.nix
+++ b/pkgs/development/python-modules/nsz/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nicoboss";
-    repo = pname;
+    repo = "nsz";
     tag = version;
     hash = "sha256-ch4HzQFa95o3HMsi7R0LpPWmhN/Z9EYfrmCdUZLwPSE=";
   };
diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix
index 29dee4bbbaa4..bd7fb86615f7 100644
--- a/pkgs/development/python-modules/numdifftools/default.nix
+++ b/pkgs/development/python-modules/numdifftools/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pbrod";
-    repo = pname;
+    repo = "numdifftools";
     rev = "v${version}";
     hash = "sha256-HYacLaowSDdrwkxL1h3h+lw/8ahzaecpXEnwrCqMCWk=";
   };
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
index bbd8361aea8b..bbe611db0734 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "schodet";
-    repo = pname;
+    repo = "nxt-python";
     tag = version;
     hash = "sha256-ffJ7VhXT5I7i5JYfnjFBaud0CxoVBFWx6kRdAz+Ry00=";
   };
diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix
index fca7740dc6de..fc6cec6ca347 100644
--- a/pkgs/development/python-modules/oasatelematics/default.nix
+++ b/pkgs/development/python-modules/oasatelematics/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "panosmz";
-    repo = pname;
+    repo = "oasatelematics";
     rev = "v${version}";
     hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg=";
   };
diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix
index cbf5d5e3c0b2..f7eaff97f382 100644
--- a/pkgs/development/python-modules/ofxtools/default.nix
+++ b/pkgs/development/python-modules/ofxtools/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # PyPI distribution does not include tests
   src = fetchFromGitHub {
     owner = "csingley";
-    repo = pname;
+    repo = "ofxtools";
     rev = version;
     hash = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc=";
   };
diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix
index 0858e4bc7b90..03a1e53eea69 100644
--- a/pkgs/development/python-modules/oletools/default.nix
+++ b/pkgs/development/python-modules/oletools/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "decalage2";
-    repo = pname;
+    repo = "oletools";
     rev = "v${version}";
     hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y=";
   };
diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix
index a36c97dd2cda..f12d7140ea62 100644
--- a/pkgs/development/python-modules/opcua-widgets/default.nix
+++ b/pkgs/development/python-modules/opcua-widgets/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
-    repo = pname;
+    repo = "opcua-widgets";
     rev = version;
     hash = "sha256-ABJlKYN5H/1k8ynvSTSoJBX12vTTyavuNUAmTJ84mn0=";
   };
diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix
index 2691be8446f9..7a40cc690de8 100644
--- a/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "p1c2u";
-    repo = pname;
+    repo = "openapi-schema-validator";
     tag = version;
     hash = "sha256-1Y049W4TbqvKZRwnvPVwyLq6CH6NQDrEfJknuMn8dGo=";
   };
diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix
index 634efaf196b2..d49618bb0140 100644
--- a/pkgs/development/python-modules/opensimplex/default.nix
+++ b/pkgs/development/python-modules/opensimplex/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "lmas";
-    repo = pname;
+    repo = "opensimplex";
     rev = "v${version}";
     sha256 = "C/MTKTHjxMsOgzuXvokw039Kv6N/PgBoOqKleWPLpw0=";
   };
diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix
index b645a2d1b1d0..d97adbefb8a1 100644
--- a/pkgs/development/python-modules/opuslib/default.nix
+++ b/pkgs/development/python-modules/opuslib/default.nix
@@ -11,7 +11,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "opuslib";
   version = "3.0.3";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "orion-labs";
-    repo = pname;
+    repo = "opuslib";
     rev = "92109c528f9f6c550df5e5325ca0fcd4f86b0909";
     hash = "sha256-NxmC/4TTIEDVzrfMPN4PcT1JY4QCw8IBMy80XiM/o00=";
   };
diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix
index 53d9e3005b9f..8b95da057d1a 100644
--- a/pkgs/development/python-modules/ormar/default.nix
+++ b/pkgs/development/python-modules/ormar/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "collerek";
-    repo = pname;
+    repo = "ormar";
     tag = version;
     hash = "sha256-jg1qgOJiRBJCRThhq/jaXNmSoL0FmceIOWMKNxtyGJI=";
   };
diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix
index ef90df289af6..6f3f8e123585 100644
--- a/pkgs/development/python-modules/oscrypto/default.nix
+++ b/pkgs/development/python-modules/oscrypto/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "wbond";
-    repo = pname;
+    repo = "oscrypto";
     rev = version;
     hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw=";
   };
diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix
index 3c89a0bec398..a933bedc85a4 100644
--- a/pkgs/development/python-modules/ospd/default.nix
+++ b/pkgs/development/python-modules/ospd/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "greenbone";
-    repo = pname;
+    repo = "ospd";
     tag = "v${version}";
     hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M=";
   };
diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix
index 047c607a340a..b8df86e21460 100644
--- a/pkgs/development/python-modules/ossfs/default.nix
+++ b/pkgs/development/python-modules/ossfs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fsspec";
-    repo = pname;
+    repo = "ossfs";
     tag = version;
     hash = "sha256-2i7zxLCi4wNCwzWNUbC6lvvdRkK+ksUWds+H6QG6bW4=";
   };
diff --git a/pkgs/development/python-modules/ovmfvartool/default.nix b/pkgs/development/python-modules/ovmfvartool/default.nix
index aaee10b25a37..d1462221f9d2 100644
--- a/pkgs/development/python-modules/ovmfvartool/default.nix
+++ b/pkgs/development/python-modules/ovmfvartool/default.nix
@@ -5,14 +5,14 @@
   pyyaml,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "ovmfvartool";
   version = "unstable-2022-09-04";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "hlandau";
-    repo = pname;
+    repo = "ovmfvartool";
     rev = "45e6b1e53967ee6590faae454c076febce096931";
     hash = "sha256-XbvcE/MXNj5S5N7A7jxdwgEE5yMuB82Xg+PYBsFRIm0=";
   };
diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix
index 8ea9f3b6d9fa..17a4955eccb3 100644
--- a/pkgs/development/python-modules/palace/default.nix
+++ b/pkgs/development/python-modules/palace/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromSourcehut {
     owner = "~cnx";
-    repo = pname;
+    repo = "palace";
     rev = version;
     sha256 = "1z0m35y4v1bg6vz680pwdicm9ssryl0q6dm9hfpb8hnifmridpcj";
   };
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 1ed55533d9d6..6db3615d92a1 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "holoviz";
-    repo = pname;
+    repo = "param";
     tag = "v${version}";
     hash = "sha256-3aqABliOk+JtR84J/qiwda4yAkVgG2lJWewhQuSUgtA=";
   };
diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix
index 4ec76c85f5fe..d6d92204c424 100644
--- a/pkgs/development/python-modules/pathable/default.nix
+++ b/pkgs/development/python-modules/pathable/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "p1c2u";
-    repo = pname;
+    repo = "pathable";
     tag = version;
     hash = "sha256-nN5jpI0Zi5ofdSuN9QbTHDXPmQRq9KAn8SoHuNDpZaw=";
   };
diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index 872deb560d3f..8b711ae52256 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "uqfoundation";
-    repo = pname;
+    repo = "pathos";
     tag = version;
     hash = "sha256-oVqWrX40umazNw/ET/s3pKUwvh8ctgF9sS0U8WwFQkA=";
   };
diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix
index 1ef4585798ef..bcc3d0bfed56 100644
--- a/pkgs/development/python-modules/patiencediff/default.nix
+++ b/pkgs/development/python-modules/patiencediff/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "breezy-team";
-    repo = pname;
+    repo = "patiencediff";
     tag = "v${version}";
     hash = "sha256-SFu1oN1yE9tKeBgWhgWjDpR31AptGrls0D5kKQed+HI=";
   };
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
index 8e868ce3ac2c..50c13671f5d5 100644
--- a/pkgs/development/python-modules/patool/default.nix
+++ b/pkgs/development/python-modules/patool/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   #pypi doesn't have test data
   src = fetchFromGitHub {
     owner = "wummel";
-    repo = pname;
+    repo = "patool";
     tag = version;
     hash = "sha256-mt/GUIRJHB2/Rritc+uNkolZzguYy2G/NKnSKNxKsLk=";
   };
diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix
index 97313c157072..d101f3d5fffb 100644
--- a/pkgs/development/python-modules/pcapy-ng/default.nix
+++ b/pkgs/development/python-modules/pcapy-ng/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stamparm";
-    repo = pname;
+    repo = "pcapy-ng";
     rev = version;
     hash = "sha256-6LA2n7Kv0MiZcqUJpi0lDN4Q+GcOttYw7hJwVqK/DU0=";
   };
diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix
index eef04412632a..79576ea2c9e8 100644
--- a/pkgs/development/python-modules/pcodedmp/default.nix
+++ b/pkgs/development/python-modules/pcodedmp/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bontchev";
-    repo = pname;
+    repo = "pcodedmp";
     rev = version;
     hash = "sha256-SYOFGMvrzxDPMACaCvqwU28Mh9LEuvFBGvAph4X+geo=";
   };
diff --git a/pkgs/development/python-modules/pem/default.nix b/pkgs/development/python-modules/pem/default.nix
index 61b1ef39a0c7..ec74c0766140 100644
--- a/pkgs/development/python-modules/pem/default.nix
+++ b/pkgs/development/python-modules/pem/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hynek";
-    repo = pname;
+    repo = "pem";
     tag = version;
     hash = "sha256-rVYlnvISGugh9qvf3mdrIyELmeOUU4g6291HeoMkoQc=";
   };
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix
index 23ebc341503a..1e20583dc9ff 100644
--- a/pkgs/development/python-modules/perfplot/default.nix
+++ b/pkgs/development/python-modules/perfplot/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nschloe";
-    repo = pname;
+    repo = "perfplot";
     tag = "v${version}";
     hash = "sha256-bu6eYQukhLE8sLkS3PbqTgXOqJFXJYXTcXAhmjaq48g=";
   };
diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix
index aec7138b7795..41f0c0ca6165 100644
--- a/pkgs/development/python-modules/pescea/default.nix
+++ b/pkgs/development/python-modules/pescea/default.nix
@@ -9,7 +9,7 @@
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pescea";
   version = "1.0.12";
   format = "setuptools";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "lazdavila";
-    repo = pname;
+    repo = "pescea";
     # https://github.com/lazdavila/pescea/issues/4
     rev = "a3dd7deedc64205e24adbc4ff406a2f6aed3b240";
     hash = "sha256-5TkFrGaSkQOORhf5a7SjkzggFLPyqe9k3M0B4ljhWTQ=";
diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix
index c4e179c2d953..dca63eba3497 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
-    repo = pname;
+    repo = "piccata";
     tag = version;
     hash = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA=";
   };
diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix
index 157a1325858d..c6988b261813 100644
--- a/pkgs/development/python-modules/picobox/default.nix
+++ b/pkgs/development/python-modules/picobox/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
-    repo = pname;
+    repo = "picobox";
     tag = version;
     hash = "sha256-JtrwUVo3b4G34OUShX4eJS2IVubl4vBmEtB/Jhk4eJI=";
   };
diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix
index d73007bf2503..9b6a355fa36f 100644
--- a/pkgs/development/python-modules/picosvg/default.nix
+++ b/pkgs/development/python-modules/picosvg/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "googlefonts";
-    repo = pname;
+    repo = "picosvg";
     tag = "v${version}";
     hash = "sha256-ocdHF0kYnfllpvul32itu1QtlDrqVeq5sT8Ecb5V1yk=";
   };
diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix
index 6866c568c09d..a69b688ad538 100644
--- a/pkgs/development/python-modules/pilkit/default.nix
+++ b/pkgs/development/python-modules/pilkit/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "matthewwithanm";
-    repo = pname;
+    repo = "pilkit";
     tag = version;
     hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk=";
   };
diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix
index 5c62e7f222b9..85139ea17f67 100644
--- a/pkgs/development/python-modules/pims/default.nix
+++ b/pkgs/development/python-modules/pims/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "soft-matter";
-    repo = pname;
+    repo = "pims";
     tag = "v${version}";
     hash = "sha256-3SBZk11w6eTZFmETMRJaYncxY38CYne1KzoF5oRgzuY=";
   };
diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix
index dd4e489defd6..d9ee6abaa67d 100644
--- a/pkgs/development/python-modules/pinboard/default.nix
+++ b/pkgs/development/python-modules/pinboard/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "lionheart";
-    repo = pname;
+    repo = "pinboard";
     rev = version;
     sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf";
   };
diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix
index fb52b8f3da04..61ed71d1b4c8 100644
--- a/pkgs/development/python-modules/pip-requirements-parser/default.nix
+++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nexB";
-    repo = pname;
+    repo = "pip-requirements-parser";
     tag = "v${version}";
     hash = "sha256-UMrwDXxk+sD3P2jk7s95y4OX6DRBjWWZZ8IhkR6tnZ4=";
   };
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index fb3cce10c235..8f4269b523fd 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -36,7 +36,7 @@ let
 
     src = fetchFromGitHub {
       owner = "pypa";
-      repo = pname;
+      repo = "pip";
       tag = version;
       hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY=";
     };
diff --git a/pkgs/development/python-modules/pipetools/default.nix b/pkgs/development/python-modules/pipetools/default.nix
index 8ef8830494e1..e6316aad4b43 100644
--- a/pkgs/development/python-modules/pipetools/default.nix
+++ b/pkgs/development/python-modules/pipetools/default.nix
@@ -6,14 +6,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pipetools";
   version = "1.1.0";
 
   # Used github as the src since the pypi package does not include the tests
   src = fetchFromGitHub {
     owner = "0101";
-    repo = pname;
+    repo = "pipetools";
     rev = "6cba9fadab07a16fd85eed16d5cffc609f84c62b";
     hash = "sha256-BoZFePQCQfz1dkct5p/WQLuXoNX3eLcnKf3Mf0fG6u8=";
   };
diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix
index 08539054316a..05092226a4c0 100644
--- a/pkgs/development/python-modules/pkce/default.nix
+++ b/pkgs/development/python-modules/pkce/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "RomeoDespres";
-    repo = pname;
+    repo = "pkce";
     rev = version;
     hash = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME=";
   };
diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index a70a39c709fd..fe8f973132f0 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ialbert";
-    repo = pname;
+    repo = "plac";
     tag = "v${version}";
     hash = "sha256-EWwDtS2cRLBe4aZuH72hgg2BQnVJQ39GmPx05NxTNjE=";
   };
diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix
index dd51e56c7d0e..d66c26e13a30 100644
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mikitex70";
-    repo = pname;
+    repo = "plantuml-markdown";
     tag = version;
     hash = "sha256-DgHWqwPsZ5q1XqrfaAiUslKnJdHX4Pzw9lygF3iaxz4=";
   };
diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix
index 9678a3449f82..462473b3507e 100644
--- a/pkgs/development/python-modules/pleroma-bot/default.nix
+++ b/pkgs/development/python-modules/pleroma-bot/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "robertoszek";
-    repo = pname;
+    repo = "pleroma-bot";
     rev = version;
     hash = "sha256-vJxblpf3NMSyYMHeWG7vHP5AeluTtMtVxOsHgvGDHeA=";
   };
diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix
index a7bd0e2e7568..1ed735a5fea0 100644
--- a/pkgs/development/python-modules/plotext/default.nix
+++ b/pkgs/development/python-modules/plotext/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "piccolomo";
-    repo = pname;
+    repo = "plotext";
     tag = version;
     hash = "sha256-4cuStXnZFTlOoBp9w+LrTZavCWEaQdZMY4apGNKvBXE=";
   };
diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix
index b0d20de57400..2e2100209323 100644
--- a/pkgs/development/python-modules/plyer/default.nix
+++ b/pkgs/development/python-modules/plyer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "kivy";
-    repo = pname;
+    repo = "plyer";
     tag = version;
     sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE=";
   };
diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
index b5081376a682..06b0c7c85b89 100644
--- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix
+++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
+    repo = "pmdsky-debug-py";
     rev = version;
     sha256 = "sha256-JTvLyYUwOEp1O0rtO313VIT6AYOqXWVFUleTrb6BN6Q=";
   };
diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
index 59a8a201c088..fe2bec35dc90 100644
--- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mtkennerly";
-    repo = pname;
+    repo = "poetry-dynamic-versioning";
     tag = "v${version}";
     hash = "sha256-V5UuODRwm829c1KPdQm9oqeN6YdcCo1ODDsEHbm4e/Y=";
   };
diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix
index fc0afe375f46..d2deda5fd8e5 100644
--- a/pkgs/development/python-modules/polarizationsolver/default.nix
+++ b/pkgs/development/python-modules/polarizationsolver/default.nix
@@ -8,14 +8,14 @@
   fields,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "polarizationsolver";
   version = "unstable-2021-11-02";
   format = "setuptools";
 
   src = fetchFromGitLab {
     owner = "reinholdt";
-    repo = pname;
+    repo = "polarizationsolver";
     rev = "00424ac4d1862257a55e4b16543f63ace3fe8c22";
     hash = "sha256-LACf8Xw+o/uJ3+PD/DE/o7nwKY7fv3NyYbpjCrTTnBU=";
   };
diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix
index 0352bea3d031..34bc7a5ceba2 100644
--- a/pkgs/development/python-modules/polyline/default.nix
+++ b/pkgs/development/python-modules/polyline/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "frederickjansen";
-    repo = pname;
+    repo = "polyline";
     tag = "v${version}";
     hash = "sha256-fbGGfZdme4OiIGNlXG1uVl1xP+rPVI9l5hjHM0gwAsE=";
   };
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index cbf7630bfa6b..62b8c9f260e0 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "pomegranate";
     owner = "jmschrei";
     tag = "v${version}";
     hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs=";
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index a1c5a27fe9e2..265a552e99b6 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "powerline";
+    repo = "powerline";
     tag = version;
     hash = "sha256-snJrfUvP11lBIy6F0WtqJt9fiYm5jxMwm9u3u5XFO84=";
   };
diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index 9124989c5d15..e75265573a6c 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pre-commit";
-    repo = pname;
+    repo = "pre-commit-hooks";
     tag = "v${version}";
     hash = "sha256-BYNi/xtdichqsn55hqr1MSFwWpH+7cCbLfqmpn9cxto=";
   };
diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix
index f35fcb5e9c87..725f4a5ed746 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/pkgs/development/python-modules/pretend/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alex";
-    repo = pname;
+    repo = "pretend";
     rev = "v${version}";
     hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ=";
   };
diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix
index fdee36a3c615..6143bc9f78a8 100644
--- a/pkgs/development/python-modules/prodict/default.nix
+++ b/pkgs/development/python-modules/prodict/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ramazanpolat";
-    repo = pname;
+    repo = "prodict";
     rev = version;
     hash = "sha256-c46JEQFg4KRwerqpMSgh6+tYRpKTOX02Lzsq4/meS3o=";
   };
diff --git a/pkgs/development/python-modules/prompthub-py/default.nix b/pkgs/development/python-modules/prompthub-py/default.nix
index 8becc3b2ac30..b10a06cd6ffb 100644
--- a/pkgs/development/python-modules/prompthub-py/default.nix
+++ b/pkgs/development/python-modules/prompthub-py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
   # Pypi source package doesn't contain tests
   src = fetchFromGitHub {
     owner = "deepset-ai";
-    repo = pname;
+    repo = "prompthub-py";
     rev = "v${version}";
     hash = "sha256-FA4IfhHViSL1u4pgd7jh40rEcS0BldSFDwCPG5irk1g=";
   };
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
index 2b679015e6bd..43784048fdd3 100644
--- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
-    repo = pname;
+    repo = "protonvpn-nm-lib";
     tag = version;
     hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA=";
   };
diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix
index 605936dd8637..d6489aa0f97b 100644
--- a/pkgs/development/python-modules/psautohint/default.nix
+++ b/pkgs/development/python-modules/psautohint/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "adobe-type-tools";
-    repo = pname;
+    repo = "psautohint";
     rev = "v${version}";
     sha256 = "125nx7accvbk626qlfar90va1995kp9qfrz6a978q4kv2kk37xai";
     fetchSubmodules = true; # data dir for tests
diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix
index 8b935f54e5dd..468464010762 100644
--- a/pkgs/development/python-modules/psd-tools/default.nix
+++ b/pkgs/development/python-modules/psd-tools/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "psd-tools";
-    repo = pname;
+    repo = "psd-tools";
     tag = "v${version}";
     hash = "sha256-n3OqyItvKXD6NjCm/FgEuu1G5apTmUypwKJ+Y2DCmEg=";
   };
diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix
index 3db8b1f6da4f..4f6fcbd62cfd 100644
--- a/pkgs/development/python-modules/psygnal/default.nix
+++ b/pkgs/development/python-modules/psygnal/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyapp-kit";
-    repo = pname;
+    repo = "psygnal";
     tag = "v${version}";
     hash = "sha256-ZEN8S2sI1usXl5A1Ow1+l4BBB6qNnlVt/nvFtAX4maY=";
   };
diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index 4eccba1a6a6a..73813e2eaedc 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "coin-or";
-    repo = pname;
+    repo = "pulp";
     tag = version;
     hash = "sha256-lpbk1GeC8F/iLGV8G5RPHghnaM9eL82YekUYEt9+mvc=";
   };
diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix
index d060de77bf2f..08bdbc505452 100644
--- a/pkgs/development/python-modules/pvextractor/default.nix
+++ b/pkgs/development/python-modules/pvextractor/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "radio-astro-tools";
-    repo = pname;
+    repo = "pvextractor";
     tag = "v${version}";
     sha256 = "sha256-TjwoTtoGWU6C6HdFuS+gJj69PUnfchPHs7UjFqwftVQ=";
   };
diff --git a/pkgs/development/python-modules/py-air-control/default.nix b/pkgs/development/python-modules/py-air-control/default.nix
index 73cac52da828..2cb2e82edf54 100644
--- a/pkgs/development/python-modules/py-air-control/default.nix
+++ b/pkgs/development/python-modules/py-air-control/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rgerganov";
-    repo = pname;
+    repo = "py-air-control";
     rev = "v${version}";
     sha256 = "0mkggl5hwmj90djxbbz4svim6iv7xl8k324cb4rlc75p5rgcdwmh";
   };
diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix
index 9ed05ea205bd..05f9d26c87b5 100644
--- a/pkgs/development/python-modules/py-canary/default.nix
+++ b/pkgs/development/python-modules/py-canary/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snjoetw";
-    repo = pname;
+    repo = "py-canary";
     tag = version;
     hash = "sha256-zylWkssU85eSfR+Di7vQGTr6hOQkqXCObv/PCDHoKHA=";
   };
diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix
index 7b986be7dc42..19966c227f02 100644
--- a/pkgs/development/python-modules/py-cid/default.nix
+++ b/pkgs/development/python-modules/py-cid/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ipld";
-    repo = pname;
+    repo = "py-cid";
     rev = "v${version}";
     hash = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U=";
   };
diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index 8485fe8c2837..4ac79186e324 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "workhorsy";
-    repo = pname;
+    repo = "py-cpuinfo";
     rev = "v${version}";
     hash = "sha256-Q5u0guAqDVhf6bvJTzNvCpWbIzjxxAjE7s0OuXj9T4Q=";
   };
diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix
index 4f1c74b9f20a..e8fdadc8feab 100644
--- a/pkgs/development/python-modules/py-desmume/default.nix
+++ b/pkgs/development/python-modules/py-desmume/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
+    repo = "py-desmume";
     tag = version;
     hash = "sha256-aH7f/BI89VLUGqwA8Y7ThSpmKxWffYRETT/+EjPVTg8=";
     fetchSubmodules = true;
diff --git a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix
index 1b64a9e888ed..6b190999aedf 100644
--- a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix
+++ b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "emontnemery";
-    repo = pname;
+    repo = "py-dormakaba-dkey";
     tag = version;
     hash = "sha256-kS99du9EZwki6J2q+nI44rx/AWIPtq7wXR/61ZcyUSM=";
   };
diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix
index b5d8e7f4ab29..9932d97e2670 100644
--- a/pkgs/development/python-modules/py-libzfs/default.nix
+++ b/pkgs/development/python-modules/py-libzfs/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "truenas";
-    repo = pname;
+    repo = "py-libzfs";
     rev = "TS-${version}";
     hash = "sha256-Uiu0RNE06++iNWUNcKpbZvreT2D7/EqHlFZJXKe3F4A=";
   };
diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix
index 95016f826c62..49ba5ea55091 100644
--- a/pkgs/development/python-modules/py-multiaddr/default.nix
+++ b/pkgs/development/python-modules/py-multiaddr/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "multiformats";
-    repo = pname;
+    repo = "py-multiaddr";
     rev = "v${version}";
     hash = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI=";
   };
diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix
index 5f8ce30adda3..cd502996e0d0 100644
--- a/pkgs/development/python-modules/py-multicodec/default.nix
+++ b/pkgs/development/python-modules/py-multicodec/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "multiformats";
-    repo = pname;
+    repo = "py-multicodec";
     tag = "v${version}";
     hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4=";
   };
diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix
index 396fd68d6696..50c4c3787098 100644
--- a/pkgs/development/python-modules/py-multihash/default.nix
+++ b/pkgs/development/python-modules/py-multihash/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "multiformats";
-    repo = pname;
+    repo = "py-multihash";
     tag = "v${version}";
     hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA=";
   };
diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix
index e690f1b1caca..edfc25ee0527 100644
--- a/pkgs/development/python-modules/py-nightscout/default.nix
+++ b/pkgs/development/python-modules/py-nightscout/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "marciogranzotto";
-    repo = pname;
+    repo = "py-nightscout";
     rev = "v${version}";
     sha256 = "0kslmm3wrxhm307nqmjmq8i8vy1x6mjaqlgba0hgvisj6b4hx65k";
   };
diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix
index 7eca2165efc1..881bc356c1a3 100644
--- a/pkgs/development/python-modules/py-ubjson/default.nix
+++ b/pkgs/development/python-modules/py-ubjson/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Iotic-Labs";
-    repo = pname;
+    repo = "py-ubjson";
     rev = "v${version}";
     sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3";
   };
diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix
index 853e33a471f3..9e7d3b7702ec 100644
--- a/pkgs/development/python-modules/pyaftership/default.nix
+++ b/pkgs/development/python-modules/pyaftership/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ludeeus";
-    repo = pname;
+    repo = "pyaftership";
     tag = version;
     hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE=";
   };
diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix
index e3879501572b..83e75000f19d 100644
--- a/pkgs/development/python-modules/pyahocorasick/default.nix
+++ b/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "WojciechMula";
-    repo = pname;
+    repo = "pyahocorasick";
     tag = version;
     hash = "sha256-SCIgu0uEjiSUiIP0WesJG+y+3ZqFBfI5PdgUzviOVrs=";
   };
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index 6e4a7e846b3e..f27f7ba4f426 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "appknox";
-    repo = pname;
+    repo = "pyaxmlparser";
     rev = "v${version}";
     hash = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw=";
   };
diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix
index 97a1d09b6b19..93473e82709e 100644
--- a/pkgs/development/python-modules/pyblackbird/default.nix
+++ b/pkgs/development/python-modules/pyblackbird/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "koolsb";
-    repo = pname;
+    repo = "pyblackbird";
     tag = version;
     hash = "sha256-+ehzrr+RrwFKOOuxBq3+mwnuMPxZFV4QTZG1IRgsbLc=";
   };
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix
index ca745113c592..3f9ae13c516b 100644
--- a/pkgs/development/python-modules/pybluez/default.nix
+++ b/pkgs/development/python-modules/pybluez/default.nix
@@ -7,14 +7,14 @@
   gattlib,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pybluez";
   version = "unstable-2022-01-28";
   format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "pybluez";
+    repo = "pybluez";
     rev = "5096047f90a1f6a74ceb250aef6243e144170f92";
     hash = "sha256-GA58DfCFaVzZQA1HYpGQ68bznrt4SX1ojyOVn8hyCGo=";
   };
diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix
index 52685473473c..b610c25b3d09 100644
--- a/pkgs/development/python-modules/pybravia/default.nix
+++ b/pkgs/development/python-modules/pybravia/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Drafteed";
-    repo = pname;
+    repo = "pybravia";
     tag = "v${version}";
     hash = "sha256-1LfYEVclRneU3eD52kvzjLYyGdzYSWVDQ5EADOviglw=";
   };
diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix
index 765b25b70f58..51f36bd86eec 100644
--- a/pkgs/development/python-modules/pycapnp/default.nix
+++ b/pkgs/development/python-modules/pycapnp/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "capnproto";
-    repo = pname;
+    repo = "pycapnp";
     tag = "v${version}";
     sha256 = "sha256-SVeBRJMMR1Z8+S+QoiUKGRFGUPS/MlmWLi1qRcGcPoE=";
   };
diff --git a/pkgs/development/python-modules/pycarwings2/default.nix b/pkgs/development/python-modules/pycarwings2/default.nix
index 2d83d009aad8..8778ec180fbf 100644
--- a/pkgs/development/python-modules/pycarwings2/default.nix
+++ b/pkgs/development/python-modules/pycarwings2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "filcole";
-    repo = pname;
+    repo = "pycarwings2";
     rev = "v${version}";
     hash = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo=";
   };
diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix
index 5f6ef9f37c7c..29a85c252abe 100644
--- a/pkgs/development/python-modules/pycec/default.nix
+++ b/pkgs/development/python-modules/pycec/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "konikvranik";
-    repo = pname;
+    repo = "pycec";
     tag = "v${version}";
     hash = "sha256-5KQyHjAvHWeHFqcFHFJxDOPwWuVcFAN2wVdz9a77dzU=";
   };
diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix
index f8e86b22add3..f9ef958474f1 100644
--- a/pkgs/development/python-modules/pycfdns/default.nix
+++ b/pkgs/development/python-modules/pycfdns/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ludeeus";
-    repo = pname;
+    repo = "pycfdns";
     tag = version;
     hash = "sha256-bLzDakxKq8fcjEKSxc6D5VN9gfAu1M3/zaAU2UYnwSs=";
   };
diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix
index 48310b769912..4558f31aeff6 100644
--- a/pkgs/development/python-modules/pychannels/default.nix
+++ b/pkgs/development/python-modules/pychannels/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fancybits";
-    repo = pname;
+    repo = "pychannels";
     rev = version;
     hash = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s=";
   };
diff --git a/pkgs/development/python-modules/pycketcasts/default.nix b/pkgs/development/python-modules/pycketcasts/default.nix
index 7b4c51fcc6e8..96ffaf13af1d 100644
--- a/pkgs/development/python-modules/pycketcasts/default.nix
+++ b/pkgs/development/python-modules/pycketcasts/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nwithan8";
-    repo = pname;
+    repo = "pycketcasts";
     rev = version;
     hash = "sha256-O4j89fE7fYPthhCH8b2gGskkelEA4mU6GvSbKIl+4Mk=";
   };
diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix
index 8b61e177f5db..992c20aafe2f 100644
--- a/pkgs/development/python-modules/pyclimacell/default.nix
+++ b/pkgs/development/python-modules/pyclimacell/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "raman325";
-    repo = pname;
+    repo = "pyclimacell";
     rev = "v${version}";
     hash = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc=";
   };
diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix
index d786032e1410..588b294dc039 100644
--- a/pkgs/development/python-modules/pyclip/default.nix
+++ b/pkgs/development/python-modules/pyclip/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "spyoungtech";
-    repo = pname;
+    repo = "pyclip";
     tag = "v${version}";
     hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM=";
   };
diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index 416bd18a2c37..9c0ba320116b 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sepandhaghighi";
-    repo = pname;
+    repo = "pycm";
     tag = "v${version}";
     hash = "sha256-JX75UEaONL+2n6xePE2hbIEMmnt0RknWNWgpbMwNyhw=";
   };
diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 38ee9a244b6d..1fc20c3b80b2 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "OpenCyphal";
-    repo = pname;
+    repo = "pycyphal";
     tag = version;
     hash = "sha256-XkH0wss8ueh/Wwz0lhvQShOp3a4X9lNdosT/sMe7p4Q=";
     fetchSubmodules = true;
diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix
index 4f4aa417c97e..b974af2b98e0 100644
--- a/pkgs/development/python-modules/pydiscourse/default.nix
+++ b/pkgs/development/python-modules/pydiscourse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pydiscourse";
-    repo = pname;
+    repo = "pydiscourse";
     tag = "v${version}";
     hash = "sha256-KqJ6ag4owG7US5Q4Ygjq263ds1o/JhEJ3bNa8YecYtE=";
   };
diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix
index a8e1462aec29..788310c18c65 100644
--- a/pkgs/development/python-modules/pydruid/default.nix
+++ b/pkgs/development/python-modules/pydruid/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "pydruid";
     owner = "druid-io";
     tag = version;
     hash = "sha256-9+xomjSwWDVHkret/mqAZKWOPFRMvVB3CWtFPzrT81k=";
diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix
index c65acc773e2d..bc747e6d2f77 100644
--- a/pkgs/development/python-modules/pyduke-energy/default.nix
+++ b/pkgs/development/python-modules/pyduke-energy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mjmeli";
-    repo = pname;
+    repo = "pyduke-energy";
     tag = "v${version}";
     hash = "sha256-7KkUpsHg3P2cF0bVl3FzyAQwzeaCmg+vzRHlM/TIcNA=";
   };
diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix
index dd9abeca4f31..29fe46f12642 100644
--- a/pkgs/development/python-modules/pyeverlights/default.nix
+++ b/pkgs/development/python-modules/pyeverlights/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "joncar";
-    repo = pname;
+    repo = "pyeverlights";
     rev = version;
     sha256 = "16xpq933j8yydq78fnf4f7ivyw5a45ix4mfycpmm91aj549p6pm0";
   };
diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix
index 40d48342e57e..ebce3deac562 100644
--- a/pkgs/development/python-modules/pyevilgenius/default.nix
+++ b/pkgs/development/python-modules/pyevilgenius/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
-    repo = pname;
+    repo = "pyevilgenius";
     rev = version;
     hash = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";
   };
diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix
index c683c93143b2..0b26308b9796 100644
--- a/pkgs/development/python-modules/pyevmasm/default.nix
+++ b/pkgs/development/python-modules/pyevmasm/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "crytic";
-    repo = pname;
+    repo = "pyevmasm";
     rev = version;
     sha256 = "134q0z0dqzxzr0jw5jr98kp90kx2dl0qw9smykwxdgq555q1l6qa";
   };
diff --git a/pkgs/development/python-modules/pyflexit/default.nix b/pkgs/development/python-modules/pyflexit/default.nix
index 22190d150b40..5ab6a9ef72d9 100644
--- a/pkgs/development/python-modules/pyflexit/default.nix
+++ b/pkgs/development/python-modules/pyflexit/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Sabesto";
-    repo = pname;
+    repo = "pyflexit";
     rev = version;
     sha256 = "1ajlqr3z6zj4fyslqzpwpfkvh8xjx94wsznzij0vx0q7jp43bqig";
   };
diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix
index f780c16cd144..ebf469ff6b32 100644
--- a/pkgs/development/python-modules/pyflic/default.nix
+++ b/pkgs/development/python-modules/pyflic/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "soldag";
-    repo = pname;
+    repo = "pyflic";
     rev = version;
     sha256 = "sha256-K1trMBZfc1aHSNSddq0v//Gv8ySgT/ONQYgrKWzw2qs=";
   };
diff --git a/pkgs/development/python-modules/pyfzf/default.nix b/pkgs/development/python-modules/pyfzf/default.nix
index 296d2d11670e..28dec72e412c 100644
--- a/pkgs/development/python-modules/pyfzf/default.nix
+++ b/pkgs/development/python-modules/pyfzf/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nk412";
-    repo = pname;
+    repo = "pyfzf";
     rev = version;
     hash = "sha256-w+ZjQGFd/lR2TiTHc2uQSJXORmzJJZXsr9BO4PIw/Co=";
   };
diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
index d4abb9fabaae..6862a8aff423 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "virtuald";
-    repo = pname;
+    repo = "pyhcl";
     rev = version;
     sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc";
   };
diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
index 44ee5b78be85..287b4b9fbc4d 100644
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
-    repo = pname;
+    repo = "pyhepmc";
     tag = "v${version}";
     hash = "sha256-yh02Z1nPGjghZYHkPBlClDEztq4VQsW3H+kuco/lBpk=";
     fetchSubmodules = true;
diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix
index 2becc21c26ce..1962d5101ee9 100644
--- a/pkgs/development/python-modules/pyhocon/default.nix
+++ b/pkgs/development/python-modules/pyhocon/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "chimpler";
-    repo = pname;
+    repo = "pyhocon";
     tag = version;
     hash = "sha256-xXx30uxJ8+KPVdYC6yRzEDJbwYSzIO/Gy1xrehvI5ZE=";
   };
diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix
index db00d9190ff0..a51e73c4109c 100644
--- a/pkgs/development/python-modules/pyhomepilot/default.nix
+++ b/pkgs/development/python-modules/pyhomepilot/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nico0302";
-    repo = pname;
+    repo = "pyhomepilot";
     rev = "v${version}";
     sha256 = "00gmqx8cwsd15iccnlr8ypgqrdg6nw9ha518cfk7pyp8vhw1ziwy";
   };
diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index f76788180202..bb52bb4b8c56 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "RyuzakiKK";
-    repo = pname;
+    repo = "pyialarm";
     rev = "v${version}";
     hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU=";
   };
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 6aebdaa47f52..2d87062de302 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "picklepete";
-    repo = pname;
+    repo = "pyicloud";
     rev = version;
     hash = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w=";
   };
diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index f941b8dc67c1..9659cd9bae80 100644
--- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "DudeNr33";
-    repo = pname;
+    repo = "pyinstaller-versionfile";
     rev = "v${version}";
     hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY=";
   };
diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix
index 060094a6cfd7..12d6a1346797 100644
--- a/pkgs/development/python-modules/pyinstrument/default.nix
+++ b/pkgs/development/python-modules/pyinstrument/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "joerick";
-    repo = pname;
+    repo = "pyinstrument";
     tag = "v${version}";
     hash = "sha256-uJ9KRgSETuxpeEIpBKFz66+Qci86jy36lKkUKpvmKIg=";
   };
diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix
index b0988585e21b..6f288964d9f7 100644
--- a/pkgs/development/python-modules/pyjsparser/default.nix
+++ b/pkgs/development/python-modules/pyjsparser/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let
-  pyjsparser = buildPythonPackage rec {
+  pyjsparser = buildPythonPackage {
     pname = "pyjsparser";
     version = "2.7.1";
     format = "setuptools";
 
     src = fetchFromGitHub {
       owner = "PiotrDabkowski";
-      repo = pname;
+      repo = "pyjsparser";
       rev = "5465d037b30e334cb0997f2315ec1e451b8ad4c1";
       hash = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8=";
     };
diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index 2e35bf2cce96..209624aa801f 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jodal";
-    repo = pname;
+    repo = "pykka";
     tag = "v${version}";
     hash = "sha256-n9TgXcmUEIQdqtrY+9T+EtPys+7OzXCemRwNPj1xPDw=";
   };
diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix
index c9c183819818..a6d19032f6f1 100644
--- a/pkgs/development/python-modules/pykostalpiko/default.nix
+++ b/pkgs/development/python-modules/pykostalpiko/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Florian7843";
-    repo = pname;
+    repo = "pykostalpiko";
     rev = "v${version}";
     hash = "sha256-kmzFsOgmMb8bOkulg7G6vXEPdb0xizh7u5LjnHfEWWQ=";
   };
diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix
index 1c3ddaea9cd7..2af5ad5c402b 100644
--- a/pkgs/development/python-modules/pykulersky/default.nix
+++ b/pkgs/development/python-modules/pykulersky/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "emlove";
-    repo = pname;
+    repo = "pykulersky";
     rev = version;
     hash = "sha256-BaGcsHlQpuEnUn8OgSUsJi2q89vFl7vpkinviKnUZJk=";
   };
diff --git a/pkgs/development/python-modules/pyld/default.nix b/pkgs/development/python-modules/pyld/default.nix
index aa66ac581c3c..d9ebdadcb2e7 100644
--- a/pkgs/development/python-modules/pyld/default.nix
+++ b/pkgs/development/python-modules/pyld/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "digitalbazaar";
-    repo = pname;
+    repo = "pyld";
     rev = version;
     sha256 = "0z2vkllw8bvzxripwb6l757r7av5qwhzsiy4061gmlhq8z8gq961";
   };
diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix
index 97037747a25b..a74e24e0be39 100644
--- a/pkgs/development/python-modules/pylibdmtx/default.nix
+++ b/pkgs/development/python-modules/pylibdmtx/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "NaturalHistoryMuseum";
-    repo = pname;
+    repo = "pylibdmtx";
     rev = "v${version}";
     hash = "sha256-vNWzhO4V0mj4eItZ0Z5UG9RBCqprIcgMGNyIe1+mXWY=";
   };
diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/pkgs/development/python-modules/pylint-celery/default.nix
index 99ffa65d6cd7..97a78f24ee07 100644
--- a/pkgs/development/python-modules/pylint-celery/default.nix
+++ b/pkgs/development/python-modules/pylint-celery/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "PyCQA";
-    repo = pname;
+    repo = "pylint-celery";
     rev = version;
     sha256 = "05fhwraq12c2724pn4py1bjzy5rmsrb1x68zck73nlp5icba6yap";
   };
diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix
index 27dd4c93d6fc..4cc3c20817ab 100644
--- a/pkgs/development/python-modules/pylru/default.nix
+++ b/pkgs/development/python-modules/pylru/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jlhutch";
-    repo = pname;
+    repo = "pylru";
     rev = "v${version}";
     hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE=";
   };
diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix
index de2cbdae88b8..feacc1d448f7 100644
--- a/pkgs/development/python-modules/pyls-spyder/default.nix
+++ b/pkgs/development/python-modules/pyls-spyder/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "spyder-ide";
-    repo = pname;
+    repo = "pyls-spyder";
     rev = "v${version}";
     sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk";
   };
diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix
index 7e5a5bd5d8c4..720961288400 100644
--- a/pkgs/development/python-modules/pymailgunner/default.nix
+++ b/pkgs/development/python-modules/pymailgunner/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pschmitt";
-    repo = pname;
+    repo = "pymailgunner";
     rev = version;
     hash = "sha256-QKwpW1aeN6OI76Kocow1Zhghq4/fl/cMPexny0MTwQs=";
   };
diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix
index de1408d95b39..453190901195 100644
--- a/pkgs/development/python-modules/pymanopt/default.nix
+++ b/pkgs/development/python-modules/pymanopt/default.nix
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "pymanopt";
+    repo = "pymanopt";
     tag = version;
     hash = "sha256-LOEulticgCWZBCf3qj5KFBHt0lMd4H85368IhG3DQ4g=";
   };
diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix
index 44bd1c815614..f852e528f209 100644
--- a/pkgs/development/python-modules/pymarshal/default.nix
+++ b/pkgs/development/python-modules/pymarshal/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stargateaudio";
-    repo = pname;
+    repo = "pymarshal";
     rev = version;
     hash = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";
   };
diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix
index d516ba9b38e7..e4bb1bfb5dbc 100644
--- a/pkgs/development/python-modules/pymata-express/default.nix
+++ b/pkgs/development/python-modules/pymata-express/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "MrYsLab";
-    repo = pname;
+    repo = "pymata-express";
     rev = version;
     sha256 = "1mibyn84kjahrv3kn51yl5mhkyig4piv6wanggzjflh5nm96bhy8";
   };
diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix
index ebd94da6860f..3f086afa7c92 100644
--- a/pkgs/development/python-modules/pymorphy3/default.nix
+++ b/pkgs/development/python-modules/pymorphy3/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "no-plagiarism";
-    repo = pname;
+    repo = "pymorphy3";
     tag = version;
     hash = "sha256-xqz9BW6vaYnDE+rPEhAO4igPYLZNwZLj42BnnJ7Uk1M=";
   };
diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix
index 9178399610b3..d5bff10a57a7 100644
--- a/pkgs/development/python-modules/pymysensors/default.nix
+++ b/pkgs/development/python-modules/pymysensors/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "theolind";
-    repo = pname;
+    repo = "pymysensors";
     rev = version;
     hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo=";
   };
diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix
index 919674c639fc..9aa53b8a0251 100644
--- a/pkgs/development/python-modules/pynello/default.nix
+++ b/pkgs/development/python-modules/pynello/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pschmitt";
-    repo = pname;
+    repo = "pynello";
     rev = version;
     hash = "sha256-sUy37sEPEMyFYFVBzFVdcg31nZAyC+Ricm4LqxmjuQQ=";
   };
diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix
index 08f200f65f1d..60247ac74ca0 100644
--- a/pkgs/development/python-modules/pynetgear/default.nix
+++ b/pkgs/development/python-modules/pynetgear/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "MatMaul";
-    repo = pname;
+    repo = "pynetgear";
     tag = version;
     hash = "sha256-5Lj2cK/SOGgaPu8dI9X3Leg4dPAY7tdIHCzFnNaube8=";
   };
diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix
index 0f178dc4cc1b..e3cd97f0dea8 100644
--- a/pkgs/development/python-modules/pynrrd/default.nix
+++ b/pkgs/development/python-modules/pynrrd/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mhe";
-    repo = pname;
+    repo = "pynrrd";
     tag = "v${version}";
     hash = "sha256-qu3s3XswJCUchqYfYMuqIzI4sfeXrttvXSEW9/GSENA=";
   };
diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix
index 6b8e6c448f0d..1c26aaaaf4bd 100644
--- a/pkgs/development/python-modules/pyobihai/default.nix
+++ b/pkgs/development/python-modules/pyobihai/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ejpenney";
-    repo = pname;
+    repo = "pyobihai";
     tag = version;
     hash = "sha256-tDPu/ceH7+7AnxokADDfl+G56B0+ri8RxXxXEyWa61Q=";
   };
diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix
index e3b4257da4e8..281d2f1c2de8 100644
--- a/pkgs/development/python-modules/pyosf/default.nix
+++ b/pkgs/development/python-modules/pyosf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "psychopy";
-    repo = pname;
+    repo = "pyosf";
     tag = "v${version}";
     hash = "sha256-Yhb6HSnLdFzWouse/RKZ8SIbMia/hhD8TAovdqmvd7o=";
   };
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index 102750113157..8536939ad536 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "JessicaTegner";
-    repo = pname;
+    repo = "pypandoc";
     tag = "v${version}";
     hash = "sha256-9fpits8O/50maM/e1lVVqBoTwUmcI+/IAYhVX1Pt6ZE=";
   };
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index a41820b42118..35734486d287 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyparsing";
-    repo = pname;
+    repo = "pyparsing";
     tag = version;
     hash = "sha256-irRSylY16Vcm2zsue1Iv+1eqYGZSAqhkqHrdjdhznlM=";
   };
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index a5f681ac167d..9aa205c3f2c2 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   disabled = isPyPy;
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "pyparted";
     owner = "dcantrell";
     tag = "v${version}";
     hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU=";
diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix
index 4bf0723dc6ce..01bf26b699e1 100644
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/pkgs/development/python-modules/pypcap/default.nix
@@ -7,14 +7,14 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pypcap";
   version = "1.3.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pynetwork";
-    repo = pname;
+    repo = "pypcap";
     # No release was tagged and PyPI doesn't contain tests.
     rev = "968859f0ffb5b7c990506dffe82457b7de23a026";
     hash = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE=";
diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix
index d92ba9f738b2..d57c96c6e9a0 100644
--- a/pkgs/development/python-modules/pyprusalink/default.nix
+++ b/pkgs/development/python-modules/pyprusalink/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
-    repo = pname;
+    repo = "pyprusalink";
     tag = version;
     hash = "sha256-Opip696hXV1gqFC1cWfrSCkrsldl7M7XZAqUaVkDy7M=";
   };
diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix
index 996e562e1315..244877d01240 100644
--- a/pkgs/development/python-modules/pypsrp/default.nix
+++ b/pkgs/development/python-modules/pypsrp/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jborean93";
-    repo = pname;
+    repo = "pypsrp";
     tag = "v${version}";
     hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU=";
   };
diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix
index 53392e3cb18d..a9ee08df28d1 100644
--- a/pkgs/development/python-modules/pyqvrpro/default.nix
+++ b/pkgs/development/python-modules/pyqvrpro/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "oblogic7";
-    repo = pname;
+    repo = "pyqvrpro";
     rev = "v${version}";
     hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU=";
   };
diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix
index a410c3345cde..ec16ae14fcd2 100644
--- a/pkgs/development/python-modules/pyrad/default.nix
+++ b/pkgs/development/python-modules/pyrad/default.nix
@@ -6,14 +6,14 @@
   poetry-core,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyrad";
   version = "2.4-unstable-2024-07-24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyradius";
-    repo = pname;
+    repo = "pyrad";
     rev = "f42a57cb0e80de42949810057d36df7c4a6b5146";
     hash = "sha256-5SPVeBL1oMZ/XXgKch2Hbk6BRU24HlVl4oXZ2agF1h8=";
   };
diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix
index c8514f59ae78..06bb22893dbc 100644
--- a/pkgs/development/python-modules/pyrituals/default.nix
+++ b/pkgs/development/python-modules/pyrituals/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "milanmeu";
-    repo = pname;
+    repo = "pyrituals";
     rev = version;
     sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g";
   };
diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix
index 89eea0f2ecbb..1da4794cd2cb 100644
--- a/pkgs/development/python-modules/pyrmvtransport/default.nix
+++ b/pkgs/development/python-modules/pyrmvtransport/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cgtobi";
-    repo = pname;
+    repo = "pyrmvtransport";
     rev = "v${version}";
     hash = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
   };
diff --git a/pkgs/development/python-modules/pysaj/default.nix b/pkgs/development/python-modules/pysaj/default.nix
index 499cb552b36e..24a28d49a414 100644
--- a/pkgs/development/python-modules/pysaj/default.nix
+++ b/pkgs/development/python-modules/pysaj/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fredericvl";
-    repo = pname;
+    repo = "pysaj";
     rev = "v${version}";
     hash = "sha256-7mN6GPRbXfEUfCrCrCs71SSt4x2Ch2y3a5rfXnuwVA0=";
   };
diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index 3fe9d328f195..919b5201df54 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyscf";
-    repo = pname;
+    repo = "pyscf";
     tag = "v${version}";
     hash = "sha256-UTeZXlNuSWDOcBRVbUUWJ3mQnZZQr17aTw6rRA5DRNI=";
   };
diff --git a/pkgs/development/python-modules/pyschemes/default.nix b/pkgs/development/python-modules/pyschemes/default.nix
index 5c7bc1afb960..034b110b1d14 100644
--- a/pkgs/development/python-modules/pyschemes/default.nix
+++ b/pkgs/development/python-modules/pyschemes/default.nix
@@ -6,14 +6,14 @@
   fetchpatch,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyschemes";
   version = "unstable-2017-11-08";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "spy16";
-    repo = pname;
+    repo = "pyschemes";
     rev = "ca6483d13159ba65ba6fc2f77b90421c40f2bbf2";
     hash = "sha256-PssucudvlE8mztwVme70+h+2hRW/ri9oV9IZayiZhdU=";
   };
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 3710af7db272..86f102627ad5 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "KimiNewt";
-    repo = pname;
+    repo = "pyshark";
     tag = "v${version}";
     hash = "sha256-kzJDzUK6zknUyXPdKc4zMvWim4C5NQCSJSS45HI6hKM=";
   };
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index 176e04eed522..361252eaee7c 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "GeospatialPython";
-    repo = pname;
+    repo = "pyshp";
     rev = version;
     hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo=";
   };
diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix
index dbf3d11da54b..42fe3a71a5a5 100644
--- a/pkgs/development/python-modules/pysmappee/default.nix
+++ b/pkgs/development/python-modules/pysmappee/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "smappee";
-    repo = pname;
+    repo = "pysmappee";
     rev = version;
     hash = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E=";
   };
diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix
index 295624bafc76..3214c7965e38 100644
--- a/pkgs/development/python-modules/pysmartapp/default.nix
+++ b/pkgs/development/python-modules/pysmartapp/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "andrewsayre";
-    repo = pname;
+    repo = "pysmartapp";
     rev = version;
     hash = "sha256-RiRGOO5l5hcHllyDDGLtQHr51JOTZhAa/wK8BfMqmAY=";
   };
diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix
index 7197bb1b6bb5..6edf59907d73 100644
--- a/pkgs/development/python-modules/pysmt/default.nix
+++ b/pkgs/development/python-modules/pysmt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pysmt";
-    repo = pname;
+    repo = "pysmt";
     rev = "v${version}";
     hash = "sha256-HmEdCJOF04h0z5UPpfYa07b78EEBj5KyVAk6aNRFPEo=";
   };
diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix
index 4117952337fe..8a45805015f8 100644
--- a/pkgs/development/python-modules/pysnooz/default.nix
+++ b/pkgs/development/python-modules/pysnooz/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "AustinBrunkhorst";
-    repo = pname;
+    repo = "pysnooz";
     tag = "v${version}";
     hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0=";
   };
diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix
index 80897afcf851..aed4cb05398d 100644
--- a/pkgs/development/python-modules/pysnow/default.nix
+++ b/pkgs/development/python-modules/pysnow/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rbw";
-    repo = pname;
+    repo = "pysnow";
     rev = version;
     hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY=";
   };
diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix
index a95787c5444a..234710d7bcf7 100644
--- a/pkgs/development/python-modules/pysonos/default.nix
+++ b/pkgs/development/python-modules/pysonos/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # pypi package is missing test fixtures
   src = fetchFromGitHub {
     owner = "amelchio";
-    repo = pname;
+    repo = "pysonos";
     rev = "v${version}";
     hash = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk=";
   };
diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix
index c8dc5e12d2e1..ff3731bc8686 100644
--- a/pkgs/development/python-modules/pyspcwebgw/default.nix
+++ b/pkgs/development/python-modules/pyspcwebgw/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mbrrg";
-    repo = pname;
+    repo = "pyspcwebgw";
     tag = "v${version}";
     hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI=";
   };
diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix
index cdedf35b93a5..bde01221be42 100644
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/pkgs/development/python-modules/pyspf/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sdgathman";
-    repo = pname;
+    repo = "pyspf";
     rev = "pyspf-${version}";
     sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi";
   };
diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix
index bc052bf3dc89..1c6de8c5b3c3 100644
--- a/pkgs/development/python-modules/pyspinel/default.nix
+++ b/pkgs/development/python-modules/pyspinel/default.nix
@@ -6,7 +6,7 @@
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyspinel";
   version = "unstable-2021-08-19";
   format = "setuptools";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "openthread";
-    repo = pname;
+    repo = "pyspinel";
     rev = "50d104e29eacd92d229f0b7179ec1067f5851c17";
     sha256 = "0s2r00zb909cq3dd28i91qbl0nz8cga3g98z84gq5jqkjpiy8269";
   };
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index 22cd63ce9fb6..a0a32a77c0b6 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jborean93";
-    repo = pname;
+    repo = "pyspnego";
     tag = "v${version}";
     hash = "sha256-5aGHCw0d1aFcHLPRMkya0hlHV30aTKshbcOjfPMOFko=";
   };
diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix
index 03f7077afd42..158f35f74f28 100644
--- a/pkgs/development/python-modules/pysubs2/default.nix
+++ b/pkgs/development/python-modules/pysubs2/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tkarabela";
-    repo = pname;
+    repo = "pysubs2";
     rev = version;
     hash = "sha256-fKSb7MfBHGft8Tp6excjfkVXKnHRER11X0QxbR1zD4I=";
   };
diff --git a/pkgs/development/python-modules/pysvg-py3/default.nix b/pkgs/development/python-modules/pysvg-py3/default.nix
index 77d430e67052..5e007defff32 100644
--- a/pkgs/development/python-modules/pysvg-py3/default.nix
+++ b/pkgs/development/python-modules/pysvg-py3/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alorence";
-    repo = pname;
+    repo = "pysvg-py3";
     rev = version;
     sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0";
   };
diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
index ce8e5c499c16..e64cbe2a1775 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "supermihi";
-    repo = pname;
+    repo = "pytaglib";
     tag = "v${version}";
     hash = "sha256-K9K30NFBcmxlYDQQ4YUhGzaPNVmLt0/L0JDrCtyKwLA=";
   };
diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix
index 213ccd4825e2..8c3cef709321 100644
--- a/pkgs/development/python-modules/pytautulli/default.nix
+++ b/pkgs/development/python-modules/pytautulli/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ludeeus";
-    repo = pname;
+    repo = "pytautulli";
     tag = version;
     hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY=";
   };
diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
index 0110008ae3dd..0d7ac5bb2d45 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "selectel";
-    repo = pname;
+    repo = "pyte";
     rev = version;
     hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE=";
   };
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 502bb3dd2465..eedc98c91b76 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "madmaze";
-    repo = pname;
+    repo = "pytesseract";
     tag = "v${version}";
     hash = "sha256-gQMeck6ojlIwyiOCBBhzHHrjQfBMelVksVGd+fyxWZk=";
   };
diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix
index b49313a63f79..068882b2f99d 100644
--- a/pkgs/development/python-modules/pytest-cid/default.nix
+++ b/pkgs/development/python-modules/pytest-cid/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ntninja";
-    repo = pname;
+    repo = "pytest-cid";
     tag = "v${version}";
     hash = "sha256-dcL/i5+scmdXh7lfE8+32w9PdHWf+mkunJL1vpJ5+Co=";
   };
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
index 006a352318e0..7527668cb321 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "omarkohl";
-    repo = pname;
+    repo = "pytest-datafiles";
     tag = version;
     hash = "sha256-YFD8M5TG6VtLRX04R3u0jtYDDlaK32D4ArWxS6x2b/E=";
   };
diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
index 594c16c4a87f..aec6a3a073ff 100644
--- a/pkgs/development/python-modules/pytest-error-for-skips/default.nix
+++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jankatins";
-    repo = pname;
+    repo = "pytest-error-for-skips";
     rev = version;
     sha256 = "04i4jd3bg4lgn2jfh0a0dzg3ml9b2bjv2ndia6b64w96r3r4p3qr";
   };
diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix
index 87855a7a1df7..f87ba271afe0 100644
--- a/pkgs/development/python-modules/pytest-golden/default.nix
+++ b/pkgs/development/python-modules/pytest-golden/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "oprypin";
-    repo = pname;
+    repo = "pytest-golden";
     tag = "v${version}";
     hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE=";
   };
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix
index 2fc387b35184..e770be044dfe 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/pkgs/development/python-modules/pytest-isort/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stephrdev";
-    repo = pname;
+    repo = "pytest-isort";
     tag = version;
     hash = "sha256-fMt2tYc+Ngb57T/VJYxI2UN25qvIrgIsEoImVIitDK4=";
   };
diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix
index b047d86acc12..f16032c17b6a 100644
--- a/pkgs/development/python-modules/pytest-logdog/default.nix
+++ b/pkgs/development/python-modules/pytest-logdog/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ods";
-    repo = pname;
+    repo = "pytest-logdog";
     rev = version;
     hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I=";
   };
diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix
index 3ab4e4e63cbf..4f521fc236bf 100644
--- a/pkgs/development/python-modules/pytest-mockservers/default.nix
+++ b/pkgs/development/python-modules/pytest-mockservers/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Gr1N";
-    repo = pname;
+    repo = "pytest-mockservers";
     rev = version;
     hash = "sha256-Mb3wSbambC1h+lFI+fafwZzm78IvADNAsF/Uw60DFHc=";
   };
diff --git a/pkgs/development/python-modules/pytest-parallel/default.nix b/pkgs/development/python-modules/pytest-parallel/default.nix
index 5aee33dd53d1..bb37a365c5cc 100644
--- a/pkgs/development/python-modules/pytest-parallel/default.nix
+++ b/pkgs/development/python-modules/pytest-parallel/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "kevlened";
-    repo = pname;
+    repo = "pytest-parallel";
     tag = version;
     hash = "sha256-ddpoWBTf7Zor569p6uOMjHSTx3Qa551f4mSwyTLDdBU=";
   };
diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix
index 793747e18248..3bb78f197750 100644
--- a/pkgs/development/python-modules/pytest-param-files/default.nix
+++ b/pkgs/development/python-modules/pytest-param-files/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "chrisjsewell";
-    repo = pname;
+    repo = "pytest-param-files";
     tag = "v${version}";
     hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE=";
   };
diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix
index a2d818f07004..538147315842 100644
--- a/pkgs/development/python-modules/pytest-raises/default.nix
+++ b/pkgs/development/python-modules/pytest-raises/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Lemmons";
-    repo = pname;
+    repo = "pytest-raises";
     tag = version;
     hash = "sha256-wmtWPWwe1sFbWSYxs5ZXDUZM1qvjRGMudWdjQeskaz0=";
   };
diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix
index b2ecfb4edb50..7c12c073f153 100644
--- a/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "pytest-randomly";
     owner = "pytest-dev";
     rev = version;
     hash = "sha256-bxbW22Nf/0hfJYSiz3xdrNCzrb7vZwuVvSIrWl0Bkv4=";
diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix
index 66389e622e64..557a9e9995a7 100644
--- a/pkgs/development/python-modules/pytest-resource-path/default.nix
+++ b/pkgs/development/python-modules/pytest-resource-path/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "yukihiko-shinoda";
-    repo = pname;
+    repo = "pytest-resource-path";
     rev = "v${version}";
     sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2";
   };
diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix
index e8cfd7dc9b62..b4fe9844778a 100644
--- a/pkgs/development/python-modules/pytest-snapshot/default.nix
+++ b/pkgs/development/python-modules/pytest-snapshot/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "joseph-roitman";
-    repo = pname;
+    repo = "pytest-snapshot";
     tag = "v${version}";
     hash = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU=";
   };
diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix
index 170e64f13f0c..a5b804545f96 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tarpas";
-    repo = pname;
+    repo = "pytest-testmon";
     tag = "v${version}";
     hash = "sha256-LSp3GkvyZ8wX6qelGy4PdCliGIzXo2nJNrYqxdSo/wM=";
   };
diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix
index 43464e3ce149..94176949f056 100644
--- a/pkgs/development/python-modules/pytest-tornasync/default.nix
+++ b/pkgs/development/python-modules/pytest-tornasync/default.nix
@@ -7,7 +7,7 @@
   tornado,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pytest-tornasync";
   version = "0.6.0.post2";
   format = "setuptools";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "eukaryote";
-    repo = pname;
+    repo = "pytest-tornasync";
     # upstream does not keep git tags in sync with pypy releases
     # https://github.com/eukaryote/pytest-tornasync/issues/9
     rev = "c5f013f1f727f1ca1fcf8cc748bba7f4a2d79e56";
diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix
index 31caf8fc5e09..5499c41d5f87 100644
--- a/pkgs/development/python-modules/pytest-trio/default.nix
+++ b/pkgs/development/python-modules/pytest-trio/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "python-trio";
-    repo = pname;
+    repo = "pytest-trio";
     rev = "v${version}";
     sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk=";
   };
diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix
index 2e77d3af8261..c2336df5c5fe 100644
--- a/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ktosiek";
-    repo = pname;
+    repo = "pytest-vcr";
     rev = version;
     sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i";
   };
diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix
index aa82db324c16..6cd18c5b97f0 100644
--- a/pkgs/development/python-modules/python-ctags3/default.nix
+++ b/pkgs/development/python-modules/python-ctags3/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
-    repo = pname;
+    repo = "python-ctags3";
     rev = version;
     hash = "sha256-XVsZckNVJ1H5q8FzqoVd1UWRw0zOygvRtb7arX9dwGE=";
   };
diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix
index 47a2629b2bb9..6bbe21fdbd4a 100644
--- a/pkgs/development/python-modules/python-decouple/default.nix
+++ b/pkgs/development/python-modules/python-decouple/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "HBNetwork";
-    repo = pname;
+    repo = "python-decouple";
     tag = "v${version}";
     hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q=";
   };
diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix
index d21202daac65..0e6b5bb5c489 100644
--- a/pkgs/development/python-modules/python-frontmatter/default.nix
+++ b/pkgs/development/python-modules/python-frontmatter/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "eyeseast";
-    repo = pname;
+    repo = "python-frontmatter";
     tag = "v${version}";
     sha256 = "sha256-Sr0RbNVk87Zu01U7nkuPUSnl1bm6G72EZDP/eDn099s=";
   };
diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix
index 14839d135b0c..3f4ed5c4d97b 100644
--- a/pkgs/development/python-modules/python-fullykiosk/default.nix
+++ b/pkgs/development/python-modules/python-fullykiosk/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cgarwood";
-    repo = pname;
+    repo = "python-fullykiosk";
     tag = version;
     hash = "sha256-+JBgBi05zNgIt2cXlHjFPI6nBFR7SpMCWIQHKtnZeX4=";
   };
diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix
index ed35a96f7752..2e36ccee20ae 100644
--- a/pkgs/development/python-modules/python-gammu/default.nix
+++ b/pkgs/development/python-modules/python-gammu/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gammu";
-    repo = pname;
+    repo = "python-gammu";
     rev = version;
     hash = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA=";
   };
diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix
index e056b4afc9d2..aa06730ffe4f 100644
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "openstack";
-    repo = pname;
+    repo = "python-ironicclient";
     tag = version;
     hash = "sha256-HqsOMvJ8SK8IEZgeClLd0TnQLBweBEru0Bw4WRSDG7s=";
   };
diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
index 9856742f48b4..cbca9a65a80d 100644
--- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
+++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "python-lsp";
-    repo = pname;
+    repo = "python-lsp-jsonrpc";
     tag = "v${version}";
     hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64=";
   };
diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix
index c9fe1b204352..5173b45edabf 100644
--- a/pkgs/development/python-modules/python-ndn/default.nix
+++ b/pkgs/development/python-modules/python-ndn/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "named-data";
-    repo = pname;
+    repo = "python-ndn";
     tag = "v${version}";
     hash = "sha256-8fcBIcZ2l6mkKe9YQe5+5fh7+vK9qxzBO2kLRUONumQ=";
   };
diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix
index 8f126bca5a8d..3df5479a72c0 100644
--- a/pkgs/development/python-modules/python-pam/default.nix
+++ b/pkgs/development/python-modules/python-pam/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "FirefighterBlu3";
-    repo = pname;
+    repo = "python-pam";
     tag = "v${version}";
     hash = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU=";
   };
diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix
index b4891105ce22..10e37e558501 100644
--- a/pkgs/development/python-modules/python-pkcs11/default.nix
+++ b/pkgs/development/python-modules/python-pkcs11/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "danni";
-    repo = pname;
+    repo = "python-pkcs11";
     rev = "v${version}";
     sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv";
   };
diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix
index fee2f88d5038..609986ea2810 100644
--- a/pkgs/development/python-modules/python-rabbitair/default.nix
+++ b/pkgs/development/python-modules/python-rabbitair/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rabbit-air";
-    repo = pname;
+    repo = "python-rabbitair";
     rev = "v${version}";
     hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs=";
   };
diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix
index 1811ba176a1e..f64c1e3d4eef 100644
--- a/pkgs/development/python-modules/python-twitter/default.nix
+++ b/pkgs/development/python-modules/python-twitter/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bear";
-    repo = pname;
+    repo = "python-twitter";
     rev = "v${version}";
     sha256 = "08ydmf6dcd416cvw6xq1wxsz6b9s21f2mf9fh3y4qz9swj6n9h8z";
   };
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index a74895545bb0..791dc068084a 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "WoLpH";
-    repo = pname;
+    repo = "python-utils";
     tag = "v${version}";
     hash = "sha256-lzLzYI5jShfIwQqvfA8UtPjGawXE80ww7jb/gPzpeDo=";
   };
diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix
index b61ff595564f..f55a0ade2077 100644
--- a/pkgs/development/python-modules/python3-application/default.nix
+++ b/pkgs/development/python-modules/python3-application/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "AGProjects";
-    repo = pname;
+    repo = "python3-application";
     rev = "release-${version}";
     hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8=";
   };
diff --git a/pkgs/development/python-modules/pytimeparse2/default.nix b/pkgs/development/python-modules/pytimeparse2/default.nix
index d7ffec6a9b7d..4a84005cd991 100644
--- a/pkgs/development/python-modules/pytimeparse2/default.nix
+++ b/pkgs/development/python-modules/pytimeparse2/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "onegreyonewhite";
-    repo = pname;
+    repo = "pytimeparse2";
     tag = version;
     hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48=";
   };
diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix
index 292283dca1bf..ae3678b3d9ba 100644
--- a/pkgs/development/python-modules/pytm/default.nix
+++ b/pkgs/development/python-modules/pytm/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "izar";
-    repo = pname;
+    repo = "pytm";
     tag = "v${version}";
     sha256 = "sha256-MseV1ucDCzSM36zx04g9v5euDX0t74KqUSB4+brHzt8=";
   };
diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix
index 98b20b6ffc46..12d6e311251c 100644
--- a/pkgs/development/python-modules/pytomlpp/default.nix
+++ b/pkgs/development/python-modules/pytomlpp/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bobfang1992";
-    repo = pname;
+    repo = "pytomlpp";
     rev = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-QJeXvj1M3Vq5ctmx7RhczONsPRXAecv3WhJgKWtNK+M=";
diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix
index f906b58fe0af..d2caf52c6010 100644
--- a/pkgs/development/python-modules/pytricia/default.nix
+++ b/pkgs/development/python-modules/pytricia/default.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pytricia";
   version = "unstable-2019-01-16";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "jsommers";
-    repo = pname;
+    repo = "pytricia";
     rev = "4ba88f68c3125f789ca8cd1cfae156e1464bde87";
     sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h";
   };
diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix
index a3cf57ca2ebb..ecc18e49f029 100644
--- a/pkgs/development/python-modules/pyu2f/default.nix
+++ b/pkgs/development/python-modules/pyu2f/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "google";
-    repo = pname;
+    repo = "pyu2f";
     tag = version;
     sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v";
   };
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index a2e0af522d83..b4a4027b28cd 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "asottile";
-    repo = pname;
+    repo = "pyupgrade";
     rev = "v${version}";
     hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU=";
   };
diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix
index ad4a805bf90d..39f0cbc0b8b6 100644
--- a/pkgs/development/python-modules/pyuptimerobot/default.nix
+++ b/pkgs/development/python-modules/pyuptimerobot/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ludeeus";
-    repo = pname;
+    repo = "pyuptimerobot";
     tag = version;
     hash = "sha256-hy/hmXxxEb44X8JUszoA1YF/41y7GkQqC4uS+Pax6WA=";
   };
diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix
index d6328c4acf81..206c2211d5fc 100644
--- a/pkgs/development/python-modules/pyversasense/default.nix
+++ b/pkgs/development/python-modules/pyversasense/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "imstevenxyz";
-    repo = pname;
+    repo = "pyversasense";
     rev = "v${version}";
     sha256 = "vTaDEwImWDMInwti0Jj+j+RFEtXOOKtiH5wOMD6ZmJk=";
   };
diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix
index 79b82c9cb040..b6cbdf091ec8 100644
--- a/pkgs/development/python-modules/pyvis/default.nix
+++ b/pkgs/development/python-modules/pyvis/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "WestHealth";
-    repo = pname;
+    repo = "pyvis";
     tag = "v${version}";
     hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E=";
   };
diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index ffc1402bc366..5ebc09edb239 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vmware";
-    repo = pname;
+    repo = "pyvmomi";
     tag = "v${version}";
     hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0=";
   };
diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix
index 36ab393c2f6d..ad85a2a12541 100644
--- a/pkgs/development/python-modules/pywaterkotte/default.nix
+++ b/pkgs/development/python-modules/pywaterkotte/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "chboland";
-    repo = pname;
+    repo = "pywaterkotte";
     tag = "v${version}";
     hash = "sha256-zK0x6LyXPPNPA20Zq+S1B1q7ZWGxQmWf4JxEfjNkPQw=";
   };
diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix
index bec42ef78367..f6a4d91ce48b 100644
--- a/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "briis";
-    repo = pname;
+    repo = "pyweatherflowrest";
     tag = "v${version}";
     hash = "sha256-l1V3HgzqnnoY6sWHwfgBtcIR782RwKhekY2qOLrUMNY=";
   };
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 213d33de2314..d745f9ab1763 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sbidy";
-    repo = pname;
+    repo = "pywizlight";
     rev = "v${version}";
     hash = "sha256-JT0Ud17U9etByaDVu9+hcadymze1rfj+mEK6nqksuWc=";
   };
diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix
index aa196c646a69..bad163763077 100644
--- a/pkgs/development/python-modules/pyws66i/default.nix
+++ b/pkgs/development/python-modules/pyws66i/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ssaenger";
-    repo = pname;
+    repo = "pyws66i";
     rev = "v${version}";
     hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY=";
   };
diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix
index 744b5f02b3ea..b6a86195e2e2 100644
--- a/pkgs/development/python-modules/pyxbe/default.nix
+++ b/pkgs/development/python-modules/pyxbe/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mborgerson";
-    repo = pname;
+    repo = "pyxbe";
     tag = "v${version}";
     hash = "sha256-iLzGGgizUbaEG1xrNq4WDaWrGtcaLwAYgn4NGYiSDBo=";
   };
diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix
index b7ec762f7d6b..035715c297a1 100644
--- a/pkgs/development/python-modules/pyxdg/default.nix
+++ b/pkgs/development/python-modules/pyxdg/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "xdg";
-    repo = pname;
+    repo = "pyxdg";
     rev = "rel-${version}";
     hash = "sha256-TrFQzfkXabmfpGYwhxD1UVY1F645KycfSPPrMJFAe+0=";
   };
diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix
index 04d5ef2b5b96..fbe09edf07a0 100644
--- a/pkgs/development/python-modules/pyxl3/default.nix
+++ b/pkgs/development/python-modules/pyxl3/default.nix
@@ -6,7 +6,7 @@
   isPy27,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyxl3";
   version = "1.4";
   format = "setuptools";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gvanrossum";
-    repo = pname;
+    repo = "pyxl3";
     rev = "e6588c12caee49c43faf6aa260f04d7e971f6aa8";
     hash = "sha256-8nKQgwLXPVgPxNRF4CryKJb7+llDsZHis5VctxqpIRo=";
   };
diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix
index b6ae8556f82a..79d3617e49f9 100644
--- a/pkgs/development/python-modules/pyzerproc/default.nix
+++ b/pkgs/development/python-modules/pyzerproc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "emlove";
-    repo = pname;
+    repo = "pyzerproc";
     tag = version;
     hash = "sha256-vS0sk/KjDhWispZvCuGlmVLLfeFymHqxwNzNqNRhg6k=";
   };
diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix
index 6b5cc55dc2e3..e3626eddd7a6 100644
--- a/pkgs/development/python-modules/qasync/default.nix
+++ b/pkgs/development/python-modules/qasync/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CabbageDevelopment";
-    repo = pname;
+    repo = "qasync";
     tag = "v${version}";
     hash = "sha256-oXzwilhJ1PhodQpOZjnV9gFuoDy/zXWva9LhhK3T00g=";
   };
diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix
index db69c1f4f5d7..c383e89b0de0 100644
--- a/pkgs/development/python-modules/qpageview/default.nix
+++ b/pkgs/development/python-modules/qpageview/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "frescobaldi";
-    repo = pname;
+    repo = "qpageview";
     tag = "v${version}";
     hash = "sha256-UADC+DH3eG1pqlC9BRsqGQQjJcpfwWWVq4O7aFGLxLA=";
   };
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 18c6cb6a2544..8ed729763110 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "spyder-ide";
-    repo = pname;
+    repo = "qtawesome";
     tag = "v${version}";
     hash = "sha256-VjUlP+5QU9ApD09UNvF48b0gepCUpVO6U6zYaKm0KoE=";
   };
diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix
index 0fa7aad7a920..85e167689cfe 100644
--- a/pkgs/development/python-modules/qualysclient/default.nix
+++ b/pkgs/development/python-modules/qualysclient/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "woodtechie1428";
-    repo = pname;
+    repo = "qualysclient";
     tag = "v${version}";
     hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0=";
   };
diff --git a/pkgs/development/python-modules/quantulum3/default.nix b/pkgs/development/python-modules/quantulum3/default.nix
index 685145d941ea..85e17eaf53c8 100644
--- a/pkgs/development/python-modules/quantulum3/default.nix
+++ b/pkgs/development/python-modules/quantulum3/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   # Pypi source package doesn't contain tests
   src = fetchFromGitHub {
     owner = "nielstron";
-    repo = pname;
+    repo = "quantulum3";
     rev = "9dafd76d3586aa5ea1b96164d86c73037e827294";
     hash = "sha256-fHztPeTbMp1aYsj+STYWzHgwdY0Q9078qXpXxtA8pPs=";
   };
diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix
index 0d8ab699377a..52aab0d5004e 100644
--- a/pkgs/development/python-modules/questionary/default.nix
+++ b/pkgs/development/python-modules/questionary/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tmbo";
-    repo = pname;
+    repo = "questionary";
     tag = version;
     hash = "sha256-HiQsOkG3oK+hnyeFjebnVASxpZhUPGBGz69JvPO43fM=";
   };
diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index e47fd1f14b35..ad83654c3ab3 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "randy3k";
-    repo = pname;
+    repo = "radian";
     tag = "v${version}";
     hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
   };
diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix
index c574b09301b8..cea8791fdb8c 100644
--- a/pkgs/development/python-modules/radiotherm/default.nix
+++ b/pkgs/development/python-modules/radiotherm/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mhrivnak";
-    repo = pname;
+    repo = "radiotherm";
     rev = version;
     sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks";
   };
diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix
index 92fcac8b67ad..78ebd833a17e 100644
--- a/pkgs/development/python-modules/rainbowstream/default.nix
+++ b/pkgs/development/python-modules/rainbowstream/default.nix
@@ -17,14 +17,14 @@
   zlib,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "rainbowstream";
   version = "1.5.5";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "orakaro";
-    repo = pname;
+    repo = "rainbowstream";
     # Request for tagging, https://github.com/orakaro/rainbowstream/issues/314
     rev = "96141fac10675e0775d703f65a59c4477a48c57e";
     sha256 = "0j0qcc428lk9b3l0cr2j418gd6wd5k4160ham2zn2mmdmxn5bldg";
diff --git a/pkgs/development/python-modules/rank-bm25/default.nix b/pkgs/development/python-modules/rank-bm25/default.nix
index 7318aa2a7934..214b78eda6b2 100644
--- a/pkgs/development/python-modules/rank-bm25/default.nix
+++ b/pkgs/development/python-modules/rank-bm25/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
   # Pypi source package doesn't contain tests
   src = fetchFromGitHub {
     owner = "dorianbrown";
-    repo = pname;
+    repo = "rank-bm25";
     rev = version;
     hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg=";
   };
diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix
index b17d017fbd6a..0e4bdaca35c1 100644
--- a/pkgs/development/python-modules/ratelimit/default.nix
+++ b/pkgs/development/python-modules/ratelimit/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tomasbasham";
-    repo = pname;
+    repo = "ratelimit";
     rev = "v${version}";
     sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2";
   };
diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index 2d992abd827a..c61edb251fca 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "randy3k";
-    repo = pname;
+    repo = "rchitect";
     tag = "v${version}";
     hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y=";
   };
diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix
index a61f2804d71f..493460381d30 100644
--- a/pkgs/development/python-modules/recommonmark/default.nix
+++ b/pkgs/development/python-modules/recommonmark/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rtfd";
-    repo = pname;
+    repo = "recommonmark";
     rev = version;
     sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379";
   };
diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix
index ea995ee27a7d..97672368fc39 100644
--- a/pkgs/development/python-modules/regional/default.nix
+++ b/pkgs/development/python-modules/regional/default.nix
@@ -9,7 +9,7 @@
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "regional";
   version = "1.1.2";
   format = "setuptools";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "freeman-lab";
-    repo = pname;
+    repo = "regional";
     rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo
     hash = "sha256-u88v9H9RZ9cgtSat73QEnHr3gZGL8DmBZ0XphMuoDw8=";
   };
diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix
index 2db172bdeb5b..5b576a26fc33 100644
--- a/pkgs/development/python-modules/releases/default.nix
+++ b/pkgs/development/python-modules/releases/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bitprophet";
-    repo = pname;
+    repo = "releases";
     rev = version;
     hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8=";
   };
diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix
index ac9ddd35aabd..424d0f5f3de0 100644
--- a/pkgs/development/python-modules/reolink/default.nix
+++ b/pkgs/development/python-modules/reolink/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fwestenberg";
-    repo = pname;
+    repo = "reolink";
     tag = "v${version}";
     hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I=";
   };
diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix
index 428b4ac18777..1ef06e813c68 100644
--- a/pkgs/development/python-modules/requests-credssp/default.nix
+++ b/pkgs/development/python-modules/requests-credssp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jborean93";
-    repo = pname;
+    repo = "requests-credssp";
     rev = "v${version}";
     hash = "sha256-HHLEmQ+mNjMjpR6J+emrKFM+2PiYq32o7Gnoo0gUrNA=";
   };
diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix
index 541604089e25..33a465dd51e5 100644
--- a/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/pkgs/development/python-modules/requests-http-signature/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyauth";
-    repo = pname;
+    repo = "requests-http-signature";
     rev = "v${version}";
     hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU=";
   };
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index 70a5eebacdb5..b2829a6a332d 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "requests";
-    repo = pname;
+    repo = "requests-kerberos";
     rev = "v${version}";
     hash = "sha256-s1Q3zqKPSuTkiFExr+axai9Eta1xjw/cip8xzfDGR88=";
   };
diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index f6ac5014be4a..b644cc76cadf 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bmcfee";
-    repo = pname;
+    repo = "resampy";
     tag = version;
     hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY=";
   };
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 1a2db047b7a4..4544ef60d6ce 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "getsentry";
-    repo = pname;
+    repo = "responses";
     tag = version;
     hash = "sha256-eiJwu0sRtr3S4yAnbsIak7g03CNqOTS16rNXoXRQumA=";
   };
diff --git a/pkgs/development/python-modules/retry-decorator/default.nix b/pkgs/development/python-modules/retry-decorator/default.nix
index 4482a7b25fac..975e878ee45a 100644
--- a/pkgs/development/python-modules/retry-decorator/default.nix
+++ b/pkgs/development/python-modules/retry-decorator/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pnpnpn";
-    repo = pname;
+    repo = "retry-decorator";
     tag = "v${version}";
     hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M=";
   };
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix
index 596a2ca07290..01ee32e3bdec 100644
--- a/pkgs/development/python-modules/rfc6555/default.nix
+++ b/pkgs/development/python-modules/rfc6555/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sethmlarson";
-    repo = pname;
+    repo = "rfc6555";
     rev = "v${version}";
     hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM=";
   };
diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
index 014f651e18c3..1d426b3558fa 100644
--- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
-    repo = pname;
+    repo = "ripe-atlas-sagan";
     rev = "v${version}";
     hash = "sha256-xIBIKsQvDmVBa/C8/7Wr3WKeepHaGhoXlgatXSUtWLA=";
   };
diff --git a/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix
index a47cc8172b69..c62052424d50 100644
--- a/pkgs/development/python-modules/riscof/default.nix
+++ b/pkgs/development/python-modules/riscof/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "riscv-software-src";
-    repo = pname;
+    repo = "riscof";
     tag = version;
     hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY=";
   };
diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix
index 0353b0d59870..dc731438b54a 100644
--- a/pkgs/development/python-modules/riscv-isac/default.nix
+++ b/pkgs/development/python-modules/riscv-isac/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "riscv-software-src";
-    repo = pname;
+    repo = "riscv-isac";
     tag = version;
     hash = "sha256-7CWUyYwzynFq/Qk5SzQB+ljsVVI98kPPDT63Emhqihw=";
   };
diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix
index acdca91e53aa..f5a7a7183eea 100644
--- a/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "MarketSquare";
-    repo = pname;
+    repo = "robotframework-requests";
     tag = "v${version}";
     hash = "sha256-NRhf3delcqUw9vWRPL6pJzpcmRMDou2pHmUHMstF8hw=";
   };
diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix
index 00e7830fbd7c..73de990287a9 100644
--- a/pkgs/development/python-modules/rpi-bad-power/default.nix
+++ b/pkgs/development/python-modules/rpi-bad-power/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "shenxn";
-    repo = pname;
+    repo = "rpi-bad-power";
     rev = "v${version}";
     hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk";
   };
diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix
index 24aa686c807c..77c9848b873d 100644
--- a/pkgs/development/python-modules/rtoml/default.nix
+++ b/pkgs/development/python-modules/rtoml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "samuelcolvin";
-    repo = pname;
+    repo = "rtoml";
     rev = "v${version}";
     hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM=";
   };
diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix
index 06147e09686d..330882d42191 100644
--- a/pkgs/development/python-modules/ruffus/default.nix
+++ b/pkgs/development/python-modules/ruffus/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cgat-developers";
-    repo = pname;
+    repo = "ruffus";
     rev = "v${version}";
     sha256 = "0fnzpchwwqsy5h18fs0n90s51w25n0dx0l74j0ka6lvhjl5sxn4c";
   };
diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix
index 30be2072b595..dd798ec72893 100644
--- a/pkgs/development/python-modules/rxv/default.nix
+++ b/pkgs/development/python-modules/rxv/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "wuub";
-    repo = pname;
+    repo = "rxv";
     rev = "v${version}";
     sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8";
   };

From e66f34783ebac25be3bd791dbdd3e933baf6f0af Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 25 May 2025 03:41:48 +0200
Subject: [PATCH 097/204] treewide: substitute pname for strings
 (python3Packages.[a-g].*)

---
 .../development/python-modules/add-trailing-comma/default.nix | 2 +-
 pkgs/development/python-modules/advocate/default.nix          | 2 +-
 pkgs/development/python-modules/aggdraw/default.nix           | 2 +-
 pkgs/development/python-modules/aioblescan/default.nix        | 2 +-
 pkgs/development/python-modules/aiodocker/default.nix         | 4 ++--
 pkgs/development/python-modules/aioemonitor/default.nix       | 2 +-
 pkgs/development/python-modules/aiohttp-wsgi/default.nix      | 2 +-
 pkgs/development/python-modules/aiohwenergy/default.nix       | 2 +-
 pkgs/development/python-modules/aiokef/default.nix            | 2 +-
 pkgs/development/python-modules/aiolimiter/default.nix        | 2 +-
 pkgs/development/python-modules/aiolookin/default.nix         | 2 +-
 pkgs/development/python-modules/aionanoleaf/default.nix       | 2 +-
 pkgs/development/python-modules/aiopg/default.nix             | 2 +-
 pkgs/development/python-modules/aiopurpleair/default.nix      | 2 +-
 pkgs/development/python-modules/aiopyarr/default.nix          | 2 +-
 pkgs/development/python-modules/aiopylgtv/default.nix         | 2 +-
 pkgs/development/python-modules/aioqsw/default.nix            | 2 +-
 pkgs/development/python-modules/aiorecollect/default.nix      | 2 +-
 pkgs/development/python-modules/aioridwell/default.nix        | 2 +-
 pkgs/development/python-modules/aiosenz/default.nix           | 2 +-
 pkgs/development/python-modules/aiosignal/default.nix         | 2 +-
 pkgs/development/python-modules/aiowatttime/default.nix       | 2 +-
 pkgs/development/python-modules/airtouch4pyapi/default.nix    | 2 +-
 pkgs/development/python-modules/aladdin-connect/default.nix   | 2 +-
 pkgs/development/python-modules/allpairspy/default.nix        | 2 +-
 pkgs/development/python-modules/amqtt/default.nix             | 4 ++--
 pkgs/development/python-modules/ancp-bids/default.nix         | 2 +-
 pkgs/development/python-modules/androguard/default.nix        | 4 ++--
 pkgs/development/python-modules/ansi/default.nix              | 2 +-
 pkgs/development/python-modules/ansiconv/default.nix          | 2 +-
 pkgs/development/python-modules/aqualogic/default.nix         | 2 +-
 pkgs/development/python-modules/arc4/default.nix              | 2 +-
 pkgs/development/python-modules/aria2p/default.nix            | 2 +-
 pkgs/development/python-modules/arpy/default.nix              | 2 +-
 pkgs/development/python-modules/asn1ate/default.nix           | 2 +-
 pkgs/development/python-modules/assay/default.nix             | 4 ++--
 pkgs/development/python-modules/assertpy/default.nix          | 4 ++--
 pkgs/development/python-modules/asyncio-throttle/default.nix  | 2 +-
 pkgs/development/python-modules/asyncmy/default.nix           | 2 +-
 .../python-modules/atlassian-python-api/default.nix           | 2 +-
 pkgs/development/python-modules/aurorapy/default.nix          | 2 +-
 pkgs/development/python-modules/avea/default.nix              | 2 +-
 pkgs/development/python-modules/babelfont/default.nix         | 2 +-
 pkgs/development/python-modules/backoff/default.nix           | 2 +-
 pkgs/development/python-modules/base58check/default.nix       | 2 +-
 pkgs/development/python-modules/bashlex/default.nix           | 2 +-
 pkgs/development/python-modules/bbox/default.nix              | 4 ++--
 pkgs/development/python-modules/beautifultable/default.nix    | 2 +-
 pkgs/development/python-modules/beautysh/default.nix          | 2 +-
 pkgs/development/python-modules/bitstring/default.nix         | 2 +-
 pkgs/development/python-modules/bitvavo-aio/default.nix       | 2 +-
 pkgs/development/python-modules/bjoern/default.nix            | 2 +-
 pkgs/development/python-modules/black-macchiato/default.nix   | 2 +-
 pkgs/development/python-modules/bleak/default.nix             | 2 +-
 pkgs/development/python-modules/blobfile/default.nix          | 2 +-
 pkgs/development/python-modules/bork/default.nix              | 2 +-
 pkgs/development/python-modules/bravado-core/default.nix      | 2 +-
 pkgs/development/python-modules/brotli-asgi/default.nix       | 2 +-
 pkgs/development/python-modules/brotli/default.nix            | 2 +-
 pkgs/development/python-modules/brottsplatskartan/default.nix | 2 +-
 pkgs/development/python-modules/bunch/default.nix             | 4 ++--
 pkgs/development/python-modules/bytecode/default.nix          | 2 +-
 pkgs/development/python-modules/bytewax/default.nix           | 2 +-
 pkgs/development/python-modules/cachelib/default.nix          | 2 +-
 pkgs/development/python-modules/cachey/default.nix            | 2 +-
 pkgs/development/python-modules/callee/default.nix            | 2 +-
 pkgs/development/python-modules/cart/default.nix              | 2 +-
 pkgs/development/python-modules/certvalidator/default.nix     | 2 +-
 .../python-modules/chacha20poly1305-reuseable/default.nix     | 2 +-
 pkgs/development/python-modules/chalice/default.nix           | 2 +-
 pkgs/development/python-modules/cheetah3/default.nix          | 2 +-
 pkgs/development/python-modules/chirpstack-api/default.nix    | 2 +-
 pkgs/development/python-modules/circuitbreaker/default.nix    | 2 +-
 pkgs/development/python-modules/class-doc/default.nix         | 4 ++--
 pkgs/development/python-modules/classify-imports/default.nix  | 2 +-
 pkgs/development/python-modules/cleo/default.nix              | 2 +-
 .../development/python-modules/click-command-tree/default.nix | 2 +-
 pkgs/development/python-modules/click-shell/default.nix       | 2 +-
 pkgs/development/python-modules/clintermission/default.nix    | 2 +-
 pkgs/development/python-modules/clip/default.nix              | 4 ++--
 pkgs/development/python-modules/clldutils/default.nix         | 2 +-
 pkgs/development/python-modules/codepy/default.nix            | 2 +-
 pkgs/development/python-modules/colorful/default.nix          | 2 +-
 pkgs/development/python-modules/colorzero/default.nix         | 2 +-
 pkgs/development/python-modules/colout/default.nix            | 2 +-
 pkgs/development/python-modules/confection/default.nix        | 2 +-
 pkgs/development/python-modules/configobj/default.nix         | 2 +-
 pkgs/development/python-modules/confuse/default.nix           | 2 +-
 pkgs/development/python-modules/connio/default.nix            | 2 +-
 pkgs/development/python-modules/convertdate/default.nix       | 2 +-
 pkgs/development/python-modules/crc32c/default.nix            | 2 +-
 pkgs/development/python-modules/cryptg/default.nix            | 2 +-
 pkgs/development/python-modules/crysp/default.nix             | 2 +-
 pkgs/development/python-modules/dacite/default.nix            | 2 +-
 pkgs/development/python-modules/databricks-cli/default.nix    | 2 +-
 .../python-modules/datasette-publish-fly/default.nix          | 2 +-
 .../python-modules/datasette-template-sql/default.nix         | 2 +-
 pkgs/development/python-modules/datasette/default.nix         | 2 +-
 pkgs/development/python-modules/datatable/default.nix         | 2 +-
 pkgs/development/python-modules/dbt-common/default.nix        | 2 +-
 .../python-modules/dbus-python-client-gen/default.nix         | 2 +-
 .../python-modules/dbus-signature-pyparsing/default.nix       | 2 +-
 pkgs/development/python-modules/debuglater/default.nix        | 2 +-
 pkgs/development/python-modules/decli/default.nix             | 2 +-
 pkgs/development/python-modules/deepwave/default.nix          | 2 +-
 pkgs/development/python-modules/deploykit/default.nix         | 2 +-
 pkgs/development/python-modules/desktop-entry-lib/default.nix | 2 +-
 pkgs/development/python-modules/detect-secrets/default.nix    | 2 +-
 pkgs/development/python-modules/dicom-numpy/default.nix       | 2 +-
 pkgs/development/python-modules/dicom2nifti/default.nix       | 2 +-
 pkgs/development/python-modules/dicomweb-client/default.nix   | 2 +-
 pkgs/development/python-modules/dictdiffer/default.nix        | 2 +-
 pkgs/development/python-modules/dill/default.nix              | 2 +-
 pkgs/development/python-modules/dinghy/default.nix            | 2 +-
 .../python-modules/django-celery-email/default.nix            | 2 +-
 pkgs/development/python-modules/django-extensions/default.nix | 4 ++--
 .../python-modules/django-graphiql-debug-toolbar/default.nix  | 2 +-
 .../python-modules/django-logentry-admin/default.nix          | 2 +-
 .../django-login-required-middleware/default.nix              | 2 +-
 .../python-modules/django-postgresql-netfields/default.nix    | 2 +-
 pkgs/development/python-modules/django-prometheus/default.nix | 2 +-
 pkgs/development/python-modules/django-rq/default.nix         | 2 +-
 .../python-modules/django-timezone-field/default.nix          | 2 +-
 pkgs/development/python-modules/django-vite/default.nix       | 2 +-
 pkgs/development/python-modules/docformatter/default.nix      | 2 +-
 .../python-modules/docstring-to-markdown/default.nix          | 2 +-
 pkgs/development/python-modules/doit-py/default.nix           | 2 +-
 pkgs/development/python-modules/dparse2/default.nix           | 2 +-
 pkgs/development/python-modules/dufte/default.nix             | 2 +-
 pkgs/development/python-modules/dungeon-eos/default.nix       | 2 +-
 pkgs/development/python-modules/echo/default.nix              | 2 +-
 pkgs/development/python-modules/edalize/default.nix           | 2 +-
 pkgs/development/python-modules/editdistance-s/default.nix    | 2 +-
 pkgs/development/python-modules/editdistance/default.nix      | 2 +-
 pkgs/development/python-modules/einops/default.nix            | 2 +-
 pkgs/development/python-modules/elegy/default.nix             | 2 +-
 pkgs/development/python-modules/elmax-api/default.nix         | 2 +-
 pkgs/development/python-modules/embedding-reader/default.nix  | 2 +-
 pkgs/development/python-modules/emcee/default.nix             | 2 +-
 pkgs/development/python-modules/enaml/default.nix             | 2 +-
 pkgs/development/python-modules/enamlx/default.nix            | 2 +-
 pkgs/development/python-modules/energyflip-client/default.nix | 2 +-
 pkgs/development/python-modules/enturclient/default.nix       | 2 +-
 pkgs/development/python-modules/eradicate/default.nix         | 2 +-
 pkgs/development/python-modules/eternalegypt/default.nix      | 2 +-
 pkgs/development/python-modules/executing/default.nix         | 2 +-
 pkgs/development/python-modules/expects/default.nix           | 2 +-
 pkgs/development/python-modules/f90nml/default.nix            | 2 +-
 pkgs/development/python-modules/fabulous/default.nix          | 2 +-
 pkgs/development/python-modules/fairseq/default.nix           | 2 +-
 .../python-modules/farama-notifications/default.nix           | 2 +-
 pkgs/development/python-modules/fastavro/default.nix          | 4 ++--
 pkgs/development/python-modules/fastdtw/default.nix           | 2 +-
 pkgs/development/python-modules/fasteners/default.nix         | 2 +-
 pkgs/development/python-modules/fastnumbers/default.nix       | 2 +-
 pkgs/development/python-modules/fastrlock/default.nix         | 2 +-
 pkgs/development/python-modules/fixerio/default.nix           | 2 +-
 pkgs/development/python-modules/flake8-bugbear/default.nix    | 2 +-
 pkgs/development/python-modules/flake8-docstrings/default.nix | 2 +-
 pkgs/development/python-modules/flask-bcrypt/default.nix      | 2 +-
 .../development/python-modules/flask-expects-json/default.nix | 2 +-
 pkgs/development/python-modules/flask-mongoengine/default.nix | 2 +-
 pkgs/development/python-modules/flask-paranoid/default.nix    | 2 +-
 pkgs/development/python-modules/flatdict/default.nix          | 2 +-
 pkgs/development/python-modules/flatten-dict/default.nix      | 2 +-
 pkgs/development/python-modules/flowlogs-reader/default.nix   | 2 +-
 pkgs/development/python-modules/flyingsquid/default.nix       | 2 +-
 pkgs/development/python-modules/fontpens/default.nix          | 2 +-
 pkgs/development/python-modules/formulae/default.nix          | 2 +-
 pkgs/development/python-modules/fortiosapi/default.nix        | 2 +-
 pkgs/development/python-modules/fqdn/default.nix              | 2 +-
 pkgs/development/python-modules/funcparserlib/default.nix     | 2 +-
 pkgs/development/python-modules/gbinder-python/default.nix    | 2 +-
 pkgs/development/python-modules/gekitchen/default.nix         | 2 +-
 pkgs/development/python-modules/geniushub-client/default.nix  | 2 +-
 pkgs/development/python-modules/geopy/default.nix             | 4 ++--
 pkgs/development/python-modules/ghrepo-stats/default.nix      | 2 +-
 .../development/python-modules/gibberish-detector/default.nix | 2 +-
 pkgs/development/python-modules/git-revise/default.nix        | 2 +-
 pkgs/development/python-modules/github-to-sqlite/default.nix  | 2 +-
 pkgs/development/python-modules/gpaw/default.nix              | 2 +-
 pkgs/development/python-modules/gpiozero/default.nix          | 2 +-
 pkgs/development/python-modules/gps3/default.nix              | 4 ++--
 pkgs/development/python-modules/gpxpy/default.nix             | 2 +-
 pkgs/development/python-modules/gpytorch/default.nix          | 2 +-
 pkgs/development/python-modules/gradient-utils/default.nix    | 2 +-
 pkgs/development/python-modules/grafanalib/default.nix        | 2 +-
 pkgs/development/python-modules/grandalf/default.nix          | 2 +-
 pkgs/development/python-modules/graphene-django/default.nix   | 2 +-
 .../python-modules/graphql-server-core/default.nix            | 2 +-
 pkgs/development/python-modules/grpc-interceptor/default.nix  | 2 +-
 pkgs/development/python-modules/gruut-ipa/default.nix         | 2 +-
 pkgs/development/python-modules/habanero/default.nix          | 2 +-
 pkgs/development/python-modules/hachoir/default.nix           | 2 +-
 pkgs/development/python-modules/hatch-odoo/default.nix        | 2 +-
 pkgs/development/python-modules/helper/default.nix            | 2 +-
 pkgs/development/python-modules/hiyapyco/default.nix          | 2 +-
 pkgs/development/python-modules/hocr-tools/default.nix        | 2 +-
 pkgs/development/python-modules/hologram/default.nix          | 2 +-
 pkgs/development/python-modules/homepluscontrol/default.nix   | 2 +-
 pkgs/development/python-modules/html5-parser/default.nix      | 2 +-
 .../python-modules/http-message-signatures/default.nix        | 2 +-
 pkgs/development/python-modules/http-parser/default.nix       | 2 +-
 pkgs/development/python-modules/httplib2/default.nix          | 4 ++--
 pkgs/development/python-modules/httpx/default.nix             | 2 +-
 pkgs/development/python-modules/huey/default.nix              | 2 +-
 pkgs/development/python-modules/humblewx/default.nix          | 2 +-
 pkgs/development/python-modules/hydrawiser/default.nix        | 2 +-
 pkgs/development/python-modules/hyperion-py/default.nix       | 2 +-
 pkgs/development/python-modules/ibis/default.nix              | 2 +-
 pkgs/development/python-modules/icmplib/default.nix           | 2 +-
 pkgs/development/python-modules/icnsutil/default.nix          | 2 +-
 pkgs/development/python-modules/ignite/default.nix            | 2 +-
 pkgs/development/python-modules/injector/default.nix          | 2 +-
 pkgs/development/python-modules/installer/default.nix         | 2 +-
 pkgs/development/python-modules/into-dbus-python/default.nix  | 2 +-
 pkgs/development/python-modules/invocations/default.nix       | 2 +-
 pkgs/development/python-modules/iodata/default.nix            | 2 +-
 pkgs/development/python-modules/ipyxact/default.nix           | 2 +-
 pkgs/development/python-modules/ircrobots/default.nix         | 2 +-
 pkgs/development/python-modules/ircstates/default.nix         | 2 +-
 pkgs/development/python-modules/irctokens/default.nix         | 2 +-
 pkgs/development/python-modules/ismartgate/default.nix        | 2 +-
 pkgs/development/python-modules/isoduration/default.nix       | 2 +-
 pkgs/development/python-modules/itemdb/default.nix            | 2 +-
 pkgs/development/python-modules/itunespy/default.nix          | 2 +-
 pkgs/development/python-modules/itypes/default.nix            | 2 +-
 227 files changed, 241 insertions(+), 241 deletions(-)

diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix
index 08da1feadb11..02bdedcaf798 100644
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "asottile";
-    repo = pname;
+    repo = "add-trailing-comma";
     rev = "v${version}";
     hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k=";
   };
diff --git a/pkgs/development/python-modules/advocate/default.nix b/pkgs/development/python-modules/advocate/default.nix
index a0954dae4439..bd52c01fe489 100644
--- a/pkgs/development/python-modules/advocate/default.nix
+++ b/pkgs/development/python-modules/advocate/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "JordanMilne";
-    repo = pname;
+    repo = "advocate";
     rev = "v${version}";
     hash = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw=";
   };
diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix
index 5eaa52f72676..4830eb75481c 100644
--- a/pkgs/development/python-modules/aggdraw/default.nix
+++ b/pkgs/development/python-modules/aggdraw/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pytroll";
-    repo = pname;
+    repo = "aggdraw";
     rev = "v${version}";
     hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA=";
   };
diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix
index a98074369074..b2e12d4d10d4 100644
--- a/pkgs/development/python-modules/aioblescan/default.nix
+++ b/pkgs/development/python-modules/aioblescan/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "frawau";
-    repo = pname;
+    repo = "aioblescan";
     tag = version;
     hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc=";
   };
diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix
index 43e0e409a015..2aed190d8490 100644
--- a/pkgs/development/python-modules/aiodocker/default.nix
+++ b/pkgs/development/python-modules/aiodocker/default.nix
@@ -6,7 +6,7 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "aiodocker";
   # unstable includes support for python 3.10+
   version = "unstable-2022-01-20";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "aio-libs";
-    repo = pname;
+    repo = "aiodocker";
     rev = "f1dbdc3d42147f4c2ab5e6802acf6f7d0f885be4";
     sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls=";
   };
diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix
index a9fcde7fb79a..7c9a6e1c4d5e 100644
--- a/pkgs/development/python-modules/aioemonitor/default.nix
+++ b/pkgs/development/python-modules/aioemonitor/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bdraco";
-    repo = pname;
+    repo = "aioemonitor";
     rev = "v${version}";
     sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn";
   };
diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
index f962c82166e9..dfe6743d700f 100644
--- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "etianen";
-    repo = pname;
+    repo = "aiohttp-wsgi";
     rev = "v${version}";
     hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q=";
   };
diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix
index a5f6c852d13f..87f62352565b 100644
--- a/pkgs/development/python-modules/aiohwenergy/default.nix
+++ b/pkgs/development/python-modules/aiohwenergy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "DCSBL";
-    repo = pname;
+    repo = "aiohwenergy";
     rev = version;
     hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho=";
   };
diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix
index ed6251b4ce04..d74e9554bf39 100644
--- a/pkgs/development/python-modules/aiokef/default.nix
+++ b/pkgs/development/python-modules/aiokef/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "basnijholt";
-    repo = pname;
+    repo = "aiokef";
     rev = "v${version}";
     sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
   };
diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix
index f6f5dfdc575b..a76d3a3ec8d8 100644
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mjpieters";
-    repo = pname;
+    repo = "aiolimiter";
     tag = "v${version}";
     hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
   };
diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix
index 25f843ddb5b3..677d9ba7c72e 100644
--- a/pkgs/development/python-modules/aiolookin/default.nix
+++ b/pkgs/development/python-modules/aiolookin/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ANMalko";
-    repo = pname;
+    repo = "aiolookin";
     tag = "v${version}";
     hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI=";
   };
diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix
index 0c0894ae1dfe..0b7e756b2fad 100644
--- a/pkgs/development/python-modules/aionanoleaf/default.nix
+++ b/pkgs/development/python-modules/aionanoleaf/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "milanmeu";
-    repo = pname;
+    repo = "aionanoleaf";
     tag = "v${version}";
     hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0=";
   };
diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix
index a54ce5436b7a..6225d1d9f0f6 100644
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "aio-libs";
-    repo = pname;
+    repo = "aiopg";
     rev = "v${version}";
     hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk=";
   };
diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix
index df687d46b61a..5df4ab4e7cda 100644
--- a/pkgs/development/python-modules/aiopurpleair/default.nix
+++ b/pkgs/development/python-modules/aiopurpleair/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bachya";
-    repo = pname;
+    repo = "aiopurpleair";
     tag = version;
     hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4=";
   };
diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix
index 8bf48eb20ee2..f6ae771dfa8b 100644
--- a/pkgs/development/python-modules/aiopyarr/default.nix
+++ b/pkgs/development/python-modules/aiopyarr/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tkdrob";
-    repo = pname;
+    repo = "aiopyarr";
     tag = version;
     hash = "sha256-CzNB6ymvDTktiOGdcdCvWLVQ3mKmbdMpc/vezSXCpG4=";
   };
diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix
index 8a23532f6345..34330eb02914 100644
--- a/pkgs/development/python-modules/aiopylgtv/default.nix
+++ b/pkgs/development/python-modules/aiopylgtv/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bendavid";
-    repo = pname;
+    repo = "aiopylgtv";
     rev = version;
     hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM=";
   };
diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix
index b2eecc0768c2..00066f12ad4b 100644
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Noltari";
-    repo = pname;
+    repo = "aioqsw";
     tag = version;
     hash = "sha256-h/rTwMF3lc/hWwpzCvK6UMq0rjq3xkw/tEY3BqOPS2s=";
   };
diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix
index 6153b430b065..4a6c1d671eb3 100644
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bachya";
-    repo = pname;
+    repo = "aiorecollect";
     tag = version;
     hash = "sha256-Rj0+r7eERLY5VzmuDQH/TeVLfmvmKwPqcvd1b/To0Ts=";
   };
diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix
index 0d152d1de607..0e9cbce40b04 100644
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bachya";
-    repo = pname;
+    repo = "aioridwell";
     tag = version;
     hash = "sha256-B5k8uXDHq0U6fJVW8oy2sWUj5OIVGUfe9EtCjnIr3OE=";
   };
diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix
index 430c5ba68d63..9c3f26500bf6 100644
--- a/pkgs/development/python-modules/aiosenz/default.nix
+++ b/pkgs/development/python-modules/aiosenz/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "milanmeu";
-    repo = pname;
+    repo = "aiosenz";
     rev = version;
     hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w=";
   };
diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index 128e8c4f2d9b..52c29031753a 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "aio-libs";
-    repo = pname;
+    repo = "aiosignal";
     rev = "v${version}";
     hash = "sha256-CvNarJpSq8EKnt+PuSerMK/ZVbxL9rp7rQ4dkWykG1M=";
   };
diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix
index 59ce8c177a84..ab55efb83960 100644
--- a/pkgs/development/python-modules/aiowatttime/default.nix
+++ b/pkgs/development/python-modules/aiowatttime/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bachya";
-    repo = pname;
+    repo = "aiowatttime";
     tag = version;
     hash = "sha256-c5L+Nx+CoWEc6Bs61GOHPBelExe5I7EOlMQ+QV6nktI=";
   };
diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix
index 47bed7a289f5..bbaf53718ad1 100644
--- a/pkgs/development/python-modules/airtouch4pyapi/default.nix
+++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "LonePurpleWolf";
-    repo = pname;
+    repo = "airtouch4pyapi";
     tag = "v${version}";
     hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA=";
   };
diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix
index 3c1361f8bdfd..bca89d55ec95 100644
--- a/pkgs/development/python-modules/aladdin-connect/default.nix
+++ b/pkgs/development/python-modules/aladdin-connect/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "shoejosh";
-    repo = pname;
+    repo = "aladdin-connect";
     tag = version;
     hash = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw=";
   };
diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index 0ed7368949a5..54695555a239 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "allpairspy";
     tag = "v${version}";
     hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI=";
   };
diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
index 0221295513b3..a04da6074231 100644
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@@ -17,7 +17,7 @@
   websockets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "amqtt";
   version = "unstable-2022-05-29";
   format = "pyproject";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Yakifo";
-    repo = pname;
+    repo = "amqtt";
     rev = "09ac98d39a711dcff0d8f22686916e1c2495144b";
     hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s=";
   };
diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix
index 9986634140ff..ffb1c0ef7859 100644
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # `tests/data` dir missing from PyPI dist
   src = fetchFromGitHub {
     owner = "ANCPLabOldenburg";
-    repo = pname;
+    repo = "ancp-bids";
     tag = version;
     hash = "sha256-vmw8SAikvbaHnPOthBQxTbyvDwnnZwCOV97aUogIgxw=";
   };
diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix
index 088a7b8ea0fa..7349d4f5d705 100644
--- a/pkgs/development/python-modules/androguard/default.nix
+++ b/pkgs/development/python-modules/androguard/default.nix
@@ -39,8 +39,8 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    repo = pname;
-    owner = pname;
+    repo = "androguard";
+    owner = "androguard";
     tag = "v${version}";
     sha256 = "sha256-qz6x7UgYXal1DbQGzi4iKnSGEn873rKibKme/pF7tLk=";
   };
diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
index 17318c7dd5f8..753dc9e04cdb 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tehmaze";
-    repo = pname;
+    repo = "ansi";
     tag = "ansi-${version}";
     hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM=";
   };
diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix
index 4e5a82dc3339..65244a9fe6d0 100644
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ansible";
-    repo = pname;
+    repo = "ansiconv";
     rev = "v${version}";
     sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
   };
diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix
index 4e5ac2e73f48..a058dea6ce1d 100644
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "swilson";
-    repo = pname;
+    repo = "aqualogic";
     rev = version;
     hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c=";
   };
diff --git a/pkgs/development/python-modules/arc4/default.nix b/pkgs/development/python-modules/arc4/default.nix
index 6706519259c7..e7350569462c 100644
--- a/pkgs/development/python-modules/arc4/default.nix
+++ b/pkgs/development/python-modules/arc4/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "manicmaniac";
-    repo = pname;
+    repo = "arc4";
     rev = version;
     hash = "sha256-DlZIygf5v3ZNY2XFmrKOA15ccMo3Rv0kf6hZJ0CskeQ=";
   };
diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index 19e589186fc9..eae13c92e2a4 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pawamoy";
-    repo = pname;
+    repo = "aria2p";
     tag = version;
     hash = "sha256-JEXTCDfFjxI1hooiEQq0KIGGoS2F7fyzOM0GMl+Jr7w=";
   };
diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix
index 819d4559dc94..bb06aa135b90 100644
--- a/pkgs/development/python-modules/arpy/default.nix
+++ b/pkgs/development/python-modules/arpy/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "viraptor";
-    repo = pname;
+    repo = "arpy";
     rev = version;
     hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s=";
   };
diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix
index 0a1032259c84..5eab9ca74f67 100644
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45";
     rev = "v${version}";
     owner = "kimgr";
-    repo = pname;
+    repo = "asn1ate";
   };
 
   propagatedBuildInputs = [ pyparsing ];
diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix
index b71a3b9be090..abd756b2acfb 100644
--- a/pkgs/development/python-modules/assay/default.nix
+++ b/pkgs/development/python-modules/assay/default.nix
@@ -5,14 +5,14 @@
   pythonAtLeast,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "assay";
   version = "0-unstable-2024-05-09";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "brandon-rhodes";
-    repo = pname;
+    repo = "assay";
     rev = "74617d70e77afa09f58b3169cf496679ac5d5621";
     hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4=";
   };
diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index e45e59409c72..a8e46e2ace44 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -11,8 +11,8 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "assertpy";
+    repo = "assertpy";
     rev = version;
     sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
   };
diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix
index dc8dc03599a1..af543d5df11c 100644
--- a/pkgs/development/python-modules/asyncio-throttle/default.nix
+++ b/pkgs/development/python-modules/asyncio-throttle/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hallazzang";
-    repo = pname;
+    repo = "asyncio-throttle";
     rev = "v${version}";
     sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
   };
diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix
index 15a2b0b7cb97..5442c0c34d7d 100644
--- a/pkgs/development/python-modules/asyncmy/default.nix
+++ b/pkgs/development/python-modules/asyncmy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "long2ice";
-    repo = pname;
+    repo = "asyncmy";
     tag = "v${version}";
     hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0=";
   };
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index ab4e3d41a0ed..c9bc2f65a692 100644
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "atlassian-api";
-    repo = pname;
+    repo = "atlassian-python-api";
     tag = version;
     hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII=";
   };
diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix
index dbfa6a226b9a..011c9f58e4b5 100644
--- a/pkgs/development/python-modules/aurorapy/default.nix
+++ b/pkgs/development/python-modules/aurorapy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitLab {
     owner = "energievalsabbia";
-    repo = pname;
+    repo = "aurorapy";
     rev = version;
     hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec=";
   };
diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix
index 202d6e7b7742..a03f7ae97247 100644
--- a/pkgs/development/python-modules/avea/default.nix
+++ b/pkgs/development/python-modules/avea/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "k0rventen";
-    repo = pname;
+    repo = "avea";
     rev = "v${version}";
     sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v";
   };
diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix
index 4a2bdbef6da5..e6044ae99d3f 100644
--- a/pkgs/development/python-modules/babelfont/default.nix
+++ b/pkgs/development/python-modules/babelfont/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # PyPI source tarballs omit tests, fetch from Github instead
   src = fetchFromGitHub {
     owner = "simoncozens";
-    repo = pname;
+    repo = "babelfont";
     tag = "v${version}";
     hash = "sha256-XNoyM3kjKRc0NWA94ufzC2DBzAsufJNJbzFDUbLu8Lc=";
   };
diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix
index ff0411795c99..a068a640914b 100644
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/pkgs/development/python-modules/backoff/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "litl";
-    repo = pname;
+    repo = "backoff";
     tag = "v${version}";
     hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI=";
   };
diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix
index 338775bf6cee..b9e526ba2852 100644
--- a/pkgs/development/python-modules/base58check/default.nix
+++ b/pkgs/development/python-modules/base58check/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "joeblackwaslike";
-    repo = pname;
+    repo = "base58check";
     rev = "v${version}";
     hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs=";
   };
diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix
index 17d2485c6def..0c6143f29e24 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "idank";
-    repo = pname;
+    repo = "bashlex";
     rev = version;
     hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
   };
diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix
index e46d0caf0738..41f3717c6516 100644
--- a/pkgs/development/python-modules/bbox/default.nix
+++ b/pkgs/development/python-modules/bbox/default.nix
@@ -12,7 +12,7 @@
   pyquaternion,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "bbox";
   version = "0.9.4";
   pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "varunagrawal";
-    repo = pname;
+    repo = "bbox";
     # matches 0.9.4 on PyPi + tests
     rev = "d3f07ed0e38b6015cf4181e3b3edae6a263f8565";
     hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs=";
diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix
index 9b1544ae2bd0..bfd6fa30bf87 100644
--- a/pkgs/development/python-modules/beautifultable/default.nix
+++ b/pkgs/development/python-modules/beautifultable/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pri22296";
-    repo = pname;
+    repo = "beautifultable";
     rev = "v${version}";
     hash = "sha256-/SReCEvSwiNjBoz/3tGJ9zUNBAag4mLsHlUXwm47zCw=";
   };
diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix
index 8c8af617f833..245615bd7ccd 100644
--- a/pkgs/development/python-modules/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "lovesegfault";
-    repo = pname;
+    repo = "beautysh";
     rev = "v${version}";
     hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
   };
diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix
index d5035321e359..75a0713efcaf 100644
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "scott-griffiths";
-    repo = pname;
+    repo = "bitstring";
     tag = "bitstring-${version}";
     hash = "sha256-ZABAd42h+BqcpKTFV5PxcBN3F8FKV6Qw3rhP13eX57k=";
   };
diff --git a/pkgs/development/python-modules/bitvavo-aio/default.nix b/pkgs/development/python-modules/bitvavo-aio/default.nix
index 0df3e7add098..f8eb0cd49734 100644
--- a/pkgs/development/python-modules/bitvavo-aio/default.nix
+++ b/pkgs/development/python-modules/bitvavo-aio/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
-    repo = pname;
+    repo = "bitvavo-aio";
     rev = version;
     sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig";
   };
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index ca8663c1d656..cbcb7be585c5 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # tests are not published to pypi anymore
   src = fetchFromGitHub {
     owner = "jonashaag";
-    repo = pname;
+    repo = "bjoern";
     rev = version;
     hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio=";
     fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix
index 56677dd344af..307aaf38d5d0 100644
--- a/pkgs/development/python-modules/black-macchiato/default.nix
+++ b/pkgs/development/python-modules/black-macchiato/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "wbolster";
-    repo = pname;
+    repo = "black-macchiato";
     rev = version;
     sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl";
   };
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 82fb53ce2ebf..682d474e30ff 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hbldh";
-    repo = pname;
+    repo = "bleak";
     tag = "v${version}";
     hash = "sha256-kPeKQcJETZE6+btQsmCgb37yRI2Klg0lZ1ZIrm8ODow=";
   };
diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix
index 244d7676053e..ca229e42139c 100644
--- a/pkgs/development/python-modules/blobfile/default.nix
+++ b/pkgs/development/python-modules/blobfile/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "christopher-hesse";
-    repo = pname;
+    repo = "blobfile";
     tag = "v${version}";
     hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk=";
   };
diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix
index 31e0e4e82b6a..cd6220610bab 100644
--- a/pkgs/development/python-modules/bork/default.nix
+++ b/pkgs/development/python-modules/bork/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "duckinator";
-    repo = pname;
+    repo = "bork";
     tag = "v${version}";
     hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk=";
   };
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index e3832e5ed550..d58dfebd9c4f 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Yelp";
-    repo = pname;
+    repo = "bravado-core";
     rev = "v${version}";
     hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw=";
   };
diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix
index 79d090f6127a..302057470abb 100644
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "fullonic";
-    repo = pname;
+    repo = "brotli-asgi";
     rev = "v${version}";
     hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
   };
diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index a3880604ea60..596a6983ea7e 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "google";
-    repo = pname;
+    repo = "brotli";
     tag = "v${version}";
     hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM=";
     # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index 8de7c2194ab2..4df1f84bce77 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "chrillux";
-    repo = pname;
+    repo = "brottsplatskartan";
     rev = version;
     sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
   };
diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix
index ff64e723cdbc..84fb157a8659 100644
--- a/pkgs/development/python-modules/bunch/default.nix
+++ b/pkgs/development/python-modules/bunch/default.nix
@@ -5,7 +5,7 @@
   pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "bunch";
   version = "unstable-2017-11-21";
   format = "setuptools";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Use a fork as upstream is dead
   src = fetchFromGitHub {
     owner = "olivecoder";
-    repo = pname;
+    repo = "bunch";
     rev = "71ac9d5c712becd4c502ab3099203731a0f1122e";
     hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s=";
   };
diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix
index e437fcefe215..f5d0475a204b 100644
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/pkgs/development/python-modules/bytecode/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vstinner";
-    repo = pname;
+    repo = "bytecode";
     tag = version;
     hash = "sha256-74qEwAYHXV4HakJQ05A9K7LuO0xP28Hub6no09KO4r4=";
   };
diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix
index 8cc88f937900..204f1af73b14 100644
--- a/pkgs/development/python-modules/bytewax/default.nix
+++ b/pkgs/development/python-modules/bytewax/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bytewax";
-    repo = pname;
+    repo = "bytewax";
     tag = "v${version}";
     hash = "sha256-O5q1Jd3AMUaQwfQM249CUnkjqEkXybxtM9SOISoULZk=";
   };
diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix
index ca68a3401d2c..3da6feb67683 100644
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/pkgs/development/python-modules/cachelib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pallets";
-    repo = pname;
+    repo = "cachelib";
     tag = version;
     hash = "sha256-8jg+zfdIATvu/GSFvqHl4cNMu+s2IFWC22vPZ7Q3WYI=";
   };
diff --git a/pkgs/development/python-modules/cachey/default.nix b/pkgs/development/python-modules/cachey/default.nix
index a8cb498b2026..94301f1dfee7 100644
--- a/pkgs/development/python-modules/cachey/default.nix
+++ b/pkgs/development/python-modules/cachey/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.6";
   src = fetchFromGitHub {
     owner = "dask";
-    repo = pname;
+    repo = "cachey";
     rev = version;
     hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s=";
   };
diff --git a/pkgs/development/python-modules/callee/default.nix b/pkgs/development/python-modules/callee/default.nix
index bc3435861f5a..9bec7a99952f 100644
--- a/pkgs/development/python-modules/callee/default.nix
+++ b/pkgs/development/python-modules/callee/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Xion";
-    repo = pname;
+    repo = "callee";
     tag = version;
     hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE=";
   };
diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix
index ddf27ae42a34..e76027a49b43 100644
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CybercentreCanada";
-    repo = pname;
+    repo = "cart";
     tag = "v${version}";
     hash = "sha256-oeWeay1Pr9T4oR3XSrwv9hRr/sLTel1Bt6BG6jHXxIA=";
   };
diff --git a/pkgs/development/python-modules/certvalidator/default.nix b/pkgs/development/python-modules/certvalidator/default.nix
index c59e2b6738e0..bfcf3ee02b1c 100644
--- a/pkgs/development/python-modules/certvalidator/default.nix
+++ b/pkgs/development/python-modules/certvalidator/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "wbond";
-    repo = pname;
+    repo = "certvalidator";
     rev = version;
     hash = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY=";
   };
diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
index 4b4ab02edc77..0feb920c81ac 100644
--- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
+++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "bdraco";
-    repo = pname;
+    repo = "chacha20poly1305-reuseable";
     tag = "v${version}";
     hash = "sha256-i6bhqfYo+gFTf3dqOBSQqGN4WPqbUR05StdwZvrVckI=";
   };
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index 9a72361a7f94..8d340ebad5b6 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "aws";
-    repo = pname;
+    repo = "chalice";
     tag = version;
     hash = "sha256-m3pSD4fahBW6Yt/w07Co4fTZD7k6as5cPwoK5QSry6M=";
   };
diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index acbaaf0e9bf4..b448def48013 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CheetahTemplate3";
-    repo = pname;
+    repo = "cheetah3";
     tag = version;
     hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI=";
   };
diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix
index 38ea1d8739cf..1d8cd789b3e1 100644
--- a/pkgs/development/python-modules/chirpstack-api/default.nix
+++ b/pkgs/development/python-modules/chirpstack-api/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "brocaar";
-    repo = pname;
+    repo = "chirpstack-api";
     rev = "v${version}";
     hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU=";
   };
diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix
index 11018f38e077..036f9657d222 100644
--- a/pkgs/development/python-modules/circuitbreaker/default.nix
+++ b/pkgs/development/python-modules/circuitbreaker/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fabfuel";
-    repo = pname;
+    repo = "circuitbreaker";
     tag = version;
     hash = "sha256-7BpYGhha0PTYzsE9CsN4KxfJW/wm2i6V+uAeamBREBQ=";
   };
diff --git a/pkgs/development/python-modules/class-doc/default.nix b/pkgs/development/python-modules/class-doc/default.nix
index 32d69f092760..70ea060fe501 100644
--- a/pkgs/development/python-modules/class-doc/default.nix
+++ b/pkgs/development/python-modules/class-doc/default.nix
@@ -8,14 +8,14 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "class-doc";
   version = "0.2.6";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "danields761";
-    repo = pname;
+    repo = "class-doc";
     rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag
     hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako=";
   };
diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix
index 53eaf1745231..acf532ee4d6a 100644
--- a/pkgs/development/python-modules/classify-imports/default.nix
+++ b/pkgs/development/python-modules/classify-imports/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "asottile";
-    repo = pname;
+    repo = "classify-imports";
     rev = "v${version}";
     hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU=";
   };
diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix
index c9b21515f69e..fffb99c0f4e0 100644
--- a/pkgs/development/python-modules/cleo/default.nix
+++ b/pkgs/development/python-modules/cleo/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "python-poetry";
-    repo = pname;
+    repo = "cleo";
     tag = version;
     hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk=";
   };
diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix
index be2ad84ece64..4935b3733db5 100644
--- a/pkgs/development/python-modules/click-command-tree/default.nix
+++ b/pkgs/development/python-modules/click-command-tree/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "whwright";
-    repo = pname;
+    repo = "click-command-tree";
     tag = version;
     hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI=";
   };
diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix
index b51163716e5f..fa95216a3267 100644
--- a/pkgs/development/python-modules/click-shell/default.nix
+++ b/pkgs/development/python-modules/click-shell/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # PyPi release is missing tests
   src = fetchFromGitHub {
     owner = "clarkperkins";
-    repo = pname;
+    repo = "click-shell";
     tag = version;
     hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI=";
   };
diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
index 5ea19c7e7b1b..e9020e9d9b1a 100644
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sebageek";
-    repo = pname;
+    repo = "clintermission";
     tag = "v${version}";
     hash = "sha256-e7C9IDr+mhVSfU8lMywjX1BYwFo/qegPNzabak7UPcY=";
   };
diff --git a/pkgs/development/python-modules/clip/default.nix b/pkgs/development/python-modules/clip/default.nix
index e5b193c9caa1..1ea558cc86d6 100644
--- a/pkgs/development/python-modules/clip/default.nix
+++ b/pkgs/development/python-modules/clip/default.nix
@@ -9,14 +9,14 @@
   tqdm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "clip";
   version = "unstable-2022-11-17";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "openai";
-    repo = pname;
+    repo = "clip";
     rev = "d50d76daa670286dd6cacf3bcd80b5e4823fc8e1";
     hash = "sha256-GAitNBb5CzFVv2+Dky0VqSdrFIpKKtoAoyqeLoDaHO4=";
   };
diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 0018a2744d9c..71f270396258 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "clld";
-    repo = pname;
+    repo = "clldutils";
     rev = "v${version}";
     hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo=";
   };
diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix
index edcda2857bc3..cf0410cc592c 100644
--- a/pkgs/development/python-modules/codepy/default.nix
+++ b/pkgs/development/python-modules/codepy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "inducer";
-    repo = pname;
+    repo = "codepy";
     rev = "v${version}";
     hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM=";
   };
diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix
index 05ebb1598804..491defd0139a 100644
--- a/pkgs/development/python-modules/colorful/default.nix
+++ b/pkgs/development/python-modules/colorful/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "timofurrer";
-    repo = pname;
+    repo = "colorful";
     tag = "v${version}";
     hash = "sha256-8rHJIsHiyfjmjlGiEyrzvEwKgi1kP4Njm731mlFDMIU=";
   };
diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix
index 2290165e639b..09a40420e1b6 100644
--- a/pkgs/development/python-modules/colorzero/default.nix
+++ b/pkgs/development/python-modules/colorzero/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "waveform80";
-    repo = pname;
+    repo = "colorzero";
     tag = "release-${version}";
     hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14=";
   };
diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix
index 904f3e1f4b02..b381ffc64ff0 100644
--- a/pkgs/development/python-modules/colout/default.nix
+++ b/pkgs/development/python-modules/colout/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nojhan";
-    repo = pname;
+    repo = "colout";
     tag = "v${version}";
     hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI=";
   };
diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix
index 6275a6963faa..8015aea9ce82 100644
--- a/pkgs/development/python-modules/confection/default.nix
+++ b/pkgs/development/python-modules/confection/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "explosion";
-    repo = pname;
+    repo = "confection";
     tag = "v${version}";
     hash = "sha256-1XIo9Hg4whYS1AkFeX8nVnpv+IvnpmyydHYdVYS0xZc=";
   };
diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index cf5397b27472..832a98eec3f4 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "DiffSK";
-    repo = pname;
+    repo = "configobj";
     tag = "v${version}";
     hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4=";
   };
diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index 59ba5a4b3faf..e713f0166406 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "beetbox";
-    repo = pname;
+    repo = "confuse";
     rev = "v${version}";
     hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
   };
diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix
index ea5f7f5518fd..8cc851b8a347 100644
--- a/pkgs/development/python-modules/connio/default.nix
+++ b/pkgs/development/python-modules/connio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
-    repo = pname;
+    repo = "connio";
     tag = "v${version}";
     hash = "sha256-fPM7Ya69t0jpZhKM2MTk6BwjvoW3a8SV3k000LB9Ypo=";
   };
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index e4c2e9bd8ec0..bddc8486013d 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fitnr";
-    repo = pname;
+    repo = "convertdate";
     rev = "v${version}";
     hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE=";
   };
diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix
index 1aa1b5f97f97..7b454bb8e040 100644
--- a/pkgs/development/python-modules/crc32c/default.nix
+++ b/pkgs/development/python-modules/crc32c/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ICRAR";
-    repo = pname;
+    repo = "crc32c";
     tag = "v${version}";
     hash = "sha256-WBFiAbdzV719vPdZkRGei2+Y33RroMZ7FeQmWo/OfE0=";
   };
diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix
index 0639c1e021bb..0f2cf892241f 100644
--- a/pkgs/development/python-modules/cryptg/default.nix
+++ b/pkgs/development/python-modules/cryptg/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cher-nov";
-    repo = pname;
+    repo = "cryptg";
     rev = "v${version}";
     hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY=";
   };
diff --git a/pkgs/development/python-modules/crysp/default.nix b/pkgs/development/python-modules/crysp/default.nix
index d3a555a6d801..98bf52f12411 100644
--- a/pkgs/development/python-modules/crysp/default.nix
+++ b/pkgs/development/python-modules/crysp/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bdcht";
-    repo = pname;
+    repo = "crysp";
     rev = "v${version}";
     hash = "sha256-51SKS6OOXIFT1L3YICR6a4QGSz/rbB8V+Z0u0jMO474=";
   };
diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix
index 5041a06a8e16..4284b119c59d 100644
--- a/pkgs/development/python-modules/dacite/default.nix
+++ b/pkgs/development/python-modules/dacite/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "konradhalas";
-    repo = pname;
+    repo = "dacite";
     tag = "v${version}";
     hash = "sha256-lvObQ+jyBH2s4GOwyDXEAYmG7ZGQN9WDqL8ftNItPCQ=";
   };
diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index 0172982442af..4f333c494567 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "databricks";
-    repo = pname;
+    repo = "databricks-cli";
     tag = version;
     hash = "sha256-dH95C2AY/B6F9BROr6rh+gVtKqxsg1gyEU5MzCd5aqs=";
   };
diff --git a/pkgs/development/python-modules/datasette-publish-fly/default.nix b/pkgs/development/python-modules/datasette-publish-fly/default.nix
index 8f07081fa624..f31f9b3e9ca7 100644
--- a/pkgs/development/python-modules/datasette-publish-fly/default.nix
+++ b/pkgs/development/python-modules/datasette-publish-fly/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "simonw";
-    repo = pname;
+    repo = "datasette-publish-fly";
     tag = version;
     hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk=";
   };
diff --git a/pkgs/development/python-modules/datasette-template-sql/default.nix b/pkgs/development/python-modules/datasette-template-sql/default.nix
index 5bdb48aa28cb..cdc245458b43 100644
--- a/pkgs/development/python-modules/datasette-template-sql/default.nix
+++ b/pkgs/development/python-modules/datasette-template-sql/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "simonw";
-    repo = pname;
+    repo = "datasette-template-sql";
     rev = version;
     hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak=";
   };
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index e963fb7e8377..10bd7e91037b 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "simonw";
-    repo = pname;
+    repo = "datasette";
     tag = version;
     hash = "sha256-kVtldBuDy19DmyxEQLtAjs1qiNIjaT8+rnHlFfGNHec=";
   };
diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix
index 27b0050763c3..5c5938de82b2 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "h2oai";
-    repo = pname;
+    repo = "datatable";
     rev = "9522f0833d3e965656396de4fffebd882d39c25d";
     hash = "sha256-lEXQwhx2msnJkkRrTkAwYttlYTISyH/Z7dSalqRrOhI=";
   };
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 6164495bd4e7..e914ece39546 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
-    repo = pname;
+    repo = "dbt-common";
     rev = "03e09c01f20573975e8e17776a4b7c9088b3f212"; # They don't tag releases
     hash = "sha256-KqnwlFZZRYuWRflMzjrqCPBnzY9q/pPhceM2DGqz5bw=";
   };
diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
index d645149b3c21..14812cda3591 100644
--- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix
+++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
-    repo = pname;
+    repo = "dbus-python-client-gen";
     tag = "v${version}";
     hash = "sha256-4Y4cL254ZlZKF6d6cStIOya3J4ZfypuumwKOdDNzuNc=";
   };
diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
index aa3892ee9aaa..41a09d8e4a3a 100644
--- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
+++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
-    repo = pname;
+    repo = "dbus-signature-pyparsing";
     rev = "v${version}";
     hash = "sha256-+jY8kg3jBDpZr5doih3DiyUEcSskq7TgubmW3qdBoZM=";
   };
diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix
index 83e06a5fd5e2..f5867b3a60db 100644
--- a/pkgs/development/python-modules/debuglater/default.nix
+++ b/pkgs/development/python-modules/debuglater/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ploomber";
-    repo = pname;
+    repo = "debuglater";
     tag = version;
     hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8=";
   };
diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix
index d682fe826c2e..5eb381bfb1cd 100644
--- a/pkgs/development/python-modules/decli/default.nix
+++ b/pkgs/development/python-modules/decli/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "woile";
-    repo = pname;
+    repo = "decli";
     tag = "v${version}";
     hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE=";
   };
diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix
index 56b9765686e8..1a7b07fc6507 100644
--- a/pkgs/development/python-modules/deepwave/default.nix
+++ b/pkgs/development/python-modules/deepwave/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ar4";
-    repo = pname;
+    repo = "deepwave";
     rev = "v${version}";
     hash = "sha256-DOOy+B12jgwJzQ90qzX50OFxYLPRcVdVYSE5gi3pqDM=";
   };
diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix
index e2882a7fa7f5..0b2b6bde553d 100644
--- a/pkgs/development/python-modules/deploykit/default.nix
+++ b/pkgs/development/python-modules/deploykit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "numtide";
-    repo = pname;
+    repo = "deploykit";
     rev = version;
     hash = "sha256-7PiXq1bQJ1jswLHNqCDSYZabgfp8HRuRt5YPGzd5Ej0=";
   };
diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix
index 6582d0fd283a..1c84612d8f60 100644
--- a/pkgs/development/python-modules/desktop-entry-lib/default.nix
+++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "JakobDev";
-    repo = pname;
+    repo = "desktop-entry-lib";
     rev = version;
     hash = "sha256-+c+FuLv88wc4yVw3iyFFtfbocnWzTCIe2DS0SWoj+VI=";
   };
diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix
index d7ce89ac8412..4957308ec4e2 100644
--- a/pkgs/development/python-modules/detect-secrets/default.nix
+++ b/pkgs/development/python-modules/detect-secrets/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Yelp";
-    repo = pname;
+    repo = "detect-secrets";
     tag = "v${version}";
     hash = "sha256-pNLAZUJhjZ3b01XaltJUJ9O7Blv6/pHQrRvURe7MJ5A=";
     leaveDotGit = true;
diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix
index 1c0b57397d21..d71677bcf74e 100644
--- a/pkgs/development/python-modules/dicom-numpy/default.nix
+++ b/pkgs/development/python-modules/dicom-numpy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "innolitics";
-    repo = pname;
+    repo = "dicom-numpy";
     tag = "v${version}";
     hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE=";
   };
diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix
index bb426fd4d483..7d73fbebd6cf 100644
--- a/pkgs/development/python-modules/dicom2nifti/default.nix
+++ b/pkgs/development/python-modules/dicom2nifti/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # no tests in PyPI dist
   src = fetchFromGitHub {
     owner = "icometrix";
-    repo = pname;
+    repo = "dicom2nifti";
     tag = version;
     hash = "sha256-lPaBKqYO8B138fCgeKH6vpwGQhN3JCOnDj5PgaYfRPA=";
   };
diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix
index 8f232be99b0f..0e886d8325b0 100644
--- a/pkgs/development/python-modules/dicomweb-client/default.nix
+++ b/pkgs/development/python-modules/dicomweb-client/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ImagingDataCommons";
-    repo = pname;
+    repo = "dicomweb-client";
     tag = "v${version}";
     hash = "sha256-D3j5EujrEdGTfR8/V3o2VJ/VkGdZ8IifPYMhP4ppXhw=";
   };
diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix
index 496c3d51af71..bea434d0d500 100644
--- a/pkgs/development/python-modules/dictdiffer/default.nix
+++ b/pkgs/development/python-modules/dictdiffer/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "inveniosoftware";
-    repo = pname;
+    repo = "dictdiffer";
     rev = "v${version}";
     hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU=";
   };
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index ca2b5ae1742b..66e1a226f05d 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "uqfoundation";
-    repo = pname;
+    repo = "dill";
     tag = version;
     hash = "sha256-p+W0ppNMfSgplKsQjaTnTrMvQ5poF/E/xSzsiLf9h58=";
   };
diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix
index c0cbd3bc477b..9e73d0a60013 100644
--- a/pkgs/development/python-modules/dinghy/default.nix
+++ b/pkgs/development/python-modules/dinghy/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nedbat";
-    repo = pname;
+    repo = "dinghy";
     tag = version;
     hash = "sha256-51BXQdDxlI6+3ctDSa/6tyRXBb1E9BVej9qy7WtkOGM=";
   };
diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix
index ea7608ffca47..214551453f08 100644
--- a/pkgs/development/python-modules/django-celery-email/default.nix
+++ b/pkgs/development/python-modules/django-celery-email/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pmclanahan";
-    repo = pname;
+    repo = "django-celery-email";
     rev = version;
     hash = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M=";
   };
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 5f79cec0bcf7..46fcb57a0da0 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -31,8 +31,8 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "django-extensions";
+    repo = "django-extensions";
     tag = version;
     hash = "sha256-WgO/bDe4anQCc1q2Gdq3W70yDqDgmsvn39Qf9ZNVXuE=";
   };
diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
index 0f8ab4fed5ec..8569e756d5ee 100644
--- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "flavors";
-    repo = pname;
+    repo = "django-graphiql-debug-toolbar";
     rev = version;
     sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw";
   };
diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix
index 8a8f7a8effe9..31c909237db2 100644
--- a/pkgs/development/python-modules/django-logentry-admin/default.nix
+++ b/pkgs/development/python-modules/django-logentry-admin/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "yprez";
-    repo = pname;
+    repo = "django-logentry-admin";
     rev = "v${version}";
     sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq";
   };
diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix
index 858dc88b0ff8..05932eacd61d 100644
--- a/pkgs/development/python-modules/django-login-required-middleware/default.nix
+++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "CleitonDeLima";
-    repo = pname;
+    repo = "django-login-required-middleware";
     tag = version;
     hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA=";
   };
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index cf9685e0b2ac..2d9b0cec0608 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jimfunk";
-    repo = pname;
+    repo = "django-postgresql-netfields";
     rev = "v${version}";
     hash = "sha256-76vGvxxfNZQBCCsTkkSgQZ8PpFspWxJQDj/xq9iOSTU=";
   };
diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix
index e15174d56ae4..3e2c03771bf4 100644
--- a/pkgs/development/python-modules/django-prometheus/default.nix
+++ b/pkgs/development/python-modules/django-prometheus/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "korfuri";
-    repo = pname;
+    repo = "django-prometheus";
     rev = "v${version}";
     hash = "sha256-JiLH+4mmNdb9BN81J5YFiMPna/3gaKUK6ARjmCa3fE8=";
   };
diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index 83532ebac162..9d5c228222c1 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rq";
-    repo = pname;
+    repo = "django-rq";
     tag = "v${version}";
     hash = "sha256-f4ilMKMWNr/NVKRhylr0fFiKFEKHXU/zIlPnq7fCYNs=";
   };
diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix
index 978ae2e8e39e..b0efb077d46b 100644
--- a/pkgs/development/python-modules/django-timezone-field/default.nix
+++ b/pkgs/development/python-modules/django-timezone-field/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mfogel";
-    repo = pname;
+    repo = "django-timezone-field";
     rev = version;
     hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI=";
   };
diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix
index c25c580fb741..70abed4ba86c 100644
--- a/pkgs/development/python-modules/django-vite/default.nix
+++ b/pkgs/development/python-modules/django-vite/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "MrBin99";
-    repo = pname;
+    repo = "django-vite";
     tag = version;
     hash = "sha256-S5DpU0Sw0TOY1SNici6djeTrvg4gehH/a2UCzju1e/s=";
   };
diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix
index 188d0d2bc487..7e87e8aa5dc9 100644
--- a/pkgs/development/python-modules/docformatter/default.nix
+++ b/pkgs/development/python-modules/docformatter/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "PyCQA";
-    repo = pname;
+    repo = "docformatter";
     tag = "v${version}";
     hash = "sha256-eLjaHso1p/nD9K0E+HkeBbnCnvjZ1sdpfww9tzBh0TI=";
   };
diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix
index 20d510e2cb4c..ae8696f13418 100644
--- a/pkgs/development/python-modules/docstring-to-markdown/default.nix
+++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "python-lsp";
-    repo = pname;
+    repo = "docstring-to-markdown";
     tag = "v${version}";
     hash = "sha256-ykqY7LFIOTuAddYkKDzIltq8FpLVz4v2ZA3Y0cZH9ms=";
   };
diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix
index 8ebaadbcf2e7..fef956d5b07a 100644
--- a/pkgs/development/python-modules/doit-py/default.nix
+++ b/pkgs/development/python-modules/doit-py/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pydoit";
-    repo = pname;
+    repo = "doit-py";
     rev = version;
     hash = "sha256-DBl6/no04ZGRHHmN9gkEtBmAMgmyZWcfPCcFz0uxAv4=";
   };
diff --git a/pkgs/development/python-modules/dparse2/default.nix b/pkgs/development/python-modules/dparse2/default.nix
index 6d0b23f28c54..c035109a6034 100644
--- a/pkgs/development/python-modules/dparse2/default.nix
+++ b/pkgs/development/python-modules/dparse2/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nexB";
-    repo = pname;
+    repo = "dparse2";
     tag = version;
     hash = "sha256-JUTL+SVf1RRIXQqwFR7MnExsgGseSiO0a5YzzcqdXHw=";
   };
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index 53ef911b8814..92a7d861a404 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nschloe";
-    repo = pname;
+    repo = "dufte";
     rev = "v${version}";
     hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
   };
diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix
index d4282575c88b..260a86af32fe 100644
--- a/pkgs/development/python-modules/dungeon-eos/default.nix
+++ b/pkgs/development/python-modules/dungeon-eos/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
+    repo = "dungeon-eos";
     rev = version;
     hash = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";
   };
diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index d4e7b1c43627..71bdcd1b40a4 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "glue-viz";
-    repo = pname;
+    repo = "echo";
     tag = "v${version}";
     sha256 = "sha256-RlTscoStJQ0vjrrk14xHRsMZOJt8eJSqinc4rY/lW4k=";
   };
diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix
index f1dfca43a7d9..b2ee35c71ebe 100644
--- a/pkgs/development/python-modules/edalize/default.nix
+++ b/pkgs/development/python-modules/edalize/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "olofk";
-    repo = pname;
+    repo = "edalize";
     tag = "v${version}";
     hash = "sha256-5c3Szq0tXQdlyzFTFCla44qB/O6RK8vezVOaFOv8sw4=";
   };
diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix
index e0ae8a91703d..a50fe7321dfc 100644
--- a/pkgs/development/python-modules/editdistance-s/default.nix
+++ b/pkgs/development/python-modules/editdistance-s/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "asottile";
-    repo = pname;
+    repo = "editdistance-s";
     rev = "v${version}";
     sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
   };
diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix
index c56e4f1d8d80..49aeb3227b13 100644
--- a/pkgs/development/python-modules/editdistance/default.nix
+++ b/pkgs/development/python-modules/editdistance/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "roy-ht";
-    repo = pname;
+    repo = "editdistance";
     tag = "v${version}";
     hash = "sha256-Ncdg8S/UHYqJ1uFnHk9qhHMM3Lrop00woSu3PLKvuBI=";
   };
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index a24f75f1a8ee..27ff8b695636 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "arogozhnikov";
-    repo = pname;
+    repo = "einops";
     tag = "v${version}";
     hash = "sha256-6x9AttvSvgYrHaS5ESKOwyEnXxD2BitYTGtqqSKur+0=";
   };
diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
index f66a80ec9908..08e93d47802d 100644
--- a/pkgs/development/python-modules/elegy/default.nix
+++ b/pkgs/development/python-modules/elegy/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "poets-ai";
-    repo = pname;
+    repo = "elegy";
     tag = version;
     hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
   };
diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix
index 49d3b046f13a..1223908209ec 100644
--- a/pkgs/development/python-modules/elmax-api/default.nix
+++ b/pkgs/development/python-modules/elmax-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "albertogeniola";
-    repo = pname;
+    repo = "elmax-api";
     tag = "v${version}";
     hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ=";
   };
diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix
index b585c85fde17..72a8373ae9e3 100644
--- a/pkgs/development/python-modules/embedding-reader/default.nix
+++ b/pkgs/development/python-modules/embedding-reader/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rom1504";
-    repo = pname;
+    repo = "embedding-reader";
     tag = version;
     hash = "sha256-paN6rAyH3L7qCfWPr5kXo9Xl57gRMhdcDnoyLJ7II2w=";
   };
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index a5cd8a86f793..f276a239f6b7 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dfm";
-    repo = pname;
+    repo = "emcee";
     tag = "v${version}";
     hash = "sha256-JVZK3kvDwWENho0OxZ9OxATcm3XpGmX+e7alPclRsHY=";
   };
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index 9763b60108cc..29514f25f826 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nucleic";
-    repo = pname;
+    repo = "enaml";
     tag = version;
     hash = "sha256-XwBvPABg4DomI5JNuqaRTINsPgjn8h67rO/ZkSRQ39o=";
   };
diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix
index cc1ee749e025..ad0e92622975 100644
--- a/pkgs/development/python-modules/enamlx/default.nix
+++ b/pkgs/development/python-modules/enamlx/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "frmdstryr";
-    repo = pname;
+    repo = "enamlx";
     tag = "v${version}";
     hash = "sha256-C3/G0bnu1EQh0elqdrpCwkFPZU4qmkUX7WRSRK9nkM4=";
   };
diff --git a/pkgs/development/python-modules/energyflip-client/default.nix b/pkgs/development/python-modules/energyflip-client/default.nix
index 6dc18ec4c286..032d4886884a 100644
--- a/pkgs/development/python-modules/energyflip-client/default.nix
+++ b/pkgs/development/python-modules/energyflip-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dennisschroer";
-    repo = pname;
+    repo = "energyflip-client";
     tag = "v${version}";
     hash = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU=";
   };
diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix
index 372bdf17e075..213e5941b74b 100644
--- a/pkgs/development/python-modules/enturclient/default.nix
+++ b/pkgs/development/python-modules/enturclient/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hfurubotten";
-    repo = pname;
+    repo = "enturclient";
     rev = "v${version}";
     hash = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo=";
   };
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index b3189941d6ba..355a4e27aee4 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "wemake-services";
-    repo = pname;
+    repo = "eradicate";
     tag = version;
     hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk=";
   };
diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix
index 5945cdd4cdf6..e1e103482e62 100644
--- a/pkgs/development/python-modules/eternalegypt/default.nix
+++ b/pkgs/development/python-modules/eternalegypt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "amelchio";
-    repo = pname;
+    repo = "eternalegypt";
     tag = "v${version}";
     hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0=";
   };
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index 58c766811fe1..b43c3b0c25af 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alexmojaki";
-    repo = pname;
+    repo = "executing";
     rev = "v${version}";
     hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g=";
   };
diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix
index a36769259e36..b2115b67f000 100644
--- a/pkgs/development/python-modules/expects/default.nix
+++ b/pkgs/development/python-modules/expects/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jaimegildesagredo";
-    repo = pname;
+    repo = "expects";
     rev = "v${version}";
     sha256 = "0mk1mhh8n9ly820krkhazn1w96f10vmgh21y2wr44sn8vwr4ngyy";
   };
diff --git a/pkgs/development/python-modules/f90nml/default.nix b/pkgs/development/python-modules/f90nml/default.nix
index 0a0f735e901a..ce6c584ba9f7 100644
--- a/pkgs/development/python-modules/f90nml/default.nix
+++ b/pkgs/development/python-modules/f90nml/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "marshallward";
-    repo = pname;
+    repo = "f90nml";
     rev = "v" + version;
     hash = "sha256-nSpVBAS2VvXIQwYK/qVVzEc13bicAQ+ScXpO4Rn2O+8=";
   };
diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix
index d94227989c49..2bb4897ba45b 100644
--- a/pkgs/development/python-modules/fabulous/default.nix
+++ b/pkgs/development/python-modules/fabulous/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jart";
-    repo = pname;
+    repo = "fabulous";
     rev = version;
     hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4=";
   };
diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix
index aa2932bbf91f..c5e6bcd22f20 100644
--- a/pkgs/development/python-modules/fairseq/default.nix
+++ b/pkgs/development/python-modules/fairseq/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pytorch";
-    repo = pname;
+    repo = "fairseq";
     rev = "v${version}";
     hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc=";
   };
diff --git a/pkgs/development/python-modules/farama-notifications/default.nix b/pkgs/development/python-modules/farama-notifications/default.nix
index c04c3a50a584..c2b4e7b4e1ac 100644
--- a/pkgs/development/python-modules/farama-notifications/default.nix
+++ b/pkgs/development/python-modules/farama-notifications/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
-    repo = pname;
+    repo = "farama-notifications";
     rev = version;
     hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw=";
   };
diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index 0493f6890fa2..1a6ae674d8ad 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "fastavro";
+    repo = "fastavro";
     tag = version;
     hash = "sha256-/YZFrEs7abm+oPn9yyLMV1X/G5VZ/s+ThpvzoQtYQu0=";
   };
diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix
index 5d55886302b0..2164f63c51a1 100644
--- a/pkgs/development/python-modules/fastdtw/default.nix
+++ b/pkgs/development/python-modules/fastdtw/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "slaypni";
-    repo = pname;
+    repo = "fastdtw";
     rev = "v${version}";
     sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw";
   };
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index 92baedf38efe..3a3cc351da94 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "harlowja";
-    repo = pname;
+    repo = "fasteners";
     tag = version;
     hash = "sha256-XFa1ItFqkSYE940p/imWFp5e9gS6n+D1uM6Cj+Vzmmg=";
   };
diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix
index 8e5d27e4dbe9..142d3a76355c 100644
--- a/pkgs/development/python-modules/fastnumbers/default.nix
+++ b/pkgs/development/python-modules/fastnumbers/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "SethMMorton";
-    repo = pname;
+    repo = "fastnumbers";
     tag = version;
     hash = "sha256-TC9+xOvskABpChlrSJcHy6O7D7EnIKL6Ekt/vaLBX2E=";
   };
diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix
index 27e505a24641..b9631adb65ae 100644
--- a/pkgs/development/python-modules/fastrlock/default.nix
+++ b/pkgs/development/python-modules/fastrlock/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "scoder";
-    repo = pname;
+    repo = "fastrlock";
     tag = "v${version}";
     hash = "sha256-NB/AR6g1ZP5Atc0zwZNuXLsxg8BM67rWnx3Q6Pb0k5k=";
   };
diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix
index 550181765263..8d8da7ae122a 100644
--- a/pkgs/development/python-modules/fixerio/default.nix
+++ b/pkgs/development/python-modules/fixerio/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "amatellanes";
-    repo = pname;
+    repo = "fixerio";
     rev = "v${version}";
     sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb";
   };
diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix
index 4a549d78eda0..6f09f07af8f2 100644
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "PyCQA";
-    repo = pname;
+    repo = "flake8-bugbear";
     tag = version;
     hash = "sha256-ZMIpQUF+aXiq2NG0v19UwhWszrW/l50aJmG4YDV0+Wg=";
   };
diff --git a/pkgs/development/python-modules/flake8-docstrings/default.nix b/pkgs/development/python-modules/flake8-docstrings/default.nix
index 92176f0b000a..bc2553e9555b 100644
--- a/pkgs/development/python-modules/flake8-docstrings/default.nix
+++ b/pkgs/development/python-modules/flake8-docstrings/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "PyCQA";
-    repo = pname;
+    repo = "flake8-docstrings";
     tag = version;
     hash = "sha256-EafLWySeHB81HRcXiDs56lbUZzGvnT87WVqln0PoLCk=";
   };
diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix
index da98864cf818..a1f4cacc0cf6 100644
--- a/pkgs/development/python-modules/flask-bcrypt/default.nix
+++ b/pkgs/development/python-modules/flask-bcrypt/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "maxcountryman";
-    repo = pname;
+    repo = "flask-bcrypt";
     rev = version;
     hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4=";
   };
diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index a0598642d497..bb51592428d9 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Fischerfredl";
-    repo = pname;
+    repo = "flask-expects-json";
     rev = version;
     hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ=";
   };
diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix
index 8fa9a2333561..ef9574a22581 100644
--- a/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/pkgs/development/python-modules/flask-mongoengine/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "MongoEngine";
-    repo = pname;
+    repo = "flask-mongoengine";
     rev = "d4526139cb1e2e94111ab7de96bb629d574c1690";
     hash = "sha256-oMQU9Z8boc0q+0KzIQAZ8qSyxiITDY0M9FCg75S9MEY=";
   };
diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix
index 0e4d49127ae9..fa63c693ba8c 100644
--- a/pkgs/development/python-modules/flask-paranoid/default.nix
+++ b/pkgs/development/python-modules/flask-paranoid/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
-    repo = pname;
+    repo = "flask-paranoid";
     rev = "v${version}";
     hash = "sha256-tikD8efc3Q3xIQnaC3SSBaCRQxMI1HzXxeupvYeNnE4=";
   };
diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix
index d0aacabfbbca..12efe3ac686d 100644
--- a/pkgs/development/python-modules/flatdict/default.nix
+++ b/pkgs/development/python-modules/flatdict/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gmr";
-    repo = pname;
+    repo = "flatdict";
     rev = version;
     hash = "sha256-CWsTiCNdIKSQtjpQC07lhZoU1hXT/MGpXdj649x2GlU=";
   };
diff --git a/pkgs/development/python-modules/flatten-dict/default.nix b/pkgs/development/python-modules/flatten-dict/default.nix
index 9f50f2c7dab9..7b03cc00fc6a 100644
--- a/pkgs/development/python-modules/flatten-dict/default.nix
+++ b/pkgs/development/python-modules/flatten-dict/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ianlini";
-    repo = pname;
+    repo = "flatten-dict";
     rev = version;
     hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ=";
   };
diff --git a/pkgs/development/python-modules/flowlogs-reader/default.nix b/pkgs/development/python-modules/flowlogs-reader/default.nix
index fb46314afab7..b74212f95f63 100644
--- a/pkgs/development/python-modules/flowlogs-reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs-reader/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "obsrvbl";
-    repo = pname;
+    repo = "flowlogs-reader";
     # https://github.com/obsrvbl/flowlogs-reader/issues/57
     tag = "v${version}";
     hash = "sha256-9UwCRLRKuIFRTh3ntAzlXCyN175J1wobT3GSLAhl+08=";
diff --git a/pkgs/development/python-modules/flyingsquid/default.nix b/pkgs/development/python-modules/flyingsquid/default.nix
index 2fe656646db3..fda3ae6613f0 100644
--- a/pkgs/development/python-modules/flyingsquid/default.nix
+++ b/pkgs/development/python-modules/flyingsquid/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "HazyResearch";
-    repo = pname;
+    repo = "flyingsquid";
     rev = "28a713a9ac501b7597c2489468ae189943d00685";
     hash = "sha256-DPHTSxDD4EW3nrNk2fk0pKJI/8+pQ7Awywd8nxhBruo=";
   };
diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix
index 4267c7235127..8ea3cfdb7aa2 100644
--- a/pkgs/development/python-modules/fontpens/default.nix
+++ b/pkgs/development/python-modules/fontpens/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "robotools";
-    repo = pname;
+    repo = "fontpens";
     tag = "v${version}";
     sha256 = "13msj0s7mg45klzbnd2w4f4ljb16bp9m0s872s6hczn0j7jmyz11";
   };
diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix
index 278a0368e7c8..c08e987a7b65 100644
--- a/pkgs/development/python-modules/formulae/default.nix
+++ b/pkgs/development/python-modules/formulae/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bambinos";
-    repo = pname;
+    repo = "formulae";
     tag = version;
     hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo=";
   };
diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix
index fce21f4c21f9..e34cdd3137ee 100644
--- a/pkgs/development/python-modules/fortiosapi/default.nix
+++ b/pkgs/development/python-modules/fortiosapi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "fortinet-solutions-cse";
-    repo = pname;
+    repo = "fortiosapi";
     tag = "v${version}";
     hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg=";
   };
diff --git a/pkgs/development/python-modules/fqdn/default.nix b/pkgs/development/python-modules/fqdn/default.nix
index dd8f5b8d8ca8..4f896c084739 100644
--- a/pkgs/development/python-modules/fqdn/default.nix
+++ b/pkgs/development/python-modules/fqdn/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ypcrts";
-    repo = pname;
+    repo = "fqdn";
     rev = "v${version}";
     hash = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE=";
   };
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
index 4c67565fd5f3..4273647c5aba 100644
--- a/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vlasovskikh";
-    repo = pname;
+    repo = "funcparserlib";
     rev = version;
     hash = "sha256-LE9ItCaEzEGeahpM3M3sSnDBXEr6uX5ogEkO5x2Jgzc=";
   };
diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index 24bf6109e8ac..e2226c211af3 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "erfanoabdi";
-    repo = pname;
+    repo = "gbinder-python";
     rev = version;
     sha256 = "1X9gAux9w/mCEVmE3Yqvvq3kU7hu4iAFaZWNZZZxt3E=";
   };
diff --git a/pkgs/development/python-modules/gekitchen/default.nix b/pkgs/development/python-modules/gekitchen/default.nix
index 615be02d1785..e5fa2ed0db41 100644
--- a/pkgs/development/python-modules/gekitchen/default.nix
+++ b/pkgs/development/python-modules/gekitchen/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ajmarks";
-    repo = pname;
+    repo = "gekitchen";
     rev = "v${version}";
     hash = "sha256-eKGundh7j9LqFd71bx86rNBVu2iAcgLN25JfFa39+VA=";
   };
diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix
index 798a3c9e9abf..2ef2373e755a 100644
--- a/pkgs/development/python-modules/geniushub-client/default.nix
+++ b/pkgs/development/python-modules/geniushub-client/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "manzanotti";
-    repo = pname;
+    repo = "geniushub-client";
     tag = "v${version}";
     hash = "sha256-Gq2scYos7E8me1a4x7NanHRq2eYWuU2uSUwM+O1TPb8=";
   };
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 8445794b392f..775044f95eef 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "geopy";
+    repo = "geopy";
     tag = version;
     hash = "sha256-mlOXDEtYry1IUAZWrP2FuY/CGliUnCPYLULnLNN0n4Y=";
   };
diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix
index 33cbf91ca37f..f9fb5f2e166d 100644
--- a/pkgs/development/python-modules/ghrepo-stats/default.nix
+++ b/pkgs/development/python-modules/ghrepo-stats/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mrbean-bremen";
-    repo = pname;
+    repo = "ghrepo-stats";
     tag = "v${version}";
     hash = "sha256-zdBIX/uetkOAalg4uJPWXRL9WUgNN+hmqUwQDTdzrzA=";
   };
diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix
index d03703b37e96..9e361e1cc81c 100644
--- a/pkgs/development/python-modules/gibberish-detector/default.nix
+++ b/pkgs/development/python-modules/gibberish-detector/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "domanchi";
-    repo = pname;
+    repo = "gibberish-detector";
     rev = "v${version}";
     sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b";
   };
diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix
index 3f3526b70481..47422563b928 100644
--- a/pkgs/development/python-modules/git-revise/default.nix
+++ b/pkgs/development/python-modules/git-revise/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # Missing tests on PyPI
   src = fetchFromGitHub {
     owner = "mystor";
-    repo = pname;
+    repo = "git-revise";
     rev = "189c9fe150e5587def75c51709246c47c93e3b4d";
     hash = "sha256-bqhRV0WtWRUKkBG2tEvctxdoYRkcrpL4JZSHYzox8so=";
   };
diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix
index 20ca2879ae3f..c1929acefd81 100644
--- a/pkgs/development/python-modules/github-to-sqlite/default.nix
+++ b/pkgs/development/python-modules/github-to-sqlite/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dogsheep";
-    repo = pname;
+    repo = "github-to-sqlite";
     rev = version;
     hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q=";
   };
diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix
index 6d7791434b8e..d421dee6f0e9 100644
--- a/pkgs/development/python-modules/gpaw/default.nix
+++ b/pkgs/development/python-modules/gpaw/default.nix
@@ -81,7 +81,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitLab {
     owner = "gpaw";
-    repo = pname;
+    repo = "gpaw";
     rev = version;
     hash = "sha256-tdS383qT6hBr5hOqjoFS36nRSS2vdVkUR7sExwjWhng=";
   };
diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix
index b92c286aa261..30fb18a81f1d 100644
--- a/pkgs/development/python-modules/gpiozero/default.nix
+++ b/pkgs/development/python-modules/gpiozero/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gpiozero";
-    repo = pname;
+    repo = "gpiozero";
     tag = "v${version}";
     hash = "sha256-ifdCFcMH6SrhKQK/TJJ5lJafSfAUzd6ZT5ANUzJGwxI=";
   };
diff --git a/pkgs/development/python-modules/gps3/default.nix b/pkgs/development/python-modules/gps3/default.nix
index 4f5cfb5d5b86..8a2a89998a96 100644
--- a/pkgs/development/python-modules/gps3/default.nix
+++ b/pkgs/development/python-modules/gps3/default.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "gps3";
   version = "unstable-2017-11-01";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "wadda";
-    repo = pname;
+    repo = "gps3";
     rev = "91adcd7073b891b135b2a46d039ce2125cf09a09";
     hash = "sha256-sVK61l8YunKAGFTSAq/m5aUGFfnizwhqTYbdznBIKfk=";
   };
diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix
index 640f2b4d6fe1..74cb4e096d91 100644
--- a/pkgs/development/python-modules/gpxpy/default.nix
+++ b/pkgs/development/python-modules/gpxpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tkrajina";
-    repo = pname;
+    repo = "gpxpy";
     rev = "v${version}";
     hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI=";
   };
diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix
index 275dda93c06a..08db11be0e4f 100644
--- a/pkgs/development/python-modules/gpytorch/default.nix
+++ b/pkgs/development/python-modules/gpytorch/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cornellius-gp";
-    repo = pname;
+    repo = "gpytorch";
     tag = "v${version}";
     hash = "sha256-whZjqAs3nyjKMzAGi+OnyBtboq0UuV8m11A4IzkWtec=";
   };
diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix
index 5fb7241d6431..7f35f03ac290 100644
--- a/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/pkgs/development/python-modules/gradient-utils/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Paperspace";
-    repo = pname;
+    repo = "gradient-utils";
     tag = "v${version}";
     hash = "sha256-swnl0phdOsBSP8AX/OySI/aYI9z60Ss3SsJox/mb9KY=";
   };
diff --git a/pkgs/development/python-modules/grafanalib/default.nix b/pkgs/development/python-modules/grafanalib/default.nix
index ba4a78746689..f25dac27ce0a 100644
--- a/pkgs/development/python-modules/grafanalib/default.nix
+++ b/pkgs/development/python-modules/grafanalib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "weaveworks";
-    repo = pname;
+    repo = "grafanalib";
     tag = "v${version}";
     hash = "sha256-vXnyAfC9avKz8U4+MJVnu2zoPD0nR2qarWYidhEPW5s=";
   };
diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix
index c447d061e4a2..03f9ca4a0dbf 100644
--- a/pkgs/development/python-modules/grandalf/default.nix
+++ b/pkgs/development/python-modules/grandalf/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bdcht";
-    repo = pname;
+    repo = "grandalf";
     rev = "v${version}";
     hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4=";
   };
diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix
index 7cc96eab7712..bc5c4bc06614 100644
--- a/pkgs/development/python-modules/graphene-django/default.nix
+++ b/pkgs/development/python-modules/graphene-django/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "graphql-python";
-    repo = pname;
+    repo = "graphene-django";
     tag = "v${version}";
     hash = "sha256-uMkzgXn3YRgEU46Sv5lg60cvetHir9bv0mzJGDv79DI=";
   };
diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix
index 7d19247c2a34..c774c8c39d88 100644
--- a/pkgs/development/python-modules/graphql-server-core/default.nix
+++ b/pkgs/development/python-modules/graphql-server-core/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "graphql-python";
-    repo = pname;
+    repo = "graphql-server-core";
     rev = "v${version}";
     sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr";
   };
diff --git a/pkgs/development/python-modules/grpc-interceptor/default.nix b/pkgs/development/python-modules/grpc-interceptor/default.nix
index 59863d735d78..7120f41222a6 100644
--- a/pkgs/development/python-modules/grpc-interceptor/default.nix
+++ b/pkgs/development/python-modules/grpc-interceptor/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "d5h-foss";
-    repo = pname;
+    repo = "grpc-interceptor";
     tag = "v${version}";
     hash = "sha256-GJkVCslPXShJNDrqhFtCsAK5+VaG8qFJo0RQTsiMIFY=";
   };
diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix
index 23843c4c7d51..56e29e3272e7 100644
--- a/pkgs/development/python-modules/gruut-ipa/default.nix
+++ b/pkgs/development/python-modules/gruut-ipa/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rhasspy";
-    repo = pname;
+    repo = "gruut-ipa";
     rev = "v${version}";
     hash = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0=";
   };
diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix
index 48e0147f55aa..8c187be4cbba 100644
--- a/pkgs/development/python-modules/habanero/default.nix
+++ b/pkgs/development/python-modules/habanero/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sckott";
-    repo = pname;
+    repo = "habanero";
     tag = "v${version}";
     hash = "sha256-tEsuCOuRXJleiv02VGLVSg0ykh3Yu77uZzE6vhf5PaQ=";
   };
diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix
index ff83aaa546e6..7d371f166563 100644
--- a/pkgs/development/python-modules/hachoir/default.nix
+++ b/pkgs/development/python-modules/hachoir/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vstinner";
-    repo = pname;
+    repo = "hachoir";
     tag = version;
     hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8=";
   };
diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix
index 6e4d0c500b45..86822cc28388 100644
--- a/pkgs/development/python-modules/hatch-odoo/default.nix
+++ b/pkgs/development/python-modules/hatch-odoo/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "acsone";
-    repo = pname;
+    repo = "hatch-odoo";
     tag = version;
     sha256 = "sha256-I3jaiG0Xu8B34q30p7zTs+FeBXUQiPKTAJLSVxE9gYE=";
   };
diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
index 930d743b7bf0..533f3c74c9cd 100644
--- a/pkgs/development/python-modules/helper/default.nix
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gmr";
-    repo = pname;
+    repo = "helper";
     rev = version;
     sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp";
   };
diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix
index 20a2ea207a36..98de45b7604c 100644
--- a/pkgs/development/python-modules/hiyapyco/default.nix
+++ b/pkgs/development/python-modules/hiyapyco/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "zerwes";
-    repo = pname;
+    repo = "hiyapyco";
     tag = "release-${version}";
     hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M=";
   };
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix
index 40d2653d6c0d..023c697abaf8 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/pkgs/development/python-modules/hocr-tools/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tmbdev";
-    repo = pname;
+    repo = "hocr-tools";
     rev = "v${version}";
     sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p";
   };
diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix
index c78b85deeb4e..b908e4126552 100644
--- a/pkgs/development/python-modules/hologram/default.nix
+++ b/pkgs/development/python-modules/hologram/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
-    repo = pname;
+    repo = "hologram";
     tag = "v${version}";
     hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc=";
   };
diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix
index 7af19f73f6fe..056e26bc8f22 100644
--- a/pkgs/development/python-modules/homepluscontrol/default.nix
+++ b/pkgs/development/python-modules/homepluscontrol/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "chemaaa";
-    repo = pname;
+    repo = "homepluscontrol";
     rev = version;
     hash = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA=";
   };
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index 81fb7a5199a0..6ac5440bf1c2 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
-    repo = pname;
+    repo = "html5-parser";
     tag = "v${version}";
     hash = "sha256-0Qn+To/d3+HMx+KhhgJBEHVYPOfIeBnngBraY7r4uSs=";
   };
diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix
index 47041ff971fa..83869dbe6380 100644
--- a/pkgs/development/python-modules/http-message-signatures/default.nix
+++ b/pkgs/development/python-modules/http-message-signatures/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyauth";
-    repo = pname;
+    repo = "http-message-signatures";
     rev = "v${version}";
     hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ=";
   };
diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix
index ba4151fb9f52..b959d65ad898 100644
--- a/pkgs/development/python-modules/http-parser/default.nix
+++ b/pkgs/development/python-modules/http-parser/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "benoitc";
-    repo = pname;
+    repo = "http-parser";
     tag = version;
     hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU=";
   };
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index a6c3e42a5317..f8e04b37146d 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "httplib2";
+    repo = "httplib2";
     rev = "v${version}";
     hash = "sha256-76gdiRbF535CEaNXwNqsVeVc0dKglovMPQpGsOkbd/4=";
   };
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index e63970de3118..17b2012c8b37 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "encode";
-    repo = pname;
+    repo = "httpx";
     tag = version;
     hash = "sha256-tB8uZm0kPRnmeOvsDdrkrHcMVIYfGanB4l/xHsTKpgE=";
   };
diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix
index 4a2534cebe84..c91c7ffd8c0b 100644
--- a/pkgs/development/python-modules/huey/default.nix
+++ b/pkgs/development/python-modules/huey/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "coleifer";
-    repo = pname;
+    repo = "huey";
     tag = version;
     hash = "sha256-Avy5aMYoeIhO7Q83s2W4o6RBMaVFdRBqa7HGNIGNOqE=";
   };
diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix
index 2a60e7e97212..e027d5569591 100644
--- a/pkgs/development/python-modules/humblewx/default.nix
+++ b/pkgs/development/python-modules/humblewx/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "thetimelineproj";
-    repo = pname;
+    repo = "humblewx";
     rev = version;
     sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
   };
diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix
index 84ffe3bcc7e3..e7c0a71a4834 100644
--- a/pkgs/development/python-modules/hydrawiser/default.nix
+++ b/pkgs/development/python-modules/hydrawiser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ptcryan";
-    repo = pname;
+    repo = "hydrawiser";
     rev = "v${version}";
     sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj";
   };
diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index 6c0285e8cadd..f19fe0ca85d5 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dermotduffy";
-    repo = pname;
+    repo = "hyperion-py";
     rev = "v${version}";
     hash = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk=";
   };
diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix
index 2300af234784..6e3cd882dc21 100644
--- a/pkgs/development/python-modules/ibis/default.nix
+++ b/pkgs/development/python-modules/ibis/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dmulholl";
-    repo = pname;
+    repo = "ibis";
     rev = version;
     hash = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM=";
   };
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 1ea2b702001b..e82d4e5b87f1 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "ValentinBELYN";
-    repo = pname;
+    repo = "icmplib";
     rev = "v${version}";
     hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI=";
   };
diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix
index 4385c636d17e..0eee0595f0f2 100644
--- a/pkgs/development/python-modules/icnsutil/default.nix
+++ b/pkgs/development/python-modules/icnsutil/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "relikd";
-    repo = pname;
+    repo = "icnsutil";
     tag = "v${version}";
     hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s=";
   };
diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
index 2307843d00d2..85ba22b81f08 100644
--- a/pkgs/development/python-modules/ignite/default.nix
+++ b/pkgs/development/python-modules/ignite/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pytorch";
-    repo = pname;
+    repo = "ignite";
     tag = "v${version}";
     hash = "sha256-aWm+rj/9A7oNBW5jkMg/BRuEw2gQUJ88At1wB75FgNQ=";
   };
diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix
index 6bc01c5188ff..499c40918bad 100644
--- a/pkgs/development/python-modules/injector/default.nix
+++ b/pkgs/development/python-modules/injector/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "python-injector";
-    repo = pname;
+    repo = "injector";
     tag = version;
     hash = "sha256-5O4vJSXfYNTrUzmv5XuT9pSUndNSvTZTxfVwiAd+0ck=";
   };
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index 1cfec3fc9328..7170c110673e 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pypa";
-    repo = pname;
+    repo = "installer";
     rev = version;
     hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
   };
diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix
index 004138c13bdb..62b3448473a2 100644
--- a/pkgs/development/python-modules/into-dbus-python/default.nix
+++ b/pkgs/development/python-modules/into-dbus-python/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
-    repo = pname;
+    repo = "into-dbus-python";
     rev = "v${version}";
     hash = "sha256-Ld/DyhVaDiWUXgqmvSmEHqFW2dcoRNM0O4X5DXE3UtM=";
   };
diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix
index 85b09a100aec..abf5299df53c 100644
--- a/pkgs/development/python-modules/invocations/default.nix
+++ b/pkgs/development/python-modules/invocations/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyinvoke";
-    repo = pname;
+    repo = "invocations";
     tag = version;
     hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0=";
   };
diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix
index 84b6dfd0a56b..2d5619c6434c 100644
--- a/pkgs/development/python-modules/iodata/default.nix
+++ b/pkgs/development/python-modules/iodata/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "theochem";
-    repo = pname;
+    repo = "iodata";
     tag = "v${version}";
     hash = "sha256-ld6V+/8lg4Du6+mHU5XuXXyMpWwyepXurerScg/bf2Q=";
   };
diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix
index 803ed5378cb4..2f4e700cf90f 100644
--- a/pkgs/development/python-modules/ipyxact/default.nix
+++ b/pkgs/development/python-modules/ipyxact/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "olofk";
-    repo = pname;
+    repo = "ipyxact";
     rev = "v${version}";
     hash = "sha256-myD+NnqcxxaSAV7qZa8xqeciaiFqFePqIzd7sb/2GXA=";
   };
diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix
index 7fcb1280987f..d8d35a093d61 100644
--- a/pkgs/development/python-modules/ircrobots/default.nix
+++ b/pkgs/development/python-modules/ircrobots/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jesopo";
-    repo = pname;
+    repo = "ircrobots";
     rev = "v${version}";
     hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0=";
   };
diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix
index 3efe469fe093..61065d492f9a 100644
--- a/pkgs/development/python-modules/ircstates/default.nix
+++ b/pkgs/development/python-modules/ircstates/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jesopo";
-    repo = pname;
+    repo = "ircstates";
     rev = "v${version}";
     hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q=";
   };
diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix
index 1e2b962d0f6a..5c5f74d01f9c 100644
--- a/pkgs/development/python-modules/irctokens/default.nix
+++ b/pkgs/development/python-modules/irctokens/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jesopo";
-    repo = pname;
+    repo = "irctokens";
     rev = "v${version}";
     hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw=";
   };
diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix
index 4b879add51e1..87e1cf31bf40 100644
--- a/pkgs/development/python-modules/ismartgate/default.nix
+++ b/pkgs/development/python-modules/ismartgate/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bdraco";
-    repo = pname;
+    repo = "ismartgate";
     tag = "v${version}";
     hash = "sha256-8c05zzDav87gTL2CI7Aoi6ALwLw76H9xj+90xH31hdE=";
   };
diff --git a/pkgs/development/python-modules/isoduration/default.nix b/pkgs/development/python-modules/isoduration/default.nix
index 613f21105d9b..fbe3c34f8f45 100644
--- a/pkgs/development/python-modules/isoduration/default.nix
+++ b/pkgs/development/python-modules/isoduration/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bolsote";
-    repo = pname;
+    repo = "isoduration";
     rev = version;
     hash = "sha256-6LqsH+3V/K0s2YD1gvmelo+cCH+yCAmmyTYGhUegVdk=";
   };
diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix
index d2d508b5a8f7..20148a8b6d0c 100644
--- a/pkgs/development/python-modules/itemdb/default.nix
+++ b/pkgs/development/python-modules/itemdb/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # PyPI tarball doesn't include tests directory
   src = fetchFromGitHub {
     owner = "almarklein";
-    repo = pname;
+    repo = "itemdb";
     tag = "v${version}";
     sha256 = "sha256-egxQ1tGC6R5p1stYm4r05+b2HkuT+nBySTZPGqeAbSE=";
   };
diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix
index 5a9b5edd6fa9..367b595356f9 100644
--- a/pkgs/development/python-modules/itunespy/default.nix
+++ b/pkgs/development/python-modules/itunespy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sleepyfran";
-    repo = pname;
+    repo = "itunespy";
     tag = "v${version}";
     sha256 = "sha256-QvSKJAZa8v0tGURXwo4Dwo73JqsYs1xsBHW0lcaM7bk=";
   };
diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix
index a1e83de89c12..9f74eeaf392c 100644
--- a/pkgs/development/python-modules/itypes/default.nix
+++ b/pkgs/development/python-modules/itypes/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "itypes";
     owner = "tomchristie";
     rev = version;
     sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52";

From b7988d22b788911c80c2af240f7f0fab34b71224 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 25 May 2025 04:01:47 +0200
Subject: [PATCH 098/204] treewide: substitute pname for strings
 (python3Packages.[s-z0-9_].*)

---
 pkgs/development/python-modules/sacremoses/default.nix        | 2 +-
 pkgs/development/python-modules/sarge/default.nix             | 2 +-
 pkgs/development/python-modules/schemainspect/default.nix     | 4 ++--
 .../development/python-modules/scikit-learn-extra/default.nix | 2 +-
 .../python-modules/scim2-filter-parser/default.nix            | 2 +-
 .../python-modules/scrapy-fake-useragent/default.nix          | 4 ++--
 pkgs/development/python-modules/screeninfo/default.nix        | 2 +-
 pkgs/development/python-modules/sdds/default.nix              | 2 +-
 pkgs/development/python-modules/seatconnect/default.nix       | 2 +-
 pkgs/development/python-modules/segyio/default.nix            | 2 +-
 pkgs/development/python-modules/sensor-state-data/default.nix | 2 +-
 pkgs/development/python-modules/serialio/default.nix          | 2 +-
 pkgs/development/python-modules/serializable/default.nix      | 4 ++--
 pkgs/development/python-modules/servefile/default.nix         | 2 +-
 pkgs/development/python-modules/service-identity/default.nix  | 2 +-
 pkgs/development/python-modules/setuptools-odoo/default.nix   | 2 +-
 pkgs/development/python-modules/seventeentrack/default.nix    | 2 +-
 pkgs/development/python-modules/sharkiq/default.nix           | 2 +-
 pkgs/development/python-modules/shellingham/default.nix       | 2 +-
 pkgs/development/python-modules/showit/default.nix            | 4 ++--
 pkgs/development/python-modules/shutilwhich/default.nix       | 2 +-
 pkgs/development/python-modules/simber/default.nix            | 2 +-
 pkgs/development/python-modules/simplehound/default.nix       | 2 +-
 pkgs/development/python-modules/simplejson/default.nix        | 4 ++--
 pkgs/development/python-modules/single-version/default.nix    | 2 +-
 pkgs/development/python-modules/skrl/default.nix              | 2 +-
 .../python-modules/skytemple-eventserver/default.nix          | 2 +-
 pkgs/development/python-modules/skytemple-icons/default.nix   | 2 +-
 pkgs/development/python-modules/slicedimage/default.nix       | 2 +-
 pkgs/development/python-modules/smbus2/default.nix            | 2 +-
 .../snakemake-executor-plugin-cluster-generic/default.nix     | 2 +-
 .../snakemake-interface-logger-plugins/default.nix            | 2 +-
 .../snakemake-interface-report-plugins/default.nix            | 2 +-
 .../snakemake-interface-storage-plugins/default.nix           | 2 +-
 .../python-modules/snakemake-storage-plugin-fs/default.nix    | 2 +-
 .../snakemake-storage-plugin-xrootd/default.nix               | 2 +-
 pkgs/development/python-modules/snorkel/default.nix           | 2 +-
 pkgs/development/python-modules/snuggs/default.nix            | 2 +-
 pkgs/development/python-modules/socialscan/default.nix        | 2 +-
 pkgs/development/python-modules/sockio/default.nix            | 2 +-
 pkgs/development/python-modules/solo-python/default.nix       | 2 +-
 pkgs/development/python-modules/sparklines/default.nix        | 2 +-
 pkgs/development/python-modules/sphinx-fortran/default.nix    | 4 ++--
 pkgs/development/python-modules/sphinx-pytest/default.nix     | 2 +-
 pkgs/development/python-modules/sqlalchemy-views/default.nix  | 2 +-
 pkgs/development/python-modules/sqlbag/default.nix            | 4 ++--
 pkgs/development/python-modules/sqlite-fts4/default.nix       | 2 +-
 pkgs/development/python-modules/sqltrie/default.nix           | 2 +-
 pkgs/development/python-modules/squarify/default.nix          | 2 +-
 pkgs/development/python-modules/srvlookup/default.nix         | 2 +-
 pkgs/development/python-modules/stanza/default.nix            | 2 +-
 pkgs/development/python-modules/staticjinja/default.nix       | 2 +-
 pkgs/development/python-modules/statmake/default.nix          | 2 +-
 pkgs/development/python-modules/stemming/default.nix          | 2 +-
 pkgs/development/python-modules/stopit/default.nix            | 2 +-
 pkgs/development/python-modules/sumtypes/default.nix          | 2 +-
 pkgs/development/python-modules/sybil/default.nix             | 2 +-
 pkgs/development/python-modules/syncer/default.nix            | 2 +-
 .../python-modules/syslog-rfc5424-formatter/default.nix       | 2 +-
 pkgs/development/python-modules/sysrsync/default.nix          | 2 +-
 pkgs/development/python-modules/tahoma-api/default.nix        | 2 +-
 pkgs/development/python-modules/tank-utility/default.nix      | 2 +-
 pkgs/development/python-modules/tcolorpy/default.nix          | 2 +-
 pkgs/development/python-modules/tensorly/default.nix          | 4 ++--
 pkgs/development/python-modules/termgraph/default.nix         | 2 +-
 pkgs/development/python-modules/termplotlib/default.nix       | 2 +-
 .../python-modules/tesla-wall-connector/default.nix           | 2 +-
 pkgs/development/python-modules/test-tube/default.nix         | 2 +-
 pkgs/development/python-modules/testbook/default.nix          | 2 +-
 pkgs/development/python-modules/threadpoolctl/default.nix     | 2 +-
 pkgs/development/python-modules/threat9-test-bed/default.nix  | 2 +-
 pkgs/development/python-modules/throttler/default.nix         | 2 +-
 pkgs/development/python-modules/tikzplotlib/default.nix       | 2 +-
 pkgs/development/python-modules/timeago/default.nix           | 2 +-
 pkgs/development/python-modules/timeslot/default.nix          | 4 ++--
 pkgs/development/python-modules/timetagger/default.nix        | 2 +-
 pkgs/development/python-modules/tmb/default.nix               | 2 +-
 pkgs/development/python-modules/token-bucket/default.nix      | 2 +-
 pkgs/development/python-modules/tokenize-rt/default.nix       | 2 +-
 pkgs/development/python-modules/tokentrim/default.nix         | 2 +-
 pkgs/development/python-modules/tomli/default.nix             | 2 +-
 pkgs/development/python-modules/trackpy/default.nix           | 2 +-
 pkgs/development/python-modules/traittypes/default.nix        | 4 ++--
 pkgs/development/python-modules/transforms3d/default.nix      | 2 +-
 pkgs/development/python-modules/translitcodec/default.nix     | 2 +-
 pkgs/development/python-modules/treeo/default.nix             | 2 +-
 pkgs/development/python-modules/treex/default.nix             | 2 +-
 .../python-modules/trino-python-client/default.nix            | 2 +-
 pkgs/development/python-modules/troposphere/default.nix       | 2 +-
 pkgs/development/python-modules/ttach/default.nix             | 2 +-
 pkgs/development/python-modules/ttkbootstrap/default.nix      | 2 +-
 pkgs/development/python-modules/ttp/default.nix               | 2 +-
 pkgs/development/python-modules/tuyaha/default.nix            | 2 +-
 pkgs/development/python-modules/typechecks/default.nix        | 4 ++--
 pkgs/development/python-modules/typesystem/default.nix        | 2 +-
 pkgs/development/python-modules/uarray/default.nix            | 2 +-
 pkgs/development/python-modules/uasiren/default.nix           | 2 +-
 pkgs/development/python-modules/ukkonen/default.nix           | 2 +-
 pkgs/development/python-modules/unicrypto/default.nix         | 2 +-
 pkgs/development/python-modules/unifiled/default.nix          | 2 +-
 pkgs/development/python-modules/upnpy/default.nix             | 2 +-
 pkgs/development/python-modules/usb-devices/default.nix       | 2 +-
 pkgs/development/python-modules/uvcclient/default.nix         | 2 +-
 pkgs/development/python-modules/vaa/default.nix               | 2 +-
 pkgs/development/python-modules/viewstate/default.nix         | 2 +-
 pkgs/development/python-modules/virtualenv-clone/default.nix  | 2 +-
 pkgs/development/python-modules/vllm/default.nix              | 2 +-
 pkgs/development/python-modules/vulcan-api/default.nix        | 2 +-
 pkgs/development/python-modules/vxi11/default.nix             | 2 +-
 pkgs/development/python-modules/wagtail-factories/default.nix | 2 +-
 pkgs/development/python-modules/warlock/default.nix           | 2 +-
 pkgs/development/python-modules/waterfurnace/default.nix      | 2 +-
 pkgs/development/python-modules/websockify/default.nix        | 2 +-
 pkgs/development/python-modules/webthing-ws/default.nix       | 2 +-
 pkgs/development/python-modules/whatthepatch/default.nix      | 2 +-
 pkgs/development/python-modules/whodap/default.nix            | 2 +-
 pkgs/development/python-modules/wifi/default.nix              | 2 +-
 pkgs/development/python-modules/xmind/default.nix             | 2 +-
 pkgs/development/python-modules/xpath-expressions/default.nix | 2 +-
 pkgs/development/python-modules/xpybutil/default.nix          | 2 +-
 pkgs/development/python-modules/yaswfp/default.nix            | 4 ++--
 pkgs/development/python-modules/zadnegoale/default.nix        | 2 +-
 pkgs/development/python-modules/zigpy-deconz/default.nix      | 2 +-
 pkgs/development/python-modules/zigpy-znp/default.nix         | 2 +-
 pkgs/development/python-modules/zwave-me-ws/default.nix       | 2 +-
 125 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix
index 08960b6dbc39..d58461de8a33 100644
--- a/pkgs/development/python-modules/sacremoses/default.nix
+++ b/pkgs/development/python-modules/sacremoses/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alvations";
-    repo = pname;
+    repo = "sacremoses";
     rev = version;
     sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770";
   };
diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix
index e9ad2980e319..34eed3242f03 100644
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vsajip";
-    repo = pname;
+    repo = "sarge";
     rev = version;
     hash = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4=";
   };
diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix
index bca42664cc18..36095d9bf981 100644
--- a/pkgs/development/python-modules/schemainspect/default.nix
+++ b/pkgs/development/python-modules/schemainspect/default.nix
@@ -14,7 +14,7 @@
   postgresql,
   postgresqlTestHook,
 }:
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "schemainspect";
   version = "3.1.1663587362";
   format = "pyproject";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "djrobstep";
-    repo = pname;
+    repo = "schemainspect";
     # no tags on github, version patch number is unix time.
     rev = "066262d6fb4668f874925305a0b7dbb3ac866882";
     hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk=";
diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix
index 3c37f61c0b53..95cdcce5d10e 100644
--- a/pkgs/development/python-modules/scikit-learn-extra/default.nix
+++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "scikit-learn-contrib";
-    repo = pname;
+    repo = "scikit-learn-extra";
     tag = "v${version}";
     sha256 = "sha256-dHOwo6NIuhcvIehpuJQ621JEg5O3mnXycAhpTZKaxns=";
   };
diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix
index fd3f8418f48f..ab9e307d3641 100644
--- a/pkgs/development/python-modules/scim2-filter-parser/default.nix
+++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "15five";
-    repo = pname;
+    repo = "scim2-filter-parser";
     tag = version;
     hash = "sha256-KmtOtI/5HT0lVwvXQFTlEwMeptoa4cA5hTSgSULxhIc=";
   };
diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index 36163e8a0c91..7f0b4ab3db53 100644
--- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -12,7 +12,7 @@
   scrapy,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "scrapy-fake-useragent";
   version = "1.4.4";
   pyproject = true;
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # PyPi tarball is corrupted
   src = fetchFromGitHub {
     owner = "alecxe";
-    repo = pname;
+    repo = "scrapy-fake-useragent";
     rev = "59c20d38c58c76618164760d546aa5b989a79b8b"; # no tags
     hash = "sha256-khQMOQrrdHokvNqfaMWqXV7AzwGxTuxaLsZoLkNpZ3k=";
   };
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index b90be59b6d66..0b5925222c5b 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rr-";
-    repo = pname;
+    repo = "screeninfo";
     tag = version;
     hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA=";
   };
diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix
index ec1aa7461196..9cc641d286cc 100644
--- a/pkgs/development/python-modules/sdds/default.nix
+++ b/pkgs/development/python-modules/sdds/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pylhc";
-    repo = pname;
+    repo = "sdds";
     tag = "v${version}";
     hash = "sha256-h1gEqzmKCUr8+w3Fv8lv35/0itZwela//AQsD3u0UJA=";
   };
diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix
index 1b685f8078a8..377293d4532c 100644
--- a/pkgs/development/python-modules/seatconnect/default.nix
+++ b/pkgs/development/python-modules/seatconnect/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "farfar";
-    repo = pname;
+    repo = "seatconnect";
     tag = version;
     hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ=";
   };
diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix
index bf0a275969d3..005a194afd6d 100644
--- a/pkgs/development/python-modules/segyio/default.nix
+++ b/pkgs/development/python-modules/segyio/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "equinor";
-    repo = pname;
+    repo = "segyio";
     tag = "v${version}";
     hash = "sha256-+N2JvHBxpdbysn4noY/9LZ4npoQ9143iFEzaxoafnms=";
   };
diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index 73454cec0101..58d85e20122c 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
-    repo = pname;
+    repo = "sensor-state-data";
     tag = "v${version}";
     hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU=";
   };
diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix
index 3ef9e2798b06..3d2b91e107a1 100644
--- a/pkgs/development/python-modules/serialio/default.nix
+++ b/pkgs/development/python-modules/serialio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
-    repo = pname;
+    repo = "serialio";
     tag = "v${version}";
     hash = "sha256-9TRGT0wpoRRcHqnH1XzlMBh0IcVzdEcOzN7hkeYnoW4=";
   };
diff --git a/pkgs/development/python-modules/serializable/default.nix b/pkgs/development/python-modules/serializable/default.nix
index abc9e1378b10..0dd160f37580 100644
--- a/pkgs/development/python-modules/serializable/default.nix
+++ b/pkgs/development/python-modules/serializable/default.nix
@@ -7,14 +7,14 @@
   typechecks,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "serializable";
   version = "unstable-2023-07-13";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "iskandr";
-    repo = pname;
+    repo = "serializable";
     # See https://github.com/iskandr/serializable/issues/7. As of 2023-07-13,
     # they do no have version tags.
     rev = "ed309a6f8f2590b525fc0f93c00549223c8c944f";
diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix
index a74fc852bc12..893cf8591544 100644
--- a/pkgs/development/python-modules/servefile/default.nix
+++ b/pkgs/development/python-modules/servefile/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sebageek";
-    repo = pname;
+    repo = "servefile";
     tag = "v${version}";
     hash = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU=";
   };
diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix
index 565655c5678c..55a101d26f90 100644
--- a/pkgs/development/python-modules/service-identity/default.nix
+++ b/pkgs/development/python-modules/service-identity/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pyca";
-    repo = pname;
+    repo = "service-identity";
     tag = version;
     hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4=";
   };
diff --git a/pkgs/development/python-modules/setuptools-odoo/default.nix b/pkgs/development/python-modules/setuptools-odoo/default.nix
index 7d1152294fec..710b70625005 100644
--- a/pkgs/development/python-modules/setuptools-odoo/default.nix
+++ b/pkgs/development/python-modules/setuptools-odoo/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "acsone";
-    repo = pname;
+    repo = "setuptools-odoo";
     tag = version;
     hash = "sha256-38YlkDH/PuJ1yvQ43OYmdnRd1SGJULv6fC/+fitLDJ8=";
   };
diff --git a/pkgs/development/python-modules/seventeentrack/default.nix b/pkgs/development/python-modules/seventeentrack/default.nix
index d0331594e3fd..a40cc9c78bda 100644
--- a/pkgs/development/python-modules/seventeentrack/default.nix
+++ b/pkgs/development/python-modules/seventeentrack/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "McSwindler";
-    repo = pname;
+    repo = "seventeentrack";
     rev = version;
     hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U=";
   };
diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix
index 0e338a979482..b2ec96b5fe22 100644
--- a/pkgs/development/python-modules/sharkiq/default.nix
+++ b/pkgs/development/python-modules/sharkiq/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "JeffResc";
-    repo = pname;
+    repo = "sharkiq";
     tag = "v${version}";
     hash = "sha256-adSBFH5nGVPo7OBMak6rN5HA5uMKZCqnIVXBnR7REgQ=";
   };
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
index f457ea4c3146..6858d34ee16e 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sarugaku";
-    repo = pname;
+    repo = "shellingham";
     tag = version;
     hash = "sha256-xeBo3Ok+XPrHN4nQd7M8/11leSV/8z1f7Sj33+HFVtQ=";
   };
diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix
index b98b48df2cd9..95d8c3d60ae4 100644
--- a/pkgs/development/python-modules/showit/default.nix
+++ b/pkgs/development/python-modules/showit/default.nix
@@ -7,14 +7,14 @@
   pytest,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "showit";
   version = "1.1.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "freeman-lab";
-    repo = pname;
+    repo = "showit";
     rev = "ef76425797c71fbe3795b4302c49ab5be6b0bacb"; # no tags in repo
     sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6";
   };
diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix
index bc022fbe0f85..4f9b5dd8d629 100644
--- a/pkgs/development/python-modules/shutilwhich/default.nix
+++ b/pkgs/development/python-modules/shutilwhich/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mbr";
-    repo = pname;
+    repo = "shutilwhich";
     rev = version;
     sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0";
   };
diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index 65c8e9e4692d..3aa1cf1d51e5 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "deepjyoti30";
-    repo = pname;
+    repo = "simber";
     tag = version;
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix
index bf2efed90c09..e9462acf1f07 100644
--- a/pkgs/development/python-modules/simplehound/default.nix
+++ b/pkgs/development/python-modules/simplehound/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "robmarkcole";
-    repo = pname;
+    repo = "simplehound";
     rev = "v${version}";
     sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh";
   };
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 49b0c3061747..398ccd8dd226 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -15,8 +15,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "simplejson";
+    repo = "simplejson";
     tag = "v${version}";
     hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas=";
   };
diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix
index 960efdb9a218..1b738a665a25 100644
--- a/pkgs/development/python-modules/single-version/default.nix
+++ b/pkgs/development/python-modules/single-version/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hongquan";
-    repo = pname;
+    repo = "single-version";
     tag = "v${version}";
     hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc=";
   };
diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix
index 49ccd8740f92..e5c1b5991899 100644
--- a/pkgs/development/python-modules/skrl/default.nix
+++ b/pkgs/development/python-modules/skrl/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Toni-SM";
-    repo = pname;
+    repo = "skrl";
     tag = version;
     hash = "sha256-5lkoYAmMIWqK3+E3WxXMWS9zal2DhZkfl30EkrHKpdI=";
   };
diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix
index 275948b3970d..e0c6c50fa7ec 100644
--- a/pkgs/development/python-modules/skytemple-eventserver/default.nix
+++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
+    repo = "skytemple-eventserver";
     rev = version;
     hash = "sha256-PWLGPORNprTfG+jgXI1sxyVkRTwSEib4SZhPdOBchwE=";
   };
diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix
index 20c6187a2c25..093b1f91e061 100644
--- a/pkgs/development/python-modules/skytemple-icons/default.nix
+++ b/pkgs/development/python-modules/skytemple-icons/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
-    repo = pname;
+    repo = "skytemple-icons";
     rev = version;
     sha256 = "0wagdvzks9irdl5lj8sfqkkvfwwmdpvjyzx6424shvpp5mk28dcv";
   };
diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix
index 8c7b0e242ce4..21613b56bde0 100644
--- a/pkgs/development/python-modules/slicedimage/default.nix
+++ b/pkgs/development/python-modules/slicedimage/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "spacetx";
-    repo = pname;
+    repo = "slicedimage";
     rev = version;
     sha256 = "1vpg8varvfx0nj6xscdfm7m118hzsfz7qfzn28r9rsfvrhr0dlcw";
   };
diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix
index de050f1f5220..5f7347eb04b3 100644
--- a/pkgs/development/python-modules/smbus2/default.nix
+++ b/pkgs/development/python-modules/smbus2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "kplindegaard";
-    repo = pname;
+    repo = "smbus2";
     tag = version;
     hash = "sha256-3ZAjviVLO/c27NzrPcWf6RlZYclYkmUmOskTP9TVbNM=";
   };
diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
index e52b88742253..34633ec6faaf 100644
--- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
+++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snakemake";
-    repo = pname;
+    repo = "snakemake-executor-plugin-cluster-generic";
     tag = "v${version}";
     hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o=";
   };
diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
index ef56cbc43bec..dcda2dab0916 100644
--- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snakemake";
-    repo = pname;
+    repo = "snakemake-interface-logger-plugins";
     tag = "v${version}";
     hash = "sha256-VHbta+R2a/K2L03IRu/Ya7dJzshIAvyK9cNIRbx8QqM=";
   };
diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
index 137aa8ae88a8..5be194ba2de6 100644
--- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snakemake";
-    repo = pname;
+    repo = "snakemake-interface-report-plugins";
     tag = "v${version}";
     hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q=";
   };
diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
index f40ea176ee08..0e6ccd4db39c 100644
--- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snakemake";
-    repo = pname;
+    repo = "snakemake-interface-storage-plugins";
     tag = "v${version}";
     hash = "sha256-mGpKmKWWL4ue9Dddjs4fXCaITrC97yHC58Jh2vclXAY=";
   };
diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
index 632f9da90058..759bd57b60c3 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snakemake";
-    repo = pname;
+    repo = "snakemake-storage-plugin-fs";
     tag = "v${version}";
     hash = "sha256-Y+Fofz4D/CWgdG3lOneadRu/VfJ23D4Dz751j9rUKNo=";
   };
diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
index 1620865f1869..1b68b506ba3a 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "snakemake";
-    repo = pname;
+    repo = "snakemake-storage-plugin-xrootd";
     tag = "v${version}";
     hash = "sha256-vfMAgOTmT3uzUZHXeKsd8Ze3+b3nFsVHDhkPG+xvz+k=";
   };
diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix
index 836e04d0875d..51c71152bfd8 100644
--- a/pkgs/development/python-modules/snorkel/default.nix
+++ b/pkgs/development/python-modules/snorkel/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "snorkel-team";
-    repo = pname;
+    repo = "snorkel";
     tag = "v${version}";
     hash = "sha256-1DgkMHYToiI3266yCND1bXiui80x8AaBttxM83kJImw=";
   };
diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix
index b742c8d6985a..7871fd5a708e 100644
--- a/pkgs/development/python-modules/snuggs/default.nix
+++ b/pkgs/development/python-modules/snuggs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
     owner = "mapbox";
-    repo = pname;
+    repo = "snuggs";
     rev = version;
     sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
   };
diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix
index a91e7867c503..381dc8b4752c 100644
--- a/pkgs/development/python-modules/socialscan/default.nix
+++ b/pkgs/development/python-modules/socialscan/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "iojw";
-    repo = pname;
+    repo = "socialscan";
     tag = "v${version}";
     hash = "sha256-4JJVhB6x1NGagtfzE03Jae2GOr25hh+4l7gQ23zc7Ck=";
   };
diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix
index a71ca5817974..a243425fe3a2 100644
--- a/pkgs/development/python-modules/sockio/default.nix
+++ b/pkgs/development/python-modules/sockio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
-    repo = pname;
+    repo = "sockio";
     tag = "v${version}";
     hash = "sha256-NSGd7/k1Yr408dipMNBSPRSwQ+wId7VLxgqMM/UmN/Q=";
   };
diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix
index 679351c90657..99eff0c3f0ef 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/pkgs/development/python-modules/solo-python/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "solokeys";
-    repo = pname;
+    repo = "solo-python";
     rev = version;
     hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU=";
   };
diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix
index 664127865129..c04f1908def7 100644
--- a/pkgs/development/python-modules/sparklines/default.nix
+++ b/pkgs/development/python-modules/sparklines/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "deeplook";
-    repo = pname;
+    repo = "sparklines";
     tag = "v${version}";
     sha256 = "sha256-oit1bDqP96wwfTRCV8V0N9P/+pkdW2WYOWT6u3lb4Xs=";
   };
diff --git a/pkgs/development/python-modules/sphinx-fortran/default.nix b/pkgs/development/python-modules/sphinx-fortran/default.nix
index e01342e8e6eb..341b3a5ce5e0 100644
--- a/pkgs/development/python-modules/sphinx-fortran/default.nix
+++ b/pkgs/development/python-modules/sphinx-fortran/default.nix
@@ -9,14 +9,14 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "sphinx-fortran";
   version = "unstable-2022-03-02";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "VACUMM";
-    repo = pname;
+    repo = "sphinx-fortran";
     rev = "394ae990b43ed43fcff8beb048632f5e99794264";
     hash = "sha256-IVKu5u9gqs7/9EZrf4ZYd12K6J31u+/B8kk4+8yfohM=";
   };
diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix
index 55c61ac7f7bb..23096443218a 100644
--- a/pkgs/development/python-modules/sphinx-pytest/default.nix
+++ b/pkgs/development/python-modules/sphinx-pytest/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "chrisjsewell";
-    repo = pname;
+    repo = "sphinx-pytest";
     tag = "v${version}";
     hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ=";
   };
diff --git a/pkgs/development/python-modules/sqlalchemy-views/default.nix b/pkgs/development/python-modules/sqlalchemy-views/default.nix
index 5f9bdfce9b35..a462e48bfede 100644
--- a/pkgs/development/python-modules/sqlalchemy-views/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-views/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "sqlalchemy-views";
     owner = "jklukas";
     tag = "v${version}";
     hash = "sha256-MJgikWXo3lpMsSYbb5sOSOTbJPOx5gEghW1V9jKvHKU=";
diff --git a/pkgs/development/python-modules/sqlbag/default.nix b/pkgs/development/python-modules/sqlbag/default.nix
index 1915296ca390..4667a7957df1 100644
--- a/pkgs/development/python-modules/sqlbag/default.nix
+++ b/pkgs/development/python-modules/sqlbag/default.nix
@@ -17,14 +17,14 @@
   postgresql,
   postgresqlTestHook,
 }:
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "sqlbag";
   version = "0.1.1617247075";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "djrobstep";
-    repo = pname;
+    repo = "sqlbag";
     # no tags on github, version patch number is unix time.
     rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120";
     hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs=";
diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix
index 0ea1f02bbff3..c84a30ffda52 100644
--- a/pkgs/development/python-modules/sqlite-fts4/default.nix
+++ b/pkgs/development/python-modules/sqlite-fts4/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "simonw";
-    repo = pname;
+    repo = "sqlite-fts4";
     tag = version;
     hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU=";
   };
diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix
index b30ff3f489a4..0d767885a761 100644
--- a/pkgs/development/python-modules/sqltrie/default.nix
+++ b/pkgs/development/python-modules/sqltrie/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "iterative";
-    repo = pname;
+    repo = "sqltrie";
     tag = version;
     hash = "sha256-D1vYXyh/i0wy7sttW117vsMbUlQJ/mq7rlxLMJWoki0=";
   };
diff --git a/pkgs/development/python-modules/squarify/default.nix b/pkgs/development/python-modules/squarify/default.nix
index 496e922a59d1..de82a86a780c 100644
--- a/pkgs/development/python-modules/squarify/default.nix
+++ b/pkgs/development/python-modules/squarify/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "laserson";
-    repo = pname;
+    repo = "squarify";
     tag = "v${version}";
     hash = "sha256-zSv+6xT9H4WyShRnwjjcNMjY19AFlQ6bw9Mh9p2rL08=";
   };
diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix
index 3ffba90e953b..e70d06d54510 100644
--- a/pkgs/development/python-modules/srvlookup/default.nix
+++ b/pkgs/development/python-modules/srvlookup/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gmr";
-    repo = pname;
+    repo = "srvlookup";
     tag = version;
     hash = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY=";
   };
diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix
index 82c16afc5ec8..2a692d6f23eb 100644
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "stanfordnlp";
-    repo = pname;
+    repo = "stanza";
     tag = "v${version}";
     hash = "sha256-0uqEyiY+gX9P2r2H+qF4t8OUUumjikBZjk4psFf9l30=";
   };
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index 2967f11b9aa6..f13df2d784dd 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # No tests in pypi
   src = fetchFromGitHub {
     owner = "staticjinja";
-    repo = pname;
+    repo = "staticjinja";
     rev = version;
     hash = "sha256-LfJTQhZtnTOm39EWF1m2MP5rxz/5reE0G1Uk9L7yx0w=";
   };
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index e9f0bd3b8ac5..f63dd9bd64df 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "daltonmaag";
-    repo = pname;
+    repo = "statmake";
     tag = "v${version}";
     hash = "sha256-3BZ71JVvj7GCojM8ycu160viPj8BLJ1SiW86Df2fzsw=";
   };
diff --git a/pkgs/development/python-modules/stemming/default.nix b/pkgs/development/python-modules/stemming/default.nix
index 98ef1eea9b09..a49c0f394112 100644
--- a/pkgs/development/python-modules/stemming/default.nix
+++ b/pkgs/development/python-modules/stemming/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage {
   # Pypi source package doesn't contain tests
   src = fetchFromGitHub {
     owner = "nmstoker";
-    repo = pname;
+    repo = "stemming";
     rev = "477d0e354e79843f5ec241ba3603bcb5b843c3c4";
     hash = "sha256-wnmBCbxnCZ9mN1J7sLcN7OynMcvqgAnhEgpAwW2/xz4=";
   };
diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix
index 4569b1ba88e2..b6aa1dd72957 100644
--- a/pkgs/development/python-modules/stopit/default.nix
+++ b/pkgs/development/python-modules/stopit/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # tests are missing from the PyPi tarball
   src = fetchFromGitHub {
     owner = "glenfant";
-    repo = pname;
+    repo = "stopit";
     rev = version;
     hash = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw=";
   };
diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix
index 91ae86b01206..20a45920f805 100644
--- a/pkgs/development/python-modules/sumtypes/default.nix
+++ b/pkgs/development/python-modules/sumtypes/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "radix";
-    repo = pname;
+    repo = "sumtypes";
     rev = version;
     hash = "sha256-qwQyFKVnGEqHUqFmUSnHVvedsp2peM6rJZcS90paLOo=";
   };
diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index 5dca021fb764..494f8e042524 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "simplistix";
-    repo = pname;
+    repo = "sybil";
     tag = version;
     hash = "sha256-ov8b8NPBbiqB/pcKgdD2D+xNSxUM1uGK8EP+20K7eGQ=";
   };
diff --git a/pkgs/development/python-modules/syncer/default.nix b/pkgs/development/python-modules/syncer/default.nix
index aed4172d9a3f..afda386209c1 100644
--- a/pkgs/development/python-modules/syncer/default.nix
+++ b/pkgs/development/python-modules/syncer/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "miyakogi";
-    repo = pname;
+    repo = "syncer";
     rev = "v${version}";
     sha256 = "sha256-3EYWy6LuZ/3i+9d0QaclCqWMMw5O3WzhTY3LUL5iMso=";
   };
diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
index 411f43337fe2..7fb7c27a3788 100644
--- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "easypost";
-    repo = pname;
+    repo = "syslog-rfc5424-formatter";
     tag = "v${version}";
     hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0=";
   };
diff --git a/pkgs/development/python-modules/sysrsync/default.nix b/pkgs/development/python-modules/sysrsync/default.nix
index cc833dd4ae8b..df7047239735 100644
--- a/pkgs/development/python-modules/sysrsync/default.nix
+++ b/pkgs/development/python-modules/sysrsync/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "gchamon";
-    repo = pname;
+    repo = "sysrsync";
     tag = version;
     hash = "sha256-2Sz3JrNmIGOnad+qjRzbAgsFEzDtwBT0KLEFyQKZra4=";
   };
diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix
index 13744f25f24d..f9701ab89da0 100644
--- a/pkgs/development/python-modules/tahoma-api/default.nix
+++ b/pkgs/development/python-modules/tahoma-api/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "philklei";
-    repo = pname;
+    repo = "tahoma-api";
     rev = "v${version}";
     hash = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4=";
   };
diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix
index 2eb958b33bc6..075b788e852b 100644
--- a/pkgs/development/python-modules/tank-utility/default.nix
+++ b/pkgs/development/python-modules/tank-utility/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "krismolendyke";
-    repo = pname;
+    repo = "tank-utility";
     tag = version;
     hash = "sha256-h9y3X+FSzSFt+bd/chz+x0nocHaKZ8DvreMxAYMs8/E=";
   };
diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix
index 9c98865b38aa..39adb610f6da 100644
--- a/pkgs/development/python-modules/tcolorpy/default.nix
+++ b/pkgs/development/python-modules/tcolorpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "tcolorpy";
     tag = "v${version}";
     hash = "sha256-0AXpwRQgBisO4360J+Xd4+EWzDtDJ64UpSUmDnSYjKE=";
   };
diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix
index 1b46e61869d1..72d202322eb8 100644
--- a/pkgs/development/python-modules/tensorly/default.nix
+++ b/pkgs/development/python-modules/tensorly/default.nix
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "tensorly";
+    repo = "tensorly";
     tag = version;
     hash = "sha256-A6Zlp8fa7XFgf4qpg7SEtNLlYSNtDGLuRUEfzD+crQc=";
   };
diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix
index f0b6dcf9310e..b874c66965d7 100644
--- a/pkgs/development/python-modules/termgraph/default.nix
+++ b/pkgs/development/python-modules/termgraph/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "mkaz";
-    repo = pname;
+    repo = "termgraph";
     tag = "v${version}";
     hash = "sha256-0J9mEpDIdNEYwO+A+HBOaSw+Ct+HsbSPwGQYuYH6NN8=";
   };
diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix
index d690ad1aa5a9..1ab3f9f50837 100644
--- a/pkgs/development/python-modules/termplotlib/default.nix
+++ b/pkgs/development/python-modules/termplotlib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nschloe";
-    repo = pname;
+    repo = "termplotlib";
     rev = "v${version}";
     sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1";
   };
diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix
index cc5907be5b37..c05c23ef63d5 100644
--- a/pkgs/development/python-modules/tesla-wall-connector/default.nix
+++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "einarhauks";
-    repo = pname;
+    repo = "tesla-wall-connector";
     rev = version;
     hash = "sha256-GblKXWV9h37E3bxNsx17hEe0uDm8ahzJUx8wiE+Vc38=";
   };
diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix
index d133362c3fb2..95ed81707792 100644
--- a/pkgs/development/python-modules/test-tube/default.nix
+++ b/pkgs/development/python-modules/test-tube/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "williamFalcon";
-    repo = pname;
+    repo = "test-tube";
     rev = version;
     sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m";
   };
diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix
index 3e6661ceb687..013291df0f46 100644
--- a/pkgs/development/python-modules/testbook/default.nix
+++ b/pkgs/development/python-modules/testbook/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nteract";
-    repo = pname;
+    repo = "testbook";
     rev = version;
     hash = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U=";
   };
diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix
index a261a319b403..11724165b2b2 100644
--- a/pkgs/development/python-modules/threadpoolctl/default.nix
+++ b/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "joblib";
-    repo = pname;
+    repo = "threadpoolctl";
     tag = version;
     hash = "sha256-yICErKIHc9XKiWg9C9EH0il9zhbbkGntw6mlYDibr9g=";
   };
diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix
index e98cdd6fdd2f..ecd5be4d6ff0 100644
--- a/pkgs/development/python-modules/threat9-test-bed/default.nix
+++ b/pkgs/development/python-modules/threat9-test-bed/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "threat9";
-    repo = pname;
+    repo = "threat9-test-bed";
     rev = "v${version}";
     hash = "sha256-0YSjMf2gDdrvkDaT77iwfCkiDDXKHnZyI8d7JmBSuCg=";
   };
diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix
index 1e8983a02103..1c1273c1899d 100644
--- a/pkgs/development/python-modules/throttler/default.nix
+++ b/pkgs/development/python-modules/throttler/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "uburuntu";
-    repo = pname;
+    repo = "throttler";
     tag = "v${version}";
     hash = "sha256-fE35zPjBUn4e1VRkkIUMtYJ/+LbnUxnxyfnU+UEPwr4=";
   };
diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix
index e09c735f4c1f..7f7ceb4f9e21 100644
--- a/pkgs/development/python-modules/tikzplotlib/default.nix
+++ b/pkgs/development/python-modules/tikzplotlib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "nschloe";
-    repo = pname;
+    repo = "tikzplotlib";
     rev = "v${version}";
     hash = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0=";
   };
diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix
index a1bd21cf16ae..107b8bee5886 100644
--- a/pkgs/development/python-modules/timeago/default.nix
+++ b/pkgs/development/python-modules/timeago/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hustcc";
-    repo = pname;
+    repo = "timeago";
     rev = version;
     sha256 = "sha256-PqORJKAVrjezU/yP2ky3gb1XsM8obDI3GQzi+mok/OM=";
   };
diff --git a/pkgs/development/python-modules/timeslot/default.nix b/pkgs/development/python-modules/timeslot/default.nix
index d1ac79f37995..0b60dd3cc004 100644
--- a/pkgs/development/python-modules/timeslot/default.nix
+++ b/pkgs/development/python-modules/timeslot/default.nix
@@ -7,14 +7,14 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "timeslot";
   version = "0.1.2";
 
   # pypi distribution doesn't include tests, so build from source instead
   src = fetchFromGitHub {
     owner = "ErikBjare";
-    repo = pname;
+    repo = "timeslot";
     rev = "af35445e96cbb2f3fb671a75aac6aa93e4e7e7a6";
     sha256 = "sha256-GEhg2iMsYMfalT7L9TCd1KHU6oa/wTl5m3mRC0zOH9Q=";
   };
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index e7b1dcdf5169..a5791fff165e 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "almarklein";
-    repo = pname;
+    repo = "timetagger";
     tag = "v${version}";
     hash = "sha256-YzMVjIsi7MGIwt828xE3FYobrh9CUz5FqCIogXjmOcM=";
   };
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 9c97153d9d22..b3aba4481e07 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "alemuro";
-    repo = pname;
+    repo = "tmb";
     rev = version;
     hash = "sha256-XuRhRmeTXAplb14UwISyzaqEIrFeg8/aCdMxUccMUos=";
   };
diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix
index 8faffa98b28f..17af9a17cbfe 100644
--- a/pkgs/development/python-modules/token-bucket/default.nix
+++ b/pkgs/development/python-modules/token-bucket/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "falconry";
-    repo = pname;
+    repo = "token-bucket";
     tag = version;
     hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg=";
   };
diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix
index b3e994e26020..05de0d83426b 100644
--- a/pkgs/development/python-modules/tokenize-rt/default.nix
+++ b/pkgs/development/python-modules/tokenize-rt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "asottile";
-    repo = pname;
+    repo = "tokenize-rt";
     rev = "v${version}";
     hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg=";
   };
diff --git a/pkgs/development/python-modules/tokentrim/default.nix b/pkgs/development/python-modules/tokentrim/default.nix
index 6aa7f9bd3113..f4c7a5017cce 100644
--- a/pkgs/development/python-modules/tokentrim/default.nix
+++ b/pkgs/development/python-modules/tokentrim/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "KillianLucas";
-    repo = pname;
+    repo = "tokentrim";
     tag = "v${version}";
     hash = "sha256-zr2SLT3MBuMD98g9fdS0mLuijcssRQ/S3+tCq2Cw1/4=";
   };
diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix
index ea17a226873e..8d5498a5fffe 100644
--- a/pkgs/development/python-modules/tomli/default.nix
+++ b/pkgs/development/python-modules/tomli/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "hukkin";
-    repo = pname;
+    repo = "tomli";
     rev = version;
     hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM=";
   };
diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 115cbdc2fbdb..1190aad1f313 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "soft-matter";
-    repo = pname;
+    repo = "trackpy";
     tag = "v${version}";
     hash = "sha256-6i1IfdxgV6bpf//mXATpnsQ0zN26S8rlL0/1ql68sd8=";
   };
diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix
index e00ebe4ce1b7..bcd7ed2dfe20 100644
--- a/pkgs/development/python-modules/traittypes/default.nix
+++ b/pkgs/development/python-modules/traittypes/default.nix
@@ -11,7 +11,7 @@
   traitlets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "traittypes";
   version = "0.2.1-unstable-2020-07-17";
   pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jupyter-widgets";
-    repo = pname;
+    repo = "traittypes";
     rev = "af2ebeec9e58b73a12d4cf841bd506d6eadb8868";
     hash = "sha256-q7kt8b+yDHsWML/wCeND9PrZMVjemhzG7Ih1OtHbnTw=";
   };
diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix
index 4550649e6392..40bd7b7444a4 100644
--- a/pkgs/development/python-modules/transforms3d/default.nix
+++ b/pkgs/development/python-modules/transforms3d/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "matthew-brett";
-    repo = pname;
+    repo = "transforms3d";
     tag = version;
     hash = "sha256-9wICu7zNYF54e6xcDpZxqctB4GVu5Knf79Z36016Rpw=";
   };
diff --git a/pkgs/development/python-modules/translitcodec/default.nix b/pkgs/development/python-modules/translitcodec/default.nix
index 2b77a2fceb51..f4e046c49838 100644
--- a/pkgs/development/python-modules/translitcodec/default.nix
+++ b/pkgs/development/python-modules/translitcodec/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "claudep";
-    repo = pname;
+    repo = "translitcodec";
     rev = "version-${version}";
     hash = "sha256-/EKquTchx9i3fZqJ6AMzHYP9yCORvwbuUQ95WJQOQbI=";
   };
diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
index 694ac20116db..27716b9fd31e 100644
--- a/pkgs/development/python-modules/treeo/default.nix
+++ b/pkgs/development/python-modules/treeo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cgarciae";
-    repo = pname;
+    repo = "treeo";
     tag = version;
     hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw=";
   };
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index 6f0de8163934..3f76b078f17f 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cgarciae";
-    repo = pname;
+    repo = "treex";
     tag = version;
     hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ=";
   };
diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix
index 0337ddfa3690..af118a7a7dc4 100644
--- a/pkgs/development/python-modules/trino-python-client/default.nix
+++ b/pkgs/development/python-modules/trino-python-client/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "trino-python-client";
     owner = "trinodb";
     tag = version;
     hash = "sha256-Nr7p7x5cxxuPv2NUh1uMth97OQ+H2KBlu0SHVJ7Zu1M=";
diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix
index 6d2d8a92a695..b363b267f897 100644
--- a/pkgs/development/python-modules/troposphere/default.nix
+++ b/pkgs/development/python-modules/troposphere/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cloudtools";
-    repo = pname;
+    repo = "troposphere";
     tag = version;
     hash = "sha256-IqWgqkxJ4EFNt9z58cuCqSTnlbMNi7bFhA04hgQjG8E=";
   };
diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix
index d8430b7922a3..74510a31f128 100644
--- a/pkgs/development/python-modules/ttach/default.nix
+++ b/pkgs/development/python-modules/ttach/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "qubvel";
-    repo = pname;
+    repo = "ttach";
     tag = "v${version}";
     hash = "sha256-R6QO+9hv0eI7dZW5iJf096+LU1q+vnmOpveurgZemPc=";
   };
diff --git a/pkgs/development/python-modules/ttkbootstrap/default.nix b/pkgs/development/python-modules/ttkbootstrap/default.nix
index 11316094e9ee..d85b9da366bb 100644
--- a/pkgs/development/python-modules/ttkbootstrap/default.nix
+++ b/pkgs/development/python-modules/ttkbootstrap/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "israel-dryer";
-    repo = pname;
+    repo = "ttkbootstrap";
     tag = "v${version}";
     hash = "sha256-Pkp45lB1Xeu9ZoLjKS8aSW2By/k3ID1qwMig/jdYHh4=";
   };
diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index 75300b1c514a..3da347dc5340 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "dmulyalin";
-    repo = pname;
+    repo = "ttp";
     tag = version;
     hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w=";
   };
diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix
index eb56f96547d6..bd760c94d932 100644
--- a/pkgs/development/python-modules/tuyaha/default.nix
+++ b/pkgs/development/python-modules/tuyaha/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "PaulAnnekov";
-    repo = pname;
+    repo = "tuyaha";
     rev = version;
     hash = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM=";
   };
diff --git a/pkgs/development/python-modules/typechecks/default.nix b/pkgs/development/python-modules/typechecks/default.nix
index 4d7da1759f31..d6d3d5a74a3e 100644
--- a/pkgs/development/python-modules/typechecks/default.nix
+++ b/pkgs/development/python-modules/typechecks/default.nix
@@ -4,14 +4,14 @@
   lib,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "typechecks";
   version = "unstable-2023-07-13";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "openvax";
-    repo = pname;
+    repo = "typechecks";
     # See https://github.com/openvax/typechecks/issues/2. As of 2023-07-13,
     # they do no have version tags.
     rev = "5340b4e8a2f419b3a7aa816a5b19e2e0a6ce0679";
diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix
index 41a4b5147fa9..cbb68b8e0330 100644
--- a/pkgs/development/python-modules/typesystem/default.nix
+++ b/pkgs/development/python-modules/typesystem/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "encode";
-    repo = pname;
+    repo = "typesystem";
     rev = version;
     hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c=";
   };
diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
index aff3471aa932..0caba72c818d 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
-    repo = pname;
+    repo = "uarray";
     tag = version;
     hash = "sha256-eCrmmP+9TI+T8Km8MOz0EqseneFwPizlnZloK5yNLcM=";
   };
diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix
index a30bc00e8ba3..7b26d889cedc 100644
--- a/pkgs/development/python-modules/uasiren/default.nix
+++ b/pkgs/development/python-modules/uasiren/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage {
 
   src = fetchFromGitHub {
     owner = "PaulAnnekov";
-    repo = pname;
+    repo = "uasiren";
     rev = "v${version}";
     hash = "sha256-NHrnG5Vhz+JZgcTJyfIgGz0Ye+3dFVv2zLCCqw2++oM=";
   };
diff --git a/pkgs/development/python-modules/ukkonen/default.nix b/pkgs/development/python-modules/ukkonen/default.nix
index 136303b02b72..2a094b6c645a 100644
--- a/pkgs/development/python-modules/ukkonen/default.nix
+++ b/pkgs/development/python-modules/ukkonen/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "asottile";
-    repo = pname;
+    repo = "ukkonen";
     rev = "v${version}";
     sha256 = "jG6VP/P5sadrdrmneH36/ExSld9blyMAAG963QS9+p0=";
   };
diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix
index 39d7c6b532f4..b5d907ea3798 100644
--- a/pkgs/development/python-modules/unicrypto/default.nix
+++ b/pkgs/development/python-modules/unicrypto/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "skelsec";
-    repo = pname;
+    repo = "unicrypto";
     tag = version;
     hash = "sha256-mZEnYVM5r4utiGwM7bp2SwaDjYsH8AR/Qm5UdPNke0w=";
   };
diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix
index 0c2ec7dd9645..b4aff6965c18 100644
--- a/pkgs/development/python-modules/unifiled/default.nix
+++ b/pkgs/development/python-modules/unifiled/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "florisvdk";
-    repo = pname;
+    repo = "unifiled";
     rev = "v${version}";
     sha256 = "1nmqxxhwa0isxdb889nhbp7w4axj1mcrwd3pr9d8nhpw4yj9h3vq";
   };
diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix
index b6677afbd2b2..7bddf9803e64 100644
--- a/pkgs/development/python-modules/upnpy/default.nix
+++ b/pkgs/development/python-modules/upnpy/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "5kyc0d3r";
-    repo = pname;
+    repo = "upnpy";
     rev = "v${version}";
     sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf";
   };
diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix
index 9b3ab579de1a..fdd4f5b60121 100644
--- a/pkgs/development/python-modules/usb-devices/default.nix
+++ b/pkgs/development/python-modules/usb-devices/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
-    repo = pname;
+    repo = "usb-devices";
     tag = "v${version}";
     hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c=";
   };
diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix
index afaab0bce2a5..3adfecf98698 100644
--- a/pkgs/development/python-modules/uvcclient/default.nix
+++ b/pkgs/development/python-modules/uvcclient/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "kk7ds";
-    repo = pname;
+    repo = "uvcclient";
     tag = "v${version}";
     hash = "sha256-V7xIvZ9vIXHPpkEeJZ6QedWk+4ZVNwCzj5ffLyixFz4=";
   };
diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix
index 2c5f79f51e30..614ab6a53ed2 100644
--- a/pkgs/development/python-modules/vaa/default.nix
+++ b/pkgs/development/python-modules/vaa/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "life4";
-    repo = pname;
+    repo = "vaa";
     tag = "v.${version}";
     hash = "sha256-24GTTJSZ55ejyHoWP1/S3DLTKvOolAJr9UhWoOm84CU=";
   };
diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix
index d48059332148..9200466e07a3 100644
--- a/pkgs/development/python-modules/viewstate/default.nix
+++ b/pkgs/development/python-modules/viewstate/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "yuvadm";
-    repo = pname;
+    repo = "viewstate";
     tag = "v${version}";
     sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI=";
   };
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 8b159e9c532a..4cab270b846d 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "edwardgeorge";
-    repo = pname;
+    repo = "virtualenv-clone";
     rev = version;
     hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw=";
   };
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index c17eb4c11ccf..67f1b7cacdac 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -235,7 +235,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "vllm-project";
-    repo = pname;
+    repo = "vllm";
     tag = "v${version}";
     hash = "sha256-LiEBkVwJTT4WoCTk9pI0ykTjmv1pDMzksmFwVktoxMY=";
   };
diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix
index c58e2af9c836..1af45db9e138 100644
--- a/pkgs/development/python-modules/vulcan-api/default.nix
+++ b/pkgs/development/python-modules/vulcan-api/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "kapi2289";
-    repo = pname;
+    repo = "vulcan-api";
     tag = "v${version}";
     hash = "sha256-oWtyqFacWkKhv4QvbZCuq3KHlM/o7SfENg90O/ygXUw=";
   };
diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix
index f68979cf2fea..3a661b9ed3e3 100644
--- a/pkgs/development/python-modules/vxi11/default.nix
+++ b/pkgs/development/python-modules/vxi11/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   # no tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "python-ivi";
-    repo = pname;
+    repo = "python-vxi11";
     rev = "v${version}";
     sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn";
   };
diff --git a/pkgs/development/python-modules/wagtail-factories/default.nix b/pkgs/development/python-modules/wagtail-factories/default.nix
index c464466d65ae..3079e81c815d 100644
--- a/pkgs/development/python-modules/wagtail-factories/default.nix
+++ b/pkgs/development/python-modules/wagtail-factories/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "wagtail-factories";
     owner = "wagtail";
     tag = version;
     sha256 = "sha256-jo8VwrmxHBJnORmuR6eTLrf/eupNL2vhXcw81EzfTxM=";
diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
index 0725368b171b..b0352114cf66 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bcwaldon";
-    repo = pname;
+    repo = "warlock";
     tag = version;
     hash = "sha256-HOCLzFYmOL/tCXT+NO/tCZuVXVowNEPP3g33ZYg4+6Q=";
   };
diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix
index 266138ddd71a..7ec4a8f21af1 100644
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "sdague";
-    repo = pname;
+    repo = "waterfurnace";
     tag = "v${version}";
     sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf";
   };
diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index 6dce8529d7c2..005390911dc3 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "novnc";
-    repo = pname;
+    repo = "websockify";
     tag = "v${version}";
     hash = "sha256-b57L4o071zEt/gX9ZVzEpcnp0RCeo3peZrby2mccJgQ=";
   };
diff --git a/pkgs/development/python-modules/webthing-ws/default.nix b/pkgs/development/python-modules/webthing-ws/default.nix
index cdf6f7a7edb7..8fda705031d5 100644
--- a/pkgs/development/python-modules/webthing-ws/default.nix
+++ b/pkgs/development/python-modules/webthing-ws/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
-    repo = pname;
+    repo = "webthing-ws";
     tag = version;
     hash = "sha256-j7nc4yJczDs28RVFDHeQ2ZIG9mIW2m25AAeErVKi4E4=";
   };
diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix
index 1776fa488cf0..090a366c97fc 100644
--- a/pkgs/development/python-modules/whatthepatch/default.nix
+++ b/pkgs/development/python-modules/whatthepatch/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "cscorley";
-    repo = pname;
+    repo = "whatthepatch";
     tag = version;
     hash = "sha256-0pkkwVo9yaFEZyitfpKMC8EVr8HgPLUkrGWmyYOdZNE=";
   };
diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix
index dcd2235a941e..d4de5f0333f5 100644
--- a/pkgs/development/python-modules/whodap/default.nix
+++ b/pkgs/development/python-modules/whodap/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "pogzyb";
-    repo = pname;
+    repo = "whodap";
     tag = "v${version}";
     hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE=";
   };
diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix
index b99d4782f47b..9dddfad9d2ef 100644
--- a/pkgs/development/python-modules/wifi/default.nix
+++ b/pkgs/development/python-modules/wifi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rockymeza";
-    repo = pname;
+    repo = "wifi";
     rev = "v${version}";
     hash = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E=";
   };
diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix
index 3b5565955bdd..aea0f4bd08c1 100644
--- a/pkgs/development/python-modules/xmind/default.nix
+++ b/pkgs/development/python-modules/xmind/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "zhuifengshen";
-    repo = pname;
+    repo = "xmind";
     rev = "v${version}";
     sha256 = "xC1WpHz2eHb5+xShM/QUQAIYnJNyK1EKWbTXJKhDwbQ=";
   };
diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix
index 56d514db4055..a2eabdc401c0 100644
--- a/pkgs/development/python-modules/xpath-expressions/default.nix
+++ b/pkgs/development/python-modules/xpath-expressions/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "orf";
-    repo = pname;
+    repo = "xpath-expressions";
     rev = "v${version}";
     hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA=";
   };
diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix
index 631cf33a77c2..a23cd81e7c79 100644
--- a/pkgs/development/python-modules/xpybutil/default.nix
+++ b/pkgs/development/python-modules/xpybutil/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   # Pypi only offers a wheel
   src = fetchFromGitHub {
     owner = "BurntSushi";
-    repo = pname;
+    repo = "xpybutil";
     rev = version;
     sha256 = "17gbqq955fcl29aayn8l0x14azc60cxgkvdxblz9q8x3l50w0xpg";
   };
diff --git a/pkgs/development/python-modules/yaswfp/default.nix b/pkgs/development/python-modules/yaswfp/default.nix
index 45be71807178..55cc548c34ba 100644
--- a/pkgs/development/python-modules/yaswfp/default.nix
+++ b/pkgs/development/python-modules/yaswfp/default.nix
@@ -5,14 +5,14 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "yaswfp";
   version = "unstable-20210331";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "facundobatista";
-    repo = pname;
+    repo = "yaswfp";
     rev = "2a2cc6ca4c0b4d52bd2e658fb5f80fdc0db4924c";
     sha256 = "1dxdz89hlycy1rnn269fwl1f0qxgxqarkc0ivs2m77f8xba2qgj9";
   };
diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix
index 2235d7c56931..f704ee59221b 100644
--- a/pkgs/development/python-modules/zadnegoale/default.nix
+++ b/pkgs/development/python-modules/zadnegoale/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "bieniu";
-    repo = pname;
+    repo = "zadnegoale";
     tag = version;
     hash = "sha256-ij8xou8LXC4/BUTApIV6xSgb7ethwLyrHNJvBgxSBYM=";
   };
diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index 0d5d9894e943..02f0e6f803b6 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "zigpy";
-    repo = pname;
+    repo = "zigpy-deconz";
     tag = version;
     hash = "sha256-el29EqCK9p3AII9LsMw+ikplHfDKNUIhaU3HJI0gfu8=";
   };
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 22aa4294a376..d78132440c01 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "zigpy";
-    repo = pname;
+    repo = "zigpy-znp";
     tag = "v${version}";
     hash = "sha256-vYB04vEFqpqrjJMS73mtYXakp7lEIJjB+tT0SF9hpWM=";
   };
diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix
index 29d3998e52ac..d48384caa093 100644
--- a/pkgs/development/python-modules/zwave-me-ws/default.nix
+++ b/pkgs/development/python-modules/zwave-me-ws/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "Z-Wave-Me";
-    repo = pname;
+    repo = "zwave-me-ws";
     tag = "v${version}";
     hash = "sha256-bTchtgr+UbHCpcXMaQA3bTrhasJ79TguvAqLNlpD/2c=";
   };

From ab80816d9270654c3776100ad8e4df32d1d89474 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 25 May 2025 03:19:38 +0000
Subject: [PATCH 099/204] naev: 0.12.4 -> 0.12.5

Diff: https://github.com/naev/naev/compare/refs/tags/v0.12.4...refs/tags/v0.12.5
---
 pkgs/by-name/na/naev/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix
index 655f5b1725b4..970af62c4330 100644
--- a/pkgs/by-name/na/naev/package.nix
+++ b/pkgs/by-name/na/naev/package.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "naev";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "naev";
     repo = "naev";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CnpxgHliJK29H4QKDvRp/e0tssTuIZy8hcwQO0tInbg=";
+    hash = "sha256-I+OU3sr+C8HPnJTQ+Cc/EvshzawqikoMg3cp9uQ5dSQ=";
     fetchSubmodules = true;
   };
 

From b5410fd1d414491c1394c2af13492a15bc5e4e4d Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 25 May 2025 05:30:16 +0200
Subject: [PATCH 100/204] flashprog: Add changelog link to meta information

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/fl/flashprog/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix
index 446061807a86..29e01cf79b7c 100644
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     homepage = "https://flashprog.org";
     description = "Utility for reading, writing, erasing and verifying flash ROM chips";
+    changelog = "https://flashprog.org/wiki/Flashprog/v${finalAttrs.version}";
     license = with licenses; [ gpl2 ];
     maintainers = with maintainers; [
       felixsinger

From 69c74cb4387e5aa88d0c0443782b9fa6bd8469e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 19:36:20 +0000
Subject: [PATCH 101/204] python3Packages.snakemake-storage-plugin-fs: 1.1.1 ->
 1.1.2

---
 .../python-modules/snakemake-storage-plugin-fs/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
index 632f9da90058..ff7f167ccc5a 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-storage-plugin-fs";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-Y+Fofz4D/CWgdG3lOneadRu/VfJ23D4Dz751j9rUKNo=";
+    hash = "sha256-bTkT1D2GJGS+zWvK/BUGLGE8ArZQikHHcdQjREJhldg=";
   };
 
   build-system = [ poetry-core ];

From 47bcf810dfd76adf2145c68cedb544e858674e33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 03:44:15 +0000
Subject: [PATCH 102/204] tana: 1.0.30 -> 1.0.31

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

diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index 8fe1a292e727..49fc649df40e 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -62,7 +62,7 @@ let
     stdenv.cc.cc
     stdenv.cc.libc
   ];
-  version = "1.0.30";
+  version = "1.0.31";
 in
 stdenv.mkDerivation {
   pname = "tana";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
-    hash = "sha256-GKRfiVKUrMr6d4ZA/FAfHnyCzyYnIwhrAwKS7HvJU1U=";
+    hash = "sha256-+KJ2peQWb378h6nWmoj5J4zAmSi4AHvR6fqrjRC/c8w=";
   };
 
   nativeBuildInputs = [

From 658746009918ba76df5f475259be8a9133afbd52 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 25 May 2025 13:45:48 +0800
Subject: [PATCH 103/204] typstyle: 0.13.8 -> 0.13.9

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

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 05cd6c655b3a..c44d84075025 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.8";
+  version = "0.13.9";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6gR235YZrGfm0OtXTXY6NN/Yqxj9xlIasxdAYuO6z64=";
+    hash = "sha256-FQ/YBjhFaG9PGb8H3LnOlDcgWrYMy1VvFCHJlLEH32k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0aRVabVuzxRSw4bDfKryPYYbkPp9CYQafZ50kHjZ8pM=";
+  cargoHash = "sha256-btybQpV5Rl9qgd6+4U4smGpr1RqMlXN82m+N7nni2yA=";
 
   # Disabling tests requiring network access
   checkFlags = [

From 1f3163445011b667ea5ba8316b96a24c107f1802 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 05:54:11 +0000
Subject: [PATCH 104/204] github-mcp-server: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 396731ba4e12..0fc77714c2f1 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GXE6ZmCDPjDCpCrrX0DcDdcLVgM+hHVWzihMYqUQaSI=";
+    hash = "sha256-7bxphEQOewy7RZIfKp6aEIPvhgvq4AsU8FozsDsGVgM=";
   };
 
-  vendorHash = "sha256-SWzKE1pliZd3fQrbh8JpoepT/bKpZHuq7WZ8LEzNn50=";
+  vendorHash = "sha256-yUg+4Z8e9j4wpDD+5XG7pZFnxibGiI5Gks1CEQT2E3g=";
 
   ldflags = [
     "-s"

From 25d2690f74d0d69b28ae4b4847619c39ba684b5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 06:52:40 +0000
Subject: [PATCH 105/204] borgmatic: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index eb2f5b5a9673..4b8b1c0b746e 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "2.0.5";
+  version = "2.0.6";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jpaTLbDmwcL8ihu8XTD2LsSfmneBpOGSVaRcJyeSSo4=";
+    hash = "sha256-yxAtD7sKOo0voE8BvfL0HGsnP0L2sc1f0UgXBNt/aQU=";
   };
 
   passthru.updateScript = nix-update-script { };

From 975c19cb475dd1ca85453c8635a8b089f6b9a693 Mon Sep 17 00:00:00 2001
From: bas <github.plated100@passmail.net>
Date: Sun, 25 May 2025 09:58:22 +0200
Subject: [PATCH 106/204] nixos/scrutiny: change collector schedule to daily

---
 nixos/modules/services/monitoring/scrutiny.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix
index 909c2815d168..e418e59da2c2 100644
--- a/nixos/modules/services/monitoring/scrutiny.nix
+++ b/nixos/modules/services/monitoring/scrutiny.nix
@@ -147,7 +147,7 @@ in
 
         schedule = mkOption {
           type = str;
-          default = "*:0/15";
+          default = "daily";
           description = ''
             How often to run the collector in systemd calendar format.
           '';

From 35e5c22876c54a09d1fb1b6e60d8333c4d60fc2a Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sun, 25 May 2025 10:00:00 +0200
Subject: [PATCH 107/204] chickenPackages: fix meta.homepage

The old endpoint seems unreachable. We are now pointing to the wiki instead.

Closes #407648
---
 pkgs/development/compilers/chicken/5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix
index a3fe5a6da5ac..ec930ef13446 100644
--- a/pkgs/development/compilers/chicken/5/default.nix
+++ b/pkgs/development/compilers/chicken/5/default.nix
@@ -40,7 +40,7 @@ lib.makeScope newScope (self: {
           name = "${pname}-${version}";
           src = self.fetchegg (eggData // { inherit pname; });
           buildInputs = map (x: eggself.${x}) dependencies;
-          meta.homepage = "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}";
+          meta.homepage = "https://wiki.call-cc.org/eggref/5/${pname}";
           meta.description = synopsis;
           meta.license =
             (

From fd25cbd7596cd8a6a338fcbbc1e91457b90fe7b6 Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sun, 25 May 2025 11:03:20 +0300
Subject: [PATCH 108/204] postgres-lsp: 0.6.0 -> 0.7.0

---
 pkgs/by-name/po/postgres-lsp/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix
index 20d486ca3cd7..dd2238068a49 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-lsp/package.nix
@@ -5,18 +5,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "postgres-lsp";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "supabase-community";
     repo = "postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-PL8irQ3R8m//BbtTjODBrBcG/bAdK+t6GZGAj0PkJwE=";
+    hash = "sha256-78DUSoJwh310TAO0a8usa6+IwZhDdOCNys9fEAky3VY=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-lUZpjX3HljOXi0Wt2xZCUru8uinWlngLEs5wlqfFiJA=";
+  cargoHash = "sha256-IxVuxDauxH3AzXirJ3Zq8QLSdUL3H3j/oSGqfNs0J20=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
@@ -35,6 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = [
     # Tries to write to the file system relatively to the current path
     "--skip=syntax_error"
+    # Requires a database connection
+    "--skip=test_cli_check_command"
   ];
 
   meta = {

From 51151cb06a33f75e648894989d775027349ecda5 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 12:07:54 +0200
Subject: [PATCH 109/204] cubeb: add pkg-config generation patch

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 ...cmake-add-pkg-config-file-generation.patch | 208 ++++++++++++++++++
 pkgs/by-name/cu/cubeb/package.nix             |  17 +-
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |  13 +-
 3 files changed, 220 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch

diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch b/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch
new file mode 100644
index 000000000000..018ec29358f4
--- /dev/null
+++ b/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch
@@ -0,0 +1,208 @@
+From e0cbc1049b9a3a3322cd48d32af148f87d5007c2 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Mon, 19 May 2025 22:36:53 +0200
+Subject: [PATCH] cmake: add pkg-config file generation
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ libcubeb.pc.in | 12 ++++++++++++
+ 2 files changed, 62 insertions(+)
+ create mode 100644 libcubeb.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07618fa..6470837 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,6 +23,17 @@ if(NOT CMAKE_BUILD_TYPE)
+       "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif()
+ 
++set(private_requires)
++set(private_libs)
++set(private_libs_flags)
++if(UNIX AND NOT APPLE)
++  if(BSD OR ANDROID)
++    list(APPEND private_libs c++)
++  else()
++    list(APPEND private_libs stdc++)
++  endif()
++endif()
++
+ set(CMAKE_C_STANDARD 99)
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -141,6 +152,7 @@ if(NOT BUNDLE_SPEEX)
+     pkg_check_modules(speexdsp IMPORTED_TARGET speexdsp)
+     if(speexdsp_FOUND)
+       add_library(speex ALIAS PkgConfig::speexdsp)
++      list(APPEND private_requires speexdsp)
+     endif()
+   endif()
+ endif()
+@@ -155,6 +167,7 @@ if(NOT TARGET speex)
+     EXPORT=
+     RANDOM_PREFIX=speex
+   )
++  list(APPEND private_libs speex)
+ endif()
+ 
+ # $<BUILD_INTERFACE:> required because of https://gitlab.kitware.com/cmake/cmake/-/issues/15415
+@@ -166,6 +179,7 @@ include(CheckIncludeFiles)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads)
+ target_link_libraries(cubeb PRIVATE Threads::Threads)
++list(APPEND private_libs ${CMAKE_THREAD_LIBS_INIT})
+ 
+ if(LAZY_LOAD_LIBS)
+   check_include_files(pulse/pulseaudio.h USE_PULSE)
+@@ -176,6 +190,7 @@ if(LAZY_LOAD_LIBS)
+ 
+   if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO)
+     target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS})
++    list(APPEND private_libs ${CMAKE_DL_LIBS})
+ 
+     if(ANDROID)
+       target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
+@@ -191,6 +206,7 @@ else()
+     set(USE_PULSE ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
++    list(APPEND private_requires libpulse)
+   endif()
+ 
+   pkg_check_modules(alsa IMPORTED_TARGET alsa)
+@@ -198,6 +214,7 @@ else()
+     set(USE_ALSA ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
++    list(APPEND private_requires alsa)
+   endif()
+ 
+   pkg_check_modules(jack IMPORTED_TARGET jack)
+@@ -205,18 +222,21 @@ else()
+     set(USE_JACK ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::jack)
++    list(APPEND private_requires jack)
+   endif()
+ 
+   check_include_files(sndio.h USE_SNDIO)
+   if(USE_SNDIO)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
+     target_link_libraries(cubeb PRIVATE sndio)
++    list(APPEND private_libs sndio)
+   endif()
+ 
+   check_include_files(aaudio/AAudio.h USE_AAUDIO)
+   if(USE_AAUDIO)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
+     target_link_libraries(cubeb PRIVATE aaudio)
++    list(APPEND private_libs aaudio)
+   endif()
+ endif()
+ 
+@@ -263,6 +283,7 @@ if(USE_AUDIOUNIT)
+     src/cubeb_osx_run_loop.cpp)
+   target_compile_definitions(cubeb PRIVATE USE_AUDIOUNIT)
+   target_link_libraries(cubeb PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices")
++  list(APPEND private_libs_flags "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices")
+ endif()
+ 
+ check_include_files(audioclient.h USE_WASAPI)
+@@ -271,6 +292,7 @@ if(USE_WASAPI)
+     src/cubeb_wasapi.cpp)
+   target_compile_definitions(cubeb PRIVATE USE_WASAPI)
+   target_link_libraries(cubeb PRIVATE avrt ole32 ksuser)
++  list(APPEND private_libs avrt ole32 ksuser)
+ endif()
+ 
+ check_include_files("windows.h;mmsystem.h" USE_WINMM)
+@@ -279,6 +301,7 @@ if(USE_WINMM)
+     src/cubeb_winmm.c)
+   target_compile_definitions(cubeb PRIVATE USE_WINMM)
+   target_link_libraries(cubeb PRIVATE winmm)
++  list(APPEND private_libs winmm)
+ endif()
+ 
+ check_include_files(SLES/OpenSLES.h USE_OPENSL)
+@@ -288,6 +311,7 @@ if(USE_OPENSL)
+     src/cubeb-jni.cpp)
+   target_compile_definitions(cubeb PRIVATE USE_OPENSL)
+   target_link_libraries(cubeb PRIVATE OpenSLES)
++  list(APPEND private_libs OpenSLES)
+ endif()
+ 
+ check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
+@@ -303,6 +327,7 @@ if(HAVE_SYS_SOUNDCARD_H)
+       pkg_check_modules(libbsd-overlay IMPORTED_TARGET libbsd-overlay)
+       if(libbsd-overlay_FOUND)
+         target_link_libraries(cubeb PRIVATE PkgConfig::libbsd-overlay)
++        list(APPEND private_requires libbsd-overlay)
+         set(HAVE_STRLCPY true)
+       endif()
+     endif()
+@@ -320,6 +345,7 @@ if(USE_AUDIOTRACK)
+     src/cubeb_audiotrack.c)
+   target_compile_definitions(cubeb PRIVATE USE_AUDIOTRACK)
+   target_link_libraries(cubeb PRIVATE log)
++  list(APPEND private_libs log)
+ endif()
+ 
+ check_include_files(sys/audioio.h USE_SUN)
+@@ -335,6 +361,7 @@ if(USE_KAI)
+     src/cubeb_kai.c)
+   target_compile_definitions(cubeb PRIVATE USE_KAI)
+   target_link_libraries(cubeb PRIVATE kai)
++  list(APPEND private_libs kai)
+ endif()
+ 
+ if(USE_PULSE AND USE_PULSE_RUST)
+@@ -452,3 +479,26 @@ add_custom_target(clang-format-check
+   | xargs -0 ${CLANG_FORMAT_BINARY} -Werror -n
+   COMMENT "Check formatting with clang-format"
+   VERBATIM)
++
++
++list(TRANSFORM private_libs PREPEND "-l")
++string(JOIN " " CUBEB_PC_PRIVATE_LIBS ${private_libs} ${private_libs_flags})
++
++string(JOIN " " CUBEB_PC_PRIVATE_REQUIRES ${private_requires})
++
++if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
++  set(CUBEB_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
++else()
++  set(CUBEB_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
++endif()
++if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
++  set(CUBEB_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
++else()
++  set(CUBEB_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
++endif()
++
++configure_file(libcubeb.pc.in libcubeb.pc @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcubeb.pc"
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
++)
++
+diff --git a/libcubeb.pc.in b/libcubeb.pc.in
+new file mode 100644
+index 0000000..2310ae6
+--- /dev/null
++++ b/libcubeb.pc.in
+@@ -0,0 +1,12 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=@CUBEB_PC_LIBDIR@
++includedir=@CUBEB_PC_INCLUDEDIR@
++
++Name: libcubeb
++Description: Cross platform audio library
++Version: @PROJECT_VERSION@
++Requires.private: @CUBEB_PC_PRIVATE_REQUIRES@
++Libs: -L${libdir} -lcubeb
++Libs.private: @CUBEB_PC_PRIVATE_LIBS@
++Cflags: -I${includedir}
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index f7fbe0c796f3..d305471b51d4 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ speexdsp ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) backendLibs;
 
+  patches = [
+    # https://github.com/mozilla/cubeb/pull/813
+    ./0001-cmake-add-pkg-config-file-generation.patch
+  ];
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" buildSharedLibs)
     "-DBUILD_TESTS=OFF" # tests require an audio server
@@ -64,18 +69,6 @@ stdenv.mkDerivation {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };
 
-  postInstall = ''
-    # TODO: remove after https://github.com/mozilla/cubeb/pull/813 is merged
-    mkdir -p $out/lib/pkgconfig/
-    echo > $out/lib/pkgconfig/libcubeb.pc \
-    "Name: libcubeb
-    Description: Cross platform audio library
-    Version: 0.0.0
-    Requires.private: libpulse
-    Libs: -L"$out/lib" -lcubeb
-    Libs.private: -lstdc++"
-  '';
-
   meta = with lib; {
     description = "Cross platform audio library";
     mainProgram = "cubeb-test";
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 9c2cb97be71c..598856fd35a2 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -7,7 +7,6 @@
   webrtc,
   pkg-config,
   cubeb,
-  libpulseaudio,
 }:
 let
   cubeb' = cubeb.override {
@@ -49,11 +48,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cmake
     pkg-config
   ];
-  buildInputs = [
-    webrtc
-    cubeb'
-    libpulseaudio
-  ];
+  buildInputs =
+    [
+      webrtc
+      cubeb'
+    ]
+    # Workaround for https://github.com/NixOS/nixpkgs/pull/394607
+    ++ cubeb'.buildInputs;
 
   meta = {
     homepage = "https://github.com/signalapp/ringrtc";

From 027c07866fd8574746392e9bb6b5f2b78f444573 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 14:59:39 +0200
Subject: [PATCH 110/204] cubeb: split outputs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 ...t-hardcode-include-as-the-includedir.patch | 31 +++++++++++++++++++
 pkgs/by-name/cu/cubeb/package.nix             |  9 ++++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch

diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch
new file mode 100644
index 000000000000..9309495a4a93
--- /dev/null
+++ b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch
@@ -0,0 +1,31 @@
+From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Sat, 24 May 2025 16:20:51 +0200
+Subject: [PATCH] cmake: don't hardcode "include" as the includedir
+
+When the default CMAKE_INSTALL_INCLUDEDIR is changed
+headers are installed to a different location, however, the
+INTERFACE_INCLUDE_DIRECTORIES in exported cmake configuration still
+point to <prefix>/include.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07618fa..bdf2212 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -91,7 +91,7 @@ add_library(cubeb
+   src/cubeb_utils.cpp
+ )
+ target_include_directories(cubeb
+-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
++  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ )
+ set_target_properties(cubeb PROPERTIES
+   VERSION ${cubeb_VERSION}
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index d305471b51d4..0780f7630e09 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -41,6 +41,12 @@ stdenv.mkDerivation {
     hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo=";
   };
 
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -51,6 +57,9 @@ stdenv.mkDerivation {
   patches = [
     # https://github.com/mozilla/cubeb/pull/813
     ./0001-cmake-add-pkg-config-file-generation.patch
+
+    # https://github.com/mozilla/cubeb/pull/814
+    ./0001-cmake-don-t-hardcode-include-as-the-includedir.patch
   ];
 
   cmakeFlags = [

From 05404c271c1859d871ab4fd5e17d337b3882604a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 16:41:47 +0200
Subject: [PATCH 111/204] cubeb: use cmakeBool for cmake flags

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 0780f7630e09..1abb55a381d0 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -64,12 +64,12 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" buildSharedLibs)
-    "-DBUILD_TESTS=OFF" # tests require an audio server
-    "-DBUNDLE_SPEEX=OFF"
-    "-DUSE_SANITIZERS=OFF"
+    (lib.cmakeBool "BUILD_TESTS" false) # tests require an audio server
+    (lib.cmakeBool "BUNDLE_SPEEX" false)
+    (lib.cmakeBool "USE_SANITIZERS" false)
 
     # Whether to lazily load libraries with dlopen()
-    "-DLAZY_LOAD_LIBS=${if lazyLoad then "ON" else "OFF"}"
+    (lib.cmakeBool "LAZY_LOAD_LIBS" lazyLoad)
   ];
 
   passthru = {

From 2fb8e7424aecda596e2298c25cd2361df938bcdb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 17:47:11 +0200
Subject: [PATCH 112/204] cubeb: disable lazy loading

Lazy loading is primarily useful when distributing binaries to systems
that may not have the libraries installed. This is not the case for the
nixpkgs and its usage complicates dependent derivations.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 1abb55a381d0..88bc7eadd748 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -10,7 +10,6 @@
   libpulseaudio,
   sndio,
   speexdsp,
-  lazyLoad ? !stdenv.hostPlatform.isDarwin,
   alsaSupport ? !stdenv.hostPlatform.isDarwin,
   pulseSupport ? !stdenv.hostPlatform.isDarwin,
   jackSupport ? !stdenv.hostPlatform.isDarwin,
@@ -18,18 +17,6 @@
   buildSharedLibs ? true,
 }:
 
-assert lib.assertMsg (
-  stdenv.hostPlatform.isDarwin -> !lazyLoad
-) "cubeb: lazyLoad is inert on Darwin";
-
-let
-  backendLibs =
-    lib.optional alsaSupport alsa-lib
-    ++ lib.optional jackSupport jack2
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional sndioSupport sndio;
-
-in
 stdenv.mkDerivation {
   pname = "cubeb";
   version = "0-unstable-2025-04-02";
@@ -52,7 +39,14 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs = [ speexdsp ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) backendLibs;
+  buildInputs =
+    [ speexdsp ]
+    # In the default configuration these inputs are lazy-loaded. If your package builds a vendored cubeb please make
+    # sure to include these in the runtime LD path.
+    ++ lib.optional alsaSupport alsa-lib
+    ++ lib.optional jackSupport jack2
+    ++ lib.optional pulseSupport libpulseaudio
+    ++ lib.optional sndioSupport sndio;
 
   patches = [
     # https://github.com/mozilla/cubeb/pull/813
@@ -69,12 +63,12 @@ stdenv.mkDerivation {
     (lib.cmakeBool "USE_SANITIZERS" false)
 
     # Whether to lazily load libraries with dlopen()
-    (lib.cmakeBool "LAZY_LOAD_LIBS" lazyLoad)
+    (lib.cmakeBool "LAZY_LOAD_LIBS" false)
   ];
 
   passthru = {
     # For downstream users when lazyLoad is true
-    backendLibs = lib.optionals lazyLoad backendLibs;
+    backendLibs = [ ];
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };
 

From ec5887903e975835f1bc4f97926ee7e8a0caf84e Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 18:17:21 +0200
Subject: [PATCH 113/204] rpcs3: use cubeb from nixpkgs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 ...cmake-add-option-to-use-system-cubeb.patch | 46 +++++++++++++++++++
 pkgs/by-name/rp/rpcs3/package.nix             |  6 ++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch

diff --git a/pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch b/pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch
new file mode 100644
index 000000000000..0ae9f29ca514
--- /dev/null
+++ b/pkgs/by-name/rp/rpcs3/0001-cmake-add-option-to-use-system-cubeb.patch
@@ -0,0 +1,46 @@
+From 5af2b630da7a6a450ec6bc4f07fc7ad9a825361d Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Sat, 24 May 2025 18:51:09 +0200
+Subject: [PATCH] cmake: add option to use system cubeb
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ 3rdparty/CMakeLists.txt | 9 ++++++++-
+ CMakeLists.txt          | 1 +
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index 044fd464e..6c49a889b 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -131,7 +131,14 @@ add_subdirectory(stblib)
+ add_subdirectory(discord-rpc)
+ 
+ # Cubeb
+-add_subdirectory(cubeb EXCLUDE_FROM_ALL)
++if(USE_SYSTEM_CUBEB)
++	find_package(cubeb REQUIRED GLOBAL)
++	message(STATUS "Using system cubeb version '${cubeb_VERSION}'")
++	add_library(3rdparty::cubeb ALIAS cubeb::cubeb)
++else()
++	message(STATUS "Using static cubeb from 3rdparty")
++	add_subdirectory(cubeb EXCLUDE_FROM_ALL)
++endif()
+ 
+ # SoundTouch
+ add_subdirectory(SoundTouch EXCLUDE_FROM_ALL)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d2edd836..39aa150c2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,6 +31,7 @@ option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
+ option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON)
+ option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
+ option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON)
++option(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF)
+ option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF)
+ option(USE_LTO "Use LTO for building" ON)
+ option(BUILD_RPCS3_TESTS "Build RPCS3 unit tests." OFF)
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 2c00a3dc91d6..93166a211e2f 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -63,6 +63,9 @@ stdenv.mkDerivation {
   patches = [
     # Modified from https://github.com/RPCS3/rpcs3/pull/17009; doesn't apply cleanly due to intermediate commits
     ./fix-qt6.9-compilation.patch
+
+    # https://github.com/RPCS3/rpcs3/pull/17246
+    ./0001-cmake-add-option-to-use-system-cubeb.patch
   ];
 
   passthru.updateScript = ./update.sh;
@@ -89,6 +92,7 @@ stdenv.mkDerivation {
     (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true)
     (lib.cmakeBool "USE_SYSTEM_SDL" true)
     (lib.cmakeBool "USE_SYSTEM_OPENCV" true)
+    (lib.cmakeBool "USE_SYSTEM_CUBEB" true)
     (lib.cmakeBool "USE_SDL" true)
     (lib.cmakeBool "WITH_LLVM" true)
     (lib.cmakeBool "BUILD_LLVM" false)
@@ -130,8 +134,8 @@ stdenv.mkDerivation {
       llvm_18
       libSM
       opencv
+      cubeb
     ]
-    ++ cubeb.passthru.backendLibs
     ++ lib.optional faudioSupport faudio
     ++ lib.optionals waylandSupport [
       wayland

From 9d9fc4258d0816251396b747ed7be126c01d507a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 18:17:21 +0200
Subject: [PATCH 114/204] pcsx2: use cubeb from nixpkgs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/pc/pcsx2/package.nix             | 27 ++++++++++++-----
 .../pc/pcsx2/remove-cubeb-vendor.patch        | 29 +++++++++++++++++++
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch

diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 9aaf2bbedb34..e8375dc46f57 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -25,6 +25,7 @@
   wayland,
   zip,
   zstd,
+  fetchpatch,
 }:
 
 let
@@ -36,6 +37,16 @@ let
     qtwayland
     wrapQtAppsHook
     ;
+
+  cubeb' = cubeb.overrideAttrs (old: {
+    patches = (old.patches or [ ]) ++ [
+      (fetchpatch {
+        url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch";
+        stripLen = 2;
+        hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ=";
+      })
+    ];
+  });
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   inherit (sources.pcsx2) pname version src;
@@ -43,6 +54,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Remove PCSX2_GIT_REV
     ./0000-define-rev.patch
+
+    ./remove-cubeb-vendor.patch
   ];
 
   cmakeFlags = [
@@ -80,7 +93,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
     wayland
     zstd
-  ] ++ cubeb.passthru.backendLibs;
+    cubeb'
+  ];
 
   strictDeps = true;
 
@@ -94,13 +108,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   qtWrapperArgs =
     let
-      libs = lib.makeLibraryPath (
-        [
-          vulkan-loader
-          shaderc
-        ]
-        ++ cubeb.passthru.backendLibs
-      );
+      libs = lib.makeLibraryPath ([
+        vulkan-loader
+        shaderc
+      ]);
     in
     [ "--prefix LD_LIBRARY_PATH : ${libs}" ];
 
diff --git a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch
new file mode 100644
index 000000000000..2c98f22746dd
--- /dev/null
+++ b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch
@@ -0,0 +1,29 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index ff66f9c..e177c90 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -100,9 +100,8 @@ if(USE_VULKAN)
+ 	add_subdirectory(3rdparty/vulkan EXCLUDE_FROM_ALL)
+ endif()
+ 
+-add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL)
+-disable_compiler_warnings_for_target(cubeb)
+-disable_compiler_warnings_for_target(speex)
++find_package(cubeb REQUIRED GLOBAL)
++add_library(cubeb ALIAS cubeb::cubeb)
+ 
+ # Find the Qt components that we need.
+ find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp
+index 4cd9993..604635d 100644
+--- a/pcsx2/Host/CubebAudioStream.cpp
++++ b/pcsx2/Host/CubebAudioStream.cpp
+@@ -288,7 +288,7 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+ 	std::vector<std::pair<std::string, std::string>> names;
+ 	names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
+ 
+-	const char** cubeb_names = cubeb_get_backend_names();
++	const char* const* cubeb_names = cubeb_get_backend_names();
+ 	for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+ 		names.emplace_back(cubeb_names[i], cubeb_names[i]);
+ 

From 709d5b4e5c3554764aea4cb01dbb3f1f305e0974 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 18:17:21 +0200
Subject: [PATCH 115/204] duckstation: use cubeb from nixpkgs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/du/duckstation/package.nix       | 19 +++++-------
 .../du/duckstation/remove-cubeb-vendor.patch  | 29 +++++++++++++++++++
 pkgs/by-name/du/duckstation/sources.nix       | 12 ++++++++
 3 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch

diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 7f5705a5bd7c..e4c39a397c6a 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -6,9 +6,7 @@
   callPackage,
   cmake,
   cpuinfo,
-  cubeb,
   curl,
-  discord-rpc,
   extra-cmake-modules,
   libXrandr,
   libbacktrace,
@@ -42,6 +40,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     ./002-hardcode-vars.diff
     # Fix NEON intrinsics usage
     ./003-fix-NEON-intrinsics.patch
+    ./remove-cubeb-vendor.patch
   ];
 
   nativeBuildInputs = [
@@ -57,6 +56,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     cpuinfo
+    sources.cubeb
     curl
     libXrandr
     libbacktrace
@@ -70,7 +70,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     sources.soundtouch-patched
     sources.spirv-cross-patched
     wayland
-  ] ++ cubeb.passthru.backendLibs;
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_TESTS" true)
@@ -115,14 +115,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   qtWrapperArgs =
     let
-      libPath = lib.makeLibraryPath (
-        [
-          sources.shaderc-patched
-          sources.spirv-cross-patched
-          vulkan-loader
-        ]
-        ++ cubeb.passthru.backendLibs
-      );
+      libPath = lib.makeLibraryPath ([
+        sources.shaderc-patched
+        sources.spirv-cross-patched
+        vulkan-loader
+      ]);
     in
     [
       "--prefix LD_LIBRARY_PATH : ${libPath}"
diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
new file mode 100644
index 000000000000..b28d522cbd50
--- /dev/null
+++ b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
@@ -0,0 +1,29 @@
+diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
+index af35687..8347825 100644
+--- a/dep/CMakeLists.txt
++++ b/dep/CMakeLists.txt
+@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL)
+ disable_compiler_warnings_for_target(rcheevos)
+ add_subdirectory(rapidyaml EXCLUDE_FROM_ALL)
+ disable_compiler_warnings_for_target(rapidyaml)
+-add_subdirectory(cubeb EXCLUDE_FROM_ALL)
+-disable_compiler_warnings_for_target(cubeb)
+-disable_compiler_warnings_for_target(speex)
++find_package(cubeb REQUIRED GLOBAL)
++add_library(cubeb ALIAS cubeb::cubeb)
+ add_subdirectory(kissfft EXCLUDE_FROM_ALL)
+ disable_compiler_warnings_for_target(kissfft)
+ 
+diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
+index 85579c4..526d168 100644
+--- a/src/util/cubeb_audio_stream.cpp
++++ b/src/util/cubeb_audio_stream.cpp
+@@ -261,7 +261,7 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+   std::vector<std::pair<std::string, std::string>> names;
+   names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
+ 
+-  const char** cubeb_names = cubeb_get_backend_names();
++  const char*const * cubeb_names = cubeb_get_backend_names();
+   for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+     names.emplace_back(cubeb_names[i], cubeb_names[i]);
+   return names;
diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix
index 228bcbc2aaba..42a24ede16c5 100644
--- a/pkgs/by-name/du/duckstation/sources.nix
+++ b/pkgs/by-name/du/duckstation/sources.nix
@@ -9,6 +9,7 @@
   stdenv,
   cmake,
   ninja,
+  cubeb,
 }:
 
 {
@@ -163,4 +164,15 @@
       platforms = lib.platforms.linux;
     };
   });
+
+  cubeb = cubeb.overrideAttrs (old: {
+    pname = "cubeb-patched-for-duckstation";
+    patches = (old.patches or [ ]) ++ [
+      (fetchpatch {
+        url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch";
+        stripLen = 2;
+        hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ=";
+      })
+    ];
+  });
 }

From a0841af35739757d9526a72659de4e88de3639ac Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 18:17:21 +0200
Subject: [PATCH 116/204] treewide: remove cubeb.passthru.backendLibs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ce/cemu/package.nix  | 2 +-
 pkgs/by-name/cu/cubeb/package.nix | 2 --
 pkgs/by-name/qc/qcm/package.nix   | 6 +-----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 29a354635a6c..2d462dfa4594 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   preFixup =
     let
-      libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs;
+      libs = [ vulkan-loader ];
     in
     ''
       gappsWrapperArgs+=(
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 88bc7eadd748..9b6c1865c1af 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -67,8 +67,6 @@ stdenv.mkDerivation {
   ];
 
   passthru = {
-    # For downstream users when lazyLoad is true
-    backendLibs = [ ];
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };
 
diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix
index 9b8d9c92caa7..baffb0244316 100644
--- a/pkgs/by-name/qc/qcm/package.nix
+++ b/pkgs/by-name/qc/qcm/package.nix
@@ -40,17 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     ffmpeg
     cubeb
-  ] ++ cubeb.passthru.backendLibs;
+  ];
 
   # Correct qml import path
   postInstall = ''
     mv $out/lib/qt6 $out/lib/qt-6
   '';
 
-  qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}"
-  ];
-
   meta = {
     description = "Unofficial Qt client for netease cloud music";
     homepage = "https://github.com/hypengw/Qcm";

From 81dca3bb1e69fe9e6dc40514ce70bb741617a683 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 24 May 2025 23:11:16 +0200
Subject: [PATCH 117/204] cubeb: remove `with lib;` from meta

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 9b6c1865c1af..41b4d079600b 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -70,13 +70,13 @@ stdenv.mkDerivation {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform audio library";
     mainProgram = "cubeb-test";
     homepage = "https://github.com/mozilla/cubeb";
-    license = licenses.isc;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    license = lib.licenses.isc;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [
       zhaofengli
       marcin-serwin
     ];

From a5b3ae44a55fe759a675c175c99449ddc28b36c5 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 25 May 2025 09:28:51 +0200
Subject: [PATCH 118/204] cubeb: add pkg-config validation

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 41b4d079600b..2592fc06bc7c 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -10,6 +10,8 @@
   libpulseaudio,
   sndio,
   speexdsp,
+  validatePkgConfig,
+  testers,
   alsaSupport ? !stdenv.hostPlatform.isDarwin,
   pulseSupport ? !stdenv.hostPlatform.isDarwin,
   jackSupport ? !stdenv.hostPlatform.isDarwin,
@@ -17,7 +19,7 @@
   buildSharedLibs ? true,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
   version = "0-unstable-2025-04-02";
 
@@ -37,6 +39,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
+    validatePkgConfig
   ];
 
   buildInputs =
@@ -68,6 +71,7 @@ stdenv.mkDerivation {
 
   passthru = {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
   meta = {
@@ -80,5 +84,6 @@ stdenv.mkDerivation {
       zhaofengli
       marcin-serwin
     ];
+    pkgConfigModules = [ "libcubeb" ];
   };
-}
+})

From 0abfee4654187a82f2dba07b6cdf28b796988900 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 25 May 2025 10:10:01 +0200
Subject: [PATCH 119/204] cubeb: add pcsx2 and duckstation to tests

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 2592fc06bc7c..79c84d8ffa57 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -11,7 +11,12 @@
   sndio,
   speexdsp,
   validatePkgConfig,
+
+  # passthru.tests
   testers,
+  pcsx2,
+  duckstation,
+
   alsaSupport ? !stdenv.hostPlatform.isDarwin,
   pulseSupport ? !stdenv.hostPlatform.isDarwin,
   jackSupport ? !stdenv.hostPlatform.isDarwin,
@@ -71,7 +76,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
+    tests = {
+      # These packages depend on a patched version of cubeb
+      inherit pcsx2 duckstation;
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    };
   };
 
   meta = {

From 4291c6f20f44d60ee2b6d571c33632d8986265a8 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 25 May 2025 10:14:42 +0200
Subject: [PATCH 120/204] cubeb: don't build shared libs on static platforms

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cu/cubeb/package.nix          | 4 ++--
 pkgs/by-name/si/signal-desktop/ringrtc.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 79c84d8ffa57..764e763ee220 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -21,7 +21,7 @@
   pulseSupport ? !stdenv.hostPlatform.isDarwin,
   jackSupport ? !stdenv.hostPlatform.isDarwin,
   sndioSupport ? !stdenv.hostPlatform.isDarwin,
-  buildSharedLibs ? true,
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_SHARED_LIBS" buildSharedLibs)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
     (lib.cmakeBool "BUILD_TESTS" false) # tests require an audio server
     (lib.cmakeBool "BUNDLE_SPEEX" false)
     (lib.cmakeBool "USE_SANITIZERS" false)
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 598856fd35a2..782c518ea443 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -14,7 +14,7 @@ let
     pulseSupport = true;
     jackSupport = false;
     sndioSupport = false;
-    buildSharedLibs = false;
+    enableShared = false;
   };
 in
 rustPlatform.buildRustPackage (finalAttrs: {

From eb3dd361dad7dbec937de5e3919fa08b17e1adad Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Sun, 25 May 2025 10:20:27 +0200
Subject: [PATCH 121/204] niri: 25.05 -> 25.05.1

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

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index f866e1fa2af6..338564c76338 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -25,13 +25,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "niri";
-  version = "25.05";
+  version = "25.05.1";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI=";
+    hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tZp7AhhddEhKWzEUTgosxXMEzALbv6FxqnJEb9MBhzc=";
+  cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs=";
 
   strictDeps = true;
 

From f57fbc289bb4167a9606b2bb6feb653d73fa9357 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 03:26:42 +0000
Subject: [PATCH 122/204] roddhjav-apparmor-rules: 0-unstable-2025-05-14 ->
 0-unstable-2025-05-20

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

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 70ae5a6af2ba..9aae938e011a 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-05-14";
+  version = "0-unstable-2025-05-20";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "877452519d3138bd4a98dc7ef3cd3dec78a5b9dc";
-    hash = "sha256-uqtCB636qAe6c/dokLsbbTGw3oeo+93YhnGfPUwg7WI=";
+    rev = "707a5e8beec085376c6bc772352289ace86633d9";
+    hash = "sha256-tSn+Yymhx8rxbr81aVgoU83FESCfK4Sq01KfO88kzJQ=";
   };
 
   dontConfigure = true;

From 1e5d30a0baf37299906cc86aef16b3131a98af70 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 25 May 2025 10:07:34 +0200
Subject: [PATCH 123/204] monophony: 2.15.0 -> 3.3.3

---
 pkgs/by-name/mo/monophony/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 2b13dd852402..cd4c3903fa03 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -12,18 +12,19 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "monophony";
-  version = "2.15.0";
-  pyproject = false;
+  version = "3.3.3";
+  pyproject = true;
 
-  sourceRoot = "${src.name}/source";
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
     rev = "v${version}";
-    hash = "sha256-fC+XXOGBpG5pIQW1tCNtQaptBCyLM+YGgsZLjWrMoDA=";
+    hash = "sha256-ET0cygX/r/YXGWpPU01FnBoLRtjo1ddXEiVIva71aE8=";
   };
 
-  pythonPath = with python3Packages; [
+  sourceRoot = "${src.name}/source";
+
+  dependencies = with python3Packages; [
     mpris-server
     pygobject3
     ytmusicapi
@@ -52,10 +53,11 @@ python3Packages.buildPythonApplication rec {
       gstreamer
     ]);
 
-  # Makefile only contains `install`
-  dontBuild = true;
+  pythonRelaxDeps = [ "mpris_server" ];
 
-  installFlags = [ "prefix=$(out)" ];
+  postInstall = ''
+    make install prefix=$out
+  '';
 
   dontWrapGApps = true;
 

From e469cc78aefe3bbc7adeea7b0fae546a0085577d Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 25 May 2025 10:08:53 +0200
Subject: [PATCH 124/204] monophony: reformat meta

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

diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index cd4c3903fa03..986f0cd2ab4d 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -70,13 +70,13 @@ python3Packages.buildPythonApplication rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
-    homepage = "https://gitlab.com/zehkira/monophony";
+  meta = {
     description = "Linux app for streaming music from YouTube";
     longDescription = "Monophony is a free and open source Linux app for streaming music from YouTube. It has no ads and does not require an account.";
-    license = licenses.agpl3Plus;
+    homepage = "https://gitlab.com/zehkira/monophony";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ quadradical ];
     mainProgram = "monophony";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ quadradical ];
   };
 }

From 795fe553bff52a19f50e164e38c1f7727dace43b Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 25 May 2025 10:49:47 +0200
Subject: [PATCH 125/204] python3Packages.mpris-server: 0.4.2 -> 0.9.6

---
 .../python-modules/mpris-server/default.nix   | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/mpris-server/default.nix b/pkgs/development/python-modules/mpris-server/default.nix
index 06383416d96c..12c21f90cd9e 100644
--- a/pkgs/development/python-modules/mpris-server/default.nix
+++ b/pkgs/development/python-modules/mpris-server/default.nix
@@ -7,44 +7,38 @@
   pygobject3,
   unidecode,
   setuptools,
+  strenum,
 }:
 buildPythonPackage rec {
   pname = "mpris-server";
-  version = "0.4.2";
+  version = "0.9.6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "mpris_server";
     inherit version;
-    hash = "sha256-p3nM80fOMtRmeKvOXuX40Fu9xH8gPgYyneXbUS678fE=";
+    hash = "sha256-T0ZeDQiYIAhKR8aw3iv3rtwzc+R0PTQuIh6+Hi4rIHQ=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     emoji
     pydbus
     pygobject3
+    strenum
     unidecode
   ];
 
-  pythonRelaxDeps = [ "emoji" ];
-
   pythonImportsCheck = [ "mpris_server" ];
 
   # upstream has no tests
   doCheck = false;
 
-  # update doesn't support python311 and monophony, the only consumer requires
-  # 0.4.2
-  passthru.skipBulkUpdate = true;
-
-  meta = with lib; {
+  meta = {
     description = "Publish a MediaPlayer2 MPRIS device to D-Bus";
     homepage = "https://pypi.org/project/mpris-server/";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ quadradical ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ quadradical ];
   };
 }

From d0f4918a8ab578bf2813a5d8fd126752f8cca033 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 09:18:29 +0000
Subject: [PATCH 126/204] lunar-client: 3.3.7 -> 3.3.8

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

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index ef997de10d60..92dff5e16573 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.3.7";
+  version = "3.3.8";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
-    hash = "sha512-YnNqFuRRaRnVqNlD1VaWbx1TaTpD851altu9YamXX0q2ZohtGzB7lzE2xhllbS61E71jSUDasLUlbyyVqGTrJw==";
+    hash = "sha512-H4v2fpOvjU8Cxxf0kxHf2CB/NwjarMp8EjjfGb2IbrVM0aXQQyvW+cHRwfsLnkyOxNYLWNC50Px0Ur/0rpj4bg==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From dd082b8161531372f6746da0859f62a17dbe814f Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 24 May 2025 01:56:14 +0200
Subject: [PATCH 127/204] jenkins: 2.492.3 -> 2.504.1

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index 97499533e82a..9a284e9e6881 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jenkins";
-  version = "2.492.3";
+  version = "2.504.1";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8=";
+    hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 18dc2804822355cc02d63d862973eb3d60d3f4c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 May 2025 05:56:27 +0000
Subject: [PATCH 128/204] python3Packages.testresources: 2.0.1 -> 2.0.2

---
 .../python-modules/testresources/default.nix  | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix
index 7d4710c74388..cb8d8458141c 100644
--- a/pkgs/development/python-modules/testresources/default.nix
+++ b/pkgs/development/python-modules/testresources/default.nix
@@ -1,42 +1,50 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pbr,
   fixtures,
   testtools,
-  unittestCheckHook,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "testresources";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417";
+  src = fetchFromGitHub {
+    owner = "testing-cabal";
+    repo = "testresources";
+    tag = version;
+    hash = "sha256-cdZObOgBOUxYg4IGUUMb6arlpb6NTU7w+EW700LKH4Y=";
   };
 
-  postPatch = ''
-    substituteInPlace testresources/tests/test_resourced_test_case.py \
-      --replace "failIf" "assertFalse"
-  '';
+  build-system = [
+    setuptools
+    pbr
+  ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ pbr ];
+  dependencies = [
+    pbr
+  ];
 
   nativeCheckInputs = [
     fixtures
     testtools
-    unittestCheckHook
+    pytestCheckHook
   ];
 
-  meta = with lib; {
+  env.PBR_VERSION = version;
+
+  meta = {
     description = "Pyunit extension for managing expensive test resources";
     homepage = "https://launchpad.net/testresources";
-    license = licenses.bsd2;
+    license = with lib.licenses; [
+      asl20 # or
+      bsd3
+    ];
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }

From aa852f2301984fb797532cc18aa050b6a3ee694b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 24 May 2025 14:17:01 +0200
Subject: [PATCH 129/204] cloud-hypervisor: 45.0 -> 46.0

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

diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index 442a83cf3e26..8fd36de84f8a 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloud-hypervisor";
-  version = "45.0";
+  version = "46.0";
 
   src = fetchFromGitHub {
     owner = "cloud-hypervisor";
     repo = "cloud-hypervisor";
     rev = "v${version}";
-    hash = "sha256-PmgHO3gRE/LfLiRC+sAQXKUeclweVUNJV2ihpkvx0Wg=";
+    hash = "sha256-3jFZgcTyjbAB4Ka8ZHeqorlVTkAvXJ2No32038xK0Pc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-h9ydLEp7GpW5jMkt5jObR09lPWGs+rmvdoEZntIZwxY=";
+  cargoHash = "sha256-Zllj6HGRgI1tT8EODGOpSgmw3F89ie9Y1hChTrvwskg=";
 
   separateDebugInfo = true;
 

From ae1c56ad7fbcf88c9899c3c83f0db258d339ef8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 19:31:23 +0000
Subject: [PATCH 130/204] python3Packages.optimum: 1.24.0 -> 1.25.3

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

diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix
index 43925f8ee7ab..dd5598b2d808 100644
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "optimum";
-  version = "1.24.0";
+  version = "1.25.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "optimum";
     tag = "v${version}";
-    hash = "sha256-0D/kHPUI+gM7IblA4ULs0JuGTNQVezIYg0SPD3ESukw=";
+    hash = "sha256-SVyGtWFI5GjfxbaVKICf+QSSMYI62dDVMzphu8TngvY=";
   };
 
   build-system = [ setuptools ];

From c2509dc9db837388da9664479b824f2dc08ea3b6 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 25 May 2025 12:49:53 +0200
Subject: [PATCH 131/204] python3Packages.optimum: update optional dependencies

---
 .../development/python-modules/optimum/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix
index dd5598b2d808..3ff806860f45 100644
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@@ -17,7 +17,6 @@
 
   # optional-dependencies
   diffusers,
-  evaluate,
   h5py,
   onnx,
   onnxruntime,
@@ -56,24 +55,25 @@ buildPythonPackage rec {
   optional-dependencies = {
     onnxruntime = [
       onnx
-      onnxruntime
       datasets
-      evaluate
       protobuf
+      onnxruntime
     ];
     exporters = [
       onnx
-      onnxruntime
       timm
+      onnxruntime
+      protobuf
     ];
     exporters-tf = [
-      tensorflow
-      tf2onnx
       onnx
-      onnxruntime
       timm
       h5py
+      tf2onnx
+      onnxruntime
       numpy
+      datasets
+      tensorflow
     ];
     diffusers = [ diffusers ];
     intel = [

From ab979f479674883b70e37dc7bc8bb19daefe76d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 11:04:36 +0000
Subject: [PATCH 132/204] libretro.mgba: 0-unstable-2025-02-17 ->
 0-unstable-2025-05-18

---
 pkgs/applications/emulators/libretro/cores/mgba.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/mgba.nix b/pkgs/applications/emulators/libretro/cores/mgba.nix
index 0073417c651c..8cf1ea735ac6 100644
--- a/pkgs/applications/emulators/libretro/cores/mgba.nix
+++ b/pkgs/applications/emulators/libretro/cores/mgba.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mgba";
-  version = "0-unstable-2025-02-17";
+  version = "0-unstable-2025-05-18";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mgba";
-    rev = "88b22735dbdbc4d6236ed872ef21ea1b4d2fc492";
-    hash = "sha256-ouwtL8vfc1LFMjfIZQ4F/ZOBW4y3VU9zovkXug0fgZY=";
+    rev = "c9bbf28b091c4c104485092279c7a6b114b2e8ff";
+    hash = "sha256-yCRM2qkacGbFVr6x0ZHBCZ8xAMruFENBdcnNKzK0sY4=";
   };
 
   meta = {

From 96c3a525927c3e484e5105dcd37f71e0b8e14d68 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 6 Apr 2025 20:16:23 +0200
Subject: [PATCH 133/204] gtkmm3: update homepage

---
 pkgs/development/libraries/gtkmm/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 16f0af732552..0796522a5660 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
       tutorial.
     '';
 
-    homepage = "https://gtkmm.org/";
+    homepage = "https://gtkmm.gnome.org/";
 
     license = licenses.lgpl2Plus;
 

From c5f3529083d802375f4851bb2a5f10c528fc6486 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 May 2025 18:20:02 +0000
Subject: [PATCH 134/204] python3Packages.flufl-lock: 8.1.0 -> 8.2.0

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

diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix
index f11178381f4b..36ef3c86a329 100644
--- a/pkgs/development/python-modules/flufl/lock.nix
+++ b/pkgs/development/python-modules/flufl/lock.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "flufl-lock";
-  version = "8.1.0";
+  version = "8.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "flufl_lock";
     inherit version;
-    hash = "sha256-2IMCAFaSpj2YtgCAFY+vCJvl7K5pafcGQJ2oJ2/c58s=";
+    hash = "sha256-FbMzw1+rGjayI4QAVyWK60zXnw+6+CwUTyPN9s8U1eM=";
   };
 
   build-system = [ hatchling ];

From 4bd7a0155f8fd5f3d0ec12abb1d4915cd42bc23c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 11:54:54 +0000
Subject: [PATCH 135/204] servo: 0-unstable-2025-05-15 -> 0-unstable-2025-05-25

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

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 3ad024bea40e..103d7283f1e8 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -61,13 +61,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-05-15";
+  version = "0-unstable-2025-05-25";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "103cbed928b0b9ecd7084b5e9dcab135eca19327";
-    hash = "sha256-TMrtD7f0bay6NtodM3SZfi8tLCQp6dE5iBicyGXZAco=";
+    rev = "3a04f4195eb650f092c44d5a05fee178b9e84fbe";
+    hash = "sha256-7dbt7h4qUPWgsKBt0wo9by6yTB4034SzlzdqMXmw2Xg=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-7PTrE2FA2cvOKU35qTYBr7cop65gWY+zSOVlDZiJdow=";
+  cargoHash = "sha256-XTtM7yU1kpzK2cspnYdgp7yrt4Xk7xeQ98rmBgu46Tg=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 35df7fd7276c6197364aff797f577fae7d7dc887 Mon Sep 17 00:00:00 2001
From: Gerardo Doro <gerrydoro97@gmail.com>
Date: Sun, 25 May 2025 11:59:57 +0000
Subject: [PATCH 136/204] openvscode-server: add bendlas as maintainer

Co-authored-by: Herwig Hochleitner <herwig@bendlas.net>
---
 pkgs/servers/openvscode-server/default.nix    | 299 ++++++++----------
 .../remove-node-download.patch                |  30 --
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 141 insertions(+), 192 deletions(-)
 delete mode 100644 pkgs/servers/openvscode-server/remove-node-download.patch

diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index e0637893c92f..945119f5a86e 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -9,9 +9,7 @@
   jq,
   git,
   pkg-config,
-  yarn,
-  python3,
-  esbuild,
+  runCommand,
   nodejs,
   node-gyp,
   libsecret,
@@ -20,17 +18,11 @@
   ripgrep,
   cctools,
   nixosTests,
+  prefetch-npm-deps,
 }:
-
 let
-  system = stdenv.hostPlatform.system;
 
-  yarn' = yarn.override { inherit nodejs; };
-  defaultYarnOpts = [
-    "frozen-lockfile"
-    "non-interactive"
-    "no-progress"
-  ];
+  system = stdenv.hostPlatform.system;
 
   vsBuildTarget =
     {
@@ -41,74 +33,76 @@ let
     }
     .${system} or (throw "Unsupported system ${system}");
 
-  esbuild' = esbuild.override {
-    buildGoModule =
-      args:
-      buildGoModule (
-        args
-        // rec {
-          version = "0.17.14";
-          src = fetchFromGitHub {
-            owner = "evanw";
-            repo = "esbuild";
-            rev = "v${version}";
-            hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA=";
-          };
-          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-        }
-      );
-  };
-
-  # replaces esbuild's download script with a binary from nixpkgs
-  patchEsbuild = path: version: ''
-    mkdir -p ${path}/node_modules/esbuild/bin
-    jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json
-    sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js
-    ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild
-  '';
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openvscode-server";
-  version = "1.88.1";
+  version = "1.99.3";
 
   src = fetchFromGitHub {
     owner = "gitpod-io";
     repo = "openvscode-server";
     rev = "openvscode-server-v${finalAttrs.version}";
-    hash = "sha256-Yc16L13Z8AmsGoSFbvy+4+KBdHxvqLMwZLeU2/dAQVU=";
+    hash = "sha256-nA+StCJgutWjD7vgCCcj9B91QSF7dEHnlNtj7zgJRwI=";
   };
 
-  yarnCache = stdenv.mkDerivation {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache";
-    inherit (finalAttrs) src;
-    nativeBuildInputs = [
-      cacert
-      yarn'
-      git
-    ];
-    buildPhase = ''
-      export HOME=$PWD
+  ## fetchNpmDeps doesn't correctly process git dependencies
+  ## presumably because of https://github.com/npm/cli/issues/5170
+  ## therefore, we're fetching all the node_module folders into
+  ## a single FOD, and unpack it in configurePhase
+  nodeModules =
+    runCommand "openvscode-server-node-modules"
+      {
+        inherit (finalAttrs) src nativeBuildInputs;
+        outputHashMode = "recursive";
+        outputHashAlgo = "sha256";
+        outputHash = "sha256-lgzNpWFAIGNxjDZ60kRw80fP1qEItk3FN1s5t7KdxGA=";
+        env = {
+          FORCE_EMPTY_CACHE = true;
+          FORCE_GIT_DEPS = true;
+          npm_config_progress = false;
+          npm_config_cafile = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+        };
+      }
+      ''
+        runPhase unpackPhase
+        export HOME=$TMPDIR/home
+        mkdir $out
+        for p in $(find -name package-lock.json)
+        do (
+          ${prefetch-npm-deps}/bin/prefetch-npm-deps "$p" "$out"
+          local lockpath=$out/lockfiles/$p
+          mkdir -p "$(dirname $lockpath)"
+          mv $out/package-lock.json "$lockpath"
+        )
+        done
+      '';
 
-      yarn config set yarn-offline-mirror $out
-      find "$PWD" -name "yarn.lock" -printf "%h\n" | \
-        xargs -I {} yarn --cwd {} \
-          --frozen-lockfile --ignore-scripts --ignore-platform \
-          --ignore-engines --no-progress --non-interactive
-    '';
+  env = {
+    NODE_OPTIONS = "--openssl-legacy-provider";
+    NODE_ENV = "development";
 
-    installPhase = ''
-      echo yarnCache
-    '';
+    # skip unnecessary binary downloads
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+    # ensure the correct node-gyp (from nixpkgs) is used
+    NIX_NODEJS_BUILDNPMPACKAGE = "1";
+    npm_config_nodedir = nodejs;
+    npm_config_node_gyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js";
+
+    # use local npm cache (see <nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh>)
+    npm_config_cache = finalAttrs.nodeModules;
+    npm_config_offline = true;
+    npm_config_progress = false;
+
+    # for --fixup-lockfile
+    prefetchNpmDeps = "${prefetch-npm-deps}/bin/prefetch-npm-deps";
+    forceGitDeps = true;
 
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-    outputHash = "sha256-89c6GYLT2RzHqwxBKegYqB6g5rEJ6/nH53cnfV7b0Ts=";
   };
-
   nativeBuildInputs = [
     nodejs
-    yarn'
-    python3
+    nodejs.python
     pkg-config
     makeWrapper
     git
@@ -127,113 +121,101 @@ stdenv.mkDerivation (finalAttrs: {
       cctools
     ];
 
-  patches = [
-    # Patch out remote download of nodejs from build script
-    ./remove-node-download.patch
-  ];
-
-  # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0.
-  env.NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT";
-
-  postPatch = ''
-    export HOME=$PWD
-
-    # remove all built-in extensions, as these are 3rd party extensions that
-    # get downloaded from vscode marketplace
-    jq --slurp '.[0] * .[1]' "product.json" <(
-      cat << EOF
-    {
-      "builtInExtensions": []
-    }
-    EOF
-    ) | sponge product.json
-  '';
-
-  configurePhase = ''
-    runHook preConfigure
-
-    # set default yarn opts
-    ${lib.concatMapStrings (option: ''
-      yarn --offline config set ${option}
-    '') defaultYarnOpts}
-
-    # set offline mirror to yarn cache we created in previous steps
-    yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}"
-
-    # set nodedir to prevent node-gyp from downloading headers
-    # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific
-    mkdir -p $HOME/.node-gyp/${nodejs.version}
-    echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
-    ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
-    export npm_config_nodedir=${nodejs}
-
-    # use updated node-gyp. fixes the following error on Darwin:
-    # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil'
-    export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js
-
-    runHook postConfigure
-  '';
-
-  buildPhase =
+  # remove all built-in extensions, as these are 3rd party extensions that
+  # get downloaded from vscode marketplace
+  postPatch =
     ''
-      runHook preBuild
+      jq --slurp '.[0] * .[1]' "product.json" <(
+        cat << EOF
+      {
+        "builtInExtensions": []
+      }
+      EOF
+      ) | sponge product.json
+      echo "Updated product.json"
+    ''
+    ## build/lib/node.ts picks up nodejs version from remote/.npmrc
+    ## and prefetches it into .build/node/v{version}/{target}/node
+    ## so we pre-seed it here
+    + ''
+      sed -i 's/target=.*/target="${nodejs.version}"/' remote/.npmrc
+      mkdir -p .build/node/v${nodejs.version}/${vsBuildTarget}
+      ln -s ${nodejs}/bin/node .build/node/v${nodejs.version}/${vsBuildTarget}/node
+    '';
 
-      # install dependencies
-      yarn --offline --ignore-scripts
+  preConfigure = ''
+    export HOME=$TMPDIR/home
+    mkdir -p $HOME
+    mkdir -p $TMPDIR/cache/_cacache
+    # ln -s $nodeModules/_cacache/* $TMPDIR/cache/_cacache
+    # mkdir -p $TMPDIR/cache
+    cp -R $nodeModules/_cacache $TMPDIR/cache
+    chmod -R +w $TMPDIR/cache
+    export npm_config_cache=$TMPDIR/cache
+  '';
 
-      # run yarn install everywhere, skipping postinstall so we can patch esbuild
-      find . -path "*node_modules" -prune -o \
-        -path "./*/*" -name "yarn.lock" -printf "%h\n" | \
-          xargs -I {} yarn --cwd {} \
-            --frozen-lockfile --offline --ignore-scripts --ignore-engines
-
-      ${patchEsbuild "./build" "0.12.6"}
-      ${patchEsbuild "./extensions" "0.11.23"}
-
-      # patch shebangs of node_modules to allow binary packages to build
-      patchShebangs ./remote/node_modules
-
-      # put ripgrep binary into bin so postinstall does not try to download it
+  configurePhase =
+    ''
+      runHook preConfigure
+    ''
+    ## unpack all of the prefetched node_modules folders
+    + ''
+      for p in $(find -name package-lock.json -exec dirname {} \;)
+      do (
+        echo "Setting up $p/node_modules"
+        cd $p
+        if [ -e node_modules ]
+        then
+          echo >&2 "File exists $p/node_modules"
+          exit 0
+        fi
+        npm ci --ignore-scripts
+        patchShebangs node_modules
+      )
+      done
+    ''
+    ## put ripgrep binary into bin so postinstall does not try to download it
+    + ''
       find -path "*@vscode/ripgrep" -type d \
         -execdir mkdir -p {}/bin \; \
         -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
     ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+
-      # (see issue #101229)
-      pushd ./remote/node_modules/@parcel/watcher
-      mkdir -p ./build/Release
-      mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node
-      jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
-      popd
-    ''
+    ## pre-seed node-gyp
     + ''
-      export NODE_OPTIONS=--openssl-legacy-provider
-
-      # rebuild binaries, we use npm here, as yarn does not provide an alternative
-      # that would not attempt to try to reinstall everything and break our
-      # patching attempts
-      npm --prefix ./remote rebuild --build-from-source
-
-      # run postinstall scripts after patching
-      find . -path "*node_modules" -prune -o \
-        -path "./*/*" -name "yarn.lock" -printf "%h\n" | \
-          xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'
-
-      # build and minify
-      yarn --offline gulp vscode-reh-web-${vsBuildTarget}-min
-
-      runHook postBuild
+      mkdir -p $HOME/.node-gyp/${nodejs.version}
+      echo 11 > $HOME/.node-gyp/${nodejs.version}/installVersion
+      ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
+    ''
+    ## node-pty build fix
+    + ''
+      substituteInPlace remote/node_modules/node-pty/scripts/post-install.js \
+        --replace-fail "npx node-gyp" "$npm_config_node_gyp"
+    ''
+    ## rebuild native binaries
+    + ''
+      echo >&2 "Rebuilding from source in ./remote"
+      npm --offline --prefix ./remote rebuild --build-from-source
+    ''
+    ## run postinstall scripts
+    + ''
+      find -name package.json -type f -exec sh -c '
+        if jq -e ".scripts.postinstall" {} >-
+        then
+          echo >&2 "Running postinstall script in $(dirname {})"
+          npm --offline --prefix=$(dirname {}) run postinstall
+        fi
+        exit 0
+      ' \;
     '';
 
-  installPhase = ''
-    runHook preInstall
+  buildPhase = ''
+    npm run gulp vscode-reh-web-${vsBuildTarget}-min
+  '';
 
+  installPhase = ''
     mkdir -p $out
     cp -R -T ../vscode-reh-web-${vsBuildTarget} $out
-    ln -s ${nodejs}/bin/node $out
-
-    runHook postInstall
+    ln -sf ${nodejs}/bin/node $out
   '';
 
   passthru.tests = {
@@ -252,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
       dguenther
       ghuntley
       emilytrau
+      bendlas
     ];
     platforms = [
       "x86_64-linux"
@@ -259,8 +242,6 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
-    # Depends on nodejs_18 that has been removed.
-    broken = true;
     mainProgram = "openvscode-server";
   };
 })
diff --git a/pkgs/servers/openvscode-server/remove-node-download.patch b/pkgs/servers/openvscode-server/remove-node-download.patch
deleted file mode 100644
index f8df53770acc..000000000000
--- a/pkgs/servers/openvscode-server/remove-node-download.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 4630eaad3cc..96b165b0949 100644
---- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -271,9 +271,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- 			.pipe(util.stripSourceMappingURL())
- 			.pipe(jsFilter.restore);
-
--		const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;
--		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
--
- 		let web = [];
- 		if (type === 'reh-web') {
- 			web = [
-@@ -290,7 +287,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- 			license,
- 			sources,
- 			deps,
--			node,
- 			...web
- 		);
-
-@@ -408,7 +404,6 @@ function tweakProductForServerWeb(product) {
- 			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
-
- 			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
--				gulp.task(`node-${platform}-${arch}`),
- 				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
- 				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
- 			));
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1905b8625cf..21affad468e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14464,9 +14464,7 @@ with pkgs;
     vscode-generic = ../applications/editors/vscode/generic.nix;
   };
 
-  openvscode-server = callPackage ../servers/openvscode-server {
-    nodejs = nodejs_20;
-  };
+  openvscode-server = callPackage ../servers/openvscode-server { };
 
   code-server = callPackage ../servers/code-server {
     nodejs = nodejs_20;

From daeba3186a9b96aeb49998ec00736aed2abbe8b5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 May 2025 14:04:41 +0200
Subject: [PATCH 137/204] python313Packages.smolagents: 1.13.0 -> 1.16.1

Changelog: https://github.com/huggingface/smolagents/releases/tag/v1.16.1
---
 .../python-modules/smolagents/default.nix           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index c7a795e44ee1..f89b1a595f62 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   accelerate,
   buildPythonPackage,
+  boto3,
   docker,
   duckduckgo-search,
   fetchFromGitHub,
@@ -33,21 +34,19 @@
 
 buildPythonPackage rec {
   pname = "smolagents";
-  version = "1.13.0";
+  version = "1.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "smolagents";
     tag = "v${version}";
-    hash = "sha256-LZW2MsBowr2ttl3V5J3AlIxZijo++DwT02gBVaXXBXs=";
+    hash = "sha256-4G55fASE8D4UfqO7/j+2VjqdQ8FxFPLkYO2pl5sSlxw=";
   };
 
   build-system = [ setuptools ];
 
-  pythonRelaxDeps = [
-    "pillow"
-  ];
+  pythonRelaxDeps = [ "pillow" ];
 
   dependencies = [
     duckduckgo-search
@@ -63,6 +62,7 @@ buildPythonPackage rec {
 
   optional-dependencies = {
     audio = [ soundfile ];
+    bedrock = [ boto3 ];
     docker = [
       docker
       websocket-client
@@ -118,9 +118,10 @@ buildPythonPackage rec {
       "test_ddgs_with_kwargs"
       "test_e2b_executor_instantiation"
       "test_flatten_messages_as_text_for_all_models"
-      "test_from_mcp"
+      "mcp"
       "test_import_smolagents_without_extras"
       "test_vision_web_browser_main"
+      "test_multiple_servers"
       # Tests require network access
       "test_agent_type_output"
       "test_call_different_providers_without_key"

From a81cfab95226f0e2945a5068edb566dd28b2cc6e Mon Sep 17 00:00:00 2001
From: Gerardo Doro <gerrydoro97@gmail.com>
Date: Sun, 25 May 2025 12:07:08 +0000
Subject: [PATCH 138/204] openvscode-server: 1.88.1 -> 1.99.3; unbreak

Co-authored-by: Herwig Hochleitner <herwig@bendlas.net>
---
 pkgs/servers/openvscode-server/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index 945119f5a86e..e50c2c2b9874 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -206,16 +206,27 @@ stdenv.mkDerivation (finalAttrs: {
         fi
         exit 0
       ' \;
+    ''
+    + ''
+      runHook postConfigure
     '';
 
   buildPhase = ''
+    runHook preBuild
+
     npm run gulp vscode-reh-web-${vsBuildTarget}-min
+
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out
     cp -R -T ../vscode-reh-web-${vsBuildTarget} $out
     ln -sf ${nodejs}/bin/node $out
+
+    runHook postInstall
   '';
 
   passthru.tests = {

From cd9a22d7530baf33890971b01af8798069c3fea9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 25 May 2025 13:42:32 +0200
Subject: [PATCH 139/204] workflows/eval: fix comparison with merge conflicts

In PRs with multiple commits and merge conflicts the logic "targetSha ==
immediate parent of mergedSha" doesn't hold anymore. The head and base
commits of the PR's branch have some commits inbetween them, instead.

Before this change, we'd get a "fatal: invalid reference" on the
"worktree add". Now, not anymore, because we fetch the right commit
directly.
---
 .github/workflows/eval.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index bec9c23de6a0..3acfbdf25e37 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -101,7 +101,6 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.prepare.outputs.mergedSha }}
-          fetch-depth: 2
           path: nixpkgs
 
       - name: Install Nix
@@ -168,6 +167,7 @@ jobs:
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
+          git -C nixpkgs fetch --depth 1 origin ${{ needs.prepare.outputs.targetSha }}
           git -C nixpkgs worktree add ../target ${{ needs.prepare.outputs.targetSha }}
           git -C nixpkgs diff --name-only ${{ needs.prepare.outputs.targetSha }} \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json

From 539e8d4f66323b87aa1b8e715ec01b9f5199ca82 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 25 May 2025 13:25:24 +0200
Subject: [PATCH 140/204] actions/get-merge-conflict: refactor

Using core.setOutput is much nicer than having to parse the json
"result" on the outside. This also avoids some very odd errors, when the
result can, for unknown reasons, *not* be parsed as JSON later on.

Also avoiding a bit of duplication between the "if mergeable" branches.
---
 .github/actions/get-merge-commit/action.yml | 29 ++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index 1505d582efd8..51f8a00286b5 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -5,10 +5,10 @@ description: 'Checks whether the Pull Request is mergeable and returns two commi
 outputs:
   mergedSha:
     description: "The merge commit SHA"
-    value: ${{ fromJSON(steps.merged.outputs.result).mergedSha }}
+    value: ${{ steps.merged.outputs.mergedSha }}
   targetSha:
     description: "The target commit SHA"
-    value: ${{ fromJSON(steps.merged.outputs.result).targetSha }}
+    value: ${{ steps.merged.outputs.targetSha }}
 
 runs:
   using: composite
@@ -17,7 +17,7 @@ runs:
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
-          if (context.eventName == 'push') return { mergedSha: context.sha }
+          if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha)
 
           for (const retryInterval of [5, 10, 20, 40, 80]) {
             console.log("Checking whether the pull request can be merged...")
@@ -35,32 +35,31 @@ runs:
               continue
             }
 
+            let mergedSha, targetSha
+
             if (prInfo.mergeable) {
               console.log("The PR can be merged.")
 
-              const mergedSha = prInfo.merge_commit_sha
-              const targetSha = (await github.rest.repos.getCommit({
+              mergedSha = prInfo.merge_commit_sha
+              targetSha = (await github.rest.repos.getCommit({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 ref: prInfo.merge_commit_sha
               })).data.parents[0].sha
-
-              console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
-
-              return { mergedSha, targetSha }
             } else {
               console.log("The PR has a merge conflict.")
 
-              const mergedSha = prInfo.head.sha
-              const targetSha = (await github.rest.repos.compareCommitsWithBasehead({
+              mergedSha = prInfo.head.sha
+              targetSha = (await github.rest.repos.compareCommitsWithBasehead({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
               })).data.merge_base_commit.sha
-
-              console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
-
-              return { mergedSha, targetSha }
             }
+
+            console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
+            core.setOutput('mergedSha', mergedSha)
+            core.setOutput('targetSha', targetSha)
+            return
           }
           throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")

From 6720d254294220cdfce18c3f981a8aabffb3de94 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 24 May 2025 14:05:26 +0200
Subject: [PATCH 141/204] workflows: checkout nixpkgs into trusted/untrusted
 directories

By consistently checking out nixpkgs into the same location in every
workflow, it's easier to reason about the different workflows at once.
We also use crystal-clear names to make clear, which checkouts are
considered trusted, because they only contain target-branch-code and
which checkouts are untrusted, because they contain code from the head
branch. By naming the checkout directories trusted/untrusted, it's
obvious at the call-site.

One example of where we likely did the wrong thing is the nixpkgs-vet
workflow: Fetching the toolVersion from the untrusted checkout opens the
door for an injection into the download URL, thus code could be
downloaded from anywhere. This is not a problem, because this workflow
does not run with elevated privileges, but it's a scary oversight
nonetheless.
---
 .github/workflows/check-cherry-picks.yml |  3 ++-
 .github/workflows/check-format.yml       |  3 ++-
 .github/workflows/check-shell.yml        |  3 ++-
 .github/workflows/codeowners-v2.yml      | 15 +++++++++------
 .github/workflows/eval-aliases.yml       |  6 +++---
 .github/workflows/eval.yml               | 22 +++++++++++-----------
 .github/workflows/lib-tests.yml          |  3 ++-
 .github/workflows/manual-nixos-v2.yml    |  3 ++-
 .github/workflows/manual-nixpkgs-v2.yml  |  3 ++-
 .github/workflows/nix-parse-v2.yml       |  3 ++-
 .github/workflows/nixpkgs-vet.yml        |  9 ++++-----
 11 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index 70dfdfba1e5f..e85fa59bb699 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -21,10 +21,11 @@ jobs:
         with:
           fetch-depth: 0
           filter: blob:none
+          path: trusted
 
       - name: Check cherry-picks
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
-          ./maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
+          ./trusted/maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 58c76f97da6b..ec83ffcce07c 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -23,6 +23,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
+          path: untrusted
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
@@ -33,7 +34,7 @@ jobs:
           # Note that it's fine to run this on untrusted code because:
           # - There's no secrets accessible here
           # - The build is sandboxed
-          if ! nix-build ci -A fmt.check; then
+          if ! nix-build untrusted/ci -A fmt.check; then
             echo "Some files are not properly formatted"
             echo "Please format them by going to the Nixpkgs root directory and running one of:"
             echo "  nix-shell --run treefmt"
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 01dd64913b6a..39fb722ae87a 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -40,8 +40,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
+          path: untrusted
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
       - name: Build shell
-        run: nix-build ci -A shell
+        run: nix-build untrusted/ci -A shell
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index e22ccfcea52d..085abced061c 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -63,10 +63,11 @@ jobs:
       # so it's important this is not the PRs code.
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          path: base
+          ref: ${{ steps.get-merge-commit.outputs.targetSha }}
+          path: trusted
 
       - name: Build codeowners validator
-        run: nix-build base/ci -A codeownersValidator
+        run: nix-build trusted/ci -A codeownersValidator
 
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         if: vars.OWNER_RO_APP_ID
@@ -80,14 +81,14 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: pr
+          path: untrusted
 
       - name: Validate codeowners
         if: steps.app-token.outputs.token
         env:
-          OWNERS_FILE: pr/${{ env.OWNERS_FILE }}
+          OWNERS_FILE: untrusted/${{ env.OWNERS_FILE }}
           GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
-          REPOSITORY_PATH: pr
+          REPOSITORY_PATH: untrusted
           OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
           # Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
           EXPERIMENTAL_CHECKS: "avoid-shadowing"
@@ -104,6 +105,8 @@ jobs:
       # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
       # This is intentional, because we need to request the review of owners as declared in the base branch.
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          path: trusted
 
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         if: vars.OWNER_APP_ID
@@ -116,7 +119,7 @@ jobs:
           permission-pull-requests: write
 
       - name: Build review request package
-        run: nix-build ci -A requestReviews
+        run: nix-build trusted/ci -A requestReviews
 
       - name: Request reviews
         if: steps.app-token.outputs.token
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 941ffd378ef7..dc5bad6572fb 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: nixpkgs
+          path: untrusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
@@ -32,8 +32,8 @@ jobs:
           extra_nix_config: sandbox = true
 
       - name: Ensure flake outputs on all systems still evaluate
-        run: nix flake check --all-systems --no-build ./nixpkgs
+        run: nix flake check --all-systems --no-build ./untrusted
 
       - name: Query nixpkgs with aliases enabled to check for basic syntax errors
         run: |
-          time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
+          time nix-env -I ./untrusted -f ./untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 3acfbdf25e37..0063ad1a12e9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -61,7 +61,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.prepare.outputs.mergedSha }}
-          path: nixpkgs
+          path: untrusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
@@ -72,7 +72,7 @@ jobs:
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
-          nix-build nixpkgs/ci -A eval.singleSystem \
+          nix-build untrusted/ci -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 10000
           # If it uses too much memory, slightly decrease chunkSize
@@ -101,7 +101,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.prepare.outputs.mergedSha }}
-          path: nixpkgs
+          path: untrusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
@@ -110,7 +110,7 @@ jobs:
 
       - name: Combine all output paths and eval stats
         run: |
-          nix-build nixpkgs/ci -A eval.combine \
+          nix-build untrusted/ci -A eval.combine \
             --arg resultsDir ./intermediate \
             -o prResult
 
@@ -167,13 +167,13 @@ jobs:
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
-          git -C nixpkgs fetch --depth 1 origin ${{ needs.prepare.outputs.targetSha }}
-          git -C nixpkgs worktree add ../target ${{ needs.prepare.outputs.targetSha }}
-          git -C nixpkgs diff --name-only ${{ needs.prepare.outputs.targetSha }} \
+          git -C untrusted fetch --depth 1 origin ${{ needs.prepare.outputs.targetSha }}
+          git -C untrusted worktree add ../trusted ${{ needs.prepare.outputs.targetSha }}
+          git -C untrusted diff --name-only ${{ needs.prepare.outputs.targetSha }} \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
-          nix-build target/ci -A eval.compare \
+          nix-build trusted/ci -A eval.compare \
             --arg beforeResultDir ./targetResult \
             --arg afterResultDir "$(realpath prResult)" \
             --arg touchedFilesJson ./touched-files.json \
@@ -222,15 +222,15 @@ jobs:
 
       # Important: This workflow job runs with extra permissions,
       # so we need to make sure to not run untrusted code from PRs
-      - name: Check out Nixpkgs at the base commit
+      - name: Check out Nixpkgs at the target commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.prepare.outputs.targetSha }}
-          path: base
+          path: trusted
           sparse-checkout: ci
 
       - name: Build the requestReviews derivation
-        run: nix-build base/ci -A requestReviews
+        run: nix-build trusted/ci -A requestReviews
 
       - name: Labelling pull request
         if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }}
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index 345d59bb9cc4..5e3a7a5cba66 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -26,6 +26,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
+          path: untrusted
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
@@ -33,4 +34,4 @@ jobs:
 
       - name: Building Nixpkgs lib-tests
         run: |
-          nix-build ci -A lib-tests
+          nix-build untrusted/ci -A lib-tests
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index 5d5acdd377e7..ce5313c8135f 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -42,6 +42,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
+          path: untrusted
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
@@ -55,7 +56,7 @@ jobs:
 
       - name: Build NixOS manual
         id: build-manual
-        run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixos --argstr system ${{ matrix.system }}
+        run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}
 
       - name: Upload NixOS manual
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index b31a6b4949e1..5cb63a2c88bd 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -29,6 +29,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
+          path: untrusted
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
@@ -41,4 +42,4 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: Building Nixpkgs manual
-        run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixpkgs -A manual-nixpkgs-tests
+        run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index 6ae66e964474..ecbb9c843389 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -24,6 +24,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
+          path: untrusted
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
@@ -33,4 +34,4 @@ jobs:
       - name: Parse all nix files
         run: |
           # Tests multiple versions at once, let's make sure all of them run, so keep-going.
-          nix-build ci -A parse --keep-going
+          nix-build untrusted/ci -A parse --keep-going
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index 761ecbf08f2f..aefed2b267ce 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -36,12 +36,11 @@ jobs:
           ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
           # Fetches the merge commit and its parents
           fetch-depth: 2
+          path: untrusted
 
       - name: Checking out target branch
         run: |
-          target=$(mktemp -d)
-          git worktree add "$target" "$(git rev-parse HEAD^1)"
-          echo "target=$target" >> "$GITHUB_ENV"
+          git -C untrusted worktree add ../trusted ${{ steps.get-merge-commit.outputs.targetSha }}
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
@@ -49,7 +48,7 @@ jobs:
         # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh
         run: |
           # The pinned version of the tooling to use.
-          toolVersion=$(<ci/nixpkgs-vet/pinned-version.txt)
+          toolVersion=$(<untrusted/ci/nixpkgs-vet/pinned-version.txt)
 
           # Fetch the x86_64-linux-specific release artifact containing the gzipped NAR of the pre-built tool.
           toolPath=$(curl -sSfL https://github.com/NixOS/nixpkgs-vet/releases/download/"$toolVersion"/x86_64-linux.nar.gz \
@@ -63,7 +62,7 @@ jobs:
           # Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
           CLICOLOR_FORCE: 1
         run: |
-          if result/bin/nixpkgs-vet --base "$target" .; then
+          if result/bin/nixpkgs-vet --base trusted untrusted; then
             exit 0
           else
             exitCode=$?

From 75bd05615bb88df2fd2afdd7fb7aa198cc657b9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 12:47:43 +0000
Subject: [PATCH 142/204] xv: 6.0.2 -> 6.0.3

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

diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix
index ad9b264e893e..0abb9e0eea39 100644
--- a/pkgs/by-name/xv/xv/package.nix
+++ b/pkgs/by-name/xv/xv/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xv";
-  version = "6.0.2";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "xv";
     rev = "v${version}";
-    sha256 = "sha256-abmMrAxgccECsOi0eIy9/y0haPkUgbOl9wCgISLy5Rs=";
+    sha256 = "sha256-508P88Kac1W0xwjNblOjkYJri36ReZkjzrNzrrSBZjg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 94c59406f9c01e3d0961ef12a9ca01e9cebc43a4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 24 May 2025 01:28:42 +0100
Subject: [PATCH 143/204] doc/rl-2505: move nexusmods-app entry back to
 "incompatibilities"

It was inadvertently moved when additional sections were added in #393738
---
 doc/release-notes/rl-2505.section.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 8f895908d2b9..e7b1a629334f 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -247,6 +247,11 @@
 - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package
   and `withGstreamer`/`withVlc` override options have been removed due to this.
 
+- `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2.
+  - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
+  - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
+  - This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
+
 - `nezha` and its agent `nezha-agent` have been updated to v1, which contains breaking changes. See the [official wiki](https://nezha.wiki/en_US/) for more details.
 
 - `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI
@@ -538,11 +543,6 @@
 
 - `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
 
-- `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2.
-  - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
-  - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
-  - This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
-
 ## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
 
 ### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking}

From c47da7fbc81ed640a7a26ea37dbd1ea108eb92a2 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 23 May 2025 18:34:51 +0100
Subject: [PATCH 144/204] doc/rl-2505: reword nexusmods-app entry

We now plan to backport updates, so the release note shouldn't specify
exact versions.

Reworded to improve clarity.

Co-authored-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 doc/release-notes/rl-2505.section.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index e7b1a629334f..ebd6dee23041 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -247,8 +247,7 @@
 - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package
   and `withGstreamer`/`withVlc` override options have been removed due to this.
 
-- `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2.
-  - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
+- `nexusmods-app` has been upgraded from version 0.6.3. If you were running a version older than 0.7.0, then before upgrading, you **must reset all app state** (mods, games, settings, etc). Otherwise, NexusMods.App will crash due to app state files incompatibility.
   - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
   - This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
 

From c8d36fe7be9ef579621f5f560eecdd09df2e0440 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 20 May 2025 22:28:34 +0100
Subject: [PATCH 145/204] nexusmods-app: 0.10.2 -> 0.11.3

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.11.1
https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.11.3
---
 pkgs/by-name/ne/nexusmods-app/deps.json   | 539 ++++++++++++----------
 pkgs/by-name/ne/nexusmods-app/package.nix |   4 +-
 2 files changed, 304 insertions(+), 239 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index e3e8bc58dc00..d448c117b1a1 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -19,11 +19,6 @@
     "version": "11.0.0",
     "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
   },
-  {
-    "pname": "Avalonia",
-    "version": "11.2.0",
-    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
-  },
   {
     "pname": "Avalonia",
     "version": "11.2.3",
@@ -31,8 +26,8 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.6",
-    "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI="
+    "version": "11.3.0",
+    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -41,8 +36,8 @@
   },
   {
     "pname": "Avalonia.AvaloniaEdit",
-    "version": "11.2.0",
-    "hash": "sha256-AFe1jt9xR8XGq4tKkxOdUd7aQOGRSE+M2EQ8fOiV6xo="
+    "version": "11.3.0",
+    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
   },
   {
     "pname": "Avalonia.BuildServices",
@@ -56,13 +51,13 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.6",
-    "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ="
+    "version": "11.3.0",
+    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.6",
-    "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI="
+    "version": "11.3.0",
+    "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ="
   },
   {
     "pname": "Avalonia.Controls.TreeDataGrid",
@@ -71,23 +66,23 @@
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.6",
-    "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24="
+    "version": "11.3.0",
+    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.6",
-    "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ="
+    "version": "11.3.0",
+    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.6",
-    "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ="
+    "version": "11.3.0",
+    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
   },
   {
     "pname": "Avalonia.Headless",
-    "version": "11.2.6",
-    "hash": "sha256-sV68KaIcXu/IK7dQ8S6GdPtRNm6PaOTv5v+z4IUYp1E="
+    "version": "11.3.0",
+    "hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao="
   },
   {
     "pname": "Avalonia.Labs.Panels",
@@ -96,13 +91,13 @@
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.6",
-    "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw="
+    "version": "11.3.0",
+    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.6",
-    "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU="
+    "version": "11.3.0",
+    "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -111,8 +106,8 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.6",
-    "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ="
+    "version": "11.3.0",
+    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
   },
   {
     "pname": "Avalonia.Skia",
@@ -121,43 +116,38 @@
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.0",
-    "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
-  },
-  {
-    "pname": "Avalonia.Skia",
-    "version": "11.2.6",
-    "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c="
+    "version": "11.3.0",
+    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
   },
   {
     "pname": "Avalonia.Svg.Skia",
-    "version": "11.2.0.2",
-    "hash": "sha256-76mxaTEgJ5HCIxX6P0+V5Kd+3Vk41YXLuHmc4Rr+/rE="
+    "version": "11.3.0",
+    "hash": "sha256-4MY70GVJYZI4eGYw+++lXfpuoKJuvc9EJoU/ty4yF0E="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.2.6",
-    "hash": "sha256-L664hbpCtbu8aDX7YLnqKybF/eQFfes8eQp4A+as8PY="
+    "version": "11.3.0",
+    "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.6",
-    "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA="
+    "version": "11.3.0",
+    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.6",
-    "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY="
+    "version": "11.3.0",
+    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.6",
-    "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw="
+    "version": "11.3.0",
+    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
   },
   {
     "pname": "AvaloniaEdit.TextMate",
-    "version": "11.2.0",
-    "hash": "sha256-O9uQHHMwXCf6xaK+oUNRPJUQC6+p97UmZU1OsLOeroI="
+    "version": "11.3.0",
+    "hash": "sha256-VyXRytKE0aaWirvfr5Hm5uJm8Ckbu/+4wnTjmomgM5s="
   },
   {
     "pname": "Bannerlord.LauncherManager",
@@ -219,6 +209,11 @@
     "version": "5.1.1",
     "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="
   },
+  {
+    "pname": "Clarp",
+    "version": "0.2.0",
+    "hash": "sha256-S+qdaIlEDl7Jz8lwI6yaO0Ee8zAqvo+T+hbt7vQ13eo="
+  },
   {
     "pname": "CliWrap",
     "version": "3.6.7",
@@ -276,8 +271,8 @@
   },
   {
     "pname": "DynamicData",
-    "version": "9.1.2",
-    "hash": "sha256-rDbtd7Fw/rhq6s9G4p/rltZ3EIR5r1RcMXsAEe7nZjw="
+    "version": "9.2.2",
+    "hash": "sha256-76RE68Yvibq237dUEc8mCN/S4PQRyULJPs/tFgNOY2I="
   },
   {
     "pname": "EmptyFiles",
@@ -286,8 +281,8 @@
   },
   {
     "pname": "ExCSS",
-    "version": "4.2.3",
-    "hash": "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="
+    "version": "4.3.0",
+    "hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M="
   },
   {
     "pname": "Fare",
@@ -361,58 +356,58 @@
   },
   {
     "pname": "GameFinder",
-    "version": "4.6.1",
-    "hash": "sha256-wx5MEcWHg+O7qmXZeoJiLCfEawh5rwtYdxYkSJh+/sk="
+    "version": "4.6.3",
+    "hash": "sha256-Y1kNjf8kZQtx4jrAOv02Jj0JzedTqLhS7CQvtvuFtzY="
   },
   {
     "pname": "GameFinder.Common",
-    "version": "4.6.1",
-    "hash": "sha256-bkgdsruhxbpu9zdyAebPSEPk08WzfzxUbxLGbIHjFT0="
+    "version": "4.6.3",
+    "hash": "sha256-EjbqVIx67dZocKL+IGyvcm/7DmDMCfvOgPEUpf0XMRQ="
   },
   {
     "pname": "GameFinder.Launcher.Heroic",
-    "version": "4.6.1",
-    "hash": "sha256-Zx4fxMvdwoNKQFXe6vz2bp3IFqoK0QHzsB8BveqnNqY="
+    "version": "4.6.3",
+    "hash": "sha256-w/z5qi5O3CjDNDR9rFdgibeUB+OspNEHfEKXLtEXkn0="
   },
   {
     "pname": "GameFinder.RegistryUtils",
-    "version": "4.6.1",
-    "hash": "sha256-AKC6Lrwyb+oFLdUpAAERkdIblRlvNOb94C4hvJflaac="
+    "version": "4.6.3",
+    "hash": "sha256-keHM0ngcgxx8UEBky6GtDMfqEv1VupeLsmNpd1i7s2A="
   },
   {
     "pname": "GameFinder.StoreHandlers.EADesktop",
-    "version": "4.6.1",
-    "hash": "sha256-6NG35ERzXLt8nGC2mt5/qF3LUSSceHRqlnWtjRfRGTY="
+    "version": "4.6.3",
+    "hash": "sha256-n9Dg0bawW+UtedEJMHiEZOhDigd7j74DX1kWMJlbngw="
   },
   {
     "pname": "GameFinder.StoreHandlers.EGS",
-    "version": "4.6.1",
-    "hash": "sha256-h+zv/YY8tLSz4XaLLZZVD7n04poAbqrJ422IHfT2rK0="
+    "version": "4.6.3",
+    "hash": "sha256-v1kmug4QkBzaqm/6droC36U4gQcckv5bbdw6TIG3Y4o="
   },
   {
     "pname": "GameFinder.StoreHandlers.GOG",
-    "version": "4.6.1",
-    "hash": "sha256-SZNRdt77Bgg3I7w6/R0OSeDI6qt90pP1GIrEg2x/a4I="
+    "version": "4.6.3",
+    "hash": "sha256-aGplqNlf8gwnoEpfieMDJQxmJJ13hdz+ahgpBdxK7Do="
   },
   {
     "pname": "GameFinder.StoreHandlers.Origin",
-    "version": "4.6.1",
-    "hash": "sha256-xp7KDYEsdxjTzRRpkqPkeuf5Umi/5+o9+k0Xn9m6Yus="
+    "version": "4.6.3",
+    "hash": "sha256-U7DfWE2IwOBeDBvdsRXAgiGojnocGqvOa7MNq2nFJ/8="
   },
   {
     "pname": "GameFinder.StoreHandlers.Steam",
-    "version": "4.6.1",
-    "hash": "sha256-xPW1IGePWF+clMOSjDky4AgEqCMMa42+ZmrH+WkZUcg="
+    "version": "4.6.3",
+    "hash": "sha256-h+akH+XSLnhD2NLM4K3YqgXxEY2dQxeB4XN4D1d0Enk="
   },
   {
     "pname": "GameFinder.StoreHandlers.Xbox",
-    "version": "4.6.1",
-    "hash": "sha256-jcWgZKQt4NYvEOAgA6tDlnm7oHCV6hwTNKztMpXnC1E="
+    "version": "4.6.3",
+    "hash": "sha256-fIwa/j71Ll3k371pxmKnEQWOqowW9XD0VhRTMnqsNYA="
   },
   {
     "pname": "GameFinder.Wine",
-    "version": "4.6.1",
-    "hash": "sha256-DZTxn55GNcWsowre57csnhIS6SW4loC+6XroJ9ZGEC8="
+    "version": "4.6.3",
+    "hash": "sha256-Tm1i2PO/+y/eCoVjKNsbX0Hu0w09mtUC4xkShgNVJz0="
   },
   {
     "pname": "Gee.External.Capstone",
@@ -449,20 +444,15 @@
     "version": "1.0.0-alpha",
     "hash": "sha256-EyVYjSpQ3g+N6knSmQzS2j7ueoowZOHxjYX93lSRQns="
   },
-  {
-    "pname": "HarfBuzzSharp",
-    "version": "7.3.0.2",
-    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
-  },
   {
     "pname": "HarfBuzzSharp",
     "version": "7.3.0.3",
     "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
   },
   {
-    "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.2",
-    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
@@ -471,34 +461,29 @@
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.2",
-    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.3",
-    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
     "version": "7.3.0.3",
     "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
   },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0.3-preview.2.2",
-    "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.2",
-    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
-  },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
     "version": "7.3.0.3",
     "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
   },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
+  },
   {
     "pname": "HotChocolate.Language.SyntaxTree",
     "version": "15.0.3",
@@ -894,6 +879,11 @@
     "version": "9.0.0",
     "hash": "sha256-LFyhPIJNZLBqOEF4uZ1SpqN/NhjpCHqhzO4R2ApXuj0="
   },
+  {
+    "pname": "Microsoft.AspNetCore.WebUtilities",
+    "version": "9.0.4",
+    "hash": "sha256-KG2H4FIuJhiallEfPqi1Kgs93tOkfrEw7qJniu0TuF0="
+  },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
     "version": "1.1.0",
@@ -954,11 +944,6 @@
     "version": "4.1.0",
     "hash": "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU="
   },
-  {
-    "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.11.0",
-    "hash": "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="
-  },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
     "version": "4.8.0",
@@ -974,11 +959,6 @@
     "version": "4.1.0",
     "hash": "sha256-pM9WXvxZI3SS89CGVjxqtAyZyfyiZQzW0UnNCDiQrQA="
   },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.11.0",
-    "hash": "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="
-  },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
     "version": "4.8.0",
@@ -1031,19 +1011,14 @@
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "17.12.0",
-    "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE="
+    "version": "17.13.0",
+    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
   },
   {
     "pname": "Microsoft.Composition",
     "version": "1.0.27",
     "hash": "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE="
   },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.7.0",
-    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
-  },
   {
     "pname": "Microsoft.Diagnostics.NETCore.Client",
     "version": "0.2.251802",
@@ -1066,13 +1041,13 @@
   },
   {
     "pname": "Microsoft.Extensions.AmbientMetadata.Application",
-    "version": "9.0.0",
-    "hash": "sha256-1cEpOtFLK7J9Hnq28Av+pdKaYjRldWVNRD2zhBsbWps="
+    "version": "9.4.0",
+    "hash": "sha256-9PpENMGcTwpxzJVGqKz3Bej+4PKGOeV+e+p3OusZSxc="
   },
   {
     "pname": "Microsoft.Extensions.Compliance.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-Se92b6d4EEpL9HCD0OwFRlRSGM64+U4PVEid9ncuAqk="
+    "version": "9.4.0",
+    "hash": "sha256-D6S6rrZg4B01a4b4C3A2GuaIAIo3BK9yQomnKD4nEa4="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -1084,6 +1059,11 @@
     "version": "9.0.0",
     "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "9.0.4",
+    "hash": "sha256-01yWDq/dHgU1Trx2OqVsXK/yobwVTClJXB07LrPc8lU="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
     "version": "8.0.0",
@@ -1094,6 +1074,11 @@
     "version": "9.0.0",
     "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-5hwq73FCWAJJ8Yb1VHaaryJJhUUiVsetPTrPLlo8N9o="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
     "version": "8.0.0",
@@ -1104,6 +1089,11 @@
     "version": "9.0.0",
     "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "9.0.4",
+    "hash": "sha256-l+qlHrdrqgvnveSMCO4qQx1QObAe5lMl80a4Kc3idzw="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.CommandLine",
     "version": "8.0.0",
@@ -1111,8 +1101,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.CommandLine",
-    "version": "9.0.0",
-    "hash": "sha256-RE6DotU1FM1sy5p3hukT+WOFsDYJRsKX6jx5vhlPceM="
+    "version": "9.0.4",
+    "hash": "sha256-usXy7P5VIBusWSmI1WxpXwwDN404TTZveBoUAlJRWEQ="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
@@ -1121,8 +1111,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "9.0.0",
-    "hash": "sha256-tDJx2prYZpr0RKSwmJfsK9FlUGwaDmyuSz2kqQxsWoI="
+    "version": "9.0.4",
+    "hash": "sha256-9agLzJpXM8i24WSB2pIGaIkQL9fyuIBGK14a1jpH/Vk="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
@@ -1131,8 +1121,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "9.0.0",
-    "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s="
+    "version": "9.0.4",
+    "hash": "sha256-i6BP99iTLEVt7aSw2Fu0ogUnY6FlVMat+BMIlndHCkQ="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
@@ -1141,8 +1131,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "9.0.0",
-    "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI="
+    "version": "9.0.4",
+    "hash": "sha256-scTrZeY5CKX9kMcN7MYQPJVgEFwDTvO+JOk+G3wXrjs="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.UserSecrets",
@@ -1151,8 +1141,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.UserSecrets",
-    "version": "9.0.0",
-    "hash": "sha256-GoEk+Qq7lbiwWurHYx1LkDaUzIpOzaoTiVGDPfViGak="
+    "version": "9.0.4",
+    "hash": "sha256-gEYqIFucwNp+4paaEjNkiqGCDG09etqVa8UcclNU17g="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -1164,6 +1154,11 @@
     "version": "9.0.0",
     "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
   },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.4",
+    "hash": "sha256-ck7PqIL/3vodYky+d7YX218n+detOoEjZeMr1EqTFPg="
+  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "2.0.0",
@@ -1184,10 +1179,15 @@
     "version": "9.0.0",
     "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
   },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-6WcGpsAYRhrpHloEom0oVP7Ff4Gh/O1XWJETJJ3LvEQ="
+  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.AutoActivation",
-    "version": "9.0.0",
-    "hash": "sha256-45NiMtCHV4BDkwnSZmsTRJ8dHMDm5WAGhJh4x+z7TiM="
+    "version": "9.4.0",
+    "hash": "sha256-WHglu/2qRZotaBHfm77fB6hiEtbdZz/oyAOIK2OthOI="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
@@ -1199,6 +1199,11 @@
     "version": "9.0.0",
     "hash": "sha256-JMbhtjdcWRlrcrbgPlowfj26+pM+MYhnPIaYKnv9byU="
   },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "9.0.4",
+    "hash": "sha256-fmRuxerdHGVDFFJMpBv9DIzofBSxjLLsi1GvaGq1dUc="
+  },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
     "version": "8.0.0",
@@ -1209,10 +1214,15 @@
     "version": "9.0.0",
     "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY="
   },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-VgBfZLr/tqAOCW3i8g8lTgdpLU/g5vHfcOUpyoQESig="
+  },
   {
     "pname": "Microsoft.Extensions.Diagnostics.ExceptionSummarization",
-    "version": "9.0.0",
-    "hash": "sha256-Nj8l1ba5iZ5Tubu+vY3a5dgTRkYmGNP2wtXC8Re8aCg="
+    "version": "9.4.0",
+    "hash": "sha256-zWxwe1R7zc/w9lGvShf5LOHGlh6PMzTJA13lVEfObJw="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
@@ -1224,6 +1234,11 @@
     "version": "9.0.0",
     "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="
   },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-OkAq+1NUG0d1Ww6zT/hZWcPB5+fCr8AJIWmkpX7CQxU="
+  },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
     "version": "8.0.0",
@@ -1231,8 +1246,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "9.0.0",
-    "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8="
+    "version": "9.0.4",
+    "hash": "sha256-whn/jRYaH56Lha20yChG5wgIllttTq2EtOwyDW+ZDO4="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
@@ -1241,8 +1256,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "9.0.0",
-    "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc="
+    "version": "9.0.4",
+    "hash": "sha256-lzNTCxATfJvnsl1hlAxhI4cibixYYBq99fK9b9tEo0A="
   },
   {
     "pname": "Microsoft.Extensions.Hosting",
@@ -1251,8 +1266,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Hosting",
-    "version": "9.0.0",
-    "hash": "sha256-apIN4Cz86ujsMp/ibxcvguA9uCFaFqOsZ4kAUPX5ASI="
+    "version": "9.0.4",
+    "hash": "sha256-qb3bcAbLnBvc91p/+C6K7P8g2Fd9yRVvPOvIzGFSu/g="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
@@ -1264,20 +1279,30 @@
     "version": "9.0.0",
     "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
   },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-eEw2h6S0m8Wb52hWo/31uCA5NQbPn/7veYpzNhkzyl0="
+  },
   {
     "pname": "Microsoft.Extensions.Http",
     "version": "9.0.0",
     "hash": "sha256-MsStH3oUfyBbcSEoxm+rfxFBKI/rtB5PZrSGvtDjVe0="
   },
+  {
+    "pname": "Microsoft.Extensions.Http",
+    "version": "9.0.4",
+    "hash": "sha256-gciOa0FAKivI5f/dzbsbS5HniIx9TJ4BTeBZ9In+fAo="
+  },
   {
     "pname": "Microsoft.Extensions.Http.Diagnostics",
-    "version": "9.0.0",
-    "hash": "sha256-4XtkhRMXTFR1I85rJ73BFa01XDRW/fz4+Jig0S/Wm3M="
+    "version": "9.4.0",
+    "hash": "sha256-fLnehXzSv6+9LtK0sLh4XAu1n3WjBmKT3VpzSqlASVE="
   },
   {
     "pname": "Microsoft.Extensions.Http.Resilience",
-    "version": "9.0.0",
-    "hash": "sha256-GFGvnupmgvTgbmknxpF7H3DmxqvX9JOdxKuK2lR6bVM="
+    "version": "9.4.0",
+    "hash": "sha256-l4psmvVkKu6+/rXbPDrrtGrzsmBIKFFED8suirggID8="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -1299,6 +1324,11 @@
     "version": "9.0.0",
     "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.4",
+    "hash": "sha256-Vj+NGOamKeuMrLNUWlVKFFkz7IKGIv6h1A5X4CK9D5E="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "2.0.0",
@@ -1324,6 +1354,11 @@
     "version": "9.0.0",
     "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-n0ZRhQ7U/5Kv1hVqUXGoa5gfrhzcy77yFhfonjq6VFc="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
     "version": "8.0.0",
@@ -1334,6 +1369,11 @@
     "version": "9.0.0",
     "hash": "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "9.0.4",
+    "hash": "sha256-WzinyQZzj7ty00RrCGsGxwDYJlsta74M5UP0ajGTWCE="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
     "version": "8.0.0",
@@ -1341,8 +1381,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "9.0.0",
-    "hash": "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw="
+    "version": "9.0.4",
+    "hash": "sha256-tofh2lKZm+FvMp0Fx9JOXltOpDSutbGLhspdAM27USQ="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Debug",
@@ -1351,8 +1391,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Debug",
-    "version": "9.0.0",
-    "hash": "sha256-5W6fP9Eb98U3MTWKeLzSNl2cRFpE694OOPjpWp/qTAk="
+    "version": "9.0.4",
+    "hash": "sha256-W1L3jKzyeyTli94+N/Di3YtYtfv9usDFdtEnJUzvF+c="
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventLog",
@@ -1361,8 +1401,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventLog",
-    "version": "9.0.0",
-    "hash": "sha256-mIL1I85Ef5+/mXl24odoUpcXet+jCZTRtKCd5z6YUwI="
+    "version": "9.0.4",
+    "hash": "sha256-TQkN+RM5qSHMM4WxXTbEbK5I2j8aBoC/3YvtjBA0gG8="
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventSource",
@@ -1371,14 +1411,24 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.EventSource",
-    "version": "9.0.0",
-    "hash": "sha256-pplZskMsR3gGbs3I0wycGsvIMPIpfWFJpOsR9GkiYRw="
+    "version": "9.0.4",
+    "hash": "sha256-fp+/DPSm7gb34634p7ADtMQh8ascCE8ny0A1fCDdQfY="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
     "version": "9.0.0",
     "hash": "sha256-mX2Y2bHwScjXh1xQOweawmwo7jYLw+MhePibk/96dMY="
   },
+  {
+    "pname": "Microsoft.Extensions.ObjectPool",
+    "version": "9.0.3",
+    "hash": "sha256-Zj4N4naWNIf6BDI5r6xIILCilgrEKHJ5z4rkoQ4gjg4="
+  },
+  {
+    "pname": "Microsoft.Extensions.ObjectPool",
+    "version": "9.0.4",
+    "hash": "sha256-HRBRlPBdEiTOX2qddbWlen+jjM6TM+rgqhAqxRSaxTU="
+  },
   {
     "pname": "Microsoft.Extensions.Options",
     "version": "2.0.0",
@@ -1394,6 +1444,11 @@
     "version": "9.0.0",
     "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
   },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.4",
+    "hash": "sha256-QyjtRCG+L9eyH/UWHf/S+7/ZiSOmuGNoKGO9nlXmjxI="
+  },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
     "version": "8.0.0",
@@ -1404,6 +1459,16 @@
     "version": "9.0.0",
     "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA="
   },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "9.0.4",
+    "hash": "sha256-fhI6GGzVC5edaS/QEdl+2WL8/P6u/+wyq9nkLW17X64="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "2.0.0",
+    "hash": "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="
+  },
   {
     "pname": "Microsoft.Extensions.Primitives",
     "version": "8.0.0",
@@ -1414,40 +1479,40 @@
     "version": "9.0.0",
     "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
   },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.4",
+    "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g="
+  },
   {
     "pname": "Microsoft.Extensions.Resilience",
-    "version": "9.0.0",
-    "hash": "sha256-3zd2zOR8C3+VaPpUnJ+wcCaBbvzU8DjGGuaZ/dxsqQQ="
+    "version": "9.4.0",
+    "hash": "sha256-ahNIEfyenOgVm/a7zWzYvgHMl0kf1RlLAXMRadc3ZCI="
   },
   {
     "pname": "Microsoft.Extensions.Telemetry",
-    "version": "9.0.0",
-    "hash": "sha256-MKltsZC6s7sE8mO1XpOOzgFbp3CJS7sHGMH92DjXSso="
+    "version": "9.4.0",
+    "hash": "sha256-1hF+rot1+hQji9LR4PWnZvhJ+0iEtE6sW9UcUiRhTfA="
   },
   {
     "pname": "Microsoft.Extensions.Telemetry.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-rGeoVSc3RJlhL8Sv8CgDh2+BOiFHllKl2K9vtXxl+Ec="
+    "version": "9.4.0",
+    "hash": "sha256-md9dBTjdENsjAAKy56hmdNXO+5R4yQXFTDuWOipWNxQ="
   },
   {
     "pname": "Microsoft.Extensions.TimeProvider.Testing",
-    "version": "9.0.0",
-    "hash": "sha256-1Pgz3Lnng9EmCqsDqAT/G1pa5dNswoFFZj35BlVlRLE="
-  },
-  {
-    "pname": "Microsoft.IO.RecyclableMemoryStream",
-    "version": "3.0.0",
-    "hash": "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4="
+    "version": "9.4.0",
+    "hash": "sha256-9aIlvFzLlmisl4WrG05+qimoJgtNySTZHnKn3wOf6nQ="
   },
   {
     "pname": "Microsoft.Net.Http.Headers",
-    "version": "9.0.0",
-    "hash": "sha256-fJ42UoMaftaGZbMA5LlGhZNns1hQY2eLkw6EEeCYcAQ="
+    "version": "9.0.4",
+    "hash": "sha256-Anax2K+D109FE9VAxd5I/a5B8piNywbr1KuymobEgNA="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.12.0",
-    "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg="
+    "version": "17.13.0",
+    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -1459,11 +1524,6 @@
     "version": "2.0.0",
     "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.1.2",
-    "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
@@ -1491,13 +1551,13 @@
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.12.0",
-    "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
+    "version": "17.13.0",
+    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.12.0",
-    "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I="
+    "version": "17.13.0",
+    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
   },
   {
     "pname": "Microsoft.VisualStudio.Composition",
@@ -1609,6 +1669,16 @@
     "version": "0.6.4",
     "hash": "sha256-jDOCZ6VWPqcKE6gqqAdkyLL3G2g6pbG78mpMRhgYx2o="
   },
+  {
+    "pname": "NexusMods.Cascade",
+    "version": "0.12.0",
+    "hash": "sha256-EHGoZyp67KzDPz3weqQTaSe2aMwJvwUFkeDDdqXYHBU="
+  },
+  {
+    "pname": "NexusMods.Cascade.SourceGenerator",
+    "version": "0.12.0",
+    "hash": "sha256-P7cUTqFgHrvbEvd2nYD0acD8l3f7ZqmT6DX2fxTmpEg="
+  },
   {
     "pname": "NexusMods.Hashing.xxHash3",
     "version": "3.0.3",
@@ -1621,18 +1691,18 @@
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.9.122",
-    "hash": "sha256-uaADmIInfTD6jxbfG2XpBzZplVBjuuki7glK5iIS6BM="
+    "version": "0.13.0",
+    "hash": "sha256-Qb+RAMFYwDSmh4LJwGg0DIR4vzIPP6qJlYL1NQ1THOA="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.9.122",
-    "hash": "sha256-UVGEPXfDx9vaOBPofVmlqJLg0LZS14AETFZWWc8KB14="
+    "version": "0.13.0",
+    "hash": "sha256-UzVjG5w7UCWpnuvSWrWdUKTyYtb09FM5LweGfE2a5OQ="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.9.122",
-    "hash": "sha256-6YlvYr3mSd/D96iDm6zqP6O9x3mo/DezS3RRRBIn2wk="
+    "version": "0.13.0",
+    "hash": "sha256-vuvKag8+4c0YTuQ+XqitOXg6LQtgY7wonsGeQqhl0uw="
   },
   {
     "pname": "NexusMods.Paths",
@@ -1849,11 +1919,6 @@
     "version": "1.0.0",
     "hash": "sha256-CikGDRUi/EDN2j32cBRl0g+QtdCVYPUizBt41oSVlUA="
   },
-  {
-    "pname": "R3",
-    "version": "1.2.9",
-    "hash": "sha256-Wb3ELPbVhxEMqkrQq5vIjGC36VAzIuMdiYqSAEnVXpY="
-  },
   {
     "pname": "R3",
     "version": "1.3.0",
@@ -1891,8 +1956,8 @@
   },
   {
     "pname": "RocksDB",
-    "version": "9.4.0.50294",
-    "hash": "sha256-SHt+2Kaj2eCqoeeH28EGlyRUi+g9Y3e9OzVvp946F7I="
+    "version": "9.10.0.55496",
+    "hash": "sha256-XnTUNUYXw+XSlBFaZJe0mas8x+EZX1HgZkmwu/SXojM="
   },
   {
     "pname": "runtime.any.System.Collections",
@@ -2116,8 +2181,8 @@
   },
   {
     "pname": "ShimSkiaSharp",
-    "version": "2.0.0.4",
-    "hash": "sha256-5XBMk4sjg2Yxr5rhoXWRsLDbZ2aTLumnFfi0Y662jTk="
+    "version": "3.0.2",
+    "hash": "sha256-rxPdc2A9ORfqpaEqF8AByxmaeRCTr9JzDTlp3j46dKw="
   },
   {
     "pname": "SimpleInfoName",
@@ -2131,13 +2196,18 @@
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.8",
-    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.9",
-    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+    "version": "3.116.1",
+    "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.119.0",
+    "hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM="
   },
   {
     "pname": "SkiaSharp.HarfBuzz",
@@ -2146,13 +2216,13 @@
   },
   {
     "pname": "SkiaSharp.HarfBuzz",
-    "version": "2.88.8",
-    "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="
+    "version": "3.116.1",
+    "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
   },
   {
-    "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.8",
-    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+    "pname": "SkiaSharp.HarfBuzz",
+    "version": "3.119.0",
+    "hash": "sha256-oIoXAzG/z/Qbl/KnDGkwsbxcIkAw4EFiVAbbYIvOO3o="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
@@ -2160,19 +2230,19 @@
     "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
   },
   {
-    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.8",
-    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "3.119.0",
+    "hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.9",
-    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+    "version": "3.116.1",
+    "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
   },
   {
-    "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.8",
-    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.119.0",
+    "hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
@@ -2181,13 +2251,13 @@
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.8",
-    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+    "version": "3.116.1",
+    "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.9",
-    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+    "version": "3.119.0",
+    "hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo="
   },
   {
     "pname": "SmartFormat",
@@ -2261,18 +2331,18 @@
   },
   {
     "pname": "Svg.Custom",
-    "version": "2.0.0.4",
-    "hash": "sha256-Gp4zGWHJ2fEOmj8VNfPDukUPusxMsPhiz0jdcWT7u7Y="
+    "version": "3.0.2",
+    "hash": "sha256-OVAL2kFLJQ2h8hDouLBVusAHUyC5ky2d5NbvJA8BYsk="
   },
   {
     "pname": "Svg.Model",
-    "version": "2.0.0.4",
-    "hash": "sha256-tMYfqm4ZYgnajWwKQIe6dc3qnoIWxbODfarIzwlWX80="
+    "version": "3.0.2",
+    "hash": "sha256-ravea4oKkzkrY24v2u/N5m1tOugFtHQysMdAkVk5SZQ="
   },
   {
     "pname": "Svg.Skia",
-    "version": "2.0.0.4",
-    "hash": "sha256-xRB9GE2IxtV25py1S4y3R0Qk5lHYThu73O+YYu1VIoA="
+    "version": "3.0.2",
+    "hash": "sha256-BMa0SyPs53YloLZ3G6ZgR8guvCIJ2MW9QwQ0VblPS5Q="
   },
   {
     "pname": "System.AppContext",
@@ -2289,6 +2359,11 @@
     "version": "4.5.1",
     "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
+  {
+    "pname": "System.CodeDom",
+    "version": "4.4.0",
+    "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="
+  },
   {
     "pname": "System.CodeDom",
     "version": "5.0.0",
@@ -2481,8 +2556,8 @@
   },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "9.0.0",
-    "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems="
+    "version": "9.0.4",
+    "hash": "sha256-afF72ywJo/vfJXt2XiI8Lf2zKcvn0F/p280P1w3Fmk4="
   },
   {
     "pname": "System.Diagnostics.Tools",
@@ -2579,6 +2654,11 @@
     "version": "9.0.0",
     "hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc="
   },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "9.0.4",
+    "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU="
+  },
   {
     "pname": "System.IO.Pipelines",
     "version": "6.0.3",
@@ -2599,6 +2679,11 @@
     "version": "9.0.0",
     "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="
   },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "9.0.4",
+    "hash": "sha256-4E3H0n6UloSxvN41xi7hltJb9+hfaFbqwb/eOQOfNsI="
+  },
   {
     "pname": "System.Linq",
     "version": "4.1.0",
@@ -2719,11 +2804,6 @@
     "version": "4.3.0",
     "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
   },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.7.0",
-    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
-  },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.0.1",
@@ -2769,11 +2849,6 @@
     "version": "7.0.0",
     "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
   },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "8.0.0",
-    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
-  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.0.1",
@@ -2814,11 +2889,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.2",
-    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.5.3",
@@ -3114,11 +3184,6 @@
     "version": "1.0.65",
     "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE="
   },
-  {
-    "pname": "Tmds.DBus.Protocol",
-    "version": "0.20.0",
-    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
-  },
   {
     "pname": "Tmds.DBus.Protocol",
     "version": "0.21.2",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 0aff0df04e7c..7d703dbe9c2a 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -24,12 +24,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.10.2";
+  version = "0.11.3";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-L75nmxjymPfuu6CM5QRE1jInElNrD2OuAXMR8+c2tGQ=";
+    hash = "sha256-EP51nhFKYfYRjOpgHiGLwXGmpDULoTlGh3hQXhR8sy8=";
     fetchSubmodules = true;
   };
 

From 00ca994bbb35f4bfa6a7c6ec63a1cc68434e76db Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Sun, 25 May 2025 14:56:46 +0200
Subject: [PATCH 146/204] ida-free: 9.0sp1 -> 9.1

---
 pkgs/by-name/id/ida-free/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix
index 4f8ac0bcdf1b..95d976b6acf3 100644
--- a/pkgs/by-name/id/ida-free/package.nix
+++ b/pkgs/by-name/id/ida-free/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ida-free";
-  version = "9.0sp1";
+  version = "9.1";
 
   src = fetchurl {
     url = "https://archive.org/download/ida-free-pc_90sp1_x64linux/ida-free-pc_90sp1_x64linux.run";

From 274bdab79f2e325d7500eb6a4e2f3930d73c2f35 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Sun, 25 May 2025 14:56:57 +0200
Subject: [PATCH 147/204] ida-free: use requireFile

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

diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix
index 95d976b6acf3..e08ffe448900 100644
--- a/pkgs/by-name/id/ida-free/package.nix
+++ b/pkgs/by-name/id/ida-free/package.nix
@@ -2,7 +2,7 @@
   autoPatchelfHook,
   cairo,
   dbus,
-  fetchurl,
+  requireFile,
   fontconfig,
   freetype,
   glib,
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
   pname = "ida-free";
   version = "9.1";
 
-  src = fetchurl {
-    url = "https://archive.org/download/ida-free-pc_90sp1_x64linux/ida-free-pc_90sp1_x64linux.run";
-    hash = "sha256-e5uCcJVn6xDwmVm14QCBUvNcB1MpVxNA2WcLyuK23vo=";
+  src = requireFile {
+    name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] version}_x64linux.run";
+    url = "https://my.hex-rays.com/dashboard/download-center/${version}/ida-free";
+    hash = "sha256-DIkxr9yD6yvziO8XHi0jt80189bXueRxmSFyq2LM0cg=";
   };
 
   nativeBuildInputs = [

From 942c377476675848155e860b9d41d869589b8a47 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 24 May 2025 15:01:44 +0200
Subject: [PATCH 148/204] workflows/nixpkgs-vet: use nixpkgs-vet from pinned
 nixpkgs

We have added nixpkgs-vet as a regular package to nixpkgs a while ago,
so we can now use it from pinned nixpkgs. This avoids pulling a
platform-specific binary version from upstream.

This change also allows to run the tool easily locally, the same way as
other tools:

  nix-build ci -A nixpkgs-vet

This will do a full check of the repo with the exception of
nixpkgs-vet's "ratchet" checks: Those depend on having two branches to
compare, but the default is to only look at the head branch. Those
ratchet checks will still be run in CI, though.
---
 .github/workflows/nixpkgs-vet.yml | 18 ++----------------
 ci/default.nix                    |  1 +
 ci/nixpkgs-vet.nix                | 31 +++++++++++++++++++++++++++++++
 ci/nixpkgs-vet.sh                 |  4 +---
 4 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 ci/nixpkgs-vet.nix

diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index aefed2b267ce..dffa9b63dd89 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -19,8 +19,7 @@ permissions: {}
 jobs:
   check:
     name: nixpkgs-vet
-    # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases.
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.04-arm
     # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
     timeout-minutes: 10
     steps:
@@ -44,25 +43,12 @@ jobs:
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
-      - name: Fetching the pinned tool
-        # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh
-        run: |
-          # The pinned version of the tooling to use.
-          toolVersion=$(<untrusted/ci/nixpkgs-vet/pinned-version.txt)
-
-          # Fetch the x86_64-linux-specific release artifact containing the gzipped NAR of the pre-built tool.
-          toolPath=$(curl -sSfL https://github.com/NixOS/nixpkgs-vet/releases/download/"$toolVersion"/x86_64-linux.nar.gz \
-            | gzip -cd | nix-store --import | tail -1)
-
-          # Adds a result symlink as a GC root.
-          nix-store --realise "$toolPath" --add-root result
-
       - name: Running nixpkgs-vet
         env:
           # Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
           CLICOLOR_FORCE: 1
         run: |
-          if result/bin/nixpkgs-vet --base trusted untrusted; then
+          if nix-build untrusted/ci -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
             exit 0
           else
             exitCode=$?
diff --git a/ci/default.nix b/ci/default.nix
index dd39e082a6fb..939e8411d27a 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -84,6 +84,7 @@ in
   manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
   manual-nixpkgs = (import ../pkgs/top-level/release.nix { }).manual;
   manual-nixpkgs-tests = (import ../pkgs/top-level/release.nix { }).manual.tests;
+  nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { };
   parse = pkgs.lib.recurseIntoAttrs {
     latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
new file mode 100644
index 000000000000..1ceec363c347
--- /dev/null
+++ b/ci/nixpkgs-vet.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  nix,
+  nixpkgs-vet,
+  runCommand,
+}:
+{
+  base ? ../.,
+  head ? ../.,
+}:
+let
+  filtered =
+    with lib.fileset;
+    path:
+    toSource {
+      fileset = (gitTracked path);
+      root = path;
+    };
+in
+runCommand "nixpkgs-vet"
+  {
+    nativeBuildInputs = [
+      nixpkgs-vet
+    ];
+    env.NIXPKGS_VET_NIX_PACKAGE = nix;
+  }
+  ''
+    nixpkgs-vet --base ${filtered base} ${filtered head}
+
+    touch $out
+  ''
diff --git a/ci/nixpkgs-vet.sh b/ci/nixpkgs-vet.sh
index 7aabdfb6b8c5..b62e04fe0177 100755
--- a/ci/nixpkgs-vet.sh
+++ b/ci/nixpkgs-vet.sh
@@ -65,7 +65,5 @@ trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. "
 toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt")
 trace -e "\e[34m$toolVersion\e[0m"
 
-trace -n "Building tool.. "
-nix-build https://github.com/NixOS/nixpkgs-vet/tarball/"$toolVersion" -o "$tmp/tool" -A build
 trace "Running nixpkgs-vet.."
-"$tmp/tool/bin/nixpkgs-vet" --base "$tmp/base" "$tmp/merged"
+nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged"

From 0e1c284b1321a3a2cacf96068fdba7b59ed0602b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 24 May 2025 16:13:22 +0200
Subject: [PATCH 149/204] workflows: checkout nixpkgs in get-merge-commit
 action

This makes checking out the nixpkgs repo even more consistent and almost
forces us to use the trusted/untrusted path pattern.
---
 .github/actions/get-merge-commit/action.yml | 31 ++++++++++++++++++---
 .github/workflows/check-format.yml          |  8 ++----
 .github/workflows/check-shell.yml           |  8 ++----
 .github/workflows/codeowners-v2.yml         | 19 +++----------
 .github/workflows/eval-aliases.yml          |  9 ++----
 .github/workflows/lib-tests.yml             |  8 ++----
 .github/workflows/manual-nixos-v2.yml       |  8 ++----
 .github/workflows/manual-nixpkgs-v2.yml     |  8 ++----
 .github/workflows/nix-parse-v2.yml          |  8 ++----
 .github/workflows/nixpkgs-vet.yml           | 15 ++--------
 10 files changed, 48 insertions(+), 74 deletions(-)

diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml
index 51f8a00286b5..a16d289cc6e0 100644
--- a/.github/actions/get-merge-commit/action.yml
+++ b/.github/actions/get-merge-commit/action.yml
@@ -1,19 +1,27 @@
 name: Get merge commit
 
-description: 'Checks whether the Pull Request is mergeable and returns two commit hashes: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.'
+description: 'Checks whether the Pull Request is mergeable and checks out the repo at up to two commits: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.'
+
+inputs:
+  merged-as-untrusted:
+    description: "Whether to checkout the merge commit in the ./untrusted folder."
+    type: boolean
+  target-as-trusted:
+    description: "Whether to checkout the target commit in the ./trusted folder."
+    type: boolean
 
 outputs:
   mergedSha:
     description: "The merge commit SHA"
-    value: ${{ steps.merged.outputs.mergedSha }}
+    value: ${{ steps.commits.outputs.mergedSha }}
   targetSha:
     description: "The target commit SHA"
-    value: ${{ steps.merged.outputs.targetSha }}
+    value: ${{ steps.commits.outputs.targetSha }}
 
 runs:
   using: composite
   steps:
-    - id: merged
+    - id: commits
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
       with:
         script: |
@@ -63,3 +71,18 @@ runs:
             return
           }
           throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
+
+      # Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
+      # but Nix is broken with them:
+      # https://github.com/NixOS/nix/issues/6073
+    - if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        ref: ${{ steps.commits.outputs.mergedSha }}
+        path: untrusted
+
+    - if: inputs.target-as-trusted && steps.commits.outputs.targetSha
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        ref: ${{ steps.commits.outputs.targetSha }}
+        path: trusted
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index ec83ffcce07c..4216c6bd1c70 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -16,14 +16,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 39fb722ae87a..014b60a492fa 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -33,14 +33,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 085abced061c..e858615c0828 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -46,9 +46,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge and target commits
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
+        with:
+          merged-as-untrusted: true
+          target-as-trusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
@@ -58,14 +60,6 @@ jobs:
           name: nixpkgs-ci
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
-      # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR itself.
-      # We later build and run code from the base branch with access to secrets,
-      # so it's important this is not the PRs code.
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ steps.get-merge-commit.outputs.targetSha }}
-          path: trusted
-
       - name: Build codeowners validator
         run: nix-build trusted/ci -A codeownersValidator
 
@@ -78,11 +72,6 @@ jobs:
           permission-administration: read
           permission-members: read
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
-
       - name: Validate codeowners
         if: steps.app-token.outputs.token
         env:
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index dc5bad6572fb..892dfe79907b 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -16,15 +16,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - name: Check out the PR at the test merge commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - name: Install Nix
         uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index 5e3a7a5cba66..c147d0084123 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -19,14 +19,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index ce5313c8135f..653a5a92fbfd 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -35,14 +35,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index 5cb63a2c88bd..13949dd3c36e 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -22,14 +22,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index ecbb9c843389..f75a46957f5a 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -17,14 +17,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout the merge commit
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          path: untrusted
+          merged-as-untrusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index dffa9b63dd89..e4fd7aa06c92 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -26,20 +26,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout: .github/actions
-      - name: Check if the PR can be merged and get the test merge commit
+      - name: Check if the PR can be merged and checkout merged and target commits
         uses: ./.github/actions/get-merge-commit
-        id: get-merge-commit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ steps.get-merge-commit.outputs.mergedSha }}
-          # Fetches the merge commit and its parents
-          fetch-depth: 2
-          path: untrusted
-
-      - name: Checking out target branch
-        run: |
-          git -C untrusted worktree add ../trusted ${{ steps.get-merge-commit.outputs.targetSha }}
+          merged-as-untrusted: true
+          target-as-trusted: true
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 

From 503a597b744768d5cb54a15c0e6e966335b33b1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 13:44:53 +0000
Subject: [PATCH 150/204] python3Packages.python-ecobee-api: 0.2.20 -> 0.3.0

---
 .../python-modules/python-ecobee-api/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix
index 21014c67d5ee..942497db0cde 100644
--- a/pkgs/development/python-modules/python-ecobee-api/default.nix
+++ b/pkgs/development/python-modules/python-ecobee-api/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "python-ecobee-api";
-  version = "0.2.20";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "nkgilley";
     repo = "python-ecobee-api";
     tag = version;
-    hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE=";
+    hash = "sha256-dJ7dVceYfmJHvk2OEXtRW/U8h2jFDc2aC58WmqhyP+k=";
   };
 
   build-system = [ setuptools ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API for talking to Ecobee thermostats";
     homepage = "https://github.com/nkgilley/python-ecobee-api";
-    changelog = "https://github.com/nkgilley/python-ecobee-api/releases/tag/${version}";
+    changelog = "https://github.com/nkgilley/python-ecobee-api/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From e32f07b6e1d63e3132e57a5d7eb84a8bcdcaf8b6 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 25 May 2025 16:22:52 +0200
Subject: [PATCH 151/204] cook-cli: 0.10.0 -> 0.12.1

https://github.com/cooklang/cookcli/releases/tag/v0.12.1
---
 pkgs/by-name/co/cook-cli/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index 5f873a8fdd61..6f5d8dc24195 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -8,17 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cook-cli";
-  version = "0.10.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "cooklang";
     repo = "cookcli";
     rev = "v${version}";
-    hash = "sha256-1m2+etJG+33fPTxBF8qT/U9WiZGcSn9r0WlK5PDL6/Q=";
+    hash = "sha256-2vY68PUoHDyyH3hJ/Fvjxbof7RzWFWYTg1UhsjWNpww=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-3tWVCP80a6odmi9C0klLbfO5UmdFczyUY8KQSaMIyw4=";
+  cargoHash = "sha256-H4soSp9fDwrqcv3eL5WqGYHWAt07gyVLoEVp1VbYchQ=";
 
   nativeBuildInputs = [
     pkg-config
@@ -39,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   passthru.ui = buildNpmPackage {
     name = "ui";
     src = "${src}/ui";
-    npmDepsHash = "sha256-uMyOAYLVHhY4ytvEFvVzdoQ7ExzQ4sH+ZtDrEacu5bk=";
+    npmDepsHash = "sha256-zx8G6Raop1EZAVy1YCF5ag5aL9NutRxbPfTARmjP2SY=";
     makeCacheWritable = true;
     npmFlags = [ "--legacy-peer-deps" ];
     installPhase = ''
@@ -49,13 +48,13 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}";
     description = "Suite of tools to create shopping lists and maintain recipes";
     homepage = "https://cooklang.org/";
-    license = [ licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "cook";
-    maintainers = [ maintainers.emilioziniades ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ lib.maintainers.emilioziniades ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 952db324ea7f9f50981f6d53b02c48647ad608d4 Mon Sep 17 00:00:00 2001
From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com>
Date: Sun, 25 May 2025 16:00:40 +0200
Subject: [PATCH 152/204] gjay:drop

Package has not been maintained actively for 10 years and still uses GTK2 which has been deprecated in 2020
---
 pkgs/by-name/gj/gjay/package.nix | 44 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/gj/gjay/package.nix

diff --git a/pkgs/by-name/gj/gjay/package.nix b/pkgs/by-name/gj/gjay/package.nix
deleted file mode 100644
index b58e8ba492e8..000000000000
--- a/pkgs/by-name/gj/gjay/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  dbus-glib,
-  audacious,
-  gtk2,
-  gsl,
-  libaudclient,
-  libmpdclient,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gjay";
-  version = "0.3.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/gjay/${pname}-${version}.tar.gz";
-    sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    libmpdclient
-    dbus-glib
-    audacious
-    gtk2
-    gsl
-    libaudclient
-  ];
-
-  hardeningDisable = [ "format" ];
-
-  meta = with lib; {
-    description = "Generates playlists such that each song sounds good following the previous song";
-    homepage = "https://gjay.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; linux;
-    mainProgram = "gjay";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a6cf0e2bdd4d..b8373f1857bf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -737,6 +737,7 @@ mapAliases {
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
   git-annex-utils = throw "'git-annex-utiks' has been removed as it is unmaintained"; # Added 2025-05-18
   git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
   gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
   gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
   gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14

From 810e02f034310ec0fe77b4625d2995ded5617c31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 15:01:53 +0000
Subject: [PATCH 153/204] gpxsee: 13.42 -> 13.43

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 54e0893960f8..476dbb6ed187 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "13.42";
+  version = "13.43";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-94zCDtja1b85Wgz4slG17ETT/TMPPCyXld3WdtGjBzA=";
+    hash = "sha256-IP5l8YUsCNm9rixgpQqbyyhfcBNQgrZha1MNjetug2c=";
   };
 
   buildInputs =

From f1c69b60ad81d9942207698bbf776273de6c3b4d Mon Sep 17 00:00:00 2001
From: Manuel Frischknecht <manuel.frischknecht@gmail.com>
Date: Sun, 25 May 2025 17:02:02 +0200
Subject: [PATCH 154/204] dclib: remove
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the tool's (Valknut, formerly DCGUI) website [^1],
the original author stopped maintaining the tool this library was
used for after the version packaged in nixpkgs up to now:

> Nach der Veröffentlichung von Valknut 0.3.7 stellte Mathias Küster die Arbeit an Valknut ein.

Someone else took over development, but the publishing folder for dclib
doesn't contain any new versions after v. 0.3.23 (2009) either [^2].
The GUI distribution folders also look abandoned.

As the version from 2009 also fails with the same build error and
this library isn't referenced anywhere else in nixpkgs (and there's
no listed maintainer), I advocate for removing this package.

[^1]: https://www.berlios.de/software/valknut/
[^2]: https://sourceforge.net/projects/wxdcgui/files/dclib/
---
 pkgs/by-name/dc/dclib/package.nix | 36 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/dc/dclib/package.nix

diff --git a/pkgs/by-name/dc/dclib/package.nix b/pkgs/by-name/dc/dclib/package.nix
deleted file mode 100644
index d95faed969ed..000000000000
--- a/pkgs/by-name/dc/dclib/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libxml2,
-  openssl,
-  bzip2,
-  zlib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dclib";
-  version = "0.3.7";
-
-  src = fetchurl {
-    url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-${version}.tar.bz2";
-    sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc";
-  };
-
-  buildInputs = [
-    libxml2
-    openssl
-    bzip2
-    zlib
-  ];
-
-  meta = with lib; {
-    description = "Peer-to-Peer file sharing client";
-    homepage = "http://dcgui.berlios.de";
-    platforms = platforms.linux;
-    license = [
-      licenses.openssl
-      licenses.gpl2
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a6cf0e2bdd4d..130ac3c4cd56 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -517,6 +517,7 @@ mapAliases {
   dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03
   dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
   dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17
+  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
   deadpixi-sam = deadpixi-sam-unstable;
 

From c2f043aafd2d07ec4e16414fff4b3a772d5554d7 Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Sun, 13 Apr 2025 21:09:25 +0200
Subject: [PATCH 155/204] ruqola: init at 2.5.0

---
 pkgs/by-name/ru/ruqola/package.nix | 65 ++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/ru/ruqola/package.nix

diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix
new file mode 100644
index 000000000000..7138368ee722
--- /dev/null
+++ b/pkgs/by-name/ru/ruqola/package.nix
@@ -0,0 +1,65 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  cmake,
+  extra-cmake-modules,
+  kdePackages,
+  qt6,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  name = "ruqola";
+  version = "2.5.0";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "network";
+    repo = "ruqola";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gcdu/+JTutY7gvokHNVbWH5D82HhtLXkL6PLZN81ano=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    kdePackages.karchive
+    kdePackages.kcodecs
+    kdePackages.kcoreaddons
+    kdePackages.kcrash
+    kdePackages.ki18n
+    kdePackages.kiconthemes
+    kdePackages.kidletime
+    kdePackages.kio
+    kdePackages.knotifyconfig
+    kdePackages.kstatusnotifieritem
+    kdePackages.ktextaddons
+    kdePackages.ktextwidgets
+    kdePackages.kxmlgui
+    kdePackages.plasma-activities
+    kdePackages.prison
+    kdePackages.purpose
+    kdePackages.qtkeychain
+    kdePackages.sonnet
+    kdePackages.syntax-highlighting
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtnetworkauth
+    qt6.qtwebsockets
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "KDE client for Rocket Chat";
+    homepage = "https://invent.kde.org/network/ruqola";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ lykos153 ];
+    mainProgram = "ruqola";
+  };
+})

From fce95bacf133602590363b8afdf8ee395290e155 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 15:42:17 +0000
Subject: [PATCH 156/204] retroarch-assets: 1.20.0-unstable-2025-03-21 ->
 1.20.0-unstable-2025-05-23

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

diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix
index 5f16bf6559d3..f76a143c8649 100644
--- a/pkgs/by-name/re/retroarch-assets/package.nix
+++ b/pkgs/by-name/re/retroarch-assets/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.20.0-unstable-2025-03-21";
+  version = "1.20.0-unstable-2025-05-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "818aca56efd784624a241a12936b5c0864e3ddd8";
-    hash = "sha256-14n9oQbvzl66pgWLMYEpAM7uJUH5e8a3xRCy5f1TFIw=";
+    rev = "2d24ef2972a709f870cc3f73853158fa2376f37d";
+    hash = "sha256-8FtY9W51Y0cLD61GHGz83TWoSyUuRfXEaAuEBKcFKRU=";
   };
 
   makeFlags = [

From 197d700cfd530db38ab8c03ce824bcc9ec765062 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 25 May 2025 17:35:17 +0200
Subject: [PATCH 157/204] python3Packages.aiodocker: unstable-2022-01-20 ->
 0.24.0

https://github.com/aio-libs/aiodocker/releases/tag/v0.24.0
---
 .../python-modules/aiodocker/default.nix      | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix
index 2aed190d8490..477fd65a3bfe 100644
--- a/pkgs/development/python-modules/aiodocker/default.nix
+++ b/pkgs/development/python-modules/aiodocker/default.nix
@@ -2,33 +2,39 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
+  hatch-vcs,
   aiohttp,
-  typing-extensions,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "aiodocker";
-  # unstable includes support for python 3.10+
-  version = "unstable-2022-01-20";
-  format = "setuptools";
+  version = "0.24.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiodocker";
-    rev = "f1dbdc3d42147f4c2ab5e6802acf6f7d0f885be4";
-    sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls=";
+    tag = "v${version}";
+    hash = "sha256-qCOAM4ZyJoLc91FjQpBO97Nyfo1ZOEi0nhXZ7nwLsHk=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
     aiohttp
-    typing-extensions
   ];
 
   # tests require docker daemon
   doCheck = false;
+
   pythonImportsCheck = [ "aiodocker" ];
 
   meta = with lib; {
+    changelog = "https://github.com/aio-libs/aiodocker/releases/tag/${src.tag}";
     description = "Docker API client for asyncio";
     homepage = "https://github.com/aio-libs/aiodocker";
     license = licenses.asl20;

From de1d581210a475747026974e600698a4f3a597cc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 25 May 2025 17:47:09 +0200
Subject: [PATCH 158/204] python3Packages.hatch-vcs: apply pep517 lingo

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

diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix
index f7fe24743c7b..3592cbf86d80 100644
--- a/pkgs/development/python-modules/hatch-vcs/default.nix
+++ b/pkgs/development/python-modules/hatch-vcs/default.nix
@@ -12,7 +12,7 @@
 buildPythonPackage rec {
   pname = "hatch-vcs";
   version = "0.4.0";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -22,9 +22,9 @@ buildPythonPackage rec {
     hash = "sha256-CTgQdI/gHbDUUfq88sGsJojK79Iy1O3pZwkLHBsH2fc=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     hatchling
     setuptools-scm
   ];

From 147794c3b73dd04e310f374cd4d8920a79a97207 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 08:50:33 -0700
Subject: [PATCH 159/204] python3Packages.langchain-community: disable flaky
 caching test

---
 pkgs/development/python-modules/langchain-community/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index fa332452fbbd..80c5f0e8139e 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -112,6 +112,7 @@ buildPythonPackage rec {
     # requires bs4, aka BeautifulSoup
     "test_importable_all"
     # flaky
+    "test_llm_caching"
     "test_llm_caching_async"
   ];
 

From 521560af3e737d8b5ca299d9d405fffdfc740e04 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 25 May 2025 18:20:20 +0200
Subject: [PATCH 160/204] python3Packages.pyfantom: drop

---
 .../python-modules/pyfantom/default.nix       | 25 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyfantom/default.nix

diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix
deleted file mode 100644
index 901a2be7484f..000000000000
--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchgit,
-}:
-
-buildPythonPackage {
-  pname = "pyfantom";
-  version = "unstable-2013-12-18";
-  format = "setuptools";
-
-  src = fetchgit {
-    url = "http://git.ni.fr.eu.org/pyfantom.git";
-    sha256 = "1m53n8bxslq5zmvcf7i1xzsgq5bdsf1z529br5ypmj5bg0s86j4q";
-  };
-
-  # No tests included
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://pyfantom.ni.fr.eu.org/";
-    description = "Wrapper for the LEGO Mindstorms Fantom Driver";
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7cd7e7c6dd88..b94e26f4121e 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -538,6 +538,7 @@ mapAliases ({
   pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14
   PyChromecast = pychromecast; # added 2023-02-19
   pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28
+  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
   pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17
   pyflunearyou = pyoutbreaksnearme; # added 2023-02-11
   pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c6ddce26ff2..7517bfd26122 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12369,8 +12369,6 @@ self: super: with self; {
 
   pyfakewebcam = callPackage ../development/python-modules/pyfakewebcam { };
 
-  pyfantom = callPackage ../development/python-modules/pyfantom { };
-
   pyfatfs = callPackage ../development/python-modules/pyfatfs { };
 
   pyfcm = callPackage ../development/python-modules/pyfcm { };

From 2ee5180743ba4dd762a6440defd98bb1a2d2ea2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 16:32:52 +0000
Subject: [PATCH 161/204] vscode-extensions.coder.coder-remote: 1.8.0 -> 1.9.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..561d1a228364 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1018,8 +1018,8 @@ let
         mktplcRef = {
           name = "coder-remote";
           publisher = "coder";
-          version = "1.8.0";
-          hash = "sha256-zAe2IFT69oZ/OLVSaaY5lGSiF/7FGiQngz/EXekwQtM=";
+          version = "1.9.0";
+          hash = "sha256-34Qu6BOQIbTsPeIGCp8Lcsz+FoDrP36PuYpX/4mqpvw=";
         };
         meta = {
           description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";

From 829010103137368f0431328435c9e17603e16837 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 25 May 2025 20:33:13 +0400
Subject: [PATCH 162/204] gpxsee-qt6: mark as unbroken on macOS

---
 pkgs/applications/misc/gpxsee/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 476dbb6ed187..c89d01584238 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    broken = isQt6 && stdenv.hostPlatform.isDarwin;
     changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
     description = "GPS log file viewer and analyzer";
     mainProgram = "gpxsee";

From d328e68e81995a093df1e010b65e677d9794d4d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 16:37:39 +0000
Subject: [PATCH 163/204] 
 vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 0.12.1 -> 0.14.0

---
 .../ms-windows-ai-studio.windows-ai-studio/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index 978644ebdb8f..5a0f77583f56 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "0.12.1";
-    hash = "sha256-uj+4o5gH6qfYCJjapoas/JDWymFWSl4kHFu5Ys9rTlU=";
+    version = "0.14.0";
+    hash = "sha256-qfEPvDHYjFWT+NMN6jlouRljtTflKOqn2wHL83tnUi0=";
   };
 
   meta = {

From 3641c822a5eb029a74adf585a5f7133808b28cfe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 16:48:47 +0000
Subject: [PATCH 164/204] vscode-extensions.eugleo.magic-racket: 0.6.7 -> 0.7.0

---
 .../editors/vscode/extensions/eugleo.magic-racket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix
index 53b23469eed7..f03ccea78b82 100644
--- a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "magic-racket";
     publisher = "evzen-wybitul";
-    version = "0.6.7";
-    hash = "sha256-1A4j8710AYuV8gA+sybv6WSavPVcCPMvI71h4n4Jx0w=";
+    version = "0.7.0";
+    hash = "sha256-8q2H9VPmdIAh4VmtGjIAwUfpr1P7+zmDLGiyCNbAXBU=";
   };
   nativeBuildInputs = [
     jq

From 20dcb0382de905a39b27b66b84315a4c232017a4 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 25 May 2025 18:50:32 +0200
Subject: [PATCH 165/204] python313Packages.cashaddress: fix version

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

diff --git a/pkgs/development/python-modules/cashaddress/default.nix b/pkgs/development/python-modules/cashaddress/default.nix
index ec7d20a9af68..f6338329bcc7 100644
--- a/pkgs/development/python-modules/cashaddress/default.nix
+++ b/pkgs/development/python-modules/cashaddress/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "cashaddress";
-  version = "1.0.6-unstable-2015-05-19";
+  version = "1.0.6-unstable-2019-05-15";
   pyproject = true;
 
   disabled = pythonOlder "3.7";

From 853d9a1ae47592dd224ac7bcf156ab89c7280a47 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 25 May 2025 18:51:09 +0200
Subject: [PATCH 166/204] python313Packages.cashaddress: remove problematic
 with lib usage

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

diff --git a/pkgs/development/python-modules/cashaddress/default.nix b/pkgs/development/python-modules/cashaddress/default.nix
index f6338329bcc7..433bacc750d1 100644
--- a/pkgs/development/python-modules/cashaddress/default.nix
+++ b/pkgs/development/python-modules/cashaddress/default.nix
@@ -27,11 +27,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "cashaddress" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python tool for convert bitcoin cash legacy addresses";
     homepage = "https://github.com/oskyk/cashaddress";
     changelog = "https://github.com/oskyk/cashaddress/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 589797166a04ab3fe8760881b0e1ccf0dbf6d2c5 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 25 May 2025 09:41:57 -0700
Subject: [PATCH 167/204] postman: 1.44.0 -> 1.46.6

---
 pkgs/by-name/po/postman/darwin.nix  | 4 ++--
 pkgs/by-name/po/postman/linux.nix   | 4 ++--
 pkgs/by-name/po/postman/package.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix
index bc7ce9fe2775..3deccfeeb464 100644
--- a/pkgs/by-name/po/postman/darwin.nix
+++ b/pkgs/by-name/po/postman/darwin.nix
@@ -13,12 +13,12 @@ let
     {
       aarch64-darwin = {
         arch = "arm64";
-        sha256 = "sha256-uhhrJk/WtM4tKsrBAn1IjHx0OeR/SpdOzy2XhoUP4sY=";
+        sha256 = "sha256-w1zu+sK8JqBMGBaKPYGJqddEWYWCv1aJRM+Q91l5dPw=";
       };
 
       x86_64-darwin = {
         arch = "64";
-        sha256 = "sha256-NYxcZoQYDyn85RkUz57b5yhzpeAK5xyyJF/7L2+3tt4=";
+        sha256 = "sha256-dlRK6NpDskuIW0nuf9mWx/xolOnGmH77ny+2ADaD7QU=";
       };
     }
     .${stdenvNoCC.hostPlatform.system}
diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
index 763330f35e03..a98ea9f4310c 100644
--- a/pkgs/by-name/po/postman/linux.nix
+++ b/pkgs/by-name/po/postman/linux.nix
@@ -56,12 +56,12 @@ let
     {
       aarch64-linux = {
         arch = "arm64";
-        sha256 = "sha256-/Qfd/xn+FwYLPSWssP5JFfjMdICz6HDg30edl/Fme5A=";
+        sha256 = "sha256-XtY5SmYoU2OhX69jRb8uSGwx5vPiSfgmF2jY7mJIrTY=";
       };
 
       x86_64-linux = {
         arch = "64";
-        sha256 = "sha256-BbTYT0GHU+BmWFXG2TU8PL90eTpLcyLgnwSw9YyWT0g=";
+        sha256 = "sha256-eEgUk3VnahmFua8UrNMUi2lG0UujiuDTs64XqaAkYe8=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix
index 3415c93e28e8..e174bf0c7d28 100644
--- a/pkgs/by-name/po/postman/package.nix
+++ b/pkgs/by-name/po/postman/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "postman";
-  version = "11.44.0";
+  version = "11.46.6";
   meta = with lib; {
     homepage = "https://www.getpostman.com";
     description = "API Development Environment";

From 3d0a5f81ecdbac8e7a762f9f08e9856e19b84160 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 25 May 2025 09:45:30 -0700
Subject: [PATCH 168/204] postman: add changelog

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

diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix
index e174bf0c7d28..b763a0f08ef4 100644
--- a/pkgs/by-name/po/postman/package.nix
+++ b/pkgs/by-name/po/postman/package.nix
@@ -9,6 +9,9 @@ let
   version = "11.46.6";
   meta = with lib; {
     homepage = "https://www.getpostman.com";
+    changelog = "https://www.postman.com/release-notes/postman-app/#${
+      replaceStrings [ "." ] [ "-" ] version
+    }";
     description = "API Development Environment";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.postman;

From 4531deeed8529305f327ea6bf6c06fa417331586 Mon Sep 17 00:00:00 2001
From: Thomas J <git@thomasjasny.de>
Date: Sun, 25 May 2025 18:58:12 +0200
Subject: [PATCH 169/204] nixos/borgmatic: do not create source directories for
 empty databases (#410752)

---
 nixos/modules/services/backup/borgmatic.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix
index f2f35f97d0dd..75dbf5fe1c77 100644
--- a/nixos/modules/services/backup/borgmatic.nix
+++ b/nixos/modules/services/backup/borgmatic.nix
@@ -17,7 +17,7 @@ let
   addRequiredBinaries =
     s:
     s
-    // {
+    // (lib.optionalAttrs (s ? postgresql_databases && s.postgresql_databases != [ ]) {
       postgresql_databases = map (
         d:
         let
@@ -33,7 +33,9 @@ let
           psql_command = "${as_user}${postgresql}/bin/psql";
         }
         // d
-      ) (s.postgresql_databases or [ ]);
+      ) s.postgresql_databases;
+    })
+    // (lib.optionalAttrs (s ? mariadb_databases && s.mariadb_databases != [ ]) {
       mariadb_databases = map (
         d:
         {
@@ -41,7 +43,9 @@ let
           mariadb_command = "${mysql}/bin/mariadb";
         }
         // d
-      ) (s.mariadb_databases or [ ]);
+      ) s.mariadb_databases;
+    })
+    // (lib.optionalAttrs (s ? mysql_databases && s.mysql_databases != [ ]) {
       mysql_databases = map (
         d:
         {
@@ -49,8 +53,8 @@ let
           mysql_command = "${mysql}/bin/mysql";
         }
         // d
-      ) (s.mysql_databases or [ ]);
-    };
+      ) s.mysql_databases;
+    });
 
   repository =
     with lib.types;
@@ -149,7 +153,9 @@ in
   config =
     let
       configFiles =
-        (lib.optionalAttrs (cfg.settings != null) { "borgmatic/config.yaml".source = cfgfile; })
+        (lib.optionalAttrs (cfg.settings != null) {
+          "borgmatic/config.yaml".source = cfgfile;
+        })
         // lib.mapAttrs' (
           name: value:
           lib.nameValuePair "borgmatic.d/${name}.yaml" {

From d066b13b3b0e97c8de04bade9247b4b0e9b58856 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:08:06 +0000
Subject: [PATCH 170/204] vscode-extensions.jnoortheen.nix-ide: 0.4.16 ->
 0.4.18

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..892e65bfbb49 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2716,8 +2716,8 @@ let
         mktplcRef = {
           publisher = "jnoortheen";
           name = "nix-ide";
-          version = "0.4.16";
-          hash = "sha256-MdFDOg9uTUzYtRW2Kk4L8V3T/87MRDy1HyXY9ikqDFY=";
+          version = "0.4.18";
+          hash = "sha256-ucy1Z0VcikEIU+s/Ai2qgJcUkEoNcAo7y7A2nuq3yZo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";

From bed077134ea733218a1fa2322fb3cf0b49f1e56f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:13:55 +0000
Subject: [PATCH 171/204] vscode-extensions.elixir-lsp.vscode-elixir-ls: 0.27.2
 -> 0.28.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..1fa21a42498e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1700,8 +1700,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.27.2";
-          hash = "sha256-PXQiZOAAApsYLB3hztQcjAsnmkfDSDtYvUmMhFUfLxA=";
+          version = "0.28.0";
+          hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

From b8ca5cd6c6ed7c83287da62aad9c747e8026c146 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:15:02 +0000
Subject: [PATCH 172/204] vscode-extensions.danielsanmedium.dscodegpt: 3.12.3
 -> 3.12.38

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..d65e39095189 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1210,8 +1210,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.12.3";
-          hash = "sha256-9vv/ourveSqLQyHylbWpUuJDwnpsZLihC800qDLI3YY=";
+          version = "3.12.38";
+          hash = "sha256-+9OsFH586I8/P7WzadRHS9tX22/bxOByJB2LDSqp2Nk=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From 257e872d5163976119c851e4cf25b2d61db792ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:15:18 +0000
Subject: [PATCH 173/204] vscode-extensions.bradlc.vscode-tailwindcss: 0.14.16
 -> 0.14.19

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..68f463327fee 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -786,8 +786,8 @@ let
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.16";
-          hash = "sha256-U2oZSIsLpqEqYBIEjSnIToEOOnTCUi4vR6XwjnNUDN8=";
+          version = "0.14.19";
+          hash = "sha256-HgrUTrYHJNC8tS8qZza98Tr3T0O0NMb7DgddNf3m7XY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";

From b2579d36ffbf8691ed1e9fcdc001d5880277ae14 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 May 2025 21:21:44 +0200
Subject: [PATCH 174/204] workflows/eval: consistently avoid "result" in
 arguments

Everything is a result, especially when nix-build uses "result" as its
default output. This becomes confusing, when re-wiring the different
parts later.

Thus, consistently name those things after some of their properties and
avoid the term result.
---
 .github/workflows/eval.yml  | 33 +++++++++++++++++----------------
 ci/eval/compare/default.nix | 14 +++++++-------
 ci/eval/default.nix         | 14 +++++++-------
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 0063ad1a12e9..1432aec3b0d1 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -74,14 +74,15 @@ jobs:
         run: |
           nix-build untrusted/ci -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
-            --arg chunkSize 10000
+            --arg chunkSize 10000 \
+            --out-link merged
           # If it uses too much memory, slightly decrease chunkSize
 
       - name: Upload the output paths and eval stats
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: intermediate-${{ matrix.system }}
-          path: result/*
+          name: merged-${{ matrix.system }}
+          path: merged/*
 
   process:
     name: Process
@@ -93,8 +94,8 @@ jobs:
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
-          pattern: intermediate-*
-          path: intermediate
+          pattern: merged-*
+          path: merged
           merge-multiple: true
 
       - name: Check out the PR at the test merge commit
@@ -111,14 +112,14 @@ jobs:
       - name: Combine all output paths and eval stats
         run: |
           nix-build untrusted/ci -A eval.combine \
-            --arg resultsDir ./intermediate \
-            -o prResult
+            --arg evalDir ./merged \
+            --out-link combined
 
       - name: Upload the combined results
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: result
-          path: prResult/*
+          name: combined
+          path: combined/*
 
       - name: Get target run id
         if: needs.prepare.outputs.targetSha
@@ -156,8 +157,8 @@ jobs:
       - uses: actions/download-artifact@v4
         if: steps.targetRunId.outputs.targetRunId
         with:
-          name: result
-          path: targetResult
+          name: combined
+          path: target
           merge-multiple: true
           github-token: ${{ github.token }}
           run-id: ${{ steps.targetRunId.outputs.targetRunId }}
@@ -174,15 +175,15 @@ jobs:
 
           # Use the target branch to get accurate maintainer info
           nix-build trusted/ci -A eval.compare \
-            --arg beforeResultDir ./targetResult \
-            --arg afterResultDir "$(realpath prResult)" \
+            --arg beforeDir ./target \
+            --arg afterDir "$(realpath combined)" \
             --arg touchedFilesJson ./touched-files.json \
             --argstr githubAuthorId "$AUTHOR_ID" \
-            -o comparison
+            --out-link comparison
 
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
 
-      - name: Upload the combined results
+      - name: Upload the comparison results
         if: steps.targetRunId.outputs.targetRunId
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
@@ -211,7 +212,7 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
-      - name: Download process result
+      - name: Download comparison result
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: comparison
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 68456135629a..01c735a4c218 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -7,8 +7,8 @@
   python3,
 }:
 {
-  beforeResultDir,
-  afterResultDir,
+  beforeDir,
+  afterDir,
   touchedFilesJson,
   githubAuthorId,
   byName ? false,
@@ -20,7 +20,7 @@ let
 
     ---
     Inputs:
-    - beforeResultDir, afterResultDir: The evaluation result from before and after the change.
+    - beforeDir, afterDir: The evaluation result from before and after the change.
       They can be obtained by running `nix-build -A ci.eval.full` on both revisions.
 
     ---
@@ -83,8 +83,8 @@ let
       data = builtins.unsafeDiscardStringContext raw;
     in
     builtins.fromJSON data;
-  beforeAttrs = getAttrs beforeResultDir;
-  afterAttrs = getAttrs afterResultDir;
+  beforeAttrs = getAttrs beforeDir;
+  afterAttrs = getAttrs afterDir;
 
   # Attrs
   # - keys: "added", "changed" and "removed"
@@ -149,8 +149,8 @@ runCommand "compare"
     maintainers = builtins.toJSON maintainers;
     passAsFile = [ "maintainers" ];
     env = {
-      BEFORE_DIR = "${beforeResultDir}";
-      AFTER_DIR = "${afterResultDir}";
+      BEFORE_DIR = "${beforeDir}";
+      AFTER_DIR = "${afterDir}";
     };
   }
   ''
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 2e5ac008312f..f60dd46efd3e 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -193,9 +193,9 @@ let
 
   combine =
     {
-      resultsDir,
+      evalDir,
     }:
-    runCommand "combined-result"
+    runCommand "combined-eval"
       {
         nativeBuildInputs = [
           jq
@@ -205,11 +205,11 @@ let
         mkdir -p $out
 
         # Combine output paths from all systems
-        cat ${resultsDir}/*/paths.json | jq -s add > $out/outpaths.json
+        cat ${evalDir}/*/paths.json | jq -s add > $out/outpaths.json
 
         mkdir -p $out/stats
 
-        for d in ${resultsDir}/*; do
+        for d in ${evalDir}/*; do
           cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")
         done
       '';
@@ -225,8 +225,8 @@ let
       quickTest ? false,
     }:
     let
-      results = symlinkJoin {
-        name = "results";
+      evals = symlinkJoin {
+        name = "evals";
         paths = map (
           evalSystem:
           singleSystem {
@@ -236,7 +236,7 @@ let
       };
     in
     combine {
-      resultsDir = results;
+      evalDir = evals;
     };
 
 in

From 13f5aa304ef68e02a35d0a26812217bb32d73be2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 25 May 2025 17:34:38 +0200
Subject: [PATCH 175/204] workflows/eval: run trusted code in process step

We don't really need to run the combine and comparison steps from the
untrusted merge commit. By switching to the trusted target commit, we
can avoid adding another worktree - and lay the foundation to later do
those steps in the tag job, which has access to secrets.
---
 .github/workflows/eval.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 1432aec3b0d1..0f5a3e90eea9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -98,11 +98,11 @@ jobs:
           path: merged
           merge-multiple: true
 
-      - name: Check out the PR at the test merge commit
+      - name: Check out the PR at the target commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.prepare.outputs.mergedSha }}
-          path: untrusted
+          ref: ${{ needs.prepare.outputs.targetSha }}
+          path: trusted
 
       - name: Install Nix
         uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
@@ -111,7 +111,7 @@ jobs:
 
       - name: Combine all output paths and eval stats
         run: |
-          nix-build untrusted/ci -A eval.combine \
+          nix-build trusted/ci -A eval.combine \
             --arg evalDir ./merged \
             --out-link combined
 
@@ -168,9 +168,8 @@ jobs:
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
-          git -C untrusted fetch --depth 1 origin ${{ needs.prepare.outputs.targetSha }}
-          git -C untrusted worktree add ../trusted ${{ needs.prepare.outputs.targetSha }}
-          git -C untrusted diff --name-only ${{ needs.prepare.outputs.targetSha }} \
+          git -C trusted fetch --depth 1 origin ${{ needs.prepare.outputs.mergedSha }}
+          git -C trusted diff --name-only ${{ needs.prepare.outputs.mergedSha }} \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info

From a6b659b08a58ed914c52a6042ad8b92ece8dea03 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 May 2025 13:50:19 +0200
Subject: [PATCH 176/204] workflows/eval: fetch target results in outpaths job

This is an intermediate step towards more efficiency. At this stage, the
outpaths job pulls the result from the matching outpaths job on the
target branch and uploads both results together. The process job then
downloads both results at once and does the comparison as usual.

This is slightly more inefficient, because the intermediate results are
essentially stored as artifacts twice. But that inefficiency will go
away in the next step, this refactor is split to make it slightly more
reviewable and testable.

On the other side, this allows us to save the process job on push events
entirely, which is a win, because most of it is setup and nix download
anyway.
---
 .github/workflows/eval.yml | 131 +++++++++++++++++++++----------------
 1 file changed, 76 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 0f5a3e90eea9..6f86d8587200 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -84,20 +84,84 @@ jobs:
           name: merged-${{ matrix.system }}
           path: merged/*
 
+      - name: Get target run id
+        if: needs.prepare.outputs.targetSha
+        id: targetRunId
+        env:
+          GH_TOKEN: ${{ github.token }}
+          MATRIX_SYSTEM: ${{ matrix.system }}
+          REPOSITORY: ${{ github.repository }}
+          TARGET_SHA: ${{ needs.prepare.outputs.targetSha }}
+        run: |
+          # Get the latest eval.yml workflow run for the PR's target commit
+          if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
+            -f head_sha="$TARGET_SHA" -f event=push \
+            --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
+            || [[ -z "$run" ]]; then
+            echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
+            exit 1
+          fi
+          echo "Comparing against $(jq .html_url <<< "$run")"
+          runId=$(jq .id <<< "$run")
+
+          if ! job=$(gh api --method GET /repos/"$REPOSITORY"/actions/runs/"$runId"/jobs \
+            --jq ".jobs[] | select (.name == \"Outpaths ($MATRIX_SYSTEM)\")") \
+            || [[ -z "$job" ]]; then
+            echo "Could not find the Outpaths ($MATRIX_SYSTEM) job for workflow run $runId, cannot make comparison"
+            exit 1
+          fi
+          jobId=$(jq .id <<< "$job")
+          conclusion=$(jq -r .conclusion <<< "$job")
+
+          while [[ "$conclusion" == null || "$conclusion" == "" ]]; do
+            echo "Job not done, waiting 10 seconds before checking again"
+            sleep 10
+            conclusion=$(gh api /repos/"$REPOSITORY"/actions/jobs/"$jobId" --jq '.conclusion')
+          done
+
+          if [[ "$conclusion" != "success" ]]; then
+            echo "Job was not successful (conclusion: $conclusion), cannot make comparison"
+            exit 1
+          fi
+
+          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/download-artifact@v4
+        if: steps.targetRunId.outputs.targetRunId
+        with:
+          run-id: ${{ steps.targetRunId.outputs.targetRunId }}
+          name: merged-${{ matrix.system }}
+          path: target
+          github-token: ${{ github.token }}
+          merge-multiple: true
+
+      - name: Upload the output paths and eval stats
+        if: steps.targetRunId.outputs.targetRunId
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: target-${{ matrix.system }}
+          path: target/*
+
   process:
     name: Process
     runs-on: ubuntu-24.04-arm
     needs: [ prepare, outpaths ]
-    outputs:
-      targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
+    if: needs.prepare.outputs.targetSha
     steps:
-      - name: Download output paths and eval stats for all systems
+      - name: Download output paths and eval stats for all systems (PR)
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           pattern: merged-*
           path: merged
           merge-multiple: true
 
+      - name: Download output paths and eval stats for all systems (target)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          pattern: target-*
+          path: target
+          merge-multiple: true
+
       - name: Check out the PR at the target commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -109,62 +173,20 @@ jobs:
         with:
           extra_nix_config: sandbox = true
 
-      - name: Combine all output paths and eval stats
+      - name: Combine all output paths and eval stats (PR)
         run: |
           nix-build trusted/ci -A eval.combine \
             --arg evalDir ./merged \
-            --out-link combined
+            --out-link combinedMerged
 
-      - name: Upload the combined results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: combined
-          path: combined/*
-
-      - name: Get target run id
+      - name: Combine all output paths and eval stats (target)
         if: needs.prepare.outputs.targetSha
-        id: targetRunId
-        env:
-          REPOSITORY: ${{ github.repository }}
-          TARGET_SHA: ${{ needs.prepare.outputs.targetSha }}
-          GH_TOKEN: ${{ github.token }}
         run: |
-          # Get the latest eval.yml workflow run for the PR's target commit
-          if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
-            -f head_sha="$TARGET_SHA" -f event=push \
-            --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
-            || [[ -z "$run" ]]; then
-            echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
-            exit 1
-          fi
-          echo "Comparing against $(jq .html_url <<< "$run")"
-          runId=$(jq .id <<< "$run")
-          conclusion=$(jq -r .conclusion <<< "$run")
-
-          while [[ "$conclusion" == null || "$conclusion" == "" ]]; do
-            echo "Workflow not done, waiting 10 seconds before checking again"
-            sleep 10
-            conclusion=$(gh api /repos/"$REPOSITORY"/actions/runs/"$runId" --jq '.conclusion')
-          done
-
-          if [[ "$conclusion" != "success" ]]; then
-            echo "Workflow was not successful (conclusion: $conclusion), cannot make comparison"
-            exit 1
-          fi
-
-          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/download-artifact@v4
-        if: steps.targetRunId.outputs.targetRunId
-        with:
-          name: combined
-          path: target
-          merge-multiple: true
-          github-token: ${{ github.token }}
-          run-id: ${{ steps.targetRunId.outputs.targetRunId }}
+          nix-build trusted/ci -A eval.combine \
+            --arg evalDir ./target \
+            -o combinedTarget
 
       - name: Compare against the target branch
-        if: steps.targetRunId.outputs.targetRunId
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
         run: |
@@ -174,8 +196,8 @@ jobs:
 
           # Use the target branch to get accurate maintainer info
           nix-build trusted/ci -A eval.compare \
-            --arg beforeDir ./target \
-            --arg afterDir "$(realpath combined)" \
+            --arg beforeDir "$(realpath combinedTarget)" \
+            --arg afterDir "$(realpath combinedMerged)" \
             --arg touchedFilesJson ./touched-files.json \
             --argstr githubAuthorId "$AUTHOR_ID" \
             --out-link comparison
@@ -183,7 +205,6 @@ jobs:
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
 
       - name: Upload the comparison results
-        if: steps.targetRunId.outputs.targetRunId
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: comparison
@@ -194,7 +215,7 @@ jobs:
     name: Tag
     runs-on: ubuntu-24.04-arm
     needs: [ prepare, process ]
-    if: needs.process.outputs.targetRunId
+    if: needs.prepare.outputs.targetSha
     permissions:
       pull-requests: write
       statuses: write

From 8a39ce4a48fab9b79be46e9ad28f410749f079d9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 May 2025 15:31:48 +0200
Subject: [PATCH 177/204] workflows/eval: diff outpaths immediately

This moves the diff of outpaths into the outpaths job, mainly as a
preparation to allow future improvements. For example, this will allow
running the purity release checks only on changed outpaths instead of
the whole eval.

This also removes the inefficiency introduced in the last commit about
uploading the intermediate paths twice. Now, only the diff is passed on.

Also, technically, the diff is now run in parallel across 4 jobs. This
should be *slightly* faster than before, where outpaths from all systems
were combined first and then diffed. It's probably only a few seconds,
though.
---
 .github/workflows/eval.yml  | 46 +++++++++++++---------------
 ci/eval/compare/default.nix | 22 +++----------
 ci/eval/compare/utils.nix   | 26 ----------------
 ci/eval/default.nix         | 41 +++++++++++++++++++------
 ci/eval/diff.nix            | 61 +++++++++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 79 deletions(-)
 create mode 100644 ci/eval/diff.nix

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 6f86d8587200..2d22270c4874 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -135,12 +135,23 @@ jobs:
           github-token: ${{ github.token }}
           merge-multiple: true
 
-      - name: Upload the output paths and eval stats
+      - name: Compare outpaths against the target branch
+        if: steps.targetRunId.outputs.targetRunId
+        env:
+          MATRIX_SYSTEM: ${{ matrix.system }}
+        run: |
+          nix-build untrusted/ci -A eval.diff \
+            --arg beforeDir ./target \
+            --arg afterDir "$(readlink ./merged)" \
+            --argstr evalSystem "$MATRIX_SYSTEM" \
+            --out-link diff
+
+      - name: Upload outpaths diff and stats
         if: steps.targetRunId.outputs.targetRunId
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: target-${{ matrix.system }}
-          path: target/*
+          name: diff-${{ matrix.system }}
+          path: diff/*
 
   process:
     name: Process
@@ -148,18 +159,11 @@ jobs:
     needs: [ prepare, outpaths ]
     if: needs.prepare.outputs.targetSha
     steps:
-      - name: Download output paths and eval stats for all systems (PR)
+      - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
-          pattern: merged-*
-          path: merged
-          merge-multiple: true
-
-      - name: Download output paths and eval stats for all systems (target)
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          pattern: target-*
-          path: target
+          pattern: diff-*
+          path: diff
           merge-multiple: true
 
       - name: Check out the PR at the target commit
@@ -173,18 +177,11 @@ jobs:
         with:
           extra_nix_config: sandbox = true
 
-      - name: Combine all output paths and eval stats (PR)
+      - name: Combine all output paths and eval stats
         run: |
           nix-build trusted/ci -A eval.combine \
-            --arg evalDir ./merged \
-            --out-link combinedMerged
-
-      - name: Combine all output paths and eval stats (target)
-        if: needs.prepare.outputs.targetSha
-        run: |
-          nix-build trusted/ci -A eval.combine \
-            --arg evalDir ./target \
-            -o combinedTarget
+            --arg diffDir ./diff \
+            --out-link combined
 
       - name: Compare against the target branch
         env:
@@ -196,8 +193,7 @@ jobs:
 
           # Use the target branch to get accurate maintainer info
           nix-build trusted/ci -A eval.compare \
-            --arg beforeDir "$(realpath combinedTarget)" \
-            --arg afterDir "$(realpath combinedMerged)" \
+            --arg combinedDir "$(realpath ./combined)" \
             --arg touchedFilesJson ./touched-files.json \
             --argstr githubAuthorId "$AUTHOR_ID" \
             --out-link comparison
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 01c735a4c218..f6cf1ebe7856 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -7,8 +7,7 @@
   python3,
 }:
 {
-  beforeDir,
-  afterDir,
+  combinedDir,
   touchedFilesJson,
   githubAuthorId,
   byName ? false,
@@ -66,7 +65,6 @@ let
       Example: { name = "python312Packages.numpy"; platform = "x86_64-linux"; }
   */
   inherit (import ./utils.nix { inherit lib; })
-    diff
     groupByKernel
     convertToPackagePlatformAttrs
     groupByPlatform
@@ -74,22 +72,10 @@ let
     getLabels
     ;
 
-  getAttrs =
-    dir:
-    let
-      raw = builtins.readFile "${dir}/outpaths.json";
-      # The file contains Nix paths; we need to ignore them for evaluation purposes,
-      # else there will be a "is not allowed to refer to a store path" error.
-      data = builtins.unsafeDiscardStringContext raw;
-    in
-    builtins.fromJSON data;
-  beforeAttrs = getAttrs beforeDir;
-  afterAttrs = getAttrs afterDir;
-
   # Attrs
   # - keys: "added", "changed" and "removed"
   # - values: lists of `packagePlatformPath`s
-  diffAttrs = diff beforeAttrs afterAttrs;
+  diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
 
   rebuilds = diffAttrs.added ++ diffAttrs.changed;
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
@@ -149,8 +135,8 @@ runCommand "compare"
     maintainers = builtins.toJSON maintainers;
     passAsFile = [ "maintainers" ];
     env = {
-      BEFORE_DIR = "${beforeDir}";
-      AFTER_DIR = "${afterDir}";
+      BEFORE_DIR = "${combinedDir}/before";
+      AFTER_DIR = "${combinedDir}/after";
     };
   }
   ''
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 6e75b2a62790..064d2cf57ea1 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -93,32 +93,6 @@ rec {
     in
     uniqueStrings (builtins.map (p: p.name) packagePlatformAttrs);
 
-  /*
-    Computes the key difference between two attrs
-
-    {
-      added: [ <keys only in the second object> ],
-      removed: [ <keys only in the first object> ],
-      changed: [ <keys with different values between the two objects> ],
-    }
-  */
-  diff =
-    let
-      filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
-    in
-    old: new: {
-      added = filterKeys (n: _: !(old ? ${n})) new;
-      removed = filterKeys (n: _: !(new ? ${n})) old;
-      changed = filterKeys (
-        n: v:
-        # Filter out attributes that don't exist anymore
-        (new ? ${n})
-
-        # Filter out attributes that are the same as the new value
-        && (v != (new.${n}))
-      ) old;
-    };
-
   /*
     Group a list of `packagePlatformAttr`s by platforms
 
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index f60dd46efd3e..82f69e1c9a44 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -191,9 +191,11 @@ let
         cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json
       '';
 
+  diff = callPackage ./diff.nix { };
+
   combine =
     {
-      evalDir,
+      diffDir,
     }:
     runCommand "combined-eval"
       {
@@ -205,12 +207,22 @@ let
         mkdir -p $out
 
         # Combine output paths from all systems
-        cat ${evalDir}/*/paths.json | jq -s add > $out/outpaths.json
+        cat ${diffDir}/*/diff.json | jq -s '
+          reduce .[] as $item ({}; {
+            added: (.added + $item.added),
+            changed: (.changed + $item.changed),
+            removed: (.removed + $item.removed)
+          })
+        ' > $out/combined-diff.json
 
-        mkdir -p $out/stats
+        mkdir -p $out/before/stats
+        for d in ${diffDir}/before/*; do
+          cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d")
+        done
 
-        for d in ${evalDir}/*; do
-          cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")
+        mkdir -p $out/after/stats
+        for d in ${diffDir}/after/*; do
+          cp -r "$d"/stats-by-chunk $out/after/stats/$(basename "$d")
         done
       '';
 
@@ -225,18 +237,26 @@ let
       quickTest ? false,
     }:
     let
-      evals = symlinkJoin {
-        name = "evals";
+      diffs = symlinkJoin {
+        name = "diffs";
         paths = map (
           evalSystem:
-          singleSystem {
-            inherit quickTest evalSystem chunkSize;
+          let
+            eval = singleSystem {
+              inherit quickTest evalSystem chunkSize;
+            };
+          in
+          diff {
+            inherit evalSystem;
+            # Local "full" evaluation doesn't do a real diff.
+            beforeDir = eval;
+            afterDir = eval;
           }
         ) evalSystems;
       };
     in
     combine {
-      evalDir = evals;
+      diffDir = diffs;
     };
 
 in
@@ -244,6 +264,7 @@ in
   inherit
     attrpathsSuperset
     singleSystem
+    diff
     combine
     compare
     # The above three are used by separate VMs in a GitHub workflow,
diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
new file mode 100644
index 000000000000..629b4f8d3a6a
--- /dev/null
+++ b/ci/eval/diff.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  runCommand,
+  writeText,
+}:
+
+{
+  beforeDir,
+  afterDir,
+  evalSystem,
+}:
+
+let
+  /*
+    Computes the key difference between two attrs
+
+    {
+      added: [ <keys only in the second object> ],
+      removed: [ <keys only in the first object> ],
+      changed: [ <keys with different values between the two objects> ],
+    }
+  */
+  diff =
+    let
+      filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
+    in
+    old: new: {
+      added = filterKeys (n: _: !(old ? ${n})) new;
+      removed = filterKeys (n: _: !(new ? ${n})) old;
+      changed = filterKeys (
+        n: v:
+        # Filter out attributes that don't exist anymore
+        (new ? ${n})
+
+        # Filter out attributes that are the same as the new value
+        && (v != (new.${n}))
+      ) old;
+    };
+
+  getAttrs =
+    dir:
+    let
+      raw = builtins.readFile "${dir}/${evalSystem}/paths.json";
+      # The file contains Nix paths; we need to ignore them for evaluation purposes,
+      # else there will be a "is not allowed to refer to a store path" error.
+      data = builtins.unsafeDiscardStringContext raw;
+    in
+    builtins.fromJSON data;
+
+  beforeAttrs = getAttrs beforeDir;
+  afterAttrs = getAttrs afterDir;
+  diffAttrs = diff beforeAttrs afterAttrs;
+  diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
+in
+runCommand "diff" { } ''
+  mkdir -p $out/${evalSystem}
+
+  cp -r ${beforeDir} $out/before
+  cp -r ${afterDir} $out/after
+  cp ${diffJson} $out/${evalSystem}/diff.json
+''

From b942fb47dc604f25e4bb710a1072f30e675c973a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 19 May 2025 20:14:13 +0200
Subject: [PATCH 178/204] workflows/eval: drop process job

Since process doesn't need to run on push events anymore, we can just as
well remove it entirely. The little bit of combine and comparison can be
done in the tag job, even with elevated privileges. That's because those
parts can be done entirely from the target commit, which is trusted.

This saves startup, installing nix, downloading tools and artifacts for
one job. It saves about 1 minute per run, start to finish.
---
 .github/workflows/eval.yml | 59 +++++++++++---------------------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 2d22270c4874..b9a9c7e9dcbe 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -153,11 +153,14 @@ jobs:
           name: diff-${{ matrix.system }}
           path: diff/*
 
-  process:
-    name: Process
+  tag:
+    name: Tag
     runs-on: ubuntu-24.04-arm
     needs: [ prepare, outpaths ]
     if: needs.prepare.outputs.targetSha
+    permissions:
+      pull-requests: write
+      statuses: write
     steps:
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -206,46 +209,6 @@ jobs:
           name: comparison
           path: comparison/*
 
-  # Separate job to have a very tightly scoped PR write token
-  tag:
-    name: Tag
-    runs-on: ubuntu-24.04-arm
-    needs: [ prepare, process ]
-    if: needs.prepare.outputs.targetSha
-    permissions:
-      pull-requests: write
-      statuses: write
-    steps:
-      # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
-      # Can't use the token received from permissions above, because it can't get enough permissions
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_APP_ID
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_APP_ID }}
-          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-          permission-administration: read
-          permission-members: read
-          permission-pull-requests: write
-
-      - name: Download comparison result
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: comparison
-          path: comparison
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
-
-      # Important: This workflow job runs with extra permissions,
-      # so we need to make sure to not run untrusted code from PRs
-      - name: Check out Nixpkgs at the target commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ needs.prepare.outputs.targetSha }}
-          path: trusted
-          sparse-checkout: ci
-
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews
 
@@ -303,6 +266,18 @@ jobs:
             "/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \
             -f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url"
 
+      # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
+      # Can't use the token received from permissions above, because it can't get enough permissions
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        if: vars.OWNER_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.OWNER_APP_ID }}
+          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+          permission-administration: read
+          permission-members: read
+          permission-pull-requests: write
+
       - name: Requesting maintainer reviews
         if: ${{ steps.app-token.outputs.token && github.repository_owner == 'NixOS' }}
         env:

From 9a8b214c68b1f658ebab39a8a52b0b2441323336 Mon Sep 17 00:00:00 2001
From: repparw <ubritos@gmail.com>
Date: Sun, 25 May 2025 12:14:08 -0300
Subject: [PATCH 179/204] task-master-ai: init at 0.15.0

---
 pkgs/by-name/ta/task-master-ai/package.nix | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/ta/task-master-ai/package.nix

diff --git a/pkgs/by-name/ta/task-master-ai/package.nix b/pkgs/by-name/ta/task-master-ai/package.nix
new file mode 100644
index 000000000000..77726e813901
--- /dev/null
+++ b/pkgs/by-name/ta/task-master-ai/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "task-master-ai";
+  version = "0.15.0";
+
+  src = fetchFromGitHub {
+    owner = "eyaltoledano";
+    repo = "claude-task-master";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cCfyQ9xU8axuZyTTVsrYVuic6DPHnAc4YX7aKj2MmSE=";
+  };
+
+  npmDepsHash = "sha256-UNGJ64E12ppo37gJBDNpyRFYfNEJMH5mRnK3HyWcy8E=";
+
+  dontNpmBuild = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Node.js agentic AI workflow orchestrator";
+    homepage = "https://task-master.dev";
+    changelog = "https://github.com/eyaltoledano/claude-task-master/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = licenses.mit;
+    mainProgram = "task-master-ai";
+    maintainers = [ maintainers.repparw ];
+    platforms = platforms.all;
+  };
+})

From ed1b7f0e7075c8835b96e300a29cb2671bd51749 Mon Sep 17 00:00:00 2001
From: repparw <ubritos@gmail.com>
Date: Sun, 25 May 2025 13:10:12 -0300
Subject: [PATCH 180/204] maintainers: add repparw

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d9731063b760..2867ce402dc6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20858,6 +20858,12 @@
     githubId = 3302;
     name = "Renzo Carbonara";
   };
+  repparw = {
+    email = "ubritos@gmail.com";
+    github = "repparw";
+    githubId = 45952970;
+    name = "repparw";
+  };
   reputable2772 = {
     name = "Reputable2772";
     github = "Reputable2772";

From 90b22d2bae9fc268bfce1782c76f89b8f78772bb Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 25 May 2025 19:31:07 +0200
Subject: [PATCH 181/204] openvscode-server: remove bendlas as maintainer
 (#410867)

---
 pkgs/servers/openvscode-server/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index e50c2c2b9874..36d49ba424d9 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -245,7 +245,6 @@ stdenv.mkDerivation (finalAttrs: {
       dguenther
       ghuntley
       emilytrau
-      bendlas
     ];
     platforms = [
       "x86_64-linux"

From 147c4599f97da52f24e5b47282ef53991df1c8e6 Mon Sep 17 00:00:00 2001
From: Squamto <25984337+Squamto@users.noreply.github.com>
Date: Sun, 25 May 2025 19:56:14 +0200
Subject: [PATCH 182/204] linux-it87: Update homepage to reflect new src repo

The homepage was still the old unmaintained repo, which lead to confusion.
---
 pkgs/os-specific/linux/it87/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix
index 030233fcc40d..a0f42ef1a909 100644
--- a/pkgs/os-specific/linux/it87/default.nix
+++ b/pkgs/os-specific/linux/it87/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Patched module for IT87xx superio chip sensors support";
-    homepage = "https://github.com/hannesha/it87";
+    homepage = "https://github.com/frankcrawford/it87";
     license = licenses.gpl2Plus;
     platforms = [
       "x86_64-linux"

From 3371e0d6df311e0c9d9c962b605800d3251a1bb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 17:59:03 +0000
Subject: [PATCH 183/204] vscode-extensions.maximedenes.vscoq: 2.2.5 -> 2.2.6

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..a6da1a8f9936 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3141,8 +3141,8 @@ let
         mktplcRef = {
           publisher = "maximedenes";
           name = "vscoq";
-          version = "2.2.5";
-          hash = "sha256-ctaeTgdK1JijSI3YD54iWEBNVrbaad408wD43fH78h4=";
+          version = "2.2.6";
+          hash = "sha256-QBUTOFhdksHGkpYqgQIF2u+WodYH5PmMMvGFHwEEEIk=";
         };
         meta = {
           description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant";

From 2dc0fbc979ec44ab128a92c9b57df3ae902f3e85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 18:01:41 +0000
Subject: [PATCH 184/204] vscode-extensions.github.copilot: 1.322.0 -> 1.323.0

---
 .../editors/vscode/extensions/github.copilot/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
index d1f2617f1775..668b086c4c78 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "github";
     name = "copilot";
-    version = "1.322.0";
-    hash = "sha256-PekZQeRqpCSSVQe+AA0XLAwC3K0LGtRMbfnN7MxfmGA=";
+    version = "1.323.0";
+    hash = "sha256-rTAq6snn3HAARrYbMJYy7aZ5rDucLfFS/t01VPjgXAo=";
   };
 
   meta = {

From 4ac09413d6cf3eada6e6c0317bebdcccfe23ecc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 18:08:09 +0000
Subject: [PATCH 185/204] vscode-extensions.danielgavin.ols: 0.1.35 -> 0.1.37

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..ed1090940470 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1195,8 +1195,8 @@ let
         mktplcRef = {
           publisher = "DanielGavin";
           name = "ols";
-          version = "0.1.35";
-          hash = "sha256-Kem8o0gM1+cYohmua17kIlAH1RURgqoc0sPuIFDVU8Q=";
+          version = "0.1.37";
+          hash = "sha256-R2vZNv6vkq5OIw3RzaAm4WGC4awiCC4junB3DRpJIfs=";
         };
         meta = {
           description = "Visual Studio Code extension for Odin language";

From 51d32532002aebc308388b3b9685babe9f5f595e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 18:11:43 +0000
Subject: [PATCH 186/204] vscode-extensions.amazonwebservices.amazon-q-vscode:
 1.67.0 -> 1.69.0

---
 .../extensions/amazonwebservices.amazon-q-vscode/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
index a31f8a10bb37..35472c001333 100644
--- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
   mktplcRef = {
     name = "amazon-q-vscode";
     publisher = "AmazonWebServices";
-    version = "1.67.0";
-    hash = "sha256-1GShGk0ulYlpJpcdai7T2n0p2v1qicLE4X2d7Pqx4Zc=";
+    version = "1.69.0";
+    hash = "sha256-DmkDkBItpcbCW3pQJ2j4SFJFubSL9jhfF66EDN96W5k=";
   };
 
   meta = {

From 5b64244f3fe95884b769ee9fa7ae6e74e7abff6c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 25 May 2025 14:15:33 -0400
Subject: [PATCH 187/204] nixVersions.nix_2_29: init

---
 pkgs/tools/package-management/nix/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 9818b0c9a254..35866d4331fc 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -186,6 +186,20 @@ lib.makeExtensible (
         self_attribute_name = "nix_2_28";
       };
 
+      nixComponents_2_29 = nixDependencies.callPackage ./modular/packages.nix rec {
+        version = "2.29.0";
+        inherit (self.nix_2_24.meta) maintainers teams;
+        otherSplices = generateSplicesForNixComponents "nixComponents_2_29";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = version;
+          hash = "sha256-fkbE3RCIUPFjS9A6SoEJbgMW3Rs98cs0ZZV/eTtJjaU=";
+        };
+      };
+
+      nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
+
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
         version = "2.30pre20250521_${lib.substring 0 8 src.rev}";
         inherit (self.nix_2_24.meta) maintainers teams;

From 6558d752ac5d9fca091352f4119f11481fff6eb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 18:47:09 +0000
Subject: [PATCH 188/204] vscode-extensions.ms-toolsai.datawrangler: 1.21.1 ->
 1.22.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 561d1a228364..c60c00599ccf 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3395,8 +3395,8 @@ let
         mktplcRef = {
           name = "datawrangler";
           publisher = "ms-toolsai";
-          version = "1.21.1";
-          hash = "sha256-I701ziW0Ibs92MzCuMGHv5AjhYrD3ow4/3U9MgB1onY=";
+          version = "1.22.0";
+          hash = "sha256-gUlb48g12RW4j2HS9jfpZROgtFM9zEPg4ozLM7hOaLk=";
         };
 
         meta = {

From 6c49f13575b9b639ab80629c6a1d3a862476a9bf Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 23 May 2025 10:45:42 -0400
Subject: [PATCH 189/204] superfile: 1.2.1 -> 1.3.1

Upstream added tests that reference the home directory, so added
writetableTmpDirAsHomeHook. I also added passthru.updateScript.

Diff: https://github.com/yorukot/superfile/compare/refs/tags/v1.2.1...refs/tags/v1.3.1

Changelogs:
* https://github.com/yorukot/superfile/blob/v1.3.0/changelog.md
* https://github.com/yorukot/superfile/releases/tag/v1.3.1
---
 pkgs/by-name/su/superfile/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix
index 67c4cebfbe82..66c8a76d3ab1 100644
--- a/pkgs/by-name/su/superfile/package.nix
+++ b/pkgs/by-name/su/superfile/package.nix
@@ -2,9 +2,11 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
+  writableTmpDirAsHomeHook,
 }:
 let
-  version = "1.2.1";
+  version = "1.3.1";
   tag = "v${version}";
 in
 buildGoModule {
@@ -15,16 +17,23 @@ buildGoModule {
     owner = "yorukot";
     repo = "superfile";
     inherit tag;
-    hash = "sha256-yClDrDpt6QUWeAtWkG0tkmFqnaviRixz6Kez0q4cRuk=";
+    hash = "sha256-GlPePeINZ6KL3RRqfQQFYsEdd+70bRJcMqMVnUmgo/I=";
   };
 
-  vendorHash = "sha256-STiuaNcmoviHBXGcSPPs39sICsks3Z8I3ANdnlUqA/k=";
+  vendorHash = "sha256-ArsB0B67ymuzxTXfaUuWiRrgVCrZhmGMbJUl2u+thUw=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
+  # Upstream notes that this could be flakey, and it consistently fails for me.
+  checkFlags = [ "-skip=^TestReturnDirElement/Sort_by_Date$" ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Pretty fancy and modern terminal file manager";
     homepage = "https://github.com/yorukot/superfile";

From 70252a94df09ad9c2facc5eddcf423254f250df3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 18:54:13 +0000
Subject: [PATCH 190/204] vscode-extensions.github.copilot-chat: 0.27.1 ->
 0.27.2

---
 .../editors/vscode/extensions/github.copilot-chat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
index 7453f8f2fc69..0976cf6d1ea3 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "github";
     name = "copilot-chat";
-    version = "0.27.1";
-    hash = "sha256-HXzPI8B4wISly2SQNdbFO6CEREfhey+SH4HhutxH7Mg=";
+    version = "0.27.2";
+    hash = "sha256-nwBDQNs5qrA0TxQZVtuXRiOy0iBNOCFpIim0x2k37YA=";
   };
 
   meta = {

From fab7c89af495178c8eeb2715b7cc653efba31f99 Mon Sep 17 00:00:00 2001
From: Thomas Zahner <thomas.zahner@protonmail.ch>
Date: Sun, 25 May 2025 20:50:02 +0200
Subject: [PATCH 191/204] tcp-cutter: drop

Remove tcp-cutter package because it no longer compiles and the source url died 2 years ago
---
 pkgs/by-name/tc/tcp-cutter/package.nix | 28 --------------------------
 pkgs/top-level/aliases.nix             |  3 ++-
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/by-name/tc/tcp-cutter/package.nix

diff --git a/pkgs/by-name/tc/tcp-cutter/package.nix b/pkgs/by-name/tc/tcp-cutter/package.nix
deleted file mode 100644
index 9ca1a2dd1399..000000000000
--- a/pkgs/by-name/tc/tcp-cutter/package.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tcp-cutter";
-  version = "1.04";
-
-  src = fetchurl {
-    url = "http://www.digitage.co.uk/digitage/files/cutter/${pname}-${version}.tgz";
-    sha256 = "100iy31a3njif6vh9gfsqrm14hac05rrflla275gd4rkxdlnqcqv";
-  };
-
-  installPhase = ''
-    install -D -m 0755 cutter $out/bin/tcp-cutter
-  '';
-
-  meta = with lib; {
-    description = "TCP/IP Connection cutting on Linux Firewalls and Routers";
-    homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.offline ];
-    mainProgram = "tcp-cutter";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dea3111f91e8..f5acb80a328e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1853,11 +1853,12 @@ mapAliases {
   tcludp = tclPackages.tcludp; # Added 2024-10-02
   tclvfs = tclPackages.tclvfs; # Added 2024-10-02
   tclx = tclPackages.tclx; # Added 2024-10-02
+  tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
   tdesktop = telegram-desktop; # Added 2023-04-07
   tdom = tclPackages.tdom; # Added 2024-10-02
   teamspeak_client = teamspeak3; # Added 2024-11-07
   teamspeak5_client = teamspeak6-client; # Added 2025-01-29
-  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
+  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # Added 2024-08-23
   telepathy-gabble = throw "'telepathy-gabble' has been removed as it was unmaintained, unused, broken and used outdated libraries"; # Added 2025-04-20
   telepathy-logger = throw "'telepathy-logger' has been removed as it was unmaintained, unused and broken"; # Added 2025-04-20
   teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26

From 5aa1b5c8291b5dc17e60a6fe8e87c681f622a02f Mon Sep 17 00:00:00 2001
From: "PAEPCKE, Michael" <git@paepcke.de>
Date: Sun, 25 May 2025 19:19:45 +0000
Subject: [PATCH 192/204] nixos/readeck: improve systemd start target

---
 nixos/modules/services/web-apps/readeck.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix
index f0e7252f40bd..0e5b68fc5faa 100644
--- a/nixos/modules/services/web-apps/readeck.nix
+++ b/nixos/modules/services/web-apps/readeck.nix
@@ -57,7 +57,8 @@ in
   config = mkIf cfg.enable {
     systemd.services.readeck = {
       description = "Readeck";
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "simple";

From 9dfeed8b42912c08d1a0a3411e538b9e180efe29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 19:32:29 +0000
Subject: [PATCH 193/204] python3Packages.eheimdigital: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix
index 438cbd43fa69..3dcc82c2d995 100644
--- a/pkgs/development/python-modules/eheimdigital/default.nix
+++ b/pkgs/development/python-modules/eheimdigital/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "eheimdigital";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "autinerd";
     repo = "eheimdigital";
     tag = version;
-    hash = "sha256-dqQeRaPy9NtvRhmGUVBVzmORJNYxzM2X/ricJUBlCK0=";
+    hash = "sha256-Jg5jVJAH6y2yrospcPJwHc/B0yd5ZRSXC6T7gYk7Sxs=";
   };
 
   build-system = [ hatchling ];

From ee4fdf237f3e5e9b91d9cb3e13c0a1e6ba50af90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 20:04:36 +0000
Subject: [PATCH 194/204] python3Packages.docling-core: 2.30.1 -> 2.31.2

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

diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 44eac5c91c86..f667e2ac0aa4 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.30.1";
+  version = "2.31.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-HTWd3jEStoRlX9NYYEO3PmC9i/cn3k+SJ7RFP0fxa3M=";
+    hash = "sha256-O0GfEoWImDjehCPb8erBdY2gYalj2im8rxdJKEsbUs4=";
   };
 
   build-system = [

From 0a6bc066dae9825b444922f6798a9a89aeb34d71 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 25 May 2025 16:29:08 +0400
Subject: [PATCH 195/204] gqrx: add darwin bundle

---
 pkgs/applications/radio/gqrx/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 2bb626cc324a..8b2610cf88b6 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   cmake,
+  desktopToDarwinBundle,
   pkg-config,
   qtbase,
   qtsvg,
@@ -45,7 +46,8 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     pkg-config
     wrapQtAppsHook
     wrapGAppsHook3
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+
   buildInputs =
     [
       gnuradioMinimal.unwrapped.logLib

From 951225149718c7596738df85268acc7ac955ce6d Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 22 May 2025 18:08:32 +0200
Subject: [PATCH 196/204] immich: 1.132.3 -> 1.133.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/im/immich/sources.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index 09cec8c283cb..855b14d14378 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,26 +1,26 @@
 {
-  "version": "1.132.3",
-  "hash": "sha256-QwQSqWSQ82R5LrbyerAZflDRM2DS+rpA8E6uzxQbs48=",
+  "version": "1.133.1",
+  "hash": "sha256-8jqFiVNj494GQInfLDTXm43mO+H9YuxPwIqUJFOwwW0=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-7CWJEEr/6+Duc90Qww6rhVLXEtxz3hymLcQIzv3YPg0=",
-      "version": "2.2.65"
+      "npmDepsHash": "sha256-oDgO8kb/8VqOAGUfG70x2K58j+OsZe+CjurEShiMeCU=",
+      "version": "2.2.67"
     },
     "server": {
-      "npmDepsHash": "sha256-CdE8H8+uAlthHhko5Ir+BETqkZoNzpimgHB2gVJbus8=",
-      "version": "1.132.3"
+      "npmDepsHash": "sha256-3beEul7d4OfByrcm4u28Qv7KTdPW8GJ2gnHfQHT9LY0=",
+      "version": "1.133.1"
     },
     "web": {
-      "npmDepsHash": "sha256-3UoNfa2P4bVFQSQTSbRacSxh2UbPokDHqveCHt9bnko=",
-      "version": "1.132.3"
+      "npmDepsHash": "sha256-xvSh0NGm7O+lunbHcE7aGv2OzQNVFlHWIeUAQPF218c=",
+      "version": "1.133.1"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-Rfds2/c8Q6KfWzyztxLcKS40JKOMh04JzMICsDvqMgs=",
-      "version": "1.132.3"
+      "npmDepsHash": "sha256-y2jwNlqGUIsr3DfNSpEr8BFdP7e8xvNUhBQ52ypf0YI=",
+      "version": "1.133.1"
     },
     "geonames": {
-      "timestamp": "20250428153140",
-      "hash": "sha256-RDetKDf/qFRwlB+Jo5ivD6yp1paMWFJeUf1Vft70Kdw="
+      "timestamp": "20250523191247",
+      "hash": "sha256-TiqUyYre3gGv3yJMoh6B+RZWu1AiMpgSZSW16NTI+Eg="
     }
   }
 }

From 42f7c724595c8b6350b1ed32551d971ce08b4425 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 21:20:33 +0000
Subject: [PATCH 197/204] ollama: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 2a3b650472b3..f972d5af23e3 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,13 +117,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rkSWMGMKzs7V6jmxS3fG611Zahsyzz5kDI8L4HxQSfQ=";
+    hash = "sha256-ee2MkvdVDQaSFJDDuXEwedqOB2DUl3MIfp5tRxqbL8A=";
     fetchSubmodules = true;
   };
 

From 884fc66c3839597badc64f3de6410cd3cb8d5a7f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 14:24:14 -0700
Subject: [PATCH 198/204] python3Packages.mutag: remove

Not used by any other package, upstream unmaintained since 2018.
---
 .../python-modules/mutag/default.nix          | 40 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mutag/default.nix

diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
deleted file mode 100644
index 6f7bf72c4a6e..000000000000
--- a/pkgs/development/python-modules/mutag/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pyparsing,
-  pythonOlder,
-  setuptools,
-}:
-
-buildPythonPackage {
-  pname = "mutag";
-  version = "0.0.2-unstable-2018-08-20";
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "aroig";
-    repo = "mutag";
-    rev = "9425169eb5d4aa9eb09f2809a09b83855b3acbef";
-    hash = "sha256-fEMmFRoFyLkqusAuhdx3XEPaPsu1x86ACAz9Vkl9YfA=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ pyparsing ];
-
-  # Module has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "mutag" ];
-
-  meta = with lib; {
-    description = "Script to change email tags in a mu indexed maildir";
-    homepage = "https://github.com/aroig/mutag";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    mainProgram = "mutag";
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b94e26f4121e..a140b395b247 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -423,6 +423,7 @@ mapAliases ({
   mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30
   mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
   multi_key_dict = multi-key-dict; # added 2023-11-05
+  mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
   mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02
   n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24
   nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7517bfd26122..dbf19b1b4b38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9320,8 +9320,6 @@ self: super: with self; {
 
   musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { };
 
-  mutag = callPackage ../development/python-modules/mutag { };
-
   mutagen = callPackage ../development/python-modules/mutagen { };
 
   mutatormath = callPackage ../development/python-modules/mutatormath { };

From 88a78211ca1497080c2c2597d6d04b589431cdb3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 09:40:48 -0700
Subject: [PATCH 199/204] python3Packages.kinparse: unstable-2019-12-18 ->
 1.2.3

---
 .../python-modules/kinparse/default.nix       | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix
index 8ddde08f68d8..7dc864b5b834 100644
--- a/pkgs/development/python-modules/kinparse/default.nix
+++ b/pkgs/development/python-modules/kinparse/default.nix
@@ -2,37 +2,49 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytest,
-  future,
   pyparsing,
+  pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "kinparse";
-  version = "unstable-2019-12-18";
-  format = "setuptools";
+  version = "1.2.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xesscorp";
     repo = "kinparse";
-    rev = "eeb3f346d57a67a471bdf111f39bef8932644481";
-    sha256 = "1nrjnybwzy93c79yylcwmb4lvkx7hixavnjwffslz0zwn32l0kx3";
+    tag = version;
+    hash = "sha256-170e2uhqpk6u/hahivWYubr3Ptb8ijymJSxhxrAfuyI=";
   };
 
+  # Remove python2 build support as it breaks python >= 3.13
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace-fail "universal = 1" "universal = 0"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ pyparsing ];
+
+  pythonRemoveDeps = [ "future" ];
+
+  preCheck = ''
+    substituteInPlace tests/test_kinparse.py \
+      --replace-fail "data/" "$src/tests/data/"
+  '';
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
   pythonImportsCheck = [ "kinparse" ];
 
-  nativeCheckInputs = [ pytest ];
-
-  propagatedBuildInputs = [
-    future
-    pyparsing
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Parser for KiCad EESCHEMA netlists";
     mainProgram = "kinparse";
     homepage = "https://github.com/xesscorp/kinparse";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthuszagh ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthuszagh ];
   };
 }

From d2ed42f2dc684c3d2550b0157d4d2a42f732f486 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 12:32:21 -0700
Subject: [PATCH 200/204] python3Packages.kivy-garden-modernmenu: remove

https://github.com/kivy-garden/garden.modernmenu archived 2019-12-10
---
 .../kivy-garden-modernmenu/default.nix        | 45 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/development/python-modules/kivy-garden-modernmenu/default.nix

diff --git a/pkgs/development/python-modules/kivy-garden-modernmenu/default.nix b/pkgs/development/python-modules/kivy-garden-modernmenu/default.nix
deleted file mode 100644
index 7ebb517f7de6..000000000000
--- a/pkgs/development/python-modules/kivy-garden-modernmenu/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  kivy,
-}:
-
-buildPythonPackage {
-  pname = "kivy-garden-modernmenu";
-  version = "0-unstable-2019-12-10";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "kivy-garden";
-    repo = "modernmenu";
-    rev = "681c3bf68b9ce2ebe653c2e6a9fcd2407bfe3e00";
-    hash = "sha256-0d4UhmRtuYwnYoZajjExavlvqkhGamiEQ8GjHWYnO88=";
-  };
-
-  strictDeps = true;
-
-  build-system = [
-    setuptools
-  ];
-
-  checkInputs = [
-    kivy
-  ];
-
-  pythonImportsCheck = [
-    "kivy_garden.modernmenu"
-  ];
-
-  preInstallCheck = ''
-    export HOME=$PWD
-  '';
-
-  meta = {
-    description = "Stylized menu system for Kivy";
-    homepage = "https://github.com/kivy-garden/modernmenu";
-    license = lib.licenses.mit;
-    teams = [ lib.teams.ngi ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b94e26f4121e..3050fafc0420 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -367,6 +367,7 @@ mapAliases ({
   keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12
   keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12
   keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
+  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2505-05-25
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchain-standard-tests = langchain-tests; # added 2025-01-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7517bfd26122..c0a71f5df10c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7511,8 +7511,6 @@ self: super: with self; {
 
   kivy-garden = callPackage ../development/python-modules/kivy-garden { };
 
-  kivy-garden-modernmenu = callPackage ../development/python-modules/kivy-garden-modernmenu { };
-
   kiwiki-client = callPackage ../development/python-modules/kiwiki-client { };
 
   kiwisolver = callPackage ../development/python-modules/kiwisolver { };

From a002df160c43ed73d27e55c6c6ff599ee5d430ac Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 14:58:07 -0700
Subject: [PATCH 201/204] python3Packages.softlayer: remove unused dependency

See https://github.com/softlayer/softlayer-python/blob/85255be090414bfded09e6c2a36fb2d679369e87/CHANGELOG.md?plain=1#L162
---
 pkgs/development/python-modules/softlayer/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix
index 1ff4abf9a06d..1d188cd39cde 100644
--- a/pkgs/development/python-modules/softlayer/default.nix
+++ b/pkgs/development/python-modules/softlayer/default.nix
@@ -11,7 +11,6 @@
   click,
   prettytable,
   prompt-toolkit,
-  ptable,
   pygments,
   requests,
   rich,
@@ -50,7 +49,6 @@ buildPythonPackage rec {
     click
     prettytable
     prompt-toolkit
-    ptable
     pygments
     requests
     rich

From c80cefcff97c2d23784d9c1f975336770a73433d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 14:58:07 -0700
Subject: [PATCH 202/204] python3Packages.ptable:remove

Unmaintained and no longer used by anyone.
---
 .../python-modules/ptable/default.nix         | 33 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ptable/default.nix

diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix
deleted file mode 100644
index d88a7433f068..000000000000
--- a/pkgs/development/python-modules/ptable/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  pytestCheckHook,
-}:
-
-buildPythonPackage {
-  pname = "ptable";
-  version = "unstable-2019-06-14";
-  pyproject = true;
-
-  # https://github.com/kxxoling/PTable/issues/27
-  src = fetchFromGitHub {
-    owner = "kxxoling";
-    repo = "PTable";
-    rev = "bcfdb92811ae1f39e1065f31544710bf87d3bc21";
-    sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i";
-  };
-
-  build-system = [ setuptools ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = with lib; {
-    homepage = "https://github.com/kxxoling/PTable";
-    description = "Simple Python library designed to make it quick and easy to represent tabular data in visually appealing ASCII tables";
-    mainProgram = "ptable";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.mmahut ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b94e26f4121e..fe5eb8c97077 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -510,6 +510,7 @@ mapAliases ({
   proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
   proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
   proxy_tools = proxy-tools; # added 2023-11-05
+  ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25
   pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
   pushbullet = pushbullet-py; # Added 2022-10-15
   push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7517bfd26122..5c45a2d52901 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11694,8 +11694,6 @@ self: super: with self; {
 
   psygnal = callPackage ../development/python-modules/psygnal { };
 
-  ptable = callPackage ../development/python-modules/ptable { };
-
   ptest = callPackage ../development/python-modules/ptest { };
 
   ptpython = callPackage ../development/python-modules/ptpython { };

From 31c672e5885bdf5ce63021ac6ab727741d89556f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 25 May 2025 13:00:25 -0700
Subject: [PATCH 203/204] python3Packages.contexttimer: unstable-2019-03-30 ->
 2024-09-05

---
 .../python-modules/contexttimer/default.nix   | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix
index 6029a556a270..987339bc9922 100644
--- a/pkgs/development/python-modules/contexttimer/default.nix
+++ b/pkgs/development/python-modules/contexttimer/default.nix
@@ -1,47 +1,45 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   fetchFromGitHub,
+  pythonOlder,
+  setuptools,
   mock,
-  fetchpatch,
-  python,
+  pytestCheckHook,
 }:
 
 buildPythonPackage {
   pname = "contexttimer";
-  version = "unstable-2019-03-30";
-  format = "setuptools";
-
-  disabled = pythonAtLeast "3.12";
+  version = "unstable-2024-09-05";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "brouberol";
     repo = "contexttimer";
-    rev = "a866f420ed4c10f29abf252c58b11f9db6706100";
-    hash = "sha256-Fc1vK1KSZWgBPtBf5dVydF6dLHEGAOslWMV0FLRdj8w=";
+    rev = "8e77927b8b75365f8e2bc456d2457b3e47c67815";
+    hash = "sha256-LCyXJa+7XkfxzcLGonv1yfOW+gZhLFBAbBT+5IP39qA=";
   };
 
-  patches = [
-    # https://github.com/brouberol/contexttimer/pull/16
-    (fetchpatch {
-      url = "https://github.com/brouberol/contexttimer/commit/dd65871f3f25a523a47a74f2f5306c57048592b0.patch";
-      hash = "sha256-vNBuFXvuvb6hWPzg4W4iyKbd4N+vofhxsKydEkc25E4=";
-    })
+  disabled = pythonOlder "3.12";
+
+  build-system = [ setuptools ];
+
+  preCheck = ''
+    substituteInPlace tests/test_timer.py \
+      --replace-fail "assertRegexpMatches" "assertRegex"
+  '';
+
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "contexttimer" ];
 
-  nativeCheckInputs = [ mock ];
-
-  checkPhase = ''
-    ${python.interpreter} -m unittest tests/test_timer.py
-  '';
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/brouberol/contexttimer";
     description = "Timer as a context manager";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ atila ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ atila ];
   };
 }

From 1fb0c25139637ac56901ef481124f521d8b140ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 22:51:45 +0000
Subject: [PATCH 204/204] flexget: 3.15.42 -> 3.16.1

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

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 9e3aae2585b1..3dc3eda4c780 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.15.42";
+  version = "3.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${version}";
-    hash = "sha256-ON0j5HYNbpHSwTMJgX/xPLjzLZXRDk1YogbhcwugxJE=";
+    hash = "sha256-IqkzMbWc8GiSo00sMrTugE+G552769WFz+GJbYIPOvs=";
   };
 
   pythonRelaxDeps = true;