From cddd1f1ffc6a0115720907c99d178bdf879e4301 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:27:29 +0000
Subject: [PATCH 01/16] qtpass: migrate to pkgs/by-name

---
 .../qt/qtpass/package.nix}                    | 20 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 14 deletions(-)
 rename pkgs/{applications/misc/qtpass/default.nix => by-name/qt/qtpass/package.nix} (89%)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/by-name/qt/qtpass/package.nix
similarity index 89%
rename from pkgs/applications/misc/qtpass/default.nix
rename to pkgs/by-name/qt/qtpass/package.nix
index 60cfc60bd138..bfe9f0238874 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/by-name/qt/qtpass/package.nix
@@ -1,17 +1,13 @@
 {
+  stdenv,
   fetchFromGitHub,
   lib,
-  stdenv,
+  libsForQt5,
   git,
   gnupg,
   pass,
   pwgen,
   qrencode,
-  qtbase,
-  qtsvg,
-  qttools,
-  qmake,
-  wrapQtAppsHook,
   makeWrapper,
 }:
 
@@ -35,20 +31,20 @@ stdenv.mkDerivation rec {
     git
     gnupg
     pass
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
   ];
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
     makeWrapper
   ];
 
   qmakeFlags = [
     # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
-    "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
+    "QMAKE_LUPDATE=${libsForQt5.qttools.dev}/bin/lupdate"
   ];
 
   qtWrapperArgs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84448f2750a6..4226903662bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11866,8 +11866,6 @@ with pkgs;
 
   qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
 
-  qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
-
   quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
 
   quasselClient = quassel.override {

From 46cf4949561d78286a10f609fb9e6cd8fc315492 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:27:44 +0000
Subject: [PATCH 02/16] qtpass: modernise

---
 pkgs/by-name/qt/qtpass/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/qt/qtpass/package.nix b/pkgs/by-name/qt/qtpass/package.nix
index bfe9f0238874..3e6fec64322c 100644
--- a/pkgs/by-name/qt/qtpass/package.nix
+++ b/pkgs/by-name/qt/qtpass/package.nix
@@ -11,15 +11,15 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtpass";
   version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "IJHack";
     repo = "QtPass";
-    rev = "v${version}";
-    sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI=";
   };
 
   postPatch = ''
@@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
     install -D qtpass.1 -t $out/share/man/man1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Multi-platform GUI for pass, the standard unix password manager";
     mainProgram = "qtpass";
     homepage = "https://qtpass.org";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.hrdinka ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.hrdinka ];
+    platforms = lib.platforms.all;
   };
-}
+})

From 7faebac97e2fffecd8b8de1fbdae6f9cb9a335e7 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:27:48 +0000
Subject: [PATCH 03/16] digitalbitbox: migrate to pkgs/by-name

---
 .../di/digitalbitbox/package.nix}             | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 19 deletions(-)
 rename pkgs/{applications/misc/digitalbitbox/default.nix => by-name/di/digitalbitbox/package.nix} (89%)

diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/by-name/di/digitalbitbox/package.nix
similarity index 89%
rename from pkgs/applications/misc/digitalbitbox/default.nix
rename to pkgs/by-name/di/digitalbitbox/package.nix
index fd805af2cdea..f9115ec59ba9 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/by-name/di/digitalbitbox/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   autoreconfHook,
   curl,
@@ -7,15 +7,12 @@
   git,
   libevent,
   libtool,
+  libsForQt5,
   qrencode,
   udev,
   libusb1,
   makeWrapper,
   pkg-config,
-  qtbase,
-  qttools,
-  qtwebsockets,
-  qtmultimedia,
   udevRule51 ? ''
     SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"
   '',
@@ -49,7 +46,7 @@
 let
   copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "digitalbitbox";
   version = "3.0.0";
 
