[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: cook: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
04/08: gnu: cook: Update phase style. |
Date: |
Wed, 21 Feb 2018 09:03:10 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit ea5d238dae574d08bd25ecc6c1fb3bf009707257
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Feb 20 21:21:03 2018 +0100
gnu: cook: Update phase style.
* gnu/packages/cook.scm (cook)[arguments]: Use MODIFY-PHASES syntax and
end phase with #t.
---
gnu/packages/cook.scm | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm
index e149968..17e090d 100644
--- a/gnu/packages/cook.scm
+++ b/gnu/packages/cook.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,26 +42,26 @@
(arguments
`(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
#:phases
- (alist-cons-before
- 'configure 'pre-conf
- (lambda _
- (substitute* (append '("common/env.c")
- (find-files "test" "\\.sh"))
- (("/bin/sh") (which "sh")))
+ (modify-phases %standard-phases
+ (add-before 'configure 'pre-conf
+ (lambda _
+ (substitute* (append '("common/env.c")
+ (find-files "test" "\\.sh"))
+ (("/bin/sh") (which "sh")))
- ;; Guix's binutils (because it wants bit-reproducable builds) is
- ;; is configured with the --enable-deterministic-archives flag.
- ;; This means the timestamp of files appended to an ar archive
- ;; are automatically and silently mutated to 00:00 1 Jan 1970
- ;; which plays havoc with this test, for which correct timestamps
- ;; are very important. Adding the U flag undoes the effect of
- ;; --enable-deterministic-archives and allows this test to work
- ;; again.
- (substitute* "test/00/t0077a.sh"
- (("ar qc") "ar qcU"))
+ ;; Guix's binutils (because it wants bit-reproducable builds) is
+ ;; is configured with the --enable-deterministic-archives flag.
+ ;; This means the timestamp of files appended to an ar archive
+ ;; are automatically and silently mutated to 00:00 1 Jan 1970
+ ;; which plays havoc with this test, for which correct timestamps
+ ;; are very important. Adding the U flag undoes the effect of
+ ;; --enable-deterministic-archives and allows this test to work
+ ;; again.
+ (substitute* "test/00/t0077a.sh"
+ (("ar qc") "ar qcU"))
- (setenv "SH" (which "sh")))
- %standard-phases)))
+ (setenv "SH" (which "sh"))
+ #t)))))
(native-inputs `(("bison" ,bison)
;; For building the documentation:
("groff" ,groff)
- branch master updated (781d721 -> 6c96b54), Tobias Geerinckx-Rice, 2018/02/21
- 03/08: gnu: slang: Update to 2.3.1a., Tobias Geerinckx-Rice, 2018/02/21
- 01/08: gnu: getmail: Update to 5.5., Tobias Geerinckx-Rice, 2018/02/21
- 05/08: gnu: lout: Update phase style., Tobias Geerinckx-Rice, 2018/02/21
- 08/08: gnu: lpsolve: Update phase style., Tobias Geerinckx-Rice, 2018/02/21
- 06/08: gnu: iptables: Update to 1.6.2., Tobias Geerinckx-Rice, 2018/02/21
- 07/08: gnu: iptables: Edit synopsis & description., Tobias Geerinckx-Rice, 2018/02/21
- 02/08: gnu: shflags: Set source file name., Tobias Geerinckx-Rice, 2018/02/21
- 04/08: gnu: cook: Update phase style.,
Tobias Geerinckx-Rice <=