From 3de22bb760e5ac3d5e93fb648e56fea25e809b59 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:55:27 +0100 Subject: [PATCH] khard: 0.11.1 -> 0.11.3 From the README of khard: # vobject version is pinned to 0.9.2 for now because of bug # https://github.com/eventable/vobject/issues/39 This is why we explicitely pin the dependency "vobject" via a new python package in the expression here. --- pkgs/applications/misc/khard/default.nix | 32 +++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 2a6329b48d76..da6dece237ed 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,39 @@ -{ stdenv, fetchurl, glibcLocales, python3Packages }: +{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: +let + vobject = python3Packages.buildPythonPackage rec { + version = "0.9.2"; + name = "vobject-${version}"; + + src = fetchFromGitHub { + owner = "eventable"; + repo = "vobject"; + sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g"; + rev = version; + }; + + disabled = python3Packages.isPyPy; + + propagatedBuildInputs = with python3Packages; [ dateutil ]; + + checkPhase = "${python3Packages.python.interpreter} tests.py"; + + meta = with stdenv.lib; { + description = "Module for reading vCard and vCalendar files"; + homepage = http://eventable.github.io/vobject/; + license = licenses.asl20; + maintainers = [ maintainers.matthiasbeyer ]; + }; + }; +in python3Packages.buildPythonApplication rec { - version = "0.11.1"; + version = "0.11.3"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0055xx9icmsr6l7v0iqrndmygygdpdv10550w6pyrb96svzhry27"; + sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69"; }; # setup.py reads the UTF-8 encoded readme.