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

Merge pull request #38404 from ttuegel/bugfix/tex-gyre/callPackages

Browse Source 
Refactor TeX Gyre package sets
This commit is contained in:
Thomas Tuegel 2018-04-04 05:56:07 -05:00 committed by GitHub
commit 130ee29844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/data/fonts/tex-gyre-math/default.nix
View File

@ -1,4 +1,4 @@
{ variant, stdenv, fetchzip }: { stdenv, fetchzip }:
let let
variants = { variants = {
@ -27,9 +27,10 @@ let
outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm"; outputHash = "0pa433cgshlypbyrrlp3qq0wg972rngcp37pr8pxdfshgz13q1mm";
}; };
}; };
current = variants."${variant}";
dotless_version = builtins.replaceStrings ["."] [""] current.version; mkVariant = variant: current:
in stdenv.mkDerivation rec { let dotless_version = builtins.replaceStrings ["."] [""] current.version; in
stdenv.mkDerivation rec {
name = "tex-gyre-${variant}-math-${current.version}"; name = "tex-gyre-${variant}-math-${current.version}";
version = "${current.version}"; version = "${current.version}";
@ -63,4 +64,6 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ siddharthist ]; maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all; platforms = platforms.all;
}; };
} };
in
stdenv.lib.mapAttrs mkVariant variants

4
pkgs/top-level/aliases.nix
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

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

@ -14539,15 +14539,9 @@ with pkgs;
terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
tex-gyre = callPackage ../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 { };