[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: gnu: mailutils: Use 'modify-phases' syntax.
From: |
Efraim Flashner |
Subject: |
03/07: gnu: mailutils: Use 'modify-phases' syntax. |
Date: |
Tue, 20 Dec 2016 20:44:52 +0000 (UTC) |
efraim pushed a commit to branch master
in repository guix.
commit de75f0b1bfd2396a3eb17c0119bc5dbade66e134
Author: Efraim Flashner <address@hidden>
Date: Tue Dec 20 21:55:53 2016 +0200
gnu: mailutils: Use 'modify-phases' syntax.
* gnu/packages/mail.scm (mailutils)[arguments]: Use 'modify-phases'.
---
gnu/packages/mail.scm | 74 ++++++++++++++++++++++++-------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fef913d..4ce7b1e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -113,43 +113,43 @@
"1dpylyg79avi7brpkcmzaq7bqqkz45flp0ws6f2c8b1gyz4hdnzm"))))
(build-system gnu-build-system)
(arguments
- '(;; TODO: Add `--with-sql'.
- #:phases (alist-cons-before
- 'build 'pre-build
- (lambda _
- ;; Use the right file name for `cat'.
- (substitute* "testsuite/lib/mailutils.exp"
- (("/bin/cat")
- (which "cat")))
-
- ;; Tests try to invoke 'maidag' such that it looks up the
- ;; 'root' user, which does not exist in the build
- ;; environment.
- (substitute* "maidag/tests/testsuite"
- (("root <") "nobody <")
- (("spool/root") "spool/nobody")
- (("address@hidden") "address@hidden"))
-
- ;; The 'pipeact.at' tests generate a shell script; make
- ;; sure it uses the right shell.
- (substitute* '("sieve/tests/testsuite"
- "mh/tests/testsuite")
- (("#! /bin/sh")
- (string-append "#!" (which "sh"))))
-
- (substitute* "mh/tests/testsuite"
- (("moreproc: /bin/cat")
- (string-append "moreproc: " (which "cat"))))
-
- ;; XXX: The comsatd tests rely on being able to open
- ;; /dev/tty, but that gives ENODEV in the build
- ;; environment. Thus, ignore test failures here.
- (substitute* "comsat/tests/Makefile.in"
- (("\\$\\(SHELL\\) \\$\\(TESTSUITE\\)" all)
- (string-append "-" all)))
-
- #t)
- %standard-phases)
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'pre-build
+ (lambda _
+ ;; Use the right file name for `cat'.
+ (substitute* "testsuite/lib/mailutils.exp"
+ (("/bin/cat")
+ (which "cat")))
+
+ ;; Tests try to invoke 'maidag' such that it looks up the
+ ;; 'root' user, which does not exist in the build
+ ;; environment.
+ (substitute* "maidag/tests/testsuite"
+ (("root <") "nobody <")
+ (("spool/root") "spool/nobody")
+ (("address@hidden") "address@hidden"))
+
+ ;; The 'pipeact.at' tests generate a shell script; make
+ ;; sure it uses the right shell.
+ (substitute* '("sieve/tests/testsuite"
+ "mh/tests/testsuite")
+ (("#! /bin/sh")
+ (string-append "#!" (which "sh"))))
+
+ (substitute* "mh/tests/testsuite"
+ (("moreproc: /bin/cat")
+ (string-append "moreproc: " (which "cat"))))
+
+ ;; XXX: The comsatd tests rely on being able to open
+ ;; /dev/tty, but that gives ENODEV in the build
+ ;; environment. Thus, ignore test failures here.
+ (substitute* "comsat/tests/Makefile.in"
+ (("\\$\\(SHELL\\) \\$\\(TESTSUITE\\)" all)
+ (string-append "-" all)))
+
+ #t)))
+ ;; TODO: Add `--with-sql'.
#:configure-flags '("--sysconfdir=/etc")
#:parallel-tests? #f))
(inputs
- branch master updated (8cb3e7e -> 899358d), Efraim Flashner, 2016/12/20
- 01/07: gnu: gnupg: Remove unneeded input., Efraim Flashner, 2016/12/20
- 05/07: gnu: bogofilter: Use 'modify-phases'., Efraim Flashner, 2016/12/20
- 02/07: gnu: mailutils: Update to 3.1.1., Efraim Flashner, 2016/12/20
- 07/07: gnu: msmtp: Update to 1.6.6., Efraim Flashner, 2016/12/20
- 04/07: gnu: mutt: Update to 1.7.2., Efraim Flashner, 2016/12/20
- 06/07: gnu: getmail: Update to 4.52.0., Efraim Flashner, 2016/12/20
- 03/07: gnu: mailutils: Use 'modify-phases' syntax.,
Efraim Flashner <=