From 25278f97f4f5592ed1913dc4a84f54b6d9456c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= <andre.vmatos@gmail.com> Date: Thu, 21 Apr 2022 13:37:12 -0300 Subject: [PATCH] kalarmcal: remove package merged to kalarm --- pkgs/applications/kde/default.nix | 1 - pkgs/applications/kde/kalarm.nix | 4 ++-- pkgs/applications/kde/kalarmcal.nix | 19 ------------------- .../kde/kdepim-runtime/default.nix | 4 ++-- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/kde/kalarmcal.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 115f3c54f761..7f0559c83c42 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -97,7 +97,6 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; - kalarmcal = callPackage ./kalarmcal.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 87bc95a24941..b99098c56f93 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -7,7 +7,7 @@ kio, knotifications, knotifyconfig, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, - kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils, + kimap, akonadi, akonadi-contacts, akonadi-mime, kcalendarcore, kcalutils, kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, pimcommon, kpimtextedit, messagelib, @@ -31,7 +31,7 @@ mkDerivation { kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem kxmlgui phonon - kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore + kimap akonadi akonadi-contacts akonadi-mime kcalendarcore kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime pimcommon kpimtextedit messagelib diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix deleted file mode 100644 index 9296fe024e95..000000000000 --- a/pkgs/applications/kde/kalarmcal.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - akonadi, kcalendarcore, kholidays, kidentitymanagement, - kpimtextedit, kcalutils -}: - -mkDerivation { - pname = "kalarmcal"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils - ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 16ec7ccd213a..5c64d8826f68 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, - kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement, + kholidays, kcalutils, kcontacts, kdav, kidentitymanagement, kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, pimcommon, libkgapi, libsecret, qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns, @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes - kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap + kholidays kcalutils kcontacts kdav kidentitymanagement kimap kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi libsecret qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns