GNU bug report logs - #55107
[PATCH] gnu: zsh: Build and install info pages.

Previous Next

Package: guix-patches;

Reported by: Andrew Tropin <andrew <at> trop.in>

Date: Mon, 25 Apr 2022 07:49:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#55107; Package guix-patches. (Mon, 25 Apr 2022 07:49:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Andrew Tropin <andrew <at> trop.in>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 25 Apr 2022 07:49:02 GMT) Full text and rfc822 format available.

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

From: Andrew Tropin <andrew <at> trop.in>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: zsh: Build and install info pages.
Date: Mon, 25 Apr 2022 09:40:02 +0300
[Message part 1 (text/plain, inline)]
* gnu/packages/shells.scm (zsh)[arguments]: Build and install info pages.
---
 gnu/packages/shells.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 3a48bc7dbf..7158a5bcfb 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2020, 2022 Marius Bakke <marius <at> gnu.org>
 ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
 ;;; Copyright © 2021, 2022 Felix Gruber <felgru <at> posteo.net>
+;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,6 +65,7 @@ (define-module (gnu packages shells)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages texinfo)
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -522,9 +524,13 @@ (define-public zsh
                          (("command -pv") "command -v")
                          (("command -p") "command ")
                          (("'command' -p") "'command' "))
-                       #t)))))
+                       #t))
+                   (add-after 'build 'make-info
+                     (lambda _ (invoke "make" "info")))
+                   (add-after 'build 'install-info
+                     (lambda _ (invoke "make" "install.info"))))))
     (native-inputs (list autoconf))
-    (inputs (list ncurses pcre perl))
+    (inputs (list ncurses pcre perl texinfo))
     (synopsis "Powerful shell for interactive use and scripting")
     (description "The Z shell (zsh) is a Unix shell that can be used
 as an interactive login shell and as a powerful command interpreter
-- 
2.35.1

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

Information forwarded to guix-patches <at> gnu.org:
bug#55107; Package guix-patches. (Wed, 27 Apr 2022 03:58:02 GMT) Full text and rfc822 format available.

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

From: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
To: Andrew Tropin <andrew <at> trop.in>
Cc: 55107 <at> debbugs.gnu.org
Subject: Re: [bug#55107] [PATCH] gnu: zsh: Build and install info pages.
Date: Wed, 27 Apr 2022 00:51:39 -0300
Hello Andrew,

This looks great. Just a couple of comments:

Andrew Tropin <andrew <at> trop.in> writes:

> [[PGP Signed Part:Undecided]]
>
> * gnu/packages/shells.scm (zsh)[arguments]: Build and install info pages.

The changelog should also mention the addition of texinfo to inputs (or
native inputs).

> @@ -522,9 +524,13 @@ (define-public zsh
>                           (("command -pv") "command -v")
>                           (("command -p") "command ")
>                           (("'command' -p") "'command' "))
> -                       #t)))))
> +                       #t))

Phases don't need to return #t anymore, so this patch would be a nice
opportunity to remove it here.

> +                   (add-after 'build 'make-info
> +                     (lambda _ (invoke "make" "info")))
> +                   (add-after 'build 'install-info
> +                     (lambda _ (invoke "make" "install.info"))))))
>      (native-inputs (list autoconf))
> -    (inputs (list ncurses pcre perl))
> +    (inputs (list ncurses pcre perl texinfo))

texinfo is a tool executed during the build process itself, so it should
be listed in native-inputs to allow cross-compilation.

-- 
Thanks
Thiago




Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Fri, 29 Apr 2022 12:55:01 GMT) Full text and rfc822 format available.

Notification sent to Andrew Tropin <andrew <at> trop.in>:
bug acknowledged by developer. (Fri, 29 Apr 2022 12:55:02 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
Cc: 55107-done <at> debbugs.gnu.org, Andrew Tropin <andrew <at> trop.in>
Subject: Re: bug#55107: [PATCH] gnu: zsh: Build and install info pages.
Date: Fri, 29 Apr 2022 14:54:34 +0200
Hi,

Thiago Jung Bauermann <bauermann <at> kolabnow.com> skribis:

> This looks great. Just a couple of comments:
>
> Andrew Tropin <andrew <at> trop.in> writes:
>
>> [[PGP Signed Part:Undecided]]
>>
>> * gnu/packages/shells.scm (zsh)[arguments]: Build and install info pages.

Applied with the changes Thiago suggested.

Thanks!

Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#55107; Package guix-patches. (Mon, 02 May 2022 12:15:02 GMT) Full text and rfc822 format available.

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

From: Andrew Tropin <andrew <at> trop.in>
To: 55107 <at> debbugs.gnu.org
Subject: Re: bug#55107: closed (Re: bug#55107: [PATCH] gnu: zsh: Build and
 install info pages.)
