diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-02-02 12:25:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-02 12:46:36 +0100 |
| commit | abac874b22532a17a868443dc1f883ed483b0604 (patch) | |
| tree | 3055f2e2d0cbe5e3ea208df81cb06e6bad7446ef /guix | |
| parent | e6c8839c180b88a9ef9e68af8acc3148099e286b (diff) | |
| download | gnu-guix-abac874b22532a17a868443dc1f883ed483b0604.tar gnu-guix-abac874b22532a17a868443dc1f883ed483b0604.tar.gz | |
store: Add 'build-things'.
* guix/store.scm (operation-id): Rename 'build-derivations' to
'build-things', as per Nix commit 1aba0bf0.
(build-derivations): Rename to...
(build-things): ... this. Keep 'build-derivations' as an alias.
(build): New procedure.
* tests/store.scm ("build-things with output path",
"substitute + build-things with output path"): New tests.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/store.scm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/guix/store.scm b/guix/store.scm index a12abc8671..5618fa340a 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -62,6 +62,8 @@ hash-part->path add-text-to-store add-to-store + build-things + build build-derivations add-temp-root add-indirect-root @@ -140,7 +142,7 @@ (query-referrers 6) (add-to-store 7) (add-text-to-store 8) - (build-derivations 9) + (build-things 9) (ensure-path 10) (add-temp-root 11) (add-indirect-root 12) @@ -573,11 +575,16 @@ kept. HASH-ALGO must be a string such as \"sha256\"." (hash-set! cache args path) path)))))) -(define-operation (build-derivations (string-list derivations)) - "Build DERIVATIONS, and return when the worker is done building them. +(define-operation (build-things (string-list things)) + "Build THINGS, a list of store items which may be either '.drv' files or +outputs, and return when the worker is done building them. Elements of THINGS +that are not derivations can only be substituted and not built locally. Return #t on success." boolean) +;; Deprecated name for 'build-things'. +(define build-derivations build-things) + (define-operation (add-temp-root (store-path path)) "Make PATH a temporary root for the duration of the current session. Return #t." @@ -907,6 +914,10 @@ permission bits are kept." recursive? "sha256" file) store))) +(define build + ;; Monadic variant of 'build-things'. + (store-lift build-things)) + (define %guile-for-build ;; The derivation of the Guile to be used within the build environment, ;; when using 'gexp->derivation' and co. |