[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: gnu: address@hidden: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
05/14: gnu: address@hidden: Update phase style. |
Date: |
Tue, 20 Feb 2018 10:06:35 -0500 (EST) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 20897536e5a9b11696f8343c804232c52677d4ed
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Feb 20 04:09:27 2018 +0100
gnu: address@hidden: Update phase style.
* gnu/packages/guile.scm (guile-2.0)[arguments]: Use MODIFY-PHASES
syntax and end phase with #t.
---
gnu/packages/guile.scm | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 5dc66c1..1025ea4 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Theodoros Foradis <address@hidden>
;;; Copyright © 2017 ng0 <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -183,23 +183,24 @@ without requiring the source code to be rewritten.")
(outputs '("out" "debug"))
(arguments
- `(#:configure-flags '("--disable-static") ;saves 3MiB
- #:phases (alist-cons-before
- 'configure 'pre-configure
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Tell (ice-9 popen) the file name of Bash.
- (let ((bash (assoc-ref inputs "bash")))
- (substitute* "module/ice-9/popen.scm"
- ;; If bash is #f allow fallback for user to provide
- ;; "bash" in PATH. This happens when cross-building to
- ;; MinGW for which we do not have Bash yet.
- (("/bin/sh")
- ,@(if (target-mingw?)
- '((if bash
- (string-append bash "/bin/bash")
- "bash"))
- '((string-append bash "/bin/bash")))))))
- %standard-phases)))
+ `(#:configure-flags '("--disable-static") ; saves 3 MiB
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'pre-configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Tell (ice-9 popen) the file name of Bash.
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "module/ice-9/popen.scm"
+ ;; If bash is #f allow fallback for user to provide
+ ;; "bash" in PATH. This happens when cross-building to
+ ;; MinGW for which we do not have Bash yet.
+ (("/bin/sh")
+ ,@(if (target-mingw?)
+ '((if bash
+ (string-append bash "/bin/bash")
+ "bash"))
+ '((string-append bash "/bin/bash")))))
+ #t))))))
(native-search-paths
(list (search-path-specification
- branch core-updates updated (cb4a178 -> 3d2d5eb), Tobias Geerinckx-Rice, 2018/02/20
- 14/14: gnu: gnurl: Add HTTP/2 support., Tobias Geerinckx-Rice, 2018/02/20
- 10/14: gnu: intltool: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 02/14: gnu: gts: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 06/14: gnu: glibc-hurd-headers: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 04/14: gnu: commencement: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 07/14: gnu: dblatex: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 05/14: gnu: address@hidden: Update phase style.,
Tobias Geerinckx-Rice <=
- 03/14: gnu: address@hidden: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 09/14: gnu: make-bootstrap: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 12/14: gnu: cross-base: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 13/14: gnu: patchelf: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 01/14: gnu: util-macros: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 11/14: gnu: indent: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 08/14: gnu: libffi: Update phase style., Tobias Geerinckx-Rice, 2018/02/20