From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package.
Date: Wed, 10 Aug 2016 14:48:46 -0400
Message-ID: <20160810184846.GD12220@jasmine>
References: <20160803210752.16650-1-sleep_walker@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33332)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1bXYYp-0000vD-4l
	for bug-guix@gnu.org; Wed, 10 Aug 2016 14:49:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1bXYYo-0003zG-4w
	for bug-guix@gnu.org; Wed, 10 Aug 2016 14:49:03 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:54883)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1bXYYn-0003yq-UZ
	for bug-guix@gnu.org; Wed, 10 Aug 2016 14:49:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1bXYYn-0000dE-Mf
	for bug-guix@gnu.org; Wed, 10 Aug 2016 14:49:01 -0400
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.24145.B24145.14708549292403@debbugs.gnu.org>
Content-Disposition: inline
In-Reply-To: <20160803210752.16650-1-sleep_walker@gnu.org>
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix/>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: =?UTF-8?Q?Tom=C3=A1=C5=A1_?= =?UTF-8?Q?=C4=8Cech?= <sleep_walker@gnu.org>
Cc: guix-devel@gnu.org, 24145@debbugs.gnu.org

On Wed, Aug 03, 2016 at 11:07:52PM +0200, Tomáš Čech wrote:
> * gnu/packages/documentation.scm(asciidoc): New input docbook-xsl,
>   replace use of online source and prefer docbook-xsl package.

Not having any practical experience with docbook-xsl, I think this
change looks fine, in general.

I think the commit message should be like this:

* gnu/packages/documentation.scm (asciidoc)[inputs]: Add docbook-xsl.
[arguments]: Add 'make-local-docbook-xsl' phase.

That is closer to the GNU Changelog format that we prefer to use.

> +         (add-before
> +             'install 'make-local-docbook-xsl

I think these two lines can collapsed into a single line.

> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* (find-files "docbook-xsl" ".*\\.xsl$")
> +               (("xsl:import href=\"http://docbook.sourceforge.net/release/xsl/current")
> +                (string-append
> +                 "xsl:import href=\""
> +                 (string-append (assoc-ref inputs "docbook-xsl")
> +                                "/xml/xsl/docbook-xsl-"
> +                                ,(package-version docbook-xsl))))))))))

My limited sense of Scheme style tells me to shift the previous 4 lines
to the right by 1 character.

The function should return #t, since (substitute*) has no defined return
value.