aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-06-14 15:19:31 +0200
committerMarius Bakke <marius@gnu.org>2020-06-14 23:15:22 +0200
commitbf7321cc9171a0b4145debd770666efafe0b2f24 (patch)
tree1d2d1086d8b2bbd95ed020a83b2b116584d376e5
parent54bbed96389cb07f5f38f2a26d6c3ce35068710a (diff)
downloadguix-bf7321cc9171a0b4145debd770666efafe0b2f24.tar
guix-bf7321cc9171a0b4145debd770666efafe0b2f24.tar.gz
gnu: docbook: Add 5.0.1.
* gnu/packages/docbook.scm (docbook-xml-5): New public variable. (docbook-xml): Inherit from it. While at it, remove trailing whitespace.
-rw-r--r--gnu/packages/docbook.scm58
1 files changed, 46 insertions, 12 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 7221dd8fd9..ee09b9d0b4 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,8 +35,50 @@
#:use-module (guix build-system trivial)
#:use-module (guix build-system python))
+(define-public docbook-xml-5
+ (package
+ (name "docbook-xml")
+ (version "5.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://www.docbook.org/xml/" version
+ "/docbook-" version ".zip"))
+ (sha256
+ (base32
+ "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs"))))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((unzip
+ (string-append (assoc-ref %build-inputs "unzip")
+ "/bin/unzip"))
+ (source (assoc-ref %build-inputs "source"))
+ (out (assoc-ref %outputs "out"))
+ (dtd (string-append out "/xml/dtd/docbook")))
+ (invoke unzip source)
+ (mkdir-p dtd)
+ (copy-recursively (string-append "docbook-" ,version) dtd)
+ (with-directory-excursion dtd
+ (substitute* (string-append out "/xml/dtd/docbook/catalog.xml")
+ (("uri=\"")
+ (string-append
+ "uri=\"file://" dtd "/")))
+ #t)))))
+ (native-inputs `(("unzip" ,unzip)))
+ (home-page "https://docbook.org")
+ (synopsis "DocBook XML DTDs for document authoring")
+ (description
+ "DocBook is general purpose XML and SGML document type particularly well
+suited to books and papers about computer hardware and software (though it is
+by no means limited to these applications.) This package provides XML DTDs.")
+ (license (x11-style "" "See file headers."))))
+
(define-public docbook-xml
(package
+ (inherit docbook-xml-5)
(name "docbook-xml")
(version "4.5")
(source (origin
@@ -45,7 +88,6 @@
(sha256
(base32
"1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"))))
- (build-system trivial-build-system)
(arguments
'(#:builder (begin
(use-modules (guix build utils))
@@ -60,19 +102,11 @@
(with-directory-excursion dtd
(invoke unzip source))
(substitute* (string-append out "/xml/dtd/docbook/catalog.xml")
- (("uri=\"")
- (string-append
+ (("uri=\"")
+ (string-append
"uri=\"file://" dtd "/")))
#t))
- #:modules ((guix build utils))))
- (native-inputs `(("unzip" ,unzip)))
- (home-page "https://docbook.org")
- (synopsis "DocBook XML DTDs for document authoring")
- (description
- "DocBook is general purpose XML and SGML document type particularly well
-suited to books and papers about computer hardware and software (though it is
-by no means limited to these applications.) This package provides XML DTDs.")
- (license (x11-style "" "See file headers."))))
+ #:modules ((guix build utils))))))
(define-public docbook-xml-4.4
(package (inherit docbook-xml)