diff options
author | Mathnerd314 <mathnerd314.gph+hs@gmail.com> | 2015-09-14 22:27:19 -0600 |
---|---|---|
committer | Mathnerd314 <mathnerd314.gph+hs@gmail.com> | 2015-09-14 22:27:19 -0600 |
commit | eb7404d97a7e46df1f598a74982ca06e08033a45 (patch) | |
tree | 6b5752df7032ba1efc535cf884db4891f20dd786 /pkgs/tools/typesetting | |
parent | 7fb1c7efcfa34a4af9f5de5fbde9e12d15017a90 (diff) |
all-packages: Use callPackage where possible
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/beamer.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/cm-super.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/context.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/extra.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/xcolor.nix | 2 |
9 files changed, 18 insertions, 11 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 0846970662ffa..56b093f921d11 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -1,4 +1,4 @@ -args : with args; +args @ {poppler, perl, makeWrapper, ... }: with args; rec { name = "TeXLive-linkdir"; diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index f19d185572d3b..7acecd66543e1 100644 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args; rec { name = "texlive-beamer-2013"; src = fetchurl { diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 066796ed39c9b..5c442fad27f47 100644 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, ...}: with args; rec { name = "texlive-cm-super-2009"; src = fetchurl { @@ -29,7 +29,7 @@ rec { description = "Extra components for TeXLive: CM-Super fonts"; maintainers = [ args.lib.maintainers.raskin ]; - # Actually, arch-independent.. + # Actually, arch-independent.. hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix index 22e0991b5cc1a..2cc62c3340947 100644 --- a/pkgs/tools/typesetting/tex/texlive/context.nix +++ b/pkgs/tools/typesetting/tex/texlive/context.nix @@ -1,4 +1,4 @@ -args: with args; +args @ { texLive, ... }: with args; rec { name = "context-2014.05.21"; src = fetchurl { @@ -22,4 +22,4 @@ rec { }; } - + diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index d676acd2f2863..74b3829cf89f5 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,4 +1,11 @@ -args : with args; +args @ { +builderDefs, zlib, bzip2, ncurses, libpng, ed, lesstif, ruby, potrace +, gd, t1lib, freetype, icu, perl, expat, curl, xz, pkgconfig, zziplib, texinfo +, libjpeg, bison, python, fontconfig, flex, poppler, libpaper, graphite2 +, makeWrapper, gmp, mpfr, xpdf, config +, libXaw, libX11, xproto, libXt, libXpm +, libXmu, libXext, xextproto, libSM, libICE +, ... }: with args; rec { src = assert config.allowTexliveBuilds or true; fetchurl { diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 59c3389d750bb..7f7ffbee7c29f 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,4 +1,4 @@ -args: with args; +args @ { texLive, xz, ... }: with args; rec { name = "texlive-extra-2014"; version = "2014.20141024"; diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index f4db43f21f2bb..9ec623a0f119a 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, unzip, ...}: with args; rec { version = "1.5.1"; name = "moderncv-${version}"; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index e80e53f912841..6d57a659b63b2 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, unzip, ...}: with args; rec { version = "0.9"; name = "moderntimeline-${version}"; diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix index f02bf351c3f64..57351e0699286 100644 --- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix +++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, ... }: with args; rec { name = "texlive-latex-xcolor-2007"; src = fetchurl { |