summary refs log tree commit diff
path: root/pkgs/applications/misc/khal
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2018-10-30 18:27:52 +0100
committerGabriel Ebner <gebner@gebner.org>2018-10-30 18:32:35 +0100
commitf129ed25a04090e5427efd3200101ca47c1b002d (patch)
tree87b04bcc85f1b167f0e2714786513c4698c18ec4 /pkgs/applications/misc/khal
parent39662cf61c42a6c89ee8dc5b95bbf89c33f8bcdc (diff)
downloadnixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.tar
nixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.tar.gz
nixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.tar.bz2
nixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.tar.lz
nixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.tar.xz
nixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.tar.zst
nixpkgs-f129ed25a04090e5427efd3200101ca47c1b002d.zip
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)...
Diffstat (limited to 'pkgs/applications/misc/khal')
-rw-r--r--pkgs/applications/misc/khal/default.nix23
1 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index b94d067dd18..bc2c8978a67 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -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 ];
   };
 }