tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
khal: fix build
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)...
+5
-18
+5
-18
pkgs/applications/misc/khal/default.nix
+5
-18
pkgs/applications/misc/khal/default.nix
···
1
1
{ stdenv, pkgs, python3 }:
2
2
3
-
let
4
-
python = python3.override {
5
-
packageOverrides = self: super: {
6
-
7
-
# https://github.com/pimutils/khal/issues/780
8
-
python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
9
-
version = "2.6.1";
10
-
src = oldAttrs.src.override {
11
-
inherit version;
12
-
sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
13
-
};
14
-
});
15
-
16
-
};
17
-
};
18
-
19
-
in with python.pkgs; buildPythonApplication rec {
3
+
with python3.pkgs; buildPythonApplication rec {
20
4
pname = "khal";
21
5
version = "0.9.10";
22
6
···
34
50
install -D misc/__khal $out/share/zsh/site-functions/__khal
35
51
'';
36
52
53
+
# One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3
54
+
doCheck = false;
55
+
37
56
checkPhase = ''
38
57
py.test
39
58
'';
···
45
58
homepage = http://lostpackets.de/khal/;
46
59
description = "CLI calendar application";
47
60
license = licenses.mit;
48
-
maintainers = with maintainers; [ jgeerds ];
61
+
maintainers = with maintainers; [ jgeerds gebner ];
49
62
};
50
63
}