diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-01-07 11:45:56 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-01-07 12:25:09 +0100 |
| commit | 058d0251bd14fdbb06ce223bbecc8eb1a0d74382 (patch) | |
| tree | 34901b760a288b2f6e93a54a9383834b30021c4e | |
| parent | 7a0836cffdfe3ab9ee899602f218277646959144 (diff) | |
| download | patches-058d0251bd14fdbb06ce223bbecc8eb1a0d74382.tar patches-058d0251bd14fdbb06ce223bbecc8eb1a0d74382.tar.gz | |
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.
| -rw-r--r-- | guix/build/download.scm | 3 | ||||
| -rw-r--r-- | guix/git.scm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/download.scm b/guix/build/download.scm index 641dacefa1..0f2d5f402a 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 15a0a6f9e5..a12f1eec8e 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))) |