guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/09: gnu: gnutls-latest: Remove dependency on Guile.


From: guix-commits
Subject: 02/09: gnu: gnutls-latest: Remove dependency on Guile.
Date: Tue, 18 Oct 2022 08:56:26 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 69ed946bbcb12b9dd114bbf9bbc9d2e3d1ce6fba
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Oct 18 10:45:41 2022 +0200

    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(-)

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 @@
   #: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 @@ required structures.")
                   (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 @@ required structures.")
                                        "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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]