From 4d043ab6283cb15e2f0cd0847a38ccf3604aab66 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Wed, 20 May 2015 18:42:35 -0400
Subject: ui: Deduplicate 'show-what-to-build*'.

* guix/ui.scm (show-what-to-build*): New procedure.
* guix/scripts/environment.scm (show-what-to-build*): Delete.
* guix/scripts/system.scm (show-what-to-build*): Likewise.
* build-aux/make-binary-tarball.scm (show-what-to-build*): Likewise.
---
 build-aux/make-binary-tarball.scm | 3 ---
 guix/scripts/environment.scm      | 3 ---
 guix/scripts/system.scm           | 2 --
 guix/ui.scm                       | 4 ++++
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build-aux/make-binary-tarball.scm b/build-aux/make-binary-tarball.scm
index 0b5dbaf1de..e12bec476c 100644
--- a/build-aux/make-binary-tarball.scm
+++ b/build-aux/make-binary-tarball.scm
@@ -27,9 +27,6 @@
              (gnu system install)
              (ice-9 match))
 
-(define show-what-to-build*
-  (store-lift show-what-to-build))
-
 (define copy-file*
   (lift2 copy-file %store-monad))
 
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index e81532c7e4..f403e95f3d 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -192,9 +192,6 @@ packages."
    (append-map transitive-inputs packages)))
 
 ;; TODO: Deduplicate these.
-(define show-what-to-build*
-  (store-lift show-what-to-build))
-
 (define set-build-options-from-command-line*
   (store-lift set-build-options-from-command-line))
 
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 459b2da0cc..8d5fbe5a78 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -67,8 +67,6 @@
   (store-lift references))
 (define topologically-sorted*
   (store-lift topologically-sorted))
-(define show-what-to-build*
-  (store-lift show-what-to-build))
 
 
 (define* (copy-item item target
diff --git a/guix/ui.scm b/guix/ui.scm
index 920355fbb5..9bab7c51dd 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -57,6 +57,7 @@
             string->number*
             size->number
             show-what-to-build
+            show-what-to-build*
             show-manifest-transaction
             call-with-error-handling
             with-error-handling
@@ -453,6 +454,9 @@ available for download."
                   (null? download) download)))
     (pair? build)))
 
+(define show-what-to-build*
+  (store-lift show-what-to-build))
+
 (define (right-arrow port)
   "Return either a string containing the 'RIGHT ARROW' character, or an ASCII
 replacement if PORT is not Unicode-capable."
-- 
cgit v1.2.3