gnu: asciidoc: Remove Python 2 variant.
* gnu/packages/documentation.scm (asciidoc): Update to 9.1.0. [inputs]: Replace PYTHON-2 with PYTHON. (asciidoc-py3): Define as deprecated alias for ASCIIDOC. * gnu/packages/version-control.scm (git)[native-inputs]: Change from ASCIIDOC-PY3 to ASCIIDOC. * gnu/packages/wm.scm (i3-wm)[native-inputs]: Likewise.master
parent
e12919a480
commit
c2649f2811
|
@ -10,6 +10,7 @@
|
||||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
|
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
|
||||||
|
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -34,6 +35,7 @@
|
||||||
#: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 (guix build-system qt)
|
#:use-module (guix build-system qt)
|
||||||
|
#:use-module (guix deprecation)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages backup)
|
#:use-module (gnu packages backup)
|
||||||
|
@ -101,16 +103,16 @@ pages in HTML.")
|
||||||
(define-public asciidoc
|
(define-public asciidoc
|
||||||
(package
|
(package
|
||||||
(name "asciidoc")
|
(name "asciidoc")
|
||||||
(version "8.6.10")
|
(version "9.1.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/asciidoc-py/asciidoc-py2")
|
(url "https://github.com/asciidoc/asciidoc-py")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1hrqkgjmp1gq3f9rkbr8l0y62fzvwb9n8ys35s25bg2ld04y4g4y"))))
|
"1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; no 'check' target
|
`(#:tests? #f ; no 'check' target
|
||||||
|
@ -159,11 +161,12 @@ release/xsl/current")
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,autoconf)))
|
`(("autoconf" ,autoconf)))
|
||||||
(inputs `(("python" ,python-2)
|
(inputs
|
||||||
("docbook-xml" ,docbook-xml)
|
`(("python" ,python)
|
||||||
("docbook-xsl" ,docbook-xsl)
|
("docbook-xml" ,docbook-xml)
|
||||||
("libxml2" ,libxml2)
|
("docbook-xsl" ,docbook-xsl)
|
||||||
("libxslt" ,libxslt)))
|
("libxml2" ,libxml2)
|
||||||
|
("libxslt" ,libxslt)))
|
||||||
(home-page "https://asciidoc.org/")
|
(home-page "https://asciidoc.org/")
|
||||||
(synopsis "Text-based document generation system")
|
(synopsis "Text-based document generation system")
|
||||||
(description
|
(description
|
||||||
|
@ -177,28 +180,7 @@ the backend output markups (which can be almost any type of SGML/XML
|
||||||
markup) can be customized and extended by the user.")
|
markup) can be customized and extended by the user.")
|
||||||
(license gpl2+)))
|
(license gpl2+)))
|
||||||
|
|
||||||
(define-public asciidoc-py3
|
(define-deprecated asciidoc-py3 asciidoc)
|
||||||
(package (inherit asciidoc)
|
|
||||||
(name "asciidoc-py3")
|
|
||||||
(version "9.1.0")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/asciidoc/asciidoc-py")
|
|
||||||
(commit version)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(native-inputs
|
|
||||||
`(("autoconf" ,autoconf)))
|
|
||||||
(inputs
|
|
||||||
`(("python" ,python)
|
|
||||||
("docbook-xml" ,docbook-xml)
|
|
||||||
("docbook-xsl" ,docbook-xsl)
|
|
||||||
("libxml2" ,libxml2)
|
|
||||||
("libxslt" ,libxslt)))))
|
|
||||||
|
|
||||||
(define-public doxygen
|
(define-public doxygen
|
||||||
(package
|
(package
|
||||||
|
|
|
@ -204,7 +204,7 @@ as well as the classic centralized workflow.")
|
||||||
(base32
|
(base32
|
||||||
"00n7vbfmd3ywgjksgwrszwj0l2niba64qkaq07ra4p8mawy483ax"))))
|
"00n7vbfmd3ywgjksgwrszwj0l2niba64qkaq07ra4p8mawy483ax"))))
|
||||||
;; For subtree documentation.
|
;; For subtree documentation.
|
||||||
("asciidoc" ,asciidoc-py3)
|
("asciidoc" ,asciidoc)
|
||||||
("docbook-xsl" ,docbook-xsl)
|
("docbook-xsl" ,docbook-xsl)
|
||||||
("xmlto" ,xmlto)
|
("xmlto" ,xmlto)
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
|
|
|
@ -334,7 +334,7 @@ commands would.")
|
||||||
`(("which" ,which)
|
`(("which" ,which)
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("asciidoc-py3" ,asciidoc-py3)
|
("asciidoc" ,asciidoc)
|
||||||
;; For building the documentation.
|
;; For building the documentation.
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("docbook-xsl" ,docbook-xsl)))
|
("docbook-xsl" ,docbook-xsl)))
|
||||||
|
|
Reference in New Issue