nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: khal: Use INVOKE. 

* gnu/packages/calendar.scm (khal)[arguments]: Substitute INVOKE for
SYSTEM* and explicitly return #t from phases where needed.
This commit is contained in:
Tobias Geerinckx-Rice 2018-04-01 07:52:59 +02:00
parent 4133914416
commit 6c738fe9e7
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/calendar.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at> ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -110,24 +111,24 @@ data units.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make installed package available for running the tests ;; Make installed package available for running the tests
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(and (invoke "make" "--directory=doc/" "man")
(zero? (system* "make" "--directory=doc/" "man")) (install-file
(install-file "doc/build/man/khal.1"
"doc/build/man/khal.1" (string-append (assoc-ref outputs "out") "/share/man/man1"))
(string-append (assoc-ref outputs "out") "/share/man/man1"))))) #t))
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The tests require us to choose a timezone. ;; The tests require us to choose a timezone.
(setenv "TZ" (setenv "TZ"
(string-append (assoc-ref inputs "tzdata") (string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo/Zulu")) "/share/zoneinfo/Zulu"))
(zero? (system* "py.test" "tests" "-k" (invoke "py.test" "tests" "-k"
(string-append (string-append
;; These tests are known to fail in when not ;; These tests are known to fail in when not
;; running in a TTY: ;; running in a TTY:
;; https://github.com/pimutils/khal/issues/683 ;; https://github.com/pimutils/khal/issues/683
"not test_printics_read_from_stdin " "not test_printics_read_from_stdin "
"and not test_import_from_stdin")))))))) "and not test_import_from_stdin")))))))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest) `(("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov) ("python-pytest-cov" ,python-pytest-cov)