diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-05 19:24:16 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-05 22:11:03 +0200 |
| commit | 6b44a09747d18f1570c26f135c7f1a88c317201c (patch) | |
| tree | 0fb364a54e05fbd68f245fa22713774f5b4368c6 | |
| parent | cf897cbacc3ddcf5d5d553ee19002995985fff11 (diff) | |
| download | guix-6b44a09747d18f1570c26f135c7f1a88c317201c.tar.gz | |
download: Disable offloading for downloads.
* guix/download.scm (url-fetch): Use #:local-build? #t. * guix/git-download.scm (git-fetch): Likewise.
| -rw-r--r-- | guix/download.scm | 11 | ||||
| -rw-r--r-- | guix/git-download.scm | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/guix/download.scm b/guix/download.scm index 079d1b0b8d..42956772f5 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -288,12 +288,11 @@ in the store." ;; Honor the user's proxy settings. #:leaked-env-vars '("http_proxy" "https_proxy") - ;; In general, offloading downloads is not a good idea. - ;;#:local-build? #t - ;; FIXME: The above would also disable use of - ;; substitutes on old daemons, so comment it out; - ;; see <https://bugs.gnu.org/18747>. - ))))) + ;; In general, offloading downloads is not a good + ;; idea. Daemons before 0.8.3 would also + ;; interpret this as "do not substitute" (see + ;; <https://bugs.gnu.org/18747>.) + #:local-build? #t))))) (define* (download-to-store store url #:optional (name (basename url)) #:key (log (current-error-port)) recursive?) diff --git a/guix/git-download.scm b/guix/git-download.scm index 0f2218c13e..1e5c845e34 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -89,9 +89,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "git-checkout") build #:system system - ;; FIXME: See <https://bugs.gnu.org/18747>. - ;; Uncomment when fixed daemons are widely deployed. - ;;#:local-build? #t + #:local-build? #t ;don't offload repo cloning #:hash-algo hash-algo #:hash hash #:recursive? #t |