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/scripts | |
| 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/scripts')
| -rw-r--r-- | guix/scripts/perform-download.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/scripts/perform-download.scm b/guix/scripts/perform-download.scm index 8d409092ba..6889bcef79 100644 --- a/guix/scripts/perform-download.scm +++ b/guix/scripts/perform-download.scm @@ -54,7 +54,8 @@ actual output is different from that when we're doing a 'bmCheck' or (output* "out") (executable "executable") (mirrors "mirrors") - (content-addressed-mirrors "content-addressed-mirrors")) + (content-addressed-mirrors "content-addressed-mirrors") + (disarchive-mirrors "disarchive-mirrors")) (unless url (leave (G_ "~a: missing URL~%") (derivation-file-name drv))) @@ -79,6 +80,10 @@ actual output is different from that when we're doing a 'bmCheck' or (lambda (port) (eval (read port) %user-module))) '()) + #:disarchive-mirrors + (if disarchive-mirrors + (call-with-input-file disarchive-mirrors read) + '()) #:hashes `((,algo . ,hash)) ;; Since DRV's output hash is known, X.509 certificate |