GNU bug report logs - #54686
[PATCH] gnu: nss-certs: Use G-Expression.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Brian Kubisiak <brian <at> kubisiak.com>
Subject: bug#54686: closed (Re: bug#54686: [PATCH] gnu: nss-certs: Use
 G-Expression.)
Date: Mon, 02 May 2022 20:25:01 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#54686: [PATCH] gnu: nss-certs: Use G-Expression.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 54686 <at> debbugs.gnu.org.

-- 
54686: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54686
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Brian Kubisiak <brian <at> kubisiak.com>
Cc: 54686-done <at> debbugs.gnu.org
Subject: Re: bug#54686: [PATCH] gnu: nss-certs: Use G-Expression.
Date: Mon, 02 May 2022 22:24:18 +0200

Hi,

Brian Kubisiak <brian <at> kubisiak.com> skribis:

> This fixes cross-compilation for aarch64-linux-gnu.
>
> * gnu/packages/certs.scm (nss-certs)[arguments]: Use a gexp to remove
> references to %output.

I resolved the merge conflict and applied to ‘staging’ (the
cross-compilation issue was fixed in
5389c5ea57dd17e19412f38dc448b0a5114a3579.)

Thanks,
Ludo’.

[Message part 3 (message/rfc822, inline)]

From: Brian Kubisiak <brian <at> kubisiak.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: nss-certs: Use G-Expression.
Date: Sat, 2 Apr 2022 17:49:15 -0700

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.