summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-10-16 23:39:54 +0200
committerLudovic Courtès <ludo@gnu.org>2014-10-16 23:40:10 +0200
commit347e17b47450a0fcc120c29e8b307e87b9182c21 (patch)
tree81e5b024c6f23483d353afc1c3d8b327ba4f82d6 /guix
parentfd2b6df2a8a396939cf963a63e1e0c2d87e2de0a (diff)
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.
Diffstat (limited to 'guix')
-rw-r--r--guix/download.scm6
-rw-r--r--guix/git-download.scm3
-rw-r--r--guix/svn-download.scm3
3 files changed, 9 insertions, 3 deletions
diff --git a/guix/download.scm b/guix/download.scm
index 2d4bf74951..4f16c3a900 100644
--- 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 b88339bed3..94b118a7b9 100644
--- 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 31dd1a90e8..f06e449777 100644
--- 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