diff options
author | Timothy Sample <samplet@ngyro.com> | 2021-03-19 23:03:25 -0400 |
---|---|---|
committer | Timothy Sample <samplet@ngyro.com> | 2021-04-29 11:24:48 -0400 |
commit | fbc2a52a32ddc664db8ebab420c2e17b1432c744 (patch) | |
tree | 11aa4c9a85a66edd1e8f30bb29c3c3978c037100 /guix/self.scm | |
parent | df0b7233450d0ad70eb7b7a7294a2d2f37118603 (diff) | |
download | guix-patches-fbc2a52a32ddc664db8ebab420c2e17b1432c744.tar guix-patches-fbc2a52a32ddc664db8ebab420c2e17b1432c744.tar.gz |
download: Use Disarchive as a last resort.
This is a fixed version of 66b14dccdd0d83c875ce3a8d50ceab8b6f0a3ce2,
which was reverted in e74250c3c535b75dd2225a26df51febb7ed94654.
* guix/download.scm (%disarchive-mirrors): New variable.
(%disarchive-mirror-file): New variable.
(built-in-download): Add 'disarchive-mirrors' keyword argument and
pass its value along to the 'builtin:download' derivation.
(url-fetch): Pass '%disarchive-mirror-file' to 'built-in-download'.
* guix/scripts/perform-download.scm (perform-download): Read
Disarchive mirrors from the environment and pass them to
'url-fetch'.
* guix/build/download.scm (disarchive-fetch/any): New procedure.
(url-fetch): Add 'disarchive-mirrors' keyword argument, use it to
make a list of URIs, and use the new procedure to fetch the file if
all other methods fail.
* build-aux/build-self.scm (build-program)[select?]: Exclude '(guix
build download)'.
* guix/self.scm (compiled-guix)[*core-modules*]: Add 'guile-json' to
the list of extensions.
Diffstat (limited to 'guix/self.scm')
-rw-r--r-- | guix/self.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index 3154d180ac..7181205610 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -878,7 +878,8 @@ itself." ("guix/store/schema.sql" ,(local-file "../guix/store/schema.sql"))) - #:extensions (list guile-gcrypt) + #:extensions (list guile-gcrypt + guile-json) ;for (guix swh) #:guile-for-build guile-for-build)) (define *extra-modules* |