@@ -71,8 +68,9 @@ mkDerivation rec {
     git
     makeWrapper
     pkg-config
-    qttools
+    libsForQt5.qttools
     udevCheckHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -81,18 +79,17 @@ mkDerivation rec {
     udev
     libusb1
     qrencode
-
-    qtbase
-    qtwebsockets
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtwebsockets
+    libsForQt5.qtmultimedia
   ];
 
-  LUPDATE = "${qttools.dev}/bin/lupdate";
-  LRELEASE = "${qttools.dev}/bin/lrelease";
-  MOC = "${qtbase.dev}/bin/moc";
-  QTDIR = qtbase.dev;
-  RCC = "${qtbase.dev}/bin/rcc";
-  UIC = "${qtbase.dev}/bin/uic";
+  LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate";
+  LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease";
+  MOC = "${libsForQt5.qtbase.dev}/bin/moc";
+  QTDIR = libsForQt5.qtbase.dev;
+  RCC = "${libsForQt5.qtbase.dev}/bin/rcc";
+  UIC = "${libsForQt5.qtbase.dev}/bin/uic";
 
   configureFlags = [
     "--enable-libusb"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4226903662bf..90710a5cb6ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -403,8 +403,6 @@ with pkgs;
     name = "die-hook";
   } ../build-support/setup-hooks/die.sh;
 
-  digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
-
   devShellTools = callPackage ../build-support/dev-shell-tools { };
 
   dockerTools = callPackage ../build-support/docker {

From 5d55c6115e2b0ec82c0a2eacdd55a2c4ad7c4963 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:27:52 +0000
Subject: [PATCH 04/16] digitalbitbox: modernise

---
 pkgs/by-name/di/digitalbitbox/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/di/digitalbitbox/package.nix b/pkgs/by-name/di/digitalbitbox/package.nix
index f9115ec59ba9..c07c6f8df244 100644
--- a/pkgs/by-name/di/digitalbitbox/package.nix
+++ b/pkgs/by-name/di/digitalbitbox/package.nix
@@ -46,15 +46,15 @@
 let
   copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "digitalbitbox";
   version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "digitalbitbox";
     repo = "dbb-app";
-    rev = "v${version}";
-    sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
   };
 
   # configure.ac:23: error: AC_CONFIG_MACRO_DIR can only be used once
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "QT based application for the Digital Bitbox hardware wallet";
     longDescription = ''
       Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices.
@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
       to the configuration which installs the package and enables the hardware module.
     '';
     homepage = "https://digitalbitbox.com/";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
-}
+})

From 92b8b7f10c12fcf0aadcb1743dea80e3c0cef261 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:01 +0000
Subject: [PATCH 05/16] pe-bear: move to pkgs/by-name

---
 .../pe-bear/default.nix => by-name/pe/pe-bear/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/pe-bear/default.nix => by-name/pe/pe-bear/package.nix} (92%)

diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/by-name/pe/pe-bear/package.nix
similarity index 92%
rename from pkgs/applications/misc/pe-bear/default.nix
rename to pkgs/by-name/pe/pe-bear/package.nix
index 16fc1b48f442..7a4c51b8a3da 100644
--- a/pkgs/applications/misc/pe-bear/default.nix
+++ b/pkgs/by-name/pe/pe-bear/package.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,11 +20,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90710a5cb6ad..6397d4daa346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -504,8 +504,6 @@ with pkgs;
 
   prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
 
-  pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { };
-
   magika = with python3Packages; toPythonApplication magika;
 
   mysql-shell = mysql-shell_8;

From 6c0f440e305684c5de9ba6a431f3d8dda1c14324 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:10 +0000
Subject: [PATCH 06/16] pe-bear: modernise

---
 pkgs/by-name/pe/pe-bear/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pe/pe-bear/package.nix b/pkgs/by-name/pe/pe-bear/package.nix
index 7a4c51b8a3da..aa4793209a9c 100644
--- a/pkgs/by-name/pe/pe-bear/package.nix
+++ b/pkgs/by-name/pe/pe-bear/package.nix
@@ -6,14 +6,14 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pe-bear";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "hasherezade";
     repo = "pe-bear";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jWRO0vO601IijFo7nu0SMF8inEXWLzv+Ni1nlJfGqhQ=";
     fetchSubmodules = true;
   };
