From 74297e1ac8b761024c11d8e8cb413777cbc9789a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:01:12 +0200 Subject: [PATCH 01/18] goldendict-ng: move to by-name --- .../go/goldendict-ng/package.nix} | 25 +++++++------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 17 deletions(-) rename pkgs/{applications/misc/goldendict-ng/default.nix => by-name/go/goldendict-ng/package.nix} (86%) diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/by-name/go/goldendict-ng/package.nix similarity index 86% rename from pkgs/applications/misc/goldendict-ng/default.nix rename to pkgs/by-name/go/goldendict-ng/package.nix index 3083af21c1da..600081eb7b6e 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/by-name/go/goldendict-ng/package.nix @@ -17,14 +17,7 @@ bzip2, libiconv, libxtst, - qtbase, - qtsvg, - qtwebengine, - qttools, - qtwayland, - qt5compat, - qtmultimedia, - wrapQtAppsHook, + qt6, wrapGAppsHook3, }: @@ -44,18 +37,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + qt6.wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ - qtbase - qtsvg - qttools - qtwebengine - qt5compat - qtmultimedia - qtwayland + qt6.qtbase + qt6.qtsvg + qt6.qttools + qt6.qtwebengine + qt6.qt5compat + qt6.qtmultimedia + qt6.qtwayland libvorbis tomlplusplus fmt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c87b3f879ff8..28e8a7fe7623 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9823,7 +9823,6 @@ with pkgs; gnuradioPackages = recurseIntoAttrs gnuradio.pkgs; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; - goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { }; inherit (ocamlPackages) google-drive-ocamlfuse; From d27ffb570609bd8bf692ce6ee278c4a380d21154 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:01:35 +0200 Subject: [PATCH 02/18] qtwirediff: move to by-name --- .../qt/qtwirediff/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/networking/sniffers/qtwirediff/default.nix => by-name/qt/qtwirediff/package.nix} (92%) diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/by-name/qt/qtwirediff/package.nix similarity index 92% rename from pkgs/applications/networking/sniffers/qtwirediff/default.nix rename to pkgs/by-name/qt/qtwirediff/package.nix index f5be6f968381..c042a560e7d8 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/by-name/qt/qtwirediff/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, - qtwayland, - wrapQtAppsHook, + qt6, wireshark-cli, }: @@ -21,15 +18,15 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt6.qmake + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6.qtwayland ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28e8a7fe7623..97b383917ba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9839,8 +9839,6 @@ with pkgs; fftw = fftwSinglePrec; }; - qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { }; - tshark = wireshark-cli; wireshark-cli = wireshark.override { withQt = false; }; From 0a87aeddc98a8e839228e58ad163d14ca79495cb Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:02:03 +0200 Subject: [PATCH 03/18] kemai: move to by-name --- .../ke/kemai/package.nix} | 21 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 16 deletions(-) rename pkgs/{applications/misc/kemai/default.nix => by-name/ke/kemai/package.nix} (84%) diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/by-name/ke/kemai/package.nix similarity index 84% rename from pkgs/applications/misc/kemai/default.nix rename to pkgs/by-name/ke/kemai/package.nix index 7f3374ac0860..895f16fe3afa 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/by-name/ke/kemai/package.nix @@ -6,19 +6,12 @@ # buildInputs libxscrnsaver, magic-enum, - - # nativeBuildInputs - qtbase, - qtconnectivity, - qtlanguageserver, - qttools, + qt6, range-v3, spdlog, - qtwayland, # nativeBuildInputs cmake, - wrapQtAppsHook, # passthru nix-update-script, @@ -47,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxscrnsaver magic-enum - qtbase - qtconnectivity - qtlanguageserver - qttools + qt6.qtbase + qt6.qtconnectivity + qt6.qtlanguageserver + qt6.qttools range-v3 spdlog ] - ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; cmakeFlags = [ (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false) @@ -63,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b383917ba1..61aaa93e7bbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9975,8 +9975,6 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; - kemai = qt6Packages.callPackage ../applications/misc/kemai { }; - jetbrains = ( recurseIntoAttrs ( callPackages ../applications/editors/jetbrains { From f853e3da8d15e0f797ada03227c5a153986a87b0 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:05:06 +0200 Subject: [PATCH 04/18] organicmaps: move to by-name --- .../or/organicmaps/package.nix} | 16 ++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 12 deletions(-) rename pkgs/{applications/misc/organicmaps/default.nix => by-name/or/organicmaps/package.nix} (94%) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/by-name/or/organicmaps/package.nix similarity index 94% rename from pkgs/applications/misc/organicmaps/default.nix rename to pkgs/by-name/or/organicmaps/package.nix index 04034000c17f..c797594b6fb2 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/by-name/or/organicmaps/package.nix @@ -8,11 +8,7 @@ which, python3, rsync, - wrapQtAppsHook, - qtbase, - qtpositioning, - qtsvg, - qtwayland, + qt6, libGLU, libGL, zlib, @@ -66,15 +62,15 @@ stdenv.mkDerivation (finalAttrs: { which python3 rsync - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # Most dependencies are vendored buildInputs = [ - qtbase - qtpositioning - qtsvg - qtwayland + qt6.qtbase + qt6.qtpositioning + qt6.qtsvg + qt6.qtwayland libGLU libGL zlib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61aaa93e7bbf..7e70df983dd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10683,8 +10683,6 @@ with pkgs; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; - organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; - openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; orpie = callPackage ../applications/misc/orpie { From 9b36dd56390dd9dc79372397aea6567a95ebda7c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:06:06 +0200 Subject: [PATCH 05/18] pineapple-pictures: move to by-name --- .../pi/pineapple-pictures/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{applications/graphics/pineapple-pictures/default.nix => by-name/pi/pineapple-pictures/package.nix} (88%) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/by-name/pi/pineapple-pictures/package.nix similarity index 88% rename from pkgs/applications/graphics/pineapple-pictures/default.nix rename to pkgs/by-name/pi/pineapple-pictures/package.nix index 14fbe2072721..0b8e543982aa 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/by-name/pi/pineapple-pictures/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qt6Packages, + qt6, exiv2, }: @@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - qt6Packages.qttools - qt6Packages.wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qt6Packages.qtsvg + qt6.qtsvg exiv2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e70df983dd2..e401cc20301e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10729,8 +10729,6 @@ with pkgs; inherit (pidginPackages) pidgin; - pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { }; - plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); From 78203ff35b3e932b431b42e07ff9951572c1ddcd Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:08:33 +0200 Subject: [PATCH 06/18] maestral-gui: move to by-name --- .../ma/maestral-gui/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/networking/maestral-qt/default.nix => by-name/ma/maestral-gui/package.nix} (90%) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/by-name/ma/maestral-gui/package.nix similarity index 90% rename from pkgs/applications/networking/maestral-qt/default.nix rename to pkgs/by-name/ma/maestral-gui/package.nix index b351009d549c..ba047ae40420 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/by-name/ma/maestral-gui/package.nix @@ -2,11 +2,8 @@ lib, fetchFromGitHub, python3, - qtbase, - qtsvg, - qtwayland, + qt6, nixosTests, - wrapQtAppsHook, }: python3.pkgs.buildPythonApplication rec { @@ -32,12 +29,12 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - qtwayland - qtbase - qtsvg # Needed for the systray icon + qt6.qtwayland + qt6.qtbase + qt6.qtsvg # Needed for the systray icon ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; dontWrapQtApps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e401cc20301e..905722874ae5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10942,8 +10942,6 @@ with pkgs; maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { }; - myfitnesspal = with python3Packages; toPythonApplication myfitnesspal; lightdm_qt = lightdm.override { withQt5 = true; }; From c5857e70ce204d434cb63f3202d841709816133a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:09:32 +0200 Subject: [PATCH 07/18] webcamoid: move to by-name --- .../we/webcamoid/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/video/webcamoid/default.nix => by-name/we/webcamoid/package.nix} (89%) diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/by-name/we/webcamoid/package.nix similarity index 89% rename from pkgs/applications/video/webcamoid/default.nix rename to pkgs/by-name/we/webcamoid/package.nix index c6cdb9901948..0af42d57267d 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/by-name/we/webcamoid/package.nix @@ -5,10 +5,7 @@ pkg-config, libxcb, cmake, - qtbase, - qtdeclarative, - wrapQtAppsHook, - qtsvg, + qt6, ffmpeg, gst_all_1, libpulseaudio, @@ -30,9 +27,9 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb - qtbase - qtdeclarative - qtsvg + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg ffmpeg gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -45,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905722874ae5..b2ba126c9ce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11360,8 +11360,6 @@ with pkgs; ]; }; - webcamoid = qt6Packages.callPackage ../applications/video/webcamoid { }; - webssh = with python3Packages; toPythonApplication webssh; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; From 294a225c25a1210143d4d6181b45df1c6589e7bd Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:10:36 +0200 Subject: [PATCH 08/18] xca: move to by-name --- .../xca/default.nix => by-name/xc/xca/package.nix} | 14 ++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/xca/default.nix => by-name/xc/xca/package.nix} (86%) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/by-name/xc/xca/package.nix similarity index 86% rename from pkgs/applications/misc/xca/default.nix rename to pkgs/by-name/xc/xca/package.nix index 5c01961ab18b..1a80b02a34fd 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/by-name/xc/xca/package.nix @@ -2,12 +2,10 @@ stdenv, lib, fetchFromGitHub, - wrapQtAppsHook, cmake, pkg-config, openssl, - qtbase, - qttools, + qt6, sphinx, }: @@ -24,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl - qtbase + qt6.qtbase ]; nativeBuildInputs = [ cmake pkg-config - qttools + qt6.qttools sphinx - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) - QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -56,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { offline peterhoeg ]; - inherit (qtbase.meta) platforms; + inherit (qt6.qtbase.meta) platforms; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2ba126c9ce6..c6c4e1832711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11420,8 +11420,6 @@ with pkgs; gbmSupport = true; }; - xca = qt6Packages.callPackage ../applications/misc/xca { }; - xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; xdg-desktop-portal-hyprland = From 83f0c0a1b9ec1b21a52c3b531cb7bf15a1047180 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:11:38 +0200 Subject: [PATCH 09/18] librepcb: move to by-name --- .../default.nix => by-name/li/librepcb/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/science/electronics/librepcb/default.nix => by-name/li/librepcb/package.nix} (93%) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/by-name/li/librepcb/package.nix similarity index 93% rename from pkgs/applications/science/electronics/librepcb/default.nix rename to pkgs/by-name/li/librepcb/package.nix index 90b8c759e5c7..7a371b701c5d 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/by-name/li/librepcb/package.nix @@ -2,13 +2,10 @@ stdenv, lib, fetchFromGitHub, - qtbase, - qttools, - qtsvg, + qt6, opencascade-occt, libGLU, cmake, - wrapQtAppsHook, rustPlatform, cargo, rustc, @@ -28,15 +25,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qttools - qtsvg - wrapQtAppsHook + qt6.qttools + qt6.qtsvg + qt6.wrapQtAppsHook opencascade-occt libGLU cargo rustc ]; - buildInputs = [ qtbase ]; + buildInputs = [ qt6.qtbase ]; cargoDeps1 = rustPlatform.fetchCargoVendor { inherit src; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6c4e1832711..f11567f30c0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12353,8 +12353,6 @@ with pkgs; kicadAddons = recurseIntoAttrs (callPackage ../by-name/ki/kicad/addons/package.nix { }); - librepcb = qt6Packages.callPackage ../applications/science/electronics/librepcb { }; - ngspice = libngspice.override { withNgshared = false; }; From f072d6644f090fae781f12397b5d3368964b171a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:12:52 +0200 Subject: [PATCH 10/18] tipp10: move to by-name --- .../default.nix => by-name/ti/tipp10/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/tipp10/default.nix => by-name/ti/tipp10/package.nix} (84%) diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/by-name/ti/tipp10/package.nix similarity index 84% rename from pkgs/applications/misc/tipp10/default.nix rename to pkgs/by-name/ti/tipp10/package.nix index f48ea45a44b5..258fd9aa992f 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/by-name/ti/tipp10/package.nix @@ -3,10 +3,7 @@ cmake, lib, fetchFromGitLab, - qtmultimedia, - qttools, - qtwayland, - wrapQtAppsHook, + qt6, }: stdenv.mkDerivation rec { @@ -22,12 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qtmultimedia - qtwayland + qt6.qtmultimedia + qt6.qtwayland ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f11567f30c0a..53ae75068c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11124,8 +11124,6 @@ with pkgs; timeshift-minimal ; - tipp10 = qt6.callPackage ../applications/misc/tipp10 { }; - tlp = callPackage ../tools/misc/tlp { inherit (linuxPackages) x86_energy_perf_policy; }; From bee8301f287f7c2b0eebe488cb26f8f3887384e2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:13:44 +0200 Subject: [PATCH 11/18] libkiwix: move to by-name --- .../misc/kiwix/lib.nix => by-name/li/libkiwix/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/kiwix/lib.nix => by-name/li/libkiwix/package.nix} (100%) diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/by-name/li/libkiwix/package.nix similarity index 100% rename from pkgs/applications/misc/kiwix/lib.nix rename to pkgs/by-name/li/libkiwix/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53ae75068c91..f9afcb53fceb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10358,8 +10358,6 @@ with pkgs; lenovo-legion = qt6Packages.callPackage ../os-specific/linux/lenovo-legion/app.nix { }; - libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; - libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; From 2e1ebd17be45ca4f514d9f8342a4e4fde481379a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:14:12 +0200 Subject: [PATCH 12/18] kiwix-tools: move to by-name --- .../misc/kiwix/tools.nix => by-name/ki/kiwix-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/kiwix/tools.nix => by-name/ki/kiwix-tools/package.nix} (100%) diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/by-name/ki/kiwix-tools/package.nix similarity index 100% rename from pkgs/applications/misc/kiwix/tools.nix rename to pkgs/by-name/ki/kiwix-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9afcb53fceb..c427377f8b1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10291,8 +10291,6 @@ with pkgs; kiwix = qt6Packages.callPackage ../applications/misc/kiwix { }; - kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; - klayout = libsForQt5.callPackage ../applications/misc/klayout { }; kotatogram-desktop = From 8b8533f7c27ff13e036d1b8ded7bed61523d3b67 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:15:02 +0200 Subject: [PATCH 13/18] kiwix: move to by-name --- .../ki/kiwix/package.nix} | 19 +++++++------------ .../ki}/kiwix/remove-Werror.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 7 insertions(+), 14 deletions(-) rename pkgs/{applications/misc/kiwix/default.nix => by-name/ki/kiwix/package.nix} (83%) rename pkgs/{applications/misc => by-name/ki}/kiwix/remove-Werror.patch (100%) diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/by-name/ki/kiwix/package.nix similarity index 83% rename from pkgs/applications/misc/kiwix/default.nix rename to pkgs/by-name/ki/kiwix/package.nix index 73e4fef2f132..4f533852df27 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/by-name/ki/kiwix/package.nix @@ -5,12 +5,7 @@ nix-update-script, libkiwix, pkg-config, - qmake, - qtbase, - qtwebengine, - qtsvg, - qtimageformats, - wrapQtAppsHook, + qt6, aria2, }: @@ -30,17 +25,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - qmake + qt6.qmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ libkiwix - qtbase - qtwebengine - qtsvg - qtimageformats + qt6.qtbase + qt6.qtwebengine + qt6.qtsvg + qt6.qtimageformats ]; qtWrapperArgs = [ diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/by-name/ki/kiwix/remove-Werror.patch similarity index 100% rename from pkgs/applications/misc/kiwix/remove-Werror.patch rename to pkgs/by-name/ki/kiwix/remove-Werror.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c427377f8b1a..c7317bc0497d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10289,8 +10289,6 @@ with pkgs; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kiwix = qt6Packages.callPackage ../applications/misc/kiwix { }; - klayout = libsForQt5.callPackage ../applications/misc/klayout { }; kotatogram-desktop = From e6b1c1cd5b8afc84c4ecea2761253cabc47f4651 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:18:29 +0200 Subject: [PATCH 14/18] web-eid-app: move to by-name --- .../default.nix => by-name/we/web-eid-app/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{tools/security/web-eid-app/default.nix => by-name/we/web-eid-app/package.nix} (95%) diff --git a/pkgs/tools/security/web-eid-app/default.nix b/pkgs/by-name/we/web-eid-app/package.nix similarity index 95% rename from pkgs/tools/security/web-eid-app/default.nix rename to pkgs/by-name/we/web-eid-app/package.nix index dae430bbadb3..26a7decaa51c 100644 --- a/pkgs/tools/security/web-eid-app/default.nix +++ b/pkgs/by-name/we/web-eid-app/package.nix @@ -6,8 +6,7 @@ gtest, pcsclite, pkg-config, - qttools, - wrapQtAppsHook, + qt6, }: stdenv.mkDerivation rec { @@ -25,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7317bc0497d..421c28bb7532 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3696,8 +3696,6 @@ with pkgs; # https://github.com/NixOS/nixpkgs/issues/227327 wafHook = waf.hook; - web-eid-app = qt6Packages.callPackage ../tools/security/web-eid-app { }; - wyrd = callPackage ../tools/misc/wyrd { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; From 437fe2ff4802258510e9df305bc69ce96f718da5 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:20:50 +0200 Subject: [PATCH 15/18] lenovo-legion: move to by-name --- .../app.nix => by-name/le/lenovo-legion/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{os-specific/linux/lenovo-legion/app.nix => by-name/le/lenovo-legion/package.nix} (96%) diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/by-name/le/lenovo-legion/package.nix similarity index 96% rename from pkgs/os-specific/linux/lenovo-legion/app.nix rename to pkgs/by-name/le/lenovo-legion/package.nix index ec001847516f..e712e5e11f47 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/by-name/le/lenovo-legion/package.nix @@ -2,10 +2,9 @@ lib, fetchFromGitHub, libxcb, - wrapQtAppsHook, python3, nix-update-script, - qtbase, + qt6, }: python3.pkgs.buildPythonApplication rec { @@ -24,12 +23,12 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools - wrapQtAppsHook + qt6.wrapQtAppsHook ]; dependencies = with python3.pkgs; [ pyqt6 - qtbase + qt6.qtbase argcomplete pillow pyyaml diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 421c28bb7532..48d013b1fc56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10350,8 +10350,6 @@ with pkgs; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - lenovo-legion = qt6Packages.callPackage ../os-specific/linux/lenovo-legion/app.nix { }; - libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; From 1619cf00fd6213891a18d8a8bcfd36faf7e29927 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:46:07 +0200 Subject: [PATCH 16/18] qmasterpassword: move to by-name, rename --- .../qm/qmasterpassword/package.nix} | 26 ++++++++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 13 insertions(+), 18 deletions(-) rename pkgs/{applications/misc/qMasterPassword/default.nix => by-name/qm/qmasterpassword/package.nix} (90%) diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/by-name/qm/qmasterpassword/package.nix similarity index 90% rename from pkgs/applications/misc/qMasterPassword/default.nix rename to pkgs/by-name/qm/qmasterpassword/package.nix index d7078b2be9c9..0686748a4eab 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/by-name/qm/qmasterpassword/package.nix @@ -5,32 +5,28 @@ libx11, libxtst, cmake, - qtbase, - qttools, - qtwayland, openssl, libscrypt, - wrapQtAppsHook, testers, - qMasterPassword, + qt6, x11Support ? true, waylandSupport ? false, }: -stdenv.mkDerivation rec { - pname = "qMasterPassword"; +stdenv.mkDerivation (finalAttrs: { + pname = "qmasterpassword"; version = "2.0.3"; src = fetchFromGitHub { owner = "bkueng"; repo = "qMasterPassword"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kNVdE42JFzl6HO84b793gseMhcDyiGzQCmhh6zh2epc="; }; buildInputs = [ - qtbase - qtwayland + qt6.qtbase + qt6.qtwayland openssl libscrypt ] @@ -40,8 +36,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; cmakeFlags = lib.optionals waylandSupport [ "-DDISABLE_FILL_FORM_SHORTCUTS=1" @@ -71,8 +67,8 @@ stdenv.mkDerivation rec { passthru = { tests.version = testers.testVersion { - package = qMasterPassword; - version = "v${version}"; + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; }; }; @@ -92,4 +88,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ teutat3s ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0433203325ff..e1e0bf36fbf0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1594,6 +1594,7 @@ mapAliases { qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21 qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27 + qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01 qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26 qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19 qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48d013b1fc56..1e97a967ef31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12710,9 +12710,7 @@ with pkgs; gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; - qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { }; - - qMasterPassword-wayland = qt6Packages.callPackage ../applications/misc/qMasterPassword { + qMasterPassword-wayland = qmasterpassword.override { x11Support = false; waylandSupport = true; }; From 5f8a89c05be30917de46eaf12d16066ecce25708 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 1 Feb 2026 00:13:10 +0200 Subject: [PATCH 17/18] qmasterpassword-wayland: rename --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e1e0bf36fbf0..92d1bdc9626d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1595,6 +1595,7 @@ mapAliases { qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21 qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27 qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01 + qMasterPassword-wayland = warnAlias "'qMasterPassword-wayland' has been renamed to/replaced by 'qmasterpassword-wayland'" qmasterpassword-wayland; # Added 2026-02-01 qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26 qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19 qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e97a967ef31..14baf6464eae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12710,7 +12710,7 @@ with pkgs; gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; - qMasterPassword-wayland = qmasterpassword.override { + qmasterpassword-wayland = qmasterpassword.override { x11Support = false; waylandSupport = true; }; From f0450cc21f9cf269fc466f4fd70d5428d7e7cef0 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:51:39 +0200 Subject: [PATCH 18/18] beamerpresenter: move to by-name --- .../be/beamerpresenter/package.nix} | 32 ++++++++----------- pkgs/top-level/all-packages.nix | 10 ++---- 2 files changed, 15 insertions(+), 27 deletions(-) rename pkgs/{applications/office/beamerpresenter/default.nix => by-name/be/beamerpresenter/package.nix} (83%) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/by-name/be/beamerpresenter/package.nix similarity index 83% rename from pkgs/applications/office/beamerpresenter/default.nix rename to pkgs/by-name/be/beamerpresenter/package.nix index 9aa3b0332879..365984034f72 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/by-name/be/beamerpresenter/package.nix @@ -5,16 +5,10 @@ cmake, pkg-config, wrapGAppsHook3, - wrapQtAppsHook, gst_all_1, - qtbase, - qtsvg, - qtmultimedia, - qttools, - qtwayland, zlib, - # only required when using poppler - poppler, + qt6, + qt6Packages, # only required when using mupdf freetype, gumbo, @@ -27,14 +21,14 @@ useExternalRenderer ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "beamerpresenter"; version = "0.2.6"; src = fetchFromGitHub { owner = "beamerpresenter"; repo = "BeamerPresenter"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k="; }; @@ -42,7 +36,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapGAppsHook3 - wrapQtAppsHook + qt6.wrapQtAppsHook ]; dontWrapGApps = true; @@ -52,13 +46,13 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good zlib - qtbase - qtsvg - qtmultimedia - qttools + qt6.qtbase + qt6.qtsvg + qt6.qtmultimedia + qt6.qttools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6.qtwayland ] ++ lib.optionals useMupdf [ freetype @@ -68,7 +62,7 @@ stdenv.mkDerivation rec { openjpeg ] ++ lib.optionals usePoppler [ - poppler + qt6Packages.poppler ]; cmakeFlags = [ @@ -81,7 +75,7 @@ stdenv.mkDerivation rec { "-DLINK_MUJS=OFF" "-DLINK_GUMBO=ON" "-DUSE_TRANSLATIONS=ON" - "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}" + "-DQT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}" ]; preFixup = '' @@ -102,4 +96,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "beamerpresenter"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14baf6464eae..76e7a85c94aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1976,14 +1976,8 @@ with pkgs; inherit (llvmPackages) openmp; }; - beamerpresenter = beamerpresenter-mupdf; - - beamerpresenter-mupdf = qt6Packages.callPackage ../applications/office/beamerpresenter { - useMupdf = true; - usePoppler = false; - }; - - beamerpresenter-poppler = qt6Packages.callPackage ../applications/office/beamerpresenter { + beamerpresenter-mupdf = beamerpresenter; + beamerpresenter-poppler = beamerpresenter.override { useMupdf = false; usePoppler = true; };