From 69ed946bbcb12b9dd114bbf9bbc9d2e3d1ce6fba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Oct 2022 10:45:41 +0200 Subject: gnu: gnutls-latest: Remove dependency on Guile. * gnu/packages/tls.scm (gnutls-latest)[inputs]: Remove 'guile' and add 'libunistring'. [native-inputs]: Remove 'guile'. --- gnu/packages/tls.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 3e0210f661..9705f823f0 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -66,6 +66,7 @@ (define-module (gnu packages tls) #:use-module (gnu packages libbsd) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) + #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) @@ -330,8 +331,6 @@ (define-public gnutls (ftp-directory . "/gcrypt/gnutls"))))) (define-public gnutls-latest - ;; Version 3.7.7 introduces 'set-session-record-port-close!', which allows - ;; us to get rid of the wrapper port in 'tls-wrap'. (package (inherit gnutls) (version "3.7.7") @@ -344,7 +343,14 @@ (define-public gnutls-latest "gnutls-cross.patch")) (sha256 (base32 - "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))))) + "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))) + + ;; Disable Guile bindings: they are now provided by Guile-GnuTLS. + (inputs (modify-inputs (package-inputs gnutls) + (delete "guile") + (append libunistring))) ;GnuTLS depends on it + (native-inputs (modify-inputs (package-native-inputs gnutls) + (delete "guile"))))) (define-public gnutls/guile-2.0 ;; GnuTLS for Guile 2.0. -- cgit v1.2.3