From: John Darrington <jmd@gnu.org>
To: guix-devel@gnu.org
Cc: John Darrington <jmd@gnu.org>
Subject: [PATCH 6/6] gnu: Tinyproxy: Cleanup xml dependencies
Date: Tue, 15 Jul 2014 20:31:36 +0200 [thread overview]
Message-ID: <1405449096-29230-6-git-send-email-jmd@gnu.org> (raw)
In-Reply-To: <1405449096-29230-1-git-send-email-jmd@gnu.org>
* gnu/packages/web.scm (tinyproxy): Use the xml_catalog from docbook instead of
generating a temporary one.
---
gnu/packages/web.scm | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6e94953..24886f9 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -528,25 +528,15 @@ help you implement simple HTTP servers.")
(alist-cons-before
'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys #:rest args)
- ;; This stuff is needed, because without it, xmlint etc tries
- ;; to download docbookx.dtd and docbook.xsl from the net
- (let ((build (assoc-ref %standard-phases 'build))
- (docbook-xml (assoc-ref inputs "docbook-xml"))
- (docbook-xsl (assoc-ref inputs "docbook-xsl"))
- (our-catalog "/tmp/docbook-xml.xml"))
- (setenv "XML_CATALOG_FILES" our-catalog)
- (with-output-to-file our-catalog
- (lambda ()
- (display (string-append
- "<?xml version=\"1.0\"?>
-<!DOCTYPE catalog PUBLIC \"-//OASIS//DTD XML Catalogs V1.0//EN\"
-\"file:///usr/share/xml/schema/xml-core/catalog.dtd\">
-<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">
-<system systemId=\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"
-uri=\"file://" docbook-xml "/xml/dtd/docbook/docbookx.dtd\"/>
-<system systemId=\"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\"
-uri=\"file://" docbook-xsl "/xml/xsl/docbook-xsl-1.72.0/manpages/docbook.xsl\"/>
-</catalog>\n"))))))
+ ;; Uncommenting the next two lines may assist in debugging
+ ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v"))
+ ;; (setenv "XML_DEBUG_CATALOG" "1")
+
+ (setenv "XML_CATALOG_FILES"
+ (string-append
+ (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-1.78.1/catalog.xml"
+ " " ; This must be a space, not a : (contrary to the documentation)
+ (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))
%standard-phases)))
;; All of the below are used to generate the documentation
;; (Should they be propagated inputs of asciidoc ??)
--
1.7.10.4
next prev parent reply other threads:[~2014-07-15 18:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 18:31 [PATCH 1/6] gnu: docbook-xsl update to 1.78.1 John Darrington
2014-07-15 18:31 ` [PATCH 2/6] gnu: Add docbook-xml version 4.3 and 4.4 John Darrington
2014-07-15 20:49 ` Ludovic Courtès
2014-07-15 18:31 ` [PATCH 3/6] gnu: docbook-xml: Substite remote xml_catalog uris with local ones John Darrington
2014-07-15 20:51 ` Ludovic Courtès
2014-07-15 18:31 ` [PATCH 4/6] gnu: docbook-xsl write absolute file:// uris in catalogs instead of ./ relative ones John Darrington
2014-07-15 20:51 ` Ludovic Courtès
2014-07-15 18:31 ` [PATCH 5/6] gnu: Enable gnome-doc-utils tests John Darrington
2014-07-15 20:59 ` Ludovic Courtès
2014-07-15 21:43 ` John Darrington
2014-07-16 9:23 ` Ludovic Courtès
2014-07-16 10:08 ` John Darrington
2014-07-15 18:31 ` John Darrington [this message]
2014-07-15 21:00 ` [PATCH 6/6] gnu: Tinyproxy: Cleanup xml dependencies Ludovic Courtès
2014-07-15 21:11 ` John Darrington
2014-07-15 20:49 ` [PATCH 1/6] gnu: docbook-xsl update to 1.78.1 Ludovic Courtès
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405449096-29230-6-git-send-email-jmd@gnu.org \
--to=jmd@gnu.org \
--cc=guix-devel@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 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).