public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82821 from veprbl/pr/lmmath_cleanup

Browse Source 
cleanup duplicate Latin Modern fonts
This commit is contained in:
Dmitry Kalinkin 2020-03-18 23:55:18 -04:00 committed by GitHub
commit 9a7f11e361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/data/fonts/lm-math/default.nix → pkgs/data/fonts/lmmath/default.nix
View File

@ -3,14 +3,14 @@
let let
version = "1.959"; version = "1.959";
in fetchzip rec { 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"; url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts/opentype/ mkdir -p $out/share/fonts/opentype/
mkdir -p $out/share/doc/${name}/ mkdir -p $out/share/doc/latinmodern-math-${version}/
unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/ unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/
unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/ unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/
''; '';
sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";

26
pkgs/data/fonts/lmodern/lmmath.nix
View File

@ -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";
};
}

15
pkgs/tools/typesetting/satysfi/default.nix
View File

@ -1,16 +1,7 @@
{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages { stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages
, ipaexfont, junicode , ipaexfont, junicode, lmodern, lmmath
}: }:
let let
lm = fetchzip {
url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip";
sha256 = "1mc88fbhfd2wki2vr700pgv96smya6d1z783xs3mfy138yb6ga2p";
stripRoot = false;
};
lm-math = fetchzip {
url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
};
camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gfngfn"; owner = "gfngfn";
@ -63,8 +54,8 @@ in
installPhase = '' installPhase = ''
cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/ cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/
cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/ cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/
cp -r ${lm}/* lib-satysfi/dist/fonts/ cp -r ${lmodern}/share/fonts/opentype/public/lm/* lib-satysfi/dist/fonts/
cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/ cp -r ${lmmath}/share/fonts/opentype/latinmodern-math.otf lib-satysfi/dist/fonts/
make install PREFIX=$out LIBDIR=$out/share/satysfi make install PREFIX=$out LIBDIR=$out/share/satysfi
mkdir -p $out/share/satysfi/ mkdir -p $out/share/satysfi/
cp -r lib-satysfi/dist/ $out/share/satysfi/ cp -r lib-satysfi/dist/ $out/share/satysfi/

1
pkgs/top-level/aliases.nix
View File

@ -212,6 +212,7 @@ mapAliases ({
krename-qt5 = krename; # added 2017-02-18 krename-qt5 = krename; # added 2017-02-18
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
kvm = qemu_kvm; # added 2018-04-25 kvm = qemu_kvm; # added 2018-04-25
latinmodern-math = lmmath;
letsencrypt = certbot; # added 2016-05-16 letsencrypt = certbot; # added 2016-05-16
libaudit = audit; # added 2018-04-25 libaudit = audit; # added 2018-04-25
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25

4
pkgs/top-level/all-packages.nix
View File

@ -17768,8 +17768,6 @@ in
kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
latinmodern-math = callPackage ../data/fonts/lm-math {};
lato = callPackage ../data/fonts/lato {}; lato = callPackage ../data/fonts/lato {};
league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
@ -17804,7 +17802,7 @@ in
libre-franklin = callPackage ../data/fonts/libre-franklin { }; libre-franklin = callPackage ../data/fonts/libre-franklin { };
lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmmath = callPackage ../data/fonts/lmmath {};
lmodern = callPackage ../data/fonts/lmodern { }; lmodern = callPackage ../data/fonts/lmodern { };