02/02: gnu: gnutls: Default to Guile 2.2.

[Ludovic Courtès]

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

commit a07007876a5dfa0e536668884f78c62c24ca2d8e
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 25 14:37:26 2017 +0200

    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.
---
 gnu/packages/tls.scm | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 17b1527..9aa482a 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -156,9 +156,7 @@ living in the same process.")
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
-       (list (string-append "--with-guile-site-dir="
-                            (assoc-ref %outputs "out")
-                            "/share/guile/site/2.0")
+       (list
              ;; GnuTLS doesn't consult any environment variables to specify
              ;; the location of the system-wide trust store.  Instead it has a
              ;; configure-time option.  Unless specified, its configure script
@@ -195,7 +193,7 @@ living in the same process.")
        ("pkg-config" ,pkg-config)
        ("which" ,which)))
     (inputs
-     `(("guile" ,guile-2.0)))
+     `(("guile" ,guile-2.2)))
     (propagated-inputs
      ;; These are all in the 'Requires.private' field of gnutls.pc.
      `(("libtasn1" ,libtasn1)
@@ -214,16 +212,14 @@ required structures.")
                   (ftp-directory . "/gcrypt/gnutls")))))
 
 (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
     (inherit gnutls)
-    (name "guile2.2-gnutls")
-    (arguments
-     ;; Remove '--with-guile-site-dir=…/2.0'.
-     (substitute-keyword-arguments (package-arguments gnutls)
-       ((#:configure-flags flags)
-        `(cdr ,flags))))
-    (inputs `(("guile" ,guile-2.2)
+    (name "guile2.0-gnutls")
+    (inputs `(("guile" ,guile-2.0)
               ,@(alist-delete "guile" (package-inputs gnutls))))))
 
 (define-public openssl