GNU bug report logs - #38301
[PATCH 0/4] Allow for multiple '--manifest' options

Previous Next

Full log

Message #20 received at 38301 <at> debbugs.gnu.org (full text, mbox):

From: brettg <at> posteo.net
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Guix-patches <guix-patches-bounces+brettg=posteo.net <at> gnu.org>,
 Konrad Hinsen <konrad.hinsen <at> fastmail.net>,
 Pierre Neidhardt <mail <at> ambrevar.xyz>, 38301 <at> debbugs.gnu.org
Subject: Re: [bug#38301] [PATCH 4/4] pack: Allow multiple '--manifest' options.
Date: Wed, 20 Nov 2019 17:23:07 +0100

On 20.11.2019 14:44, Ludovic Courtès wrote:
> * guix/scripts/pack.scm (guix-pack): Collect 'manifest' options, and
> concatenate the resulting manifests.
> * tests/guix-pack.sh: Test it.
> * doc/guix.texi (Invoking guix pack): Document it.
> ---
>  doc/guix.texi         |  3 ++-
>  guix/scripts/pack.scm | 17 ++++++++++++-----
>  tests/guix-pack.sh    | 11 +++++++++++
>  3 files changed, 25 insertions(+), 6 deletions(-)
> 
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 9de1dbd6d5..e702bc3055 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -5178,7 +5178,8 @@ build} (@pxref{Additional Build Options,
> @code{--expression} in
>  @item --manifest=@var{file}
>  @itemx -m @var{file}
>  Use the packages contained in the manifest object returned by the 
> Scheme
> -code in @var{file}.
> +code in @var{file}.  This option can be repeated several times, in 
> which
> +case the manifests are concatenated.
> 
>  This has a similar purpose as the same-named option in @command{guix
>  package} (@pxref{profile-manifest, @option{--manifest}}) and uses the
> diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
> index 89b3e389fc..c8a52374bd 100644
> --- a/guix/scripts/pack.scm
> +++ b/guix/scripts/pack.scm
> @@ -965,7 +965,10 @@ Create a bundle of PACKAGE.\n"))
>                                    (list (transform store package) 
> "out")))
>                                 (reverse
>                                  (filter-map maybe-package-argument 
> opts))))
> -           (manifest-file (assoc-ref opts 'manifest)))
> +           (manifests     (filter-map (match-lambda
> +                                        (('manifest . file) file)
> +                                        (_ #f))
> +                                      opts)))
>        (define properties
>          (if (assoc-ref opts 'save-provenance?)
>              (lambda (package)
> @@ -979,11 +982,15 @@ Create a bundle of PACKAGE.\n"))
>              (const '())))
> 
>        (cond
> -       ((and manifest-file (not (null? packages)))
> +       ((and (not (null? manifests)) (not (null? packages)))
>          (leave (G_ "both a manifest and a package list were 
> given~%")))
> -       (manifest-file
> -        (let ((user-module (make-user-module '((guix profiles) 
> (gnu)))))
> -          (load* manifest-file user-module)))
> +       ((not (null? manifests))
> +        (concatenate-manifests
> +         (map (lambda (file)
> +                (let ((user-module (make-user-module
> +                                    '((guix profiles) (gnu)))))
> +                  (load* file user-module)))
> +              manifests)))
>         (else
>          (manifest
>           (map (match-lambda
> diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh
> index cf4e4ca4f9..7a0f3400c3 100644
> --- a/tests/guix-pack.sh
> +++ b/tests/guix-pack.sh
> @@ -109,3 +109,14 @@ drv1="`guix pack -n guile 2>&1 | grep 
> pack.*\.drv`"
>  drv2="`guix pack -n --with-source=guile=$test_directory guile 2>&1 |
> grep pack.*\.drv`"
>  test -n "$drv1"
>  test "$drv1" != "$drv2"
> +
> +# Try '--manifest' options.
> +cat > "$test_directory/manifest1.scm" <<EOF
> +(specifications->manifest '("guile"))
> +EOF
> +cat > "$test_directory/manifest2.scm" <<EOF
> +(specifications->manifest '("emacs"))
> +EOF
> +drv="`guix pack -nd -m "$test_directory/manifest1.scm" -m
> "$test_directory/manifest2.scm"`"
> +guix gc -R "$drv" | grep `guix build guile -nd`
> +guix gc -R "$drv" | grep `guix build emacs -nd`

At last! This feature is going to be available.

These patches LGTM!

Brett

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.