summaryrefslogtreecommitdiff
path: root/guix/scripts/perform-download.scm
diff options
context:
space:
mode:
authorTimothy Sample <samplet@ngyro.com>2021-04-28 00:23:09 -0400
committerTimothy Sample <samplet@ngyro.com>2021-04-28 00:24:28 -0400
commite74250c3c535b75dd2225a26df51febb7ed94654 (patch)
treef8a62aa1a341ed9d9f5ba296e05bc17895f544ee /guix/scripts/perform-download.scm
parent1f6854bd066b1a5f0cd715f616696f90fd9983eb (diff)
Revert "download: Use Disarchive as a last resort."
This reverts commit 66b14dccdd0d83c875ce3a8d50ceab8b6f0a3ce2, which broke 'guix pull'.
Diffstat (limited to 'guix/scripts/perform-download.scm')
-rw-r--r--guix/scripts/perform-download.scm7
1 files changed, 1 insertions, 6 deletions
diff --git a/guix/scripts/perform-download.scm b/guix/scripts/perform-download.scm
index 6889bcef79..8d409092ba 100644
--- a/guix/scripts/perform-download.scm
+++ b/guix/scripts/perform-download.scm
@@ -54,8 +54,7 @@ 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")
- (disarchive-mirrors "disarchive-mirrors"))
+ (content-addressed-mirrors "content-addressed-mirrors"))
(unless url
(leave (G_ "~a: missing URL~%") (derivation-file-name drv)))
@@ -80,10 +79,6 @@ 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