all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: ludo@gnu.org (Ludovic Courtès)
To: "Tomáš Čech" <sleep_walker@gnu.org>
Cc: guix-devel@gnu.org, 24145@debbugs.gnu.org
Subject: Re: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package.
Date: Mon, 29 Aug 2016 17:41:59 +0200	[thread overview]
Message-ID: <87zinvzins.fsf@gnu.org> (raw)
In-Reply-To: <20160803210752.16650-1-sleep_walker@gnu.org> ("Tomáš Čech"'s message of "Wed, 3 Aug 2016 23:07:52 +0200")

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’.

  parent reply	other threads:[~2016-08-29 15:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-03 17:14 bug#24145: asciidoc depends on Internet connection instead of docbook-xsl package Tomáš Čech
2016-08-03 21:07 ` bug#24145: [PATCH] gnu: asciidoc: Use local " 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-22  6:44             ` bug#24145: " Leo Famulari
2016-08-22  6:04           ` Tomáš Čech
2016-08-29 15:41   ` Ludovic Courtès
2016-08-29 15:41   ` Ludovic Courtès [this message]
2016-08-30 16:51     ` Tomáš Čech

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87zinvzins.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=24145@debbugs.gnu.org \
    --cc=guix-devel@gnu.org \
    --cc=sleep_walker@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.