all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Alex Kost <alezost@gmail.com>
To: myglc2 <myglc2@gmail.com>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: emacs-ag: build/install info
Date: Wed, 12 Apr 2017 21:18:15 +0300	[thread overview]
Message-ID: <87bms1sd5k.fsf@gmail.com> (raw)
In-Reply-To: 86h91vswh6.fsf@gmail.com

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

  reply	other threads:[~2017-04-12 18:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-10 22:56 [PATCH] gnu: emacs-ag: build/install info myglc2
2017-04-12 18:18 ` Alex Kost [this message]
2017-04-13  3:34   ` myglc2

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87bms1sd5k.fsf@gmail.com \
    --to=alezost@gmail.com \
    --cc=guix-devel@gnu.org \
    --cc=myglc2@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.