diff options
author | Marius Bakke <marius@gnu.org> | 2022-08-27 17:10:55 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-08-27 17:10:55 +0200 |
commit | ad384816fe260be98bc53701d9d761197ef162fc (patch) | |
tree | ff06eb12983b7cbd972c3153404bb3952e2f28c0 /guix | |
parent | d08411ffd0a36a6b67a238be69d32c9f74101389 (diff) | |
parent | fb3d90b8f31c4b1e2e3d427544c6610f3fe1ce55 (diff) |
Merge branch 'staging' into core-updates
Diffstat (limited to 'guix')
-rw-r--r-- | guix/build-system/gnu.scm | 2 | ||||
-rw-r--r-- | guix/import/utils.scm | 6 | ||||
-rw-r--r-- | guix/ui.scm | 27 |
3 files changed, 32 insertions, 3 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 651415098e..8eea1cd4c2 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -228,7 +228,7 @@ use `--strip-all' as the arguments to `strip'." (replacement (and=> (package-replacement p) static-package)))) (define* (dist-package p source #:key (phases '%dist-phases)) - "Return a package that runs takes source files from the SOURCE directory, + "Return a package that takes source files from the SOURCE directory, runs `make distcheck' and whose result is one or more source tarballs. The exact build phases are defined by PHASES." (let ((s source)) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 668b8c8083..7e7d116d1d 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2016 David Craven <david@craven.ch> -;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017, 2019, 2020, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> @@ -283,6 +283,10 @@ LENGTH characters." (string-append "This package provides" (substring description (string-length "Provides")))) + ((string-prefix? "Implements " description) + (string-append "This package implements" + (substring description + (string-length "Implements")))) ((string-prefix? "Functions " description) (string-append "This package provides functions" (substring description diff --git a/guix/ui.scm b/guix/ui.scm index a7acd41440..dad2b853ac 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Steve Sprang <scs@stevesprang.com> ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info> +;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1511,6 +1512,29 @@ that may return a colorized version of its argument." (sort packages package<?))) " "))) (split-lines list (string-length "dependencies: ")))) + (define (output->recutils package output) + (string-append + "+ " output ": " + (or + (any + (match-lambda + (('output-synopsis key synopsis) + (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) + (G_ "see Appendix H")))) + + (define (package-outputs/out-last package) + ((compose append partition) + (negate (cut string=? "out" <>)) + (package-outputs package))) + (define (package<? p1 p2) (string<? (package-full-name p1) (package-full-name p2))) @@ -1522,7 +1546,8 @@ 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~%" (string-join (package-outputs p))) + (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: "))) |