From 56c1eb11d81369876581cc3945019bb4292ed432 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Oct 2025 11:19:09 -0500 Subject: [PATCH] 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;