From 6500c9a5b364616e38a7e03aa4516fc2d7cee876 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Jun 2021 16:52:59 +0200 Subject: 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(-) (limited to 'gnu/packages') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 60fa8cec29..82e5b8c987 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -71,8 +71,18 @@ (define certdata2pem (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 2b6bdf323a..55eddc0c91 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -71,8 +71,8 @@ (define-public nspr 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") -- cgit v1.2.3