diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
| commit | d726b954baaeff876ce9728e00920fa45f529f9a (patch) | |
| tree | 4b767b7586a1082dd2691bc33c3e45ace044e6e5 /gnu/packages/calendar.scm | |
| parent | 9a74a7db8626bc139307d115f5cec2648f5273ad (diff) | |
| parent | e165a2492d73d37c8b95d6970d453b9d88911ee6 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/ruby.scm
Diffstat (limited to 'gnu/packages/calendar.scm')
| -rw-r--r-- | gnu/packages/calendar.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 71b4827578..53c73c969d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> +;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +64,7 @@ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/HowardHinnant/date.git") + (url "https://github.com/HowardHinnant/date") (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))) (file-name (git-file-name name version)) (sha256 @@ -195,6 +196,12 @@ data units.") "doc/build/man/khal.1" (string-append (assoc-ref outputs "out") "/share/man/man1")) #t)) + (add-before 'check 'fix-tests + (lambda _ + ;; Reported upstream: <https://github.com/pimutils/khal/issues/947>. + (substitute* "tests/cli_test.py" + (("Invalid value for \"\\[ICS\\]\"") "Invalid value for \\'[ICS]\\'")) + #t)) (replace 'check (lambda* (#:key inputs #:allow-other-keys) ;; The tests require us to choose a timezone. |