From 4b0601434916e590cb4d4e85b1761fcae2916191 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Oct 2025 09:20:36 -0500 Subject: [PATCH 1/5] heaptrack: migrate to by-name, move out of top-level --- .../he/heaptrack/package.nix} | 19 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 14 deletions(-) rename pkgs/{development/tools/profiling/heaptrack/default.nix => by-name/he/heaptrack/package.nix} (87%) diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/by-name/he/heaptrack/package.nix similarity index 87% rename from pkgs/development/tools/profiling/heaptrack/default.nix rename to pkgs/by-name/he/heaptrack/package.nix index e5f6e15696d0..a663250988f0 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/by-name/he/heaptrack/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, cmake, - extra-cmake-modules, makeBinaryWrapper, zlib, boost, @@ -11,14 +10,7 @@ elfutils, sparsehash, zstd, - qtbase, - wrapQtAppsHook, - kio, - kitemmodels, - threadweaver, - kconfigwidgets, - kcoreaddons, - kdiagram, + kdePackages, }: stdenv.mkDerivation { @@ -35,9 +27,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules makeBinaryWrapper - wrapQtAppsHook + kdePackages.wrapQtAppsHook ]; buildInputs = [ @@ -46,6 +38,8 @@ stdenv.mkDerivation { libunwind sparsehash zstd + ] + ++ (with kdePackages; [ qtbase kio kitemmodels @@ -53,7 +47,8 @@ stdenv.mkDerivation { kconfigwidgets kcoreaddons kdiagram - ] + ]) + ++ lib.optionals stdenv.hostPlatform.isLinux [ elfutils ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9caf1068efe..6edf05ed98b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3091,8 +3091,6 @@ with pkgs; threadsafe = true; }; - heaptrack = kdePackages.callPackage ../development/tools/profiling/heaptrack { }; - headscale = callPackage ../servers/headscale { }; highlight = callPackage ../tools/text/highlight { From 226c340d7edd983cfbf138c999968a2f75d74c2d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Oct 2025 09:40:28 -0500 Subject: [PATCH 2/5] kdiskmark: migrate to by-name, move out of top-level --- .../default.nix => by-name/kd/kdiskmark/package.nix} | 10 +++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 9 deletions(-) rename pkgs/{tools/filesystems/kdiskmark/default.nix => by-name/kd/kdiskmark/package.nix} (91%) diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/by-name/kd/kdiskmark/package.nix similarity index 91% rename from pkgs/tools/filesystems/kdiskmark/default.nix rename to pkgs/by-name/kd/kdiskmark/package.nix index c401567ed9b4..70aab77d7243 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/by-name/kd/kdiskmark/package.nix @@ -1,14 +1,10 @@ { stdenv, lib, - wrapQtAppsHook, - qtbase, - qttools, fio, cmake, - polkit-qt-1, - extra-cmake-modules, fetchFromGitHub, + kdePackages, }: stdenv.mkDerivation rec { pname = "kdiskmark"; @@ -22,13 +18,13 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ + nativeBuildInputs = with kdePackages; [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with kdePackages; [ qtbase qttools polkit-qt-1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6edf05ed98b4..e9613d2de991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3235,8 +3235,6 @@ with pkgs; kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; - kdiskmark = kdePackages.callPackage ../tools/filesystems/kdiskmark { }; - keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; keybase = callPackage ../tools/security/keybase { }; From 2a0a311a4d5cfe772c6cf13b6b6e4279e509c378 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Oct 2025 10:54:17 -0500 Subject: [PATCH 3/5] whitesur-kde: migrate to by-name, move out of top-level --- .../default.nix => by-name/wh/whitesur-kde/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{data/themes/whitesur-kde/default.nix => by-name/wh/whitesur-kde/package.nix} (100%) diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/by-name/wh/whitesur-kde/package.nix similarity index 100% rename from pkgs/data/themes/whitesur-kde/default.nix rename to pkgs/by-name/wh/whitesur-kde/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9613d2de991..25ba47ff97ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10891,8 +10891,6 @@ with pkgs; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; - whitesur-kde = kdePackages.callPackage ../data/themes/whitesur-kde { }; - xkeyboard_config = xkeyboard-config; xlsx2csv = with python3Packages; toPythonApplication xlsx2csv; From 56c1eb11d81369876581cc3945019bb4292ed432 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Oct 2025 11:19:09 -0500 Subject: [PATCH 4/5] skrooge: migrate to by-name --- .../sk/skrooge/package.nix} | 24 +++---------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 23 deletions(-) rename pkgs/{applications/office/skrooge/default.nix => by-name/sk/skrooge/package.nix} (80%) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/by-name/sk/skrooge/package.nix similarity index 80% rename from pkgs/applications/office/skrooge/default.nix rename to pkgs/by-name/sk/skrooge/package.nix index 884f2ff7bc77..6bd4487b1531 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/by-name/sk/skrooge/package.nix @@ -3,30 +3,12 @@ lib, fetchurl, cmake, - extra-cmake-modules, pkg-config, - qtbase, - wrapQtAppsHook, - qtwebengine, grantlee, - kxmlgui, - kwallet, - kparts, - kdoctools, - kjobwidgets, - kiconthemes, - knewstuff, sqlcipher, - qca, - plasma-activities, - karchive, - kguiaddons, - knotifyconfig, - krunner, - ktexttemplate, - kwindowsystem, libofx, shared-mime-info, + kdePackages, }: stdenv.mkDerivation rec { @@ -38,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8="; }; - nativeBuildInputs = [ + nativeBuildInputs = with kdePackages; [ cmake extra-cmake-modules kdoctools @@ -47,7 +29,7 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with kdePackages; [ qtbase qtwebengine grantlee diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25ba47ff97ac..97e2ef853014 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12694,8 +12694,6 @@ with pkgs; super-slicer-latest = super-slicer.latest; - skrooge = kdePackages.callPackage ../applications/office/skrooge { }; - soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan; From 7132a3c6e5ddb0980ebfb8bbb86c083873de9c75 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Oct 2025 11:28:57 -0500 Subject: [PATCH 5/5] ktailctl: migrate to by-name --- .../kt/ktailctl/package.nix} | 21 +++---------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 20 deletions(-) rename pkgs/{applications/networking/ktailctl/default.nix => by-name/kt/ktailctl/package.nix} (83%) diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/by-name/kt/ktailctl/package.nix similarity index 83% rename from pkgs/applications/networking/ktailctl/default.nix rename to pkgs/by-name/kt/ktailctl/package.nix index aa3c56234b22..26207bd9d4de 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/by-name/kt/ktailctl/package.nix @@ -1,28 +1,13 @@ { buildGo124Module, cmake, - extra-cmake-modules, fetchFromGitHub, git, go_1_24, - kconfig, - kcoreaddons, - kdbusaddons, - kguiaddons, - ki18n, - kirigami, - kirigami-addons, - knotifications, - kwindowsystem, lib, nlohmann_json, - qqc2-desktop-style, - qtbase, - qtdeclarative, - qtsvg, - qtwayland, stdenv, - wrapQtAppsHook, + kdePackages, }: let @@ -61,7 +46,7 @@ stdenv.mkDerivation { "-DKTAILCTL_FLATPAK_BUILD=ON" ]; - nativeBuildInputs = [ + nativeBuildInputs = with kdePackages; [ cmake extra-cmake-modules git @@ -69,7 +54,7 @@ stdenv.mkDerivation { wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with kdePackages; [ kconfig kcoreaddons kdbusaddons diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e2ef853014..2dc5f94801ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3380,8 +3380,6 @@ with pkgs; node2nix = nodePackages.node2nix; - ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { }; - ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump; leanblueprint = with python3Packages; toPythonApplication leanblueprint;