7 files changed, 35 insertions(+), 22 deletions(-)

M gnu/packages/diffoscope.scm
M gnu/packages/gtk.scm
M gnu/packages/linux.scm
M gnu/packages/power.scm
M gnu/packages/python-xyz.scm
M gnu/packages/version-control.scm
M gnu/packages/virtualization.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")

@@ 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

@@ 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")

@@ 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")

@@ 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

@@ 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

@@ 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)