mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-26 04:29:25 -05:00
transformations: Show '--help-transform' only where applicable.
Fixes <https://bugs.gnu.org/44773>.
Reported by Florian Pelz <pelzflorian@pelzflorian.de>.
This fixes a regression introduced in
6701f64f73
.
* guix/transformations.scm (%transformation-options): Add
"--help-transform".
(show-transformation-options-help): Rename to...
(show-transformation-options-help/detailed): ... this.
(show-transformation-options-help): New public procedure.
* guix/scripts/build.scm (show-build-options-help): Remove
"--help-transform".
(%standard-build-options): Likewise.
(show-help): Call 'show-transformation-options-help'.
* guix/scripts/environment.scm (show-help): Likewise.
* guix/scripts/graph.scm (show-help): Likewise.
* guix/scripts/install.scm (show-help): Likewise.
* guix/scripts/pack.scm (show-help): Likewise.
* guix/scripts/package.scm (show-help): Likewise.
* guix/scripts/upgrade.scm (show-help): Likewise.
This commit is contained in:
parent
0a47ff9f9f
commit
5b3904116f
8 changed files with 31 additions and 13 deletions
|
@ -181,8 +181,6 @@ (define (show-build-options-help)
|
|||
-c, --cores=N allow the use of up to N CPU cores for the build"))
|
||||
(display (G_ "
|
||||
-M, --max-jobs=N allow at most N build jobs"))
|
||||
(display (G_ "
|
||||
--help-transform list package transformation options not shown here"))
|
||||
(display (G_ "
|
||||
--debug=LEVEL produce debugging output at LEVEL")))
|
||||
|
||||
|
@ -319,14 +317,7 @@ (define %standard-build-options
|
|||
(if c
|
||||
(apply values (alist-cons 'max-jobs c result) rest)
|
||||
(leave (G_ "not a number: '~a' option argument: ~a~%")
|
||||
name arg)))))
|
||||
(option '("help-transform") #f #f
|
||||
(lambda _
|
||||
(format #t
|
||||
(G_ "Available package transformation options:~%"))
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(exit 0)))))
|
||||
name arg)))))))
|
||||
|
||||
|
||||
;;;
|
||||
|
@ -383,6 +374,8 @@ (define (show-help)
|
|||
(newline)
|
||||
(show-build-options-help)
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -180,6 +180,8 @@ (define (show-help)
|
|||
(newline)
|
||||
(show-build-options-help)
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -35,7 +35,8 @@ (define-module (guix scripts graph)
|
|||
#:use-module ((guix diagnostics)
|
||||
#:select (location-file formatted-message))
|
||||
#:use-module ((guix transformations)
|
||||
#:select (options->transformation
|
||||
#:select (show-transformation-options-help
|
||||
options->transformation
|
||||
%transformation-options))
|
||||
#:use-module ((guix scripts build)
|
||||
#:select (%standard-build-options))
|
||||
|
@ -546,6 +547,8 @@ (define (show-help)
|
|||
(display (G_ "
|
||||
-L, --load-path=DIR prepend DIR to the package module search path"))
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -39,6 +39,8 @@ (define (show-help)
|
|||
(newline)
|
||||
(show-build-options-help)
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -1067,6 +1067,8 @@ (define (show-help)
|
|||
Create a bundle of PACKAGE.\n"))
|
||||
(show-build-options-help)
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-f, --format=FORMAT build a pack in the given FORMAT"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -398,6 +398,8 @@ (define (show-help)
|
|||
(newline)
|
||||
(show-build-options-help)
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -42,6 +42,8 @@ (define (show-help)
|
|||
(newline)
|
||||
(show-build-options-help)
|
||||
(newline)
|
||||
(show-transformation-options-help)
|
||||
(newline)
|
||||
(display (G_ "
|
||||
-h, --help display this help and exit"))
|
||||
(display (G_ "
|
||||
|
|
|
@ -508,9 +508,17 @@ (define %transformation-options
|
|||
(option '("with-debug-info") #t #f
|
||||
(parser 'with-debug-info))
|
||||
(option '("without-tests") #t #f
|
||||
(parser 'without-tests)))))
|
||||
(parser 'without-tests))
|
||||
|
||||
(define (show-transformation-options-help)
|
||||
(option '("help-transform") #f #f
|
||||
(lambda _
|
||||
(format #t
|
||||
(G_ "Available package transformation options:~%"))
|
||||
(show-transformation-options-help/detailed)
|
||||
(newline)
|
||||
(exit 0))))))
|
||||
|
||||
(define (show-transformation-options-help/detailed)
|
||||
(display (G_ "
|
||||
--with-source=[PACKAGE=]SOURCE
|
||||
use SOURCE when building the corresponding package"))
|
||||
|
@ -539,6 +547,10 @@ (define (show-transformation-options-help)
|
|||
--without-tests=PACKAGE
|
||||
build PACKAGE without running its tests")))
|
||||
|
||||
(define (show-transformation-options-help)
|
||||
"Show basic help for package transformation options."
|
||||
(display (G_ "
|
||||
--help-transform list package transformation options not shown here")))
|
||||
|
||||
(define (options->transformation opts)
|
||||
"Return a procedure that, when passed an object to build (package,
|
||||
|
|
Loading…
Reference in a new issue