From 30ac875bd85e3da141961ed2225092fdc37729e4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Fri, 12 Aug 2022 21:03:40 +0200
Subject: gnu: python-sphinx: Update to 5.1.1.

* gnu/packages/sphinx.scm (python-sphinx): Update to 5.1.1.
---
 gnu/packages/sphinx.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/sphinx.scm')

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index c68cc9c1b7..b6e7d94462 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -62,14 +62,14 @@
 (define-public python-sphinx
   (package
     (name "python-sphinx")
-    (version "5.0.2")
+    (version "5.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Sphinx" version))
        (sha256
         (base32
-         "1c67w48509k07pa1q3rp93lpchy8hp6h5iqrc3r20msnly79g3mi"))))
+         "12cdy3m5c09lpf2bbxzbhm5v5y9fk7jgm94qrzggpq86waj28cms"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From 00e78042b7e1e740bacb42008781548cf763d167 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sat, 13 Aug 2022 11:55:51 +0200
Subject: gnu: python-sphinx: Add 4.5.0.

* gnu/packages/sphinx.scm (python-sphinx-4): New variable.
---
 gnu/packages/sphinx.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'gnu/packages/sphinx.scm')

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index b6e7d94462..036950e8cf 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -148,6 +148,18 @@ for Python projects or other documents consisting of multiple reStructuredText
 sources.")
     (license license:bsd-2)))
 
+;; Some packages do not support Sphinx 5 yet.  Remove when unused.
+(define-public python-sphinx-4
+  (package
+    (inherit python-sphinx)
+    (version "4.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "Sphinx" version))
+              (sha256
+               (base32
+                "1rp28jryxwy24y8vpacclqihbizyi6b1s6id86pibvm46ybcmy3v"))))))
+
 (define-public python-sphinxcontrib-apidoc
   (package
     (name "python-sphinxcontrib-apidoc")
-- 
cgit v1.2.3


From 27555b05661931f7087b735db7be715ab9ac8f27 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sat, 13 Aug 2022 11:58:08 +0200
Subject: gnu: python-sphinx-panels: Use python-sphinx@4.

...also add deprecation notice, and change its users accordingly.

* gnu/packages/sphinx.scm (python-sphinx-panels)[propagated-inputs]: Change
from PYTHON-SPHINX to PYTHON-SPHINX-4.
[description]: Mention that it is unmaintained.
* gnu/packages/python-science.scm (python-scipy)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]: Likewise.
---
 gnu/packages/sphinx.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/sphinx.scm')

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 036950e8cf..1e628a0e75 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -377,14 +377,16 @@ Blog, News or Announcements section to a Sphinx website.")
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
                (invoke "pytest")))))))
-    (propagated-inputs (list python-docutils python-sphinx))
+    (propagated-inputs (list python-docutils python-sphinx-4))
     (native-inputs
      (list python-pytest
            python-pytest-regressions))
     (home-page "https://github.com/executablebooks/sphinx-panels")
     (synopsis "Sphinx extension for creating panels in a grid layout")
     (description
-     "This package provides a sphinx extension for creating panels in a grid layout.")
+     "This package provides a sphinx extension for creating panels in a
+grid layout.  It is no longer maintained and users are encouraged to use
+@code{sphinx-design} instead.")
     (license license:expat)))
 
 (define-public python-sphinxcontrib-programoutput
-- 
cgit v1.2.3


From 213c60f332a8531f6bbafc02365f9dd6d8e01e98 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sat, 13 Aug 2022 12:04:53 +0200
Subject: gnu: texlive-hyperref: Propagate more inputs.

* gnu/packages/tex.scm (texlive-hyperref)[propagated-inputs]: Add TEXLIVE-CM,
TEXLIVE-LATEX-GRAPHICS, TEXLIVE-STRINGENC, and TEXLIVE-ZAPFDING.
* gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Remove
TEXLIVE-STRINGENC and TEXLIVE-ZAPFDING.
---
 gnu/packages/sphinx.scm | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'gnu/packages/sphinx.scm')

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 1e628a0e75..cded866c90 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -111,10 +111,6 @@
            texlive-etoolbox
            texlive-generic-ltxcmds
            texlive-hyperref
-           ;; TODO: Remove texlive-stringenc and texlive-zapfding after
-           ;; propagating them in texlive-hyperref in next rebuild cycle.
-           texlive-stringenc
-           texlive-zapfding
            texlive-latex-base           ;alltt, atbegshi, makeidx, textcomp
            texlive-latex-cmap
            texlive-latex-fancyhdr
-- 
cgit v1.2.3