nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

download: Disable offloading for downloads. 

* guix/download.scm (url-fetch): Use #:local-build? #t.
* guix/git-download.scm (git-fetch): Likewise.
This commit is contained in:
Ludovic Courtès 2015-09-05 19:24:16 +02:00
parent cf897cbacc
commit 6b44a09747
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/download.scm
View File

@ -288,12 +288,11 @@ in the store."
;; Honor the user's proxy settings. ;; Honor the user's proxy settings.
#:leaked-env-vars '("http_proxy" "https_proxy") #:leaked-env-vars '("http_proxy" "https_proxy")
;; In general, offloading downloads is not a good idea. ;; In general, offloading downloads is not a good
;;#:local-build? #t ;; idea. Daemons before 0.8.3 would also
;; FIXME: The above would also disable use of ;; interpret this as "do not substitute" (see
;; substitutes on old daemons, so comment it out; ;; <https://bugs.gnu.org/18747>.)
;; see <https://bugs.gnu.org/18747>. #:local-build? #t)))))
)))))
(define* (download-to-store store url #:optional (name (basename url)) (define* (download-to-store store url #:optional (name (basename url))
#:key (log (current-error-port)) recursive?) #:key (log (current-error-port)) recursive?)

4
guix/git-download.scm
View File

@ -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))) (mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "git-checkout") build (gexp->derivation (or name "git-checkout") build
#:system system #:system system
;; FIXME: See <https://bugs.gnu.org/18747>. #:local-build? #t ;don't offload repo cloning
;; Uncomment when fixed daemons are widely deployed.
;;#:local-build? #t
#:hash-algo hash-algo #:hash-algo hash-algo
#:hash hash #:hash hash
#:recursive? #t #:recursive? #t