02/02: gnu: texlive-xstring: Supersed texlive-generic-xstring.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit 82fc07363b1600b0bfbf4a3327ea516a7b480f6b
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sat Feb 25 12:23:34 2023 +0100

    gnu: texlive-xstring: Supersed texlive-generic-xstring.
    
    * gnu/packages/tex.scm (texlive-xstring): New variable.
    (texlive-generic-xstring): Deprecate in favour of the above.
    (texlive-minted): Use new name.
---
 gnu/packages/tex.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index cf649e0cfd..1dc74d848d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -10076,12 +10076,12 @@ the bundle.")
                                texlive-etoolbox
                                texlive-fancyvrb
                                texlive-fvextra
-                               texlive-generic-xstring
                                texlive-latex-float
                                texlive-latex-framed
                                texlive-latex-ifplatform
                                texlive-latex-newfloat
-                               texlive-lineno))
+                               texlive-lineno
+                               texlive-xstring))
       (home-page "https://ctan.org/pkg/minted";)
       (synopsis "Highlight source code in LaTeX documents")
       (description "This package facilitates expressive syntax highlighting in
@@ -12132,9 +12132,9 @@ syllable.  The package itself does not support UTF-8 
input in ordinary
 
 (define-deprecated-package texlive-generic-soul texlive-soul)
 
-(define-public texlive-generic-xstring
+(define-public texlive-xstring
   (let ((template (simple-texlive-package
-                   "texlive-generic-xstring"
+                   "texlive-xstring"
                    (list "/doc/generic/xstring/"
                          "/tex/generic/xstring/")
                    (base32
@@ -12153,6 +12153,8 @@ recurrences of, a substring.  The package works equally 
in Plain TeX and LaTeX
 (expandable) macros.")
       (license license:lppl1.3c))))
 
+(define-deprecated texlive-generic-xstring texlive-xstring)
+
 (define-public texlive-substr
   (package
     (inherit (simple-texlive-package