From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
Subject: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package.
Date: Mon, 29 Aug 2016 17:41:59 +0200
Message-ID: <87zinvzins.fsf__35463.7313554578$1472485412$gmane$org@gnu.org>
References: <20160803171453.GB9060@venom>
	<20160803210752.16650-1-sleep_walker@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41523)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1beOiI-0008DG-DG
	for bug-guix@gnu.org; Mon, 29 Aug 2016 11:43:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1beOiE-0004Xj-7a
	for bug-guix@gnu.org; Mon, 29 Aug 2016 11:43:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:46015)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1beOiE-0004Xf-41
	for bug-guix@gnu.org; Mon, 29 Aug 2016 11:43:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1beOiD-00016O-VA
	for bug-guix@gnu.org; Mon, 29 Aug 2016 11:43:01 -0400
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.24145.B24145.14724853324166@debbugs.gnu.org>
In-Reply-To: <20160803210752.16650-1-sleep_walker@gnu.org>
	("=?UTF-8?Q?Tom=C3=A1=C5=A1_?= =?UTF-8?Q?=C4=8Cech?="'s
	message of "Wed, 3 Aug 2016 23:07:52 +0200")
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

Hello,

Tom=C3=A1=C5=A1 =C4=8Cech <sleep_walker@gnu.org> skribis:

> * gnu/packages/documentation.scm(asciidoc): New input docbook-xsl,
>   replace use of online source and prefer docbook-xsl package.

Rather:

* gnu/packages/documentation (asciidoc)[inputs]: Add PYTHON-2 and
DOCBOOK-XSL.
(arguments): Add 'make-local-docbook-xsl' phase.

> diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.=
scm
> index 72af708..98d30e7 100644
> --- a/gnu/packages/documentation.scm
> +++ b/gnu/packages/documentation.scm
> @@ -49,8 +49,22 @@
>                 (base32
>                  "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"))=
))
>      (build-system gnu-build-system)
> -    (arguments '(#:tests? #f))                    ; no 'check' target
> -    (inputs `(("python" ,python-2)))
> +    (arguments
> +     `(#:tests? #f                     ; no 'check' target
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before
> +             'install 'make-local-docbook-xsl
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* (find-files "docbook-xsl" ".*\\.xsl$")
> +               (("xsl:import href=3D\"http://docbook.sourceforge.net/rel=
ease/xsl/current")
> +                (string-append
> +                 "xsl:import href=3D\""
> +                 (string-append (assoc-ref inputs "docbook-xsl")
> +                                "/xml/xsl/docbook-xsl-"
> +                                ,(package-version docbook-xsl))))))))))
> +    (inputs `(("python" ,python-2)
> +              ("docbook-xsl" ,docbook-xsl)))

Otherwise LGTM, please push!

Ludo=E2=80=99.