me
/
guix
Archived
1
0
Fork 0
Code

guix: ui: Handle single outputs. 

The current code says "out" contains "everything else", even if there's no
other output to contain anything.

* guix/ui.scm (package->recutils)[default-output-synopses]: New variable.
[output->recutils]: Take default synopses as argument.
["outputs"]: Distinguish single and multiple outputs.
master
Liliana Marie Prikler 2022-11-02 21:01:30 +01:00
parent 913015fb28
commit 9eb80094ae
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
guix/ui.scm
View File

@ -1512,7 +1512,15 @@ that may return a colorized version of its argument."
(sort packages package<?))) " ")))
(split-lines list (string-length "dependencies: "))))
(define (output->recutils package output)
(define %default-output-synopses
`(("bin" . ,(G_ "executable programs and scripts"))
("debug" . ,(G_ "debug information"))
("lib" . ,(G_ "shared libraries"))
("static" . ,(G_ "static libraries"))
("out" . ,(G_ "everything else"))))
(define* (output->recutils package output #:optional
(default-synopses %default-output-synopses))
(string-append
"+ " output ": "
(or
@ -1522,12 +1530,7 @@ that may return a colorized version of its argument."
(and (string=? key output) (P_ synopsis)))
(_ #f))
(package-properties package))
(assoc-ref `(("bin" . ,(G_ "executable programs and scripts"))
("debug" . ,(G_ "debug information"))
("lib" . ,(G_ "shared libraries"))
("static" . ,(G_ "static libraries"))
("out" . ,(G_ "everything else")))
output)
(assoc-ref default-synopses output)
(G_ "see Appendix H"))))
(define (package-outputs/out-last package)
@ -1546,8 +1549,16 @@ that may return a colorized version of its argument."
;; Note: Don't i18n field names so that people can post-process it.
(format port "name: ~a~%" (highlight (package-name p) port*))
(format port "version: ~a~%" (highlight (package-version p) port*))
(format port "outputs:~%~{~a~%~}"
(map (cut output->recutils p <>) (package-outputs/out-last p)))
(match (package-outputs/out-last p)
(("out") ; one output has everything
(format port "outputs:~%~a~%"
(output->recutils p "out"
(alist-cons "out" (G_ "everything")
%default-output-synopses))))
(outputs ; multiple outputs
(format port "outputs:~%~{~a~%~}"
(map (cut output->recutils p <>) (package-outputs/out-last p)))))
(format port "systems: ~a~%"
(split-lines (string-join (package-transitive-supported-systems p))
(string-length "systems: ")))