diff options
author | Will Dietz <w@wdtz.org> | 2020-02-03 17:38:20 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 17:38:20 -0600 |
commit | d18b1ee9985368d6acc16cc51f1bf90d2b269aee (patch) | |
tree | d8dbbed177f64c694cb5adc18393b496515a65eb | |
parent | 500f0327296a34fd5d24bcf6da87956aacbf26f6 (diff) | |
parent | ed68721cdea932ef74db95e1212ab10466991da2 (diff) | |
download | nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.tar nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.tar.gz nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.tar.bz2 nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.tar.lz nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.tar.xz nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.tar.zst nixlib-d18b1ee9985368d6acc16cc51f1bf90d2b269aee.zip |
Merge pull request #78155 from dtzWill/update/zanshin-0.5.71
zanshin: 2019-07-28 -> 0.5.71
-rw-r--r-- | pkgs/applications/office/zanshin/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index b76e09d4d1d6..b4adc947c4d1 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,21 +1,19 @@ { mkDerivation, lib, - fetchFromGitHub, + fetchurl, extra-cmake-modules, qtbase, boost, akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, - krunner, kwallet + krunner, kwallet, kcalendarcore }: -mkDerivation { +mkDerivation rec { pname = "zanshin"; - version = "2019-07-28"; + version = "0.5.71"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "zanshin"; - rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378"; - sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; nativeBuildInputs = [ @@ -25,7 +23,7 @@ mkDerivation { buildInputs = [ qtbase boost akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap - krunner kwallet + krunner kwallet kcalendarcore ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 232b84f5aada..25f44009f305 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22594,7 +22594,7 @@ in zanshin = libsForQt5.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; - inherit (kdeFrameworks) krunner kwallet; + inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; }; |