tex-gyre-*-math: Move to tex-gyre-math package set

The `tex-gyre-*-math` fonts are moved to the `tex-gyre-math` set for consistency
with `tex-gyre` and to allow them to be easily installed together. Aliases are
created for backwards-compatibility.
This commit is contained in:
Thomas Tuegel 2018-04-03 06:32:02 -05:00
parent 87c12bda03
commit 140f2a3584
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 42 additions and 41 deletions

View File

@ -1,4 +1,4 @@
{ variant, stdenv, fetchzip }: { stdenv, fetchzip }:
let let
variants = { variants = {
@ -27,40 +27,43 @@ let
outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm";
}; };
}; };
current = variants."${variant}";
dotless_version = builtins.replaceStrings ["."] [""] current.version;
in stdenv.mkDerivation rec {
name = "tex-gyre-${variant}-math-${current.version}";
version = "${current.version}";
src = fetchzip { mkVariant = variant: current:
url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip"; let dotless_version = builtins.replaceStrings ["."] [""] current.version; in
sha256 = current.sha256; stdenv.mkDerivation rec {
}; name = "tex-gyre-${variant}-math-${current.version}";
version = "${current.version}";
installPhase = '' src = fetchzip {
mkdir -p $out/share/fonts/opentype/ url = "www.gust.org.pl/projects/e-foundry/tg-math/download/texgyre${variant}-math-${dotless_version}.zip";
mkdir -p $out/share/doc/${name}/ sha256 = current.sha256;
cp -v opentype/*.otf $out/share/fonts/opentype/ };
cp -v doc/*.txt $out/share/doc/${name}/
'';
outputHashAlgo = "sha256"; installPhase = ''
outputHashMode = "recursive"; mkdir -p $out/share/fonts/opentype/
outputHash = current.outputHash; mkdir -p $out/share/doc/${name}/
cp -v opentype/*.otf $out/share/fonts/opentype/
cp -v doc/*.txt $out/share/doc/${name}/
'';
meta = with stdenv.lib; { outputHashAlgo = "sha256";
longDescription = '' outputHashMode = "recursive";
TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre outputHash = current.outputHash;
${current.displayName} family of fonts (see
http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. meta = with stdenv.lib; {
''; longDescription = ''
homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; TeX Gyre ${current.displayName} Math is a math companion for the TeX Gyre
# "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), ${current.displayName} family of fonts (see
# which is a free license, legally equivalent to the LaTeX Project Public http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format.
# License (LPPL), version 1.3c or later." - GUST website '';
license = licenses.lppl13c; homepage = http://www.gust.org.pl/projects/e-foundry/tg-math;
maintainers = with maintainers; [ siddharthist ]; # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL),
platforms = platforms.all; # 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;
};
};
in
stdenv.lib.mapAttrs mkVariant variants

View File

@ -212,6 +212,10 @@ mapAliases (rec {
telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt = telepathy-qt; # added 2018-02-25
telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19
telepathy_salut = telepathy-salut; # added 2018-02-25 telepathy_salut = telepathy-salut; # added 2018-02-25
tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03
transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06

View File

@ -14539,13 +14539,7 @@ with pkgs;
tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre = callPackages ../data/fonts/tex-gyre { };
tex-gyre-bonum-math = callPackage ../data/fonts/tex-gyre-math { variant = "bonum"; }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
tex-gyre-pagella-math = callPackage ../data/fonts/tex-gyre-math { variant = "pagella"; };
tex-gyre-schola-math = callPackage ../data/fonts/tex-gyre-math { variant = "schola"; };
tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-math { variant = "termes"; };
tipa = callPackage ../data/fonts/tipa { }; tipa = callPackage ../data/fonts/tipa { };