[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: nss-certs: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
01/01: gnu: nss-certs: Update phase style. |
Date: |
Mon, 19 Feb 2018 21:51:17 -0500 (EST) |
nckx pushed a commit to branch staging
in repository guix.
commit 3c747a080f015c9e62d76fc9b206b8393759e27a
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Feb 20 03:27:54 2018 +0100
gnu: nss-certs: Update phase style.
* gnu/packages/certs.scm (nss-certs)[arguments]: Use MODIFY-PHASES
syntax, substitute INVOKE for SYSTEM*, and end phas with #t.
---
gnu/packages/certs.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index 30e53e3..2b5ea38 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2017 Leo Famulari <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -102,8 +102,10 @@
(srfi srfi-26)
(ice-9 regex))
#:phases
- (alist-cons-after
- 'unpack 'install
+ (modify-phases
+ (map (cut assq <> %standard-phases)
+ '(set-paths install-locale unpack))
+ (add-after 'unpack 'install
(lambda _
(let ((certsdir (string-append %output "/etc/ssl/certs/"))
(trusted-rx (make-regexp "^# openssl-trust=[a-zA-Z]"
@@ -131,10 +133,9 @@
;; "Usage error; try -help."
;; This looks like a bug in openssl-1.0.2, but we can also
;; switch into the target directory.
- (system* "c_rehash" "."))))
+ (invoke "c_rehash" "."))
+ #t))))))
- (map (cut assq <> %standard-phases)
- '(set-paths install-locale unpack)))))
(synopsis "CA certificates from Mozilla")
(description
"This package provides certificates for Certification Authorities (CA)