ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nettle: Make version 3 the default.

Browse source 
* gnu/packages/nettle.scm (nettle): Rename to...
  (nettle-2): ... this.
  (nettle-3): Rename to...
  (nettle): ... this.
* gnu/packages/gnutls.scm (gnutls): Use NETTLE-2.
* gnu/packages/lsh.scm (lsh): Likewise.
This commit is contained in:
Ludovic Courtès 2015-04-09 18:32:32 +02:00
parent 1421afa94a
commit 0be199c976
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/gnutls.scm
View file

@ -140,7 +140,7 @@ (define-public gnutls
(propagated-inputs (propagated-inputs
;; These are all in the 'Requires.private' field of gnutls.pc. ;; These are all in the 'Requires.private' field of gnutls.pc.
`(("libtasn1" ,libtasn1) `(("libtasn1" ,libtasn1)
("nettle" ,nettle) ("nettle" ,nettle-2)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "http://www.gnu.org/software/gnutls/") (home-page "http://www.gnu.org/software/gnutls/")
(synopsis "Transport layer security library") (synopsis "Transport layer security library")

4
gnu/packages/lsh.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -91,7 +91,7 @@ (define-public lsh
("gperf" ,gperf) ("gperf" ,gperf)
("psmisc" ,psmisc))) ; for `killall' ("psmisc" ,psmisc))) ; for `killall'
(inputs (inputs
`(("nettle" ,nettle) `(("nettle" ,nettle-2)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
;; 'rl.c' uses the 'CPPFunction' type, which is no longer in ;; 'rl.c' uses the 'CPPFunction' type, which is no longer in

8
gnu/packages/nettle.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,7 +24,7 @@ (define-module (gnu packages nettle)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages m4)) #:use-module (gnu packages m4))
(define-public nettle (define-public nettle-2
(package (package
(name "nettle") (name "nettle")
(version "2.7.1") (version "2.7.1")
@ -53,10 +53,10 @@ (define-public nettle
themselves.") themselves.")
(license gpl2+))) (license gpl2+)))
(define-public nettle-3 (define-public nettle
;; This version is not API-compatible with version 2. In particular GnuTLS ;; This version is not API-compatible with version 2. In particular GnuTLS
;; cannot use it yet. So keep it separate. ;; cannot use it yet. So keep it separate.
(package (inherit nettle) (package (inherit nettle-2)
(version "3.0") (version "3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)