From 1bd7a3fb1c9956d300b48ee327d785afc3ea608c Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Mon, 12 Dec 2022 14:30:49 +0100 Subject: [PATCH] colord-kde: move to kde gear packages --- .../default.nix => applications/kde/colord-kde.nix} | 6 ------ pkgs/applications/kde/default.nix | 1 + pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/colord-kde/default.nix => applications/kde/colord-kde.nix} (78%) diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/applications/kde/colord-kde.nix similarity index 78% rename from pkgs/tools/misc/colord-kde/default.nix rename to pkgs/applications/kde/colord-kde.nix index 33686498112..e250df5633f 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/applications/kde/colord-kde.nix @@ -7,12 +7,6 @@ mkDerivation rec { pname = "colord-kde"; - version = "0.5.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; - }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 2a36b135f15..6968c50c609 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -81,6 +81,7 @@ let bomber = callPackage ./bomber.nix {}; bovo = callPackage ./bovo.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; + colord-kde = callPackage ./colord-kde.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; dragon = callPackage ./dragon.nix {}; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7546a693aab..7586a6e68c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1772,7 +1772,7 @@ mapAliases ({ inherit (plasma5Packages) akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk - breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon + breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dedaa9842bb..e35f80aa819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3890,8 +3890,6 @@ with pkgs; coloredlogs = with python3Packages; toPythonApplication coloredlogs; - colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; - colpack = callPackage ../applications/science/math/colpack { }; cz-cli = callPackage ../applications/version-management/cz-cli {};