nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gnutls: Default to Guile 2.2. 

* gnu/packages/tls.scm (gnutls)[arguments]: Remove
'--with-guile-site-dir' configure flag.
[inputs]: Use GUILE-2.2 instead of GUILE-2.0.
(gnutls/guile-2.2): Redefine using 'deprecated-package'.
(gnutls/guile-2.0): New variable.
This commit is contained in:
Ludovic Courtès 2017-05-25 14:37:26 +02:00
parent 696487d665
commit a07007876a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/tls.scm
View File

@ -156,9 +156,7 @@ living in the same process.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
(list (string-append "--with-guile-site-dir=" (list
(assoc-ref %outputs "out")
"/share/guile/site/2.0")
;; GnuTLS doesn't consult any environment variables to specify ;; GnuTLS doesn't consult any environment variables to specify
;; the location of the system-wide trust store. Instead it has a ;; the location of the system-wide trust store. Instead it has a
;; configure-time option. Unless specified, its configure script ;; configure-time option. Unless specified, its configure script
@ -195,7 +193,7 @@ living in the same process.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which))) ("which" ,which)))
(inputs (inputs
`(("guile" ,guile-2.0))) `(("guile" ,guile-2.2)))
(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)
@ -214,16 +212,14 @@ required structures.")
(ftp-directory . "/gcrypt/gnutls"))))) (ftp-directory . "/gcrypt/gnutls")))))
(define-public gnutls/guile-2.2 (define-public gnutls/guile-2.2
;; GnuTLS for Guile 2.2. This is supported by GnuTLS >= 3.5.5. (deprecated-package "guile2.2-gnutls" gnutls))
(define-public gnutls/guile-2.0
;; GnuTLS for Guile 2.0.
(package (package
(inherit gnutls) (inherit gnutls)
(name "guile2.2-gnutls") (name "guile2.0-gnutls")
(arguments (inputs `(("guile" ,guile-2.0)
;; Remove '--with-guile-site-dir=…/2.0'.
(substitute-keyword-arguments (package-arguments gnutls)
((#:configure-flags flags)
`(cdr ,flags))))
(inputs `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs gnutls)))))) ,@(alist-delete "guile" (package-inputs gnutls))))))
(define-public openssl (define-public openssl