@@ -27,23 +27,23 @@ stdenv.mkDerivation rec {
     libsForQt5.qtbase
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Portable Executable reversing tool with a friendly GUI";
     mainProgram = "PE-bear";
     homepage = "https://hshrzd.wordpress.com/pe-bear/";
 
-    license = [
+    license = with lib.licenses; [
       # PE-Bear
-      licenses.gpl2Only
+      gpl2Only
 
       # Vendored capstone
-      licenses.bsd3
+      bsd3
 
       # Vendored bearparser
-      licenses.bsd2
+      bsd2
     ];
 
-    maintainers = with maintainers; [ blitz ];
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.blitz ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 4550c31e8743aa9256a14ef4de8e73454a5e5bb6 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:15 +0000
Subject: [PATCH 07/16] ocs-url: migrate to pkgs/by-name

---
 .../misc/ocs-url/default.nix => by-name/oc/ocs-url/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/ocs-url/default.nix => by-name/oc/ocs-url/package.nix} (100%)

diff --git a/pkgs/tools/misc/ocs-url/default.nix b/pkgs/by-name/oc/ocs-url/package.nix
similarity index 100%
rename from pkgs/tools/misc/ocs-url/default.nix
rename to pkgs/by-name/oc/ocs-url/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6397d4daa346..dcab8d81a6db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1074,8 +1074,6 @@ with pkgs;
 
   mkosi-full = mkosi.override { withQemu = true; };
 
-  ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
-
   openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
 
   openusd = python3Packages.openusd.override {

From d1fefd49dabe29ad9bb30221d74150515ab426b1 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:19 +0000
Subject: [PATCH 08/16] veikk-linux-driver-gui: migrate to pkgs/by-name

---
 .../ve/veikk-linux-driver-gui/package.nix}            | 11 +++++++----
 pkgs/top-level/all-packages.nix                       |  2 --
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/veikk-linux-driver-gui/default.nix => by-name/ve/veikk-linux-driver-gui/package.nix} (84%)

diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix
similarity index 84%
rename from pkgs/tools/misc/veikk-linux-driver-gui/default.nix
rename to pkgs/by-name/ve/veikk-linux-driver-gui/package.nix
index 8069e7cec5d1..8e3673cabf71 100644
--- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix
+++ b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
-  qmake,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "veikk-linux-driver-gui";
   version = "2.0";
 
@@ -16,7 +16,10 @@ mkDerivation rec {
     sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   postBuild = ''
     make all clean
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcab8d81a6db..6f83727d2cb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1097,8 +1097,6 @@ with pkgs;
 
   ufolint = with python3Packages; toPythonApplication ufolint;
 
-  veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
-
   ventoy-full = ventoy.override {
     withCryptsetup = true;
     withXfs = true;

From e37d8ba012b9e1952248af38010ac05a7075543d Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:24 +0000
Subject: [PATCH 09/16] veikk-linux-driver-gui: modernise

---
 .../ve/veikk-linux-driver-gui/package.nix      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix
index 8e3673cabf71..2d93bbf90683 100644
--- a/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix
+++ b/pkgs/by-name/ve/veikk-linux-driver-gui/package.nix
@@ -5,15 +5,15 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "veikk-linux-driver-gui";
   version = "2.0";
 
   src = fetchFromGitHub {
     owner = "jlam55555";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j";
+    repo = "veikk-linux-driver-gui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ssQ54d+4H0a0FF3BrVlHPrPd7WlBocFLep9KPtPB4Qk=";
   };
 
   nativeBuildInputs = [
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
     cp veikk-linux-driver-gui $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Configuration tool for the VEIKK Linux driver";
     homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nicbk ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.nicbk ];
     mainProgram = "veikk-linux-driver-gui";
   };
-}
+})

From 9ea93118de0a583c70343c4be86fab55cec79b6f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:28 +0000
Subject: [PATCH 10/16] cool-retro-term: migrate to pkgs/by-name

---
 .../co/cool-retro-term/package.nix}           | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{applications/terminal-emulators/cool-retro-term/default.nix => by-name/co/cool-retro-term/package.nix} (84%)

diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/by-name/co/cool-retro-term/package.nix
similarity index 84%
rename from pkgs/applications/terminal-emulators/cool-retro-term/default.nix
rename to pkgs/by-name/co/cool-retro-term/package.nix
index 2e91884aa2d2..233b7674108a 100644
--- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
+++ b/pkgs/by-name/co/cool-retro-term/package.nix
@@ -2,16 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  mkDerivation,
-  qtbase,
-  qmltermwidget,
-  qtquickcontrols2,
-  qtgraphicaleffects,
-  qmake,
+  libsForQt5,
   nixosTests,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "1.2.0";
   pname = "cool-retro-term";
 
@@ -27,13 +22,16 @@ mkDerivation rec {
   '';
 
   buildInputs = [
-    qtbase
-    qmltermwidget
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qmltermwidget
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f83727d2cb2..6f1d1d9381d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1414,8 +1414,6 @@ with pkgs;
 
   ### APPLICATIONS/TERMINAL-EMULATORS
 
-  cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
-
   kitty = callPackage ../by-name/ki/kitty/package.nix {
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From d2f3dc913dce46afccbe7fb5f815e27bdddedac0 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:32 +0000
Subject: [PATCH 11/16] asymptote: migrate to pkgs/by-name

---
 .../default.nix => by-name/as/asymptote/package.nix}   | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{tools/graphics/asymptote/default.nix => by-name/as/asymptote/package.nix} (98%)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/by-name/as/asymptote/package.nix
similarity index 98%
rename from pkgs/tools/graphics/asymptote/default.nix
rename to pkgs/by-name/as/asymptote/package.nix
index c40eef77c647..e0608eb5d8f6 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/by-name/as/asymptote/package.nix
@@ -6,7 +6,6 @@
   bison,
   glm,
   flex,
-  wrapQtAppsHook,
   cmake,
   pkg-config,
   libglut,
@@ -14,6 +13,7 @@
   imagemagick,
   fftw,
   eigen,
+  libsForQt5,
   libtirpc,
   boehmgc,
   libGLU,
@@ -24,8 +24,6 @@
   gsl,
   libsigsegv,
   python3,
-  qtbase,
-  qtsvg,
   boost186,
   zlib,
   perl,
@@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     flex
     bison
     texinfo
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     cmake
     ghostscriptX
     perl
@@ -101,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     perl
     curl
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     # relies on removed asio::io_service
     # https://github.com/kuafuwang/LspCpp/issues/52
     boost186
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f1d1d9381d4..25ef040566e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1490,8 +1490,6 @@ with pkgs;
 
   arpack-mpi = arpack.override { useMpi = true; };
 
-  asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
-
   authelia = callPackage ../servers/authelia {
     buildGoModule = buildGo124Module;
     pnpm = pnpm_10;

From c0956ce317c95503ed68bc0b798c4281bc296a66 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:36 +0000
Subject: [PATCH 12/16] asymptote: modernise

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

diff --git a/pkgs/by-name/as/asymptote/package.nix b/pkgs/by-name/as/asymptote/package.nix
index e0608eb5d8f6..c5ab1571c8a5 100644
--- a/pkgs/by-name/as/asymptote/package.nix
+++ b/pkgs/by-name/as/asymptote/package.nix
@@ -197,11 +197,11 @@ stdenv.mkDerivation (finalAttrs: {
   #   make: *** [Makefile:272: install-asy] Error 1
   enableParallelInstalling = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for programming graphics intended to replace Metapost";
     homepage = "https://asymptote.sourceforge.io/";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From 3ed41beefa53a9b66791a98259609fdabc812bc6 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:41 +0000
Subject: [PATCH 13/16] guglielmo: migrate to pkgs/by-name

---
 .../default.nix => by-name/gu/guglielmo/package.nix} | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{applications/radio/guglielmo/default.nix => by-name/gu/guglielmo/package.nix} (89%)

diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/by-name/gu/guglielmo/package.nix
similarity index 89%
rename from pkgs/applications/radio/guglielmo/default.nix
rename to pkgs/by-name/gu/guglielmo/package.nix
index e1a81e9b40f1..513c244f6ca8 100644
--- a/pkgs/applications/radio/guglielmo/default.nix
+++ b/pkgs/by-name/gu/guglielmo/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -9,14 +9,13 @@
   fdk_aac,
   faad2,
   fftwFloat,
+  libsForQt5,
   libsndfile,
   libsamplerate,
   portaudio,
-  qtmultimedia,
-  qwt,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "guglielmo";
   version = "0.5";
 
@@ -34,6 +33,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     airspy
@@ -44,8 +44,8 @@ mkDerivation rec {
     libsndfile
     libsamplerate
     portaudio
-    qtmultimedia
-    qwt
+    libsForQt5.qtmultimedia
+    libsForQt5.qwt
   ];
 
   postFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25ef040566e7..1c016abf7744 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1622,8 +1622,6 @@ with pkgs;
 
   go2tv-lite = go2tv.override { withGui = false; };
 
-  guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
-
   hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit;
 
   hwi = with python3Packages; toPythonApplication hwi;

From 38d70a9e126ce5b3d3e589427e942ba9d3ec672e Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:45 +0000
Subject: [PATCH 14/16] guglielmo: modernise

---
 pkgs/by-name/gu/guglielmo/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gu/guglielmo/package.nix b/pkgs/by-name/gu/guglielmo/package.nix
index 513c244f6ca8..b16b3393064a 100644
--- a/pkgs/by-name/gu/guglielmo/package.nix
+++ b/pkgs/by-name/gu/guglielmo/package.nix
@@ -15,15 +15,15 @@
   portaudio,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guglielmo";
   version = "0.5";
 
   src = fetchFromGitHub {
     owner = "marcogrecopriolo";
     repo = "guglielmo";
-    rev = "v${version}";
-    sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
   };
 
   postInstall = ''
@@ -53,12 +53,12 @@ stdenv.mkDerivation rec {
     patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Qt based FM / Dab tuner";
     mainProgram = "guglielmo";
     homepage = "https://github.com/marcogrecopriolo/guglielmo";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.markuskowa ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 35804aeee3ca398919fe33e5bc981750b23b5242 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:49 +0000
Subject: [PATCH 15/16] cmst: migrate to pkgs/by-name

---
 .../default.nix => by-name/cm/cmst/package.nix}   | 15 +++++++--------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{tools/networking/cmst/default.nix => by-name/cm/cmst/package.nix} (83%)

diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/by-name/cm/cmst/package.nix
similarity index 83%
rename from pkgs/tools/networking/cmst/default.nix
rename to pkgs/by-name/cm/cmst/package.nix
index 54189d208331..a6cfdf31b42a 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/by-name/cm/cmst/package.nix
@@ -1,14 +1,12 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
+  libsForQt5,
   gitUpdater,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cmst";
   version = "2023.03.14";
 
@@ -20,11 +18,12 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   postPatch = ''
     for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c016abf7744..3e784aac07e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2302,8 +2302,6 @@ with pkgs;
     ;
   citrix_workspace = citrix_workspace_25_05_0;
 
-  cmst = libsForQt5.callPackage ../tools/networking/cmst { };
-
   colord-gtk4 = colord-gtk.override { withGtk4 = true; };
 
   connmanFull = connman.override {

From 502a93fdce0aff242a0f38a31268c78395c8bfbc Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:28:54 +0000
Subject: [PATCH 16/16] cmst: modernise

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

diff --git a/pkgs/by-name/cm/cmst/package.nix b/pkgs/by-name/cm/cmst/package.nix
index a6cfdf31b42a..dbf87ce4163d 100644
--- a/pkgs/by-name/cm/cmst/package.nix
+++ b/pkgs/by-name/cm/cmst/package.nix
@@ -6,15 +6,15 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cmst";
   version = "2023.03.14";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk=";
+    tag = "${finalAttrs.pname}-${finalAttrs.version}";
+    hash = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk=";
   };
 
   nativeBuildInputs = [
@@ -32,18 +32,18 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.updateScript = gitUpdater {
-    rev-prefix = "${pname}-";
+    rev-prefix = "${finalAttrs.pname}-";
   };
 
-  meta = with lib; {
+  meta = {
     description = "QT GUI for Connman with system tray icon";
     mainProgram = "cmst";
     homepage = "https://github.com/andrew-bibb/cmst";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       matejc
       romildo
     ];
-    platforms = platforms.linux;
-    license = licenses.mit;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
-}
+})