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

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
@@ -199,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;
   };
 })

pkgs/by-name/cm/cmst/package.nix

@@ -1,30 +1,29 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
+  libsForQt5,
   gitUpdater,
 }:
 
-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 = [
-    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
@@ -33,18 +32,18 @@ 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;
   };
-}
+})

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)" ];
 

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,15 +46,15 @@
 let
   copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
 in
-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
@@ -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"
@@ -130,7 +127,7 @@ 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.
@@ -149,7 +146,7 @@ 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;
   };
-}
+})

pkgs/by-name/gu/guglielmo/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -9,22 +9,21 @@
   fdk_aac,
   faad2,
   fftwFloat,
+  libsForQt5,
   libsndfile,
   libsamplerate,
   portaudio,
-  qtmultimedia,
-  qwt,
 }:
 
-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 = ''
@@ -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 = ''
@@ -53,12 +53,12 @@ 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;
   };
-}
+})

pkgs/by-name/pe/pe-bear/package.nix

@@ -3,48 +3,47 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  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;
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    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;
   };
-}
+})

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

@@ -1,29 +1,25 @@
 {
+  stdenv,
   fetchFromGitHub,
   lib,
-  stdenv,
+  libsForQt5,
   git,
   gnupg,
   pass,
   pwgen,
   qrencode,
-  qtbase,
-  qtsvg,
-  qttools,
-  qmake,
-  wrapQtAppsHook,
   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 = ''
@@ -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 = [
@@ -76,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;
   };
-}
+})

pkgs/by-name/ve/veikk-linux-driver-gui/package.nix

@@ -1,22 +1,25 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
-  qmake,
+  libsForQt5,
 }:
 
-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 = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   postBuild = ''
     make all clean
@@ -27,12 +30,12 @@ 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";
   };
-}
+})

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 {
@@ -506,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;
@@ -1078,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 {
@@ -1103,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;
@@ -1422,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;
   };
@@ -1500,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;
@@ -1634,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;
@@ -2316,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 {
@@ -11866,8 +11850,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 {