various: migrate to pkgs/by-name (#456661)

pkgs/by-name/ai/aitrack/package.nix

@@ -3,12 +3,10 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  wrapQtAppsHook,
   opencv,
   spdlog,
   onnxruntime,
-  qtx11extras,
+  libsForQt5,
 }:
 stdenv.mkDerivation {
   pname = "aitrack";
@@ -23,14 +21,14 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     opencv
     spdlog
-    qtx11extras
+    libsForQt5.qtx11extras
     onnxruntime
   ];
 

pkgs/by-name/ap/apitrace/package.nix

@@ -8,12 +8,11 @@
   procps,
   python3,
   libdwarf,
-  qtbase,
-  wrapQtAppsHook,
   libglvnd,
   gtest,
   brotli,
   enableGui ? true,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
     brotli
   ]
   ++ lib.optionals enableGui [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   nativeBuildInputs = [
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
     python3
   ]
   ++ lib.optionals enableGui [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [

pkgs/by-name/fl/flashprint/package.nix

@@ -2,11 +2,10 @@
   lib,
   stdenv,
   libGLU,
-  qtbase,
   fetchurl,
   dpkg,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     dpkg
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libGLU
   ];
 

pkgs/by-name/fu/fulcrum/package.nix

@@ -3,12 +3,11 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   python3,
-  qtbase,
   rocksdb_7_10,
   zeromq,
   nix-update-script,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
   ];
 
   buildInputs = [
     python3
-    qtbase
+    libsForQt5.qtbase
     rocksdb_7_10
     zeromq
   ];

pkgs/by-name/gi/gittyup/package.nix

@@ -11,9 +11,7 @@
   ninja,
   openssl,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
     cmark
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -66,8 +64,8 @@ stdenv.mkDerivation rec {
     libssh2
     lua5_4
     openssl
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ];
 
   postInstall = ''

pkgs/by-name/gp/gpsbabel/package.nix

@@ -5,16 +5,11 @@
   fetchurl,
   pkg-config,
   which,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
   libusb1,
   shapelib,
   zlib,
   withGUI ? false,
-  qtserialport,
   withMapPreview ? (!stdenv.hostPlatform.isDarwin),
-  qtwebengine,
   withDoc ? false,
   docbook_xml_dtd_45,
   docbook_xsl,
@@ -23,6 +18,7 @@
   libxml2,
   libxslt,
   perl,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,11 +52,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
   ]
   ++ lib.optionals withGUI [
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optionals withDoc [
     docbook_xml_dtd_45
@@ -77,8 +73,8 @@ stdenv.mkDerivation rec {
     shapelib
     zlib
   ]
-  ++ lib.optional withGUI qtserialport
-  ++ lib.optional (withGUI && withMapPreview) qtwebengine;
+  ++ lib.optional withGUI libsForQt5.qtserialport
+  ++ lib.optional (withGUI && withMapPreview) libsForQt5.qtwebengine;
 
   nativeCheckInputs = [
     libxml2

pkgs/by-name/ka/kapow/package.nix

@@ -1,11 +1,8 @@
 {
   lib,
   stdenv,
-  qmake,
   fetchFromGitHub,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "Punch clock to track time spent on projects";

pkgs/by-name/mp/mpsolve/package.nix

@@ -9,8 +9,7 @@
   gmp,
   gtk3,
   pkg-config,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     gmp
     gtk3
-    qtbase
+    libsForQt5.qtbase
   ];
 
   passthru.updateScript = gitUpdater { };

pkgs/by-name/qj/qjournalctl/package.nix

@@ -2,11 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
   pkg-config,
   libssh,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,14 +23,14 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libssh
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = with lib; {

pkgs/by-name/qn/qnotero/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonPackage rec {
@@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = [
     python3Packages.pyqt5
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   patchPhase = ''

pkgs/by-name/qt/qtrvsim/package.nix

@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +19,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "RISC-V CPU simulator for education purposes";

pkgs/by-name/rm/rmview/package.nix

@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = with python3Packages; [
     pyqt5
     setuptools
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   propagatedBuildInputs = with python3Packages; [
     pyqt5

pkgs/by-name/se/selectdefaultapplication/package.nix

@@ -2,9 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,10 +17,10 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   installPhase = ''
     runHook preInstall

pkgs/by-name/sy/synergy/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
 
   cmake,
   openssl,
@@ -14,7 +13,6 @@
   pkg-config,
   gdk-pixbuf,
   libnotify,
-  qttools,
   libICE,
   libSM,
   libX11,
@@ -26,7 +24,7 @@
   xkeyboardconfig,
   xinput,
   avahi-compat,
-
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,10 +60,10 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ]
-  ++ lib.optional withGUI wrapQtAppsHook;
+  ++ lib.optional withGUI libsForQt5.wrapQtAppsHook;
 
   buildInputs = [
-    qttools # Used for translations even when not building the GUI
+    libsForQt5.qttools # Used for translations even when not building the GUI
     openssl
     pcre
   ]

pkgs/by-name/tp/tpmmanager/package.nix

@@ -2,10 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
-  wrapQtAppsHook,
   trousers,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     trousers
   ];
 

pkgs/by-name/ya/yacas/package.nix

@@ -6,9 +6,6 @@
   cmake,
   perl,
   enableGui ? false,
-  qtbase,
-  wrapQtAppsHook,
-  qtwebengine,
   enableJupyter ? true,
   boost,
   jsoncpp,
@@ -17,6 +14,7 @@
   enableJava ? false,
   openjdk,
   gtest,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,9 +67,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
   ]
   ++ lib.optionals enableGui [
-    qtbase
-    wrapQtAppsHook
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtwebengine
   ]
   ++ lib.optionals enableJupyter [
     boost

pkgs/top-level/all-packages.nix

@@ -769,8 +769,6 @@ with pkgs;
   mkShell = callPackage ../build-support/mkshell { };
   mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
 
-  mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
-
   nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix {
     inherit lib writeText;
     inherit (emacs.pkgs) inherit-local;
@@ -1246,8 +1244,6 @@ with pkgs;
 
   gitRepo = git-repo;
 
-  gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
-
   merge-fmt = callPackage ../applications/version-management/merge-fmt {
     inherit (ocamlPackages)
       buildDunePackage
@@ -1536,8 +1532,6 @@ with pkgs;
   arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
   arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
 
-  apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { };
-
   arpack-mpi = arpack.override { useMpi = true; };
 
   asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
@@ -2225,8 +2219,6 @@ with pkgs;
 
   renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; };
 
-  rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
-
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
   ropgadget = with python3Packages; toPythonApplication ropgadget;
@@ -3703,8 +3695,6 @@ with pkgs;
 
   packagekit = callPackage ../tools/package-management/packagekit { };
 
-  pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
-
   pakcs = callPackage ../development/compilers/pakcs { };
 
   paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
@@ -3855,8 +3845,6 @@ with pkgs;
 
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
-
   qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { };
 
   qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
@@ -3952,8 +3940,6 @@ with pkgs;
 
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
-  selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
-
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
   inherit (semgrep.passthru) semgrep-core;
 
@@ -4103,8 +4089,6 @@ with pkgs;
 
   trackma-qt = trackma.override { withQT = true; };
 
-  tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
-
   trezorctl = with python3Packages; toPythonApplication trezor;
 
   trezor-agent = with python3Packages; toPythonApplication trezor-agent;
@@ -11271,8 +11255,6 @@ with pkgs;
 
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
-
   gpsbabel-gui = gpsbabel.override {
     withGUI = true;
     withDoc = true;
@@ -11544,8 +11526,6 @@ with pkgs;
     ;
   k3s = k3s_1_34;
 
-  kapow = libsForQt5.callPackage ../applications/misc/kapow { };
-
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
@@ -12108,8 +12088,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
-
   qsstv = qt5.callPackage ../applications/radio/qsstv { };
 
   qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
@@ -12396,8 +12374,6 @@ with pkgs;
     systemdSupport = true;
   };
 
-  synergy = libsForQt5.callPackage ../applications/misc/synergy { };
-
   synergyWithoutGUI = synergy.override { withGUI = false; };
 
   tabbed = callPackage ../applications/window-managers/tabbed {
@@ -12960,8 +12936,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
-
   gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
     boost = boost179;
   };
@@ -13957,8 +13931,6 @@ with pkgs;
     };
   };
 
-  yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
-
   yacas-gui = yacas.override {
     enableGui = true;
     enableJupyter = false;
@@ -14047,8 +14019,6 @@ with pkgs;
 
   faust = faust2;
 
-  flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
-
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
@@ -14330,8 +14300,6 @@ with pkgs;
 
   qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };
 
-  qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };
@@ -14587,8 +14555,6 @@ with pkgs;
 
   swift-corelibs-libdispatch = swiftPackages.Dispatch;
 
-  aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };
-
   tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
 
   duden = python3Packages.toPythonApplication python3Packages.duden;