~ruther/guix-local

4d043ab6283cb15e2f0cd0847a38ccf3604aab66 — David Thompson 10 years ago 35481e8
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.
M build-aux/make-binary-tarball.scm => build-aux/make-binary-tarball.scm +0 -3
@@ 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))


M guix/scripts/environment.scm => guix/scripts/environment.scm +0 -3
@@ 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))


M guix/scripts/system.scm => guix/scripts/system.scm +0 -2
@@ 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

M guix/ui.scm => guix/ui.scm +4 -0
@@ 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."