JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

khal: fix build

Browse Source 
Upgrading icalendar to 4.0.3 broke the pinned dateutil version.
Luckily khal 0.9.10 now works with dateutil 2.7, so we no longer need to
override it.  However now one test in khal fails (the string output
changed from icalendar 4.0.2 to 4.0.3)...
This commit is contained in:
Gabriel Ebner 2018-10-30 18:27:52 +01:00
parent 39662cf61c
commit f129ed25a0
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/misc/khal/default.nix
View File

@ -1,22 +1,6 @@
{ stdenv, pkgs, 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 {
with python3.pkgs; buildPythonApplication rec {
pname = "khal";
version = "0.9.10";
@ -50,6 +34,9 @@ in with python.pkgs; buildPythonApplication rec {
install -D misc/__khal $out/share/zsh/site-functions/__khal
'';
# One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3
doCheck = false;
checkPhase = ''
py.test
'';
@ -58,6 +45,6 @@ in with python.pkgs; buildPythonApplication rec {
homepage = http://lostpackets.de/khal/;
description = "CLI calendar application";
license = licenses.mit;
maintainers = with maintainers; [ jgeerds ];
maintainers = with maintainers; [ jgeerds gebner ];
};
}