guix-commits
[Top][All Lists]
Advanced

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

03/03: download, git: Refer to the right module in 'module-use!' call.


From: guix-commits
Subject: 03/03: download, git: Refer to the right module in 'module-use!' call.
Date: Tue, 7 Jan 2020 06:25:17 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 058d0251bd14fdbb06ce223bbecc8eb1a0d74382
Author: Ludovic Court├Ęs <address@hidden>
AuthorDate: Tue Jan 7 11:45:56 2020 +0100

    download, git: Refer to the right module in 'module-use!' call.
    
    This fixes a regression introduced in
    6a7c4636d4dec47eefa03c95da5a1315bd0e0413.
    
    * guix/build/download.scm (load-gnutls): Call 'resolve-module' instead
    of 'current-module'.
    * guix/git.scm (load-git-submodules): Likewise.
---
 guix/build/download.scm | 3 ++-
 guix/git.scm            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/build/download.scm b/guix/build/download.scm
index 641dace..0f2d5f4 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -158,7 +158,8 @@ out if the connection could not be established in less than 
TIMEOUT seconds."
 (define (load-gnutls)
   ;; XXX: Use this hack instead of #:autoload to avoid compilation errors.
   ;; See <http://bugs.gnu.org/12202>.
-  (module-use! (current-module) (resolve-interface '(gnutls)))
+  (module-use! (resolve-module '(guix build download))
+               (resolve-interface '(gnutls)))
   (set! load-gnutls (const #t)))
 
 (define %x509-certificate-directory
diff --git a/guix/git.scm b/guix/git.scm
index 15a0a6f..a12f1ee 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -203,7 +203,7 @@ Return true on success, false on failure."
      (set! load-git-submodules (const #f))
      #f)
     (iface
-     (module-use! (current-module) iface)
+     (module-use! (resolve-module '(guix git)) iface)
      (set! load-git-submodules (const #t))
      #t)))
 



reply via email to

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