Date: Mon, 02 May 2022 15:14:32 +0300
[Message part 1 (text/plain, inline)]
On 2022-04-29 12:55, GNU bug Tracking System wrote:

> Your bug report
>
> #55107: [PATCH] gnu: zsh: Build and install info pages.
>
> which was filed against the guix-patches package, has been closed.
>
> The explanation is attached below, along with your original report.
> If you require more details, please reply to 55107 <at> debbugs.gnu.org.
>
> -- 
> 55107: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55107
> GNU Bug Tracking System
> Contact help-debbugs <at> gnu.org with problems
> From: Ludovic Courtès <ludo <at> gnu.org>
> Subject: Re: bug#55107: [PATCH] gnu: zsh: Build and install info pages.
> To: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
> Cc: 55107-done <at> debbugs.gnu.org, Andrew Tropin <andrew <at> trop.in>
> Date: Fri, 29 Apr 2022 14:54:34 +0200
>
> Hi,
>
> Thiago Jung Bauermann <bauermann <at> kolabnow.com> skribis:
>
>> This looks great. Just a couple of comments:
>>
>> Andrew Tropin <andrew <at> trop.in> writes:
>>
>>> [[PGP Signed Part:Undecided]]
>>>
>>> * gnu/packages/shells.scm (zsh)[arguments]: Build and install info pages.
>
> Applied with the changes Thiago suggested.

Thank you very much!

>
> Thanks!
>
> Ludo’.
>
> From: Andrew Tropin <andrew <at> trop.in>
> Subject: [PATCH] gnu: zsh: Build and install info pages.
> To: guix-patches <at> gnu.org
> Date: Mon, 25 Apr 2022 09:40:02 +0300
>
>
> * gnu/packages/shells.scm (zsh)[arguments]: Build and install info pages.
> ---
>  gnu/packages/shells.scm | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
> index 3a48bc7dbf..7158a5bcfb 100644
> --- a/gnu/packages/shells.scm
> +++ b/gnu/packages/shells.scm
> @@ -19,6 +19,7 @@
>  ;;; Copyright © 2020, 2022 Marius Bakke <marius <at> gnu.org>
>  ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
>  ;;; Copyright © 2021, 2022 Felix Gruber <felgru <at> posteo.net>
> +;;; Copyright © 2022 Andrew Tropin <andrew <at> trop.in>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -64,6 +65,7 @@ (define-module (gnu packages shells)
>    #:use-module (gnu packages tls)
>    #:use-module (gnu packages version-control)
>    #:use-module (gnu packages xorg)
> +  #:use-module (gnu packages texinfo)
>    #:use-module (guix build-system cargo)
>    #:use-module (guix build-system cmake)
>    #:use-module (guix build-system gnu)
> @@ -522,9 +524,13 @@ (define-public zsh
>                           (("command -pv") "command -v")
>                           (("command -p") "command ")
>                           (("'command' -p") "'command' "))
> -                       #t)))))
> +                       #t))
> +                   (add-after 'build 'make-info
> +                     (lambda _ (invoke "make" "info")))
> +                   (add-after 'build 'install-info
> +                     (lambda _ (invoke "make" "install.info"))))))
>      (native-inputs (list autoconf))
> -    (inputs (list ncurses pcre perl))
> +    (inputs (list ncurses pcre perl texinfo))
>      (synopsis "Powerful shell for interactive use and scripting")
>      (description "The Z shell (zsh) is a Unix shell that can be used
>  as an interactive login shell and as a powerful command interpreter

-- 
Best regards,
Andrew Tropin
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 31 May 2022 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 302 days ago.

Previous Next


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