summary refs log tree commit diff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-02-20 17:51:57 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-20 17:51:57 +0100
commit5f9f034e2fd1694bf92f4c40b405c46b8417e642 (patch)
tree2f0307e3e4993aebad612c034163d1f3e335bc4d /gnu/packages/tls.scm
parent971c8bb0a65a730c566eedacd02b689d79c5d562 (diff)
downloadguix-5f9f034e2fd1694bf92f4c40b405c46b8417e642.tar.gz
gnu: guile3.0-gnutls: Update to 3.6.12.
* gnu/packages/tls.scm (gnutls-3.6.10): Remove variable.
(guile3.0-gnutls): Inherit from GNUTLS.
[arguments]: Remove.
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm29
1 files changed, 2 insertions, 27 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index ca8838a0d6..e498909047 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -266,38 +266,13 @@ required structures.")
     (inputs `(("unbound" ,unbound)
               ,@(package-inputs gnutls)))))
 
-(define gnutls-3.6.10
-  ;; This is for 'guile3.0-gnutls', below.  Version 3.6.10 is the first to
-  ;; introduce Guile 2.9/3.0 support.
-  (package
-    (inherit gnutls)
-    (version "3.6.10")
-    (source (origin
-              (inherit (package-source gnutls))
-              (uri (string-append "mirror://gnupg/gnutls/v"
-                                  (version-major+minor version)
-                                  "/gnutls-" version ".tar.xz"))
-              (sha256
-               (base32
-                "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))))
-
 (define-public guile3.0-gnutls
   (package
-    (inherit gnutls-3.6.10)
+    (inherit gnutls)
     (name "guile3.0-gnutls")
-    (arguments
-     (substitute-keyword-arguments (package-arguments gnutls-3.6.10)
-       ((#:phases phases '%standard-phases)
-        `(modify-phases ,phases
-           (add-before 'build 'leave-guile-stdout-open
-             (lambda _
-               ;; Work around <https://bugs.gnu.org/38348>.
-               (substitute* "guile/Makefile"
-                 (("out=-") "out=/dev/null"))
-               #t))))))
     (inputs `(("guile" ,guile-next)
               ,@(alist-delete "guile"
-                              (package-inputs gnutls-3.6.10))))))
+                              (package-inputs gnutls))))))
 
 (define-public openssl
   (package