diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-25 17:22:53 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-25 17:22:53 +0100 |
| commit | 6ce206cb92ba803de7ff05410787f18ea7d37bae (patch) | |
| tree | d5510fccc78fd8350c3768295622a0d677659705 | |
| parent | 200a97e64f29dc904961e99bcbc0f20fef431dd2 (diff) | |
| download | patches-6ce206cb92ba803de7ff05410787f18ea7d37bae.tar patches-6ce206cb92ba803de7ff05410787f18ea7d37bae.tar.gz | |
Prefer local builds for "small" derivations.
* gnu/system.scm (union, file-union, links): Pass #:local-build? #t to
'derivation-expression'.
* guix/derivations.scm (imported-files, compiled-modules): Likewise.
* guix/profiles.scm (profile-derivation): Likewise.
| -rw-r--r-- | gnu/system.scm | 11 | ||||
| -rw-r--r-- | guix/derivations.scm | 6 | ||||
| -rw-r--r-- | guix/profiles.scm | 3 |
3 files changed, 13 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 6fd753f8fd..1b5ce7afc5 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,7 +152,8 @@ input tuples." #:system system #:inputs inputs #:modules '((guix build union)) - #:guile-for-build guile))) + #:guile-for-build guile + #:local-build? #t))) (define* (file-union files #:key (inputs '()) (name "file-union")) @@ -190,7 +191,8 @@ as an inputs; additional inputs, such as derivations, are taken from INPUTS." `(symlink ,target ,name))) files)) - #:inputs inputs)))) + #:inputs inputs + #:local-build? #t)))) (define (links inputs) "Return a directory with symbolic links to all of INPUTS. This is @@ -212,7 +214,8 @@ directories or regular files." (mlet %store-monad ((inputs (lower-inputs inputs))) (derivation-expression "links" builder - #:inputs inputs))) + #:inputs inputs + #:local-build? #t))) (define* (etc-directory #:key (locale "C") (timezone "Europe/Paris") diff --git a/guix/derivations.scm b/guix/derivations.scm index cc8e37c973..ae68bb1194 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -836,7 +836,8 @@ system, imported, and appears under FINAL-PATH in the resulting store path." (build-expression->derivation store name builder #:system system #:inputs files - #:guile-for-build guile))) + #:guile-for-build guile + #:local-build? #t))) (define* (imported-modules store modules #:key (name "module-import") @@ -902,7 +903,8 @@ they can refer to each other." (build-expression->derivation store name builder #:inputs `(("modules" ,module-drv)) #:system system - #:guile-for-build guile))) + #:guile-for-build guile + #:local-build? #t))) (define* (build-expression->derivation store name exp #:key diff --git a/guix/profiles.scm b/guix/profiles.scm index 1ff6c97f9f..c1fa8272ba 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -257,7 +257,8 @@ the given MANIFEST." ;; already valid. `((,name ,path) ,@deps))) (manifest-entries manifest)) - #:modules '((guix build union)))) + #:modules '((guix build union)) + #:local-build? #t)) (define (profile-regexp profile) "Return a regular expression that matches PROFILE's name and number." |