branch core-updates updated: gnu: texlive-generic-iftex: Rename to texlive-iftex.

[guix-commits]

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

ngz pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 006538c527 gnu: texlive-generic-iftex: Rename to texlive-iftex.
006538c527 is described below

commit 006538c5273e08e775488af16c8014ba71d8a36e
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Fri Mar 4 02:00:09 2022 +0100

    gnu: texlive-generic-iftex: Rename to texlive-iftex.
    
    * gnu/packages/tex.scm (texlive-iftex): Renamed from TEXLIVE-GENERIC-IFTEX.
    (texlive-hyperref):
    (texlive-oberdiek):
    (texlive-pdftexcmds):
    (texlive-generic-etexcmds):
    (texlive-generic-iftex):
    (texlive-generic-ifxetex):
    (texlive-latex-xkeyval):
    * gnu/packages/docbook.scm (dblatex):
    * gnu/packages/python-xyz.scm (python-numpy-documentation):
    (python-ipython-documentation):
    (python-nbconvert):
    (python-pypandoc): Apply renaming.
---
 gnu/packages/docbook.scm    |  2 +-
 gnu/packages/python-xyz.scm |  8 ++++----
 gnu/packages/tex.scm        | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index bd0e4e8f5d..9fe42dcfb0 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -485,7 +485,7 @@ the in DocBook SGML DTDs.")
                                         texlive-fonts-rsfs
                                         texlive-stmaryrd
 
-                                        texlive-generic-iftex)))
+                                        texlive-iftex)))
        ("imagemagick" ,imagemagick)     ;for convert
        ("inkscape" ,inkscape)           ;for svg conversion
        ("docbook" ,docbook-xml)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index dafda261cd..22131820a4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5831,7 +5831,7 @@ readable format.")
        ("python-numpydoc" ,python-numpydoc)
        ("texlive" ,(texlive-updmap.cfg (list texlive-cm-super
                                         texlive-fonts-ec
-                                        texlive-generic-iftex
+                                        texlive-iftex
                                         texlive-pdftex
                                         texlive-amsfonts
                                         texlive-latex-capt-of
@@ -8917,7 +8917,7 @@ computing.")
        ;; FIXME: It's possible that a smaller union would work just as well.
        ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
                                         texlive-fonts-ec
-                                        texlive-generic-iftex
+                                        texlive-iftex
                                         texlive-pdftex
                                         texlive-latex-capt-of
                                         texlive-latex-cmap
@@ -12614,7 +12614,7 @@ time.")
                                         texlive-eurosym
                                         texlive-fonts-rsfs
                                         texlive-generic-ulem
-                                        texlive-generic-iftex
+                                        texlive-iftex
                                         texlive-jknappen
                                         texlive-latex-amsmath
                                         texlive-latex-enumitem
@@ -26474,7 +26474,7 @@ By default it uses the open Python vulnerability 
database Safety DB.")
     (native-inputs
      `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
                                         texlive-fonts-ec
-                                        texlive-generic-iftex
+                                        texlive-iftex
                                         texlive-hyperref
                                         texlive-oberdiek
                                         texlive-lm
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 169bb25e45..b64014071a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3458,7 +3458,7 @@ XML, using UTF-8 or a suitable 8-bit encoding.")
              texlive-generic-bitset
              texlive-generic-etexcmds
              texlive-generic-gettitlestring
-             texlive-generic-iftex
+             texlive-iftex
              texlive-generic-infwarerr
              texlive-generic-intcalc
              texlive-generic-kvdefinekeys
@@ -3512,7 +3512,7 @@ pdf and HTML backends.  The package is distributed with 
the @code{backref} and
                (("ifpdf.ins") "ifpdf.dtx"))
              #t)))))
     (propagated-inputs
-     (list texlive-generic-iftex))
+     (list texlive-iftex))
     (home-page "https://www.ctan.org/pkg/oberdiek";)
     (synopsis "Bundle of packages submitted by Heiko Oberdiek")
     (description
@@ -4909,7 +4909,7 @@ Unicode option of @code{inputenc} or @code{inputenx}, or 
by XeLaTeX/LuaLaTeX.")
                     (copy-recursively (string-append origin "/source") source)
                     (copy-recursively (string-append origin "/doc") doc))))))))
       (propagated-inputs
-       (list texlive-generic-iftex texlive-generic-infwarerr
+       (list texlive-iftex texlive-generic-infwarerr
              texlive-generic-ltxcmds))
       (home-page "https://www.ctan.org/pkg/pdftexcmds";)
       (synopsis "LuaTeX support for pdfTeX utility functions")
@@ -8098,7 +8098,7 @@ can be manipulated.")
                "11y6pnlq13bp0ybi7c82g8ds8085zv1zaslgqv3dzhgi3dklpc0c")
               #:trivial? #t))
     (propagated-inputs
-     (list texlive-generic-infwarerr texlive-generic-iftex))
+     (list texlive-generic-infwarerr texlive-iftex))
     (home-page "https://www.ctan.org/pkg/etexcmds";)
     (synopsis "Avoid name clashes with e-TeX commands")
     (description
@@ -8790,9 +8790,9 @@ may be used instead of @code{\\marginpar} at almost every 
place where
 frames made with the @code{framed} package.")
       (license license:lppl1.3c+))))
 
-(define-public texlive-generic-iftex
+(define-public texlive-iftex
   (let ((template (simple-texlive-package
-                   "texlive-generic-iftex"
+                   "texlive-iftex"
                    (list "/doc/generic/iftex/"
                          "/tex/generic/iftex/")
                    (base32
@@ -8810,9 +8810,9 @@ package also provides the @code{\\RequirePDFTeX}, 
@code{\\RequireXeTeX}, and
 LuaTeX (respectively) is not the engine in use.")
       (license license:lppl1.3+))))
 
-(define-deprecated-package texlive-iftex texlive-generic-iftex)
+(define-deprecated-package texlive-generic-iftex texlive-iftex)
 
-(define-deprecated-package texlive-generic-ifxetex texlive-generic-iftex)
+(define-deprecated-package texlive-generic-ifxetex texlive-iftex)
 
 (define-public texlive-tools
   (let ((template (simple-texlive-package
@@ -8907,7 +8907,7 @@ are part of the LaTeX required tools distribution, 
comprising the packages:
            texlive-graphics-def
            texlive-xcolor
            texlive-latex-footmisc
-           texlive-generic-iftex
+           texlive-iftex
            texlive-listings
            texlive-pstricks
            texlive-pst-text