diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/by-name/be/beamerpresenter/package.nix
similarity index 83%
rename from pkgs/applications/office/beamerpresenter/default.nix
rename to pkgs/by-name/be/beamerpresenter/package.nix
index 9aa3b03328793..365984034f72f 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/by-name/be/beamerpresenter/package.nix
@@ -5,16 +5,10 @@
   cmake,
   pkg-config,
   wrapGAppsHook3,
-  wrapQtAppsHook,
   gst_all_1,
-  qtbase,
-  qtsvg,
-  qtmultimedia,
-  qttools,
-  qtwayland,
   zlib,
-  # only required when using poppler
-  poppler,
+  qt6,
+  qt6Packages,
   # only required when using mupdf
   freetype,
   gumbo,
@@ -27,14 +21,14 @@
   useExternalRenderer ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "beamerpresenter";
   version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "beamerpresenter";
     repo = "BeamerPresenter";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";
   };
 
@@ -42,7 +36,7 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     wrapGAppsHook3
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   dontWrapGApps = true;
@@ -52,13 +46,13 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
     zlib
-    qtbase
-    qtsvg
-    qtmultimedia
-    qttools
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtmultimedia
+    qt6.qttools
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ]
   ++ lib.optionals useMupdf [
     freetype
@@ -68,7 +62,7 @@ stdenv.mkDerivation rec {
     openjpeg
   ]
   ++ lib.optionals usePoppler [
-    poppler
+    qt6Packages.poppler
   ];
 
   cmakeFlags = [
@@ -81,7 +75,7 @@ stdenv.mkDerivation rec {
     "-DLINK_MUJS=OFF"
     "-DLINK_GUMBO=ON"
     "-DUSE_TRANSLATIONS=ON"
-    "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
+    "-DQT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}"
   ];
 
   preFixup = ''
@@ -102,4 +96,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "beamerpresenter";
   };
-}
+})
diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/by-name/go/goldendict-ng/package.nix
similarity index 86%
rename from pkgs/applications/misc/goldendict-ng/default.nix
rename to pkgs/by-name/go/goldendict-ng/package.nix
index 3083af21c1daa..600081eb7b6e9 100644
--- a/pkgs/applications/misc/goldendict-ng/default.nix
+++ b/pkgs/by-name/go/goldendict-ng/package.nix
@@ -17,14 +17,7 @@
   bzip2,
   libiconv,
   libxtst,
-  qtbase,
-  qtsvg,
-  qtwebengine,
-  qttools,
-  qtwayland,
-  qt5compat,
-  qtmultimedia,
-  wrapQtAppsHook,
+  qt6,
   wrapGAppsHook3,
 }:
 
@@ -44,18 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     wrapGAppsHook3
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qttools
-    qtwebengine
-    qt5compat
-    qtmultimedia
-    qtwayland
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qtwebengine
+    qt6.qt5compat
+    qt6.qtmultimedia
+    qt6.qtwayland
     libvorbis
     tomlplusplus
     fmt
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/by-name/ke/kemai/package.nix
similarity index 84%
rename from pkgs/applications/misc/kemai/default.nix
rename to pkgs/by-name/ke/kemai/package.nix
index 7f3374ac08606..895f16fe3afaf 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/by-name/ke/kemai/package.nix
@@ -6,19 +6,12 @@
   # buildInputs
   libxscrnsaver,
   magic-enum,
-
-  # nativeBuildInputs
-  qtbase,
-  qtconnectivity,
-  qtlanguageserver,
-  qttools,
+  qt6,
   range-v3,
   spdlog,
-  qtwayland,
 
   # nativeBuildInputs
   cmake,
-  wrapQtAppsHook,
 
   # passthru
   nix-update-script,
@@ -47,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxscrnsaver
     magic-enum
