From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kMS8IFfvSGJy8wAAgWs5BA (envelope-from ) for ; Sun, 03 Apr 2022 02:50:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yOxFGVfvSGL9dAAAG6o9tA (envelope-from ) for ; Sun, 03 Apr 2022 02:50:31 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DBF082E107 for ; Sun, 3 Apr 2022 02:50:30 +0200 (CEST) Received: from localhost ([::1]:48442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naoRp-0004Ce-Km for larch@yhetil.org; Sat, 02 Apr 2022 20:50:29 -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-Type: text/plain; charset=us-ascii 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648947031; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post; bh=U1S+NdOltxqZ3xgv6sAtlgbcoqbZZ9eMpZLSzDPl+uY=; b=BydKRsYK8ujOS7DEvjGDMoB4ACpNJa5cTfqfHcUBCc6hRIcvtoLXl6TEdXVfmVTTIsEDnc gx0Btq+icxwAL/8aO1iA/wtzELvgwy+RCzy0oXq9E8RwYU0higrDC5PK1VGuK7cwspbCim IZF4a7OjeT7YkkSuszZ2q8ONDUDXyNl0Hwz6zm2YA/rMxJ5bWs41jKZ8Fhzy1biUYJAvjy 3qqZkrE4pwxZ1KMomUjn54RKZv5ULYgc8O8Xqj2Do/BfBLUnRcu9We0pkTLztOXkoAdLpI 0SEZihA2/fniKLhkSDmkTXg9KZDWDLgd3gW4fzBDCU80HUgJrNteSz2i3Go9/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648947031; a=rsa-sha256; cv=none; b=o7uKO0JnZSMJfcfP/pq2QF/lfgEk5vkw7ysxzQsbkTKH6Uq0jwUL8RLptovWgEtMGOB/49 kyI/n8feYSNAEuztenSV7XEyoQ9ZtnO9ecw+0qPBi6003p+GfTC0fgo6dx+5jfHeBZeClB 978RKm1yh/Z7VoivsYQuQw0ezifD3wFzOYKLvY9Y0uNhuiX9VXgiDlRHC8flZ2b3qLjgPE VT6SRF8yrxoVFWQVzDM8u42mI1hGir0FddzLQtSPNQoBTDtwBLgY2D1NzYYb62S2CqbFjX NEx/5/c9IDdj3pYTXjuJcdLcHwI0Y68ddUZtg0hZNYTamvRm6zHROttgevPjOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.78 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DBF082E107 X-Spam-Score: -2.78 X-Migadu-Scanner: scn1.migadu.com X-TUID: VE99Ld1Juv+Z 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) -- 2.34.0