nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Ludovic Courtès 2018-11-26 22:31:09 +01:00
parent af1f1c38fb
commit d4aa147eec
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
guix/ui.scm
View File

@ -816,6 +816,12 @@ warning."
(warning (G_ "at least ~,1h MB needed but only ~,1h MB available in ~a~%") (warning (G_ "at least ~,1h MB needed but only ~,1h MB available in ~a~%")
(/ need 1e6) (/ free 1e6) directory)))) (/ 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 (define* (show-what-to-build store drv
#:key dry-run? (use-substitutes? #t) #:key dry-run? (use-substitutes? #t)
(mode (build-mode normal))) (mode (build-mode normal)))
@ -865,7 +871,11 @@ report what is prerequisites are available for download."
(append-map (append-map
substitutable-references substitutable-references
download)))) download))))
download))) download))
((graft build)
(partition (compose graft-derivation?
read-derivation-from-file)
build)))
(define installed-size (define installed-size
(reduce + 0 (map substitutable-nar-size download))) (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~%~}~;~]" "~:[The following files would be downloaded:~%~{ ~a~%~}~;~]"
(length download)) (length download))
(null? 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 (begin
(format (current-error-port) (format (current-error-port)
(N_ "~:[The following derivation will be built:~%~{ ~a~%~}~;~]" (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~%~}~;~]" "~:[The following files will be downloaded:~%~{ ~a~%~}~;~]"
(length download)) (length download))
(null? 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) (check-available-space installed-size)