branch master updated: Revert "download: Refer to the 'guile-gnutls' package and not 'gnutls'."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c3d7c09b9f Revert "download: Refer to the 'guile-gnutls' package and 
not 'gnutls'."
c3d7c09b9f is described below

commit c3d7c09b9f8522f37a88e3a2d92ab38ce4a9c65a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat May 6 19:12:16 2023 +0200

    Revert "download: Refer to the 'guile-gnutls' package and not 'gnutls'."
    
    This reverts commit c625e5b64d0a6cb7ffbf2ef971d4c990b1f5c5c1, which
    introduced a circular dependency: the origin of guile-gnutls relies on
    'git-download', which would now depend on guile-gnutls.
---
 guix/android-repo-download.scm | 2 +-
 guix/cvs-download.scm          | 2 +-
 guix/git-download.scm          | 2 +-
 guix/hg-download.scm           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/android-repo-download.scm b/guix/android-repo-download.scm
index 9a134c269a..1d1b9e2f09 100644
--- a/guix/android-repo-download.scm
+++ b/guix/android-repo-download.scm
@@ -82,7 +82,7 @@ generic name if unset."
     (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib))
 
   (define gnutls
-    (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
+    (module-ref (resolve-interface '(gnu packages tls)) 'gnutls))
 
   (define config.scm
     (scheme-file "config.scm"
diff --git a/guix/cvs-download.scm b/guix/cvs-download.scm
index c0c526b9db..22af2461e9 100644
--- a/guix/cvs-download.scm
+++ b/guix/cvs-download.scm
@@ -68,7 +68,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
     (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4))
 
   (define gnutls
-    (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
+    (module-ref (resolve-interface '(gnu packages tls)) 'gnutls))
 
   (define modules
     (delete '(guix config)
diff --git a/guix/git-download.scm b/guix/git-download.scm
index d88f4c40ee..027ef47468 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -105,7 +105,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
     (module-ref (resolve-interface '(gnu packages guile)) 'guile-lzlib))
 
   (define gnutls
-    (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
+    (module-ref (resolve-interface '(gnu packages tls)) 'gnutls))
 
   (define glibc-locales
     ;; Note: pick the '-final' variant to avoid circular dependency on
diff --git a/guix/hg-download.scm b/guix/hg-download.scm
index 6d02de47e4..13135082fa 100644
--- a/guix/hg-download.scm
+++ b/guix/hg-download.scm
@@ -79,7 +79,7 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
     (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4))
 
   (define gnutls
-    (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
+    (module-ref (resolve-interface '(gnu packages tls)) 'gnutls))
 
   (define modules
     (delete '(guix config)