[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: ngircd: Use ‘modify-phases’ syntax.
From: |
Tobias Geerinckx-Rice |
Subject: |
04/06: gnu: ngircd: Use ‘modify-phases’ syntax. |
Date: |
Mon, 20 Mar 2017 17:43:23 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 341ed63f47766570229567dd45c04dc0d6db1e94
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Mon Mar 20 22:32:58 2017 +0100
gnu: ngircd: Use ‘modify-phases’ syntax.
* gnu/packages/messaging.scm (ngircd)[arguments]: Use ‘modify-phases’.
---
gnu/packages/messaging.scm | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index adc7b01..535a1d3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -235,28 +235,27 @@ dictionaries. HexChat can be extended with multiple
addons.")
'("--with-pam")
'()))
#:phases
- ;; Necessary for the test suite.
- (alist-cons-after
- 'configure 'post-configure
- (lambda _
- (substitute* "src/ngircd/Makefile"
- (("/bin/sh") (which "sh")))
- ;; The default getpid.sh does a sloppy grep over 'ps -ax' output,
- ;; which fails arbitrarily.
- (with-output-to-file "src/testsuite/getpid.sh"
- (lambda ()
- (display
- (string-append
- "#!" (which "sh") "\n"
- "ps -C \"$1\" -o pid=\n"))))
- ;; Our variant of getpid.sh does not work for interpreter names if a
- ;; shebang script is run directly as "./foo", so patch cases where
- ;; the test suite relies on this.
- (substitute* "src/testsuite/start-server.sh"
- ;; It runs 'getpid.sh sh' to test if it works at all. Run it on
- ;; 'make' instead.
- (("getpid.sh sh") "getpid.sh make")))
- %standard-phases)))
+ (modify-phases %standard-phases
+ ;; Necessary for the test suite.
+ (add-after 'configure 'post-configure
+ (lambda _
+ (substitute* "src/ngircd/Makefile"
+ (("/bin/sh") (which "sh")))
+ ;; The default getpid.sh does a sloppy grep over 'ps -ax' output,
+ ;; which fails arbitrarily.
+ (with-output-to-file "src/testsuite/getpid.sh"
+ (lambda ()
+ (display
+ (string-append
+ "#!" (which "sh") "\n"
+ "ps -C \"$1\" -o pid=\n"))))
+ ;; Our variant of getpid.sh does not match interpreter names
+ ;; when the script's shebang is invoked directly as "./foo".
+ ;; Patch cases where the test suite relies on this.
+ (substitute* "src/testsuite/start-server.sh"
+ ;; It runs 'getpid.sh sh' to test if it works at all. Run it on
+ ;; 'make' instead.
+ (("getpid.sh sh") "getpid.sh make")))))))
(home-page "http://ngircd.barton.de/")
(synopsis "Lightweight Internet Relay Chat server for small networks")
(description
- branch master updated (e2c4fe7 -> 6809d93), Tobias Geerinckx-Rice, 2017/03/20
- 01/06: gnu: simple-scan: Update to 3.24.0., Tobias Geerinckx-Rice, 2017/03/20
- 04/06: gnu: ngircd: Use ‘modify-phases’ syntax.,
Tobias Geerinckx-Rice <=
- 05/06: gnu: ngircd: Use the phrase ‘IRC’ in its description., Tobias Geerinckx-Rice, 2017/03/20
- 06/06: gnu: ngircd: Use HTTPS., Tobias Geerinckx-Rice, 2017/03/20
- 02/06: gnu: znc: Run test suite., Tobias Geerinckx-Rice, 2017/03/20
- 03/06: gnu: ngircd: Update to 24., Tobias Geerinckx-Rice, 2017/03/20