From fd867123f642fc818beb4b6847bc7236b8647015 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 17 Mar 2020 22:32:56 -0400
Subject: remove lmmath, rename latinmodern-math to lmmath

---
 pkgs/data/fonts/lm-math/default.nix | 27 ---------------------------
 pkgs/data/fonts/lmmath/default.nix  | 27 +++++++++++++++++++++++++++
 pkgs/data/fonts/lmodern/lmmath.nix  | 26 --------------------------
 pkgs/top-level/aliases.nix          |  1 +
 pkgs/top-level/all-packages.nix     |  4 +---
 5 files changed, 29 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/data/fonts/lm-math/default.nix
 create mode 100644 pkgs/data/fonts/lmmath/default.nix
 delete mode 100644 pkgs/data/fonts/lmodern/lmmath.nix

diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix
deleted file mode 100644
index ac5988d8eb609..0000000000000
--- a/pkgs/data/fonts/lm-math/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, fetchzip }:
-
-let
-  version = "1.959";
-in fetchzip rec {
-  name = "latinmodern-math-${version}";
-
-  url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
-  postFetch = ''
-    mkdir -p $out/share/fonts/opentype/
-    mkdir -p $out/share/doc/${name}/
-    unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/
-    unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/${name}/
-  '';
-  sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
-
-  meta = with lib; {
-    description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth.";
-    homepage = http://www.gust.org.pl/projects/e-foundry/lm-math;
-    # "The Latin Modern Math font is licensed under the GUST Font License (GFL),
-    # which is a free license, legally equivalent to the LaTeX Project Public
-    # License (LPPL), version 1.3c or later." - GUST website
-    license = licenses.lppl13c;
-    maintainers = with maintainers; [ siddharthist ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix
new file mode 100644
index 0000000000000..c971a699b2a5b
--- /dev/null
+++ b/pkgs/data/fonts/lmmath/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchzip }:
+
+let
+  version = "1.959";
+in fetchzip rec {
+  name = "lmmath-${version}";
+
+  url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
+  postFetch = ''
+    mkdir -p $out/share/fonts/opentype/
+    mkdir -p $out/share/doc/latinmodern-math-${version}/
+    unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/
+    unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/
+  '';
+  sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
+
+  meta = with lib; {
+    description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth.";
+    homepage = http://www.gust.org.pl/projects/e-foundry/lm-math;
+    # "The Latin Modern Math font is licensed under the GUST Font License (GFL),
+    # which is a free license, legally equivalent to the LaTeX Project Public
+    # License (LPPL), version 1.3c or later." - GUST website
+    license = licenses.lppl13c;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix
deleted file mode 100644
index 679f520021391..0000000000000
--- a/pkgs/data/fonts/lmodern/lmmath.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchzip }:
-
-fetchzip {
-  name = "lmmath-0.903";
-
-  url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
-
-  postFetch = ''
-    unzip $downloadedFile
-
-    mkdir -p $out/texmf-dist/fonts/opentype
-    mkdir -p $out/share/fonts/opentype
-
-    cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf
-    cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf
-
-    ln -s -r $out/texmf* $out/share/
-  '';
-
-  sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln";
-
-  meta = {
-    description = "Latin Modern font";
-  };
-}
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index af8cbed10613c..6cd5581e71cf8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -212,6 +212,7 @@ mapAliases ({
   krename-qt5 = krename; # added 2017-02-18
   keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
   kvm = qemu_kvm; # added 2018-04-25
+  latinmodern-math = lmmath;
   letsencrypt = certbot; # added 2016-05-16
   libaudit = audit; # added 2018-04-25
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1e82c5dc5655..4a0a4c30b3faa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17756,8 +17756,6 @@ in
 
   kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
 
-  latinmodern-math = callPackage ../data/fonts/lm-math {};
-
   lato = callPackage ../data/fonts/lato {};
 
   league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
@@ -17792,7 +17790,7 @@ in
 
   libre-franklin = callPackage ../data/fonts/libre-franklin { };
 
-  lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
+  lmmath = callPackage ../data/fonts/lmmath {};
 
   lmodern = callPackage ../data/fonts/lmodern { };
 
-- 
cgit 1.4.1