download: Allow use of substitutes.

See <https://bugs.gnu.org/18747> for the original report.

* guix/download.scm (url-fetch): Comment out #:local-build? argument.
* guix/git-download.scm (git-fetch): Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.

diff --git a/guix/download.scm b/guix/download.scm
index 2d4bf74..4f16c3a 100644 (file)
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -258,7 +258,11 @@ must be a list of symbol/URL-list pairs."
                             #:guile-for-build guile-for-build
 
                             ;; In general, offloading downloads is not a good idea.
-                            #:local-build? #t)
+                            ;;#:local-build? #t
+                            ;; FIXME: The above would also disable use of
+                            ;; substitutes, so comment it out; see
+                            ;; <https://bugs.gnu.org/18747>.
+                            )
           #:guile-for-build guile-for-build
           #:system system))))
 

diff --git a/guix/git-download.scm b/guix/git-download.scm
index b88339b..94b118a 100644 (file)
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -98,7 +98,8 @@ type HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if
   (run-with-store store
     (gexp->derivation (or name "git-checkout") build
                       #:system system
-                      #:local-build? #t
+                      ;; FIXME: See <https://bugs.gnu.org/18747>.
+                      ;;#:local-build? #t
                       #:hash-algo hash-algo
                       #:hash hash
                       #:recursive? #t

diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 31dd1a9..f06e449 100644 (file)
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -76,7 +76,8 @@ type HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if
   (run-with-store store
     (gexp->derivation (or name "svn-checkout") build
                       #:system system
-                      #:local-build? #t
+                      ;; FIXME: See <https://bugs.gnu.org/18747>.
+                      ;;#:local-build? #t
                       #:hash-algo hash-algo
                       #:hash hash
                       #:recursive? #t