diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-12-03 19:08:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-12-03 19:09:53 +0200 |
| commit | 07e70f4846521c1fa5319b25f23eea171a03fccd (patch) | |
| tree | 6afe1552ef452c53e4f786953b9716e4d25bc5cd /guix | |
| parent | d203d3d4cb3d83beaadaaef6c279c3d84ac142f7 (diff) | |
| download | gnu-guix-07e70f4846521c1fa5319b25f23eea171a03fccd.tar gnu-guix-07e70f4846521c1fa5319b25f23eea171a03fccd.tar.gz | |
store: Add mode parameter to 'build-paths'.
* guix/store.scm (%protocol-version): Set minor to 15.
(build-mode): New enumerate type.
(build-things): Add 'mode' parameter; pass it to the RPC.
* tests/store.scm ("build-things, check mode"): New check.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/store.scm | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/guix/store.scm b/guix/store.scm index 89f5df052a..1818187155 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -53,6 +53,7 @@ nix-protocol-error-status hash-algo + build-mode open-connection close-connection @@ -129,7 +130,7 @@ direct-store-path log-file)) -(define %protocol-version #x10e) +(define %protocol-version #x10f) (define %worker-magic-1 #x6e697863) ; "nixc" (define %worker-magic-2 #x6478696f) ; "dxio" @@ -188,6 +189,12 @@ (sha1 2) (sha256 3)) +(define-enumerate-type build-mode + ;; store-api.hh + (normal 0) + (repair 1) + (check 2)) + (define-enumerate-type gc-action ;; store-api.hh (return-live 0) @@ -637,12 +644,17 @@ bits are kept. HASH-ALGO must be a string such as \"sha256\"." (hash-set! cache args path) path)))))) -(define-operation (build-things (string-list things)) - "Build THINGS, a list of store items which may be either '.drv' files or +(define build-things + (let ((build (operation (build-things (string-list things) + (integer mode)) + "Do it!" + boolean))) + (lambda* (store things #:optional (mode (build-mode normal))) + "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) + (build store things mode)))) (define-operation (add-temp-root (store-path path)) "Make PATH a temporary root for the duration of the current session. |