From 5f9f034e2fd1694bf92f4c40b405c46b8417e642 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Feb 2020 17:51:57 +0100 Subject: 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. --- gnu/packages/tls.scm | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'gnu/packages') 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 @@ (define-public gnutls/dane (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 . - (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 -- cgit v1.2.3