02/06: gnu: texlive-amsmath: Supersed 'texlive-latex-amsmath'.

[guix-commits]

civodul pushed a commit to branch staging
in repository guix.

commit 3aafcdbd8ba2fdec961fd8e7d7c892e20caf4787
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun May 8 11:53:10 2022 +0200

    gnu: texlive-amsmath: Supersed 'texlive-latex-amsmath'.
    
    * gnu/packages/tex.scm (texlive-latex-amsmath): Redefine as a deprecated
    alias for 'texlive-amsmath'.
    (texlive-base): Use 'texlive-amsmath' instead of 'texlive-latex-amsmath'.
    * gnu/packages/python-xyz.scm 
(python-matplotlib-documentation)[native-inputs]:
    Use 'texlive-amsmath instead of 'texlive-latex-amsmath'.
    (python-nbconvert)[native-inputs]: Likewise.
    * gnu/packages/radio.scm (gnuradio)[native-inputs]: Likewise.
    (libosmo-dsp)[native-inputs]: Likewise.
---
 gnu/packages/python-xyz.scm |  4 ++--
 gnu/packages/radio.scm      |  4 ++--
 gnu/packages/tex.scm        | 35 +++--------------------------------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a1e7ca1c0c..7c19d2409b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6719,7 +6719,7 @@ toolkits.")
        ("graphviz" ,graphviz)
        ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
                                              texlive-enumitem
-                                             texlive-latex-amsmath
+                                             texlive-amsmath
                                              texlive-latex-expdlist
                                              texlive-latex-geometry
                                              texlive-latex-preview
@@ -13053,7 +13053,7 @@ time.")
                                      texlive-fonts-rsfs
                                      texlive-generic-iftex
                                      texlive-jknappen
-                                     texlive-latex-amsmath
+                                     texlive-amsmath
                                      texlive-latex-fancyvrb
                                      texlive-latex-float
                                      texlive-fontspec
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index aa0406b324..9c6db4d93f 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -554,7 +554,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} 
signals (MPX).")
        ("python-scipy" ,python-scipy)
        ("python-sphinx" ,python-sphinx)
        ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                             texlive-latex-amsmath
+                                             texlive-amsmath
                                              ;; TODO: Add newunicodechar.
                                              texlive-latex-graphics)))
        ("xorg-server" ,xorg-server-for-tests)))
@@ -762,7 +762,7 @@ to access different radio hardware.")
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
        ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
-                                        texlive-latex-amsmath
+                                        texlive-amsmath
                                         ;; TODO: Add newunicodechar.
                                         texlive-latex-graphics)))))
     (inputs
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f6716c38b8..76cc0f7119 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3768,37 +3768,6 @@ loading fonts by their proper names instead of file 
names.")
 
 (define-deprecated-package texlive-luatex-luaotfload texlive-luaotfload)
 
-(define-public texlive-latex-amsmath
-  (package
-    (name "texlive-latex-amsmath")
-    (version (number->string %texlive-revision))
-    (source (origin
-              (method svn-fetch)
-              (uri (texlive-ref "latex" "amsmath"))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "172zybw7rp05jca8wl6x0mh6z6gncdyi1j9wdfyjnhbvqw0z4wi4"))))
-    ;; This package misses important files
-    (replacement texlive-amsmath)
-    (build-system texlive-build-system)
-    (arguments '(#:tex-directory "latex/amsmath"))
-    (home-page "https://www.ctan.org/pkg/amsmath";)
-    (synopsis "AMS mathematical facilities for LaTeX")
-    (description
-     "This is the principal package in the AMS-LaTeX distribution.  It adapts
-for use in LaTeX most of the mathematical features found in AMS-TeX; it is
-highly recommended as an adjunct to serious mathematical typesetting in LaTeX.
-When amsmath is loaded, AMS-LaTeX packages @code{amsbsyamsbsy} (for bold
-symbols), @code{amsopnamsopn} (for operator names) and
-@code{amstextamstext} (for text embedded in mathematics) are also loaded.
-This package is part of the LaTeX required distribution; however, several
-contributed packages add still further to its appeal; examples are
-@code{empheqempheq}, which provides functions for decorating and highlighting
-mathematics, and @code{ntheoremntheorem}, for specifying theorem (and similar)
-definitions.")
-    (license license:lppl1.3c+)))
-
 (define-public texlive-amsmath
   (let ((template (simple-texlive-package
                    "texlive-amsmath"
@@ -3844,6 +3813,8 @@ mathematics, and @code{ntheoremntheorem}, for specifying 
theorem (and similar)
 definitions.")
       (license license:lppl1.3c+))))
 
+(define-deprecated-package texlive-latex-amsmath texlive-amsmath)
+
 (define-public texlive-amscls
   (let ((template (simple-texlive-package
                    "texlive-amscls"
@@ -4241,7 +4212,7 @@ part of the LaTeX required set of packages.")
                 texlive-latex-base
                 texlive-kpathsea       ;for mktex.opt
                 ;; LaTeX packages from the "required" set.
-                texlive-latex-amsmath
+                texlive-amsmath
                 texlive-amscls
                 texlive-babel
                 texlive-generic-babel-english