[PATCH] scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module.

[PATCH] scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module.

[David Thompson]

[-- Attachment #1: Type: text/plain, Size: 136 bytes --]

More tidying.  Moving this monadic procedure to the more sensible place
will allow reuse in other scripts.  'guix deploy' will use it.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-scripts-Move-set-build-options-from-command-line-to-.patch --]
[-- Type: text/x-diff, Size: 2038 bytes --]

From 8bb17b4ce15e6db8c9a6aea3cd83208dd76f8e8c Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Wed, 20 May 2015 18:48:10 -0400
Subject: [PATCH] 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?))
-- 
2.1.4


[-- Attachment #3: Type: text/plain, Size: 38 bytes --]


-- 
David Thompson
GPG Key: 0FF1D807

Re: [PATCH] scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 8bb17b4ce15e6db8c9a6aea3cd83208dd76f8e8c Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Wed, 20 May 2015 18:48:10 -0400
> Subject: [PATCH] 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.

OK!

Ludo'.