~ruther/guix-local

347e17b47450a0fcc120c29e8b307e87b9182c21 — Ludovic Courtès 11 years ago fd2b6df
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.
3 files changed, 9 insertions(+), 3 deletions(-)

M guix/download.scm
M guix/git-download.scm
M guix/svn-download.scm
M guix/download.scm => guix/download.scm +5 -1
@@ 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))))


M guix/git-download.scm => guix/git-download.scm +2 -1
@@ 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

M guix/svn-download.scm => guix/svn-download.scm +2 -1
@@ 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