From e74250c3c535b75dd2225a26df51febb7ed94654 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 28 Apr 2021 00:23:09 -0400 Subject: Revert "download: Use Disarchive as a last resort." This reverts commit 66b14dccdd0d83c875ce3a8d50ceab8b6f0a3ce2, which broke 'guix pull'. --- guix/scripts/perform-download.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'guix/scripts/perform-download.scm') 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 @@ (define* (perform-download drv #:optional output (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 @@ (define* (perform-download drv #:optional output (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 -- cgit v1.2.3