From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH] ui: Deduplicate 'show-what-to-build*'. Date: Wed, 20 May 2015 18:44:37 -0400 Message-ID: <87bnheoomi.fsf@fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvCjF-0000hx-Pz for guix-devel@gnu.org; Wed, 20 May 2015 18:44:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YvCjE-0000Gn-P4 for guix-devel@gnu.org; Wed, 20 May 2015 18:44:45 -0400 Received: from mail.fsf.org ([208.118.235.13]:49656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvCjE-0000Gj-Li for guix-devel@gnu.org; Wed, 20 May 2015 18:44:44 -0400 Received: from jumpgate.fsf.org ([74.94.156.211]:47712 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1YvCjE-0004Mb-4e for guix-devel@gnu.org; Wed, 20 May 2015 18:44:44 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Just tidying up a bit. :) --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-ui-Deduplicate-show-what-to-build.patch >From aab1d1d3ebc76a9ac9c82d3690d76cdad1128a6f Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 20 May 2015 18:42:35 -0400 Subject: [PATCH] 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 0b5dbaf..e12bec4 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 e81532c..f403e95 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 459b2da..8d5fbe5 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 920355f..9bab7c5 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." -- 2.1.4 --=-=-= Content-Type: text/plain -- David Thompson GPG Key: 0FF1D807 --=-=-=--