diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2021-05-02 18:31:13 +0200 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-05-02 18:42:11 +0200 |
commit | d2b5bb5f9de8dc1a51260e17cd91c3039070a7f2 (patch) | |
tree | 4b31010b936d3e4ef4e837ce2385f78d3175749f | |
parent | 2710df38b0c317bdc69c61c7775d8141eb214dd1 (diff) |
hg-download: Add guile-json and gnutls extensions.
This partially fixes: <https://issues.guix.gnu.org/48152>.
The (guix build download-nar) module drags the (guix build download) module
that autoloads (guix swh).
[13/26] Loading './guix/swh.scm'...
;;; Failed to autoload swh-download-directory in (guix swh):
;;; no code for module (json)
Backtrace:
In srfi/srfi-1.scm:
460:18 19 (fold #<procedure 7ffff2c50760 at ice-9/eval.scm:336:1?> ?)
In ice-9/eval.scm:
619:8 18 (_ #(#(#<directory (guix build utils) 7ffff318fd20>) # ?))
In ice-9/boot-9.scm:
2806:4 17 (save-module-excursion #<procedure 7ffff25b1a00 at ice-?>)
In unknown file:
16 (primitive-load "./guix/swh.scm")
In ice-9/eval.scm:
721:20 15 (primitive-eval (define-module (guix swh) #:use-module ?))
In ice-9/psyntax.scm:
1241:36 14 (expand-top-sequence ((define-module (guix swh) # # ?)) ?)
1233:19 13 (parse _ (("placeholder" placeholder)) ((top) #(# # ?)) ?)
285:10 12 (parse _ (("placeholder" placeholder)) (()) _ c&e (eval) ?)
In ice-9/eval.scm:
293:34 11 (_ #<directory (guix build utils) 7ffff318fd20>)
In ice-9/boot-9.scm:
3380:4 10 (define-module* _ #:filename _ #:pure _ #:version _ # _ ?)
2565:24 9 (call-with-deferred-observers #<procedure 7ffff2215230 ?>)
3393:24 8 (_)
222:29 7 (map1 (((guix base16)) ((guix build utils)) ((# ?) ?) ?))
222:29 6 (map1 (((guix build utils)) ((guix build syscalls) ?) ?))
222:29 5 (map1 (((guix build syscalls) #:select (mkdtemp!)) (#) ?))
222:29 4 (map1 (((web uri)) ((web client)) ((web response)) (#) ?))
222:29 3 (map1 (((web client)) ((web response)) ((json)) ((?)) ?))
222:29 2 (map1 (((web response)) ((json)) ((srfi srfi-1)) ((?)) ?))
222:17 1 (map1 (((json)) ((srfi srfi-1)) ((srfi srfi-9)) ((?)) ?))
3300:6 0 (resolve-interface (json) #:select _ #:hide _ #:prefix _ ?)
ice-9/boot-9.scm:3300:6: In procedure resolve-interface:
no code for module (json)
* guix/hg-download.scm (hg-fetch): Add guile-json and gnutls as extensions.
-rw-r--r-- | guix/hg-download.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/hg-download.scm b/guix/hg-download.scm index bd55946523..c6cee2dbb8 100644 --- a/guix/hg-download.scm +++ b/guix/hg-download.scm @@ -65,6 +65,12 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (define guile-zlib (module-ref (resolve-interface '(gnu packages guile)) 'guile-zlib)) + (define guile-json + (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) + + (define gnutls + (module-ref (resolve-interface '(gnu packages tls)) 'gnutls)) + (define modules (delete '(guix config) (source-module-closure '((guix build hg) @@ -72,7 +78,8 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (define build (with-imported-modules modules - (with-extensions (list guile-zlib) + (with-extensions (list guile-json gnutls ;for (guix swh) + guile-zlib) #~(begin (use-modules (guix build hg) (guix build download-nar)) |