aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-11-28 00:38:25 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-11-28 00:38:25 +0100
commit0897ad7fac04fc9d814e83eed46e88c7bf9740bc (patch)
tree9bccfdb52de4c468778ceaabe337c0539c302a30 /gnu/packages/tls.scm
parent6d460e80d1b06fc094374e7ba5c2503f2a897f11 (diff)
parent9943d238e9f07dccae973b641eb7738637ce95fb (diff)
downloadguix-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar
guix-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm33
1 files changed, 33 insertions, 0 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a23eac58fc..6d91989b19 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -263,6 +263,39 @@ 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)
+ (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))))))
+
(define-public openssl
(package
(name "openssl")