[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/31: gnu: khal: Use INVOKE.
From: |
Tobias Geerinckx-Rice |
Subject: |
23/31: gnu: khal: Use INVOKE. |
Date: |
Wed, 30 May 2018 22:55:36 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 6c738fe9e7e6a95ce910f5a22e6f2c869075ec2d
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Sun Apr 1 07:52:59 2018 +0200
gnu: khal: Use INVOKE.
* gnu/packages/calendar.scm (khal)[arguments]: Substitute INVOKE for
SYSTEM* and explicitly return #t from phases where needed.
---
gnu/packages/calendar.scm | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index d1aa9c2..79cef99 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Troy Sankey <address@hidden>
;;; Copyright © 2016 Stefan Reichoer <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -110,24 +111,24 @@ data units.")
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make installed package available for running the tests
(add-installed-pythonpath inputs outputs)
- (and
- (zero? (system* "make" "--directory=doc/" "man"))
- (install-file
- "doc/build/man/khal.1"
- (string-append (assoc-ref outputs "out") "/share/man/man1")))))
+ (invoke "make" "--directory=doc/" "man")
+ (install-file
+ "doc/build/man/khal.1"
+ (string-append (assoc-ref outputs "out") "/share/man/man1"))
+ #t))
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
;; The tests require us to choose a timezone.
(setenv "TZ"
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo/Zulu"))
- (zero? (system* "py.test" "tests" "-k"
- (string-append
- ;; These tests are known to fail in when not
- ;; running in a TTY:
- ;; https://github.com/pimutils/khal/issues/683
- "not test_printics_read_from_stdin "
- "and not test_import_from_stdin"))))))))
+ (invoke "py.test" "tests" "-k"
+ (string-append
+ ;; These tests are known to fail in when not
+ ;; running in a TTY:
+ ;; https://github.com/pimutils/khal/issues/683
+ "not test_printics_read_from_stdin "
+ "and not test_import_from_stdin")))))))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
- 20/31: gnu: python-internetarchive: Use INVOKE., (continued)
- 20/31: gnu: python-internetarchive: Use INVOKE., Tobias Geerinckx-Rice, 2018/05/30
- 28/31: gnu: stunnel: Update to 5.46., Tobias Geerinckx-Rice, 2018/05/30
- 27/31: gnu: mkvtoolnix: Use INVOKE., Tobias Geerinckx-Rice, 2018/05/30
- 22/31: gnu: rss-bridge: Use INVOKE., Tobias Geerinckx-Rice, 2018/05/30
- 24/31: gnu: xapian: Use INVOKE., Tobias Geerinckx-Rice, 2018/05/30
- 29/31: gnu: sakura: Update to 3.6.0., Tobias Geerinckx-Rice, 2018/05/30
- 30/31: gnu: duperemove: Update to 0.11., Tobias Geerinckx-Rice, 2018/05/30
- 31/31: gnu: knot: Update to 2.6.7., Tobias Geerinckx-Rice, 2018/05/30
- 16/31: gnu: sassc: Use INVOKE., Tobias Geerinckx-Rice, 2018/05/30
- 17/31: gnu: gumbo-parser: Use INVOKE., Tobias Geerinckx-Rice, 2018/05/30
- 23/31: gnu: khal: Use INVOKE.,
Tobias Geerinckx-Rice <=