[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
137/155: gnu: mailutils: Use 'modify-phases' syntax.
From: |
John Darrington |
Subject: |
137/155: gnu: mailutils: Use 'modify-phases' syntax. |
Date: |
Wed, 21 Dec 2016 20:48:42 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 6e508ec02f48e3ff856189c862d2f117ff2b93e4
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
- 133/155: gnu: nss: Add comment about test failures in NSS 3.27.2, (continued)
- 133/155: gnu: nss: Add comment about test failures in NSS 3.27.2, John Darrington, 2016/12/21
- 73/155: gnu: mig: Update to 1.8., John Darrington, 2016/12/21
- 99/155: gnu: utox: Update to 0.11.0., John Darrington, 2016/12/21
- 109/155: gnu: cutadapt: Use ‘modify-phases’ syntax., John Darrington, 2016/12/21
- 106/155: services: guix: Add 'log-file' configuration option., John Darrington, 2016/12/21
- 121/155: services: cuirass: Add Cuirass to the system profile., John Darrington, 2016/12/21
- 128/155: mailmap: Add alias for Marius Bakke., John Darrington, 2016/12/21
- 126/155: build: Delete all the .service and .conf files upon 'make clean'., John Darrington, 2016/12/21
- 134/155: gnu: borg: Update to 1.0.9., John Darrington, 2016/12/21
- 136/155: gnu: mailutils: Update to 3.1.1., John Darrington, 2016/12/21
- 137/155: gnu: mailutils: Use 'modify-phases' syntax.,
John Darrington <=
- 130/155: environment: Add '--root' option., John Darrington, 2016/12/21
- 144/155: gnu: imagemagick: Update to 6.9.7-0., John Darrington, 2016/12/21
- 149/155: gnu: jsoncpp: Update to 1.8.0., John Darrington, 2016/12/21
- 152/155: gnu: lablgtk: Update to 2.18.5, John Darrington, 2016/12/21
- 88/155: gnu: kdbusaddons: Embed kinit store dir, avoid dependency cycles., John Darrington, 2016/12/21
- 102/155: services: cuirass: Add 'log-file' option., John Darrington, 2016/12/21
- 94/155: gnu: grub: Use qemu-minimal for tests., John Darrington, 2016/12/21
- 101/155: gnu: cuirass: Add Git to 'PATH'., John Darrington, 2016/12/21
- 103/155: services: cuirass: Honor 'user' and 'group'., John Darrington, 2016/12/21
- 98/155: gnu: Add c-toxcore., John Darrington, 2016/12/21