diff options
| -rw-r--r-- | gnu/packages/diffoscope.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/power.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 45 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/virtualization.scm | 2 |
7 files changed, 35 insertions, 22 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 7314029c6c..005be166ba 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -376,7 +376,7 @@ them in detail for later analysis.") (propagated-inputs (list python-requests)) (native-inputs - (list gzip python-docutils python-setuptools python-wheel)) + (list gzip python-docutils-0.19 python-setuptools python-wheel)) (build-system pyproject-build-system) (home-page "https://try.diffoscope.org") (synopsis "Client for remote diffoscope service") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 39e9e6ec73..d229f7827b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1373,7 +1373,7 @@ application suites.") pkg-config python-pygobject ;; These python modules are required for building documentation. - python-docutils + python-docutils-0.19 python-jinja2 python-markdown python-markupsafe diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f59a21a8ff..96940bbe7a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7940,7 +7940,7 @@ from the ntfs-3g package. It is meant to be used in initrds.") (search-input-file %build-inputs "/bin/rst2man.py"))))) (native-inputs - (list pkg-config python-wrapper python-docutils)) ;for 'rst2man' + (list pkg-config python-wrapper python-docutils-0.19)) ;for 'rst2man' (inputs (list libnl eudev)) (home-page "https://github.com/linux-rdma/rdma-core") diff --git a/gnu/packages/power.scm b/gnu/packages/power.scm index 7ba86b16eb..7be8485449 100644 --- a/gnu/packages/power.scm +++ b/gnu/packages/power.scm @@ -126,7 +126,7 @@ (lambda _ (delete-file-recursively (string-append #$output "/etc/apcupsd"))))))) - (native-inputs (list mandoc pkg-config python-docutils util-linux)) + (native-inputs (list mandoc pkg-config python-docutils-0.19 util-linux)) (inputs (list libusb libusb-compat)) (home-page "http://www.apcupsd.org") (synopsis "Daemon for controlling APC UPSes") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 581c9c05bb..bcde89425a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8529,21 +8529,20 @@ Google and Numpydoc format.") (define-public python-docutils (package (name "python-docutils") - (version "0.19") - (source (origin - (method url-fetch) - (uri (pypi-uri "docutils" version)) - (sha256 - (base32 - "1rprvir116g5rz2bgzkzgyn6mv0z8582rz7bgxbpy2y3adkmm69k")))) - (build-system python-build-system) + (version "0.21.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "docutils" version)) + (sha256 + (base32 "0vwqzbmzdvwx23myx4cg8s8mdkrqnfxpa9yi7jm2s66z5rrihsrs")))) + (build-system pyproject-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (invoke "python" "test/alltests.py") - (format #t "test suite not run~%"))))))) + (list + #:test-backend #~'custom + #:test-flags #~(list "test/alltests.py"))) + (native-inputs + (list python-flit-core)) (home-page "https://docutils.sourceforge.net/") (synopsis "Python Documentation Utilities") (description @@ -8571,7 +8570,21 @@ via commands such as @command{rst2man}, as well as supporting Python code.") ;; tests contain Python 2 syntax. (arguments '(#:tests? #false)) (native-inputs - (list python-setuptools)))) + (list python-setuptools python-wheel)))) + +(define-public python-docutils-0.19 + (hidden-package + (package + (inherit python-docutils) + (version "0.19") + (source (origin + (method url-fetch) + (uri (pypi-uri "docutils" version)) + (sha256 + (base32 + "1rprvir116g5rz2bgzkzgyn6mv0z8582rz7bgxbpy2y3adkmm69k")))) + (native-inputs + (list python-setuptools python-wheel))))) (define-public python-docx (package @@ -39900,7 +39913,7 @@ path.") (native-inputs (list perl-image-exiftool python-dateutil - python-docutils + python-docutils-0.19 python-jinja2 python-markdown python-pillow diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index dad26eb712..6cae9c2546 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1774,7 +1774,7 @@ supports AGit-Flow and lifts the requirement to use a manifest file.") bash-minimal openssl python - python-docutils + python-docutils-0.19 python-markdown python-pygments zlib diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3d5e939a26..e71daaed5b 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1060,7 +1060,7 @@ firmware blobs. You can ("automake" ,automake) ;; For the documentation. - ("python-docutils" ,python-docutils) + ("python-docutils" ,python-docutils-0.19) ("sphinx" ,python-sphinx) ("pandoc" ,pandoc) ("dot" ,graphviz) |