Merge pull request #28452 from zraexy/zanshin

zanshin: 0.3.1 -> 0.4.1
This commit is contained in:
Jörg Thalheim 2017-08-26 06:52:03 +01:00 committed by GitHub
commit 3de17cb021
2 changed files with 39 additions and 12 deletions

View File

@ -1,21 +1,45 @@
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs4, kdepimlibs, boost, baloo }:
{
stdenv,
fetchurl, fetchpatch,
extra-cmake-modules,
qtbase, boost,
akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
krunner, kwallet
}:
stdenv.mkDerivation rec {
name = "zanshin-0.3.1";
pname = "zanshin";
version = "0.4.1";
name = "${pname}-${version}";
src = fetchurl {
url = "http://files.kde.org/zanshin/${name}.tar.bz2";
sha256 = "1ck2ncz8i816d6d1gcsdrh6agd2zri24swgz3bhn8vzbk4215yzl";
url = "https://files.kde.org/${pname}/${name}.tar.bz2";
sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
};
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
patches = [
(fetchpatch {
name = "zanshin-fix-qt59-build.patch";
url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
})
];
buildInputs = [ kdelibs4 kdepimlibs boost baloo ];
nativeBuildInputs = [
extra-cmake-modules
];
meta = {
description = "GTD for KDE";
maintainers = [ ];
inherit (kdelibs4.meta) platforms;
buildInputs = [
qtbase boost
akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap
krunner kwallet
];
meta = with stdenv.lib; {
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
homepage = https://zanshin.kde.org/;
maintainers = with maintainers; [ zraexy ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

View File

@ -17046,7 +17046,10 @@ with pkgs;
zam-plugins = callPackage ../applications/audio/zam-plugins { };
zanshin = kde4.callPackage ../applications/office/zanshin { };
zanshin = libsForQt5.callPackage ../applications/office/zanshin {
inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap;
inherit (kdeFrameworks) krunner kwallet;
};
zathura = callPackage ../applications/misc/zathura {
useMupdf = config.zathura.useMupdf or true;