diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
| commit | 933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch) | |
| tree | f10581ed0da1911eed9b02e69d999ba481d9d3c6 /gnu/packages/calendar.scm | |
| parent | f8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff) | |
| parent | 998afc3608242b75051f43ece36d52474c51e285 (diff) | |
| download | patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/calendar.scm')
| -rw-r--r-- | gnu/packages/calendar.scm | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 2e4481f94b..5ef5ec9271 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015 Leo Famulari <leo@famulari.name> +;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,12 +79,25 @@ data units.") (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Bug reported: https://github.com/geier/khal/issues/309 - (add-after 'unpack 'disable-test + (add-after 'unpack 'disable-tests (lambda _ + ;; Bug reported for test_only_update_old_event: + ;; https://github.com/geier/khal/issues/309 (substitute* "tests/khalendar_test.py" (("test_only_update_old_event") - "disabled_only_update_old_event")))) + "disabled_only_update_old_event")) + + ;; Bug reported for test_dt_two_tz: + ;; https://github.com/pimutils/khal/issues/382 + (substitute* "tests/event_test.py" + (("test_dt_two_tz") + "disabled_dt_two_tz")) + ;; Another timezone / DST issue: + ;; https://github.com/pimutils/khal/issues/146 + (substitute* "tests/event_test.py" + (("test_raw_dt") + "disabled_raw_dt")))) + ;; Building the manpage requires khal to be installed. (add-after 'install 'manpage (lambda* (#:key outputs #:allow-other-keys) @@ -95,6 +108,7 @@ data units.") (install-file "doc/build/man/khal.1" (string-append (assoc-ref outputs "out") "/share/man/man1")))) + ;; The tests require us to choose a timezone. (replace 'check (lambda* (#:key inputs #:allow-other-keys) |