02/02: scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module.

[David Thompson]

davexunit pushed a commit to branch master
in repository guix.

commit 2d977638c9a6d8779b01042b0f085da5b26affa9
Author: David Thompson <address@hidden>
Date:   Wed May 20 18:48:10 2015 -0400

    scripts: Move 'set-build-options-from-command-line*' to (guix scripts 
build) module.
    
    * guix/scripts/build.scm (set-build-options-from-command-line*): New
      procedure.
    * guix/scripts/environment.scm (set-build-options-from-command-line*): 
Delete.
---
 guix/scripts/build.scm       |    4 ++++
 guix/scripts/environment.scm |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index da71adb..2307f76 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -37,6 +37,7 @@
   #:autoload   (guix download) (download-to-store)
   #:export (%standard-build-options
             set-build-options-from-command-line
+            set-build-options-from-command-line*
             show-build-options-help
 
             guix-build))
@@ -139,6 +140,9 @@ options handled by 'set-build-options-from-command-line', 
and listed in
                      #:print-build-trace (assoc-ref opts 'print-build-trace?)
                      #:verbosity (assoc-ref opts 'verbosity)))
 
+(define set-build-options-from-command-line*
+  (store-lift set-build-options-from-command-line))
+
 (define %standard-build-options
   ;; List of standard command-line options for tools that build something.
   (list (option '(#\L "load-path") #t #f
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index f403e95..d053daf 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -191,10 +191,6 @@ packages."
   (delete-duplicates
    (append-map transitive-inputs packages)))
 
-;; TODO: Deduplicate these.
-(define set-build-options-from-command-line*
-  (store-lift set-build-options-from-command-line))
-
 (define (build-inputs inputs opts)
   "Build the packages in INPUTS using the build options in OPTS."
   (let ((substitutes? (assoc-ref opts 'substitutes?))