GNU bug report logs - #71204
[PATCH 1/2] gnu: guix: Add imagemagick, perl and use full graphviz.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71204 in the body.
You can then email your comments to 71204 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 1/2] gnu: guix: Add imagemagick, perl and use full graphviz.
Date: Sun, 26 May 2024 04:26:16 +0000

This makes it possible to run 'make distcheck' in a 'guix shell -D guix'
environment.

* gnu/packages/package-management.scm (guix)
[native-inputs]: Replace graphviz-minimal with graphviz.  Add imagemagick and
perl.

Change-Id: Ie400c622d8fc77108df29c03e11f36159d6f6238
---
 gnu/packages/package-management.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 862de9f942..2f1434d5be 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -490,8 +490,10 @@ (define-public guix
                        ("automake" ,automake)
                        ("gettext" ,gettext-minimal)
                        ("texinfo" ,texinfo)
-                       ("graphviz" ,graphviz-minimal)
+                       ("graphviz" ,graphviz) ;non-minimal for PDF support
                        ("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
+                       ("imagemagick" ,imagemagick) ;for 'make dist'
+                       ("perl" ,perl)               ;for 'make dist'
                        ("help2man" ,help2man)
                        ("po4a" ,po4a-minimal)))
       (inputs

base-commit: 77771036f0970083c146b709d792d128f4235125
-- 
2.41.0

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 71204 <at> debbugs.gnu.org
Subject: Re: [bug#71204] [PATCH 1/2] gnu: guix: Add imagemagick, perl and
 use full graphviz.
Date: Sun, 26 May 2024 15:46:45 +0800

[Message part 1 (text/plain, inline)]

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> This makes it possible to run 'make distcheck' in a 'guix shell -D guix'

I think maybe should add them to manifest.scm? And just 'guix shell' or
'guix shell -m manifest.scm'?


> environment.
>
> * gnu/packages/package-management.scm (guix)
> [native-inputs]: Replace graphviz-minimal with graphviz.  Add imagemagick and
> perl.
>
> Change-Id: Ie400c622d8fc77108df29c03e11f36159d6f6238
> ---
>  gnu/packages/package-management.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
> index 862de9f942..2f1434d5be 100644
> --- a/gnu/packages/package-management.scm
> +++ b/gnu/packages/package-management.scm
> @@ -490,8 +490,10 @@ (define-public guix
>                         ("automake" ,automake)
>                         ("gettext" ,gettext-minimal)
>                         ("texinfo" ,texinfo)
> -                       ("graphviz" ,graphviz-minimal)
> +                       ("graphviz" ,graphviz) ;non-minimal for PDF support
>                         ("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
> +                       ("imagemagick" ,imagemagick) ;for 'make dist'
> +                       ("perl" ,perl)               ;for 'make dist'
>                         ("help2man" ,help2man)
>                         ("po4a" ,po4a-minimal)))
>        (inputs
>
> base-commit: 77771036f0970083c146b709d792d128f4235125

[signature.asc (application/pgp-signature, inline)]

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71204 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 2/2] manifest: Streamline;
 add packages useful for patch review/submission.
Date: Sun, 26 May 2024 07:53:35 -0400

* manifest.scm: Fix alternate command line invocation (which would not
consider 'manifest.scm').  Use specifications instead of packages.  Remove
perl (now in the guix package's native inputs).  Add b4, git, git:send-email,
mumi, nss-certs, openssl and patman to the manifest.

Change-Id: I49d92dda059856ce217cea9054a466a1754dcf94
---

 manifest.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/manifest.scm b/manifest.scm
index 2bc225ead7..7e4d82c3a5 100644
--- a/manifest.scm
+++ b/manifest.scm
@@ -22,18 +22,19 @@
 ;;
 ;; or something like
 ;;
-;;     guix shell --pure git git:send-email openssh
-
-(use-modules (guix profiles)
-             (gnu packages gnupg)
-             (gnu packages perl)
-             (gnu packages package-management))
+;;     guix shell --pure -m manifest.scm hello ...
 
 (concatenate-manifests
- (list (package->development-manifest guix)
-
-       ;; Extra packages used by make dist.
-       (packages->manifest (list perl))
-
+ (list (package->development-manifest (specification->package "guix"))
        ;; Extra packages used by unit tests.
-       (packages->manifest (list gnupg))))
+       (specifications->manifest (list "gnupg"))
+
+       ;; Useful extras for patches submission.
+       (specifications->manifest
+        (list "b4"
+              "git"
+              "git:send-email"
+              "mumi"
+              "nss-certs"
+              "openssl"              ;required if using 'smtpEncryption = tls'
+              "patman"))))
-- 
2.41.0

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 71204 <at> debbugs.gnu.org
Subject: Re: [bug#71204] [PATCH 1/2] gnu: guix: Add imagemagick, perl and
 use full graphviz.
Date: Sun, 26 May 2024 08:09:51 -0400

Hi Zheng,

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
>> This makes it possible to run 'make distcheck' in a 'guix shell -D guix'

> I think maybe should add them to manifest.scm? And just 'guix shell' or
> 'guix shell -m manifest.scm'?

I think it's nice that 'make distcheck' works out of the box, even for
'guix shell -D guix ...'.  According to 'guix size' the
new $GUIX_ENVIRONMENT produced with the added inputs do not add any
weight, so were probably already transitively referenced.

Also see PATCH 2/2 where I augment the manifest.scm file with
git:send-email and friends.

-- 
Thanks,
Maxim

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 71204 <at> debbugs.gnu.org
Subject: Re: [bug#71204] [PATCH 1/2] gnu: guix: Add imagemagick, perl and
 use full graphviz.
Date: Mon, 27 May 2024 18:59:27 +0800

[Message part 1 (text/plain, inline)]

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hi Zheng,
>
> Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:
>
>> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>>
>>> This makes it possible to run 'make distcheck' in a 'guix shell -D guix'
>
>> I think maybe should add them to manifest.scm? And just 'guix shell' or
>> 'guix shell -m manifest.scm'?
>
> I think it's nice that 'make distcheck' works out of the box, even for
> 'guix shell -D guix ...'.  According to 'guix size' the
> new $GUIX_ENVIRONMENT produced with the added inputs do not add any

ok, LGTM. 

> weight, so were probably already transitively referenced.
>
> Also see PATCH 2/2 where I augment the manifest.scm file with
> git:send-email and friends.

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 71204-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 71204-done <at> debbugs.gnu.org
Subject: Re: [bug#71204] [PATCH 1/2] gnu: guix: Add imagemagick, perl and
 use full graphviz.
Date: Sun, 23 Jun 2024 22:58:53 -0400

Hi,

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
>> Hi Zheng,
>>
>> Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:
>>
>>> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>>>
>>>> This makes it possible to run 'make distcheck' in a 'guix shell -D guix'
>>
>>> I think maybe should add them to manifest.scm? And just 'guix shell' or
>>> 'guix shell -m manifest.scm'?
>>
>> I think it's nice that 'make distcheck' works out of the box, even for
>> 'guix shell -D guix ...'.  According to 'guix size' the
>> new $GUIX_ENVIRONMENT produced with the added inputs do not add any
>
> ok, LGTM. 

Applied, thanks for taking a look!

-- 
Thanks,
Maxim

Previous Next

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