From abac874b22532a17a868443dc1f883ed483b0604 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 2 Feb 2015 12:25:34 +0100
Subject: 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.
---
 guix/store.scm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'guix')

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 @@ (define-module (guix store)
             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 @@ (define-enumerate-type operation-id
   (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 @@ (define add-to-store
               (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 @@ (define* (interned-file file #:optional name
                           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.
-- 
cgit v1.2.3