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