diff options
| author | Pierre Langlois <pierre.langlois@gmx.com> | 2021-09-28 22:50:39 +0100 |
|---|---|---|
| committer | Pierre Langlois <pierre.langlois@gmx.com> | 2021-10-02 21:21:19 +0100 |
| commit | 20bc9ecc204a610a0d5fa8b88c74421f57dbaf3b (patch) | |
| tree | 1eff897476c0b33bcb6180812c567f9c5ab7c9b5 | |
| parent | 62a24dd9a125095362789dd4b3c3fe3fd650f017 (diff) | |
| download | guix-patches-20bc9ecc204a610a0d5fa8b88c74421f57dbaf3b.tar guix-patches-20bc9ecc204a610a0d5fa8b88c74421f57dbaf3b.tar.gz | |
scripts: home: Wire and document --expression flag.
* guix/scripts/home.scm (show-help): Add --expression option.
(%options): Likewise.
* doc/guix.texi (Invoking guix home): Document it.
| -rw-r--r-- | doc/guix.texi | 16 | ||||
| -rw-r--r-- | guix/scripts/home.scm | 7 |
2 files changed, 22 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index a72a726b54..2a1fea2987 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -79,7 +79,7 @@ Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020, 2021 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* -Copyright @copyright{} 2020 Pierre Langlois@* +Copyright @copyright{} 2020, 2021 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* @@ -36093,6 +36093,20 @@ $ guix home list-generations 10d @end table +@var{options} can contain any of the common build options (@pxref{Common +Build Options}). In addition, @var{options} can contain one of the +following: + +@table @option + +@item --expression=@var{expr} +@itemx -e @var{expr} +Consider the home-environment @var{expr} evaluates to. +This is an alternative to specifying a file which evaluates to a home +environment. + +@end table + @node Documentation @chapter Documentation diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 75df6d707d..a466f3deb1 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> +;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +87,9 @@ Some ACTIONS support additional ARGS.\n")) (show-build-options-help) (display (G_ " + -e, --expression=EXPR consider the home-environment EXPR evaluates to + instead of reading FILE, when applicable")) + (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) (display (G_ " @@ -115,6 +119,9 @@ Some ACTIONS support additional ARGS.\n")) (let ((level (string->number* arg))) (alist-cons 'verbosity level (alist-delete 'verbosity result))))) + (option '(#\e "expression") #t #f + (lambda (opt name arg result) + (alist-cons 'expression arg result))) %standard-build-options)) (define %default-options |