ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?)
(define (load-gnutls) (define (load-gnutls)
;; XXX: Use this hack instead of #:autoload to avoid compilation errors. ;; XXX: Use this hack instead of #:autoload to avoid compilation errors.
;; See <http://bugs.gnu.org/12202>. ;; 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))) (set! load-gnutls (const #t)))
(define %x509-certificate-directory (define %x509-certificate-directory

2
guix/git.scm
View file

@ -203,7 +203,7 @@ (define (load-git-submodules)
(set! load-git-submodules (const #f)) (set! load-git-submodules (const #f))
#f) #f)
(iface (iface
(module-use! (current-module) iface) (module-use! (resolve-module '(guix git)) iface)
(set! load-git-submodules (const #t)) (set! load-git-submodules (const #t))
#t))) #t)))