diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/by-name/an/antimicrox/package.nix similarity index 93% rename from pkgs/tools/misc/antimicrox/default.nix rename to pkgs/by-name/an/antimicrox/package.nix index aa5fc1597bb4..207eb187851b 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/by-name/an/antimicrox/package.nix @@ -6,9 +6,8 @@ pkg-config, itstool, udevCheckHook, - wrapQtAppsHook, SDL2, - qttools, + libsForQt5, libxtst, fetchFromGitHub, }: @@ -30,11 +29,11 @@ stdenv.mkDerivation rec { pkg-config itstool udevCheckHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ SDL2 - qttools + libsForQt5.qttools libxtst ]; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/by-name/aw/awesomebump/package.nix similarity index 86% rename from pkgs/applications/graphics/awesomebump/default.nix rename to pkgs/by-name/aw/awesomebump/package.nix index c789ef1ddeee..697437f29adc 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/by-name/aw/awesomebump/package.nix @@ -2,13 +2,9 @@ lib, stdenv, fetchgit, - qtbase, - qmake, - qtscript, flex, bison, - qtdeclarative, - wrapQtAppsHook, + libsForQt5, }: let @@ -27,15 +23,15 @@ let sourceRoot = "${src.name}/Sources/utils/QtnProperty"; patches = [ ./qtnproperty-parallel-building.patch ]; buildInputs = [ - qtscript - qtbase - qtdeclarative + libsForQt5.qtscript + libsForQt5.qtbase + libsForQt5.qtdeclarative ]; nativeBuildInputs = [ - qmake + libsForQt5.qmake flex bison - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; postInstall = '' install -D bin-linux/QtnPEG $out/bin/QtnPEG @@ -49,14 +45,14 @@ stdenv.mkDerivation { inherit src; buildInputs = [ - qtbase - qtscript - qtdeclarative + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qtdeclarative ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; preBuild = '' diff --git a/pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch b/pkgs/by-name/aw/awesomebump/qtnproperty-parallel-building.patch similarity index 100% rename from pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch rename to pkgs/by-name/aw/awesomebump/qtnproperty-parallel-building.patch diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/by-name/bf/bfcal/package.nix similarity index 85% rename from pkgs/applications/misc/bfcal/default.nix rename to pkgs/by-name/bf/bfcal/package.nix index ba4fd793fb08..bf76c67e0f7f 100644 --- a/pkgs/applications/misc/bfcal/default.nix +++ b/pkgs/by-name/bf/bfcal/package.nix @@ -5,8 +5,7 @@ meson, ninja, pkg-config, - wrapQtAppsHook, - qtbase, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; meta = { @@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "bfcal"; homepage = "https://git.sr.ht/~bitfehler/bfcal"; license = lib.licenses.gpl3Plus; - platforms = qtbase.meta.platforms; + platforms = libsForQt5.qtbase.meta.platforms; maintainers = with lib.maintainers; [ laalsaas ]; }; }) diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/by-name/ca/cask-server/package.nix similarity index 94% rename from pkgs/applications/misc/cask-server/default.nix rename to pkgs/by-name/ca/cask-server/package.nix index d2563a0313e4..29b6e8e96b10 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/by-name/ca/cask-server/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, kdePackages, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake kdePackages.extra-cmake-modules - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; meta = { diff --git a/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch b/pkgs/by-name/ce/cemu-ti/cmake-no-deploy.patch similarity index 100% rename from pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch rename to pkgs/by-name/ce/cemu-ti/cmake-no-deploy.patch diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/by-name/ce/cemu-ti/package.nix similarity index 100% rename from pkgs/applications/science/math/cemu-ti/default.nix rename to pkgs/by-name/ce/cemu-ti/package.nix diff --git a/pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch b/pkgs/by-name/ce/cemu-ti/resolve-ambiguous-constexpr.patch similarity index 100% rename from pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch rename to pkgs/by-name/ce/cemu-ti/resolve-ambiguous-constexpr.patch diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/by-name/ch/chewing-editor/package.nix similarity index 96% rename from pkgs/applications/misc/chewing-editor/default.nix rename to pkgs/by-name/ch/chewing-editor/package.nix index a63497a6e6e7..f2eb5ec92780 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/by-name/ch/chewing-editor/package.nix @@ -7,8 +7,6 @@ pkg-config, libchewing, qt5, - qtbase, - qttools, }: stdenv.mkDerivation (finalAttrs: { @@ -34,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest libchewing - qtbase - qttools + qt5.qtbase + qt5.qttools ]; meta = { diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/by-name/co/communi/package.nix similarity index 92% rename from pkgs/applications/networking/irc/communi/default.nix rename to pkgs/by-name/co/communi/package.nix index 809a4b04cf3d..72c7c3f6f93e 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/by-name/co/communi/package.nix @@ -2,10 +2,7 @@ stdenv, lib, fetchFromGitHub, - libcommuni, - qmake, - qtbase, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation { @@ -24,13 +21,13 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - libcommuni - qtbase + libsForQt5.libcommuni + libsForQt5.qtbase ]; # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin @@ -39,7 +36,7 @@ stdenv.mkDerivation { dontWrapQtApps = stdenv.hostPlatform.isDarwin; preConfigure = '' - export QMAKEFEATURES=${libcommuni}/features + export QMAKEFEATURES=${libsForQt5.libcommuni}/features ''; qmakeFlags = [ diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/by-name/co/confclerk/package.nix similarity index 86% rename from pkgs/applications/misc/confclerk/default.nix rename to pkgs/by-name/co/confclerk/package.nix index 7c7750203830..12b675d08bc4 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/by-name/co/confclerk/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchurl, - qtbase, - qmake, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -16,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GgWvPHcQnQrK9SOC8U9F2P8kuPCn8I2EhoWEEMtKBww="; }; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; postInstall = '' diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/by-name/co/coreboot-configurator/package.nix similarity index 95% rename from pkgs/tools/misc/coreboot-configurator/default.nix rename to pkgs/by-name/co/coreboot-configurator/package.nix index 631e18581624..9b21e86c9c34 100644 --- a/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/pkgs/by-name/co/coreboot-configurator/package.nix @@ -14,9 +14,7 @@ yaml-cpp, nvramtool, systemd, - qtbase, - qtsvg, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation { @@ -35,12 +33,12 @@ stdenv.mkDerivation { meson ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ yaml-cpp - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ]; postPatch = '' diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/by-name/cu/cura/package.nix similarity index 93% rename from pkgs/applications/misc/cura/default.nix rename to pkgs/by-name/cu/cura/package.nix index 9e04fe277cda..bce9ab2fb375 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/by-name/cu/cura/package.nix @@ -4,10 +4,7 @@ fetchFromGitHub, cmake, python3, - wrapQtAppsHook, - qtbase, - qtquickcontrols2, - qtgraphicaleffects, + libsForQt5, curaengine, plugins ? [ ], }: @@ -31,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - qtbase - qtquickcontrols2 - qtgraphicaleffects + libsForQt5.qtbase + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; @@ -53,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake python3.pkgs.wrapPython - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/by-name/dd/ddcui/package.nix similarity index 90% rename from pkgs/applications/misc/ddcui/default.nix rename to pkgs/by-name/dd/ddcui/package.nix index 4b247360196e..acec39e67c1c 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/by-name/dd/ddcui/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsHook, - qtbase, - qttools, + libsForQt5, ddcutil, }: @@ -26,12 +24,12 @@ stdenv.mkDerivation rec { # file is not currently written to support PREFIX installations. cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools ddcutil ]; diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/by-name/de/degate/package.nix similarity index 90% rename from pkgs/applications/science/electronics/degate/default.nix rename to pkgs/by-name/de/degate/package.nix index 7f9e56ee9f68..6f12df416f3a 100644 --- a/pkgs/applications/science/electronics/degate/default.nix +++ b/pkgs/by-name/de/degate/package.nix @@ -5,10 +5,7 @@ fetchpatch, cmake, boost183, - qtbase, - qtimageformats, - qttools, - wrapQtAppsHook, + libsForQt5, }: let @@ -49,13 +46,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ boost_static - qtbase + libsForQt5.qtbase ]; doCheck = true; @@ -66,7 +63,7 @@ stdenv.mkDerivation rec { cd tests/out/bin # provide qtimageformats plugin to allow tests to read tiff files - export QT_PLUGIN_PATH="${qtimageformats}/${qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${libsForQt5.qtimageformats}/${libsForQt5.qtbase.qtPluginPrefix}" ./DegateTests ) diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/by-name/di/dialogbox/package.nix similarity index 91% rename from pkgs/tools/misc/dialogbox/default.nix rename to pkgs/by-name/di/dialogbox/package.nix index b4d932c7f2d9..da09653201f1 100644 --- a/pkgs/tools/misc/dialogbox/default.nix +++ b/pkgs/by-name/di/dialogbox/package.nix @@ -2,9 +2,7 @@ stdenv, lib, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, }: stdenv.mkDerivation { @@ -19,12 +17,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; installPhase = '' diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch b/pkgs/by-name/di/diffpdf/fix_path_poppler_qt5.patch similarity index 100% rename from pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch rename to pkgs/by-name/di/diffpdf/fix_path_poppler_qt5.patch diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/by-name/di/diffpdf/package.nix similarity index 92% rename from pkgs/applications/misc/diffpdf/default.nix rename to pkgs/by-name/di/diffpdf/package.nix index 75cf07bf2e07..cb38b488aed9 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/by-name/di/diffpdf/package.nix @@ -3,11 +3,7 @@ stdenv, fetchurl, fetchpatch, - qmake, - qttools, - wrapQtAppsHook, - qtbase, - poppler, + libsForQt5, }: stdenv.mkDerivation rec { @@ -28,17 +24,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - poppler + libsForQt5.qtbase + libsForQt5.poppler ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${libsForQt5.poppler.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/science/electronics/dsview/cmake4.patch b/pkgs/by-name/ds/dsview/cmake4.patch similarity index 100% rename from pkgs/applications/science/electronics/dsview/cmake4.patch rename to pkgs/by-name/ds/dsview/cmake4.patch diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/by-name/ds/dsview/install.patch similarity index 100% rename from pkgs/applications/science/electronics/dsview/install.patch rename to pkgs/by-name/ds/dsview/install.patch diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/by-name/ds/dsview/package.nix similarity index 89% rename from pkgs/applications/science/electronics/dsview/default.nix rename to pkgs/by-name/ds/dsview/package.nix index 17b1a69380ae..20f0fc1ae928 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/by-name/ds/dsview/package.nix @@ -4,14 +4,11 @@ fetchFromGitHub, pkg-config, cmake, - wrapQtAppsHook, libzip, boost, fftw, libusb1, - qtbase, - qtsvg, - qtwayland, + libsForQt5, python3, desktopToDarwinBundle, }: @@ -40,20 +37,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ boost fftw - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg libusb1 libzip python3 ] - ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland; doInstallCheck = true; diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/by-name/ed/edb/package.nix similarity index 95% rename from pkgs/development/tools/misc/edb/default.nix rename to pkgs/by-name/ed/edb/package.nix index f41b4324d6e9..866bb4e905d3 100644 --- a/pkgs/development/tools/misc/edb/default.nix +++ b/pkgs/by-name/ed/edb/package.nix @@ -8,10 +8,7 @@ capstone_4, double-conversion, graphviz, - qtxmlpatterns, - qttools, - qtbase, - wrapQtAppsHook, + libsForQt5, testers, nix-update-script, }: @@ -31,17 +28,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase + libsForQt5.qtbase boost.dev capstone_4 double-conversion graphviz - qtxmlpatterns + libsForQt5.qtxmlpatterns ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/by-name/ei/eiskaltdcpp/package.nix similarity index 94% rename from pkgs/applications/networking/p2p/eiskaltdcpp/default.nix rename to pkgs/by-name/ei/eiskaltdcpp/package.nix index 600575d672ea..66e7768485df 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/by-name/ei/eiskaltdcpp/package.nix @@ -5,13 +5,9 @@ fetchpatch2, cmake, pkg-config, - wrapQtAppsHook, bzip2, libx11, - qtbase, - qttools, - qtmultimedia, - qtscript, + libsForQt5, libiconv, pcre-cpp, libidn, @@ -43,13 +39,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qttools - qtmultimedia - qtscript + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtmultimedia + libsForQt5.qtscript bzip2 libx11 pcre-cpp diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/by-name/ev/evtest-qt/package.nix similarity index 93% rename from pkgs/applications/misc/evtest-qt/default.nix rename to pkgs/by-name/ev/evtest-qt/package.nix index 4067d0d5d311..dbf98a59b5ae 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/by-name/ev/evtest-qt/package.nix @@ -1,9 +1,8 @@ { lib, stdenv, - qtbase, cmake, - wrapQtAppsHook, + libsForQt5, fetchFromGitHub, fetchpatch, unstableGitUpdater, @@ -33,10 +32,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/by-name/g2/g2o/package.nix similarity index 90% rename from pkgs/development/libraries/g2o/default.nix rename to pkgs/by-name/g2/g2o/package.nix index c37e20027906..96a67570f191 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/by-name/g2/g2o/package.nix @@ -3,14 +3,12 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, eigen, suitesparse, blas, lapack, libGLU, - qtbase, - libqglviewer, + libsForQt5, spdlog, }: @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ eigen @@ -44,8 +42,8 @@ stdenv.mkDerivation rec { blas lapack libGLU - qtbase - libqglviewer + libsForQt5.qtbase + libsForQt5.libqglviewer ]; propagatedBuildInputs = [ spdlog ]; @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ # Detection script is broken - "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" + "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ diff --git a/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/pkgs/by-name/g2/g2o/remove-compiler-reference.patch similarity index 100% rename from pkgs/development/libraries/g2o/remove-compiler-reference.patch rename to pkgs/by-name/g2/g2o/remove-compiler-reference.patch diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/by-name/ge/gecode/package.nix similarity index 68% rename from pkgs/development/libraries/gecode/default.nix rename to pkgs/by-name/ge/gecode/package.nix index 5f7cfb52fe63..d07198f78125 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/by-name/ge/gecode/package.nix @@ -8,7 +8,7 @@ perl, gmp, mpfr, - qtbase, + libsForQt5, enableGist ? true, }: @@ -24,7 +24,12 @@ stdenv.mkDerivation rec { }; patches = [ - (import ./fix-const-weights-clang-patch.nix fetchpatch) + # https://github.com/Gecode/gecode/pull/74 + (fetchpatch { + name = "fix-const-weights-clang.patch"; + url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; + sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; + }) ]; enableParallelBuilding = true; @@ -38,7 +43,7 @@ stdenv.mkDerivation rec { gmp mpfr ] - ++ lib.optional enableGist qtbase; + ++ lib.optional enableGist libsForQt5.qtbase; meta = { license = lib.licenses.mit; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/by-name/ge/gecode_3/package.nix similarity index 72% rename from pkgs/development/libraries/gecode/3.nix rename to pkgs/by-name/ge/gecode_3/package.nix index 134c17fa37c0..7db4192b6bfb 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/by-name/ge/gecode_3/package.nix @@ -16,7 +16,12 @@ stdenv.mkDerivation rec { }; patches = [ - (import ./fix-const-weights-clang-patch.nix fetchpatch) + # https://github.com/Gecode/gecode/pull/74 + (fetchpatch { + name = "fix-const-weights-clang.patch"; + url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; + sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; + }) ]; postPatch = '' diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/by-name/ge/gede/package.nix similarity index 83% rename from pkgs/development/tools/misc/gede/default.nix rename to pkgs/by-name/ge/gede/package.nix index 857c8a6fb84f..b03119072f3a 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/by-name/ge/gede/package.nix @@ -4,10 +4,7 @@ fetchFromGitHub, makeWrapper, python3, - qtbase, - qmake, - qtserialport, - wrapQtAppsHook, + libsForQt5, ctags, gdb, }: @@ -27,9 +24,9 @@ stdenv.mkDerivation rec { ctags makeWrapper python3 - qmake - qtserialport - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qtserialport + libsForQt5.wrapQtAppsHook ]; strictDeps = true; @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { installPhase = '' python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ - --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \ + --prefix QT_PLUGIN_PATH : ${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix} \ --prefix PATH : ${ lib.makeBinPath [ ctags diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/by-name/gl/glogg/package.nix similarity index 95% rename from pkgs/tools/text/glogg/default.nix rename to pkgs/by-name/gl/glogg/package.nix index 23e84e7dc90a..840142175fe4 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/by-name/gl/glogg/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, + libsForQt5, boost, }: @@ -24,8 +23,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ boost ]; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/by-name/go/googleearth-pro/package.nix similarity index 98% rename from pkgs/applications/misc/googleearth-pro/default.nix rename to pkgs/by-name/go/googleearth-pro/package.nix index 76722bdeb2e8..d5907528d408 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/by-name/go/googleearth-pro/package.nix @@ -29,7 +29,7 @@ xkeyboard-config, autoPatchelfHook, - wrapQtAppsHook, + libsForQt5, }: let arch = @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { dpkg makeWrapper autoPatchelfHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; propagatedBuildInputs = [ xkeyboard-config ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/by-name/gu/guvcview/package.nix similarity index 93% rename from pkgs/os-specific/linux/guvcview/default.nix rename to pkgs/by-name/gu/guvcview/package.nix index 772b53f12436..af683e34bc54 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/by-name/gu/guvcview/package.nix @@ -19,8 +19,7 @@ pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio, useQt ? false, - qtbase ? null, - wrapQtAppsHook ? null, + libsForQt5, # can be turned off if used as a library useGtk ? true, gtk3, @@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ] ++ lib.optionals useGtk [ wrapGAppsHook3 ] - ++ lib.optionals useQt [ wrapQtAppsHook ]; + ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ]; buildInputs = [ SDL2 @@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals useGtk [ gtk3 ] ++ lib.optionals useQt [ - qtbase + libsForQt5.qtbase ]; configureFlags = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/by-name/he/heimer/package.nix similarity index 93% rename from pkgs/applications/misc/heimer/default.nix rename to pkgs/by-name/he/heimer/package.nix index d6545bd6c645..93c1718fbe49 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/by-name/he/heimer/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - wrapQtAppsHook, - qttools, - qtbase, + libsForQt5, }: stdenv.mkDerivation rec { @@ -36,12 +34,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qttools - qtbase + libsForQt5.qttools + libsForQt5.qtbase ]; meta = { diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/by-name/he/herqq/package.nix similarity index 84% rename from pkgs/development/libraries/herqq/default.nix rename to pkgs/by-name/he/herqq/package.nix index 939b4086ee03..53a832f9fcf0 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/by-name/he/herqq/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtmultimedia, - qtbase, + libsForQt5, }: stdenv.mkDerivation rec { @@ -13,13 +10,13 @@ stdenv.mkDerivation rec { pname = "herqq"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia ]; outputs = [ diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/by-name/ho/hopper/package.nix similarity index 97% rename from pkgs/development/tools/analysis/hopper/default.nix rename to pkgs/by-name/ho/hopper/package.nix index 93b29865173d..b6d876217d6a 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/by-name/ho/hopper/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, autoPatchelfHook, - wrapQtAppsHook, + libsForQt5, gnustep-libobjc, libbsd, libffi_3_3, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/hue-plus/default.nix b/pkgs/by-name/hu/hue-plus/package.nix similarity index 90% rename from pkgs/applications/misc/hue-plus/default.nix rename to pkgs/by-name/hu/hue-plus/package.nix index 0c73820b3cda..c229d5df7038 100644 --- a/pkgs/applications/misc/hue-plus/default.nix +++ b/pkgs/by-name/hu/hue-plus/package.nix @@ -2,8 +2,7 @@ python3Packages, fetchFromGitHub, lib, - wrapQtAppsHook, - qtbase, + libsForQt5, }: python3Packages.buildPythonApplication { @@ -18,9 +17,9 @@ python3Packages.buildPythonApplication { sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; }; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ pyserial diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/by-name/hy/hyperion-ng/package.nix similarity index 92% rename from pkgs/applications/video/hyperion-ng/default.nix rename to pkgs/by-name/hy/hyperion-ng/package.nix index 618d690d7609..a0940a96497a 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/by-name/hy/hyperion-ng/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, gitMinimal, - wrapQtAppsHook, + libsForQt5, perl, flatbuffers, protobuf, @@ -18,11 +18,6 @@ libxcb, libxrandr, python3, - qtbase, - qtserialport, - qtsvg, - qtx11extras, - qtwebsockets, withRPiDispmanx ? false, libraspberrypi, }: @@ -54,11 +49,11 @@ stdenv.mkDerivation rec { protobuf mbedtls python3 - qtbase - qtserialport - qtsvg - qtwebsockets - qtx11extras + libsForQt5.qtbase + libsForQt5.qtserialport + libsForQt5.qtsvg + libsForQt5.qtwebsockets + libsForQt5.qtx11extras ] ++ lib.optional stdenv.hostPlatform.isLinux libcec ++ lib.optional withRPiDispmanx libraspberrypi; @@ -66,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gitMinimal - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/by-name/i7/i7z/package.nix similarity index 94% rename from pkgs/os-specific/linux/i7z/default.nix rename to pkgs/by-name/i7/i7z/package.nix index c7f26a82386b..305fd0c689b7 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/by-name/i7/i7z/package.nix @@ -5,7 +5,7 @@ fetchpatch, ncurses, withGui ? false, - qtbase, + libsForQt5, }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy"; }; - buildInputs = [ ncurses ] ++ lib.optional withGui qtbase; + buildInputs = [ ncurses ] ++ lib.optional withGui libsForQt5.qtbase; patches = [ (fetchpatch { diff --git a/pkgs/os-specific/linux/i7z/qt5.patch b/pkgs/by-name/i7/i7z/qt5.patch similarity index 100% rename from pkgs/os-specific/linux/i7z/qt5.patch rename to pkgs/by-name/i7/i7z/qt5.patch diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/by-name/kr/kristall/package.nix similarity index 89% rename from pkgs/applications/networking/browsers/kristall/default.nix rename to pkgs/by-name/kr/kristall/package.nix index 8cd69c42d670..273b7b088f27 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/by-name/kr/kristall/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - wrapQtAppsHook, - qmake, - qtmultimedia, + libsForQt5, }: stdenv.mkDerivation rec { @@ -23,11 +21,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wrapQtAppsHook - qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qmake ]; - buildInputs = [ qtmultimedia ]; + buildInputs = [ libsForQt5.qtmultimedia ]; qmakeFlags = [ "src/kristall.pro" ]; @@ -52,6 +50,6 @@ stdenv.mkDerivation rec { mainProgram = "kristall"; homepage = "https://random-projects.net/projects/kristall.gemini"; license = lib.licenses.gpl3Only; - inherit (qtmultimedia.meta) platforms; + inherit (libsForQt5.qtmultimedia.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/by-name/kv/kvirc/package.nix similarity index 81% rename from pkgs/applications/networking/irc/kvirc/default.nix rename to pkgs/by-name/kv/kvirc/package.nix index 84174949a0f5..131423c5fb59 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/by-name/kv/kvirc/package.nix @@ -2,14 +2,10 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qtmultimedia, - qtsvg, - qtx11extras, pkg-config, cmake, gettext, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation { @@ -24,17 +20,17 @@ stdenv.mkDerivation { }; buildInputs = [ - qtbase - qtmultimedia - qtsvg - qtx11extras + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtsvg + libsForQt5.qtx11extras ]; nativeBuildInputs = [ pkg-config cmake gettext - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; meta = { diff --git a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/pkgs/by-name/li/linssid/0001-unbundled-qwt.patch similarity index 100% rename from pkgs/applications/networking/linssid/0001-unbundled-qwt.patch rename to pkgs/by-name/li/linssid/0001-unbundled-qwt.patch diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/by-name/li/linssid/package.nix similarity index 84% rename from pkgs/applications/networking/linssid/default.nix rename to pkgs/by-name/li/linssid/package.nix index ef9c30c5a770..d0974b9161c1 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/by-name/li/linssid/package.nix @@ -2,15 +2,11 @@ lib, stdenv, fetchurl, - qtbase, - qtsvg, - qmake, pkg-config, boost, wirelesstools, iw, - qwt6_1, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -24,20 +20,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg boost - qwt6_1 + libsForQt5.qwt6_1 ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' - sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro + sed -e "s|/usr/include/qt5.*$|& ${libsForQt5.qwt6_1}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ diff --git a/pkgs/development/tools/loganalyzer/default.nix b/pkgs/by-name/lo/loganalyzer/package.nix similarity index 93% rename from pkgs/development/tools/loganalyzer/default.nix rename to pkgs/by-name/lo/loganalyzer/package.nix index 34c6021f02fd..b869f579f386 100644 --- a/pkgs/development/tools/loganalyzer/default.nix +++ b/pkgs/by-name/lo/loganalyzer/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qtsvg, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -20,12 +18,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ]; nativeBuildInputs = [ - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/by-name/ly/lyx/package.nix similarity index 92% rename from pkgs/applications/misc/lyx/default.nix rename to pkgs/by-name/ly/lyx/package.nix index 76f3e6059e40..a766d92207a1 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/by-name/ly/lyx/package.nix @@ -6,9 +6,7 @@ python3, file, bc, - qtbase, - wrapQtAppsHook, - qtsvg, + libsForQt5, hunspell, makeWrapper, # , mythes, boost }: @@ -27,12 +25,12 @@ stdenv.mkDerivation rec { pkg-config makeWrapper python3 - qtbase - wrapQtAppsHook + libsForQt5.qtbase + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg file # for libmagic bc hunspell # enchant diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/by-name/ma/makehuman/package.nix similarity index 96% rename from pkgs/applications/misc/makehuman/default.nix rename to pkgs/by-name/ma/makehuman/package.nix index 309d0a84771a..e5a56d273542 100644 --- a/pkgs/applications/misc/makehuman/default.nix +++ b/pkgs/by-name/ma/makehuman/package.nix @@ -3,9 +3,8 @@ lib, fetchFromGitHub, python3, - qtbase, git-lfs, - wrapQtAppsHook, + libsForQt5, }: let @@ -45,14 +44,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python - qtbase + libsForQt5.qtbase git-lfs - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ python - qtbase + libsForQt5.qtbase ]; propagatedBuildInputs = pydeps; diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/by-name/ma/maliit-framework/package.nix similarity index 89% rename from pkgs/applications/misc/maliit-framework/default.nix rename to pkgs/by-name/ma/maliit-framework/package.nix index f6432ac2d66d..54e06bafac77 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/by-name/ma/maliit-framework/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, fetchpatch, - qtbase, - at-spi2-atk, at-spi2-core, libepoxy, @@ -25,7 +23,7 @@ pkg-config, wayland-protocols, wayland-scanner, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation { @@ -61,11 +59,11 @@ stdenv.mkDerivation { pkg-config wayland-protocols wayland-scanner - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ - "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}" ]; meta = { diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/by-name/ma/maliit-keyboard/package.nix similarity index 86% rename from pkgs/applications/misc/maliit-keyboard/default.nix rename to pkgs/by-name/ma/maliit-keyboard/package.nix index 822aa5c2e773..9b8e637cc77d 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/by-name/ma/maliit-keyboard/package.nix @@ -8,15 +8,11 @@ libchewing, libpinyin, maliit-framework, - qtfeedback, - qtmultimedia, - qtquickcontrols2, - qtgraphicaleffects, cmake, pkg-config, wrapGAppsHook3, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation { @@ -41,10 +37,10 @@ stdenv.mkDerivation { libchewing libpinyin maliit-framework - qtfeedback - qtmultimedia - qtquickcontrols2 - qtgraphicaleffects + libsForQt5.qtfeedback + libsForQt5.qtmultimedia + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects ]; cmakeFlags = [ @@ -56,7 +52,7 @@ stdenv.mkDerivation { cmake pkg-config wrapGAppsHook3 - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; postInstall = '' diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/by-name/mi/michabo/package.nix similarity index 89% rename from pkgs/applications/misc/michabo/default.nix rename to pkgs/by-name/mi/michabo/package.nix index 482cace47eb3..4e9875d1d78f 100644 --- a/pkgs/applications/misc/michabo/default.nix +++ b/pkgs/by-name/mi/michabo/package.nix @@ -3,11 +3,7 @@ stdenv, makeDesktopItem, fetchFromGitLab, - qmake, - wrapQtAppsHook, - # qt - qtbase, - qtwebsockets, + libsForQt5, }: let @@ -31,12 +27,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtwebsockets + libsForQt5.qtbase + libsForQt5.qtwebsockets ]; qmakeFlags = [ diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/by-name/my/mythtv/dont-source-os-release.patch similarity index 100% rename from pkgs/applications/video/mythtv/dont-source-os-release.patch rename to pkgs/by-name/my/mythtv/dont-source-os-release.patch diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/by-name/my/mythtv/package.nix similarity index 94% rename from pkgs/applications/video/mythtv/default.nix rename to pkgs/by-name/my/mythtv/package.nix index b22bfb64ba47..012a2ba1dbeb 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/by-name/my/mythtv/package.nix @@ -3,8 +3,6 @@ stdenv, fetchFromGitHub, which, - qtbase, - qtscript, libpulseaudio, fftwSinglePrec, lame, @@ -32,7 +30,7 @@ autoconf, automake, file, - wrapQtAppsHook, + libsForQt5, exiv2, linuxHeaders, soundtouch, @@ -60,8 +58,8 @@ stdenv.mkDerivation rec { buildInputs = [ freetype - qtbase - qtscript + libsForQt5.qtbase + libsForQt5.qtscript lame zlib libGLU @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { autoconf automake file - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/by-name/na/nano-wallet/package.nix similarity index 82% rename from pkgs/applications/blockchains/nano-wallet/default.nix rename to pkgs/by-name/na/nano-wallet/package.nix index 821e8b1880bb..1e06141692a0 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/by-name/na/nano-wallet/package.nix @@ -5,10 +5,9 @@ fetchpatch, cmake, pkg-config, - wrapQtAppsHook, boost, libGL, - qtbase, + libsForQt5, python3, }: @@ -43,10 +42,10 @@ stdenv.mkDerivation (finalAttrs: { BOOST_ROOT = boost; RAIBLOCKS_GUI = "ON"; RAIBLOCKS_TEST = "ON"; - Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; - Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core"; - Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui"; - Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets"; + Qt5_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5"; + Qt5Core_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core"; + Qt5Gui_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtGui"; + Qt5Widgets_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtWidgets"; }; optionToFlag = name: value: "-D${name}=${value}"; in @@ -55,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ boost libGL - qtbase + libsForQt5.qtbase ]; strictDeps = true; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/by-name/na/nanovna-saver/package.nix similarity index 100% rename from pkgs/applications/science/electronics/nanovna-saver/default.nix rename to pkgs/by-name/na/nanovna-saver/package.nix diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/by-name/na/natron/package.nix similarity index 98% rename from pkgs/applications/video/natron/default.nix rename to pkgs/by-name/na/natron/package.nix index a47c815aef41..3b646a73bf27 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/by-name/na/natron/package.nix @@ -5,7 +5,7 @@ fetchpatch, cmake, pkg-config, - wrapQtAppsHook, + libsForQt5, boost, cairo, ceres-solver, @@ -63,7 +63,7 @@ stdenv.mkDerivation { cmake kdePackages.extra-cmake-modules pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/tools/graphics/nifskope/external-lib-paths.patch b/pkgs/by-name/ni/nifskope/external-lib-paths.patch similarity index 100% rename from pkgs/tools/graphics/nifskope/external-lib-paths.patch rename to pkgs/by-name/ni/nifskope/external-lib-paths.patch diff --git a/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch b/pkgs/by-name/ni/nifskope/no-sse-on-arm.patch similarity index 100% rename from pkgs/tools/graphics/nifskope/no-sse-on-arm.patch rename to pkgs/by-name/ni/nifskope/no-sse-on-arm.patch diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/by-name/ni/nifskope/package.nix similarity index 93% rename from pkgs/tools/graphics/nifskope/default.nix rename to pkgs/by-name/ni/nifskope/package.nix index db59bb81613c..0c19da4fe22d 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/by-name/ni/nifskope/package.nix @@ -2,13 +2,10 @@ lib, stdenv, fetchFromGitHub, - qmake, - qtbase, - qttools, replaceVars, libGLU, zlib, - wrapQtAppsHook, + libsForQt5, fetchpatch, }: @@ -28,7 +25,7 @@ stdenv.mkDerivation { ./external-lib-paths.patch ./zlib.patch (replaceVars ./qttools-bins.patch { - qttools = "${qttools.dev}/bin"; + qttools = "${libsForQt5.qttools.dev}/bin"; }) (fetchpatch { name = "qt512-build-fix.patch"; @@ -39,14 +36,14 @@ stdenv.mkDerivation { ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch); buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools libGLU zlib ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; preConfigure = '' diff --git a/pkgs/tools/graphics/nifskope/qttools-bins.patch b/pkgs/by-name/ni/nifskope/qttools-bins.patch similarity index 100% rename from pkgs/tools/graphics/nifskope/qttools-bins.patch rename to pkgs/by-name/ni/nifskope/qttools-bins.patch diff --git a/pkgs/tools/graphics/nifskope/zlib.patch b/pkgs/by-name/ni/nifskope/zlib.patch similarity index 100% rename from pkgs/tools/graphics/nifskope/zlib.patch rename to pkgs/by-name/ni/nifskope/zlib.patch diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/by-name/ni/nitrokey-app/package.nix similarity index 96% rename from pkgs/tools/security/nitrokey-app/default.nix rename to pkgs/by-name/ni/nitrokey-app/package.nix index b5521973ead4..b81271ebba75 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/by-name/ni/nitrokey-app/package.nix @@ -4,10 +4,9 @@ cmake, fetchFromGitHub, pkg-config, - wrapQtAppsHook, + libsForQt5, libnitrokey, cppcodec, - qttools, }: stdenv.mkDerivation rec { @@ -24,8 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; cmakeFlags = [ diff --git a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix b/pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix similarity index 94% rename from pkgs/tools/system/nvidia-system-monitor-qt/default.nix rename to pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix index d7ef01f0c9cc..76c9403b1721 100644 --- a/pkgs/tools/system/nvidia-system-monitor-qt/default.nix +++ b/pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix @@ -3,8 +3,7 @@ lib, fetchFromGitHub, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, makeDesktopItem, copyDesktopItems, }: @@ -35,10 +34,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg="; }; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook copyDesktopItems ]; diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/by-name/op/openambit/package.nix similarity index 96% rename from pkgs/applications/misc/openambit/default.nix rename to pkgs/by-name/op/openambit/package.nix index 0c8f6c9cfcde..4607c3b3d79f 100644 --- a/pkgs/applications/misc/openambit/default.nix +++ b/pkgs/by-name/op/openambit/package.nix @@ -6,9 +6,7 @@ lib, libusb1, python3, - qtbase, - qttools, - wrapQtAppsHook, + libsForQt5, udev, zlib, }: @@ -49,13 +47,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libusb1 python3 - qtbase + libsForQt5.qtbase udev zlib ]; diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/by-name/op/openbrf/package.nix similarity index 93% rename from pkgs/applications/misc/openbrf/default.nix rename to pkgs/by-name/op/openbrf/package.nix index e131ff45ce97..cd881f745853 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/by-name/op/openbrf/package.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, vcg, glew, libGLU, @@ -34,12 +32,12 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase vcg glew eigen @@ -61,7 +59,7 @@ stdenv.mkDerivation { patchelf \ --set-rpath "${ lib.makeLibraryPath [ - qtbase + libsForQt5.qtbase glew stdenv.cc.cc libGLU diff --git a/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch b/pkgs/by-name/op/opentx/fix-cmake-qt-linking-and-location.patch similarity index 100% rename from pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch rename to pkgs/by-name/op/opentx/fix-cmake-qt-linking-and-location.patch diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/by-name/op/opentx/package.nix similarity index 95% rename from pkgs/applications/misc/opentx/default.nix rename to pkgs/by-name/op/opentx/package.nix index 147a72df6c71..43ef23356568 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/by-name/op/opentx/package.nix @@ -5,11 +5,8 @@ cmake, gcc-arm-embedded, python3Packages, - qttools, udevCheckHook, - wrapQtAppsHook, - qtbase, - qtmultimedia, + libsForQt5, SDL, gtest, dfu-util, @@ -35,14 +32,14 @@ stdenv.mkDerivation rec { cmake gcc-arm-embedded python3Packages.pillow - qttools + libsForQt5.qttools udevCheckHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia SDL ]; diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/by-name/pr/projecteur/package.nix similarity index 91% rename from pkgs/os-specific/linux/projecteur/default.nix rename to pkgs/by-name/pr/projecteur/package.nix index b6823f0dc433..5139d991049e 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/by-name/pr/projecteur/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, cmake, pkg-config, - qtbase, - qtgraphicaleffects, - wrapQtAppsHook, + libsForQt5, udevCheckHook, versionCheckHook, }: @@ -24,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - qtbase - qtgraphicaleffects + libsForQt5.qtbase + libsForQt5.qtgraphicaleffects ]; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook udevCheckHook ]; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/by-name/pu/pulseview/package.nix similarity index 93% rename from pkgs/applications/science/electronics/pulseview/default.nix rename to pkgs/by-name/pu/pulseview/package.nix index 2582f03ccd92..eae130b779ee 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/by-name/pu/pulseview/package.nix @@ -15,10 +15,8 @@ glibmm, pcre, python3, - qtsvg, - qttools, bluez, - wrapQtAppsHook, + libsForQt5, desktopToDarwinBundle, }: @@ -36,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; @@ -53,7 +51,7 @@ stdenv.mkDerivation { glibmm pcre python3 - qtsvg + libsForQt5.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/by-name/pu/pure-maps/package.nix similarity index 84% rename from pkgs/applications/misc/pure-maps/default.nix rename to pkgs/by-name/pu/pure-maps/package.nix index 9903c2433c47..a9730664d973 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/by-name/pu/pure-maps/package.nix @@ -3,16 +3,10 @@ stdenv, fetchFromGitHub, cmake, - qttools, - wrapQtAppsHook, - qtquickcontrols2, - qtlocation, - qtsensors, + libsForQt5, nemo-qml-plugin-dbus, - mapbox-gl-qml, s2geometry, python3, - pyotherside, }: stdenv.mkDerivation rec { @@ -30,18 +24,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 - qttools + libsForQt5.qttools python3.pkgs.wrapPython - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtquickcontrols2 - qtlocation - qtsensors + libsForQt5.qtquickcontrols2 + libsForQt5.qtlocation + libsForQt5.qtsensors nemo-qml-plugin-dbus - pyotherside - mapbox-gl-qml + libsForQt5.pyotherside + libsForQt5.mapbox-gl-qml s2geometry ]; diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/by-name/qa/qarte/package.nix similarity index 94% rename from pkgs/applications/video/qarte/default.nix rename to pkgs/by-name/qa/qarte/package.nix index 297493de9da8..e8abc59501c7 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/by-name/qa/qarte/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchbzr, - wrapQtAppsHook, + libsForQt5, python3, rtmpdump, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "sha256-+Ixe4bWKubH/XBESwmP2NWS8bH0jq611c3MZn7W87Jw="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; buildInputs = [ pythonEnv ]; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/by-name/qb/qbs/package.nix similarity index 86% rename from pkgs/development/tools/build-managers/qbs/default.nix rename to pkgs/by-name/qb/qbs/package.nix index 9bac8e827fc0..761cdb8a2162 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/by-name/qb/qbs/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - qtbase, - qtscript, + libsForQt5, }: stdenv.mkDerivation rec { @@ -19,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nL7UZh29Oecu3RvXYg5xsin2IvPWpApleLH37sEdSAI="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ libsForQt5.qmake ]; dontWrapQtApps = true; @@ -29,8 +27,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase - qtscript + libsForQt5.qtbase + libsForQt5.qtscript ]; meta = { diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/by-name/qc/qctools/package.nix similarity index 91% rename from pkgs/applications/video/qctools/default.nix rename to pkgs/by-name/qc/qctools/package.nix index b42469008eb6..1f31afa22a60 100644 --- a/pkgs/applications/video/qctools/default.nix +++ b/pkgs/by-name/qc/qctools/package.nix @@ -2,11 +2,8 @@ lib, stdenv, fetchurl, - qmake, - wrapQtAppsHook, ffmpeg_6, - qtmultimedia, - qwt, + libsForQt5, }: stdenv.mkDerivation rec { @@ -21,14 +18,14 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}/Project/QtCreator"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ ffmpeg_6 - qtmultimedia - qwt + libsForQt5.qtmultimedia + libsForQt5.qwt ]; installPhase = '' diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/by-name/qf/qFlipper/package.nix similarity index 84% rename from pkgs/tools/misc/qflipper/default.nix rename to pkgs/by-name/qf/qFlipper/package.nix index d1ea8a0da1fa..a9d2156d07f9 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/by-name/qf/qFlipper/package.nix @@ -6,20 +6,9 @@ zlib, libusb1, libGL, - qmake, wrapGAppsHook3, - wrapQtAppsHook, - qttools, - qtbase, - qt3d, - qtsvg, - qtserialport, - qtdeclarative, - qtquickcontrols, - qtquickcontrols2, - qtgraphicaleffects, - qtwayland, + libsForQt5, nix-update-script, }: let @@ -43,10 +32,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config - qmake - qttools + libsForQt5.qmake + libsForQt5.qttools wrapGAppsHook3 - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -54,17 +43,17 @@ stdenv.mkDerivation { libusb1 libGL - qtbase - qt3d - qtsvg - qtserialport - qtdeclarative - qtquickcontrols - qtquickcontrols2 - qtgraphicaleffects + libsForQt5.qtbase + libsForQt5.qt3d + libsForQt5.qtsvg + libsForQt5.qtserialport + libsForQt5.qtdeclarative + libsForQt5.qtquickcontrols + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - qtwayland + libsForQt5.qtwayland ]; qmakeFlags = [ diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/by-name/qj/qjoypad/package.nix similarity index 93% rename from pkgs/tools/misc/qjoypad/default.nix rename to pkgs/by-name/qj/qjoypad/package.nix index 917aef1ce2bb..a1b4e185371a 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/by-name/qj/qjoypad/package.nix @@ -4,12 +4,9 @@ fetchFromGitHub, pkg-config, cmake, - qttools, - wrapQtAppsHook, libx11, libxtst, - qtbase, - qtx11extras, + libsForQt5, }: stdenv.mkDerivation rec { pname = "qjoypad"; @@ -30,14 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libx11 libxtst - qtbase - qtx11extras + libsForQt5.qtbase + libsForQt5.qtx11extras ]; meta = { diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/by-name/qp/qpdfview/package.nix similarity index 90% rename from pkgs/applications/office/qpdfview/default.nix rename to pkgs/by-name/qp/qpdfview/package.nix index 1eae8b47442e..226ae659f0b7 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/by-name/qp/qpdfview/package.nix @@ -2,13 +2,8 @@ lib, stdenv, fetchurl, - qmake, - qttools, pkg-config, - wrapQtAppsHook, - qtbase, - qtsvg, - poppler, + libsForQt5, djvulibre, libspectre, cups, @@ -26,16 +21,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.qttools pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg - poppler + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.poppler djvulibre libspectre cups diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/by-name/qs/qsudo/package.nix similarity index 89% rename from pkgs/applications/misc/qsudo/default.nix rename to pkgs/by-name/qs/qsudo/package.nix index 460007221caf..4fd3e778845b 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/by-name/qs/qsudo/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, sudo, }: @@ -22,12 +20,12 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase sudo ]; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/by-name/qt/qt-box-editor/package.nix similarity index 89% rename from pkgs/applications/misc/qt-box-editor/default.nix rename to pkgs/by-name/qt/qt-box-editor/package.nix index 77192ff48c7e..47084069bb2f 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/by-name/qt/qt-box-editor/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtbase, - qtsvg, + libsForQt5, leptonica, tesseract4, }: @@ -22,13 +19,13 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg leptonica tesseract4 ]; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/by-name/qt/qtbitcointrader/package.nix similarity index 100% rename from pkgs/applications/misc/qtbitcointrader/default.nix rename to pkgs/by-name/qt/qtbitcointrader/package.nix diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/by-name/qt/qtemu/package.nix similarity index 92% rename from pkgs/applications/virtualization/qtemu/default.nix rename to pkgs/by-name/qt/qtemu/package.nix index 354bcbfcd72c..183144ae0bd4 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/by-name/qt/qtemu/package.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitLab, pkg-config, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, qemu, }: @@ -21,13 +19,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase qemu ]; diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/by-name/qt/qtspim/package.nix similarity index 84% rename from pkgs/development/tools/misc/qtspim/default.nix rename to pkgs/by-name/qt/qtspim/package.nix index deb4cbae41f0..ae9e9ef23614 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/by-name/qt/qtspim/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchsvn, - wrapQtAppsHook, - qtbase, - qttools, - qmake, + libsForQt5, bison, flex, }: @@ -24,7 +21,7 @@ stdenv.mkDerivation { substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib substituteInPlace menu.cpp \ - --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ + --replace /usr/lib/qtspim/bin/assistant ${libsForQt5.qttools.dev}/bin/assistant \ --replace /usr/lib/qtspim/help/qtspim.qhc $out/share/help/qtspim.qhc substituteInPlace ../Setup/qtspim_debian_deployment/qtspim.desktop \ --replace /usr/bin/qtspim qtspim \ @@ -32,14 +29,14 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - wrapQtAppsHook - qttools - qmake + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + libsForQt5.qmake bison flex ]; - buildInputs = [ qtbase ]; - env.QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + buildInputs = [ libsForQt5.qtbase ]; + env.QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}"; qmakeFlags = [ "QtSpim.pro" diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/by-name/qu/quassel/package.nix similarity index 89% rename from pkgs/applications/networking/irc/quassel/default.nix rename to pkgs/by-name/qu/quassel/package.nix index a716025225ad..27ce28dbf961 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/by-name/qu/quassel/package.nix @@ -10,14 +10,11 @@ fetchFromGitHub, cmake, makeWrapper, - wrapQtAppsHook, dconf, - qtbase, boost, zlib, - qtscript, libdbusmenu, - qca-qt5, + libsForQt5, openldap, }: @@ -51,15 +48,15 @@ stdenv.mkDerivation rec { cmake makeWrapper ] - ++ lib.optional buildClient wrapQtAppsHook; + ++ lib.optional buildClient libsForQt5.wrapQtAppsHook; buildInputs = [ - qtbase + libsForQt5.qtbase boost zlib ] ++ lib.optionals buildCore [ - qtscript - qca-qt5 + libsForQt5.qtscript + libsForQt5.qca-qt5 openldap ] ++ lib.optionals buildClient [ @@ -80,7 +77,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString enableDaemon '' - wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" + wrapProgram "$out/bin/quasselcore" --suffix PATH : "${libsForQt5.qtbase.bin}/bin" '' + lib.optionalString buildClient '' wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \ @@ -106,6 +103,6 @@ stdenv.mkDerivation rec { "quasselclient" else "quasselcore"; - inherit (qtbase.meta) platforms; + inherit (libsForQt5.qtbase.meta) platforms; }; } diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/by-name/qx/qxmledit/package.nix similarity index 88% rename from pkgs/applications/editors/qxmledit/default.nix rename to pkgs/by-name/qx/qxmledit/package.nix index 2064586e5eeb..e6a0a6ae9e31 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/by-name/qx/qxmledit/package.nix @@ -2,11 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - qtbase, - qtxmlpatterns, - qtsvg, - qtscxml, + libsForQt5, libGLU, }: @@ -26,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ libsForQt5.qmake ]; buildInputs = [ - qtbase - qtxmlpatterns - qtsvg - qtscxml + libsForQt5.qtbase + libsForQt5.qtxmlpatterns + libsForQt5.qtsvg + libsForQt5.qtscxml libGLU ]; diff --git a/pkgs/tools/misc/r3ctl/default.nix b/pkgs/by-name/r3/r3ctl/package.nix similarity index 88% rename from pkgs/tools/misc/r3ctl/default.nix rename to pkgs/by-name/r3/r3ctl/package.nix index 892b618e44f9..79580d929c88 100644 --- a/pkgs/tools/misc/r3ctl/default.nix +++ b/pkgs/by-name/r3/r3ctl/package.nix @@ -2,10 +2,6 @@ stdenv, lib, qt5, - qtbase, - qttools, - qtwebsockets, - qtmultimedia, fetchFromGitHub, }: @@ -34,10 +30,10 @@ stdenv.mkDerivation { ]; buildInputs = [ - qtbase - qttools - qtmultimedia - qtwebsockets + qt5.qtbase + qt5.qttools + qt5.qtmultimedia + qt5.qtwebsockets ]; meta = { diff --git a/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch b/pkgs/by-name/re/recoll/0001-no-qtgui-darwin-bundle.patch similarity index 100% rename from pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch rename to pkgs/by-name/re/recoll/0001-no-qtgui-darwin-bundle.patch diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/by-name/re/recoll/package.nix similarity index 97% rename from pkgs/applications/search/recoll/default.nix rename to pkgs/by-name/re/recoll/package.nix index 382c681634c0..f90707fa4b4d 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/by-name/re/recoll/package.nix @@ -29,9 +29,7 @@ pkg-config, poppler-utils, python3Packages, - qtbase, - qttools, - wrapQtAppsHook, + libsForQt5, unrtf, untex, unzip, @@ -120,11 +118,11 @@ stdenv.mkDerivation rec { ninja pkg-config which - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ] ++ lib.optionals withGui [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools ] ++ lib.optionals withPython [ python3Packages.setuptools @@ -145,7 +143,7 @@ stdenv.mkDerivation rec { file ] ++ lib.optionals withGui [ - qtbase + libsForQt5.qtbase ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/by-name/re/rescuetime/package.nix similarity index 98% rename from pkgs/applications/misc/rescuetime/default.nix rename to pkgs/by-name/re/rescuetime/package.nix index 5dcec2b91675..da2588ca7d5d 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/by-name/re/rescuetime/package.nix @@ -3,7 +3,6 @@ lib, fetchurl, dpkg, - wrapQtAppsHook, patchelf, qt5, libxtst, @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { inherit src; nativeBuildInputs = [ dpkg - wrapQtAppsHook + qt5.wrapQtAppsHook ]; # avoid https://github.com/NixOS/patchelf/issues/99 dontStrip = true; diff --git a/pkgs/applications/networking/p2p/retroshare/no-submodules.patch b/pkgs/by-name/re/retroshare/no-submodules.patch similarity index 100% rename from pkgs/applications/networking/p2p/retroshare/no-submodules.patch rename to pkgs/by-name/re/retroshare/no-submodules.patch diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/by-name/re/retroshare/package.nix similarity index 95% rename from pkgs/applications/networking/p2p/retroshare/default.nix rename to pkgs/by-name/re/retroshare/package.nix index 4deaf0eca7c8..dc164b52c6f0 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/by-name/re/retroshare/package.nix @@ -3,10 +3,8 @@ stdenv, fetchFromGitHub, fetchpatch2, - qmake, cmake, pkg-config, - wrapQtAppsHook, miniupnpc, bzip2, speex, @@ -16,9 +14,7 @@ sqlcipher, rapidjson, libxscrnsaver, - qtbase, - qtx11extras, - qtmultimedia, + libsForQt5, libgnome-keyring, }: @@ -50,16 +46,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ speex miniupnpc - qtmultimedia - qtx11extras - qtbase + libsForQt5.qtmultimedia + libsForQt5.qtx11extras + libsForQt5.qtbase libgnome-keyring bzip2 libxscrnsaver diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/by-name/rg/rgp/package.nix similarity index 100% rename from pkgs/development/tools/rgp/default.nix rename to pkgs/by-name/rg/rgp/package.nix diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/by-name/ro/rocket/package.nix similarity index 87% rename from pkgs/tools/graphics/rocket/default.nix rename to pkgs/by-name/ro/rocket/package.nix index d3db5906f9b4..4580cad9a4f0 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/by-name/ro/rocket/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtbase, + libsForQt5, }: stdenv.mkDerivation { @@ -19,10 +17,10 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; dontConfigure = true; diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/by-name/se/seer/package.nix similarity index 98% rename from pkgs/development/tools/misc/seer/default.nix rename to pkgs/by-name/se/seer/package.nix index 263b67ec465c..991d70136bbb 100644 --- a/pkgs/development/tools/misc/seer/default.nix +++ b/pkgs/by-name/se/seer/package.nix @@ -5,7 +5,6 @@ cmake, gdb, kdePackages, - wrapQtAppsHook, }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/by-name/si/simplescreenrecorder/package.nix similarity index 92% rename from pkgs/applications/video/simplescreenrecorder/default.nix rename to pkgs/by-name/si/simplescreenrecorder/package.nix index e58e8475fe22..e04c684a35b2 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/by-name/si/simplescreenrecorder/package.nix @@ -8,7 +8,6 @@ libx11, libxext, libxinerama, - qtx11extras, libxfixes, libGLU, libGL, @@ -16,9 +15,7 @@ libpulseaudio, libv4l, pipewire, - qtbase, - qttools, - wrapQtAppsHook, + libsForQt5, cmake, ninja, unstableGitUpdater, @@ -53,7 +50,7 @@ stdenv.mkDerivation { pkg-config cmake ninja - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -69,9 +66,9 @@ stdenv.mkDerivation { libpulseaudio libv4l pipewire - qtbase - qttools - qtx11extras + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtx11extras ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/by-name/tw/twinkle/package.nix similarity index 90% rename from pkgs/applications/networking/instant-messengers/twinkle/default.nix rename to pkgs/by-name/tw/twinkle/package.nix index 67e00c5c379a..742b5078d77d 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/by-name/tw/twinkle/package.nix @@ -11,14 +11,11 @@ flex, ucommon, ccrtp, - qtbase, - qttools, - qtquickcontrols2, alsa-lib, speex, ilbc, bcg729, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -39,9 +36,9 @@ stdenv.mkDerivation rec { readline ucommon ccrtp - qtbase - qttools - qtquickcontrols2 + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtquickcontrols2 alsa-lib speex ilbc @@ -52,7 +49,7 @@ stdenv.mkDerivation rec { bison flex bcg729 - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/by-name/tw/twmn/package.nix similarity index 90% rename from pkgs/applications/misc/twmn/default.nix rename to pkgs/by-name/tw/twmn/package.nix index e3eb09fce7d7..fca23736c6ed 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/by-name/tw/twmn/package.nix @@ -2,10 +2,8 @@ lib, stdenv, fetchFromGitHub, - qmake, pkg-config, - wrapQtAppsHook, - qtbase, + libsForQt5, boost, }: @@ -22,11 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase boost ]; diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/by-name/un/unigine-superposition/package.nix similarity index 97% rename from pkgs/applications/graphics/unigine-superposition/default.nix rename to pkgs/by-name/un/unigine-superposition/package.nix index caf2ac5bfa62..1d07d10fbd26 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/by-name/un/unigine-superposition/package.nix @@ -6,7 +6,7 @@ freetype, fontconfig, zlib, - qtquickcontrols2, + libsForQt5, libxinerama, libxcb, libsm, @@ -51,7 +51,7 @@ let freetype fontconfig zlib - qtquickcontrols2 + libsForQt5.qtquickcontrols2 libxinerama libxcb libsm @@ -108,7 +108,7 @@ buildFHSEnv { freetype fontconfig zlib - qtquickcontrols2 + libsForQt5.qtquickcontrols2 libxinerama libxcb libsm diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/by-name/va/valentina/package.nix similarity index 82% rename from pkgs/applications/misc/valentina/default.nix rename to pkgs/by-name/va/valentina/package.nix index e66cef47eaa4..ffb78b73ea28 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/by-name/va/valentina/package.nix @@ -3,11 +3,7 @@ stdenv, fetchFromGitLab, installShellFiles, - qmake, - qttools, - qtsvg, - qtxmlpatterns, - wrapQtAppsHook, + libsForQt5, autoPatchelfHook, }: @@ -24,20 +20,20 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/app/translations.pri \ - --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' + --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev libsForQt5.qttools}/bin/lrelease' ''; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook installShellFiles autoPatchelfHook ]; buildInputs = [ - qtsvg - qtxmlpatterns + libsForQt5.qtsvg + libsForQt5.qtxmlpatterns ]; qmakeFlags = [ diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/by-name/xf/xflr5/package.nix similarity index 90% rename from pkgs/applications/science/physics/xflr5/default.nix rename to pkgs/by-name/xf/xflr5/package.nix index 2ec048864429..6b17cbbe22a6 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/by-name/xf/xflr5/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchsvn, - qmake, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -18,8 +17,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; meta = { diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/by-name/xx/xxdiff/package.nix similarity index 100% rename from pkgs/development/tools/misc/xxdiff/default.nix rename to pkgs/by-name/xx/xxdiff/package.nix diff --git a/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch b/pkgs/by-name/zb/zbar/darwin-segfault-optimized-pointer-assignment.patch similarity index 100% rename from pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch rename to pkgs/by-name/zb/zbar/darwin-segfault-optimized-pointer-assignment.patch diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/by-name/zb/zbar/package.nix similarity index 96% rename from pkgs/tools/graphics/zbar/default.nix rename to pkgs/by-name/zb/zbar/package.nix index 88f7d8193c78..cd879801723c 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/by-name/zb/zbar/package.nix @@ -8,10 +8,7 @@ withXorg ? true, libx11, libv4l, - qtbase, - qtwayland, - qtx11extras, - wrapQtAppsHook, + libsForQt5, wrapGAppsHook3, gtk3, xmlto, @@ -77,8 +74,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableVideo [ wrapGAppsHook3 - wrapQtAppsHook - qtbase + libsForQt5.wrapQtAppsHook + libsForQt5.qtbase ]; buildInputs = [ @@ -97,9 +94,9 @@ stdenv.mkDerivation rec { ++ lib.optionals enableVideo [ libv4l gtk3 - qtbase - qtwayland - qtx11extras + libsForQt5.qtbase + libsForQt5.qtwayland + libsForQt5.qtx11extras ]; nativeCheckInputs = [ diff --git a/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix b/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix deleted file mode 100644 index 77160283afee..000000000000 --- a/pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix +++ /dev/null @@ -1,7 +0,0 @@ -fetchpatch: -# https://github.com/Gecode/gecode/pull/74 -(fetchpatch { - name = "fix-const-weights-clang.patch"; - url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; - sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ec4a15282aa..830b0307bcb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,8 +417,6 @@ with pkgs; protobuf = protobuf_21; }; - r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; - deviceTree = callPackage ../os-specific/linux/device-tree { }; octodns-providers = octodns.providers; @@ -1069,8 +1067,6 @@ with pkgs; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; - makehuman = libsForQt5.callPackage ../applications/misc/makehuman { }; - mkosi-full = mkosi.override { withQemu = true; }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -1082,8 +1078,6 @@ with pkgs; py7zr = with python3Packages; toPythonApplication py7zr; - qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; - inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2; sdkmanager = with python3Packages; toPythonApplication sdkmanager; @@ -1640,8 +1634,6 @@ with pkgs; coreboot-utils ; - coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; - intelLlvmStdenv = intel-llvm.stdenv; cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; @@ -1662,8 +1654,6 @@ with pkgs; inherit (haskellPackages) ghcWithPackages diagrams-builder; }; - dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; - ding = callPackage ../applications/misc/ding { aspellDicts_de = aspellDicts.de; aspellDicts_en = aspellDicts.en; @@ -1755,8 +1745,6 @@ with pkgs; futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; - g2o = libsForQt5.callPackage ../development/libraries/g2o { }; - inherit (go-containerregistry) crane gcrane; geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { }; @@ -1774,8 +1762,6 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - hopper = qt5.callPackage ../development/tools/analysis/hopper { }; - hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; @@ -1811,10 +1797,6 @@ with pkgs; kaggle = with python3Packages; toPythonApplication kaggle; - maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { }; - - maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; - materialx = with python3Packages; toPythonApplication materialx; # while building documentation meson may want to run binaries for host @@ -1930,8 +1912,6 @@ with pkgs; davix-copy = davix.override { enableThirdPartyCopy = true; }; - cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; - libceph = ceph.lib; ceph-client = ceph.client; ceph-dev = ceph; @@ -2068,8 +2048,6 @@ with pkgs; provider = "calyx"; }; - cask-server = libsForQt5.callPackage ../applications/misc/cask-server { }; - cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { }; @@ -2148,8 +2126,6 @@ with pkgs; dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; - ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; - inherit (callPackages ../applications/networking/p2p/deluge { }) deluge-gtk deluged @@ -2164,8 +2140,6 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; - inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; }) dub-to-nix importDubLock @@ -2231,8 +2205,6 @@ with pkgs; emborg = python3Packages.callPackage ../development/python-modules/emborg { }; - evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; - executor = with python3Packages; toPythonApplication executor; exiftool = perlPackages.ImageExifTool; @@ -2241,8 +2213,6 @@ with pkgs; Fabric = with python3Packages; toPythonApplication fabric; - chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; - fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; }; @@ -2317,8 +2287,6 @@ with pkgs; gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { }; - glogg = libsForQt5.callPackage ../tools/text/glogg { }; - gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { inherit (gst_all_1) gstreamer @@ -2495,8 +2463,6 @@ with pkgs; httpie = with python3Packages; toPythonApplication httpie; - hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; - humanfriendly = with python3Packages; toPythonApplication humanfriendly; hw-probe = perlPackages.callPackage ../tools/system/hw-probe { }; @@ -2614,8 +2580,6 @@ with pkgs; limine-full = limine.override { enableAll = true; }; - loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { }; - logstash7 = callPackage ../tools/misc/logstash/7.x.nix { # https://www.elastic.co/support/matrix#logstash-and-jvm jre = jdk11_headless; @@ -2633,8 +2597,6 @@ with pkgs; lua = lua5_2_compat; }; - kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; - lagrange-tui = lagrange.override { enableTUI = true; }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -2931,8 +2893,6 @@ with pkgs; pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; - nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; - nsjail = callPackage ../tools/security/nsjail { protobuf = protobuf_21; }; @@ -3148,22 +3108,14 @@ with pkgs; provider = "riseup"; }; - rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; - rtaudio = rtaudio_5; mpi = openmpi; # this attribute should used to build MPI applications - qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { }; - qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; - qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; - quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; @@ -3192,18 +3144,12 @@ with pkgs; opensslSupport = false; }; - qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; - - recoll = libsForQt5.callPackage ../applications/search/recoll { }; - recoll-nox = recoll.override { withGui = false; }; remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { }; reptor = with python3.pkgs; toPythonApplication reptor; - rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; - inherit (callPackage ../development/misc/resholve { }) resholve ; @@ -3248,7 +3194,6 @@ with pkgs; slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; # aka., pgp-tools - simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; snapcast = callPackage ../applications/audio/snapcast { pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; @@ -3499,8 +3444,6 @@ with pkgs; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; - # Nvidia support does not require any proprietary libraries, so CI can build it. # Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section. zenith-nvidia = zenith.override { @@ -5631,15 +5574,11 @@ with pkgs; drake = callPackage ../development/tools/build-managers/drake { }; - edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - # NOTE: Override and set useIcon = false to use Awk instead of Icon. fffuu = haskell.lib.compose.justStaticExecutables ( haskellPackages.callPackage ../tools/misc/fffuu { } ); - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; - gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; @@ -5821,8 +5760,6 @@ with pkgs; pycritty = with python3Packages; toPythonApplication pycritty; - qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit { }; - radare2 = callPackage ../development/tools/analysis/radare2 ( { lua = lua5; @@ -5860,8 +5797,6 @@ with pkgs; buildDocs = false; }; - seer = libsForQt5.callPackage ../development/tools/misc/seer { }; - sbt = callPackage ../development/tools/build-managers/sbt { }; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; @@ -5966,8 +5901,6 @@ with pkgs; xcodebuild = xcbuild; - xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; - xxdiff-tip = xxdiff; yq = python3.pkgs.toPythonApplication python3.pkgs.yq; @@ -6187,10 +6120,6 @@ with pkgs; gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; }; - gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; - gecode_6 = qt5.callPackage ../development/libraries/gecode { }; - gecode = gecode_6; - geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; geoipWithDatabase = makeOverridable (callPackage ../by-name/ge/geoip/package.nix) { @@ -6422,8 +6351,6 @@ with pkgs; withIcu = true; }; - herqq = libsForQt5.callPackage ../development/libraries/herqq { }; - highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; hunspellDicts = recurseIntoAttrs (callPackages ../by-name/hu/hunspell/dictionaries.nix { }); @@ -6882,8 +6809,6 @@ with pkgs; mygpoclient = with python3.pkgs; toPythonApplication mygpoclient; - nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; - nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; ncurses5 = ncurses.override { @@ -6937,8 +6862,6 @@ with pkgs; nvidia-vaapi-driver = hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { }); - nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { }; - nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage stdenv; }); inherit (callPackages ../development/libraries/ogre { }) @@ -7118,8 +7041,6 @@ with pkgs; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; - qdjango = libsForQt5.callPackage ../development/libraries/qdjango { }; quartoMinimal = quarto.override { @@ -8385,8 +8306,6 @@ with pkgs; btop-cuda = btop.override { cudaSupport = true; }; btop-rocm = btop.override { rocmSupport = true; }; - i7z = qt5.callPackage ../os-specific/linux/i7z { }; - ipu6ep-camera-hal = ipu6-camera-hal.override { ipuVersion = "ipu6ep"; }; @@ -8405,8 +8324,6 @@ with pkgs; libkrun-sev = libkrun.override { variant = "sev"; }; libkrun-tdx = libkrun.override { variant = "tdx"; }; - projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { }; - lklWithFirewall = lkl.override { firewallSupport = true; }; inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; }) @@ -9029,16 +8946,12 @@ with pkgs; inherit (texFunctions) fontsConf; }; - awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - backintime = backintime-qt; bespokesynth-with-vst2 = bespokesynth.override { enableVST2 = true; }; - bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; - bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { }; @@ -9088,10 +9001,6 @@ with pkgs; cni = callPackage ../applications/networking/cluster/cni { }; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { }; - communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; - - confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; - codeblocksFull = codeblocks.override { contribPlugins = true; }; cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; @@ -9423,8 +9332,6 @@ with pkgs; } ); - linssid = libsForQt5.callPackage ../applications/networking/linssid { }; - deadd-notification-center = haskell.lib.compose.justStaticExecutables ( haskellPackages.callPackage ../applications/misc/deadd-notification-center { } ); @@ -9440,19 +9347,13 @@ with pkgs; graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - gpsbabel-gui = gpsbabel.override { withGUI = true; withDoc = true; }; - guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; - hachoir = with python3Packages; toPythonApplication hachoir; - heimer = libsForQt5.callPackage ../applications/misc/heimer { }; - hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; @@ -9478,8 +9379,6 @@ with pkgs; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperglot = with python3Packages; toPythonApplication hyperglot; jackline = callPackage ../applications/networking/instant-messengers/jackline { @@ -9643,8 +9542,6 @@ with pkgs; callPackage ../applications/networking/cluster/helm/plugins { } ); - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; - ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { fftw = fftwSinglePrec; }; @@ -9706,8 +9603,6 @@ with pkgs; luddite = with python3Packages; toPythonApplication luddite; - lyx = libsForQt5.callPackage ../applications/misc/lyx { }; - magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; magnetophonDSP = recurseIntoAttrs { @@ -9736,8 +9631,6 @@ with pkgs; mercurialFull = mercurial.override { fullBuild = true; }; - michabo = libsForQt5.callPackage ../applications/misc/michabo { }; - minitube = kdePackages.callPackage ../applications/video/minitube { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { @@ -9822,8 +9715,6 @@ with pkgs; pythonPackages = python3Packages; }; - natron = libsForQt5.callPackage ../applications/video/natron { }; - netmaker = callPackage ../applications/networking/netmaker { subPackages = [ "." ]; }; netmaker-full = callPackage ../applications/networking/netmaker { }; @@ -9879,14 +9770,10 @@ with pkgs; enableGL = false; }; - diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; - mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; - ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { @@ -9906,10 +9793,6 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins { }); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; - openambit = qt5.callPackage ../applications/misc/openambit { }; - - openbrf = libsForQt5.callPackage ../applications/misc/openbrf { }; - opencpn = callPackage ../applications/misc/opencpn { inherit (darwin) DarwinTools; }; @@ -9935,8 +9818,6 @@ with pkgs; kreative-square ; - opentx = libsForQt5.callPackage ../applications/misc/opentx { }; - openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; orpie = callPackage ../applications/misc/orpie { @@ -9980,23 +9861,15 @@ with pkgs; // (config.profanity or { }) ); - pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; - puredata-with-plugins = plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; }; - pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; - qbittorrent-nox = qbittorrent.override { guiSupport = false; }; qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; }; - qctools = libsForQt5.callPackage ../applications/video/qctools { }; - qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { }; - eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; - qemu-python-utils = python3Packages.toPythonApplication ( python3Packages.qemu.override { fuseSupport = true; @@ -10020,14 +9893,6 @@ with pkgs; qmplay2-qt5 = qmplay2.override { qtVersion = "5"; }; qmplay2-qt6 = qmplay2.override { qtVersion = "6"; }; - qsudo = libsForQt5.callPackage ../applications/misc/qsudo { }; - - qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { }; - - qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; - quasselClient = quassel.override { monolithic = false; client = true; @@ -10080,10 +9945,6 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; - - rgp = libsForQt5.callPackage ../development/tools/rgp { }; - ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; }; ripcord = @@ -10153,8 +10014,6 @@ with pkgs; protobuf = protobuf_21; }; - cura = libsForQt5.callPackage ../applications/misc/cura { }; - curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { }); super-slicer-beta = super-slicer.beta; @@ -10337,10 +10196,6 @@ with pkgs; tuxclocker-without-unfree = libsForQt5.callPackage ../applications/misc/tuxclocker { }; - twmn = libsForQt5.callPackage ../applications/misc/twmn { }; - - twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; - linphonePackages = recurseIntoAttrs ( callPackage ../applications/networking/instant-messengers/linphone { } ); @@ -10365,12 +10220,8 @@ with pkgs; unigine-sanctuary = pkgsi686Linux.callPackage ../applications/graphics/unigine-sanctuary { }; - unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { }; - uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc; - valentina = libsForQt5.callPackage ../applications/misc/valentina { }; - vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; vim = vimUtils.makeCustomizable ( @@ -10415,8 +10266,6 @@ with pkgs; vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; - # this is a lower-level alternative to wrapNeovim conceived to handle # more usecases when wrapping neovim. The interface is being actively worked on # so expect breakage. use wrapNeovim instead if you want a stable alternative @@ -10738,8 +10587,6 @@ with pkgs; napari = with python312Packages; toPythonApplication napari; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; - pycoin = with python3Packages; toPythonApplication pycoin; inherit (callPackages ../applications/blockchains/teos { }) @@ -11315,8 +11162,6 @@ with pkgs; ### SCIENCE/PHYSICS - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; - ### SCIENCE/LOGIC abella = callPackage ../applications/science/logic/abella { @@ -11447,8 +11292,6 @@ with pkgs; simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; }; simulide_1_2_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.2.0"; }; - degate = libsForQt5.callPackage ../applications/science/electronics/degate { }; - geda = callPackage ../applications/science/electronics/geda { guile = guile_2_2; }; @@ -11552,8 +11395,6 @@ with pkgs; ### MISC - antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { }; foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { @@ -11980,8 +11821,6 @@ with pkgs; torcs-without-data = callPackage ../../pkgs/by-name/to/torcs/without-data.nix { }; - nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { }; hy = with python3Packages; toPythonApplication hy; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6e753238312f..351bae3541fa 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -76,7 +76,7 @@ makeScopeWithSplicing' { grantlee = callPackage ../development/libraries/grantlee/5 { }; - herqq = callPackage ../development/libraries/herqq { }; + herqq = callPackage ../by-name/he/herqq/package.nix { }; kcolorpicker = callPackage ../development/libraries/kcolorpicker { };