[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: ui: 'show-what-to-build' reports grafts separately.
From: |
guix-commits |
Subject: |
04/07: ui: 'show-what-to-build' reports grafts separately. |
Date: |
Wed, 28 Nov 2018 04:40:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit d4aa147eecc64a00d1463d4008b22c9595041552
Author: Ludovic Courtès <address@hidden>
Date: Mon Nov 26 22:31:09 2018 +0100
ui: 'show-what-to-build' reports grafts separately.
* guix/ui.scm (graft-derivation?): New procedure.
(show-what-to-build): Distinguish among BUILD derivations that match
'graft-derivation?'. Report them separately.
---
guix/ui.scm | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index 96f403a..60636ed 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -816,6 +816,12 @@ warning."
(warning (G_ "at least ~,1h MB needed but only ~,1h MB available in
~a~%")
(/ need 1e6) (/ free 1e6) directory))))
+(define (graft-derivation? drv)
+ "Return true if DRV is definitely a graft derivation, false otherwise."
+ (match (assq-ref (derivation-properties drv) 'type)
+ ('graft #t)
+ (_ #f)))
+
(define* (show-what-to-build store drv
#:key dry-run? (use-substitutes? #t)
(mode (build-mode normal)))
@@ -865,7 +871,11 @@ report what is prerequisites are available for download."
(append-map
substitutable-references
download))))
- download)))
+ download))
+ ((graft build)
+ (partition (compose graft-derivation?
+ read-derivation-from-file)
+ build)))
(define installed-size
(reduce + 0 (map substitutable-nar-size download)))
@@ -898,7 +908,12 @@ report what is prerequisites are available for download."
"~:[The following files would be downloaded:~%~{
~a~%~}~;~]"
(length download))
(null? download)
- (map substitutable-path download))))
+ (map substitutable-path download)))
+ (format (current-error-port)
+ (N_ "~:[The following graft would be made:~%~{ ~a~%~}~;~]"
+ "~:[The following grafts would be made:~%~{ ~a~%~}~;~]"
+ (length graft))
+ (null? graft) graft))
(begin
(format (current-error-port)
(N_ "~:[The following derivation will be built:~%~{
~a~%~}~;~]"
@@ -918,7 +933,12 @@ report what is prerequisites are available for download."
"~:[The following files will be downloaded:~%~{
~a~%~}~;~]"
(length download))
(null? download)
- (map substitutable-path download)))))
+ (map substitutable-path download)))
+ (format (current-error-port)
+ (N_ "~:[The following graft will be made:~%~{ ~a~%~}~;~]"
+ "~:[The following grafts will be made:~%~{ ~a~%~}~;~]"
+ (length graft))
+ (null? graft) graft)))
(check-available-space installed-size)
- branch master updated (01e7ca5 -> e91152e), guix-commits, 2018/11/28
- 03/07: status: Report grafting derivations specially., guix-commits, 2018/11/28
- 02/07: grafts: Record metadata as derivation properties., guix-commits, 2018/11/28
- 01/07: derivations: Add properties., guix-commits, 2018/11/28
- 04/07: ui: 'show-what-to-build' reports grafts separately.,
guix-commits <=
- 06/07: channels: Add 'checkout->channel-instance'., guix-commits, 2018/11/28
- 07/07: guix hash: Fix version and help messages, guix-commits, 2018/11/28
- 05/07: inferior: Add 'inferior-eval-with-store'., guix-commits, 2018/11/28