gnu: asciidoc: Update to 8.6.10.

* gnu/packages/documentation.scm (asciidoc): Update to 8.6.10.
[source]: Switch to new code host.
[arguments]: Add new ‘bootstrap’ phase...
[native-inputs]: ...and required autoconf.
[home-page]: Point to a more recently updated instance.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-06 15:53:15 +01:00
parent 1ffa065c44
commit ccfe4aa1c0
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -5,6 +5,7 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +29,7 @@ (define-module (gnu packages documentation)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
@ -42,19 +44,23 @@ (define-module (gnu packages documentation)
(define-public asciidoc (define-public asciidoc
(package (package
(name "asciidoc") (name "asciidoc")
(version "8.6.9") (version "8.6.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/asciidoc/asciidoc/" (uri (string-append "https://github.com/asciidoc/asciidoc/"
version "/asciidoc-" version ".tar.gz")) "archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq")))) "10xrl1iwyvs8aqm0vzkvs3dnsn93wyk942kk4ppyl6w9imbzhlly"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no 'check' target `(#:tests? #f ; no 'check' target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "autoconf")))
;; Some XML-related binaries are required for asciidoc's proper usage. ;; Some XML-related binaries are required for asciidoc's proper usage.
;; Without these, asciidoc fails when parsing XML documents, either ;; Without these, asciidoc fails when parsing XML documents, either
;; reporting a missing "xmllint" binary or, when passed the ;; reporting a missing "xmllint" binary or, when passed the
@ -93,12 +99,14 @@ (define-public asciidoc
(string-append (assoc-ref inputs "docbook-xml") (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/docbookx.dtd"))) "/xml/dtd/docbook/docbookx.dtd")))
#t))))) #t)))))
(native-inputs
`(("autoconf" ,autoconf)))
(inputs `(("python" ,python-2) (inputs `(("python" ,python-2)
("docbook-xml" ,docbook-xml) ("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxslt" ,libxslt))) ("libxslt" ,libxslt)))
(home-page "http://www.methods.co.nz/asciidoc/") (home-page "http://asciidoc.org/")
(synopsis "Text-based document generation system") (synopsis "Text-based document generation system")
(description (description
"AsciiDoc is a text document format for writing notes, documentation, "AsciiDoc is a text document format for writing notes, documentation,