diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/sphinx.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.zip | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/sphinx.scm')
| -rw-r--r-- | gnu/packages/sphinx.scm | 51 |
1 files changed, 3 insertions, 48 deletions
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index f27f9d0176..5ba9594135 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -48,14 +48,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "2.3.1") + (version "3.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "19a28nsb0w4bs6k8rdfyk6vzrcwdpvhs2wq77rgpmww59yvndrz6")))) + "1zd8l4dh0v4p8m7s51xr001k09cq2023dd0953ygw7xa76dypnmr")))) (build-system python-build-system) (arguments `(#:phases @@ -99,52 +99,7 @@ for Python projects or other documents consisting of multiple reStructuredText sources.") (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-sphinx)))))) - -;; Sphinx 2 does not support Python 2, so we stick with this older version here. -;; Remove this package once python2-pbcore no longer requires it. -(define-public python2-sphinx - (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) - (package - (inherit base) - (version "1.7.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'check 'disable-broken-tests - (lambda _ - ;; These tests are broken when using Python2: - ;; <https://github.com/sphinx-doc/sphinx/issues/4710>. - (for-each delete-file '("tests/test_api_translator.py" - "tests/test_setup_command.py")) - #t)))))) - (native-inputs `(("python2-mock" ,python2-mock) - ("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base))) - ;; Sphinx 2 has some dependencies that do not support Python 2, so - ;; we keep our own propagated-inputs here instead of inheriting. - (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-typing" ,python2-typing) - ("python2-imagesize" ,python2-imagesize) - ("python2-sphinx-alabaster-theme" - ,python2-sphinx-alabaster-theme) - ("python2-babel" ,python2-babel-2.6) - ("python2-snowballstemmer" ,python2-snowballstemmer) - ("python2-docutils" ,python2-docutils-0.14) - ("python2-jinja2" ,python2-jinja2) - ("python2-packaging" ,python2-packaging) - ("python2-pygments" ,python2-pygments) - ("python2-requests" ,python2-requests) - ("python2-six" ,python2-six) - ("python2-sphinxcontrib-websupport" - ,python2-sphinxcontrib-websupport)))))) + (properties `((python2-variant . ,(delay python-sphinx)))))) (define-public python-sphinxcontrib-applehelp (package |