diff mbox series

[bug#68479] weather: Add ‘-e’.

Message ID d657298afb6109d5e9a369e08b10bb677699566e.1705339189.git.ludo@gnu.org
State New
Headers show
Series [bug#68479] weather: Add ‘-e’. | expand

Commit Message

Ludovic Courtès Jan. 15, 2024, 5:21 p.m. UTC 
* guix/scripts/weather.scm (show-help, %options): Add ‘-e’.
(guix-weather): Handle it.
* doc/guix.texi (Invoking guix weather): Document it.

Change-Id: I6dc97ec2b8226b57be33247b05a34c23b573a64f
---
 doc/guix.texi            | 16 +++++++++++++++-
 guix/scripts/weather.scm |  9 ++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

Hi!

This patch adds to ‘guix weather’ the ‘-e’ option that ‘guix build’
and most other commands already support.

Thoughts?

Ludo’.


base-commit: 162d6a2fdd6af13272967c77347a54934ecb45e6

Comments

Simon Tournier Jan. 18, 2024, 10:55 a.m. UTC | #1 
Hi,

On lun., 15 janv. 2024 at 18:21, Ludovic Courtès <ludo@gnu.org> wrote:
> * guix/scripts/weather.scm (show-help, %options): Add ‘-e’.
> (guix-weather): Handle it.
> * doc/guix.texi (Invoking guix weather): Document it.
>
> Change-Id: I6dc97ec2b8226b57be33247b05a34c23b573a64f
> ---
>  doc/guix.texi            | 16 +++++++++++++++-
>  guix/scripts/weather.scm |  9 ++++++++-
>  2 files changed, 23 insertions(+), 2 deletions(-)
>
> Hi!
>
> This patch adds to ‘guix weather’ the ‘-e’ option that ‘guix build’
> and most other commands already support.

LGTM.

Cheers,
simon
Ludovic Courtès Jan. 28, 2024, 9:25 p.m. UTC | #2 
Simon Tournier <zimon.toutoune@gmail.com> skribis:

> On lun., 15 janv. 2024 at 18:21, Ludovic Courtès <ludo@gnu.org> wrote:
>> * guix/scripts/weather.scm (show-help, %options): Add ‘-e’.
>> (guix-weather): Handle it.
>> * doc/guix.texi (Invoking guix weather): Document it.
>>
>> Change-Id: I6dc97ec2b8226b57be33247b05a34c23b573a64f
>> ---
>>  doc/guix.texi            | 16 +++++++++++++++-
>>  guix/scripts/weather.scm |  9 ++++++++-
>>  2 files changed, 23 insertions(+), 2 deletions(-)
>>
>> Hi!
>>
>> This patch adds to ‘guix weather’ the ‘-e’ option that ‘guix build’
>> and most other commands already support.
>
> LGTM.

Pushed as 6cca8f069431f4475d8eaf9336cb952ce5694e55, thanks!

Ludo'.
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index a66005ee9d..fe16dd30e6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -22,7 +22,7 @@ 
 @set SUBSTITUTE-URLS https://@value{SUBSTITUTE-SERVER-1} https://@value{SUBSTITUTE-SERVER-2}
 
 @copying
-Copyright @copyright{} 2012-2023 Ludovic Courtès@*
+Copyright @copyright{} 2012-2024 Ludovic Courtès@*
 Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@*
 Copyright @copyright{} 2013 Nikita Karetnikov@*
 Copyright @copyright{} 2014, 2015, 2016 Alex Kost@*
@@ -16721,6 +16721,20 @@  Invoking guix weather
 This option can be repeated several times, in which case the manifests
 are concatenated.
 
+@item --expression=@var{expr}
+@itemx -e @var{expr}
+Consider the package @var{expr} evaluates to.
+
+A typical use case for this option is specifying a package that is
+hidden and thus cannot be referred to in the usual way, as in this
+example:
+
+@example
+guix weather -e '(@@@@ (gnu packages rust) rust-bootstrap)'
+@end example
+
+This option can be repeated.
+
 @item --coverage[=@var{count}]
 @itemx -c [@var{count}]
 Report on substitute coverage for packages: list packages with at least
diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm
index 2f8985593d..08a1b22a74 100644
--- a/guix/scripts/weather.scm
+++ b/guix/scripts/weather.scm
@@ -1,5 +1,5 @@ 
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017-2024 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
@@ -388,6 +388,8 @@  (define (show-help)
   -m, --manifest=MANIFEST
                          look up substitutes for packages specified in MANIFEST"))
   (display (G_ "
+  -e, --expression=EXPR  build the object EXPR evaluates to"))
+  (display (G_ "
   -c, --coverage[=COUNT]
                          show substitute coverage for packages with at least
                          COUNT dependents"))
@@ -426,6 +428,9 @@  (define %options
          (option '(#\m "manifest") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'manifest arg result)))
+         (option '(#\e "expression") #t #f
+                 (lambda (opt name arg result)
+                   (alist-cons 'expression arg result)))
          (option '(#\c "coverage") #f #t
                  (lambda (opt name arg result)
                    (alist-cons 'coverage
@@ -611,6 +616,8 @@  (define-command (guix-weather . args)
           (base  (filter-map (match-lambda
                                (('argument . spec)
                                 (specification->package spec))
+                               (('expression . str)
+                                (read/eval-package-expression str))
                                (_
                                 #f))
                              opts)))