From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: Re: [PATCH] gnu: emacs-ag: build/install info Date: Wed, 12 Apr 2017 21:18:15 +0300 Message-ID: <87bms1sd5k.fsf@gmail.com> References: <86h91vswh6.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyMqV-0007EC-G7 for guix-devel@gnu.org; Wed, 12 Apr 2017 14:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyMqQ-0008DB-H8 for guix-devel@gnu.org; Wed, 12 Apr 2017 14:18:23 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:35724) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cyMqQ-0008Cy-9d for guix-devel@gnu.org; Wed, 12 Apr 2017 14:18:18 -0400 Received: by mail-lf0-x244.google.com with SMTP id i3so4160063lfh.2 for ; Wed, 12 Apr 2017 11:18:18 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: myglc2 Cc: guix-devel@gnu.org 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 > 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