From ab5e65bbe3f18e99a6a1780a48bd0b4385f65a9e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 31 Jan 2021 09:03:32 -0600 Subject: [PATCH] kdepim-apps-libs: remove --- pkgs/applications/kde/calendarsupport.nix | 4 ++-- pkgs/applications/kde/default.nix | 1 - pkgs/applications/kde/incidenceeditor.nix | 4 ++-- pkgs/applications/kde/kaddressbook.nix | 4 ++-- pkgs/applications/kde/kalarm.nix | 4 ++-- pkgs/applications/kde/kdepim-addons.nix | 4 ++-- .../kde/kdepim-apps-libs/default.nix | 20 ------------------- pkgs/applications/kde/kmail.nix | 4 ++-- pkgs/applications/kde/kontact.nix | 4 ++-- pkgs/applications/kde/korganizer.nix | 4 ++-- pkgs/applications/kde/messagelib.nix | 4 ++-- 11 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/kde/kdepim-apps-libs/default.nix diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index b316ab4e5689..b8bf806dc69a 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, - akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, + akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: @@ -20,7 +20,7 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools + akonadi akonadi-mime akonadi-notes kcalutils kholidays pimcommon qttools ]; propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 7ca98d0fab6c..b312a566a700 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -112,7 +112,6 @@ let kdenlive = callPackage ./kdenlive {}; kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; - kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; kdiamond = callPackage ./kdiamond.nix {}; diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 981c184d1515..7f2c284ad74d 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, + akonadi, akonadi-mime, calendarsupport, eventviews, kdiagram, kldap, kmime, pimcommon, qtbase }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram + akonadi akonadi-mime calendarsupport eventviews kdiagram kldap kmime pimcommon qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 452c5142157d..e0aba17f16aa 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, - kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, + kcrash, kdbusaddons, ki18n, kontactinterface, kparts, kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison, qgpgme, qtbase, }: @@ -23,7 +23,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash - kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit + kdbusaddons ki18n kontactinterface kparts kpimtextedit kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase ]; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 70ee3f741854..f12e7469d2a7 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -8,7 +8,7 @@ kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils, kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, - pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, + pimcommon, kpimtextedit, messagelib, qtx11extras, @@ -29,7 +29,7 @@ mkDerivation { kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime - pimcommon kpimtextedit kdepim-apps-libs messagelib + pimcommon kpimtextedit messagelib qtx11extras ]; diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 0939b0ecd26f..42532644a1a6 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -3,7 +3,7 @@ extra-cmake-modules, shared-mime-info, akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative, - kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, + kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, kitinerary, kontactinterface }: @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi-import-wizard akonadi-notes calendarsupport eventviews incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative - kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar + kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass kitinerary kontactinterface ]; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix deleted file mode 100644 index 19f476fd781e..000000000000 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, - kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, -}: - -mkDerivation { - pname = "kdepim-apps-libs"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets - kcontacts ki18n kiconthemes kio libkleo pimcommon prison - ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index fa3fe033035f..e742f566678f 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, - kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, + kconfigwidgets, kcoreaddons, kdelibs4support, libkdepim, kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, @@ -19,7 +19,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n + kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim knotifications knotifyconfig kontactinterface kparts kpty kservice ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index 3dfa28e9dfe7..801c6845e409 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, qtwebengine, kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, - akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, + akonadi, grantleetheme, kontactinterface, kpimtextedit, mailcommon, libkdepim, pimcommon }: @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ qtwebengine kcmutils kcrash kdbusaddons kparts kwindowsystem - akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit + akonadi grantleetheme kontactinterface kpimtextedit mailcommon libkdepim pimcommon ]; } diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix index f28e0406b134..a6a28427772e 100644 --- a/pkgs/applications/kde/korganizer.nix +++ b/pkgs/applications/kde/korganizer.nix @@ -5,7 +5,7 @@ phonon, knewstuff, akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search, - calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs, + calendarsupport, eventviews, incidenceeditor, kcalutils, kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface, kpimtextedit, pimcommon, }: @@ -22,7 +22,7 @@ mkDerivation { phonon knewstuff akonadi-calendar akonadi-contacts akonadi-notes akonadi-search - calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs + calendarsupport eventviews incidenceeditor kcalutils kholidays kidentitymanagement kldap kmailtransport kontactinterface kpimtextedit pimcommon ]; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index d47a5504417a..6709a1f072a5 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, - kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, + kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, pimcommon, qca-qt5, qtwebengine, syntax-highlighting }: @@ -17,7 +17,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs - kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap + kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5 syntax-highlighting ];