gnu: python-docutils: Update to 0.21.2.

This change updates python-docutils to the latests version and pins some
older packages on 0.19 to resolve build documentation issue which uses
rst2man.

* gnu/packages/python-xyz.scm (python-docutils): Update to 0.21.2.
[build-system]: Use pyproject.
[arguments] <phases>: Do not overwrite 'check use {#:test-backend} and
{#:test-flags}.
[native-inputs]: Add python-flit-core.

(python-docutils-0.16)[native-inputs]: Add python-wheel.

(python-docutils-0.19): New variable.

* gnu/packages/diffoscope.scm (trydiffoscope) [native-inputs]: Remove
python-docutils; add python-docutils-0.19.
* gnu/packages/gtk.scm (gtk): Likewise.
* gnu/packages/linux.scm (rdma-core): Likewise.
* gnu/packages/power.scm (apcupsd): Likewise.
* gnu/packages/version-control.scm (cgit): Likewise.
* gnu/packages/virtualization.scm (ganeti)) Likewise.

Change-Id: If58b9b12732347245e66e3c2cb5e67b0a8450913
This commit is contained in:
Sharlatan Hellseher 2025-06-25 19:44:00 +01:00
parent 579d43aafc
commit 7372201a62
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
7 changed files with 35 additions and 22 deletions

View file

@ -376,7 +376,7 @@ them in detail for later analysis.")
(propagated-inputs (propagated-inputs
(list python-requests)) (list python-requests))
(native-inputs (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) (build-system pyproject-build-system)
(home-page "https://try.diffoscope.org") (home-page "https://try.diffoscope.org")
(synopsis "Client for remote diffoscope service") (synopsis "Client for remote diffoscope service")

View file

@ -1373,7 +1373,7 @@ application suites.")
pkg-config pkg-config
python-pygobject python-pygobject
;; These python modules are required for building documentation. ;; These python modules are required for building documentation.
python-docutils python-docutils-0.19
python-jinja2 python-jinja2
python-markdown python-markdown
python-markupsafe python-markupsafe

View file

@ -7940,7 +7940,7 @@ from the ntfs-3g package. It is meant to be used in initrds.")
(search-input-file (search-input-file
%build-inputs "/bin/rst2man.py"))))) %build-inputs "/bin/rst2man.py")))))
(native-inputs (native-inputs
(list pkg-config python-wrapper python-docutils)) ;for 'rst2man' (list pkg-config python-wrapper python-docutils-0.19)) ;for 'rst2man'
(inputs (inputs
(list libnl eudev)) (list libnl eudev))
(home-page "https://github.com/linux-rdma/rdma-core") (home-page "https://github.com/linux-rdma/rdma-core")

View file

@ -126,7 +126,7 @@
(lambda _ (lambda _
(delete-file-recursively (delete-file-recursively
(string-append #$output "/etc/apcupsd"))))))) (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)) (inputs (list libusb libusb-compat))
(home-page "http://www.apcupsd.org") (home-page "http://www.apcupsd.org")
(synopsis "Daemon for controlling APC UPSes") (synopsis "Daemon for controlling APC UPSes")

View file

@ -8529,21 +8529,20 @@ Google and Numpydoc format.")
(define-public python-docutils (define-public python-docutils
(package (package
(name "python-docutils") (name "python-docutils")
(version "0.19") (version "0.21.2")
(source (origin (source
(method url-fetch) (origin
(uri (pypi-uri "docutils" version)) (method url-fetch)
(sha256 (uri (pypi-uri "docutils" version))
(base32 (sha256
"1rprvir116g5rz2bgzkzgyn6mv0z8582rz7bgxbpy2y3adkmm69k")))) (base32 "0vwqzbmzdvwx23myx4cg8s8mdkrqnfxpa9yi7jm2s66z5rrihsrs"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases (list
(replace 'check #:test-backend #~'custom
(lambda* (#:key tests? #:allow-other-keys) #:test-flags #~(list "test/alltests.py")))
(if tests? (native-inputs
(invoke "python" "test/alltests.py") (list python-flit-core))
(format #t "test suite not run~%")))))))
(home-page "https://docutils.sourceforge.net/") (home-page "https://docutils.sourceforge.net/")
(synopsis "Python Documentation Utilities") (synopsis "Python Documentation Utilities")
(description (description
@ -8571,7 +8570,21 @@ via commands such as @command{rst2man}, as well as supporting Python code.")
;; tests contain Python 2 syntax. ;; tests contain Python 2 syntax.
(arguments '(#:tests? #false)) (arguments '(#:tests? #false))
(native-inputs (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 (define-public python-docx
(package (package
@ -39900,7 +39913,7 @@ path.")
(native-inputs (native-inputs
(list perl-image-exiftool (list perl-image-exiftool
python-dateutil python-dateutil
python-docutils python-docutils-0.19
python-jinja2 python-jinja2
python-markdown python-markdown
python-pillow python-pillow

View file

@ -1774,7 +1774,7 @@ supports AGit-Flow and lifts the requirement to use a manifest file.")
bash-minimal bash-minimal
openssl openssl
python python
python-docutils python-docutils-0.19
python-markdown python-markdown
python-pygments python-pygments
zlib zlib

View file

@ -1060,7 +1060,7 @@ firmware blobs. You can
("automake" ,automake) ("automake" ,automake)
;; For the documentation. ;; For the documentation.
("python-docutils" ,python-docutils) ("python-docutils" ,python-docutils-0.19)
("sphinx" ,python-sphinx) ("sphinx" ,python-sphinx)
("pandoc" ,pandoc) ("pandoc" ,pandoc)
("dot" ,graphviz) ("dot" ,graphviz)