From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?VG9tw6HFoSDEjGVjaA==?= Subject: Re: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package. Date: Tue, 30 Aug 2016 18:51:15 +0200 Message-ID: <20160830165115.gnrfgky7h3jsrhvy@venom> References: <20160803171453.GB9060@venom> <20160803210752.16650-1-sleep_walker@gnu.org> <87zinvzins.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tqo7weoeynfir6wh" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bemFx-00006S-1S for guix-devel@gnu.org; Tue, 30 Aug 2016 12:51:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bemFs-00010g-2X for guix-devel@gnu.org; Tue, 30 Aug 2016 12:51:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:51364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bemFr-000100-Q3 for guix-devel@gnu.org; Tue, 30 Aug 2016 12:51:20 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id AA717ABEC for ; Tue, 30 Aug 2016 16:51:17 +0000 (UTC) Content-Disposition: inline In-Reply-To: <87zinvzins.fsf@gnu.org> 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: guix-devel@gnu.org --tqo7weoeynfir6wh Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Aug 29, 2016 at 05:41:59PM +0200, Ludovic Court=C3=A8s wrote: >Hello, > >Tom=C3=A1=C5=A1 =C4=8Cech 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. Shouldn't that be rather [arguments]: as it is in "the same level" as [inputs]? (and python-2 was already among inputs already) Thanks for your patience! >> diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation= =2Escm >> 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/re= lease/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! I'm afraid that Leo already pushed that. Thanks --tqo7weoeynfir6wh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXxbl6AAoJEEoj40+gM0NtfiAP/2icIUtALVgWLwJ9JINdZ5nr SSE0GObg56JrkcnSmP8U1U+P8WXC7mwXI8JSxe9NLwJKdVWX9LNixgUkIjiZAdv1 TOGqBtJRdg7U/JCTR+bJCKrj6sOlFKeR7wcr5/CB6SXYlx+SR6B/k/8ZW+WPW4c7 +NeTxaXhZWvSOByUhDlriID0vQbTL32d1RmHIYoeCVeITIM+meo4NTgu+lwA6Kqq zUygAxS6yYDKhQ7Uh+YeWLPRps5Mers7eccEMul+sNGwdcsV/HrHnLimU1uST21i Kr0mpO764nI2zUQjpzw33INEi1Ye4WceVKorSaMIQK8Zo/W0bCoazWKwA6gCqgCc ofNA4fKHFuJVoGdROtpIqPN5xq7R6oyWU931DpWVsQGHbv0vHdrQcXS7IOoUxkYz WYCP6f4wNKXr4n1amlyWcPjxvy14SkeEAaT+6sEh/rR45/f8+mOlp7vXbLPtzi2J UIgUsVG8wXPhTdmcRa8u11PTldLXRaoc7YT1HsOcQtWb0FwcpKyFjTN3S7N24Oo4 mHbw6Bb3hDkw0GS7wa19wzKKri12KTUjzldSQjFUgtRLi/ibc7UVZJtcrOOXaaZj VChJBLcG+n5yukUWgV3B7WTlxgH1ZGCCHVD+vhczfPRSFFdirpQz6DCiwXpGfHh0 IliE34R3IJWnoQfr3+Yy =rAft -----END PGP SIGNATURE----- --tqo7weoeynfir6wh--