me/guix
Archived
1
0
Fork 0
Code Activity

gnu: nss-certs: Sync with the sources used for nss.

Browse source 
* gnu/packages/certs.scm (nss-certs)[version]: Reuse nss version.
[source]: Reuse nss source.
[phases]{install}: Adjust for the new NSS source files hierarchy.  Remove
trailing #t.
This commit is contained in:
Maxim Cournoyer 2021-01-26 10:02:30 -05:00
parent cfcead2e51
commit 18c38c1898
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/certs.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +28,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages nss)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages tls)) #:use-module (gnu packages tls))
@ -76,18 +78,8 @@
(define-public nss-certs (define-public nss-certs
(package (package
(name "nss-certs") (name "nss-certs")
(version "3.59") (version (package-version nss))
(source (origin (source (package-source nss))
(method url-fetch)
(uri (let ((version-with-underscores
(string-join (string-split version #\.) "_")))
(string-append
"https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
"releases/NSS_" version-with-underscores "_RTM/src/"
"nss-" version ".tar.gz")))
(sha256
(base32
"096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out")) (outputs '("out"))
(native-inputs (native-inputs
@ -120,7 +112,7 @@
(cut display cert <>))))) (cut display cert <>)))))
(mkdir-p certsdir) (mkdir-p certsdir)
(with-directory-excursion "nss/lib/ckfw/builtins/" (with-directory-excursion "lib/ckfw/builtins/"
;; extract single certificates from blob ;; extract single certificates from blob
(invoke "certdata2pem.py" "certdata.txt") (invoke "certdata2pem.py" "certdata.txt")
;; copy selected .pem files into the output ;; copy selected .pem files into the output
@ -134,8 +126,7 @@
;; "Usage error; try -help." ;; "Usage error; try -help."
;; This looks like a bug in openssl-1.0.2, but we can also ;; This looks like a bug in openssl-1.0.2, but we can also
;; switch into the target directory. ;; switch into the target directory.
(invoke "c_rehash" ".")) (invoke "c_rehash" "."))))))))
#t))))))
(synopsis "CA certificates from Mozilla") (synopsis "CA certificates from Mozilla")
(description (description