all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#62577] [PATCH] refresh: Support select packages SUBSET by module name.
@ 2023-04-01  3:59 iyzsong--- via Guix-patches via
  2023-04-08 21:27 ` Ludovic Courtès
  2023-04-09  4:43 ` [bug#62577] [PATCH v2] " iyzsong--- via Guix-patches via
  0 siblings, 2 replies; 6+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-04-01  3:59 UTC (permalink / raw)
  To: 62577; +Cc: 宋文武

From: 宋文武 <iyzsong@member.fsf.org>

* guix/scripts/refresh.scm (%options): Support '--select module:NAME'.
(show-help): Adjust accordingly.
(options->update-specs): Honor the module passed by '--select'.
---
 guix/scripts/refresh.scm | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index bc6c24967a..d6ac574b1f 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -32,6 +32,7 @@ (define-module (guix scripts refresh)
   #:use-module ((guix scripts build) #:select (%standard-build-options))
   #:use-module (guix store)
   #:use-module (guix utils)
+  #:use-module (guix discovery)
   #:use-module (guix packages)
   #:use-module (guix profiles)
   #:use-module (guix upstream)
@@ -71,8 +72,15 @@ (define %options
                     ((or "core" "non-core")
                      (alist-cons 'select (string->symbol arg)
                                  result))
+                    ((? (cut string-prefix? "module:" <>))
+                     (alist-cons 'select
+                                 (cons 'module
+                                       (string->symbol
+                                        (string-drop
+                                         arg (string-length "module:"))))
+                                 result))
                     (x
-                     (leave (G_ "~a: invalid selection; expected `core' or `non-core'~%")
+                     (leave (G_ "~a: invalid selection; expected `core', `non-core' or `module:NAME'~%")
                             arg)))))
         (option '(#\t "type") #t #f
                 (lambda (opt name arg result)
@@ -141,8 +149,8 @@ (define (show-help)
   (display (G_ "
   -u, --update           update source files in place"))
   (display (G_ "
-  -s, --select=SUBSET    select all the packages in SUBSET, one of
-                         `core' or `non-core'"))
+  -s, --select=SUBSET    select all the packages in SUBSET, one of `core`,
+                         `non-core' or `module:NAME' (eg: module:guile)"))
   (display (G_ "
   -m, --manifest=FILE    select all the packages from the manifest in FILE"))
   (display (G_ "
@@ -257,13 +265,20 @@ (define update-specs
        (let ((select? (match (assoc-ref opts 'select)
                         ('core core-package?)
                         ('non-core (negate core-package?))
-                        (_ (const #t)))))
+                        (_ (const #t))))
+             (modules (match (assoc-ref opts 'select)
+                         (('module . mod)
+                          (list (resolve-interface `(gnu packages ,mod))))
+                         (_ (all-modules (%package-module-path)
+                                         #:warn
+                                         warn-about-load-error)))))
          (map update-spec
               (fold-packages (lambda (package result)
                                (if (select? package)
                                    (keep-newest package result)
                                    result))
-                             '()))))
+                             '()
+                             modules))))
       (some                                       ;user-specified packages
        some)))
 

base-commit: 1c6238794b0058003fa6c827ca0d039764ebe699
-- 
2.39.2





^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#62577] [PATCH] refresh: Support select packages SUBSET by module name.
  2023-04-01  3:59 [bug#62577] [PATCH] refresh: Support select packages SUBSET by module name iyzsong--- via Guix-patches via
@ 2023-04-08 21:27 ` Ludovic Courtès
  2023-04-09  4:46   ` 宋文武 via Guix-patches via
  2023-04-09  4:43 ` [bug#62577] [PATCH v2] " iyzsong--- via Guix-patches via
  1 sibling, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2023-04-08 21:27 UTC (permalink / raw)
  To: iyzsong; +Cc: 62577, 宋文武

Hi,

iyzsong@envs.net skribis:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> * guix/scripts/refresh.scm (%options): Support '--select module:NAME'.
> (show-help): Adjust accordingly.
> (options->update-specs): Honor the module passed by '--select'.

That looks very useful!

Could you also update ‘doc/guix.texi’?

> +                    ((? (cut string-prefix? "module:" <>))
> +                     (alist-cons 'select
> +                                 (cons 'module
> +                                       (string->symbol
> +                                        (string-drop
> +                                         arg (string-length "module:"))))
> +                                 result))

Perhaps this should support both full module names:

  module:(past packages autotools)

and:

  module:guile

where the latter is short for “module:(gnu packages guile)”.

WDYT?

Otherwise LGTM.

Could you send an updated version?

Thanks,
Ludo’.




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#62577] [PATCH v2] refresh: Support select packages SUBSET by module name.
  2023-04-01  3:59 [bug#62577] [PATCH] refresh: Support select packages SUBSET by module name iyzsong--- via Guix-patches via
  2023-04-08 21:27 ` Ludovic Courtès
@ 2023-04-09  4:43 ` iyzsong--- via Guix-patches via
  2023-04-20 10:18   ` Ludovic Courtès
  1 sibling, 1 reply; 6+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-04-09  4:43 UTC (permalink / raw)
  To: 62577; +Cc: Ludovic Courtès, 宋文武

From: 宋文武 <iyzsong@member.fsf.org>

* guix/scripts/refresh.scm (%options): Support '--select module:NAME'.
(show-help): Adjust accordingly.
(options->update-specs): Honor the module passed by '--select'.
* doc/guix.texi (Invoking guix refresh): Document it.
---
 doc/guix.texi            |  9 +++++++--
 guix/scripts/refresh.scm | 36 +++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index ed42488882..711755dbe3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14227,8 +14227,8 @@ $ ./pre-inst-env guix refresh -s non-core -u
 
 @item --select=[@var{subset}]
 @itemx -s @var{subset}
-Select all the packages in @var{subset}, one of @code{core} or
-@code{non-core}.
+Select all the packages in @var{subset}, one of @code{core}, @code{non-core}
+or @code{module:NAME}.
 
 The @code{core} subset refers to all the packages at the core of the
 distribution---i.e., packages that are used to build ``everything
@@ -14241,6 +14241,11 @@ The @code{non-core} subset refers to the remaining packages.  It is
 typically useful in cases where an update of the core packages would be
 inconvenient.
 
+The @code{module:NAME} subset refers to all the packages in a specified
+guile module.  The module can be specified as @code{module:guile} or
+@code{module:(gnu packages guile)}, the former is a shorthand for the
+later.
+
 @item --manifest=@var{file}
 @itemx -m @var{file}
 Select all the packages from the manifest in @var{file}.  This is useful to
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index bc6c24967a..47c4d55ec4 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -32,6 +32,7 @@ (define-module (guix scripts refresh)
   #:use-module ((guix scripts build) #:select (%standard-build-options))
   #:use-module (guix store)
   #:use-module (guix utils)
+  #:use-module (guix discovery)
   #:use-module (guix packages)
   #:use-module (guix profiles)
   #:use-module (guix upstream)
@@ -44,6 +45,7 @@ (define-module (guix scripts refresh)
   #:use-module ((gnu packages commencement) #:select (%final-inputs))
   #:use-module (ice-9 match)
   #:use-module (ice-9 format)
+  #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-26)
@@ -71,8 +73,23 @@ (define %options
                     ((or "core" "non-core")
                      (alist-cons 'select (string->symbol arg)
                                  result))
+                    ((? (cut string-prefix? "module:" <>))
+                     (let ((mod (cond
+                                 ;; Shorthand name: "module:guile".
+                                 ((string-match "module:([^\( ]+)$" arg) =>
+                                  (lambda (m)
+                                    `(gnu packages ,(string->symbol
+                                                     (match:substring m 1)))))
+                                 ;; Full name : "module:(gnu packages guile)".
+                                 ((string-match "module:\\(([^)]+)\\)$" arg) =>
+                                  (lambda (m)
+                                    (map string->symbol
+                                         (string-split
+                                          (match:substring m 1) #\space))))
+                                 (else (leave (G_ "invalid module: ~a~%") arg)))))
+                       (alist-cons 'select (cons 'module mod) result)))
                     (x
-                     (leave (G_ "~a: invalid selection; expected `core' or `non-core'~%")
+                     (leave (G_ "~a: invalid selection; expected `core', `non-core' or `module:NAME'~%")
                             arg)))))
         (option '(#\t "type") #t #f
                 (lambda (opt name arg result)
@@ -141,8 +158,10 @@ (define (show-help)
   (display (G_ "
   -u, --update           update source files in place"))
   (display (G_ "
-  -s, --select=SUBSET    select all the packages in SUBSET, one of
-                         `core' or `non-core'"))
+  -s, --select=SUBSET    select all the packages in SUBSET, one of `core`,
+                         `non-core' or `module:NAME' (eg: module:guile)
+                         the module can also be fully specified as
+                         'module:(gnu packages guile)'"))
   (display (G_ "
   -m, --manifest=FILE    select all the packages from the manifest in FILE"))
   (display (G_ "
@@ -257,13 +276,20 @@ (define update-specs
        (let ((select? (match (assoc-ref opts 'select)
                         ('core core-package?)
                         ('non-core (negate core-package?))
-                        (_ (const #t)))))
+                        (_ (const #t))))
+             (modules (match (assoc-ref opts 'select)
+                         (('module . mod)
+                          (list (resolve-interface mod)))
+                         (_ (all-modules (%package-module-path)
+                                         #:warn
+                                         warn-about-load-error)))))
          (map update-spec
               (fold-packages (lambda (package result)
                                (if (select? package)
                                    (keep-newest package result)
                                    result))
-                             '()))))
+                             '()
+                             modules))))
       (some                                       ;user-specified packages
        some)))
 

base-commit: c1262edba9118af6507dc47ce6ad61ffdec02384
-- 
2.39.2





^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#62577] [PATCH] refresh: Support select packages SUBSET by module name.
  2023-04-08 21:27 ` Ludovic Courtès
@ 2023-04-09  4:46   ` 宋文武 via Guix-patches via
  0 siblings, 0 replies; 6+ messages in thread
From: 宋文武 via Guix-patches via @ 2023-04-09  4:46 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 62577, 宋文武

Ludovic Courtès <ludo@gnu.org> writes:

> Could you send an updated version?

v2 patch sent with update guix.texi and support full module name, thank
you for the suggestions!




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#62577] [PATCH v2] refresh: Support select packages SUBSET by module name.
  2023-04-09  4:43 ` [bug#62577] [PATCH v2] " iyzsong--- via Guix-patches via
@ 2023-04-20 10:18   ` Ludovic Courtès
  2023-04-23  7:36     ` bug#62577: [PATCH] " 宋文武 via Guix-patches via
  0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2023-04-20 10:18 UTC (permalink / raw)
  To: iyzsong; +Cc: 62577, 宋文武

Hi,

iyzsong@envs.net skribis:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> * guix/scripts/refresh.scm (%options): Support '--select module:NAME'.
> (show-help): Adjust accordingly.
> (options->update-specs): Honor the module passed by '--select'.
> * doc/guix.texi (Invoking guix refresh): Document it.

[...]

> +Select all the packages in @var{subset}, one of @code{core}, @code{non-core}
> +or @code{module:NAME}.
>  
>  The @code{core} subset refers to all the packages at the core of the
>  distribution---i.e., packages that are used to build ``everything
> @@ -14241,6 +14241,11 @@ The @code{non-core} subset refers to the remaining packages.  It is
>  typically useful in cases where an update of the core packages would be
>  inconvenient.
>  
> +The @code{module:NAME} subset refers to all the packages in a specified

s/@code{module:NAME}/@code{module:@var{name}}/

Otherwise LGTM, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#62577: [PATCH] refresh: Support select packages SUBSET by module name.
  2023-04-20 10:18   ` Ludovic Courtès
@ 2023-04-23  7:36     ` 宋文武 via Guix-patches via
  0 siblings, 0 replies; 6+ messages in thread
From: 宋文武 via Guix-patches via @ 2023-04-23  7:36 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 62577-done

Ludovic Courtès <ludo@gnu.org> writes:

>> +The @code{module:NAME} subset refers to all the packages in a specified
>
> s/@code{module:NAME}/@code{module:@var{name}}/
>
> Otherwise LGTM, thanks!

Pushed, thank you for review!




^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-04-23  7:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-01  3:59 [bug#62577] [PATCH] refresh: Support select packages SUBSET by module name iyzsong--- via Guix-patches via
2023-04-08 21:27 ` Ludovic Courtès
2023-04-09  4:46   ` 宋文武 via Guix-patches via
2023-04-09  4:43 ` [bug#62577] [PATCH v2] " iyzsong--- via Guix-patches via
2023-04-20 10:18   ` Ludovic Courtès
2023-04-23  7:36     ` bug#62577: [PATCH] " 宋文武 via Guix-patches via

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.