BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #73117 from doronbehar/update-khard

Browse source 
khard: 0.14.0 -> 0.15.1
This commit is contained in:
Maximilian Bosch 2019-11-12 18:44:06 +01:00 committed by GitHub
commit 57bcbb4c99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/applications/misc/khard/default.nix
View file

@ -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";