branch master updated: gnu: Remove occurrences of deprecated texlive-latex-capt-of.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2b37ec1c60 gnu: Remove occurrences of deprecated texlive-latex-capt-of.
2b37ec1c60 is described below

commit 2b37ec1c608f935e183b532e92b973cbb0e8fb1b
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Fri Jan 28 14:37:49 2022 +0100

    gnu: Remove occurrences of deprecated texlive-latex-capt-of.
    
    * gnu/packages/maths.scm (hypre):
    * gnu/packages/python-xyz.scm (python-numpy-documentation):
    (python-ipython-documentation): Use texlive-capt-of instead of 
texlive-latex-capt-of.
---
 gnu/packages/maths.scm      | 4 ++--
 gnu/packages/python-xyz.scm | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9a0f913c5a..1895acd368 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -30,7 +30,7 @@
 ;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
 ;;; Copyright © 2018, 2021 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
-;;; Copyright © 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
 ;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -5540,6 +5540,7 @@ set.")
        ("texlive" ,(texlive-updmap.cfg (list texlive-adjustbox
                                              texlive-amsfonts
                                              texlive-bibtex
+                                             texlive-capt-of
                                              texlive-caption
                                              texlive-cm
                                              texlive-etoolbox
@@ -5551,7 +5552,6 @@ set.")
                                              texlive-xypic
                                              texlive-generic-listofitems
                                              texlive-generic-ulem
-                                             texlive-latex-capt-of
                                              texlive-latex-cmap
                                              texlive-latex-colortbl
                                              texlive-latex-etoc
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 51a7a64fe6..24e7fef494 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5829,12 +5829,13 @@ readable format.")
        ("pkg-config" ,pkg-config)
        ("python-sphinx" ,python-sphinx)
        ("python-numpydoc" ,python-numpydoc)
-       ("texlive" ,(texlive-updmap.cfg (list texlive-cm-super
+       ("texlive" ,(texlive-updmap.cfg (list
+                                        texlive-capt-of
+                                        texlive-cm-super
                                         texlive-fonts-ec
                                         texlive-generic-iftex
                                         texlive-pdftex
                                         texlive-amsfonts
-                                        texlive-latex-capt-of
                                         texlive-latex-cmap
                                         texlive-latex-environ
                                         texlive-latex-eqparbox
@@ -8916,10 +8917,10 @@ computing.")
        ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
        ;; FIXME: It's possible that a smaller union would work just as well.
        ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
+                                        texlive-capt-of
                                         texlive-fonts-ec
                                         texlive-generic-iftex
                                         texlive-pdftex
-                                        texlive-latex-capt-of
                                         texlive-latex-cmap
                                         texlive-latex-environ
                                         texlive-latex-eqparbox