guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/08: gnu: nss-certs: Do not inherit version and source from nss.


From: guix-commits
Subject: 08/08: gnu: nss-certs: Do not inherit version and source from nss.
Date: Sat, 19 Jun 2021 11:09:26 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 6500c9a5b364616e38a7e03aa4516fc2d7cee876
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 19 16:52:59 2021 +0200

    gnu: nss-certs: Do not inherit version and source from nss.
    
    ...in order to avoid a top-level variable reference.  This reverts commit
    18c38c18989aab28a654c9e546243603690cc75e.
    
    * gnu/packages/certs.scm (nss-certs)[version, source]: Do not inherit from 
NSS.
---
 gnu/packages/certs.scm | 14 ++++++++++++--
 gnu/packages/nss.scm   |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index 60fa8ce..82e5b8c 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -71,8 +71,18 @@ that was originally contributed to Debian.")
 (define-public nss-certs
   (package
     (name "nss-certs")
-    (version (package-version nss))
-    (source (package-source nss))
+    (version "3.67")
+    (source (origin
+              (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
+                "0zyfi27lbdz1bmk9dmsivcya4phx25rzlxqcnjab69yd928rlm7n"))))
     (build-system gnu-build-system)
     (outputs '("out"))
     (native-inputs
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 2b6bdf3..55eddc0 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -71,8 +71,8 @@ platform-neutral API for system level and libc-like 
functions.  It is used
 in the Mozilla clients.")
     (license license:mpl2.0)))
 
-;;; Note: When updating, also test the build of the nss-certs package, which
-;;; uses the same source as nss.
+;;; Note: When updating, also update the nss-certs package, which cannot
+;;; inherit from here.
 (define-public nss
   (package
     (name "nss")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]