| Message ID | 20160718115941.17707-2-ricardo.wurmus@mdc-berlin.de |
|---|---|
| State | New |
| Headers | show |
On Mon, Jul 18, 2016 at 01:59:39PM +0200, Ricardo Wurmus wrote: > * gnu/packages/certs.scm (nss-certs): Stop inheriting from nss package. Why do we want to do this? It appears to me that the resulting package would be the same. Is there a plan to let the versions diverge in the future? > +;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> Is this intentional?
Leo Famulari <leo@famulari.name> writes: > On Mon, Jul 18, 2016 at 01:59:39PM +0200, Ricardo Wurmus wrote: >> * gnu/packages/certs.scm (nss-certs): Stop inheriting from nss package. > > Why do we want to do this? > > It appears to me that the resulting package would be the same. Is there > a plan to let the versions diverge in the future? We have a module cycle when using the certs module from the java module. By separating “nss-certs” from the “nss” package we break the cycle. Ludo explained it well in this email: http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00648.html >> +;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> > > Is this intentional? Yes. This patch is almost exactly the same as what Ludo proposed in the email above. I cannot take credit for this. ~~ Ricardo
On Mon, Jul 18, 2016 at 09:34:18PM +0200, Ricardo Wurmus wrote: > Leo Famulari <leo@famulari.name> writes: > > > On Mon, Jul 18, 2016 at 01:59:39PM +0200, Ricardo Wurmus wrote: > >> * gnu/packages/certs.scm (nss-certs): Stop inheriting from nss package. > > > > Why do we want to do this? > > > > It appears to me that the resulting package would be the same. Is there > > a plan to let the versions diverge in the future? > > We have a module cycle when using the certs module from the java > module. By separating “nss-certs” from the “nss” package we break the > cycle. Ludo explained it well in this email: > > http://lists.gnu.org/archive/html/guix-devel/2016-06/msg00648.html > > >> +;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> > > > > Is this intentional? > > Yes. This patch is almost exactly the same as what Ludo proposed in the > email above. I cannot take credit for this. Ah, thanks for explaining!
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis: > From: Ricardo Wurmus <rekado@elephly.net> > > * gnu/packages/certs.scm (nss-certs): Stop inheriting from nss package. OK!
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index dd7d339..f5a4372 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +25,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) - #:use-module (gnu packages gnuzilla) #:use-module (gnu packages python) #:use-module (gnu packages perl) #:use-module (gnu packages tls)) @@ -71,8 +71,20 @@ (home-page "http://pkgs.fedoraproject.org/cgit/ca-certificates.git/"))) (define-public nss-certs - (package (inherit nss) ; to reuse the source, version and some metadata + (package (name "nss-certs") + (version "3.23") + (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 + "1kqidv91icq96m9m8zx50n7px08km2l88458rkgyjwcn3kiq7cwl")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs @@ -123,5 +135,7 @@ '(set-paths install-locale unpack))))) (synopsis "CA certificates from Mozilla") (description - "This package provides certificates for Certification Authorities (CA) -taken from the NSS package and thus ultimately from the Mozilla project."))) + "This package provides certificates for Certification Authorities (CA) +taken from the NSS package and thus ultimately from the Mozilla project.") + (home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS") + (license license:mpl2.0)))
From: Ricardo Wurmus <rekado@elephly.net> * gnu/packages/certs.scm (nss-certs): Stop inheriting from nss package. --- gnu/packages/certs.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)