diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-06 17:14:41 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-06 17:14:41 -0500 |
| commit | 74288230ea8b2310495dc2739f39ceadcc143fd0 (patch) | |
| tree | 73ba6c7c13d59c5f92b409c94dccfff159e08f4d /gnu/packages/calendar.scm | |
| parent | 92e779592d269ca1924f184496eb4ca832997b12 (diff) | |
| parent | aa21c764d65068783ae31febee2a92eb3d138a24 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/calendar.scm')
| -rw-r--r-- | gnu/packages/calendar.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 306c949066..70bf8f9573 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -88,6 +88,7 @@ data units.") (source (origin (method url-fetch) (uri (pypi-uri "khal" version)) + (patches (search-patches "khal-disable-failing-tests.patch")) (sha256 (base32 "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f")))) @@ -96,10 +97,9 @@ data units.") `(#:phases (modify-phases %standard-phases ;; Building the manpage requires khal to be installed. (add-after 'install 'manpage - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PYTHONPATH" - (string-append - (getenv "PYTHONPATH") ":" (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) (zero? (system* "make" "--directory=doc/" "man")) (install-file "doc/build/man/khal.1" |