[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: gnu: libarchive: Use 'modify-phases' syntax.
From: |
Efraim Flashner |
Subject: |
05/14: gnu: libarchive: Use 'modify-phases' syntax. |
Date: |
Sun, 1 Oct 2017 16:13:16 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 4ac8d4864035d753429265a637b197356df8017b
Author: Efraim Flashner <address@hidden>
Date: Sun Oct 1 21:32:24 2017 +0300
gnu: libarchive: Use 'modify-phases' syntax.
* gnu/packages/backup.scm (libarchive)[arguments]: Use 'modify-phases'
syntax.
---
gnu/packages/backup.scm | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 6393c64..60b371f 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
;;; Copyright © 2017 Arun Isaac <address@hidden>
;;; Copyright © 2017 Kei Kebreau <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -205,26 +206,25 @@ backups (called chunks) to allow easy burning to CD/DVD.")
("xz" ,xz)))
(arguments
`(#:phases
- (alist-cons-before
- 'build 'patch-pwd
- (lambda _
- (substitute* "Makefile"
- (("/bin/pwd") (which "pwd"))))
- (alist-replace
- 'check
- (lambda _
- ;; XXX: The test_owner_parse, test_read_disk, and
- ;; test_write_disk_lookup tests expect user 'root' to exist, but
- ;; the chroot's /etc/passwd doesn't have it. Turn off those tests.
- ;;
- ;; The tests allow one to disable tests matching a globbing pattern.
- (and (zero? (system* "make"
- "libarchive_test" "bsdcpio_test"
"bsdtar_test"))
- ;; XXX: This glob disables too much.
- (zero? (system* "./libarchive_test" "^test_*_disk*"))
- (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
- (zero? (system* "./bsdtar_test"))))
- %standard-phases))
+ (modify-phases %standard-phases
+ (add-before 'build 'patch-pwd
+ (lambda _
+ (substitute* "Makefile"
+ (("/bin/pwd") (which "pwd"))
+ #t)))
+ (replace 'check
+ (lambda _
+ ;; XXX: The test_owner_parse, test_read_disk, and
+ ;; test_write_disk_lookup tests expect user 'root' to exist, but
+ ;; the chroot's /etc/passwd doesn't have it. Turn off those
tests.
+ ;;
+ ;; The tests allow one to disable tests matching a globbing
pattern.
+ (and (zero? (system* "make"
+ "libarchive_test" "bsdcpio_test"
"bsdtar_test"))
+ ;; XXX: This glob disables too much.
+ (zero? (system* "./libarchive_test" "^test_*_disk*"))
+ (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
+ (zero? (system* "./bsdtar_test"))))))
;; libarchive/test/test_write_format_gnutar_filenames.c needs to be
;; compiled with C99 or C11 or a gnu variant.
#:configure-flags '("CFLAGS=-O2 -g -std=c99")))
- branch core-updates updated (b83ad3a -> b33c255), Efraim Flashner, 2017/10/01
- 04/14: gnu: libarchive: Update to 3.3.2., Efraim Flashner, 2017/10/01
- 03/14: gnu: Remove package/inherit from commencement., Efraim Flashner, 2017/10/01
- 05/14: gnu: libarchive: Use 'modify-phases' syntax.,
Efraim Flashner <=
- 10/14: gnu: bluez: Ungraft package., Efraim Flashner, 2017/10/01
- 02/14: gnu: binutils: Update to 2.28.1., Efraim Flashner, 2017/10/01
- 06/14: gnu: curl: Update to 7.55.0., Efraim Flashner, 2017/10/01
- 08/14: gnu: libgcrypt: Update to 1.8.1., Efraim Flashner, 2017/10/01
- 13/14: gnu: libtasn1: Ungraft package., Efraim Flashner, 2017/10/01
- 14/14: gnu: expat: Update to 2.2.2., Efraim Flashner, 2017/10/01
- 09/14: gnu: gdk-pixbuf: Update to 2.36.10., Efraim Flashner, 2017/10/01
- 12/14: gnu: ruby: Update to 2.4.2., Efraim Flashner, 2017/10/01
- 01/14: Merge remote-tracking branch 'origin/master' into core-updates, Efraim Flashner, 2017/10/01
- 11/14: gnu: pcre: Update to 8.41., Efraim Flashner, 2017/10/01