From patchwork Sun Apr 3 00:49:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Kubisiak X-Patchwork-Id: 38291 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0392527BBEA; Sun, 3 Apr 2022 01:50:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE2B927BBE9 for ; Sun, 3 Apr 2022 01:50:29 +0100 (BST) Received: from localhost ([::1]:48442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naoRo-0004Ce-Th for patchwork@mira.cbaines.net; Sat, 02 Apr 2022 20:50:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naoRP-0004C9-DG for guix-patches@gnu.org; Sat, 02 Apr 2022 20:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naoRN-0005ei-Qa for guix-patches@gnu.org; Sat, 02 Apr 2022 20:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naoRN-0005Sl-Jv for guix-patches@gnu.org; Sat, 02 Apr 2022 20:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54686] [PATCH] gnu: nss-certs: Use G-Expression. Resent-From: Brian Kubisiak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Apr 2022 00:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54686@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164894697020955 (code B ref -1); Sun, 03 Apr 2022 00:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2022 00:49:30 +0000 Received: from localhost ([127.0.0.1]:47153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naoQr-0005Rv-So for submit@debbugs.gnu.org; Sat, 02 Apr 2022 20:49:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:35954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naoQr-0005Ro-7H for submit@debbugs.gnu.org; Sat, 02 Apr 2022 20:49:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naoQr-00049W-0A for guix-patches@gnu.org; Sat, 02 Apr 2022 20:49:29 -0400 Received: from mn-69-69-108-139.sta.embarqhsd.net ([69.69.108.139]:1455 helo=mail.kubisiak.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naoQp-0005bc-EG for guix-patches@gnu.org; Sat, 02 Apr 2022 20:49:28 -0400 Received: from peregrine (108-237-41-25.lightspeed.sntcca.sbcglobal.net [108.237.41.25]) by mail.kubisiak.com with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Sat, 2 Apr 2022 19:49:09 -0500 Date: Sat, 2 Apr 2022 17:49:15 -0700 From: Brian Kubisiak Message-ID: <20220403004915.rzqmwkqkags4adf6@peregrine> MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass client-ip=69.69.108.139; envelope-from=brian@kubisiak.com; helo=mail.kubisiak.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This fixes cross-compilation for aarch64-linux-gnu. * gnu/packages/certs.scm (nss-certs)[arguments]: Use a gexp to remove references to %output. --- gnu/packages/certs.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 28c2f84f98..8f762f2966 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -28,6 +28,7 @@ (define-module (gnu packages certs) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -164,21 +165,21 @@ (define-public nss-certs (rnrs io ports) (srfi srfi-26)) #:phases - (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/"))) - (with-directory-excursion "nss/lib/ckfw/builtins/" - (unless (file-exists? "blacklist.txt") - (call-with-output-file "blacklist.txt" (const #t))) - ;; Extract selected single certificates from blob. - (invoke "certdata2pem") - ;; Copy .pem files into the output. - (for-each (cut install-file <> certsdir) - (find-files "." ".*\\.pem$"))) - (invoke "openssl" "rehash" certsdir))))))) + ,#~(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/"))) + (with-directory-excursion "nss/lib/ckfw/builtins/" + (unless (file-exists? "blacklist.txt") + (call-with-output-file "blacklist.txt" (const #t))) + ;; Extract selected single certificates from blob. + (invoke "certdata2pem") + ;; Copy .pem files into the output. + (for-each (cut install-file <> certsdir) + (find-files "." ".*\\.pem$"))) + (invoke "openssl" "rehash" certsdir))))))) (synopsis "CA certificates from Mozilla") (description "This package provides certificates for Certification Authorities (CA)