05/08: gnu: texlive-latex-wrapfig: Rename to "texlive-wrapfig".

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 5a04a8a6bce81ddbd65c3e13dc83a7941521044e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Mar 2 18:28:40 2022 +0100

    gnu: texlive-latex-wrapfig: Rename to "texlive-wrapfig".
    
    * gnu/packages/tex.scm (texlive-latex-wrapfig): Rename to...
    (texlive-wrapfig): ... this.
    (texlive-latex-wrapfig): Define as deprecated.
    * gnu/packages/maths.scm (hypre)[native-inputs]: Use new name.
    * gnu/packages/python-xyz.scm (python-ipython-documentation)
    (python-numpy-documentation): Likewise.
---
 gnu/packages/maths.scm      | 2 +-
 gnu/packages/python-xyz.scm | 6 +++---
 gnu/packages/tex.scm        | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 70b0d76ea5..16050f8840 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5414,7 +5414,7 @@ set.")
                                              texlive-latex-varwidth
                                              texlive-ulem
                                              texlive-wasysym
-                                             texlive-latex-wrapfig)))))
+                                             texlive-wrapfig)))))
     (inputs
      `(("blas" ,openblas)
        ("lapack" ,lapack)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c05502388e..d3d7b7160d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic 
Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2017, 2021 Eric Bavier <bavier@posteo.net>
@@ -5899,7 +5899,7 @@ readable format.")
                                         texlive-latex-upquote
                                         texlive-url
                                         texlive-latex-varwidth
-                                        texlive-latex-wrapfig)))
+                                        texlive-wrapfig)))
        ("texinfo" ,texinfo)
        ("perl" ,perl)
        ("scipy-sphinx-theme"
@@ -9001,7 +9001,7 @@ computing.")
                                         texlive-latex-upquote
                                         texlive-url
                                         texlive-latex-varwidth
-                                        texlive-latex-wrapfig)))
+                                        texlive-wrapfig)))
        ("texinfo" ,texinfo)))))
 
 (define-public python-urwid
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 758ec601b7..c430e9968c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7108,9 +7108,9 @@ implements an easy to use interface for these symbols.")
 
 (define-deprecated-package texlive-latex-wasysym texlive-wasysym)
 
-(define-public texlive-latex-wrapfig
+(define-public texlive-wrapfig
   (package
-    (name "texlive-latex-wrapfig")
+    (name "texlive-wrapfig")
     (version (number->string %texlive-revision))
     (source (origin
               (method svn-fetch)
@@ -7142,6 +7142,8 @@ It does not work in combination with list environments, 
but can be used in a
 @code{parbox} or @code{minipage}, and in two-column format.")
     (license license:lppl)))
 
+(define-deprecated-package texlive-latex-wrapfig texlive-wrapfig)
+
 (define-public texlive-latex-ucs
   (package
     (name "texlive-latex-ucs")