-    qtbase
-    qtconnectivity
-    qtlanguageserver
-    qttools
+    qt6.qtbase
+    qt6.qtconnectivity
+    qt6.qtlanguageserver
+    qt6.qttools
     range-v3
     spdlog
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
 
   cmakeFlags = [
     (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
@@ -63,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   passthru = {
diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/by-name/ki/kiwix-tools/package.nix
similarity index 100%
rename from pkgs/applications/misc/kiwix/tools.nix
rename to pkgs/by-name/ki/kiwix-tools/package.nix
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/by-name/ki/kiwix/package.nix
similarity index 83%
rename from pkgs/applications/misc/kiwix/default.nix
rename to pkgs/by-name/ki/kiwix/package.nix
index 73e4fef2f1321..4f533852df270 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/by-name/ki/kiwix/package.nix
@@ -5,12 +5,7 @@
   nix-update-script,
   libkiwix,
   pkg-config,
-  qmake,
-  qtbase,
-  qtwebengine,
-  qtsvg,
-  qtimageformats,
-  wrapQtAppsHook,
+  qt6,
   aria2,
 }:
 
@@ -30,17 +25,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    qmake
+    qt6.qmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     libkiwix
-    qtbase
-    qtwebengine
-    qtsvg
-    qtimageformats
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qtimageformats
   ];
 
   qtWrapperArgs = [
diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/by-name/ki/kiwix/remove-Werror.patch
similarity index 100%
rename from pkgs/applications/misc/kiwix/remove-Werror.patch
rename to pkgs/by-name/ki/kiwix/remove-Werror.patch
diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/by-name/le/lenovo-legion/package.nix
similarity index 96%
rename from pkgs/os-specific/linux/lenovo-legion/app.nix
rename to pkgs/by-name/le/lenovo-legion/package.nix
index ec001847516f4..e712e5e11f47f 100644
--- a/pkgs/os-specific/linux/lenovo-legion/app.nix
+++ b/pkgs/by-name/le/lenovo-legion/package.nix
@@ -2,10 +2,9 @@
   lib,
   fetchFromGitHub,
   libxcb,
-  wrapQtAppsHook,
   python3,
   nix-update-script,
-  qtbase,
+  qt6,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -24,12 +23,12 @@ python3.pkgs.buildPythonApplication rec {
 
   build-system = with python3.pkgs; [
     setuptools
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   dependencies = with python3.pkgs; [
     pyqt6
-    qtbase
+    qt6.qtbase
     argcomplete
     pillow
     pyyaml
diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/by-name/li/libkiwix/package.nix
similarity index 100%
rename from pkgs/applications/misc/kiwix/lib.nix
rename to pkgs/by-name/li/libkiwix/package.nix
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/by-name/li/librepcb/package.nix
similarity index 93%
rename from pkgs/applications/science/electronics/librepcb/default.nix
rename to pkgs/by-name/li/librepcb/package.nix
index 90b8c759e5c7b..7a371b701c5d5 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/by-name/li/librepcb/package.nix
@@ -2,13 +2,10 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qtbase,
-  qttools,
-  qtsvg,
+  qt6,
   opencascade-occt,
   libGLU,
   cmake,
-  wrapQtAppsHook,
   rustPlatform,
   cargo,
   rustc,
@@ -28,15 +25,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    qtsvg
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.qtsvg
+    qt6.wrapQtAppsHook
     opencascade-occt
     libGLU
     cargo
     rustc
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qt6.qtbase ];
 
   cargoDeps1 = rustPlatform.fetchCargoVendor {
     inherit src;
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/by-name/ma/maestral-gui/package.nix
similarity index 90%
rename from pkgs/applications/networking/maestral-qt/default.nix
rename to pkgs/by-name/ma/maestral-gui/package.nix
index b351009d549c3..ba047ae404209 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/by-name/ma/maestral-gui/package.nix
@@ -2,11 +2,8 @@
   lib,
   fetchFromGitHub,
   python3,
-  qtbase,
-  qtsvg,
-  qtwayland,
+  qt6,
   nixosTests,
-  wrapQtAppsHook,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -32,12 +29,12 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    qtwayland
-    qtbase
-    qtsvg # Needed for the systray icon
+    qt6.qtwayland
+    qt6.qtbase
+    qt6.qtsvg # Needed for the systray icon
   ];
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/by-name/or/organicmaps/package.nix
similarity index 94%
rename from pkgs/applications/misc/organicmaps/default.nix
rename to pkgs/by-name/or/organicmaps/package.nix
index 04034000c17f2..c797594b6fb2c 100644
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/by-name/or/organicmaps/package.nix
@@ -8,11 +8,7 @@
   which,
   python3,
   rsync,
-  wrapQtAppsHook,
-  qtbase,
-  qtpositioning,
-  qtsvg,
-  qtwayland,
+  qt6,
   libGLU,
   libGL,
   zlib,
@@ -66,15 +62,15 @@ stdenv.mkDerivation (finalAttrs: {
     which
     python3
     rsync
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   # Most dependencies are vendored
   buildInputs = [
-    qtbase
-    qtpositioning
-    qtsvg
-    qtwayland
+    qt6.qtbase
+    qt6.qtpositioning
+    qt6.qtsvg
+    qt6.qtwayland
     libGLU
     libGL
     zlib
diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/by-name/pi/pineapple-pictures/package.nix
similarity index 88%
rename from pkgs/applications/graphics/pineapple-pictures/default.nix
rename to pkgs/by-name/pi/pineapple-pictures/package.nix
index 14fbe20727210..0b8e543982aa2 100644
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/by-name/pi/pineapple-pictures/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qt6Packages,
+  qt6,
   exiv2,
 }:
 
@@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qt6Packages.qtsvg
+    qt6.qtsvg
     exiv2
   ];
 
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/by-name/qm/qmasterpassword/package.nix
similarity index 90%
rename from pkgs/applications/misc/qMasterPassword/default.nix
rename to pkgs/by-name/qm/qmasterpassword/package.nix
index d7078b2be9c9c..0686748a4eabe 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/pkgs/by-name/qm/qmasterpassword/package.nix
@@ -5,32 +5,28 @@
   libx11,
   libxtst,
   cmake,
-  qtbase,
-  qttools,
-  qtwayland,
   openssl,
   libscrypt,
-  wrapQtAppsHook,
   testers,
-  qMasterPassword,
+  qt6,
   x11Support ? true,
   waylandSupport ? false,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "qMasterPassword";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qmasterpassword";
   version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "bkueng";
     repo = "qMasterPassword";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-kNVdE42JFzl6HO84b793gseMhcDyiGzQCmhh6zh2epc=";
   };
 
   buildInputs = [
-    qtbase
-    qtwayland
+    qt6.qtbase
+    qt6.qtwayland
     openssl
     libscrypt
   ]
@@ -40,8 +36,8 @@ stdenv.mkDerivation rec {
   ];
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
   cmakeFlags = lib.optionals waylandSupport [
     "-DDISABLE_FILL_FORM_SHORTCUTS=1"
@@ -71,8 +67,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     tests.version = testers.testVersion {
-      package = qMasterPassword;
-      version = "v${version}";
+      package = finalAttrs.finalPackage;
+      version = "v${finalAttrs.version}";
     };
   };
 
@@ -92,4 +88,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ teutat3s ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/by-name/qt/qtwirediff/package.nix
similarity index 92%
rename from pkgs/applications/networking/sniffers/qtwirediff/default.nix
rename to pkgs/by-name/qt/qtwirediff/package.nix
index f5be6f9683814..c042a560e7d81 100644
--- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix
+++ b/pkgs/by-name/qt/qtwirediff/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
-  qtwayland,
-  wrapQtAppsHook,
+  qt6,
   wireshark-cli,
 }:
 
@@ -21,15 +18,15 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    qt6.qmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ];
 
   installPhase = ''
diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/by-name/ti/tipp10/package.nix
similarity index 84%
rename from pkgs/applications/misc/tipp10/default.nix
rename to pkgs/by-name/ti/tipp10/package.nix
index f48ea45a44b5f..258fd9aa992f0 100644
--- a/pkgs/applications/misc/tipp10/default.nix
+++ b/pkgs/by-name/ti/tipp10/package.nix
@@ -3,10 +3,7 @@
   cmake,
   lib,
   fetchFromGitLab,
-  qtmultimedia,
-  qttools,
-  qtwayland,
-  wrapQtAppsHook,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,12 +19,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
-    qtmultimedia
-    qtwayland
+    qt6.qtmultimedia
+    qt6.qtwayland
   ];
 
   meta = {
diff --git a/pkgs/tools/security/web-eid-app/default.nix b/pkgs/by-name/we/web-eid-app/package.nix
similarity index 95%
rename from pkgs/tools/security/web-eid-app/default.nix
rename to pkgs/by-name/we/web-eid-app/package.nix
index dae430bbadb3e..26a7decaa51cf 100644
--- a/pkgs/tools/security/web-eid-app/default.nix
+++ b/pkgs/by-name/we/web-eid-app/package.nix
@@ -6,8 +6,7 @@
   gtest,
   pcsclite,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,8 +24,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/by-name/we/webcamoid/package.nix
similarity index 89%
rename from pkgs/applications/video/webcamoid/default.nix
rename to pkgs/by-name/we/webcamoid/package.nix
index c6cdb99019484..0af42d57267d9 100644
--- a/pkgs/applications/video/webcamoid/default.nix
+++ b/pkgs/by-name/we/webcamoid/package.nix
@@ -5,10 +5,7 @@
   pkg-config,
   libxcb,
   cmake,
-  qtbase,
-  qtdeclarative,
-  wrapQtAppsHook,
-  qtsvg,
+  qt6,
   ffmpeg,
   gst_all_1,
   libpulseaudio,
@@ -30,9 +27,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxcb
-    qtbase
-    qtdeclarative
-    qtsvg
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtsvg
     ffmpeg
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
@@ -45,7 +42,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   meta = {
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/by-name/xc/xca/package.nix
similarity index 86%
rename from pkgs/applications/misc/xca/default.nix
rename to pkgs/by-name/xc/xca/package.nix
index 5c01961ab18b7..1a80b02a34fdd 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/by-name/xc/xca/package.nix
@@ -2,12 +2,10 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
   cmake,
   pkg-config,
   openssl,
-  qtbase,
-  qttools,
+  qt6,
   sphinx,
 }:
 
@@ -24,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     openssl
-    qtbase
+    qt6.qtbase
   ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
+    qt6.qttools
     sphinx
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)
-  QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+  QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}";
 
   enableParallelBuilding = true;
 
