diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/by-name/au/ausweisapp/package.nix similarity index 88% rename from pkgs/applications/misc/ausweisapp/default.nix rename to pkgs/by-name/au/ausweisapp/package.nix index e5396ceae468..b69dfd9318c1 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/by-name/au/ausweisapp/package.nix @@ -5,13 +5,8 @@ testers, cmake, pkg-config, - wrapQtAppsHook, + qt6, pcsclite, - qtscxml, - qtsvg, - qttools, - qtwayland, - qtwebsockets, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # The build scripts copy the entire translations directory from Qt @@ -39,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pcsclite - qtscxml - qtsvg - qttools - qtwayland - qtwebsockets + qt6.qtscxml + qt6.qtsvg + qt6.qttools + qt6.qtwayland + qt6.qtwebsockets ]; passthru = { diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/by-name/ca/calcmysky/package.nix similarity index 85% rename from pkgs/applications/science/astronomy/calcmysky/default.nix rename to pkgs/by-name/ca/calcmysky/package.nix index 5c961c99a85c..aa0f2562fcf8 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/by-name/ca/calcmysky/package.nix @@ -3,32 +3,31 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, + qt6, glm, eigen, - qtbase, stellarium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "calcmysky"; version = "0.4.0"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AuDHLgOS+Cu2xSJQVi8XfrINoh18STP1ox7JElafW3k="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ glm eigen - qtbase + qt6.qtbase ]; cmakeFlags = [ "-DQT_VERSION=6" ]; @@ -45,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/by-name/co/copyq/package.nix similarity index 89% rename from pkgs/applications/misc/copyq/default.nix rename to pkgs/by-name/co/copyq/package.nix index d0f69520f4cc..b1b3e65f8d63 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/by-name/co/copyq/package.nix @@ -5,16 +5,11 @@ fetchpatch2, cmake, ninja, - qtbase, - qtsvg, - qttools, - qtdeclarative, + qt6, libXfixes, libXtst, - qtwayland, wayland, pkg-config, - wrapQtAppsHook, kdePackages, }: @@ -33,18 +28,18 @@ stdenv.mkDerivation rec { cmake ninja kdePackages.extra-cmake-modules - wrapQtAppsHook + qt6.wrapQtAppsHook pkg-config ]; buildInputs = [ - qtbase - qtsvg - qttools - qtdeclarative + qt6.qtbase + qt6.qtsvg + qt6.qttools + qt6.qtdeclarative libXfixes libXtst - qtwayland + qt6.qtwayland wayland kdePackages.kconfig kdePackages.kstatusnotifieritem diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/by-name/do/doxygen/package.nix similarity index 92% rename from pkgs/development/tools/documentation/doxygen/default.nix rename to pkgs/by-name/do/doxygen/package.nix index bd70e8d59490..be439f4faf7f 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/by-name/do/doxygen/package.nix @@ -6,6 +6,7 @@ python3, flex, bison, + withGui ? false, qt6, libiconv, spdlog, @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { fmt sqlite ] - ++ lib.optionals (qt6 != null) [ + ++ lib.optionals withGui [ qt6.qtbase qt6.wrapQtAppsHook qt6.qtsvg @@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { "-Duse_sys_fmt=ON" "-Duse_sys_sqlite3=ON" ] - ++ lib.optional (qt6 != null) "-Dbuild_wizard=YES"; + ++ lib.optional withGui "-Dbuild_wizard=YES"; # put examples in an output so people/tools can test against them outputs = [ @@ -89,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: { off-line reference manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix; + platforms = if withGui then lib.platforms.linux else lib.platforms.unix; }; }) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/by-name/fo/focuswriter/package.nix similarity index 75% rename from pkgs/applications/editors/focuswriter/default.nix rename to pkgs/by-name/fo/focuswriter/package.nix index 0bc8aa027561..e1eab242465b 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/by-name/fo/focuswriter/package.nix @@ -2,41 +2,35 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, cmake, hunspell, - qtbase, - qtmultimedia, - qttools, - qt5compat, - qtwayland, - wrapQtAppsHook, + qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "focuswriter"; version = "1.8.13"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI="; }; nativeBuildInputs = [ pkg-config cmake - qttools - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ hunspell - qtbase - qtmultimedia - qt5compat - qtwayland + qt6.qtbase + qt6.qtmultimedia + qt6.qt5compat + qt6.qtwayland ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; @@ -52,4 +46,4 @@ stdenv.mkDerivation rec { homepage = "https://gottcode.org/focuswriter/"; mainProgram = "focuswriter"; }; -} +}) diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/by-name/ga/gammaray/package.nix similarity index 70% rename from pkgs/development/tools/gammaray/default.nix rename to pkgs/by-name/ga/gammaray/package.nix index 79cf10a11395..5164adb54c2c 100644 --- a/pkgs/development/tools/gammaray/default.nix +++ b/pkgs/by-name/ga/gammaray/package.nix @@ -4,51 +4,41 @@ fetchFromGitHub, cmake, pkg-config, - qttools, - wrapQtAppsHook, - qtbase, - qtwayland, - qtsvg, - qt3d, - qtdeclarative, - qtconnectivity, - qtlocation, - qtscxml, - qtwebengine, + qt6, kdePackages, wayland, elfutils, libbfd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gammaray"; version = "3.3.1"; src = fetchFromGitHub { owner = "KDAB"; - repo = pname; - tag = "v${version}"; + repo = finalAttrs.pname; + tag = "v${finalAttrs.version}"; hash = "sha256-CJKb7H77PjPwCGW4fqLSJw1mhSweuFYlDE/7RyVDcT0="; }; nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtwayland - qtsvg - qt3d - qtdeclarative - qtconnectivity - qtlocation - qtscxml - qtwebengine + qt6.qtbase + qt6.qtwayland + qt6.qtsvg + qt6.qt3d + qt6.qtdeclarative + qt6.qtconnectivity + qt6.qtlocation + qt6.qtscxml + qt6.qtwebengine kdePackages.kcoreaddons wayland elfutils @@ -63,10 +53,10 @@ stdenv.mkDerivation rec { meta = { description = "Software introspection tool for Qt applications developed by KDAB"; homepage = "https://github.com/KDAB/GammaRay"; - changelog = "https://github.com/KDAB/GammaRay/releases/tag/${src.tag}"; + changelog = "https://github.com/KDAB/GammaRay/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ wineee ]; mainProgram = "gammaray"; }; -} +}) diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/by-name/gr/graphia/package.nix similarity index 81% rename from pkgs/applications/science/misc/graphia/default.nix rename to pkgs/by-name/gr/graphia/package.nix index 9df8a729f035..dfe38b62a56e 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/by-name/gr/graphia/package.nix @@ -4,35 +4,31 @@ cmake, git, fetchFromGitHub, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qtsvg, - qtwebengine, + qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphia"; version = "5.2"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k="; }; nativeBuildInputs = [ cmake git # needs to define some hash as a version - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtdeclarative - qtsvg - qtwebengine + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtwebengine ]; meta = { @@ -46,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bgamari ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/misc/input-leap/macos-no-dmg.patch b/pkgs/by-name/in/input-leap/macos-no-dmg.patch similarity index 100% rename from pkgs/applications/misc/input-leap/macos-no-dmg.patch rename to pkgs/by-name/in/input-leap/macos-no-dmg.patch diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/by-name/in/input-leap/package.nix similarity index 87% rename from pkgs/applications/misc/input-leap/default.nix rename to pkgs/by-name/in/input-leap/package.nix index 5fdc6ecadcec..329d388aec42 100644 --- a/pkgs/applications/misc/input-leap/default.nix +++ b/pkgs/by-name/in/input-leap/package.nix @@ -3,10 +3,6 @@ stdenv, fetchFromGitHub, cmake, - - withLibei ? !stdenv.hostPlatform.isDarwin, - - avahi, curl, libICE, libSM, @@ -21,20 +17,20 @@ openssl, pkgsStatic, pkg-config, - qtbase, - qttools, + qt6, wrapGAppsHook3, - wrapQtAppsHook, + avahi, + avahi' ? avahi.override { withLibdnssdCompat = true; }, + withLibei ? !stdenv.hostPlatform.isDarwin, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "input-leap"; version = "3.0.3"; src = fetchFromGitHub { owner = "input-leap"; repo = "input-leap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zSaeeMlhpWIX3y4OmZ7eHXCu1HPP7NU5HFkME/JZjuQ="; fetchSubmodules = true; }; @@ -45,14 +41,14 @@ stdenv.mkDerivation rec { pkg-config cmake wrapGAppsHook3 - wrapQtAppsHook - qttools + qt6.wrapQtAppsHook + qt6.qttools ]; buildInputs = [ curl - qtbase - avahi + qt6.qtbase + avahi' libX11 libXext libXtst @@ -71,7 +67,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DINPUTLEAP_REVISION=${builtins.substring 0 8 src.rev}" + "-DINPUTLEAP_REVISION=${builtins.substring 0 8 finalAttrs.src.rev}" ] ++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON"; @@ -102,4 +98,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/by-name/ke/kernelshark/package.nix similarity index 93% rename from pkgs/os-specific/linux/trace-cmd/kernelshark.nix rename to pkgs/by-name/ke/kernelshark/package.nix index d7136f4a5d71..a6a43e7fd72d 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/by-name/ke/kernelshark/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchzip, - qtbase, - qtscxml, + qt6, cmake, json_c, mesa_glu, @@ -13,8 +12,6 @@ libtraceevent, libtracefs, freefont_ttf, - wrapQtAppsHook, - qtwayland, fetchpatch, }: @@ -40,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtscxml - qtwayland + qt6.qtbase + qt6.qtscxml + qt6.qtwayland json_c mesa_glu libglut diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/by-name/ma/maskromtool/package.nix similarity index 68% rename from pkgs/tools/graphics/maskromtool/default.nix rename to pkgs/by-name/ma/maskromtool/package.nix index 94fbfdb61fe0..d3af7bd976d1 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/by-name/ma/maskromtool/package.nix @@ -3,42 +3,38 @@ stdenv, fetchFromGitHub, cmake, - qtbase, qt6, - wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maskromtool"; version = "2024-08-18"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo="; }; buildInputs = [ - qtbase + qt6.qtbase qt6.qtcharts qt6.qttools ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; meta = { description = "CAD tool for extracting bits from Mask ROM photographs"; homepage = "https://github.com/travisgoodspeed/maskromtool"; - license = [ - lib.licenses.beerware - lib.licenses.gpl1Plus - ]; - maintainers = [ - lib.maintainers.evanrichter + license = with lib.licenses; [ + beerware + gpl1Plus ]; + maintainers = with lib.maintainers; [ evanrichter ]; }; -} +}) diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/by-name/mi/minizinc-ide/package.nix similarity index 80% rename from pkgs/development/tools/minizinc/ide.nix rename to pkgs/by-name/mi/minizinc-ide/package.nix index de125700780e..760fab209312 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/by-name/mi/minizinc-ide/package.nix @@ -2,9 +2,7 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, - qtwebsockets, + qt6, minizinc, makeWrapper, copyDesktopItems, @@ -19,27 +17,28 @@ let else "$out/bin/MiniZincIDE"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minizinc-ide"; version = "2.9.5"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; - rev = version; + rev = finalAttrs.version; hash = "sha256-VqVcByPBS7UBU/h5NIUltIKA0POAX1dUVgMsn5b9C4w="; fetchSubmodules = true; }; nativeBuildInputs = [ - qmake + qt6.qmake makeWrapper copyDesktopItems imagemagick ]; + buildInputs = [ - qtbase - qtwebsockets + qt6.qtbase + qt6.qtwebsockets ]; desktopItems = [ @@ -47,7 +46,7 @@ stdenv.mkDerivation rec { name = "MiniZincIDE"; desktopName = "MiniZincIDE"; icon = "minizinc"; - comment = meta.description; + comment = finalAttrs.meta.description; exec = "MiniZincIDE"; type = "Application"; terminal = false; @@ -59,7 +58,7 @@ stdenv.mkDerivation rec { }) ]; - sourceRoot = "${src.name}/MiniZincIDE"; + sourceRoot = "${finalAttrs.src.name}/MiniZincIDE"; dontWrapQtApps = true; @@ -71,11 +70,11 @@ stdenv.mkDerivation rec { + '' wrapProgram ${executableLoc} \ --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "${qtbase}/lib/qt-6/plugins/platforms" + --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt6.qtbase}/lib/qt-6/plugins/platforms" for size in 16 24 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - magick -background none ${src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png + magick -background none ${finalAttrs.src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png done ''; @@ -94,4 +93,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/by-name/po/polychromatic/package.nix similarity index 100% rename from pkgs/applications/misc/polychromatic/default.nix rename to pkgs/by-name/po/polychromatic/package.nix diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/by-name/qg/qgit/package.nix similarity index 83% rename from pkgs/applications/version-management/qgit/default.nix rename to pkgs/by-name/qg/qgit/package.nix index cb654c45de32..e01cf9c46780 100644 --- a/pkgs/applications/version-management/qgit/default.nix +++ b/pkgs/by-name/qg/qgit/package.nix @@ -3,9 +3,7 @@ lib, fetchFromGitHub, cmake, - qtbase, - qt5compat, - wrapQtAppsHook, + qt6, }: stdenv.mkDerivation (finalAttrs: { @@ -21,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qt5compat + qt6.qtbase + qt6.qt5compat ]; meta = { @@ -37,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { peterhoeg markuskowa ]; - inherit (qtbase.meta) platforms; + inherit (qt6.qtbase.meta) platforms; mainProgram = "qgit"; }; }) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/by-name/qt/qtcreator/package.nix similarity index 84% rename from pkgs/development/tools/qtcreator/default.nix rename to pkgs/by-name/qt/qtcreator/package.nix index ca44d1d9e78b..674e9e6a076e 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/by-name/qt/qtcreator/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchurl, cmake, @@ -7,24 +6,13 @@ ninja, go, python3, - qtbase, - qt5compat, - qtdeclarative, - qtdoc, - qtquick3d, - qtquicktimeline, - qtserialport, - qtsvg, - qttools, - qtwebengine, - qtwayland, - qtshadertools, - wrapQtAppsHook, + qt6, yaml-cpp, litehtml, libsecret, gumbo, - llvmPackages, + llvmPackages_21, + stdenv' ? llvmPackages_21.stdenv, rustc-demangle, elfutils, perf, @@ -49,39 +37,37 @@ let ''; }).goModules; in -stdenv.mkDerivation { - inherit pname; - inherit version; - inherit src; +stdenv'.mkDerivation { + inherit pname version src; nativeBuildInputs = [ cmake pkg-config - (qttools.override { withClang = true; }) - wrapQtAppsHook + (qt6.qttools.override { withClang = true; }) + qt6.wrapQtAppsHook python3 ninja go ]; buildInputs = [ - qtbase - qtdoc - qtsvg - qtquick3d - qtwebengine - qtwayland - qtserialport - qtshadertools - qt5compat - qtdeclarative - qtquicktimeline + qt6.qtbase + qt6.qtdoc + qt6.qtsvg + qt6.qtquick3d + qt6.qtwebengine + qt6.qtwayland + qt6.qtserialport + qt6.qtshadertools + qt6.qt5compat + qt6.qtdeclarative + qt6.qtquicktimeline yaml-cpp litehtml libsecret gumbo - llvmPackages.libclang - llvmPackages.llvm + llvmPackages_21.libclang + llvmPackages_21.llvm rustc-demangle elfutils ]; diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/by-name/qt/qtcreator/with-plugins.nix similarity index 100% rename from pkgs/development/tools/qtcreator/with-plugins.nix rename to pkgs/by-name/qt/qtcreator/with-plugins.nix diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/by-name/re/retext/package.nix similarity index 85% rename from pkgs/applications/editors/retext/default.nix rename to pkgs/by-name/re/retext/package.nix index 5bd6ace5f54f..1bf3d35234bb 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/by-name/re/retext/package.nix @@ -1,12 +1,9 @@ { lib, - python3, + python3Packages, fetchzip, fetchFromGitHub, - wrapQtAppsHook, - qtbase, - qttools, - qtsvg, + qt6, buildEnv, aspellDicts, # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries @@ -17,7 +14,7 @@ ], }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "retext"; version = "8.1.0"; pyproject = true; @@ -34,19 +31,19 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-nqKAUg9nTzGPPxr80KTn6JX9JgCUJwpcwp8aOIlcxPY="; }; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; nativeBuildInputs = [ - wrapQtAppsHook - qttools.dev + qt6.wrapQtAppsHook + qt6.qttools.dev ]; buildInputs = [ - qtbase - qtsvg + qt6.qtbase + qt6.qtsvg ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ chardet docutils markdown @@ -81,7 +78,7 @@ python3.pkgs.buildPythonApplication rec { }" ) - cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons + cp ${toolbarIcons}/* $out/${python3Packages.python.sitePackages}/ReText/icons substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ --replace-fail "Exec=retext-${version}.data/scripts/retext %F" "Exec=retext %F" \ diff --git a/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch b/pkgs/by-name/te/texmaker/fix-build-with-qt-6-10.patch similarity index 100% rename from pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch rename to pkgs/by-name/te/texmaker/fix-build-with-qt-6-10.patch diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/by-name/te/texmaker/package.nix similarity index 80% rename from pkgs/applications/editors/texmaker/default.nix rename to pkgs/by-name/te/texmaker/package.nix index ab19250e69be..8f35448653ee 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/by-name/te/texmaker/package.nix @@ -4,21 +4,17 @@ fetchurl, cmake, pkg-config, - wrapQtAppsHook, - poppler, - qtbase, - qttools, - qtwebengine, - qt5compat, + qt6, + qt6Packages, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texmaker"; version = "6.0.1"; src = fetchurl { - url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2"; + url = "http://www.xm1math.net/texmaker/texmaker-${finalAttrs.version}.tar.bz2"; hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY="; }; @@ -28,17 +24,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - poppler - qtbase - qtwebengine - qt5compat - qttools + qt6Packages.poppler + qt6.qtbase + qt6.qtwebengine + qt6.qt5compat + qt6.qttools zlib ]; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; qmakeFlags = [ @@ -63,4 +59,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "texmaker"; }; -} +}) diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/by-name/te/texworks/package.nix similarity index 70% rename from pkgs/applications/editors/texworks/default.nix rename to pkgs/by-name/te/texworks/package.nix index 43753c97f1ad..8f4fb723e5be 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/by-name/te/texworks/package.nix @@ -4,44 +4,41 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsHook, + qt6, + qt6Packages, hunspell, - poppler, - qt5compat, - qttools, - qtwayland, withLua ? true, lua, withPython ? true, python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texworks"; version = "0.6.10"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-tC3ADD35yrmwBJQ8JaXdr8trVf6WLt1r2/euzt0mvN8="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ hunspell - poppler - qt5compat - qttools + qt6Packages.poppler + qt6.qt5compat + qt6.qttools ] ++ lib.optional withLua lua ++ lib.optional withPython python3 - ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" @@ -50,12 +47,12 @@ stdenv.mkDerivation rec { ++ lib.optional withPython "-DWITH_PYTHON=ON"; meta = { - changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS"; + changelog = "https://github.com/TeXworks/texworks/blob/${finalAttrs.src.rev}/NEWS"; description = "Simple TeX front-end program inspired by TeXShop"; homepage = "http://www.tug.org/texworks/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ dotlambda ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; mainProgram = "texworks"; }; -} +}) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/by-name/we/welle-io/package.nix similarity index 90% rename from pkgs/applications/radio/welle-io/default.nix rename to pkgs/by-name/we/welle-io/package.nix index ba6a49a7e710..623eff5967c0 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/by-name/we/welle-io/package.nix @@ -5,11 +5,7 @@ fetchpatch, cmake, pkg-config, - wrapQtAppsHook, - qtbase, - qtcharts, - qtmultimedia, - qt5compat, + qt6, faad2, rtl-sdr, soapysdr-with-plugins, @@ -45,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook unixtools.xxd ]; @@ -55,10 +51,10 @@ stdenv.mkDerivation (finalAttrs: { lame libusb-compat-0_1 mpg123 - qtbase - qtcharts - qtmultimedia - qt5compat + qt6.qtbase + qt6.qtcharts + qt6.qtmultimedia + qt6.qt5compat rtl-sdr soapysdr-with-plugins ] diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/by-name/wi/wireshark/package.nix similarity index 96% rename from pkgs/applications/networking/sniffers/wireshark/default.nix rename to pkgs/by-name/wi/wireshark/package.nix index 9d5a98ac5f1a..5293c378af7e 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/by-name/wi/wireshark/package.nix @@ -50,14 +50,14 @@ brotli, withQt ? true, - qt6 ? null, + qt6, + libpcap' ? libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }, }: let isAppBundle = withQt && stdenv.hostPlatform.isDarwin; in -assert withQt -> qt6 != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wireshark-${if withQt then "qt" else "cli"}"; version = "4.6.3"; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { repo = "wireshark"; owner = "wireshark"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DthYkAW6UYnsDLQf2h3jgJB8RZoasjREWV1NTtZv7PQ="; }; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { libkrb5 libmaxminddb libopus - libpcap + libpcap' libsmi libssh libxml2 @@ -226,7 +226,7 @@ stdenv.mkDerivation rec { experts. It runs on UNIX, macOS and Windows. ''; homepage = "https://www.wireshark.org"; - changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html"; + changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.src.tag}.html"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ @@ -235,4 +235,4 @@ stdenv.mkDerivation rec { ]; mainProgram = if withQt then "wireshark" else "tshark"; }; -} +}) diff --git a/pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch b/pkgs/by-name/wi/wireshark/patches/lookup-dumpcap-in-path.patch similarity index 100% rename from pkgs/applications/networking/sniffers/wireshark/patches/lookup-dumpcap-in-path.patch rename to pkgs/by-name/wi/wireshark/patches/lookup-dumpcap-in-path.patch diff --git a/pkgs/development/tools/documentation/doxygen/doxmlparser.nix b/pkgs/development/python-modules/doxmlparser/default.nix similarity index 100% rename from pkgs/development/tools/documentation/doxygen/doxmlparser.nix rename to pkgs/development/python-modules/doxmlparser/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d5b73eb9e32..c4314dfc31d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1196,6 +1196,7 @@ mapAliases { minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27 minetestclient = throw "'minetestclient' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27 minetestserver = throw "'minetestserver' has been renamed to/replaced by 'luanti-server'"; # Converted to throw 2025-10-27 + minizincide = warnAlias "'minizincide' has been renamed to 'minizinc-ide'" minizinc-ide; # Added 2026-01-03 minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27 miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21 mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 @@ -1866,6 +1867,7 @@ mapAliases { wineWayland = throw "'wineWayland' has been renamed to/replaced by 'wine-wayland'"; # Converted to throw 2025-10-27 wingpanel-indicator-ayatana = throw "'wingpanel-indicator-ayatana' has been removed as it is archived upstream and doesn't work with pantheon 8 and onwards. Use wingpanel-indicator-namarupa instead"; # Added 2026-01-14 winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14 + wireshark-qt = warnAlias "'wireshark-qt' has been renamed to/replaced by 'wireshark'" wireshark; # Added 2026-01-23 wkhtmltopdf-bin = throw "'wkhtmltopdf-bin' has been renamed to/replaced by 'wkhtmltopdf'"; # Converted to throw 2025-10-27 wlx-overlay-s = throw "'wlx-overlay-s' and 'wayvr-dashboard' have been merged into a single application. Please switch to 'wayvr'"; # Added 2026-01-09 wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 257eddeab5bb..734fce603364 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1180,8 +1180,6 @@ with pkgs; ; }; - qgit = qt6Packages.callPackage ../applications/version-management/qgit { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; @@ -1518,8 +1516,6 @@ with pkgs; fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; }; - gammaray = qt6Packages.callPackage ../development/tools/gammaray { }; - gams = callPackage ../tools/misc/gams (config.gams or { }); gancioPlugins = recurseIntoAttrs (callPackage ../by-name/ga/gancio/plugins.nix { }); @@ -2897,8 +2893,6 @@ with pkgs; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; - maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { }; - matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; maubot = with python3Packages; toPythonApplication maubot; @@ -3491,8 +3485,6 @@ with pkgs; ratarmount = with python3Packages; toPythonApplication ratarmount; - retext = qt6Packages.callPackage ../applications/editors/retext { }; - inherit (callPackage ../tools/security/rekor { }) rekor-cli rekor-server @@ -3662,10 +3654,6 @@ with pkgs; extraFonts = true; }; - texmaker = qt6Packages.callPackage ../applications/editors/texmaker { }; - - texworks = qt6Packages.callPackage ../applications/editors/texworks { }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tinc = callPackage ../tools/networking/tinc { }; @@ -3696,8 +3684,6 @@ with pkgs; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; - kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; - translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { }); translatepy = with python3.pkgs; toPythonApplication translatepy; @@ -6011,11 +5997,7 @@ with pkgs; dot2tex = with python3.pkgs; toPythonApplication dot2tex; - doxygen = callPackage ../development/tools/documentation/doxygen { - qt6 = null; - }; - - doxygen_gui = lowPrio (doxygen.override { inherit qt6; }); + doxygen_gui = lowPrio (doxygen.override { withGui = true; }); drake = callPackage ../development/tools/build-managers/drake { }; @@ -6116,7 +6098,6 @@ with pkgs; ); minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix { }; mkdocs = with python3Packages; toPythonApplication mkdocs; @@ -6226,11 +6207,6 @@ with pkgs; pycritty = with python3Packages; toPythonApplication pycritty; - qtcreator = qt6Packages.callPackage ../development/tools/qtcreator { - llvmPackages = llvmPackages_21; - stdenv = llvmPackages_21.stdenv; - }; - qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit { }; radare2 = callPackage ../development/tools/analysis/radare2 ( @@ -6661,9 +6637,6 @@ with pkgs; ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; - - graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; - glfw = glfw3; glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix { @@ -9785,8 +9758,6 @@ with pkgs; papis = with python3Packages; toPythonApplication papis; - polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { }; - scheherazade-new = scheherazade.override { version = "4.400"; }; @@ -9899,8 +9870,6 @@ with pkgs; bambootracker-qt6 = bambootracker.override { withQt6 = true; }; - ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; - awesome = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; inherit (texFunctions) fontsConf; @@ -9946,8 +9915,6 @@ with pkgs; breezy = with python3Packages; toPythonApplication breezy; - calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { }; - # calico-felix and calico-node have not been packaged due to libbpf, linking issues inherit (callPackage ../applications/networking/cluster/calico { }) calico-apiserver @@ -9979,8 +9946,6 @@ with pkgs; confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; - copyq = qt6Packages.callPackage ../applications/misc/copyq { }; - codeblocksFull = codeblocks.override { contribPlugins = true; }; cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; @@ -10094,10 +10059,6 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - input-leap = qt6Packages.callPackage ../applications/misc/input-leap { - avahi = avahi.override { withLibdnssdCompat = true; }; - }; - evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; @@ -10118,8 +10079,6 @@ with pkgs; hamlib = hamlib_4; }; - focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { }; - fossil = callPackage ../applications/version-management/fossil { sqlite = sqlite.override { enableDeserialize = true; }; }; @@ -10162,20 +10121,10 @@ with pkgs; fftw = fftwSinglePrec; }; - welle-io = qt6Packages.callPackage ../applications/radio/welle-io { }; - - wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { - libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; - }; - wireshark-qt = wireshark; - qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { }; tshark = wireshark-cli; - wireshark-cli = wireshark.override { - withQt = false; - libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; }; - }; + wireshark-cli = wireshark.override { withQt = false; }; buildMozillaMach = opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cce9f803536..2ed24daec215 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4572,7 +4572,7 @@ self: super: with self; { downloader-cli = callPackage ../development/python-modules/downloader-cli { }; - doxmlparser = callPackage ../development/tools/documentation/doxygen/doxmlparser.nix { }; + doxmlparser = callPackage ../development/python-modules/doxmlparser { }; dparse = callPackage ../development/python-modules/dparse { };