From 4a6aeb670f74ef895878631bc3d832d08e1cb321 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jul 2015 00:05:16 +0200 Subject: derivations: Add #:substitutable?, distinguished from #:local-build?. Fixes . * guix/derivations.scm (substitutable-derivation?): Rewrite to check for "allowSubstitutes". (derivation): Add #:substitutable? parameter. [user+system-env-vars]: Honor it. (build-expression->derivation): Add #:substitutable? and honor it. * guix/gexp.scm (gexp->derivation): Likewise. * tests/derivations.scm ("derivation-prerequisites-to-build and substitutes, non-substitutable build"): Use #:substitutable? instead of #:local-build?. ("substitutable-derivation?", "derivation-prerequisites-to-build and substitutes, local build"): New tests. * guix/download.scm (url-fetch): Adjust comment. * guix/git-download.scm (git-fetch): Likewise. * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Use #:substitutable? instead of #:local-build?. * doc/guix.texi (Derivations, G-Expressions): Adjust accordingly. --- guix/build-system/gnu.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'guix/build-system/gnu.scm') diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 05b6e6f680..8702c6c915 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -367,10 +367,7 @@ are allowed to refer to." #:inputs input-drvs #:outputs outputs #:modules imported-modules - - ;; XXX: Update when - ;; is fixed. - #:local-build? (not substitutable?) + #:substitutable? substitutable? #:allowed-references (and allowed-references @@ -513,10 +510,7 @@ platform." #:inputs (append native-drvs target-drvs) #:outputs outputs #:modules imported-modules - - ;; XXX: Update when - ;; is fixed. - #:local-build? (not substitutable?) + #:substitutable? substitutable? #:allowed-references (and allowed-references -- cgit v1.2.3