kde5.applications: 16.08.3 -> 16.12.0

New packages:
- akonadi
- akonadi-contacts
- akonadi-mime
- kcontacts
- kdegraphics-mobipocket
- kmime

Removed packages:
- gpgmepp: now part of gpgme

Notable changes:
- kgpg: ported from Qt 4 and kdelibs to Qt 5 and Frameworks
- okular: ported from Qt 4 and kdelibs to Qt 5 and Frameworks
This commit is contained in:
Thomas Tuegel 2016-12-16 11:25:50 -06:00
parent 0d296076b4
commit 46b1cc4f75
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
12 changed files with 1345 additions and 1088 deletions

View File

@ -0,0 +1,19 @@
{
kdeApp, lib,
ecm,
akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
akonadi
}:
kdeApp {
name = "akonadi-contacts";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ];
buildInputs = [
akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
];
propagatedBuildInputs = [ akonadi ];
}

View File

@ -0,0 +1,15 @@
{
kdeApp, lib,
ecm,
akonadi, kdbusaddons, kio, kitemmodels, kmime
}:
kdeApp {
name = "akonadi-mime";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ];
buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
}

View File

@ -0,0 +1,20 @@
{
kdeApp, lib,
ecm,
kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
kio,
boost, kitemmodels
}:
kdeApp {
name = "akonadi";
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ];
buildInputs = [
kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
];
propagatedBuildInputs = [ boost kitemmodels ];
}

View File

@ -31,6 +31,9 @@ let
inherit (pkgs) attica phonon;
};
akonadi = callPackage ./akonadi.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
akonadi-mime = callPackage ./akonadi-mime.nix {};
ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
@ -39,18 +42,20 @@ let
ffmpeg = pkgs.ffmpeg_2;
};
filelight = callPackage ./filelight.nix {};
gpgmepp = callPackage ./gpgmepp.nix {};
gwenview = callPackage ./gwenview.nix {};
kate = callPackage ./kate.nix {};
kdenlive = callPackage ./kdenlive.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 {};
kdf = callPackage ./kdf.nix {};
kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kmime = callPackage ./kmime.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};

View File

@ -1 +1 @@
WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.3/ --cut-dirs=1 -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/applications/16.12.0/ -A '*.tar.xz' )

View File

@ -0,0 +1,15 @@
{
kdeApp, lib,
ecm, ki18n,
kcoreaddons, kconfig, kcodecs
}:
kdeApp {
name = "kcontacts";
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ki18n ];
buildInputs = [ kcoreaddons kconfig kcodecs ];
}

View File

@ -1,15 +1,15 @@
{
kdeApp, lib,
ecm,
boost, gpgme
kio
}:
kdeApp {
name = "gpgmepp";
name = "kdegraphics-mobipocket";
meta = {
license = with lib.licenses; [ lgpl21 bsd3 ];
license = [ lib.licenses.gpl2Plus ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ boost gpgme ];
buildInputs = [ kio ];
}

View File

@ -1,17 +1,19 @@
{
kdeApp, lib,
automoc4, cmake, makeWrapper, perl, pkgconfig,
boost, gpgme, kdelibs, kdepimlibs, gnupg
ecm, kdoctools, ki18n,
akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
}:
kdeApp {
name = "kgpg";
nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ];
buildInputs = [ boost gpgme kdelibs kdepimlibs ];
postInstall = ''
wrapProgram "$out/bin/kgpg" \
--prefix PATH : "${gnupg}/bin"
'';
nativeBuildInputs = [ ecm kdoctools ki18n ];
buildInputs = [
akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
kwidgetsaddons kwindowsystem
];
meta = {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];

View File

@ -0,0 +1,15 @@
{
kdeApp, lib,
ecm, ki18n,
kcodecs
}:
kdeApp {
name = "kmime";
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ ecm ki18n ];
buildInputs = [ kcodecs ];
}

View File

@ -205,7 +205,7 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
}) {};
qt5 = callPackage (kdeLocale5 "sr" {
preConfigure = ''
patchShebangs 5/sr/data/resolve-sr-hybrid
patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
'';
}) {};
@ -222,13 +222,10 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
qt4 = callPackage (kdeLocale4 "ug" {}) {};
qt5 = callPackage (kdeLocale5 "ug" {}) {};
};
# TODO: build broken in 15.11.80; re-enable in next release
/*
uk = {
qt4 = callPackage (kdeLocale4 "uk" {}) {};
qt5 = callPackage (kdeLocale5 "uk" {}) {};
};
*/
wa = {
qt4 = callPackage (kdeLocale4 "wa" {}) {};
qt5 = callPackage (kdeLocale5 "wa" {}) {};

View File

@ -1,21 +1,30 @@
{
kdeApp, lib,
automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz,
poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype,
ebook_tools
kdeApp, lib, kdeWrapper,
ecm, kdoctools,
djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
}:
kdeApp {
name = "okular";
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [
kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff
freetype ebook_tools
];
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
let
unwrapped = kdeApp {
name = "okular";
nativeBuildInputs = [ ecm kdoctools ];
buildInputs = [
djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
qca-qt5 qtdeclarative qtsvg threadweaver
];
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
};
in
kdeWrapper unwrapped {
targets = [ "bin/okular" ];
}

File diff suppressed because it is too large Load Diff