JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: replace kcalcore dependencies with kcalendarcore

Browse Source
This commit is contained in:
nyanloutre 2019-12-11 22:15:00 +01:00 committed by Frederik Rietdijk
parent 3ccb0bef9c
commit 2abd0a559c
15 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/digikam/default.nix
View File

@ -9,7 +9,7 @@
, qtwebengine , qtwebengine
, akonadi-contacts , akonadi-contacts
, kcalcore , kcalendarcore
, kconfigwidgets , kconfigwidgets
, kcoreaddons , kcoreaddons
, kdoctools , kdoctools
@ -89,7 +89,7 @@ mkDerivation rec {
qtwebengine qtwebengine
akonadi-contacts akonadi-contacts
kcalcore kcalendarcore
kconfigwidgets kconfigwidgets
kcoreaddons kcoreaddons
kfilemetadata kfilemetadata

4
pkgs/applications/kde/akonadi-calendar.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts, akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
kidentitymanagement, kio, kmailtransport, kidentitymanagement, kio, kmailtransport,
}: }:
@ -13,7 +13,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
kio kmailtransport kio kmailtransport
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

4
pkgs/applications/kde/akonadi-search.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime, akonadi, akonadi-mime, kcalendarcore, kcmutils, kcontacts, kcoreaddons, kmime,
krunner, qtbase, xapian krunner, qtbase, xapian
}: }:
@ -14,7 +14,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcmutils krunner xapian ]; buildInputs = [ kcmutils krunner xapian ];
propagatedBuildInputs = [ propagatedBuildInputs = [
akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/akonadiconsole.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion, akonadi, akonadi-contacts, calendarsupport, kcalendarcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim, kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}: }:
@ -14,7 +14,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets akonadi akonadi-contacts calendarsupport kcalendarcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
messagelib qtbase libkdepim akonadi-search xapian messagelib qtbase libkdepim akonadi-search xapian
]; ];

4
pkgs/applications/kde/kalarm.nix
View File

@ -6,7 +6,7 @@
kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio, kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils, kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
@ -27,7 +27,7 @@ mkDerivation {
kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
pimcommon kpimtextedit kdepim-apps-libs messagelib pimcommon kpimtextedit kdepim-apps-libs messagelib

4
pkgs/applications/kde/kalarmcal.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, akonadi, kcalendarcore, kdelibs4support, kholidays, kidentitymanagement,
kpimtextedit, kcalutils kpimtextedit, kcalutils
}: }:
@ -13,7 +13,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils akonadi kcalendarcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/kcalutils.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, grantlee, kcalendarcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit, kidentitymanagement, kpimtextedit,
}: }:
@ -13,7 +13,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support grantlee kcalendarcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit kidentitymanagement kpimtextedit
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

4
pkgs/applications/kde/kdepim-addons.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info, extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface kitinerary, kontactinterface
@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface kitinerary kontactinterface

4
pkgs/applications/kde/kitinerary.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, extra-cmake-modules mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass , qtbase, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalcore , poppler, kcontacts, kcalendarcore
}: }:
mkDerivation { mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler qtbase qtdeclarative ki18n kmime kpkpass poppler
kcontacts kcalcore kcontacts kcalendarcore
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/kmailtransport.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, akonadi, akonadi-mime, cyrus_sasl, kcmutils,
ki18n, kio, kmime, kwallet, ksmtp, libkgapi, ki18n, kio, kmime, kwallet, ksmtp, libkgapi,
kcalcore, kcontacts kcalendarcore, kcontacts
}: }:
mkDerivation { mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ]; buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/knotes.nix
View File

@ -9,7 +9,7 @@
grantlee, grantleetheme, qtx11extras, grantlee, grantleetheme, qtx11extras,
akonadi, akonadi-notes, akonadi-search, kcalutils, akonadi, akonadi-notes, akonadi-search, kcalutils,
kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit, kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,
kcalcore kcalendarcore
}: }:
mkDerivation { mkDerivation {
@ -24,6 +24,6 @@ mkDerivation {
akonadi akonadi-notes kcalutils kontactinterface akonadi akonadi-notes kcalutils kontactinterface
libkdepim kmime pimcommon kpimtextedit libkdepim kmime pimcommon kpimtextedit
akonadi-search akonadi-search
kcalcore kcalendarcore
]; ];
} }

4
pkgs/applications/kde/ktnef.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kcalcore, kcalutils, kcontacts, kdelibs4support kcalendarcore, kcalutils, kcontacts, kdelibs4support
}: }:
mkDerivation { mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kcalcore kcalutils kcontacts kdelibs4support kcalendarcore kcalutils kcontacts kdelibs4support
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/libkgapi.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
qtwebengine, kio, kcalcore, kcontacts, qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl cyrus_sasl
}: }:
@ -12,5 +12,5 @@ mkDerivation {
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ]; buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
} }

4
pkgs/applications/kde/pim-data-exporter.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons, akonadi, akonadi-notes, kcalendarcore, kcmutils, kcrash, kdbusaddons,
kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications,
knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo,
pimcommon, qttools, karchive, mailcommon, messagelib pimcommon, qttools, karchive, mailcommon, messagelib
@ -15,7 +15,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons akonadi akonadi-notes kcalendarcore kcmutils kcrash kdbusaddons
kidentitymanagement kldap kmailtransport knewstuff knotifications kidentitymanagement kldap kmailtransport knewstuff knotifications
knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon
qttools karchive mailcommon messagelib qttools karchive mailcommon messagelib

3
pkgs/top-level/all-packages.nix
View File

@ -22610,7 +22610,8 @@ in
digikam = libsForQt5.callPackage ../applications/graphics/digikam { digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen; inherit (plasma5) oxygen;
inherit (kdeApplications) akonadi-contacts kcalcore; inherit (kdeApplications) akonadi-contacts;
inherit (kdeFrameworks) kcalendarcore;
ffmpeg = ffmpeg_4; ffmpeg = ffmpeg_4;
opencv3 = opencv3WithoutCuda; opencv3 = opencv3WithoutCuda;
}; };