amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "download: Use Disarchive as a last resort."

Browse source 
This reverts commit 66b14dccdd, which broke
'guix pull'.
This commit is contained in:
Timothy Sample 2021-04-28 00:23:09 -04:00
parent 1f6854bd06
commit e74250c3c5
No known key found for this signature in database
GPG key ID: 2AC6A5EC1C357C59
3 changed files with 14 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

7
guix/scripts/perform-download.scm
View file

@ -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