diff options
| author | Timothy Sample <samplet@ngyro.com> | 2021-04-28 00:23:09 -0400 |
|---|---|---|
| committer | Timothy Sample <samplet@ngyro.com> | 2021-04-28 00:24:28 -0400 |
| commit | e74250c3c535b75dd2225a26df51febb7ed94654 (patch) | |
| tree | f8a62aa1a341ed9d9f5ba296e05bc17895f544ee /guix/download.scm | |
| parent | 1f6854bd066b1a5f0cd715f616696f90fd9983eb (diff) | |
| download | guix-e74250c3c535b75dd2225a26df51febb7ed94654.tar guix-e74250c3c535b75dd2225a26df51febb7ed94654.tar.gz | |
Revert "download: Use Disarchive as a last resort."
This reverts commit 66b14dccdd0d83c875ce3a8d50ceab8b6f0a3ce2, which broke
'guix pull'.
Diffstat (limited to 'guix/download.scm')
| -rw-r--r-- | guix/download.scm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/guix/download.scm b/guix/download.scm index 72094e7318..30f69c0325 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -406,19 +406,12 @@ (plain-file "content-addressed-mirrors" (object->string %content-addressed-mirrors))) -(define %disarchive-mirrors - '("https://disarchive.ngyro.com/")) - -(define %disarchive-mirror-file - (plain-file "disarchive-mirrors" (object->string %disarchive-mirrors))) - (define built-in-builders* (store-lift built-in-builders)) (define* (built-in-download file-name url #:key system hash-algo hash mirrors content-addressed-mirrors - disarchive-mirrors executable? (guile 'unused)) "Download FILE-NAME from URL using the built-in 'download' builder. When @@ -429,16 +422,13 @@ explicitly depend on Guile, GnuTLS, etc. Instead, the daemon performs the download by itself using its own dependencies." (mlet %store-monad ((mirrors (lower-object mirrors)) (content-addressed-mirrors - (lower-object content-addressed-mirrors)) - (disarchive-mirrors (lower-object disarchive-mirrors))) + (lower-object content-addressed-mirrors))) (raw-derivation file-name "builtin:download" '() #:system system #:hash-algo hash-algo #:hash hash #:recursive? executable? - #:sources (list mirrors - content-addressed-mirrors - disarchive-mirrors) + #:sources (list mirrors content-addressed-mirrors) ;; Honor the user's proxy and locale settings. #:leaked-env-vars '("http_proxy" "https_proxy" @@ -449,7 +439,6 @@ download by itself using its own dependencies." ("mirrors" . ,mirrors) ("content-addressed-mirrors" . ,content-addressed-mirrors) - ("disarchive-mirrors" . ,disarchive-mirrors) ,@(if executable? '(("executable" . "1")) '())) @@ -503,9 +492,7 @@ name in the store." #:executable? executable? #:mirrors %mirror-file #:content-addressed-mirrors - %content-addressed-mirror-file - #:disarchive-mirrors - %disarchive-mirror-file))))) + %content-addressed-mirror-file))))) (define* (url-fetch/executable url hash-algo hash #:optional name |