civodul pushed a commit to branch master
in repository guix.
commit 3186a52e11aa1172c2dbdfe855127c9586f2b3b9
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sat May 6 18:17:25 2023 +0200
download: Refer to the 'guile-gnutls' package and not 'gnutls'.
This reinstates c625e5b64d0a6cb7ffbf2ef971d4c990b1f5c5c1, which was
reverted due to a circular dependency:
https://issues.guix.gnu.org/63331
This is a followup to 305794762cbb57d252d5305b69a18cec6528baef, which
removed Guile bindings from 'gnutls'.
* guix/android-repo-download.scm (android-repo-fetch): Refer to
'guile-gnutls instead of 'gnutls.
* guix/cvs-download.scm (cvs-fetch): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/hg-download.scm (hg-fetch): Likewise.
---
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 1d1b9e2f09..9a134c269a 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)) 'gnutls))
+ (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
(define config.scm
(scheme-file "config.scm"
diff --git a/guix/cvs-download.scm b/guix/cvs-download.scm
index 22af2461e9..c0c526b9db 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)) 'gnutls))
+ (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
(define modules
(delete '(guix config)
diff --git a/guix/git-download.scm b/guix/git-download.scm
index 027ef47468..d88f4c40ee 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)) 'gnutls))
+ (module-ref (resolve-interface '(gnu packages tls)) 'guile-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 13135082fa..6d02de47e4 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)) 'gnutls))
+ (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
(define modules
(delete '(guix config)
