From 3c747a080f015c9e62d76fc9b206b8393759e27a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Feb 2018 03:27:54 +0100 Subject: 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(-) (limited to 'gnu/packages/certs.scm') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 30e53e3458..2b5ea3850a 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; 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) -- cgit v1.2.3 From 9fcec717d3912c3c4bc05f81703e51ce93ae8753 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Mar 2018 17:38:55 +0100 Subject: gnu: nss, nss-certs: Update to 3.36. * gnu/packages/gnuzilla.scm (nss): Update to 3.36. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/certs.scm') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index e016d9f2ad..3cbf9202f9 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -75,7 +75,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.35") + (version "3.36") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -86,7 +86,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl")))) + "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index dfc6e1080f..c9c96c4746 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -286,7 +286,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.35") + (version "3.36") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -297,7 +297,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl")) + "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) -- cgit v1.2.3