guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#54393] [PATCH 0/2] Add 'guix manifest' to "translate" commands to m


From: Maxim Cournoyer
Subject: [bug#54393] [PATCH 0/2] Add 'guix manifest' to "translate" commands to manifests
Date: Mon, 04 Apr 2022 10:37:26 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)

Hello,

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

> * guix/scripts/shell.scm (show-help, %options): Add '--export-manifest'.
> (manifest-entry-version-prefix, manifest->code*)
> (export-manifest): New procedures.
> (guix-shell): Honor '--export-manifest'.
> * tests/guix-shell-export-manifest.sh: New file.
> * Makefile.am (SH_TESTS): Add it.
> * doc/guix.texi (Invoking guix shell): Document '--export-manifest'.
> (Invoking guix environment): Link to it.
> (Invoking guix pack): Likewise.

[...]

> +
> +;;;
> +;;; Exporting a manifest.
> +;;;
> +
> +(define (manifest-entry-version-prefix entry)
> +  "Search among all the versions of ENTRY's package that are available, and
> +return the shortest unambiguous version prefix for this package."
> +  (package-unique-version-prefix (manifest-entry-name entry)
> +                                 (manifest-entry-version entry)))
> +
> +(define (manifest->code* manifest extra-manifests)
> +  "Like 'manifest->code', but insert a 'concatenate-manifests' call that
> +concatenates MANIFESTS, a list of expressions."
> +  (if (null? (manifest-entries manifest))
> +      (match extra-manifests
> +        ((one) one)
> +        (lst   `(concatenate-manifests ,@extra-manifests)))
> +      (match (manifest->code manifest
> +                             #:entry-package-version
> +                             manifest-entry-version-prefix)
> +        (('begin exp ... last)
> +         `(begin
> +            ,@exp
> +            ,(match extra-manifests
> +               (() last)
> +               (_  `(concatenate-manifests
> +                     (list ,last ,@extra-manifests)))))))))

Should an "else" clause be added here with a more useful error message
that the default 'no match for x' or similar?  If that'd be totally
unexpected and a bug, then it's fine as-is.

> +(define (export-manifest opts port)
> +  "Write to PORT a manifest corresponding to OPTS."
> +  (define (manifest-lift proc)
> +    (lambda (entry)
> +      (match (manifest-entry-item entry)
> +        ((? package? p)
> +         (manifest-entry
> +           (inherit (package->manifest-entry (proc p)))
> +           (output (manifest-entry-output entry))))
> +        (_
> +         entry))))
> +
> +  (define (validated-spec spec)
> +    ;; Return SPEC if it's validate package spec.

As this is an action (proc), perhaps it should be named "validate-spec".
The comment doc should also be worded as "if SPEC is a valid package
spec" or similar.

The rest LGTM.

Thank you for addressing the suggestion to reuse an existing sub-command
to try to keep things neatly organized instead of extending the already
large set of them :-).

Maxim





reply via email to

[Prev in Thread] Current Thread [Next in Thread]