* bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package. [not found] <20160803171453.GB9060@venom> @ 2016-08-03 21:07 ` Tomáš Čech 2016-08-10 18:48 ` Leo Famulari 2016-08-29 15:41 ` bug#24145: " Ludovic Courtès 0 siblings, 2 replies; 8+ messages in thread From: Tomáš Čech @ 2016-08-03 21:07 UTC (permalink / raw) To: guix-devel; +Cc: 24145 * gnu/packages/documentation.scm(asciidoc): New input docbook-xsl, replace use of online source and prefer docbook-xsl package. --- gnu/packages/documentation.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) 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=\"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)))))))))) + (inputs `(("python" ,python-2) + ("docbook-xsl" ,docbook-xsl))) (home-page "http://www.methods.co.nz/asciidoc/") (synopsis "Text-based document generation system") (description -- 2.9.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-03 21:07 ` bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package Tomáš Čech @ 2016-08-10 18:48 ` Leo Famulari 2016-08-14 17:17 ` Tomáš Čech 2016-08-29 15:41 ` bug#24145: " Ludovic Courtès 1 sibling, 1 reply; 8+ messages in thread From: Leo Famulari @ 2016-08-10 18:48 UTC (permalink / raw) To: Tomáš Čech; +Cc: guix-devel, 24145 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. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-10 18:48 ` Leo Famulari @ 2016-08-14 17:17 ` Tomáš Čech 2016-08-19 19:08 ` Tomáš Čech 0 siblings, 1 reply; 8+ messages in thread From: Tomáš Čech @ 2016-08-14 17:17 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 2422 bytes --] On Wed, Aug 10, 2016 at 02:48:46PM -0400, Leo Famulari wrote: >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. I see your point and thanks for the pointer, I'll try to read more about that. > >> + (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") I'd agree but my emacs autoindentation then does crazy things: (add-before 'install 'make-local-docbook-xsl (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)))))))))) So, can I adjust indentation settings or is it expected? >> + (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. Are you sure about that? It's 2nd and 3rd parameter to `string-append'... >The function should return #t, since (substitute*) has no defined return >value. I see. Fixed. Thanks for review! S_W [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-14 17:17 ` Tomáš Čech @ 2016-08-19 19:08 ` Tomáš Čech 2016-08-21 21:44 ` Leo Famulari 0 siblings, 1 reply; 8+ messages in thread From: Tomáš Čech @ 2016-08-19 19:08 UTC (permalink / raw) To: guix-devel * gnu/packages/documentation.scm (asciidoc)[inputs]: Add docbook-xsl. [arguments]: Add 'make-local-docbook-xsl' phase. --- gnu/packages/documentation.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 72af708..59417a0 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -49,8 +49,23 @@ (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=\"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))))) + #t))))) + (inputs `(("python" ,python-2) + ("docbook-xsl" ,docbook-xsl))) (home-page "http://www.methods.co.nz/asciidoc/") (synopsis "Text-based document generation system") (description -- 2.9.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-19 19:08 ` Tomáš Čech @ 2016-08-21 21:44 ` Leo Famulari 2016-08-22 6:04 ` Tomáš Čech 0 siblings, 1 reply; 8+ messages in thread From: Leo Famulari @ 2016-08-21 21:44 UTC (permalink / raw) To: Tomáš Čech; +Cc: guix-devel On Fri, Aug 19, 2016 at 09:08:43PM +0200, Tomáš Čech wrote: > * gnu/packages/documentation.scm (asciidoc)[inputs]: Add docbook-xsl. > [arguments]: Add 'make-local-docbook-xsl' phase. Thanks! I added a comment above the phase and pushed as dd10ba6356. And then I remembered that you could have pushed it yourself. Oops! ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-21 21:44 ` Leo Famulari @ 2016-08-22 6:04 ` Tomáš Čech 0 siblings, 0 replies; 8+ messages in thread From: Tomáš Čech @ 2016-08-22 6:04 UTC (permalink / raw) To: guix-devel; +Cc: 24145 [-- Attachment #1: Type: text/plain, Size: 483 bytes --] On Sun, Aug 21, 2016 at 05:44:12PM -0400, Leo Famulari wrote: >On Fri, Aug 19, 2016 at 09:08:43PM +0200, Tomáš Čech wrote: >> * gnu/packages/documentation.scm (asciidoc)[inputs]: Add docbook-xsl. >> [arguments]: Add 'make-local-docbook-xsl' phase. > >Thanks! I added a comment above the phase and pushed as dd10ba6356. Thanks! >And then I remembered that you could have pushed it yourself. Oops! That doesn't matter :) I think we can close bug#24145 now. S_W [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-03 21:07 ` bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package Tomáš Čech 2016-08-10 18:48 ` Leo Famulari @ 2016-08-29 15:41 ` Ludovic Courtès 2016-08-30 16:51 ` Tomáš Čech 1 sibling, 1 reply; 8+ messages in thread From: Ludovic Courtès @ 2016-08-29 15:41 UTC (permalink / raw) To: Tomáš Čech; +Cc: guix-devel, 24145 Hello, Tomáš Čech <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=\"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)))))))))) > + (inputs `(("python" ,python-2) > + ("docbook-xsl" ,docbook-xsl))) Otherwise LGTM, please push! Ludo’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package. 2016-08-29 15:41 ` bug#24145: " Ludovic Courtès @ 2016-08-30 16:51 ` Tomáš Čech 0 siblings, 0 replies; 8+ messages in thread From: Tomáš Čech @ 2016-08-30 16:51 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 1983 bytes --] On Mon, Aug 29, 2016 at 05:41:59PM +0200, Ludovic Courtès wrote: >Hello, > >Tomáš Čech <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. 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.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=\"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)))))))))) >> + (inputs `(("python" ,python-2) >> + ("docbook-xsl" ,docbook-xsl))) > >Otherwise LGTM, please push! I'm afraid that Leo already pushed that. Thanks [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-08-30 16:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160803171453.GB9060@venom>
2016-08-03 21:07 ` bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package Tomáš Čech
2016-08-10 18:48 ` Leo Famulari
2016-08-14 17:17 ` Tomáš Čech
2016-08-19 19:08 ` Tomáš Čech
2016-08-21 21:44 ` Leo Famulari
2016-08-22 6:04 ` Tomáš Čech
2016-08-29 15:41 ` bug#24145: " Ludovic Courtès
2016-08-30 16:51 ` Tomáš Čech
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).