guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/08: store: Remove 'build-derivations'.


From: Ludovic Courtès
Subject: 08/08: store: Remove 'build-derivations'.
Date: Mon, 02 Feb 2015 11:46:57 +0000

civodul pushed a commit to branch master
in repository guix.

commit 01d8ac64abaac9202c32848f7c4a394393ba6534
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 2 12:46:09 2015 +0100

    store: Remove 'build-derivations'.
    
    * guix/store.scm (build-derivations): Remove.
    * guix/derivations.scm (build-derivations): Write in terms of
      'build-things'.
    * doc/guix.texi (Invoking guix build): Adjust text accordingly.
---
 doc/guix.texi        |    2 +-
 guix/derivations.scm |   16 +++++++---------
 guix/store.scm       |    4 ----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index b3c7365..1b3bd0e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2879,7 +2879,7 @@ equivalent @command{guix-daemon} option.
 Behind the scenes, @command{guix build} is essentially an interface to
 the @code{package-derivation} procedure of the @code{(guix packages)}
 module, and to the @code{build-derivations} procedure of the @code{(guix
-store)} module.
+derivations)} module.
 
 In addition to options explicitly passed on the command line,
 @command{guix build} and other @command{guix} commands that support
diff --git a/guix/derivations.scm b/guix/derivations.scm
index edf6b57..2cbf46f 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -94,6 +94,7 @@
 
             map-derivation
 
+            build-derivations
             built-derivations
             imported-modules
             compiled-modules
@@ -102,9 +103,7 @@
             imported-files)
 
   ;; Re-export it from here for backward compatibility.
-  #:re-export (%guile-for-build)
-
-  #:replace (build-derivations))
+  #:re-export (%guile-for-build))
 
 ;;;
 ;;; Error conditions.
@@ -916,12 +915,11 @@ recursively."
 
 (define (build-derivations store derivations)
   "Build DERIVATIONS, a list of <derivation> objects or .drv file names."
-  (let ((build (@ (guix store) build-derivations)))
-    (build store (map (match-lambda
-                       ((? string? file) file)
-                       ((and drv ($ <derivation>))
-                        (derivation-file-name drv)))
-                      derivations))))
+  (build-things store (map (match-lambda
+                            ((? string? file) file)
+                            ((and drv ($ <derivation>))
+                             (derivation-file-name drv)))
+                           derivations)))
 
 
 ;;;
diff --git a/guix/store.scm b/guix/store.scm
index 5618fa3..02d84eb 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -64,7 +64,6 @@
             add-to-store
             build-things
             build
-            build-derivations
             add-temp-root
             add-indirect-root
             add-permanent-root
@@ -582,9 +581,6 @@ 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."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]