From 27532073dd450429084b55357ace61cc4dd98d60 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:37:02 -0500 Subject: [PATCH 001/100] kdeApplications: add kdepimTeam maintainer list --- pkgs/applications/kde/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 207228a65b0..90af8bf1611 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -40,6 +40,9 @@ let packages = self: with self; let callPackage = self.newScope { + # Team of maintainers assigned to the KDE PIM suite + kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; + mkDerivation = import ./build-support/application.nix { inherit lib; inherit srcs; From 066f2734050ced20f90d6dac17ca8e280bc223da Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:37:20 -0500 Subject: [PATCH 002/100] akonadi-contacts: assign to kdepimTeam --- pkgs/applications/kde/akonadi-contacts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 3f410b7b8b9..1f618567e11 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, kmime, ktextwidgets, qtwebengine, @@ -9,7 +9,7 @@ mkDerivation { name = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ From d1e30e5c34d573bcfa9d0b23528b7d3a0be09b60 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:38:13 -0500 Subject: [PATCH 003/100] akonadi-mime: assign to kdepimTeam --- pkgs/applications/kde/akonadi-mime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 98a341da6b6..e47645518d0 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime, shared_mime_info @@ -9,7 +9,7 @@ mkDerivation { name = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ akonadi shared_mime_info From e17f125214931809fbf8a2009d9cef0713324008 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:38:39 -0500 Subject: [PATCH 004/100] akonadi: assign to kdepimTeam --- pkgs/applications/kde/akonadi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index c2e34428474..b69b6b1e407 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, + mkDerivation, copyPathsToStore, lib, kdepimTeam, extra-cmake-modules, kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, kwindowsystem, kcrash, kio, @@ -11,7 +11,7 @@ mkDerivation { name = "akonadi"; meta = { license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules ]; From 39f9ff0263a31eb979f0d92ad00cfcc4ac29bf10 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:38:51 -0500 Subject: [PATCH 005/100] kcontacts: assign to kdepimTeam --- pkgs/applications/kde/kcontacts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix index 96828af9d17..d73f7f64625 100644 --- a/pkgs/applications/kde/kcontacts.nix +++ b/pkgs/applications/kde/kcontacts.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kcoreaddons, kconfig, kcodecs, ki18n, qtbase, }: @@ -8,7 +8,7 @@ mkDerivation { name = "kcontacts"; meta = { license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ]; From 5fa44742b9ced69b7013e1ffcc3cd2eff1b52e47 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:39:02 -0500 Subject: [PATCH 006/100] kmime: assign to kdepimTeam --- pkgs/applications/kde/kmime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index b14e0abcc3f..a5f7b11101e 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, ki18n, kcodecs, qtbase, }: @@ -8,7 +8,7 @@ mkDerivation { name = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules ki18n ]; buildInputs = [ kcodecs qtbase ]; From 816a7683aaa5dcbe571d7c048115ce058476b959 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:44:15 -0500 Subject: [PATCH 007/100] akonadi-contacts: fixup inputs and outputs --- pkgs/applications/kde/akonadi-contacts.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 1f618567e11..b09058b60be 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,8 +1,10 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, - akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes, - kio, kitemmodels, kmime, ktextwidgets, qtwebengine, + qtwebengine, + grantlee, + kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison, + akonadi, akonadi-mime, kcontacts, kmime, }: mkDerivation { @@ -13,8 +15,10 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio - kitemmodels kmime ktextwidgets qtwebengine + qtwebengine + grantlee + kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison + akonadi-mime kcontacts kmime ]; propagatedBuildInputs = [ akonadi ]; outputs = [ "out" "dev" ]; From 67226f34bea2a25edb7747dd63f8f284df13f0ae Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:44:30 -0500 Subject: [PATCH 008/100] akonadi-mime: fixup inputs and outputs --- pkgs/applications/kde/akonadi-mime.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index e47645518d0..52a17f5cbeb 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,8 +1,7 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, - akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime, - shared_mime_info + extra-cmake-modules, shared_mime_info, + akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: mkDerivation { @@ -11,8 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ akonadi shared_mime_info - kdbusaddons ki18n kio kitemmodels kmime ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } From 284466837afe944229e9925a03ad969e225e8302 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:44:44 -0500 Subject: [PATCH 009/100] akonadi: fixup inputs and outputs --- pkgs/applications/kde/akonadi/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index b69b6b1e407..d6ba0abd226 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,10 +1,8 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, - extra-cmake-modules, - kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, - kwindowsystem, kcrash, kio, - boost, kitemmodels, shared_mime_info, - mysql + extra-cmake-modules, shared_mime_info, + boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, + ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: mkDerivation { @@ -14,12 +12,13 @@ mkDerivation { maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; buildInputs = [ - kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio - kwindowsystem kcrash shared_mime_info + kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n + kiconthemes kio kwindowsystem qttools ]; propagatedBuildInputs = [ boost kitemmodels ]; + outputs = [ "out" "dev" ]; cmakeFlags = [ "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld" ]; From da47cdfffb0c795ac38cb2ddf59c2cc1d4b09910 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:45:02 -0500 Subject: [PATCH 010/100] ffmpegthumbs: fixup inputs and outputs --- pkgs/applications/kde/ffmpegthumbs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 4e915422d14..aa03425f36a 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ffmpeg kio ]; + buildInputs = [ ffmpeg kio ]; } From 79a882da54819cd31f68b1eb2f22c0cb4d65d8de Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:45:18 -0500 Subject: [PATCH 011/100] kcachegrind: fixup inputs and outputs --- pkgs/applications/kde/kcachegrind.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 19e01aeebe9..91faaef623a 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -1,8 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kio, ki18n, karchive, qttools, - perl, python, php + karchive, ki18n, kio, perl, python, php, qttools, }: mkDerivation { @@ -12,6 +11,5 @@ mkDerivation { maintainers = with lib.maintainers; [ orivej ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kio ]; - buildInputs = [ perl python php ki18n karchive qttools ]; + buildInputs = [ karchive ki18n kio perl python php qttools ]; } From 1277814070025fab755673621650d5ab9a8d27ea Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:45:30 -0500 Subject: [PATCH 012/100] kcalc: fixup inputs and outputs --- pkgs/applications/kde/kcalc.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 856da42c835..2d902c220af 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp + gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications, + kxmlgui, }: mkDerivation { @@ -11,8 +12,7 @@ mkDerivation { maintainers = [ lib.maintainers.fridh ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ gmp ]; - propagatedBuildInputs = [ - kconfig kconfigwidgets kguiaddons kinit knotifications + buildInputs = [ + gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui ]; } From 6e96de513b742640494462521171253e51430895 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:45:41 -0500 Subject: [PATCH 013/100] kcolorchooser: fixup inputs and outputs --- pkgs/applications/kde/kcolorchooser.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index 186505a050c..45b32fbe832 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -11,6 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kwidgetsaddons kxmlgui ]; + buildInputs = [ ki18n kwidgetsaddons kxmlgui ]; } From b5cef7ebc6c71296005fa231387f370f524e927d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:45:50 -0500 Subject: [PATCH 014/100] kcontacts: fixup inputs and outputs --- pkgs/applications/kde/kcontacts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix index d73f7f64625..12b3198a26b 100644 --- a/pkgs/applications/kde/kcontacts.nix +++ b/pkgs/applications/kde/kcontacts.nix @@ -12,4 +12,5 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ]; + outputs = [ "out" "dev" ]; } From 7378747c40ff90f586c4e9134c7f9cba36f56862 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:46:00 -0500 Subject: [PATCH 015/100] kdegraphics-mobipocket: fixup inputs and outputs --- pkgs/applications/kde/kdegraphics-mobipocket.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index 09f761df851..e5f5b88ec44 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -12,4 +12,5 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kio ]; + outputs = [ "out" "dev" ]; } From c54222a1941f24a31ffb98228b0ae0727e7e686f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:46:13 -0500 Subject: [PATCH 016/100] kdegraphics-thumbnailers: fixup inputs and outputs --- pkgs/applications/kde/kdegraphics-thumbnailers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 3302681bd85..2e43e946d7f 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -10,5 +10,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kio libkexiv2 libkdcraw ]; + buildInputs = [ kio libkexiv2 libkdcraw ]; } From 90a72a506534e6ac9adeaecc28acd2ac014e81fa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:49:20 -0500 Subject: [PATCH 017/100] kdenetwork-filesharing: fixup inputs and outputs --- pkgs/applications/kde/kdenetwork-filesharing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 62176f3f3bb..d251eb74f27 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; + buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; } From fcd152534565937d790497f1b10b40b2909389bb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:49:51 -0500 Subject: [PATCH 018/100] kdf: fixup inputs and outputs --- pkgs/applications/kde/kdf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index 333fea3df53..eef94fd5eb2 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kcmutils + kcmutils, ki18n, kiconthemes, kio, knotifications, kxmlgui, }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.peterhoeg ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kcmutils ]; + buildInputs = [ kcmutils ki18n kiconthemes kio knotifications kxmlgui ]; } From c173140843dd5996c229eaf56b834cb8b77e951f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:50:00 -0500 Subject: [PATCH 019/100] kgpg: fixup inputs and outputs --- pkgs/applications/kde/kgpg.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index ca495a1ae26..33813f376a5 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,19 +1,18 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, makeWrapper, - akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, + akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, - ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem + ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme, }: mkDerivation { name = "kgpg"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - buildInputs = [ gnupg1 gpgme ki18n ]; - propagatedBuildInputs = [ - akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons - kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui - kwidgetsaddons kwindowsystem + buildInputs = [ + akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash + kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice + ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme ]; postFixup = '' wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}" From cf91cbbe52bc17eb7e7a945609cea1d9c06a3955 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:50:10 -0500 Subject: [PATCH 020/100] khelpcenter: fixup inputs and outputs --- pkgs/applications/kde/khelpcenter.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index db68cec976e..69b629bbeb9 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -1,16 +1,15 @@ { mkDerivation, extra-cmake-modules, kdoctools, - grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, - kdelibs4support, khtml, kservice, xapian + grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n, + kinit, khtml, kservice, xapian }: mkDerivation { name = "khelpcenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ ki18n xapian ]; - propagatedBuildInputs = [ - grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons - kinit kcmutils kservice + buildInputs = [ + grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml + ki18n kinit kservice xapian ]; } From d732dd9c98f4471e7fbad52a7cea2951d7c80633 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:50:20 -0500 Subject: [PATCH 021/100] kig: fixup inputs and outputs --- pkgs/applications/kde/kig.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 34b32896209..7b858907795 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -1,8 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kparts, qtsvg, qtxmlpatterns, ktexteditor, boost, - karchive, kcrash + boost, karchive, kcrash, kiconthemes, kparts, ktexteditor, qtsvg, + qtxmlpatterns, }: mkDerivation { @@ -12,9 +12,8 @@ mkDerivation { maintainers = with lib.maintainers; [ raskin ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ boost ]; - propagatedBuildInputs = [ - kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash + buildInputs = [ + boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns ]; } From b2f6848e34188e7edb8df2ee8b45e1cbcc06b84f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:50:29 -0500 Subject: [PATCH 022/100] kio-extras: fixup inputs and outputs --- pkgs/applications/kde/kio-extras.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 50709a7ddef..a78da6f48ca 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -13,7 +13,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; - propagatedBuildInputs = [ + buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kpty libmtp libssh openexr openslp phonon qtsvg samba solid From f86b67d0a5ecf05c8ffeaf0074054b312386e3af Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:50:47 -0500 Subject: [PATCH 023/100] kmime: fixup inputs and outputs --- pkgs/applications/kde/kmime.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index a5f7b11101e..b18a3f7fdc1 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -12,4 +12,5 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ki18n ]; buildInputs = [ kcodecs qtbase ]; + outputs = [ "out" "dev" ]; } From 35818ba666ddbf1e9d0bd629d7e4012a6d460ebf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:50:56 -0500 Subject: [PATCH 024/100] kmix: fixup inputs and outputs --- pkgs/applications/kde/kmix.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 058fd8178c4..8010c57d927 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -12,12 +12,9 @@ mkDerivation { maintainers = [ lib.maintainers.rongcuid ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; - propagatedBuildInputs = [ - kglobalaccel kxmlgui kcoreaddons kdelibs4support - plasma-framework - ]; - cmakeFlags = [ - "-DKMIX_KF5_BUILD=1" + buildInputs = [ + alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support + libcanberra_kde libpulseaudio plasma-framework ]; + cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ]; } From 27bc86a5c878df153693fd2ff17ec96b52076ccf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:51:11 -0500 Subject: [PATCH 025/100] kolourpaint: fixup inputs and outputs --- pkgs/applications/kde/kolourpaint.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix index db4cb75cc35..4501324a871 100644 --- a/pkgs/applications/kde/kolourpaint.nix +++ b/pkgs/applications/kde/kolourpaint.nix @@ -9,7 +9,7 @@ mkDerivation { name = "kolourpaint"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support libkexiv2 ]; + buildInputs = [ kdelibs4support libkexiv2 ]; meta = { maintainers = [ lib.maintainers.fridh ]; license = with lib.licenses; [ gpl2 ]; From 93478529d0a9de4e0c23d796e6278e15203f15b7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:51:21 -0500 Subject: [PATCH 026/100] kompare: fixup inputs and outputs --- pkgs/applications/kde/kompare.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index cf2fa2e6a10..bbaad3a02f8 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,14 +1,15 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kparts, ktexteditor, kwidgetsaddons, libkomparediff2 + kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 }: mkDerivation { name = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kparts ktexteditor kwidgetsaddons libkomparediff2 + buildInputs = [ + kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2 ]; + outputs = [ "out" "dev" ]; } From fd630ab1cc66a0e6dc5d3a4e6bb23a763517044f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:51:31 -0500 Subject: [PATCH 027/100] konsole: fixup inputs and outputs --- pkgs/applications/kde/konsole.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index d2d60adda2c..5269941fa11 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -14,10 +14,9 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ + buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support - kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty + kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; From 0ba1b29ea3c99cae8d8259929129c74fe7dcec1c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:51:42 -0500 Subject: [PATCH 028/100] libkdcraw: fixup inputs and outputs --- pkgs/applications/kde/libkdcraw.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 383bd3b6703..70e3cb0e195 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -9,4 +9,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ libraw ]; + outputs = [ "out" "dev" ]; } From 2f3085cb8d57390eeea4b1864d43e04932f637d6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:51:53 -0500 Subject: [PATCH 029/100] libkexiv2: fixup inputs and outputs --- pkgs/applications/kde/libkexiv2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 816d4168967..8c8d244d6f6 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -9,4 +9,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ exiv2 ]; + outputs = [ "out" "dev" ]; } From 612a7bb45e55621aba900f3e65a4207d703fdb82 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:52:04 -0500 Subject: [PATCH 030/100] libkipi: fixup inputs and outputs --- pkgs/applications/kde/libkipi.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index 3a28d8c2e8c..c70d8407fc7 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -7,5 +7,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ]; + buildInputs = [ kconfig ki18n kservice kxmlgui ]; + outputs = [ "out" "dev" ]; } From 668b0aa1a8d575b40f37c9779c63e43da6021711 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 08:52:16 -0500 Subject: [PATCH 031/100] spectacle: fixup inputs and outputs --- pkgs/applications/kde/spectacle.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 1be07fe6fe8..6deec6aaabb 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -11,10 +11,9 @@ mkDerivation { name = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ ki18n xcb-util-cursor ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications - kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras + buildInputs = [ + kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications + kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } From 47c74997a46e3c74916d668fab06902718672b44 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:28:45 -0500 Subject: [PATCH 032/100] kmbox: init at 17.04.0 --- pkgs/applications/kde/default.nix | 5 +++-- pkgs/applications/kde/kmbox.nix | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/kde/kmbox.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 90af8bf1611..1864605daf9 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -63,19 +63,20 @@ let gwenview = callPackage ./gwenview.nix {}; k3b = callPackage ./k3b.nix {}; kate = callPackage ./kate.nix {}; - kdenlive = callPackage ./kdenlive.nix {}; - kcalc = callPackage ./kcalc.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; + kcalc = callPackage ./kcalc.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; + kdenlive = callPackage ./kdenlive.nix {}; kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; kig = callPackage ./kig.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix new file mode 100644 index 00000000000..4b6b72a3734 --- /dev/null +++ b/pkgs/applications/kde/kmbox.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kmime, qtbase, +}: + +mkDerivation { + name = "kmbox"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kmime qtbase ]; + outputs = [ "out" "dev" ]; +} From 0d21d80618a5f03c4b02a0459d2d09c4ab7aae4c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:29:48 -0500 Subject: [PATCH 033/100] kmailtransport: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kmailtransport.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/kde/kmailtransport.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 1864605daf9..718ac70c80b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -76,6 +76,7 @@ let khelpcenter = callPackage ./khelpcenter.nix {}; kig = callPackage ./kig.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kmailtransport = callPackage ./kmailtransport.nix {}; kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix new file mode 100644 index 00000000000..19ce2ba94f3 --- /dev/null +++ b/pkgs/applications/kde/kmailtransport.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, +}: + +mkDerivation { + name = "kmailtransport"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ akonadi kcmutils ki18n kio ]; + propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; + outputs = [ "out" "dev" ]; +} From 4caf71456c63ea957a53f9fda8e7c1966ae2def9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:30:24 -0500 Subject: [PATCH 034/100] kcalcore: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kcalcore.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/applications/kde/kcalcore.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 718ac70c80b..5cff7241c9b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -65,6 +65,7 @@ let kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; kcalc = callPackage ./kcalc.nix {}; + kcalcore = callPackage ./kcalcore.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; diff --git a/pkgs/applications/kde/kcalcore.nix b/pkgs/applications/kde/kcalcore.nix new file mode 100644 index 00000000000..4ac9c9b925a --- /dev/null +++ b/pkgs/applications/kde/kcalcore.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kdelibs4support, libical +}: + +mkDerivation { + name = "kcalcore"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kdelibs4support libical ]; + outputs = [ "out" "dev" ]; +} From a40f04d8dc05a8a4f8934c76fb09a7718cfca59d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:30:51 -0500 Subject: [PATCH 035/100] kpimtextedit: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kpimtextedit.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/kde/kpimtextedit.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5cff7241c9b..062a2b03b09 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -84,6 +84,7 @@ let kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; + kpimtextedit = callPackage ./kpimtextedit.nix {}; krfb = callPackage ./krfb.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libkcddb = callPackage ./libkcddb.nix {}; diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix new file mode 100644 index 00000000000..17c960d1762 --- /dev/null +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, +}: + +mkDerivation { + name = "kpimtextedit"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin + sonnet syntax-highlighting qttools + ]; + propagatedBuildInputs = [ ktextwidgets ]; + outputs = [ "out" "dev" ]; +} From 0601524c047a68914e65021e94ca8ca0e96a935a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:31:14 -0500 Subject: [PATCH 036/100] kontactinterface: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kontactinterface.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/kde/kontactinterface.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 062a2b03b09..ae2edf3bf61 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -84,6 +84,7 @@ let kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; + kontactinterface = callPackage ./kontactinterface.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; krfb = callPackage ./krfb.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix new file mode 100644 index 00000000000..f2df628f301 --- /dev/null +++ b/pkgs/applications/kde/kontactinterface.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kiconthemes, kparts, kwindowsystem, kxmlgui +}: + +mkDerivation { + name = "kontactinterface"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kiconthemes kparts kwindowsystem kxmlgui + ]; +} From 2d60e62d3676d2c65970ab384505026b4f6132d6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:31:45 -0500 Subject: [PATCH 037/100] kldap: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kldap.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/kde/kldap.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index ae2edf3bf61..52b612095ef 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -77,6 +77,7 @@ let khelpcenter = callPackage ./khelpcenter.nix {}; kig = callPackage ./kig.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kldap = callPackage ./kldap.nix {}; kmailtransport = callPackage ./kmailtransport.nix {}; kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix new file mode 100644 index 00000000000..14a8aea5e67 --- /dev/null +++ b/pkgs/applications/kde/kldap.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + cyrus_sasl, ki18n, kio, kmbox, openldap +}: + +mkDerivation { + name = "kldap"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n kio kmbox ]; + propagatedBuildInputs = [ cyrus_sasl openldap ]; + outputs = [ "out" "dev" ]; +} From a5dd08bb8fa04462f9b96fefe468228722cb1088 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:32:18 -0500 Subject: [PATCH 038/100] libkdepim: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/libkdepim.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/kde/libkdepim.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 52b612095ef..5c62edd6cdb 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -91,6 +91,7 @@ let kwalletmanager = callPackage ./kwalletmanager.nix {}; libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; + libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix new file mode 100644 index 00000000000..92716e40a34 --- /dev/null +++ b/pkgs/applications/kde/libkdepim.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, akonadi-search, kcmutils, kcodecs, kcompletion, + kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, kitemviews, kjobwidgets, + kldap, kwallet, +}: + +mkDerivation { + name = "libkdepim"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-contacts akonadi-search kcmutils kcodecs kcompletion + kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap + kwallet + ]; +} From 5417bb6b814c18da1427b4aea4e651be2d6a98d0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:32:38 -0500 Subject: [PATCH 039/100] libkleo: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/libkleo.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/kde/libkleo.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5c62edd6cdb..37769d24a1a 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -94,6 +94,7 @@ let libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; + libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; marble = callPackage ./marble.nix {}; okteta = callPackage ./okteta.nix {}; diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix new file mode 100644 index 00000000000..0958a0e605f --- /dev/null +++ b/pkgs/applications/kde/libkleo.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + boost, qgpgme, kcodecs, kcompletion, kconfig, kcoreaddons, ki18n, kitemmodels, + kpimtextedit, kwidgetsaddons, kwindowsystem +}: + +mkDerivation { + name = "libkleo"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + boost kcodecs kcompletion kconfig kcoreaddons ki18n kitemmodels + kpimtextedit kwidgetsaddons kwindowsystem + ]; + propagatedBuildInputs = [ qgpgme ]; + outputs = [ "out" "dev" ]; +} From 8c36d47804666e90b62c427dab53dcd0eaca753c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:33:11 -0500 Subject: [PATCH 040/100] kidentitymanagement: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kidentitymanagement.nix | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/kidentitymanagement.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 37769d24a1a..2afb85615de 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -75,6 +75,7 @@ let kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; + kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix new file mode 100644 index 00000000000..92fcc238779 --- /dev/null +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcompletion, kcoreaddons, kemoticons, kiconthemes, kio, kpimtextedit, + ktextwidgets, kxmlgui +}: + +mkDerivation { + name = "kidentitymanagement"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kemoticons kiconthemes kio ktextwidgets kxmlgui + ]; + propagatedBuildInputs = [ kcoreaddons kpimtextedit ]; + outputs = [ "out" "dev" ]; +} From 9e4cf7e36b0d4ecfcdb757d661de7e7a82d3a050 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:33:33 -0500 Subject: [PATCH 041/100] kcalutils: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kcalutils.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/kcalutils.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 2afb85615de..3d11bdb6359 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -66,6 +66,7 @@ let kcachegrind = callPackage ./kcachegrind.nix {}; kcalc = callPackage ./kcalc.nix {}; kcalcore = callPackage ./kcalcore.nix {}; + kcalutils = callPackage ./kcalutils.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix new file mode 100644 index 00000000000..3f6821e08ea --- /dev/null +++ b/pkgs/applications/kde/kcalutils.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, + kidentitymanagement, kpimtextedit, +}: + +mkDerivation { + name = "kcalutils"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support + kidentitymanagement kpimtextedit + ]; + outputs = [ "out" "dev" ]; +} From 2dfa7a0af2965084eb4cd78beb0d2c2c98d04294 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:33:55 -0500 Subject: [PATCH 042/100] grantleetheme: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/grantleetheme.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/kde/grantleetheme.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 3d11bdb6359..28fba34baa4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -60,6 +60,7 @@ let dolphin-plugins = callPackage ./dolphin-plugins.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; + grantleetheme = callPackage ./grantleetheme.nix {}; gwenview = callPackage ./gwenview.nix {}; k3b = callPackage ./k3b.nix {}; kate = callPackage ./kate.nix {}; diff --git a/pkgs/applications/kde/grantleetheme.nix b/pkgs/applications/kde/grantleetheme.nix new file mode 100644 index 00000000000..9555e153a30 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, +}: + +mkDerivation { + name = "grantleetheme"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase + ]; + output = [ "out" "dev" ]; +} From a731f3f82442a3c83b2d7b9efbf30e1a106bd9f5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:34:19 -0500 Subject: [PATCH 043/100] pimcommon: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/pimcommon.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/kde/pimcommon.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 28fba34baa4..31ccac2bbbe 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -102,6 +102,7 @@ let marble = callPackage ./marble.nix {}; okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; + pimcommon = callPackage ./pimcommon.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix new file mode 100644 index 00000000000..02e9a47274b --- /dev/null +++ b/pkgs/applications/kde/pimcommon.nix @@ -0,0 +1,26 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, + kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin, + kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, + kwallet, kwindowsystem, libkdepim, qtwebengine +}: + +mkDerivation { + name = "pimcommon"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit + kwallet kwindowsystem libkdepim qtwebengine + ]; + propagatedBuildInputs = [ + akonadi akonadi-contacts kconfig kcontacts kimap + ]; + outputs = [ "out" "dev" ]; +} From e95b0be376a0c992cf3547ea4654e89b82a990ff Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:34:43 -0500 Subject: [PATCH 044/100] libgravatar: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/libgravatar.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/kde/libgravatar.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 31ccac2bbbe..b71b7661f00 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -92,6 +92,7 @@ let kpimtextedit = callPackage ./kpimtextedit.nix {}; krfb = callPackage ./krfb.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; + libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; libkdepim = callPackage ./libkdepim.nix {}; diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix new file mode 100644 index 00000000000..69a1b9e99cb --- /dev/null +++ b/pkgs/applications/kde/libgravatar.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kconfig, kio, ktextwidgets, kwidgetsaddons, pimcommon +}: + +mkDerivation { + name = "libgravatar"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + kconfig kio ktextwidgets kwidgetsaddons pimcommon + ]; + outputs = [ "out" "dev" ]; +} From 2b2a98f9d0e59a4ff251523b58a943cdaeb94c84 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:35:06 -0500 Subject: [PATCH 045/100] messagelib: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/messagelib.nix | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/kde/messagelib.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index b71b7661f00..487d5bcb0d5 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -101,6 +101,7 @@ let libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; marble = callPackage ./marble.nix {}; + messagelib = callPackage ./messagelib.nix {}; okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix new file mode 100644 index 00000000000..f12158a1f71 --- /dev/null +++ b/pkgs/applications/kde/messagelib.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5, + grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, + kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, + kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, + pimcommon, qtwebengine, qtwebkit, syntax-highlighting +}: + +mkDerivation { + name = "messagelib"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs + kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap + kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit + syntax-highlighting + ]; + propagatedBuildInputs = [ + akonadi akonadi-mime kcontacts kidentitymanagement kmime libkleo pimcommon + qtwebengine + ]; + outputs = [ "out" "dev" ]; +} From 16675033bbcbf0be13a06acb830e6cd8ab0d153b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:35:26 -0500 Subject: [PATCH 046/100] mailimporter: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/mailimporter.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/kde/mailimporter.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 487d5bcb0d5..dc549ecb376 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -100,6 +100,7 @@ let libkipi = callPackage ./libkipi.nix {}; libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; messagelib = callPackage ./messagelib.nix {}; okteta = callPackage ./okteta.nix {}; diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix new file mode 100644 index 00000000000..f002ff0f340 --- /dev/null +++ b/pkgs/applications/kde/mailimporter.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n, + kmime, kxmlgui, libkdepim +}: + +mkDerivation { + name = "mailimporter"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime + kxmlgui libkdepim + ]; +} From 1e5a96ea1a5ecf6fb91d0db6a5a0fcfd2b609e9b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:35:46 -0500 Subject: [PATCH 047/100] mailcommon: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/mailcommon.nix | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/kde/mailcommon.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index dc549ecb376..5b23a32a5fa 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -100,6 +100,7 @@ let libkipi = callPackage ./libkipi.nix {}; libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; messagelib = callPackage ./messagelib.nix {}; diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix new file mode 100644 index 00000000000..ee958d701b3 --- /dev/null +++ b/pkgs/applications/kde/mailcommon.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets, + kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap, + kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, +}: + +mkDerivation { + name = "mailcommon"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons + kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport + kwindowsystem mailimporter messagelib phonon + ]; + outputs = [ "out" "dev" ]; +} From 4e88274bf3d99ad9bf665082759e7cb9cdf4f3e1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:36:05 -0500 Subject: [PATCH 048/100] libksieve: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/libksieve.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/kde/libksieve.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5b23a32a5fa..bb04f44d28c 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -100,6 +100,7 @@ let libkipi = callPackage ./libkipi.nix {}; libkleo = callPackage ./libkleo.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + libksieve = callPackage ./libksieve.nix {}; mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix new file mode 100644 index 00000000000..dd33f759c31 --- /dev/null +++ b/pkgs/applications/kde/libksieve.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, karchive, kcompletion, kiconthemes, kidentitymanagement, kio, + kmailtransport, knewstuff, kwindowsystem, kxmlgui, libkdepim, pimcommon, + qtwebengine, syntax-highlighting, +}: + +mkDerivation { + name = "libksieve"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi karchive kcompletion kiconthemes kidentitymanagement kio + kmailtransport knewstuff kwindowsystem kxmlgui libkdepim pimcommon + qtwebengine + ]; + propagatedBuildInputs = [ syntax-highlighting ]; +} From 551604e0456f680775b482cd0cd72d924a4399e5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:36:20 -0500 Subject: [PATCH 049/100] ktnef: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/ktnef.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/kde/ktnef.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index bb04f44d28c..f6662d08d3d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -91,6 +91,7 @@ let kontactinterface = callPackage ./kontactinterface.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; krfb = callPackage ./krfb.nix {}; + ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix new file mode 100644 index 00000000000..b5a3834869d --- /dev/null +++ b/pkgs/applications/kde/ktnef.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcalcore, kcalutils, kcontacts, kdelibs4support +}: + +mkDerivation { + name = "ktnef"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + kcalcore kcalutils kcontacts kdelibs4support + ]; + outputs = [ "out" "dev" ]; +} From 2dd147c9a789099db9a1352150e1a2fa27d7fd74 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:36:38 -0500 Subject: [PATCH 050/100] kimap: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kimap.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/kde/kimap.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f6662d08d3d..0db8df42805 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -79,6 +79,7 @@ let khelpcenter = callPackage ./khelpcenter.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; + kimap = callPackage ./kimap.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; kmailtransport = callPackage ./kmailtransport.nix {}; diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix new file mode 100644 index 00000000000..9e42c571058 --- /dev/null +++ b/pkgs/applications/kde/kimap.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + cyrus_sasl, kcoreaddons, ki18n, kio, kmime +}: + +mkDerivation { + name = "kimap"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n kio ]; + propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ]; + outputs = [ "out" "dev" ]; +} From 59c0f98a4cbca8170cb9b4de10da9dab00151ecb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:37:10 -0500 Subject: [PATCH 051/100] akonadi-search: init at 17.04.0 --- pkgs/applications/kde/akonadi-search.nix | 20 ++++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/akonadi-search.nix diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix new file mode 100644 index 00000000000..617c086ad9c --- /dev/null +++ b/pkgs/applications/kde/akonadi-search.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime, + krunner, qtbase, xapian +}: + +mkDerivation { + name = "akonadi-search"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcmutils krunner xapian ]; + propagatedBuildInputs = [ + akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0db8df42805..b4dcb341a3a 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -54,6 +54,7 @@ let akonadi = callPackage ./akonadi {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; + akonadi-search = callPackage ./akonadi-search.nix {}; ark = callPackage ./ark/default.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; dolphin = callPackage ./dolphin.nix {}; From 8d26f93e8ceb0b7105b20defd057235fa857d6e5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:37:29 -0500 Subject: [PATCH 052/100] akonadi-notes: init at 17.04.0 --- pkgs/applications/kde/akonadi-notes.nix | 18 ++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/kde/akonadi-notes.nix diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix new file mode 100644 index 00000000000..72c4d799239 --- /dev/null +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, kcompletion, ki18n, kitemmodels, kmime, kxmlgui +}: + +mkDerivation { + name = "akonadi-notes"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi kcompletion ki18n kitemmodels kmime kxmlgui + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index b4dcb341a3a..d4772fa7176 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -54,6 +54,7 @@ let akonadi = callPackage ./akonadi {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; + akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; ark = callPackage ./ark/default.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; From fa8d2401880c6b8185891005a9ea9b99dafaaef8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 9 May 2017 18:37:41 -0500 Subject: [PATCH 053/100] kmail: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kmail.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/kde/kmail.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d4772fa7176..2a2cad01225 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -84,6 +84,7 @@ let kimap = callPackage ./kimap.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; + kmail = callPackage ./kmail.nix {}; kmailtransport = callPackage ./kmailtransport.nix {}; kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix new file mode 100644 index 00000000000..ec8c9892779 --- /dev/null +++ b/pkgs/applications/kde/kmail.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, + kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, + kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, + kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, + kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, + kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, + messagelib, pim-sieve-editor, qtscript, qtwebengine, +}: + +mkDerivation { + name = "kmail"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig + kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n + kiconthemes kinit kio kldap kmail-account-wizard kmailtransport + knotifications knotifyconfig kontactinterface kparts kpty kservice + ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar + libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine + ]; + propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 372d346aeec..a53c411753a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14841,8 +14841,8 @@ with pkgs; inherit (kdeApplications) akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive - kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix - kolourpaint kompare konsole krfb kwalletmanager marble okteta okular + kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmail + kmix kolourpaint kompare konsole krfb kwalletmanager marble okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; From 828124b4201483bcbf84216ea2d32636eac645c9 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Tue, 18 Apr 2017 09:40:22 +0200 Subject: [PATCH 054/100] grantleetheme: check for a null pointer --- pkgs/applications/kde/grantleetheme.nix | 4 ++- .../kde/grantleetheme_check_null.patch | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/grantleetheme_check_null.patch diff --git a/pkgs/applications/kde/grantleetheme.nix b/pkgs/applications/kde/grantleetheme.nix index 9555e153a30..976ccbe28ce 100644 --- a/pkgs/applications/kde/grantleetheme.nix +++ b/pkgs/applications/kde/grantleetheme.nix @@ -10,9 +10,11 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + output = [ "out" "dev" ]; + patches = [ ./grantleetheme_check_null.patch ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase ]; - output = [ "out" "dev" ]; + propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ]; } diff --git a/pkgs/applications/kde/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme_check_null.patch new file mode 100644 index 00000000000..730d5b0fe26 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme_check_null.patch @@ -0,0 +1,25 @@ +diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp +index b86fc3a..8af72f4 100644 +--- a/src/grantleetheme.cpp ++++ b/src/grantleetheme.cpp +@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason, + Grantlee::Context ctx = createContext(); + ctx.insert(QStringLiteral("error"), reason); + ctx.insert(QStringLiteral("templateName"), origTemplateName); +- ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString()); ++ const QString errorString = failedTemplate ++ ? failedTemplate->errorString() ++ : QStringLiteral("(null template)"); ++ ctx.insert(QStringLiteral("errorMessage"), errorString); + return tpl->render(&ctx); + } + +@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con + } + + Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine); +- if (tpl->error()) { ++ if (!tpl || tpl->error()) { + return d->errorTemplate(i18n("Template parsing error"), templateName, tpl); + } + From 126da861bebd1549c0736cd8e62aed0fe7dbc958 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 22 May 2017 12:30:11 -0500 Subject: [PATCH 055/100] kmail-account-wizard: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + .../applications/kde/kmail-account-wizard.nix | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/kde/kmail-account-wizard.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 2a2cad01225..8501fe3e988 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -85,6 +85,7 @@ let kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; kmail = callPackage ./kmail.nix {}; + kmail-account-wizard = callPackage ./kmail-account-wizard.nix {}; kmailtransport = callPackage ./kmailtransport.nix {}; kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix new file mode 100644 index 00000000000..9f3d5e2ea01 --- /dev/null +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, shared_mime_info, + akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, + kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, + kwallet, libkdepim, libkleo, pimcommon, qttools, +}: + +mkDerivation { + name = "kmail-account-wizard"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + buildInputs = [ + akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport + knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim + libkleo pimcommon qttools + ]; +} From cf2d844cc2edd60d1b215f12626895983c58c7aa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 22 May 2017 12:30:34 -0500 Subject: [PATCH 056/100] mbox-importer: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/mbox-importer.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/mbox-importer.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8501fe3e988..500f6017fae 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -110,6 +110,7 @@ let mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; + mbox-importer = callPackage ./mbox-importer.nix {}; messagelib = callPackage ./messagelib.nix {}; okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix new file mode 100644 index 00000000000..aa637d440bd --- /dev/null +++ b/pkgs/applications/kde/mbox-importer.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-search, kconfig, kservice, kio, mailcommon, mailimporter, messagelib +}: + +mkDerivation { + name = "mbox-importer"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib + ]; + preHook = '' + set -x + ''; +} From 6caaa1fc480d0cf139a274ec2ad93e57d1bbdc20 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 22 May 2017 12:30:55 -0500 Subject: [PATCH 057/100] pim-sieve-editor: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/pim-sieve-editor.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/kde/pim-sieve-editor.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 500f6017fae..ed2aefd77b7 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -115,6 +115,7 @@ let okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; + pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix new file mode 100644 index 00000000000..c83df2e0e49 --- /dev/null +++ b/pkgs/applications/kde/pim-sieve-editor.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit, + kmailtransport, pimcommon, libksieve +}: + +mkDerivation { + name = "pim-sieve-editor"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport + pimcommon libksieve + ]; +} From 463569f763023188b5cf6bc22cbbfb39faee2dc8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 11:00:43 -0500 Subject: [PATCH 058/100] kdav: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kdav.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/applications/kde/kdav.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index ed2aefd77b7..5ded354e9e5 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -72,6 +72,7 @@ let kcalutils = callPackage ./kcalutils.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; + kdav = callPackage ./kdav.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/applications/kde/kdav.nix new file mode 100644 index 00000000000..800c92511de --- /dev/null +++ b/pkgs/applications/kde/kdav.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kcoreaddons, kio, qtxmlpatterns, +}: + +mkDerivation { + name = "kdav"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kio qtxmlpatterns ]; + outputs = [ "out" "dev" ]; +} From 7872516b99ebfb28d3762ce12bf47d029860f4c6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 11:11:21 -0500 Subject: [PATCH 059/100] kholidays: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kholidays.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/applications/kde/kholidays.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5ded354e9e5..57f2ee3887b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -80,6 +80,7 @@ let kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; + kholidays = callPackage ./kholidays.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/applications/kde/kholidays.nix new file mode 100644 index 00000000000..352bec09492 --- /dev/null +++ b/pkgs/applications/kde/kholidays.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtbase, qtdeclarative, qttools, +}: + +mkDerivation { + name = "kholidays"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtbase qtdeclarative qttools ]; + outputs = [ "out" "dev" ]; +} From 87588ff4831e05e178bf4c82fc9d0d874f7941e2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 11:11:49 -0500 Subject: [PATCH 060/100] kalarmcal: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kalarmcal.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/kde/kalarmcal.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 57f2ee3887b..89ca6fe758e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -65,6 +65,7 @@ let grantleetheme = callPackage ./grantleetheme.nix {}; gwenview = callPackage ./gwenview.nix {}; k3b = callPackage ./k3b.nix {}; + kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; kcalc = callPackage ./kcalc.nix {}; diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix new file mode 100644 index 00000000000..f2fb6f4d8bb --- /dev/null +++ b/pkgs/applications/kde/kalarmcal.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, + kpimtextedit, +}: + +mkDerivation { + name = "kalarmcal"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit + ]; + outputs = [ "out" "dev" ]; +} From 5e860b04610fa1e766929d11807fdd20b6fbe18d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 11:37:46 -0500 Subject: [PATCH 061/100] akonadi-calendar: init at 17.04.0 --- pkgs/applications/kde/akonadi-calendar.nix | 20 ++++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/akonadi-calendar.nix diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix new file mode 100644 index 00000000000..ce6b6f75f93 --- /dev/null +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts, + kidentitymanagement, kio, kmailtransport, +}: + +mkDerivation { + name = "akonadi-calendar"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement + kio kmailtransport + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 89ca6fe758e..342574cd2db 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -52,6 +52,7 @@ let in { kdelibs = callPackage ./kdelibs { inherit attica phonon; }; akonadi = callPackage ./akonadi {}; + akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; From d47e75a4604d80d42915c689a8a139cbf7280ebf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 11:41:07 -0500 Subject: [PATCH 062/100] kdepim-runtime: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kdepim-runtime.nix | 25 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/kde/kdepim-runtime.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 342574cd2db..9f056e3c6cd 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -79,6 +79,7 @@ let kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime.nix {}; kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix new file mode 100644 index 00000000000..01683a6315c --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + shared_mime_info, + akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, + kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, + kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, + qtwebengine, +}: + +mkDerivation { + name = "kdepim-runtime"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + buildInputs = [ + akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes + kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap + kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + ]; + # Attempts to build some files before dependencies have been generated + enableParallelBuilding = false; +} From f3324a806a2e9e68f7cb86bed07471e7bbe4035a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 13:04:13 -0500 Subject: [PATCH 063/100] ark: do not callPackage default.nix directly --- pkgs/applications/kde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 9f056e3c6cd..11e4da36638 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -57,7 +57,7 @@ let akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; - ark = callPackage ./ark/default.nix {}; + ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; From 4e799eb5bd2ac7ea7bc0477712674b4f6781688a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 13:35:24 -0500 Subject: [PATCH 064/100] calendarsupport: init at 17.04.0 --- pkgs/applications/kde/calendarsupport.nix | 20 ++++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/calendarsupport.nix diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix new file mode 100644 index 00000000000..485397ec4aa --- /dev/null +++ b/pkgs/applications/kde/calendarsupport.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs, + kholidays, kidentitymanagement, kmime, pimcommon, qttools, +}: + +mkDerivation { + name = "calendarsupport"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime kcalutils kdepim-apps-libs 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 11e4da36638..fd9deedbddf 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -59,6 +59,7 @@ let akonadi-search = callPackage ./akonadi-search.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; + calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; From d5468a51fb5afb3c812d8cf8abf950b85d2454ce Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 13:35:34 -0500 Subject: [PATCH 065/100] akonadiconsole: init at 17.04.0 --- pkgs/applications/kde/akonadiconsole.nix | 21 +++++++++++++++++++++ pkgs/applications/kde/default.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/kde/akonadiconsole.nix diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix new file mode 100644 index 00000000000..844cbc7d17f --- /dev/null +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion, + kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, + ktextwidgets, kxmlgui, messagelib, qtbase, +}: + +mkDerivation { + name = "akonadiconsole"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets + kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui + messagelib qtbase + ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index fd9deedbddf..d98c3cf3e56 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -57,6 +57,7 @@ let akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; + akonadiconsole = callPackage ./akonadiconsole.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; From 71827091742d065d24498f3f5736cf58c31dea4f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 May 2017 16:20:11 -0500 Subject: [PATCH 066/100] grantlee: search profile library paths for plugins --- .../grantlee/{5.x.nix => 5/default.nix} | 8 +++++--- .../grantlee/5/grantlee-nix-profiles.patch | 19 +++++++++++++++++++ pkgs/development/libraries/grantlee/5/series | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) rename pkgs/development/libraries/grantlee/{5.x.nix => 5/default.nix} (81%) create mode 100644 pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch create mode 100644 pkgs/development/libraries/grantlee/5/series diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5/default.nix similarity index 81% rename from pkgs/development/libraries/grantlee/5.x.nix rename to pkgs/development/libraries/grantlee/5/default.nix index fb6af9c895d..7025877c847 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtscript, cmake }: +{ stdenv, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: stdenv.mkDerivation rec { name = "grantlee-${version}"; @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { name = "${name}.tar.gz"; }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { description = "Qt5 port of Django template system"; longDescription = '' Grantlee is a plugin based String Template system written using the Qt @@ -25,7 +27,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ ]; + maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch new file mode 100644 index 00000000000..f6c13dbd6d5 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch @@ -0,0 +1,19 @@ +Index: grantlee-5.1.0/templates/lib/engine.cpp +=================================================================== +--- grantlee-5.1.0.orig/templates/lib/engine.cpp ++++ grantlee-5.1.0/templates/lib/engine.cpp +@@ -48,6 +48,14 @@ Engine::Engine(QObject *parent) + + d_ptr->m_pluginDirs = QCoreApplication::instance()->libraryPaths(); + d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH); ++ ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ d_ptr->m_pluginDirs << (QFile::decodeName(profile) + QStringLiteral("/lib")); ++ } ++ } + } + + Engine::~Engine() diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series new file mode 100644 index 00000000000..16f04d44562 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/series @@ -0,0 +1 @@ +grantlee-nix-profiles.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a53c411753a..811d5f1745c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9979,7 +9979,7 @@ with pkgs; qgpgme = callPackage ../development/libraries/gpgme { }; - grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; + grantlee = callPackage ../development/libraries/grantlee/5 { }; inherit (callPackage ../development/libraries/kirigami { }) kirigami_1 From 7640cae5b04c88d8b8b97a628a0f10fd7cecffef Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Fri, 7 Apr 2017 20:06:26 +0200 Subject: [PATCH 067/100] akregator: init at 17.04.0 --- pkgs/applications/kde/akregator.nix | 30 +++++++++++++++++++++++++++ pkgs/applications/kde/default.nix | 2 ++ pkgs/applications/kde/syndication.nix | 15 ++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/applications/kde/akregator.nix create mode 100644 pkgs/applications/kde/syndication.nix diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix new file mode 100644 index 00000000000..98d53bc8083 --- /dev/null +++ b/pkgs/applications/kde/akregator.nix @@ -0,0 +1,30 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtwebengine, + grantlee, + kcmutils, kcrash, kiconthemes, knotifyconfig, kparts, ktexteditor, + kwindowsystem, + akonadi, akonadi-mime, grantleetheme, kontactinterface, libkdepim, libkleo, + messagelib, syndication +}: + +mkDerivation { + name = "akregator"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + qtwebengine + + grantlee + + kcmutils kcrash kiconthemes knotifyconfig kparts ktexteditor kwindowsystem + + akonadi akonadi-mime grantleetheme kontactinterface libkdepim libkleo + messagelib syndication + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d98c3cf3e56..c7e43f5820d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -58,6 +58,7 @@ let akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; akonadiconsole = callPackage ./akonadiconsole.nix {}; + akregator = callPackage ./akregator.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; @@ -125,6 +126,7 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; + syndication = callPackage ./syndication.nix {}; l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; }); }; diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix new file mode 100644 index 00000000000..43a4ea005bd --- /dev/null +++ b/pkgs/applications/kde/syndication.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + kio +}: + +mkDerivation { + name = "syndication"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kio ]; +} From 4b032f12eaf2167694098b2ae312dc508635a889 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 22 May 2017 12:36:13 -0500 Subject: [PATCH 068/100] kdepim-apps-libs: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + .../kde/kdepim-apps-libs/default.nix | 21 +++++++ ...-apps-libs-grantlee-merge-theme-dirs.patch | 62 +++++++++++++++++++ pkgs/applications/kde/kdepim-apps-libs/series | 1 + 4 files changed, 85 insertions(+) create mode 100644 pkgs/applications/kde/kdepim-apps-libs/default.nix create mode 100644 pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch create mode 100644 pkgs/applications/kde/kdepim-apps-libs/series diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c7e43f5820d..8af03708774 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -83,6 +83,7 @@ let kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix new file mode 100644 index 00000000000..6189e8706db --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, + kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, +}: + +mkDerivation { + name = "kdepim-apps-libs"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + 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/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch new file mode 100644 index 00000000000..02c369cc4ee --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch @@ -0,0 +1,62 @@ +Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp +=================================================================== +--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp ++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp +@@ -50,9 +50,9 @@ public: + mTemplateLoader.clear(); + } + +- void changeGrantleePath(const QString &path) ++ void changeGrantleePath(const QStringList &paths) + { +- mTemplateLoader->setTemplateDirs(QStringList() << path); ++ mTemplateLoader->setTemplateDirs(paths); + mEngine->addTemplateLoader(mTemplateLoader); + + mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html")); +@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee + + void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path) + { +- d->changeGrantleePath(path); ++ d->changeGrantleePath(QStringList(path)); + } + + void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) + { +- d->changeGrantleePath(theme.absolutePath()); ++ d->changeGrantleePath(theme.absolutePaths()); + } + + inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value) +Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp +=================================================================== +--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp ++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp +@@ -74,9 +74,9 @@ public: + mTemplateLoader.clear(); + } + +- void changeGrantleePath(const QString &path) ++ void changeGrantleePath(const QStringList &paths) + { +- mTemplateLoader->setTemplateDirs(QStringList() << path); ++ mTemplateLoader->setTemplateDirs(paths); + mEngine->addTemplateLoader(mTemplateLoader); + + mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html")); +@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta + + void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path) + { +- d->changeGrantleePath(path); ++ d->changeGrantleePath(QStringList(path)); + } + + void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) + { +- d->changeGrantleePath(theme.absolutePath()); ++ d->changeGrantleePath(theme.absolutePaths()); + } + + void GrantleeContactFormatter::setForceDisableQRCode(bool b) diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series new file mode 100644 index 00000000000..1e8a52b55e9 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/series @@ -0,0 +1 @@ +kdepim-apps-libs-grantlee-merge-theme-dirs.patch From e6b42d7403cc0802c1264952fb19044eba8475e8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 11:00:47 -0500 Subject: [PATCH 069/100] grantleetheme: merge themes across multiple prefixes --- pkgs/applications/kde/default.nix | 2 +- .../default.nix} | 2 +- .../grantlee-merge-theme-dirs.patch | 166 ++++++++++++++++++ .../grantleetheme_check_null.patch | 0 pkgs/applications/kde/grantleetheme/series | 2 + 5 files changed, 170 insertions(+), 2 deletions(-) rename pkgs/applications/kde/{grantleetheme.nix => grantleetheme/default.nix} (89%) create mode 100644 pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch rename pkgs/applications/kde/{ => grantleetheme}/grantleetheme_check_null.patch (100%) create mode 100644 pkgs/applications/kde/grantleetheme/series diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8af03708774..a5504a2813f 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -66,7 +66,7 @@ let dolphin-plugins = callPackage ./dolphin-plugins.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; - grantleetheme = callPackage ./grantleetheme.nix {}; + grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; k3b = callPackage ./k3b.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; diff --git a/pkgs/applications/kde/grantleetheme.nix b/pkgs/applications/kde/grantleetheme/default.nix similarity index 89% rename from pkgs/applications/kde/grantleetheme.nix rename to pkgs/applications/kde/grantleetheme/default.nix index 976ccbe28ce..5035685c64f 100644 --- a/pkgs/applications/kde/grantleetheme.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -11,7 +11,7 @@ mkDerivation { maintainers = kdepimTeam; }; output = [ "out" "dev" ]; - patches = [ ./grantleetheme_check_null.patch ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch new file mode 100644 index 00000000000..76b65a44475 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -0,0 +1,166 @@ +Index: grantleetheme-17.04.0/src/grantleetheme_p.h +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleetheme_p.h ++++ grantleetheme-17.04.0/src/grantleetheme_p.h +@@ -47,7 +47,7 @@ public: + QString description; + QString name; + QString dirName; +- QString absolutePath; ++ QStringList absolutePaths; + QString author; + QString email; + +Index: grantleetheme-17.04.0/src/grantleetheme.cpp +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleetheme.cpp ++++ grantleetheme-17.04.0/src/grantleetheme.cpp +@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr + , description(other.description) + , name(other.name) + , dirName(other.dirName) +- , absolutePath(other.absolutePath) ++ , absolutePaths(other.absolutePaths) + , author(other.author) + , email(other.email) + , loader(other.loader) +@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine() + + void ThemePrivate::setupLoader() + { +- // Get the parent dir with themes, we set the theme directory separately +- QDir dir(absolutePath); +- dir.cdUp(); ++ QStringList templateDirs; ++ for (const QString& path : absolutePaths) { ++ QDir dir(path); ++ dir.cdUp(); ++ templateDirs << dir.absolutePath(); ++ } + + loader = QSharedPointer::create(); +- loader->setTemplateDirs({ dir.absolutePath() }); ++ loader->setTemplateDirs(templateDirs); + loader->setTheme(dirName); + + if (!sEngine) { +@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons + Grantlee::Context ctx = createContext(); + ctx.insert(QStringLiteral("error"), reason); + ctx.insert(QStringLiteral("templateName"), origTemplateName); +- const QString errorString = failedTemplate +- ? failedTemplate->errorString() +- : QStringLiteral("(null template)"); ++ const QString errorString = failedTemplate->errorString(); + ctx.insert(QStringLiteral("errorMessage"), errorString); + return tpl->render(&ctx); + } +@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c + KConfigGroup group(&config, QStringLiteral("Desktop Entry")); + if (group.isValid()) { + d->dirName = dirName; +- d->absolutePath = themePath; ++ d->absolutePaths = QStringList(themePath); + d->name = group.readEntry("Name", QString()); + d->description = group.readEntry("Description", QString()); + d->themeFileName = group.readEntry("FileName", QString()); +@@ -141,7 +142,7 @@ Theme::~Theme() + + bool Theme::operator==(const Theme &other) const + { +- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); ++ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); + } + + Theme &Theme::operator=(const Theme &other) +@@ -185,7 +186,12 @@ QString Theme::dirName() const + + QString Theme::absolutePath() const + { +- return d->absolutePath; ++ return d->absolutePaths.first(); ++} ++ ++QStringList Theme::absolutePaths() const ++{ ++ return d->absolutePaths; + } + + QString Theme::author() const +@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem + return result; + } + ++void Theme::addThemeDir(const QString& path) ++{ ++ QDir dir(path); ++ dir.cdUp(); ++ d->absolutePaths << dir.absolutePath(); ++} ++ + void Theme::addPluginPath(const QString &path) + { + if (!ThemePrivate::sEngine) { +Index: grantleetheme-17.04.0/src/grantleetheme.h +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleetheme.h ++++ grantleetheme-17.04.0/src/grantleetheme.h +@@ -50,11 +50,14 @@ public: + QStringList displayExtraVariables() const; + QString dirName() const; + QString absolutePath() const; ++ QStringList absolutePaths() const; + QString author() const; + QString authorEmail() const; + + QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); + ++ void addThemeDir(const QString&); ++ + static void addPluginPath(const QString &path); + + private: +Index: grantleetheme-17.04.0/src/grantleethememanager.cpp +=================================================================== +--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp ++++ grantleetheme-17.04.0/src/grantleethememanager.cpp +@@ -142,25 +142,18 @@ public: + + for (const QString &directory : qAsConst(themesDirectories)) { + QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); +- QStringList alreadyLoadedThemeName; + while (dirIt.hasNext()) { + dirIt.next(); + const QString dirName = dirIt.fileName(); + GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + QString themeName = theme.name(); +- if (alreadyLoadedThemeName.contains(themeName)) { +- int i = 2; +- const QString originalName(theme.name()); +- while (alreadyLoadedThemeName.contains(themeName)) { +- themeName = originalName + QStringLiteral(" (%1)").arg(i); +- ++i; +- } +- theme.d->name = themeName; ++ QMap::iterator i = themes.find(dirName); ++ if (i != themes.end()) { ++ i.value().addThemeDir(dirIt.filePath()); ++ } else { ++ themes.insert(dirName, theme); + } +- alreadyLoadedThemeName << themeName; +- themes.insert(dirName, theme); +- //qDebug()<<" theme.name()"<addDir(directory); +@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con + GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + if (dirName == themeName) { +- return theme.absolutePath(); ++ return theme.absolutePaths().first(); + } + } + } diff --git a/pkgs/applications/kde/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch similarity index 100% rename from pkgs/applications/kde/grantleetheme_check_null.patch rename to pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series new file mode 100644 index 00000000000..5c38848de71 --- /dev/null +++ b/pkgs/applications/kde/grantleetheme/series @@ -0,0 +1,2 @@ +grantleetheme_check_null.patch +grantlee-merge-theme-dirs.patch From 58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 11:01:31 -0500 Subject: [PATCH 070/100] grantlee: don't canonicalize template paths --- .../5/grantlee-no-canonicalize-filepath.patch | 27 +++++++++++++++++++ pkgs/development/libraries/grantlee/5/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch new file mode 100644 index 00000000000..d78ef74ce35 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -0,0 +1,27 @@ +Index: grantlee-5.1.0/templates/lib/templateloader.cpp +=================================================================== +--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp ++++ grantlee-5.1.0/templates/lib/templateloader.cpp +@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB + + QLatin1Char('/') + fileName); + const QFileInfo fi(file); + +- if (file.exists() +- && !fi.canonicalFilePath().contains( +- QDir(d->m_templateDirs.at(i)).canonicalPath())) +- return Template(); + ++i; + } + +@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co + + QLatin1Char('/') + fileName); + + const QFileInfo fi(file); +- if (!fi.canonicalFilePath().contains( +- QDir(d->m_templateDirs.at(i)).canonicalPath())) { +- ++i; +- continue; +- } + + if (file.exists()) { + auto path = fi.absoluteFilePath(); diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 16f04d44562..9c4015a1c19 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1 +1,2 @@ grantlee-nix-profiles.patch +grantlee-no-canonicalize-filepath.patch From 60f56bac82c3ad11f10dfa20f6cd41012a38794b Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Fri, 7 Apr 2017 20:21:08 +0200 Subject: [PATCH 071/100] kleopatra: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kleopatra.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/kde/kleopatra.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a5504a2813f..947c8afdb73 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -93,6 +93,7 @@ let kimap = callPackage ./kimap.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; + kleopatra = callPackage ./kleopatra.nix {}; kmail = callPackage ./kmail.nix {}; kmail-account-wizard = callPackage ./kmail-account-wizard.nix {}; kmailtransport = callPackage ./kmailtransport.nix {}; diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix new file mode 100644 index 00000000000..a19fef9c9ed --- /dev/null +++ b/pkgs/applications/kde/kleopatra.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, + knotifications, kwindowsystem, kxmlgui, libkleo +}: + +mkDerivation { + name = "kleopatra"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime + knotifications kwindowsystem kxmlgui libkleo + ]; +} From 7fe86510c1fb8be35ae72dd1e1fb4ed0c37ff483 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Fri, 7 Apr 2017 20:54:27 +0200 Subject: [PATCH 072/100] kaddressbook: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kaddressbook.nix | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/kde/kaddressbook.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 947c8afdb73..a2b8868c5d6 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -69,6 +69,7 @@ let grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; k3b = callPackage ./k3b.nix {}; + kaddressbook = callPackage ./kaddressbook.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix new file mode 100644 index 00000000000..b4b0450e78b --- /dev/null +++ b/pkgs/applications/kde/kaddressbook.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, + kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, + kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison, + qgpgme, qtbase, +}: + +mkDerivation { + name = "kaddressbook"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash + kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit + kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase + ]; +} From 129413c4742623df72d449daf9174ff215dafd4c Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sat, 8 Apr 2017 01:18:27 +0200 Subject: [PATCH 073/100] kontact: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kontact.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/kde/kontact.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a2b8868c5d6..92b3af5834e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -104,6 +104,7 @@ let kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; + kontact = callPackage ./kontact.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; krfb = callPackage ./krfb.nix {}; diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix new file mode 100644 index 00000000000..4bbee9c3ffa --- /dev/null +++ b/pkgs/applications/kde/kontact.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtwebengine, + kcmutils, kcrash, kdbusaddons, kwindowsystem, + akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, + mailcommon, +}: + +mkDerivation { + name = "kontact"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + qtwebengine + kcmutils kcrash kdbusaddons kwindowsystem + akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit + mailcommon + ]; +} From b7493e13618e739a386f7a2d2f11db3ed8fb0118 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 12:55:10 -0500 Subject: [PATCH 074/100] kdiagram: init at 2.6.0 --- .../libraries/kdiagram/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/kdiagram/default.nix diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix new file mode 100644 index 00000000000..853f02f566a --- /dev/null +++ b/pkgs/development/libraries/kdiagram/default.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, fetchurl, lib, + extra-cmake-modules, qttools, + qtbase, qtsvg, +}: + +mkDerivation { + name = "kdiagram-2.6.0"; + src = fetchurl { + url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz"; + sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02"; + }; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + propagatedBuildInputs = [ qtbase qtsvg ]; + meta = { + shortDescription = "Libraries for creating business diagrams"; + license = lib.licenses.gpl2; + platforms = qtbase.meta.platforms; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 811d5f1745c..4b67fbe5107 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9985,6 +9985,8 @@ with pkgs; kirigami_1 kirigami_2; + kdiagram = callPackage ../development/libraries/kdiagram { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; From 3ca93ebb4ba5f69e6baaa24a804705388590a356 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 12:55:26 -0500 Subject: [PATCH 075/100] kqtquickcharts: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kqtquickcharts.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/applications/kde/kqtquickcharts.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 92b3af5834e..288f9c66a1d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -107,6 +107,7 @@ let kontact = callPackage ./kontact.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; + kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krfb = callPackage ./krfb.nix {}; ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix new file mode 100644 index 00000000000..2b3dc5313d9 --- /dev/null +++ b/pkgs/applications/kde/kqtquickcharts.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qtdeclarative, +}: + +mkDerivation { + name = "kqtquickcharts"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; +} From 95eee6b49ba94045d4ab3cb6b57ee28d96d94fc0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 12:55:42 -0500 Subject: [PATCH 076/100] eventviews: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/eventviews.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/kde/eventviews.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 288f9c66a1d..c0aaaed3e03 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -64,6 +64,7 @@ let calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + eventviews = callPackage ./eventviews.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; grantleetheme = callPackage ./grantleetheme {}; diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix new file mode 100644 index 00000000000..cc1e83f6581 --- /dev/null +++ b/pkgs/applications/kde/eventviews.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools, +}: + +mkDerivation { + name = "eventviews"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools + ]; + outputs = [ "out" "dev" ]; +} From c3101965d4681dc7e914559612a17232d0a7f141 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 13:00:02 -0500 Subject: [PATCH 077/100] incidenceeditor: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/incidenceeditor.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/kde/incidenceeditor.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c0aaaed3e03..f8a8ecd1c06 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -69,6 +69,7 @@ let filelight = callPackage ./filelight.nix {}; grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; + incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix new file mode 100644 index 00000000000..8224b98253b --- /dev/null +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, + kdiagram, kldap, kmime, qtbase, +}: + +mkDerivation { + name = "incidenceeditor"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram + kldap kmime qtbase + ]; + outputs = [ "out" "dev" ]; +} From 548f52c0a3b7861f2895843bf0c6de9111ec3985 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 12 May 2017 13:38:35 -0500 Subject: [PATCH 078/100] korganizer: init at 17.04.0 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/korganizer.nix | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/kde/korganizer.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f8a8ecd1c06..a9e11c7ba24 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -108,6 +108,7 @@ let konsole = callPackage ./konsole.nix {}; kontact = callPackage ./kontact.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; + korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; krfb = callPackage ./krfb.nix {}; diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix new file mode 100644 index 00000000000..2f37a1bac0f --- /dev/null +++ b/pkgs/applications/kde/korganizer.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + qtbase, qttools, + phonon, + knewstuff, + akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search, + calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs, + kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface, + kpimtextedit, pimcommon, +}: + +mkDerivation { + name = "korganizer"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + qtbase qttools + phonon + knewstuff + akonadi-calendar akonadi-contacts akonadi-notes akonadi-search + calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs + kholidays kidentitymanagement kldap kmailtransport kontactinterface + kpimtextedit pimcommon + ]; +} From 5a609e389a28915c949c4c37d304c6ebf52adbb2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 19 May 2017 09:16:26 -0500 Subject: [PATCH 079/100] grantlee5: multiple outputs --- .../libraries/grantlee/5/default.nix | 23 ++++++++++++++++--- .../libraries/grantlee/5/setup-hook.sh | 23 +++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/grantlee/5/setup-hook.sh diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 7025877c847..571ad98c38c 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,8 +1,10 @@ -{ stdenv, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: +{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "grantlee-${version}"; version = "5.1.0"; + grantleeCompatVersion = "5.1"; + grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; @@ -15,7 +17,22 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$grantleePluginPrefix" "$bin" + + # CMake checks that the provided libraries and plugins exist + # Link libraries into $dev to satisfy CMake + mkdir -p $dev/lib + find $out/lib -name '*.so.*' -exec ln -s \{\} $dev/lib \; + + # Link plugins into $dev to satisfy CMake + ln -s $bin/lib/grantlee $dev/lib + ''; + + setupHook = ./setup-hook.sh; + + meta = with lib; { description = "Qt5 port of Django template system"; longDescription = '' Grantlee is a plugin based String Template system written using the Qt diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh new file mode 100644 index 00000000000..d11ef5883a1 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -0,0 +1,23 @@ +grantleePluginPrefix=@grantleePluginPrefix@ + +providesGrantleeRuntime() { + [ -d "$1/$grantleePluginPrefix" ] +} + +_grantleeCrossEnvHook() { + if providesQtRuntime "$1"; then + propagatedBuildInputs+=" $1" + propagatedUserEnvPkgs+=" $1" + fi +} +crossEnvHooks+=(_grantleeCrossEnvHook) + +_grantleeEnvHook() { + if providesGrantleeRuntime "$1"; then + propagatedNativeBuildInputs+=" $1" + if [ -z "$crossConfig" ]; then + propagatedUserEnvPkgs+=" $1" + fi + fi +} +envHooks+=(_grantleeEnvHook) From 597a1c6a9edd76ef9e32ee3f0122e758d2205756 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 21 May 2017 13:59:37 -0500 Subject: [PATCH 080/100] kwallet: remove legacy D-Bus service --- pkgs/development/libraries/kde-frameworks/kwallet.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index ece915071ad..66c8301215b 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -16,4 +16,7 @@ mkDerivation { ]; propagatedBuildInputs = [ qtbase ]; patches = [ ./kwallet-dbus.patch ]; + postFixup = '' + rm "''${!outputBin}/share/dbus-1/services/org.kde.kwalletd.service" + ''; } From b3ffeab007b4785545f6c96e4e9cb60b83bb384b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 21 May 2017 08:32:51 -0500 Subject: [PATCH 081/100] kdeApplications: move mkDerivation --- .../kde/build-support/application.nix | 20 ------------- pkgs/applications/kde/default.nix | 29 ++++++++++++++----- 2 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/kde/build-support/application.nix diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix deleted file mode 100644 index 087f355b4fa..00000000000 --- a/pkgs/applications/kde/build-support/application.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, lib, srcs }: - -args: - -let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; -in -mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - outputs = args.outputs or [ "out" "dev" ]; - - meta = { - platforms = lib.platforms.linux; - homepage = http://www.kde.org; - } // (args.meta or {}); -}) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a9e11c7ba24..24b73f415ad 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -33,21 +33,34 @@ still shows most of the available features is in `./gwenview.nix`. let mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit fetchurl mirror; }; -in -let + mkDerivation = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + mkDerivation = + libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + in + mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + outputs = args.outputs or [ "out" ]; + + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); packages = self: with self; let callPackage = self.newScope { + inherit mkDerivation; + # Team of maintainers assigned to the KDE PIM suite kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; - - mkDerivation = import ./build-support/application.nix { - inherit lib; - inherit srcs; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - }; }; in { kdelibs = callPackage ./kdelibs { inherit attica phonon; }; From 88d29f80c1ac483c6f62a04de2a9ca7b9ea4f128 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 06:15:04 -0500 Subject: [PATCH 082/100] qttools: move qdbusviewer to runtime output --- pkgs/development/libraries/qt-5/5.6/qttools/default.nix | 1 + pkgs/development/libraries/qt-5/5.9/qttools/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix index d72d7b6c64c..57b1b46a9c5 100644 --- a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix @@ -6,6 +6,7 @@ qtSubmodule { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postFixup = '' moveToOutput "bin/qdbus" "$out" + moveToOutput "bin/qdbusviewer" "$out" moveToOutput "bin/qtpaths" "$out" ''; } diff --git a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix index 8c231271607..012e8bca75d 100644 --- a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix @@ -10,6 +10,7 @@ qtSubmodule { # qmake moves all binaries to $dev in preFixup postFixup = '' moveToOutput "bin/qdbus" "$bin" + moveToOutput "bin/qdbusviewer" "$bin" moveToOutput "bin/qtpaths" "$bin" ''; } From fa2f19467f76aa6b4c9e943ea49db415499f5ae7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 06:55:36 -0500 Subject: [PATCH 083/100] akonadi: use QLatin1String instead of QStringLiteral QStringLiteral stores strings in UTF-16 encoding. Nix cannot decode such paths, so we must use QLatin1String for strings that may be paths, or the dependency graph will be broken! --- .../kde/akonadi/akonadi-paths.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index f1ae1f23cc9..91fd934b1ec 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -33,7 +33,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp - } - const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); -+ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN); ++ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") @@ -42,11 +42,11 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp } - mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); -+ mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); ++ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; - mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); -+ mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK); ++ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); @@ -55,7 +55,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); - mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString(); -+ mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD); ++ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD); mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); @@ -84,7 +84,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp // generate config file - const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); -+ const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); ++ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { @@ -133,7 +133,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - - defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); - defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); -+ defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB); ++ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } @@ -145,7 +145,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - if (mInternalServer && mServerPath.isEmpty()) { - mServerPath = defaultServerPath; - } -+ mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL); ++ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL); qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { @@ -166,7 +166,7 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); - const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher"); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); mController->start(agentLauncherExec, arguments); } return true; @@ -179,13 +179,13 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); - mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); if (mAgentServerEnabled) { mAgentServer = new Akonadi::ProcessControl; connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); - mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); } #ifndef QT_NO_DEBUG From 22b6a93fadb9cb6aebc8bf0aecdfdc8ae60ae155 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 06:57:06 -0500 Subject: [PATCH 084/100] akonadi: no need to set MYSQLD_EXECUTABLE --- pkgs/applications/kde/akonadi/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index d6ba0abd226..bb7dac1b62a 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -19,9 +19,6 @@ mkDerivation { ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld" - ]; NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"'' ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"'' From 5ba0dd1ad7aa54b2d695d4c91251c73b7d2551b2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 09:51:38 -0500 Subject: [PATCH 085/100] qgpgme: build with -DQT_NO_DEBUG qgpgme uses Q_ASSERT which causes build inputs to be retained unnecessarily at runtime unless debugging is disabled. --- pkgs/development/libraries/gpgme/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index aae24587302..9773ef8b896 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -32,9 +32,12 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gnupg}/bin" ]; - # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html NIX_CFLAGS_COMPILE = - lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + # qgpgme uses Q_ASSERT which retains build inputs at runtime unless + # debugging is disabled + lib.optional (qtbase != null) "-DQT_NO_DEBUG" + # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html + ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; meta = with stdenv.lib; { homepage = https://gnupg.org/software/gpgme/index.html; From 55e6c1b8e1e189d3a3166752e5ecc620133225ae Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 11:18:52 -0500 Subject: [PATCH 086/100] kholidays: add to libsForQt5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b67fbe5107..11dabac2ea7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9969,7 +9969,7 @@ with pkgs; ### KDE APPLICATIONS inherit (kdeApplications.override { libsForQt5 = self; }) - libkdcraw libkexiv2 libkipi libkomparediff2; + kholidays libkdcraw libkexiv2 libkipi libkomparediff2; ### LIBRARIES From b4780249c64548dff25387d527f193a3b4f555bf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 16:20:45 -0500 Subject: [PATCH 087/100] grantlee5: don't link plugins into $dev --- .../libraries/grantlee/5/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 571ad98c38c..6fae90a8d89 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -12,23 +12,18 @@ mkDerivation rec { name = "${name}.tar.gz"; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - outputs = [ "out" "dev" "bin" ]; - postInstall = '' - moveToOutput "$grantleePluginPrefix" "$bin" + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - # CMake checks that the provided libraries and plugins exist - # Link libraries into $dev to satisfy CMake - mkdir -p $dev/lib - find $out/lib -name '*.so.*' -exec ln -s \{\} $dev/lib \; - - # Link plugins into $dev to satisfy CMake - ln -s $bin/lib/grantlee $dev/lib - ''; + outputs = [ "out" "dev" ]; + postFixup = + # Disabuse CMake of the notion that libraries are in $dev + '' + sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ + -e "s|\''${_IMPORT_PREFIX}|$out|" + ''; setupHook = ./setup-hook.sh; From d0337b0874e530e87bf34fb1b90366400ae54c1b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 16:25:13 -0500 Subject: [PATCH 088/100] libgnome-keyring: separate $dev output --- pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix index c6c9323c010..689ece9ad78 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; From 2978918f63c73e2703fbb438dcc88ef2db3fa398 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 16:56:54 -0500 Subject: [PATCH 089/100] kdesignerplugin: propagate qttools build input --- pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 91b596cc4d3..8418863eabb 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -11,6 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews - kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet + kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet ]; + propagatedBuildInputs = [ qttools ]; } From dd3f3de3e3d746522a854a7fd695eeeeb6008a71 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 16:57:41 -0500 Subject: [PATCH 090/100] syndication: multiple outputs --- pkgs/applications/kde/syndication.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix index 43a4ea005bd..42782d449d5 100644 --- a/pkgs/applications/kde/syndication.nix +++ b/pkgs/applications/kde/syndication.nix @@ -12,4 +12,5 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kio ]; + outputs = [ "out" "dev" ]; } From 91b99ec9296536e1a6090d269564330502996ce2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 18:27:57 -0500 Subject: [PATCH 091/100] sddm: no propagatedBuildInputs --- pkgs/applications/display-managers/sddm/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index dd9cae32ba4..920e5ba9abd 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -14,7 +14,7 @@ let }; in mkDerivation rec { - name = "sddm-unwrapped-${version}"; + name = "sddm-${version}"; src = fetchFromGitHub { owner = "sddm"; @@ -36,11 +36,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau pam systemd - ]; - - propagatedBuildInputs = [ - qtbase qtdeclarative + libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd ]; cmakeFlags = [ From 7c850a0fd6ada32eb3e24b63222caa32f9de960b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 26 May 2017 16:22:27 -0500 Subject: [PATCH 092/100] libkscreen: fix circular references --- pkgs/desktops/plasma-5/default.nix | 2 ++ pkgs/desktops/plasma-5/libkscreen/default.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index e386f3a319a..a962d3054f8 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -71,6 +71,8 @@ let propagateBin = propagate "bin"; callPackage = self.newScope { + inherit propagate propagateBin; + mkDerivation = args: let inherit (args) name; diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index b81755ed757..5625aa656ce 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, propagate, extra-cmake-modules, kwayland, libXrandr, qtx11extras }: @@ -13,4 +13,5 @@ mkDerivation { preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" ''; + setupHook = propagate "out"; } From 6ba0ab1b92c89aa09847e06df27dda0938a3a45c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 27 May 2017 13:13:07 -0500 Subject: [PATCH 093/100] Revert "kcmutils: fix kcm plugin path" This reverts commit cb922bbd5855aba00b96f223dce50c4556472a25. --- .../kcmutils/kcmutils-fix-plugin-path.patch | 13 ------------- .../libraries/kde-frameworks/kcmutils/series | 1 - 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch deleted file mode 100644 index e82ce7d592c..00000000000 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kcmutils-5.33.0/src/kcmoduleloader.cpp -=================================================================== ---- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp -+++ kcmutils-5.33.0/src/kcmoduleloader.cpp -@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con - if (module) { - return module; - } else { -- KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); -+ KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library())); - KPluginFactory* factory = loader.factory(); - if (!factory) { - qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series index 6fbc4ca6563..f2c22554a45 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/series +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series @@ -1,3 +1,2 @@ kcmutils-follow-symlinks.patch kcmutils-debug-module-loader.patch -kcmutils-fix-plugin-path.patch From 96e2a3bd85b50aa074eb6f36c9e600c3257d59e3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 27 May 2017 16:19:26 -0500 Subject: [PATCH 094/100] grantlee5: update meta.homepage --- pkgs/development/libraries/grantlee/5/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 6fae90a8d89..13c350f2ecf 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -21,8 +21,9 @@ mkDerivation rec { postFixup = # Disabuse CMake of the notion that libraries are in $dev '' - sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ - -e "s|\''${_IMPORT_PREFIX}|$out|" + for mod in $dev/lib/cmake/Grantlee5/GrantleeTargets-*.cmake; do + sed -i $mod -e "s|\''${_IMPORT_PREFIX}|$out|" + done ''; setupHook = ./setup-hook.sh; From d143269ea87f757df1b01e4137f202998b5b1eda Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 27 May 2017 16:20:57 -0500 Subject: [PATCH 095/100] grantlee5: patch CMake module correctly in release or debug build --- pkgs/development/libraries/grantlee/5/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 13c350f2ecf..6fae90a8d89 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -21,9 +21,8 @@ mkDerivation rec { postFixup = # Disabuse CMake of the notion that libraries are in $dev '' - for mod in $dev/lib/cmake/Grantlee5/GrantleeTargets-*.cmake; do - sed -i $mod -e "s|\''${_IMPORT_PREFIX}|$out|" - done + sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ + -e "s|\''${_IMPORT_PREFIX}|$out|" ''; setupHook = ./setup-hook.sh; From ca324e54dd25150eb728b1aad130197281bff9f8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 May 2017 08:34:40 -0500 Subject: [PATCH 096/100] kdepim-runtime: patch from upstream to fix IMAP resource crash --- pkgs/applications/kde/kdepim-runtime.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 01683a6315c..f267c6a8306 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, shared_mime_info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, @@ -20,6 +20,13 @@ mkDerivation { kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine ]; + patches = [ + # Fix crash in IMAP Akonadi resource + (fetchpatch { + url = "https://cgit.kde.org/kdepim-runtime.git/patch/?id=611510d0a005bc93102aa4b9f1a5b5f9905c4179"; + sha256 = "1zidfqwzj5waq01iqzgq1imr8aq7a2h5aysygi4ynakwgr4ypxcj"; + }) + ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; } From 5f3732f81567613e5f3853dee7f0bc9badd2efc6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 21 Jun 2017 19:30:55 -0500 Subject: [PATCH 097/100] Revert "kdepim-runtime: patch from upstream to fix IMAP resource crash" This reverts commit a6d746fbd12a6633e775e2cb52793f4baa8bab36. --- pkgs/applications/kde/kdepim-runtime.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index f267c6a8306..01683a6315c 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, shared_mime_info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, @@ -20,13 +20,6 @@ mkDerivation { kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine ]; - patches = [ - # Fix crash in IMAP Akonadi resource - (fetchpatch { - url = "https://cgit.kde.org/kdepim-runtime.git/patch/?id=611510d0a005bc93102aa4b9f1a5b5f9905c4179"; - sha256 = "1zidfqwzj5waq01iqzgq1imr8aq7a2h5aysygi4ynakwgr4ypxcj"; - }) - ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; } From 4fd2820dcd020525c5968e67b8820bc35f735dd8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 22 Jun 2017 08:29:48 -0500 Subject: [PATCH 098/100] k3b: fixup inputs --- pkgs/applications/kde/k3b.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index cfe7327ac72..c70c3ea877b 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -15,7 +15,7 @@ mkDerivation { maintainers = with maintainers; [ sander phreedom ]; platforms = platforms.linux; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ]; propagatedBuildInputs = [ # qt qtwebkit From 46ecfa19085d74cad42b9c0a2a22733cbe497323 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 22 Jun 2017 08:30:31 -0500 Subject: [PATCH 099/100] okteta: fixup inputs --- pkgs/applications/kde/okteta.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 1d44bb27fa3..b985d7170d9 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,9 +1,7 @@ { mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtscript, kconfig, kinit, karchive, - kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared_mime_info + extra-cmake-modules, kdoctools, shared_mime_info, + kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript }: mkDerivation { @@ -12,10 +10,8 @@ mkDerivation { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; - buildInputs = [ shared_mime_info ]; - propagatedBuildInputs = [ - kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 - karchive + nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + buildInputs = [ + kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript ]; } From 933f384fc72008ea60b4772be1f2a5cd0e01da1e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 7 Jul 2017 15:23:03 -0500 Subject: [PATCH 100/100] ark: use plain unzip Use plain unzip instead of unzipNLS, which is unnecessary and also broken. --- pkgs/applications/kde/ark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index df15f6b0f18..013e2e63f59 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -7,7 +7,7 @@ khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive, # Archive tools - p7zip, unzipNLS, zip, + p7zip, unzip, zip, # Unfree tools unfreeEnableUnrar ? false, unrar, @@ -25,7 +25,7 @@ mkDerivation { let PATH = lib.makeBinPath - ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar); + ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar); in '' wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}" '';