@@ -56,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
       offline
       peterhoeg
     ];
-    inherit (qtbase.meta) platforms;
+    inherit (qt6.qtbase.meta) platforms;
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0433203325ff7..92d1bdc9626d9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1594,6 +1594,8 @@ mapAliases {
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21
   qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27
+  qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01
+  qMasterPassword-wayland = warnAlias "'qMasterPassword-wayland' has been renamed to/replaced by 'qmasterpassword-wayland'" qmasterpassword-wayland; # Added 2026-02-01
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
   qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c87b3f879ff87..76e7a85c94aaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1976,14 +1976,8 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  beamerpresenter = beamerpresenter-mupdf;
-
-  beamerpresenter-mupdf = qt6Packages.callPackage ../applications/office/beamerpresenter {
-    useMupdf = true;
-    usePoppler = false;
-  };
-
-  beamerpresenter-poppler = qt6Packages.callPackage ../applications/office/beamerpresenter {
+  beamerpresenter-mupdf = beamerpresenter;
+  beamerpresenter-poppler = beamerpresenter.override {
     useMupdf = false;
     usePoppler = true;
   };
@@ -3696,8 +3690,6 @@ with pkgs;
   # https://github.com/NixOS/nixpkgs/issues/227327
   wafHook = waf.hook;
 
-  web-eid-app = qt6Packages.callPackage ../tools/security/web-eid-app { };
-
   wyrd = callPackage ../tools/misc/wyrd {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
@@ -9823,7 +9815,6 @@ with pkgs;
   gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
-  goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
@@ -9840,8 +9831,6 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { };
-
   tshark = wireshark-cli;
   wireshark-cli = wireshark.override { withQt = false; };
 
@@ -9978,8 +9967,6 @@ with pkgs;
 
   gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
 
-  kemai = qt6Packages.callPackage ../applications/misc/kemai { };
-
   jetbrains = (
     recurseIntoAttrs (
       callPackages ../applications/editors/jetbrains {
@@ -10294,10 +10281,6 @@ with pkgs;
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
 
-  kiwix = qt6Packages.callPackage ../applications/misc/kiwix { };
-
-  kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
-
   klayout = libsForQt5.callPackage ../applications/misc/klayout { };
 
   kotatogram-desktop =
@@ -10361,10 +10344,6 @@ with pkgs;
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
 
-  lenovo-legion = qt6Packages.callPackage ../os-specific/linux/lenovo-legion/app.nix { };
-
-  libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
-
   libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
 
   libreoffice = hiPrio libreoffice-still;
@@ -10688,8 +10667,6 @@ with pkgs;
 
   opentx = libsForQt5.callPackage ../applications/misc/opentx { };
 
-  organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { };
-
   openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon;
 
   orpie = callPackage ../applications/misc/orpie {
@@ -10736,8 +10713,6 @@ with pkgs;
 
   inherit (pidginPackages) pidgin;
 
-  pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
-
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
 
   plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
@@ -10951,8 +10926,6 @@ with pkgs;
 
   maestral = with python3Packages; toPythonApplication maestral;
 
-  maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { };
-
   myfitnesspal = with python3Packages; toPythonApplication myfitnesspal;
 
   lightdm_qt = lightdm.override { withQt5 = true; };
@@ -11135,8 +11108,6 @@ with pkgs;
     timeshift-minimal
     ;
 
-  tipp10 = qt6.callPackage ../applications/misc/tipp10 { };
-
   tlp = callPackage ../tools/misc/tlp {
     inherit (linuxPackages) x86_energy_perf_policy;
   };
@@ -11371,8 +11342,6 @@ with pkgs;
     ];
   };
 
-  webcamoid = qt6Packages.callPackage ../applications/video/webcamoid { };
-
   webssh = with python3Packages; toPythonApplication webssh;
 
   wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
@@ -11433,8 +11402,6 @@ with pkgs;
     gbmSupport = true;
   };
 
-  xca = qt6Packages.callPackage ../applications/misc/xca { };
-
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
   xdg-desktop-portal-hyprland =
@@ -12368,8 +12335,6 @@ with pkgs;
 
   kicadAddons = recurseIntoAttrs (callPackage ../by-name/ki/kicad/addons/package.nix { });
 
-  librepcb = qt6Packages.callPackage ../applications/science/electronics/librepcb { };
-
   ngspice = libngspice.override {
     withNgshared = false;
   };
@@ -12739,9 +12704,7 @@ with pkgs;
     gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
   };
 
-  qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
-
-  qMasterPassword-wayland = qt6Packages.callPackage ../applications/misc/qMasterPassword {
+  qmasterpassword-wayland = qmasterpassword.override {
     x11Support = false;
     waylandSupport = true;
   };