From 142ecf93be0a24994d22466da1ba8f72d601c42f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 16:22:54 +0000
Subject: [PATCH 01/28] python3Packages.aocd: migrate to by-name

---
 pkgs/by-name/ao/aocd/package.nix                              | 4 ++++
 .../aocd/default.nix => by-name/ao/aocd/unwrapped.nix}        | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ao/aocd/package.nix
 rename pkgs/{development/python-modules/aocd/default.nix => by-name/ao/aocd/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/ao/aocd/package.nix b/pkgs/by-name/ao/aocd/package.nix
new file mode 100644
index 0000000000000..91ced33d32215
--- /dev/null
+++ b/pkgs/by-name/ao/aocd/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.aocd
diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/by-name/ao/aocd/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/aocd/default.nix
rename to pkgs/by-name/ao/aocd/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ef0add7e5f0..a1c43d9cd167a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -273,8 +273,6 @@ with pkgs;
 
   # addDriverRunpath is the preferred package name, as this enables
   # many more scenarios than just opengl now.
-  aocd = with python3Packages; toPythonApplication aocd;
-
   cve = with python3Packages; toPythonApplication cvelib;
 
   bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e27fb27d8d67..92c0f5715cf0d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -826,7 +826,7 @@ self: super: with self; {
 
   anywidget = callPackage ../development/python-modules/anywidget { };
 
-  aocd = callPackage ../development/python-modules/aocd { };
+  aocd = callPackage ../by-name/ao/aocd/unwrapped.nix { };
 
   aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { };
 

From 95779efde233e851640ce23ab21f660173429eee Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 18:15:25 +0000
Subject: [PATCH 02/28] python3Packages.acquire: migrate to by-name

---
 pkgs/by-name/ac/acquire/package.nix                           | 4 ++++
 .../acquire/default.nix => by-name/ac/acquire/unwrapped.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ac/acquire/package.nix
 rename pkgs/{development/python-modules/acquire/default.nix => by-name/ac/acquire/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/ac/acquire/package.nix b/pkgs/by-name/ac/acquire/package.nix
new file mode 100644
index 0000000000000..04dbb74ba59d1
--- /dev/null
+++ b/pkgs/by-name/ac/acquire/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.acquire
diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/by-name/ac/acquire/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/acquire/default.nix
rename to pkgs/by-name/ac/acquire/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1c43d9cd167a..6f7eabb5dfa66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -975,8 +975,6 @@ with pkgs;
 
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
-  acquire = with python3Packages; toPythonApplication acquire;
-
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
   opnplug = adlplug.override { type = "OPN"; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 92c0f5715cf0d..e5ca9e0748a1d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -55,7 +55,7 @@ self: super: with self; {
 
   acme-tiny = callPackage ../development/python-modules/acme-tiny { };
 
-  acquire = callPackage ../development/python-modules/acquire { };
+  acquire = callPackage ../by-name/ac/acquire/unwrapped.nix { };
 
   acres = callPackage ../development/python-modules/acres { };
 

From f26bcf19a3c484ef14116f30b399215b62e2dee9 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 18:22:51 +0000
Subject: [PATCH 03/28] python3Packages.actdiag: migrate to by-name

---
 .../ac}/actdiag/fix_test_generate.patch                       | 0
 pkgs/by-name/ac/actdiag/package.nix                           | 4 ++++
 .../actdiag/default.nix => by-name/ac/actdiag/unwrapped.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/{development/python-modules => by-name/ac}/actdiag/fix_test_generate.patch (100%)
 create mode 100644 pkgs/by-name/ac/actdiag/package.nix
 rename pkgs/{development/python-modules/actdiag/default.nix => by-name/ac/actdiag/unwrapped.nix} (100%)

diff --git a/pkgs/development/python-modules/actdiag/fix_test_generate.patch b/pkgs/by-name/ac/actdiag/fix_test_generate.patch
similarity index 100%
rename from pkgs/development/python-modules/actdiag/fix_test_generate.patch
rename to pkgs/by-name/ac/actdiag/fix_test_generate.patch
diff --git a/pkgs/by-name/ac/actdiag/package.nix b/pkgs/by-name/ac/actdiag/package.nix
new file mode 100644
index 0000000000000..bba6abed40cfe
--- /dev/null
+++ b/pkgs/by-name/ac/actdiag/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.actdiag
diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/by-name/ac/actdiag/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/actdiag/default.nix
rename to pkgs/by-name/ac/actdiag/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f7eabb5dfa66..50486622d5712 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -975,8 +975,6 @@ with pkgs;
 
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
-  actdiag = with python3.pkgs; toPythonApplication actdiag;
-
   opnplug = adlplug.override { type = "OPN"; };
 
   aflplusplus = callPackage ../tools/security/aflplusplus { wine = null; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e5ca9e0748a1d..f6a73504b6262 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -59,7 +59,7 @@ self: super: with self; {
 
   acres = callPackage ../development/python-modules/acres { };
 
-  actdiag = callPackage ../development/python-modules/actdiag { };
+  actdiag = callPackage ../by-name/ac/actdiag/unwrapped.nix { };
 
   actron-neo-api = callPackage ../development/python-modules/actron-neo-api { };
 

From 203002d07c71181e5d3cd930ebd905c51463d4a1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 18:29:57 +0000
Subject: [PATCH 04/28] python3Packages.aioblescan: migrate to by-name

---
 pkgs/by-name/ai/aioblescan/package.nix                        | 4 ++++
 .../default.nix => by-name/ai/aioblescan/unwrapped.nix}       | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ai/aioblescan/package.nix
 rename pkgs/{development/python-modules/aioblescan/default.nix => by-name/ai/aioblescan/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/ai/aioblescan/package.nix b/pkgs/by-name/ai/aioblescan/package.nix
new file mode 100644
index 0000000000000..819a0b96d27a9
--- /dev/null
+++ b/pkgs/by-name/ai/aioblescan/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.aioblescan
diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/by-name/ai/aioblescan/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/aioblescan/default.nix
rename to pkgs/by-name/ai/aioblescan/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50486622d5712..4b3357fef6013 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -981,8 +981,6 @@ with pkgs;
 
   libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { };
 
-  aioblescan = with python3Packages; toPythonApplication aioblescan;
-
   inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
     akku
     akkuPackages
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f6a73504b6262..11aa07a64c0c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -230,7 +230,7 @@ self: super: with self; {
 
   aiobiketrax = callPackage ../development/python-modules/aiobiketrax { };
 
-  aioblescan = callPackage ../development/python-modules/aioblescan { };
+  aioblescan = callPackage ../by-name/ai/aioblescan/unwrapped.nix { };
 
   aioboto3 = callPackage ../development/python-modules/aioboto3 { };
 

From 7f608d71d86c21e4cf741fd3166f395175d9a337 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 18:39:39 +0000
Subject: [PATCH 05/28] python3Packages.auditwheel: migrate to by-name

---
 pkgs/by-name/au/auditwheel/package.nix                        | 4 ++++
 .../default.nix => by-name/au/auditwheel/unwrapped.nix}       | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/au/auditwheel/package.nix
 rename pkgs/{development/python-modules/auditwheel/default.nix => by-name/au/auditwheel/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/au/auditwheel/package.nix b/pkgs/by-name/au/auditwheel/package.nix
new file mode 100644
index 0000000000000..2ba1bf3d9d662
--- /dev/null
+++ b/pkgs/by-name/au/auditwheel/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.auditwheel
diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/by-name/au/auditwheel/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/auditwheel/default.nix
rename to pkgs/by-name/au/auditwheel/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b3357fef6013..ee0ab7770994b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -989,8 +989,6 @@ with pkgs;
   alice-tools-qt5 = alice-tools.override { withQt5 = true; };
   alice-tools-qt6 = alice-tools.override { withQt6 = true; };
 
-  auditwheel = with python3Packages; toPythonApplication auditwheel;
-
   btrsync = with python3Packages; toPythonApplication btrsync;
 
   davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11aa07a64c0c9..f5937c55cac49 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1215,7 +1215,7 @@ self: super: with self; {
 
   auditok = callPackage ../development/python-modules/auditok { };
 
-  auditwheel = callPackage ../development/python-modules/auditwheel {
+  auditwheel = callPackage ../by-name/au/auditwheel/unwrapped.nix {
     inherit (pkgs)
       bzip2
       gnutar

From 2779e9b21fe8ed23732f81ec4b61e4dd66e8247e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 18:48:53 +0000
Subject: [PATCH 06/28] python3Packages.dehinter: migrate to by-name

---
 pkgs/by-name/de/dehinter/package.nix                          | 4 ++++
 .../default.nix => by-name/de/dehinter/unwrapped.nix}         | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/de/dehinter/package.nix
 rename pkgs/{development/python-modules/dehinter/default.nix => by-name/de/dehinter/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/de/dehinter/package.nix b/pkgs/by-name/de/dehinter/package.nix
new file mode 100644
index 0000000000000..84057bf8048cd
--- /dev/null
+++ b/pkgs/by-name/de/dehinter/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.dehinter
diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/by-name/de/dehinter/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/dehinter/default.nix
rename to pkgs/by-name/de/dehinter/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee0ab7770994b..af9a23139c333 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -995,8 +995,6 @@ with pkgs;
     studioVariant = true;
   };
 
-  dehinter = with python3Packages; toPythonApplication dehinter;
-
   gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
     enableExecutable = false;
     enableWsi = true;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f5937c55cac49..2c911a95ac6a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3796,7 +3796,7 @@ self: super: with self; {
 
   defusedxml = callPackage ../development/python-modules/defusedxml { };
 
-  dehinter = callPackage ../development/python-modules/dehinter { };
+  dehinter = callPackage ../by-name/de/dehinter/unwrapped.nix { };
 
   deid = callPackage ../development/python-modules/deid { };
 

From 83152bd39fedc969b1369b0f7ad75b58387ec805 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 18:55:03 +0000
Subject: [PATCH 07/28] python3Packages.bloodhound-py: migrate to by-name

---
 pkgs/by-name/bl/bloodhound-py/package.nix                     | 4 ++++
 .../default.nix => by-name/bl/bloodhound-py/unwrapped.nix}    | 0
 pkgs/top-level/all-packages.nix                               | 2 --
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/bl/bloodhound-py/package.nix
 rename pkgs/{development/python-modules/bloodhound-py/default.nix => by-name/bl/bloodhound-py/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/bl/bloodhound-py/package.nix b/pkgs/by-name/bl/bloodhound-py/package.nix
new file mode 100644
index 0000000000000..30deae3045338
--- /dev/null
+++ b/pkgs/by-name/bl/bloodhound-py/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.bloodhound-py
diff --git a/pkgs/development/python-modules/bloodhound-py/default.nix b/pkgs/by-name/bl/bloodhound-py/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/bloodhound-py/default.nix
rename to pkgs/by-name/bl/bloodhound-py/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af9a23139c333..f99c795dba531 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -275,8 +275,6 @@ with pkgs;
   # many more scenarios than just opengl now.
   cve = with python3Packages; toPythonApplication cvelib;
 
-  bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
-
   # Zip file format only allows times after year 1980, which makes e.g. Python
   # wheel building fail with:
   # ValueError: ZIP does not support timestamps before 1980
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c911a95ac6a1..d4c0d57f9e6e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2146,7 +2146,7 @@ self: super: with self; {
 
   blocksat-cli = callPackage ../development/python-modules/blocksat-cli { };
 
-  bloodhound-py = callPackage ../development/python-modules/bloodhound-py { };
+  bloodhound-py = callPackage ../by-name/bl/bloodhound-py/unwrapped.nix { };
 
   bloodyad = callPackage ../development/python-modules/bloodyad { };
 

From 5c427cd731442dfafffc8648ea1f9c1b866c582d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 19:00:08 +0000
Subject: [PATCH 08/28] python3Packages.blocksat-cli: migrate to by-name

---
 pkgs/by-name/bl/blocksat-cli/package.nix                     | 5 +++++
 .../default.nix => by-name/bl/blocksat-cli/unwrapped.nix}    | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/bl/blocksat-cli/package.nix
 rename pkgs/{development/python-modules/blocksat-cli/default.nix => by-name/bl/blocksat-cli/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/bl/blocksat-cli/package.nix b/pkgs/by-name/bl/blocksat-cli/package.nix
new file mode 100644
index 0000000000000..ffb132806d9b5
--- /dev/null
+++ b/pkgs/by-name/bl/blocksat-cli/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.blocksat-cli
diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/by-name/bl/blocksat-cli/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/blocksat-cli/default.nix
rename to pkgs/by-name/bl/blocksat-cli/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f99c795dba531..2bdbccbb88bab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1420,8 +1420,6 @@ with pkgs;
 
   bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { };
 
-  blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
-
   bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; };
   bucklespring = bucklespring-x11;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d4c0d57f9e6e9..735731aef48a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2144,7 +2144,7 @@ self: super: with self; {
 
   blockfrost-python = callPackage ../development/python-modules/blockfrost-python { };
 
-  blocksat-cli = callPackage ../development/python-modules/blocksat-cli { };
+  blocksat-cli = callPackage ../by-name/bl/blocksat-cli/unwrapped.nix { };
 
   bloodhound-py = callPackage ../by-name/bl/bloodhound-py/unwrapped.nix { };
 

From df8d63e5752d18679282403224032a4b859ac5b4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 19:07:45 +0000
Subject: [PATCH 09/28] python3Packages.bump2version: migrate to by-name

---
 pkgs/by-name/bu/bump2version/package.nix                     | 5 +++++
 .../default.nix => by-name/bu/bump2version/unwrapped.nix}    | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/bu/bump2version/package.nix
 rename pkgs/{development/python-modules/bump2version/default.nix => by-name/bu/bump2version/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/bu/bump2version/package.nix b/pkgs/by-name/bu/bump2version/package.nix
new file mode 100644
index 0000000000000..2d90ad21646fd
--- /dev/null
+++ b/pkgs/by-name/bu/bump2version/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.bump2version
diff --git a/pkgs/development/python-modules/bump2version/default.nix b/pkgs/by-name/bu/bump2version/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/bump2version/default.nix
rename to pkgs/by-name/bu/bump2version/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bdbccbb88bab..3323c0c79c0b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1097,8 +1097,6 @@ with pkgs;
     withpcre2 = false;
   };
 
-  bump2version = with python3Packages; toPythonApplication bump2version;
-
   cgit = callPackage ../applications/version-management/cgit { };
 
   datalad = with python3Packages; toPythonApplication datalad;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 735731aef48a9..061790c2c2b19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2363,7 +2363,7 @@ self: super: with self; {
 
   bump-my-version = callPackage ../development/python-modules/bump-my-version { };
 
-  bump2version = callPackage ../development/python-modules/bump2version { };
+  bump2version = callPackage ../by-name/bu/bump2version/unwrapped.nix { };
 
   bumpfontversion = callPackage ../development/python-modules/bumpfontversion { };
 

From 9b41bd9e30d4ef24c64c99ce07f419d6fee22ff2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 19:15:57 +0000
Subject: [PATCH 10/28] python3Packages.cvelib: migrate to by-name

---
 pkgs/by-name/cv/cve/package.nix                              | 5 +++++
 .../cvelib/default.nix => by-name/cv/cve/unwrapped.nix}      | 0
 pkgs/top-level/all-packages.nix                              | 1 -
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/cv/cve/package.nix
 rename pkgs/{development/python-modules/cvelib/default.nix => by-name/cv/cve/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/cv/cve/package.nix b/pkgs/by-name/cv/cve/package.nix
new file mode 100644
index 0000000000000..f09a850894d3d
--- /dev/null
+++ b/pkgs/by-name/cv/cve/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.cvelib
diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/by-name/cv/cve/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/cvelib/default.nix
rename to pkgs/by-name/cv/cve/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3323c0c79c0b3..e13c4d21b3f96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -273,7 +273,6 @@ with pkgs;
 
   # addDriverRunpath is the preferred package name, as this enables
   # many more scenarios than just opengl now.
-  cve = with python3Packages; toPythonApplication cvelib;
 
   # Zip file format only allows times after year 1980, which makes e.g. Python
   # wheel building fail with:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 061790c2c2b19..979b1e84aa849 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3422,7 +3422,7 @@ self: super: with self; {
 
   cv2-enumerate-cameras = callPackage ../development/python-modules/cv2-enumerate-cameras { };
 
-  cvelib = callPackage ../development/python-modules/cvelib { };
+  cvelib = callPackage ../by-name/cv/cve/unwrapped.nix { };
 
   cvss = callPackage ../development/python-modules/cvss { };
 

From 47e1390f93b01d95aed0b6e0dd219837f9d24844 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 19:40:37 +0000
Subject: [PATCH 11/28] python3Packages.datalad-gooey: migrate to by-name

---
 pkgs/by-name/da/datalad-gooey/package.nix                    | 5 +++++
 .../da}/datalad-gooey/setuptools.patch                       | 0
 .../default.nix => by-name/da/datalad-gooey/unwrapped.nix}   | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/da/datalad-gooey/package.nix
 rename pkgs/{development/python-modules => by-name/da}/datalad-gooey/setuptools.patch (100%)
 rename pkgs/{development/python-modules/datalad-gooey/default.nix => by-name/da/datalad-gooey/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/da/datalad-gooey/package.nix b/pkgs/by-name/da/datalad-gooey/package.nix
new file mode 100644
index 0000000000000..1d908cc0d5fb6
--- /dev/null
+++ b/pkgs/by-name/da/datalad-gooey/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.datalad-gooey
diff --git a/pkgs/development/python-modules/datalad-gooey/setuptools.patch b/pkgs/by-name/da/datalad-gooey/setuptools.patch
similarity index 100%
rename from pkgs/development/python-modules/datalad-gooey/setuptools.patch
rename to pkgs/by-name/da/datalad-gooey/setuptools.patch
diff --git a/pkgs/development/python-modules/datalad-gooey/default.nix b/pkgs/by-name/da/datalad-gooey/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/datalad-gooey/default.nix
rename to pkgs/by-name/da/datalad-gooey/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e13c4d21b3f96..7c9fe3a17789a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1100,8 +1100,6 @@ with pkgs;
 
   datalad = with python3Packages; toPythonApplication datalad;
 
-  datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;
-
   forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
 
   github-cli = gh;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 979b1e84aa849..9e0bef6f3c84a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3614,7 +3614,7 @@ self: super: with self; {
 
   datalad = callPackage ../development/python-modules/datalad { };
 
-  datalad-gooey = callPackage ../development/python-modules/datalad-gooey { };
+  datalad-gooey = callPackage ../by-name/da/datalad-gooey/unwrapped.nix { };
 
   datalad-next = callPackage ../development/python-modules/datalad-next { };
 

From ac2602bcfa464f41244a2be0a53b3099d221d1e6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 19:50:49 +0000
Subject: [PATCH 12/28] python3Packages.datalad: migrate to by-name

---
 pkgs/by-name/da/datalad/package.nix                          | 5 +++++
 .../datalad/default.nix => by-name/da/datalad/unwrapped.nix} | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/da/datalad/package.nix
 rename pkgs/{development/python-modules/datalad/default.nix => by-name/da/datalad/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/da/datalad/package.nix b/pkgs/by-name/da/datalad/package.nix
new file mode 100644
index 0000000000000..e129ee2f39333
--- /dev/null
+++ b/pkgs/by-name/da/datalad/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.datalad
diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/by-name/da/datalad/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/datalad/default.nix
rename to pkgs/by-name/da/datalad/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c9fe3a17789a..1a37744f47be0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1098,8 +1098,6 @@ with pkgs;
 
   cgit = callPackage ../applications/version-management/cgit { };
 
-  datalad = with python3Packages; toPythonApplication datalad;
-
   forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
 
   github-cli = gh;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e0bef6f3c84a..14d4098df6b7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3612,7 +3612,7 @@ self: super: with self; {
     protoc = pkgs.protobuf;
   };
 
-  datalad = callPackage ../development/python-modules/datalad { };
+  datalad = callPackage ../by-name/da/datalad/unwrapped.nix { };
 
   datalad-gooey = callPackage ../by-name/da/datalad-gooey/unwrapped.nix { };
 

From 096163deee74c9a6d9e565daad89b18a600b2e21 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 19:57:37 +0000
Subject: [PATCH 13/28] python3Packages.dinghy: migrate to by-name

---
 pkgs/by-name/di/dinghy/package.nix                           | 5 +++++
 .../dinghy/default.nix => by-name/di/dinghy/unwrapped.nix}   | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/di/dinghy/package.nix
 rename pkgs/{development/python-modules/dinghy/default.nix => by-name/di/dinghy/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/di/dinghy/package.nix b/pkgs/by-name/di/dinghy/package.nix
new file mode 100644
index 0000000000000..9ed1fe5934132
--- /dev/null
+++ b/pkgs/by-name/di/dinghy/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.dinghy
diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/by-name/di/dinghy/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/dinghy/default.nix
rename to pkgs/by-name/di/dinghy/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a37744f47be0..b8e62aa446c97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -326,8 +326,6 @@ with pkgs;
 
   dhallToNix = callPackage ../build-support/dhall/to-nix.nix { };
 
-  dinghy = with python3Packages; toPythonApplication dinghy;
-
   djgpp = djgpp_i586;
   djgpp_i586 = callPackage ../development/compilers/djgpp {
     targetArchitecture = "i586";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14d4098df6b7e..e5db64cc2d4fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3920,7 +3920,7 @@ self: super: with self; {
 
   dill = callPackage ../development/python-modules/dill { };
 
-  dinghy = callPackage ../development/python-modules/dinghy { };
+  dinghy = callPackage ../by-name/di/dinghy/unwrapped.nix { };
 
   dingz = callPackage ../development/python-modules/dingz { };
 

From 19c78df53d396e4c44c26ed25969f759b54e206a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:01:47 +0000
Subject: [PATCH 14/28] python3Packages.dnf-plugins-core: migrate to by-name

---
 pkgs/by-name/dn/dnf-plugins-core/package.nix                 | 5 +++++
 .../dn/dnf-plugins-core/unwrapped.nix}                       | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/dn/dnf-plugins-core/package.nix
 rename pkgs/{development/python-modules/dnf-plugins-core/default.nix => by-name/dn/dnf-plugins-core/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/dn/dnf-plugins-core/package.nix b/pkgs/by-name/dn/dnf-plugins-core/package.nix
new file mode 100644
index 0000000000000..d4affcf7d1c6d
--- /dev/null
+++ b/pkgs/by-name/dn/dnf-plugins-core/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.dnf-plugins-core
diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/by-name/dn/dnf-plugins-core/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/dnf-plugins-core/default.nix
rename to pkgs/by-name/dn/dnf-plugins-core/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8e62aa446c97..eca1744eb4af9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -338,8 +338,6 @@ with pkgs;
     }
   );
 
-  dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core;
-
   dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };
 
   ebpf-verifier = callPackage ../tools/networking/ebpf-verifier {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e5db64cc2d4fe..0f51316dd2e74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4505,7 +4505,7 @@ self: super: with self; {
 
   dncil = callPackage ../development/python-modules/dncil { };
 
-  dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { };
+  dnf-plugins-core = callPackage ../by-name/dn/dnf-plugins-core/unwrapped.nix { };
 
   dnf4 = callPackage ../development/python-modules/dnf4 { };
 

From 8051d96c759c4a97ff0358596675ae071ddf33f0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:04:39 +0000
Subject: [PATCH 15/28] python3Packages.font-v: migrate to by-name

---
 pkgs/by-name/fo/font-v/package.nix                           | 5 +++++
 .../font-v/default.nix => by-name/fo/font-v/unwrapped.nix}   | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-v/package.nix
 rename pkgs/{development/python-modules/font-v/default.nix => by-name/fo/font-v/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/fo/font-v/package.nix b/pkgs/by-name/fo/font-v/package.nix
new file mode 100644
index 0000000000000..f22f39dd53278
--- /dev/null
+++ b/pkgs/by-name/fo/font-v/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.font-v
diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/by-name/fo/font-v/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/font-v/default.nix
rename to pkgs/by-name/fo/font-v/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eca1744eb4af9..907838dc76539 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -993,8 +993,6 @@ with pkgs;
     enableWsi = true;
   };
 
-  font-v = with python3Packages; toPythonApplication font-v;
-
   fontbakery = with python3Packages; toPythonApplication fontbakery;
 
   genealogos-api = genealogos-cli.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f51316dd2e74..a278db9b4a748 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5809,7 +5809,7 @@ self: super: with self; {
 
   folium = callPackage ../development/python-modules/folium { };
 
-  font-v = callPackage ../development/python-modules/font-v { };
+  font-v = callPackage ../by-name/fo/font-v/unwrapped.nix { };
 
   fontawesomefree = callPackage ../development/python-modules/fontawesomefree { };
 

From 226dc3535e0c72c4fe3ab918d72fd876e6be9b5c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:08:13 +0000
Subject: [PATCH 16/28] python3Packages.fontbakery: migrate to by-name

---
 pkgs/by-name/fo/fontbakery/package.nix                       | 5 +++++
 .../python-modules => by-name/fo}/fontbakery/tests.nix       | 0
 .../default.nix => by-name/fo/fontbakery/unwrapped.nix}      | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/fo/fontbakery/package.nix
 rename pkgs/{development/python-modules => by-name/fo}/fontbakery/tests.nix (100%)
 rename pkgs/{development/python-modules/fontbakery/default.nix => by-name/fo/fontbakery/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/fo/fontbakery/package.nix b/pkgs/by-name/fo/fontbakery/package.nix
new file mode 100644
index 0000000000000..1448ebe4d1329
--- /dev/null
+++ b/pkgs/by-name/fo/fontbakery/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.fontbakery
diff --git a/pkgs/development/python-modules/fontbakery/tests.nix b/pkgs/by-name/fo/fontbakery/tests.nix
similarity index 100%
rename from pkgs/development/python-modules/fontbakery/tests.nix
rename to pkgs/by-name/fo/fontbakery/tests.nix
diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/by-name/fo/fontbakery/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/fontbakery/default.nix
rename to pkgs/by-name/fo/fontbakery/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 907838dc76539..a89cf4f1abc52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -993,8 +993,6 @@ with pkgs;
     enableWsi = true;
   };
 
-  fontbakery = with python3Packages; toPythonApplication fontbakery;
-
   genealogos-api = genealogos-cli.override {
     crate = "api";
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a278db9b4a748..d0e03ae8433a0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5813,7 +5813,7 @@ self: super: with self; {
 
   fontawesomefree = callPackage ../development/python-modules/fontawesomefree { };
 
-  fontbakery = callPackage ../development/python-modules/fontbakery { };
+  fontbakery = callPackage ../by-name/fo/fontbakery/unwrapped.nix { };
 
   fontfeatures = callPackage ../development/python-modules/fontfeatures { };
 

From f48818c3908c65dbb9aa6b865b9933ec03edd13f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:11:59 +0000
Subject: [PATCH 17/28] python3Packages.ghrepo-stats: migrate to by-name

---
 pkgs/by-name/gh/ghrepo-stats/package.nix                     | 5 +++++
 .../default.nix => by-name/gh/ghrepo-stats/unwrapped.nix}    | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/gh/ghrepo-stats/package.nix
 rename pkgs/{development/python-modules/ghrepo-stats/default.nix => by-name/gh/ghrepo-stats/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/gh/ghrepo-stats/package.nix b/pkgs/by-name/gh/ghrepo-stats/package.nix
new file mode 100644
index 0000000000000..d5856c2f3668f
--- /dev/null
+++ b/pkgs/by-name/gh/ghrepo-stats/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.ghrepo-stats
diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/by-name/gh/ghrepo-stats/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/ghrepo-stats/default.nix
rename to pkgs/by-name/gh/ghrepo-stats/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a89cf4f1abc52..a0ffb29e12b9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1139,8 +1139,6 @@ with pkgs;
 
   git-autofixup = perlPackages.GitAutofixup;
 
-  ghrepo-stats = with python3Packages; toPythonApplication ghrepo-stats;
-
   git-filter-repo = with python3Packages; toPythonApplication git-filter-repo;
 
   git-revise = with python3Packages; toPythonApplication git-revise;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0e03ae8433a0..7326189750294 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6226,7 +6226,7 @@ self: super: with self; {
 
   ghp-import = callPackage ../development/python-modules/ghp-import { };
 
-  ghrepo-stats = callPackage ../development/python-modules/ghrepo-stats { };
+  ghrepo-stats = callPackage ../by-name/gh/ghrepo-stats/unwrapped.nix { };
 
   gibberish-detector = callPackage ../development/python-modules/gibberish-detector { };
 

From 27aaa9f5ec81d66151f9619998c071d635d3dae2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:14:33 +0000
Subject: [PATCH 18/28] python3Packages.git-filter-repo: migrate to by-name

---
 pkgs/by-name/gi/git-filter-repo/package.nix                  | 5 +++++
 .../default.nix => by-name/gi/git-filter-repo/unwrapped.nix} | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/gi/git-filter-repo/package.nix
 rename pkgs/{development/python-modules/git-filter-repo/default.nix => by-name/gi/git-filter-repo/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/gi/git-filter-repo/package.nix b/pkgs/by-name/gi/git-filter-repo/package.nix
new file mode 100644
index 0000000000000..b0a6f685ae0aa
--- /dev/null
+++ b/pkgs/by-name/gi/git-filter-repo/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.git-filter-repo
diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/by-name/gi/git-filter-repo/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/git-filter-repo/default.nix
rename to pkgs/by-name/gi/git-filter-repo/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0ffb29e12b9e..ba98dc9000498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1139,8 +1139,6 @@ with pkgs;
 
   git-autofixup = perlPackages.GitAutofixup;
 
-  git-filter-repo = with python3Packages; toPythonApplication git-filter-repo;
-
   git-revise = with python3Packages; toPythonApplication git-revise;
 
   ### APPLICATIONS/EMULATORS
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7326189750294..73ff6566740cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6246,7 +6246,7 @@ self: super: with self; {
 
   git-dummy = callPackage ../development/python-modules/git-dummy { };
 
-  git-filter-repo = callPackage ../development/python-modules/git-filter-repo { };
+  git-filter-repo = callPackage ../by-name/gi/git-filter-repo/unwrapped.nix { };
 
   git-find-repos = callPackage ../development/python-modules/git-find-repos { };
 

From 9aaced00d97cf3f5a9b67ccdfd65caa21ba8fd42 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:17:06 +0000
Subject: [PATCH 19/28] python3Packages.git-revise: migrate to by-name

---
 pkgs/by-name/gi/git-revise/package.nix                       | 5 +++++
 .../default.nix => by-name/gi/git-revise/unwrapped.nix}      | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/gi/git-revise/package.nix
 rename pkgs/{development/python-modules/git-revise/default.nix => by-name/gi/git-revise/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/gi/git-revise/package.nix b/pkgs/by-name/gi/git-revise/package.nix
new file mode 100644
index 0000000000000..aa9ad1833d48c
--- /dev/null
+++ b/pkgs/by-name/gi/git-revise/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.git-revise
diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/by-name/gi/git-revise/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/git-revise/default.nix
rename to pkgs/by-name/gi/git-revise/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba98dc9000498..64f57d829c91b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1139,8 +1139,6 @@ with pkgs;
 
   git-autofixup = perlPackages.GitAutofixup;
 
-  git-revise = with python3Packages; toPythonApplication git-revise;
-
   ### APPLICATIONS/EMULATORS
 
   _86box-with-roms = _86box.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73ff6566740cf..ff54ea634aa85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6250,7 +6250,7 @@ self: super: with self; {
 
   git-find-repos = callPackage ../development/python-modules/git-find-repos { };
 
-  git-revise = callPackage ../development/python-modules/git-revise { };
+  git-revise = callPackage ../by-name/gi/git-revise/unwrapped.nix { };
 
   git-sweep = callPackage ../development/python-modules/git-sweep { };
 

From d22b34ff10fef06192a1c8010a269c69dbf221d2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:19:16 +0000
Subject: [PATCH 20/28] python3Packages.magika: migrate to by-name

---
 pkgs/by-name/ma/magika/package.nix                           | 5 +++++
 .../magika/default.nix => by-name/ma/magika/unwrapped.nix}   | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ma/magika/package.nix
 rename pkgs/{development/python-modules/magika/default.nix => by-name/ma/magika/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/ma/magika/package.nix b/pkgs/by-name/ma/magika/package.nix
new file mode 100644
index 0000000000000..1c93348953f5c
--- /dev/null
+++ b/pkgs/by-name/ma/magika/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.magika
diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/by-name/ma/magika/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/magika/default.nix
rename to pkgs/by-name/ma/magika/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64f57d829c91b..127565a1e3f92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -485,8 +485,6 @@ with pkgs;
 
   prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
 
-  magika = with python3Packages; toPythonApplication magika;
-
   mysql-shell = mysql-shell_8;
 
   inherit
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff54ea634aa85..c03d6a72dc423 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9379,7 +9379,7 @@ self: super: with self; {
 
   magicgui = callPackage ../development/python-modules/magicgui { };
 
-  magika = callPackage ../development/python-modules/magika { };
+  magika = callPackage ../by-name/ma/magika/unwrapped.nix { };
 
   mahotas = callPackage ../development/python-modules/mahotas { };
 

From 398fff39159b4fbdda62615156e2273cf8d5fef8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:22:17 +0000
Subject: [PATCH 21/28] python3Packages.oletools: migrate to by-name

---
 pkgs/by-name/ol/oletools/package.nix                         | 5 +++++
 .../default.nix => by-name/ol/oletools/unwrapped.nix}        | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ol/oletools/package.nix
 rename pkgs/{development/python-modules/oletools/default.nix => by-name/ol/oletools/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/ol/oletools/package.nix b/pkgs/by-name/ol/oletools/package.nix
new file mode 100644
index 0000000000000..73e0401541faf
--- /dev/null
+++ b/pkgs/by-name/ol/oletools/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.oletools
diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/by-name/ol/oletools/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/oletools/default.nix
rename to pkgs/by-name/ol/oletools/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 127565a1e3f92..14d516a65f703 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -366,8 +366,6 @@ with pkgs;
 
   octodns-providers = octodns.providers;
 
-  oletools = with python3.pkgs; toPythonApplication oletools;
-
   ollama-cpu = callPackage ../by-name/ol/ollama/package.nix { acceleration = false; };
   ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; };
   ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c03d6a72dc423..eeddc6b372515 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11327,7 +11327,7 @@ self: super: with self; {
 
   olefile = callPackage ../development/python-modules/olefile { };
 
-  oletools = callPackage ../development/python-modules/oletools { };
+  oletools = callPackage ../by-name/ol/oletools/unwrapped.nix { };
 
   ollama = callPackage ../development/python-modules/ollama { };
 

From 2d0fabe6f1533548ab30fd07bc280f49e288a666 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:41:02 +0000
Subject: [PATCH 22/28] python3Packages.py65: migrate to by-name

---
 pkgs/by-name/py/py65/package.nix                             | 5 +++++
 .../py65/default.nix => by-name/py/py65/unwrapped.nix}       | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/py/py65/package.nix
 rename pkgs/{development/python-modules/py65/default.nix => by-name/py/py65/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/py/py65/package.nix b/pkgs/by-name/py/py65/package.nix
new file mode 100644
index 0000000000000..c751645493be9
--- /dev/null
+++ b/pkgs/by-name/py/py65/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.py65
diff --git a/pkgs/development/python-modules/py65/default.nix b/pkgs/by-name/py/py65/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/py65/default.nix
rename to pkgs/by-name/py/py65/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14d516a65f703..d9830e8593a0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1218,8 +1218,6 @@ with pkgs;
     in
     ppsspp.override argset;
 
-  py65 = with python3.pkgs; toPythonApplication py65;
-
   rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
     withWayland = true;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eeddc6b372515..01fa5d5739bba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13112,7 +13112,7 @@ self: super: with self; {
 
   py4j = callPackage ../development/python-modules/py4j { };
 
-  py65 = callPackage ../development/python-modules/py65 { };
+  py65 = callPackage ../by-name/py/py65/unwrapped.nix { };
 
   py7zr = callPackage ../development/python-modules/py7zr { };
 

From 7117c0b6be45ea397c2015b418a01feb57816143 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:43:53 +0000
Subject: [PATCH 23/28] python3Packages.py7zr: migrate to by-name

---
 pkgs/by-name/py/py7zr/package.nix                            | 5 +++++
 .../py7zr/default.nix => by-name/py/py7zr/unwrapped.nix}     | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/py/py7zr/package.nix
 rename pkgs/{development/python-modules/py7zr/default.nix => by-name/py/py7zr/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/py/py7zr/package.nix b/pkgs/by-name/py/py7zr/package.nix
new file mode 100644
index 0000000000000..8eba72424f270
--- /dev/null
+++ b/pkgs/by-name/py/py7zr/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.py7zr
diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/by-name/py/py7zr/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/py7zr/default.nix
rename to pkgs/by-name/py/py7zr/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9830e8593a0d..fd6590193afc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1015,8 +1015,6 @@ with pkgs;
     withUsdView = true;
   };
 
-  py7zr = with python3Packages; toPythonApplication py7zr;
-
   qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };
 
   inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 01fa5d5739bba..9651e0cfb03ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13114,7 +13114,7 @@ self: super: with self; {
 
   py65 = callPackage ../by-name/py/py65/unwrapped.nix { };
 
-  py7zr = callPackage ../development/python-modules/py7zr { };
+  py7zr = callPackage ../by-name/py/py7zr/unwrapped.nix { };
 
   pyabpoa = toPythonModule (
     pkgs.abpoa.override {

From 5544a934ae7cf8bcb665507615a99082ea841f9c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:46:01 +0000
Subject: [PATCH 24/28] python3Packages.sdkmanager: migrate to by-name

---
 pkgs/by-name/sd/sdkmanager/package.nix                       | 5 +++++
 .../default.nix => by-name/sd/sdkmanager/unwrapped.nix}      | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/sd/sdkmanager/package.nix
 rename pkgs/{development/python-modules/sdkmanager/default.nix => by-name/sd/sdkmanager/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/sd/sdkmanager/package.nix b/pkgs/by-name/sd/sdkmanager/package.nix
new file mode 100644
index 0000000000000..82d3a69f19d09
--- /dev/null
+++ b/pkgs/by-name/sd/sdkmanager/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.sdkmanager
diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/by-name/sd/sdkmanager/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/sdkmanager/default.nix
rename to pkgs/by-name/sd/sdkmanager/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd6590193afc1..81a17ab9dc621 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1019,8 +1019,6 @@ with pkgs;
 
   inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
 
-  sdkmanager = with python3Packages; toPythonApplication sdkmanager;
-
   shaperglot = with python3Packages; toPythonApplication shaperglot;
 
   ufolint = with python3Packages; toPythonApplication ufolint;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9651e0cfb03ad..4534e256ae401 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17242,7 +17242,7 @@ self: super: with self; {
 
   sdjson = callPackage ../development/python-modules/sdjson { };
 
-  sdkmanager = callPackage ../development/python-modules/sdkmanager { };
+  sdkmanager = callPackage ../by-name/sd/sdkmanager/unwrapped.nix { };
 
   sdnotify = callPackage ../development/python-modules/sdnotify { };
 

From 3efddf3b9ccd05a847a63596287164f91899d866 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:48:25 +0000
Subject: [PATCH 25/28] python3Packages.shaperglot: migrate to by-name

---
 pkgs/by-name/sh/shaperglot/package.nix                       | 5 +++++
 .../default.nix => by-name/sh/shaperglot/unwrapped.nix}      | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/sh/shaperglot/package.nix
 rename pkgs/{development/python-modules/shaperglot/default.nix => by-name/sh/shaperglot/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/sh/shaperglot/package.nix b/pkgs/by-name/sh/shaperglot/package.nix
new file mode 100644
index 0000000000000..6b1d792f64d79
--- /dev/null
+++ b/pkgs/by-name/sh/shaperglot/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.shaperglot
diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/by-name/sh/shaperglot/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/shaperglot/default.nix
rename to pkgs/by-name/sh/shaperglot/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81a17ab9dc621..983a667263bf4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1019,8 +1019,6 @@ with pkgs;
 
   inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
 
-  shaperglot = with python3Packages; toPythonApplication shaperglot;
-
   ufolint = with python3Packages; toPythonApplication ufolint;
 
   ventoy-full = ventoy.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4534e256ae401..c2cf1502e3315 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17426,7 +17426,7 @@ self: super: with self; {
 
   shapely = callPackage ../development/python-modules/shapely { };
 
-  shaperglot = callPackage ../development/python-modules/shaperglot { };
+  shaperglot = callPackage ../by-name/sh/shaperglot/unwrapped.nix { };
 
   shared = callPackage ../development/python-modules/shared { };
 

From 8634ca48b4f2ef441cd3edc3ac1a1cb4b9ef9188 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 20:51:12 +0000
Subject: [PATCH 26/28] python3Packages.twine: migrate to by-name

---
 pkgs/by-name/tw/twine/package.nix                            | 5 +++++
 .../twine/default.nix => by-name/tw/twine/unwrapped.nix}     | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/tw/twine/package.nix
 rename pkgs/{development/python-modules/twine/default.nix => by-name/tw/twine/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/tw/twine/package.nix b/pkgs/by-name/tw/twine/package.nix
new file mode 100644
index 0000000000000..2c44a0100523d
--- /dev/null
+++ b/pkgs/by-name/tw/twine/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.twine
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/by-name/tw/twine/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/twine/default.nix
rename to pkgs/by-name/tw/twine/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 983a667263bf4..98d879c6beef8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1295,8 +1295,6 @@ with pkgs;
   };
   termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
 
-  twine = with python3Packages; toPythonApplication twine;
-
   inherit (callPackages ../development/tools/ammonite { })
     ammonite_2_12
     ammonite_2_13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2cf1502e3315..bde8a1e99ac3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19645,7 +19645,7 @@ self: super: with self; {
 
   twill = callPackage ../development/python-modules/twill { };
 
-  twine = callPackage ../development/python-modules/twine { };
+  twine = callPackage ../by-name/tw/twine/unwrapped.nix { };
 
   twinkly-client = callPackage ../development/python-modules/twinkly-client { };
 

From 7be897a02ea15cf64ff49e76ac28f90aa06e220c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 21:01:36 +0000
Subject: [PATCH 27/28] python3Packages.ufolint: migrate to by-name

---
 pkgs/by-name/uf/ufolint/package.nix                          | 5 +++++
 .../ufolint/default.nix => by-name/uf/ufolint/unwrapped.nix} | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/uf/ufolint/package.nix
 rename pkgs/{development/python-modules/ufolint/default.nix => by-name/uf/ufolint/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/uf/ufolint/package.nix b/pkgs/by-name/uf/ufolint/package.nix
new file mode 100644
index 0000000000000..f90f689cb1b4e
--- /dev/null
+++ b/pkgs/by-name/uf/ufolint/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.ufolint
diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/by-name/uf/ufolint/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/ufolint/default.nix
rename to pkgs/by-name/uf/ufolint/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98d879c6beef8..e7eadb2be8b8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1019,8 +1019,6 @@ with pkgs;
 
   inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
 
-  ufolint = with python3Packages; toPythonApplication ufolint;
-
   ventoy-full = ventoy.override {
     withCryptsetup = true;
     withXfs = true;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bde8a1e99ac3a..590e12aaa9942 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20238,7 +20238,7 @@ self: super: with self; {
 
   ufolib2 = callPackage ../development/python-modules/ufolib2 { };
 
-  ufolint = callPackage ../development/python-modules/ufolint { };
+  ufolint = callPackage ../by-name/uf/ufolint/unwrapped.nix { };
 
   ufomerge = callPackage ../development/python-modules/ufomerge { };
 

From 08532a2b31d9ebdfbc9286f3242f19dbe9021308 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 28 Jan 2026 21:05:11 +0000
Subject: [PATCH 28/28] python3Packages.vprof: migrate to by-name

---
 pkgs/by-name/vp/vprof/package.nix                            | 5 +++++
 .../vprof/default.nix => by-name/vp/vprof/unwrapped.nix}     | 0
 pkgs/top-level/all-packages.nix                              | 2 --
 pkgs/top-level/python-packages.nix                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/vp/vprof/package.nix
 rename pkgs/{development/python-modules/vprof/default.nix => by-name/vp/vprof/unwrapped.nix} (100%)

diff --git a/pkgs/by-name/vp/vprof/package.nix b/pkgs/by-name/vp/vprof/package.nix
new file mode 100644
index 0000000000000..fb067fdc7ecb0
--- /dev/null
+++ b/pkgs/by-name/vp/vprof/package.nix
@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.vprof
diff --git a/pkgs/development/python-modules/vprof/default.nix b/pkgs/by-name/vp/vprof/unwrapped.nix
similarity index 100%
rename from pkgs/development/python-modules/vprof/default.nix
rename to pkgs/by-name/vp/vprof/unwrapped.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7eadb2be8b8e..6d4f102dacf49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1034,8 +1034,6 @@ with pkgs;
     defaultGuiType = "qt5";
   };
 
-  vprof = with python3Packages; toPythonApplication vprof;
-
   waydroid-nftables = waydroid.override { withNftables = true; };
 
   winbox = winbox3;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 590e12aaa9942..5e22089443858 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20662,7 +20662,7 @@ self: super: with self; {
 
   vpk = callPackage ../development/python-modules/vpk { };
 
-  vprof = callPackage ../development/python-modules/vprof { };
+  vprof = callPackage ../by-name/vp/vprof/unwrapped.nix { };
 
   vqgan-jax = callPackage ../development/python-modules/vqgan-jax { };