[bug#55107] gnu: zsh: Build and install info pages.
Commit Message
* gnu/packages/shells.scm (zsh)[arguments]: Build and install info pages.
---
gnu/packages/shells.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Comments
Hello Andrew,
This looks great. Just a couple of comments:
Andrew Tropin <andrew@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.
Hi,
Thiago Jung Bauermann <bauermann@kolabnow.com> skribis:
> This looks great. Just a couple of comments:
>
> Andrew Tropin <andrew@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’.
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@debbugs.gnu.org.
>
> --
> 55107: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55107
> GNU Bug Tracking System
> Contact help-debbugs@gnu.org with problems
> From: Ludovic Courtès <ludo@gnu.org>
> Subject: Re: bug#55107: [PATCH] gnu: zsh: Build and install info pages.
> To: Thiago Jung Bauermann <bauermann@kolabnow.com>
> Cc: 55107-done@debbugs.gnu.org, Andrew Tropin <andrew@trop.in>
> Date: Fri, 29 Apr 2022 14:54:34 +0200
>
> Hi,
>
> Thiago Jung Bauermann <bauermann@kolabnow.com> skribis:
>
>> This looks great. Just a couple of comments:
>>
>> Andrew Tropin <andrew@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@trop.in>
> Subject: [PATCH] gnu: zsh: Build and install info pages.
> To: guix-patches@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@gnu.org>
> ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
> ;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
> +;;; Copyright © 2022 Andrew Tropin <andrew@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
@@ -19,6 +19,7 @@
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2022 Andrew Tropin <andrew@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