[PATCH] gnu: emacs-ag: build/install info

[PATCH] gnu: emacs-ag: build/install info

[myglc2]

[-- Attachment #1: Type: text/plain, Size: 59 bytes --]


Info source was included but not previously being built.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-ag-build-install-info.patch --]
[-- Type: text/x-patch, Size: 1823 bytes --]

From 5b757a33ffb1528621027aeecff07a7b95c5df39 Mon Sep 17 00:00:00 2001
From: George Clemmer <myglc2@gmail.com>
Date: Mon, 10 Apr 2017 18:31:52 -0400
Subject: [PATCH] gnu: emacs-ag: build/install info

* gnu/packages/emacs.scm (emacs-a): build/install info
---
 gnu/packages/emacs.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index cc14fd228..4e788830c 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -56,6 +56,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
@@ -1125,9 +1126,23 @@ than @code{electric-indent-mode}.")
                ("ag-executable"
                 (string-append (assoc-ref inputs "the-silver-searcher")
                                "/bin/ag")))
-             #t)))))
+             #t))
+         (add-before 'install 'make-info
+           (lambda _
+             (with-directory-excursion "docs"
+               (unless (zero? (system* "make" "info"))
+                 (error "makeinfo failed")))))
+         (add-after 'install 'install-info
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out      (assoc-ref outputs "out"))
+                    (info (string-append out "/share/info")))
+               (install-file "docs/_build/texinfo/agel.info" info)
+               #t))))))
     (inputs
      `(("the-silver-searcher" ,the-silver-searcher)))
+    (native-inputs
+     `(("python-sphinx" ,python-sphinx)
+       ("texinfo" ,texinfo)))
     (propagated-inputs
      `(("dash" ,emacs-dash)
        ("s" ,emacs-s)))
-- 
2.12.2

Re: [PATCH] gnu: emacs-ag: build/install info

[Alex Kost]

myglc2 (2017-04-10 18:56 -0400) wrote:

> Info source was included but not previously being built.
>
> From 5b757a33ffb1528621027aeecff07a7b95c5df39 Mon Sep 17 00:00:00 2001
> From: George Clemmer <myglc2@gmail.com>
> Date: Mon, 10 Apr 2017 18:31:52 -0400
> Subject: [PATCH] gnu: emacs-ag: build/install info
>
> * gnu/packages/emacs.scm (emacs-a): build/install info
> ---
>  gnu/packages/emacs.scm | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index cc14fd228..4e788830c 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -56,6 +56,7 @@
>    #:use-module (gnu packages gtk)
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages ncurses)
> +  #:use-module (gnu packages python)
>    #:use-module (gnu packages tex)
>    #:use-module (gnu packages texinfo)
>    #:use-module (gnu packages tls)
> @@ -1125,9 +1126,23 @@ than @code{electric-indent-mode}.")
>                 ("ag-executable"
>                  (string-append (assoc-ref inputs "the-silver-searcher")
>                                 "/bin/ag")))
> -             #t)))))
> +             #t))
> +         (add-before 'install 'make-info
> +           (lambda _
> +             (with-directory-excursion "docs"
> +               (unless (zero? (system* "make" "info"))
> +                 (error "makeinfo failed")))))

This error is not needed, just (zero? ...)

> +         (add-after 'install 'install-info
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
                              ^^^^^^
'inputs' variable is not needed here as it is not used in the body.

> +             (let* ((out      (assoc-ref outputs "out"))
> +                    (info (string-append out "/share/info")))
> +               (install-file "docs/_build/texinfo/agel.info" info)
> +               #t))))))
>      (inputs
>       `(("the-silver-searcher" ,the-silver-searcher)))
> +    (native-inputs
> +     `(("python-sphinx" ,python-sphinx)
> +       ("texinfo" ,texinfo)))
>      (propagated-inputs
>       `(("dash" ,emacs-dash)
>         ("s" ,emacs-s)))

I added a copyright line for you and committed:

http://git.savannah.gnu.org/cgit/guix.git/commit/?id=99517d92709ee979c3507994caeb18db1eed08a6

Thanks!

-- 
Alex

Re: [PATCH] gnu: emacs-ag: build/install info

[myglc2]

On 04/12/2017 at 18:18 Alex Kost writes:

[...]
> I added a copyright line for you and committed:
>
> http://git.savannah.gnu.org/cgit/guix.git/commit/?id=99517d92709ee979c3507994caeb18db1eed08a6
>
> Thanks!

Thank you for the corrections. Stumbling around in the dark and happy to have them ;-)