From bb9c16de4bed40c40dfbe0e858db3947afc34496 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 Mar 2020 03:21:33 -0400 Subject: [PATCH 1/3] latinmodern-math: fix build --- pkgs/data/fonts/lm-math/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix index 8df851cb9dfb..ac5988d8eb60 100644 --- a/pkgs/data/fonts/lm-math/default.nix +++ b/pkgs/data/fonts/lm-math/default.nix @@ -9,8 +9,8 @@ in fetchzip rec { postFetch = '' mkdir -p $out/share/fonts/opentype/ mkdir -p $out/share/doc/${name}/ - unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/ - unzip -f $downloadedFile doc/*.txt -d $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"; From fd867123f642fc818beb4b6847bc7236b8647015 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 17 Mar 2020 22:32:56 -0400 Subject: [PATCH 2/3] remove lmmath, rename latinmodern-math to lmmath --- .../fonts/{lm-math => lmmath}/default.nix | 6 ++--- pkgs/data/fonts/lmodern/lmmath.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 5 insertions(+), 32 deletions(-) rename pkgs/data/fonts/{lm-math => lmmath}/default.nix (84%) delete mode 100644 pkgs/data/fonts/lmodern/lmmath.nix diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lmmath/default.nix similarity index 84% rename from pkgs/data/fonts/lm-math/default.nix rename to pkgs/data/fonts/lmmath/default.nix index ac5988d8eb60..c971a699b2a5 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 679f52002139..000000000000 --- 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 af8cbed10613..6cd5581e71cf 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 d1e82c5dc565..4a0a4c30b3fa 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 { }; From cdde5967458c06d73389b6a9667139318f913e16 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 17 Mar 2020 22:45:08 -0400 Subject: [PATCH 3/3] satysfi: use packaged Latin Modern fonts --- pkgs/tools/typesetting/satysfi/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index f2d447f66f6e..c355d7b6d986 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,16 +1,7 @@ { stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages -, ipaexfont, junicode +, ipaexfont, junicode, lmodern, lmmath }: 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: { src = fetchFromGitHub { owner = "gfngfn"; @@ -63,8 +54,8 @@ in installPhase = '' cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/ cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/ - cp -r ${lm}/* lib-satysfi/dist/fonts/ - cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/ + cp -r ${lmodern}/share/fonts/opentype/public/lm/* 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 mkdir -p $out/share/satysfi/ cp -r lib-satysfi/dist/ $out/share/satysfi/