about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2020-02-02 15:19:05 -0600
committerWill Dietz <w@wdtz.org>2020-02-03 18:08:59 -0600
commit6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640 (patch)
tree462fb0ffd95903188d873b5685502d44a6b8d508
parentd78ad343d7358cc79417f46f1d4e5f490fb455cd (diff)
downloadnixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.tar
nixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.tar.gz
nixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.tar.bz2
nixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.tar.lz
nixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.tar.xz
nixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.tar.zst
nixlib-6f60621c0c3a7c6691757d7b8e7e7a5d4c6aa640.zip
kcontacts: kdeApplications -> kdeFrameworks
-rw-r--r--pkgs/applications/kde/default.nix1
-rw-r--r--pkgs/development/libraries/kde-frameworks/default.nix1
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcontacts.nix (renamed from pkgs/applications/kde/kcontacts.nix)3
-rw-r--r--pkgs/top-level/all-packages.nix4
4 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 3c45b05e9e8f..4d2c4b6af51c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -95,7 +95,6 @@ let
       kcalutils = callPackage ./kcalutils.nix {};
       kcharselect = callPackage ./kcharselect.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
-      kcontacts = callPackage ./kcontacts.nix {};
       kdav = callPackage ./kdav.nix {};
       kdebugsettings = callPackage ./kdebugsettings.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index d18dea1c3817..7ce3954e286c 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -100,6 +100,7 @@ let
       kcalendarcore = callPackage ./kcalendarcore.nix {};
       kcodecs = callPackage ./kcodecs.nix {};
       kconfig = callPackage ./kconfig.nix {};
+      kcontacts = callPackage ./kcontacts.nix {};
       kcoreaddons = callPackage ./kcoreaddons.nix {};
       kdbusaddons = callPackage ./kdbusaddons.nix {};
       kdnssd = callPackage ./kdnssd.nix {};
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
index 12b3198a26b2..74b6652aee2a 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam,
+  mkDerivation, lib,
   extra-cmake-modules,
   kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
 }:
@@ -8,7 +8,6 @@ mkDerivation {
   name = "kcontacts";
   meta = {
     license = [ lib.licenses.lgpl21 ];
-    maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7d3628b84f0..e33c28f8d2fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13822,7 +13822,7 @@ in
       kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
       networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
-      syndication threadweaver kirigami2 kholidays kpurpose;
+      syndication threadweaver kirigami2 kholidays kpurpose kcontacts;
 
     ### KDE PLASMA 5
 
@@ -19830,7 +19830,7 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
-    kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
+    kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
     keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
     kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;