tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: nss-certs-for-test: Use ‘with-imported-modules’.

Browse Source 
This is functionally equivalent to the previous style but hopefully clearer.

* gnu/packages/nss.scm (nss-certs-for-test)[arguments]: Remove #:modules and
use ‘with-imported-modules’ instead.

Change-Id: I6cb7b4d377d891e42c4a4dfb55230169714da523
This commit is contained in:
Ludovic Courtès
2026-02-14 23:16:36 +01:00
parent 13f2fe8936
commit 0e1cd35d6e
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gnu/packages/nss.scm
View File

@@ -364,32 +364,33 @@ taken from the NSS package and thus ultimately from the Mozilla project.")
(inputs '())
(propagated-inputs '())
(arguments
(list #:modules '((guix build utils))
#:builder
#~(begin
(use-modules (guix build utils)
(rnrs io ports)
(srfi srfi-26))
(define certs-dir (string-append #$output "/etc/ssl/certs/"))
(define ca-files
(find-files (string-append #+(this-package-native-input
"nss-certs")
"/etc/ssl/certs")
(lambda (file stat)
(string-suffix? ".pem" file))))
(define (concatenate-files files result)
"Make RESULT the concatenation of all of FILES."
(define (dump file port)
(display (call-with-input-file file get-string-all) port)
(newline port))
(call-with-output-file result
(lambda (port)
(for-each (cut dump <> port) files))))
(list
#:builder
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils)
(rnrs io ports)
(srfi srfi-26))
(define certs-dir (string-append #$output "/etc/ssl/certs/"))
(define ca-files
(find-files (string-append #+(this-package-native-input
"nss-certs")
"/etc/ssl/certs")
(lambda (file stat)
(string-suffix? ".pem" file))))
(define (concatenate-files files result)
"Make RESULT the concatenation of all of FILES."
(define (dump file port)
(display (call-with-input-file file get-string-all) port)
(newline port))
(call-with-output-file result
(lambda (port)
(for-each (cut dump <> port) files))))
(mkdir-p certs-dir)
(concatenate-files
ca-files (string-append certs-dir "/ca-certificates.crt"))
(for-each (cut install-file <> certs-dir) ca-files))))
(mkdir-p certs-dir)
(concatenate-files
ca-files (string-append certs-dir "/ca-certificates.crt"))
(for-each (cut install-file <> certs-dir) ca-files)))))
(native-search-paths
(list $SSL_CERT_DIR
$SSL_CERT_FILE)))))