mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
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.
This commit is contained in:
parent
af1f1c38fb
commit
d4aa147eec
1 changed files with 23 additions and 3 deletions
26
guix/ui.scm
26
guix/ui.scm
|
@ -816,6 +816,12 @@ (define* (check-available-space need
|
|||
(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 @@ (define (built-or-substitutable? drv)
|
|||
(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 @@ (define display-download-size?
|
|||
"~:[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 @@ (define display-download-size?
|
|||
"~:[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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue