rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This fixes a regression introduced in
6a7c4636d4.

* guix/build/download.scm (load-gnutls): Call 'resolve-module' instead
of 'current-module'.
* guix/git.scm (load-git-submodules): Likewise.
This commit is contained in:
Ludovic Courtès 2020-01-07 11:45:56 +01:00
parent 7a0836cffd
commit 058d0251bd
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build/download.scm
View File

@ -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

2
guix/git.scm
View File

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