diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-03-17 22:32:56 -0400 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-03-18 03:24:53 -0400 |
commit | fd867123f642fc818beb4b6847bc7236b8647015 (patch) | |
tree | 3dc01a11a228bf53c20f18eebfe48a29482fdede | |
parent | bb9c16de4bed40c40dfbe0e858db3947afc34496 (diff) | |
download | nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.tar nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.tar.gz nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.tar.bz2 nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.tar.lz nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.tar.xz nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.tar.zst nixpkgs-fd867123f642fc818beb4b6847bc7236b8647015.zip |
remove lmmath, rename latinmodern-math to lmmath
-rw-r--r-- | pkgs/data/fonts/lmmath/default.nix (renamed from pkgs/data/fonts/lm-math/default.nix) | 6 | ||||
-rw-r--r-- | pkgs/data/fonts/lmodern/lmmath.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lmmath/default.nix index ac5988d8eb6..c971a699b2a 100644 --- a/pkgs/data/fonts/lm-math/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -3,14 +3,14 @@ let version = "1.959"; in fetchzip rec { - name = "latinmodern-math-${version}"; + 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/${name}/ + 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/${name}/ + unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ ''; sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix deleted file mode 100644 index 679f5200213..00000000000 --- 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 af8cbed1061..6cd5581e71c 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 d1e82c5dc56..4a0a4c30b3f 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 { }; |