diff options
author | Doron Behar <doron.behar@gmail.com> | 2019-11-09 17:46:08 +0200 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2019-11-09 17:46:08 +0200 |
commit | 7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9 (patch) | |
tree | 8543ddb9412041f284fbd4490b16663d6dbf67fd /pkgs/applications/misc/khard/default.nix | |
parent | 8302338ae99b81db102cceec8212b5c5dcce4e3f (diff) | |
download | nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.tar nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.tar.gz nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.tar.bz2 nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.tar.lz nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.tar.xz nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.tar.zst nixlib-7e7427e2c05f71ae94b3a4d6e497ef11cff0ddf9.zip |
khard: 0.14.0 -> 0.15.1
Diffstat (limited to 'pkgs/applications/misc/khard/default.nix')
-rw-r--r-- | pkgs/applications/misc/khard/default.nix | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 99b9c38d53f8..1c6708c51c97 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,36 +1,15 @@ -{ stdenv, fetchurl, glibcLocales, python3 }: +{ stdenv, glibcLocales, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - - # https://github.com/pimutils/khal/issues/780 - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - - }; - }; - -in with python.pkgs; buildPythonApplication rec { - version = "0.14.0"; +python3.pkgs.buildPythonApplication rec { + version = "0.15.1"; pname = "khard"; - namePrefix = ""; - src = fetchurl { - url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq"; + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "18ba2xgfq8sw0bg6xmlfjpizid1hkzgswcfcc54gl21y2dwfda2w"; }; - # setup.py reads the UTF-8 encoded readme. - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ atomicwrites configobj vobject @@ -43,9 +22,6 @@ in with python.pkgs; buildPythonApplication rec { install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard ''; - # Fails; but there are no tests anyway. - doCheck = false; - meta = { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; |