diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
commit | ff97b7dbe6aef98b105c8af34f19232aa7d49d80 (patch) | |
tree | b44b52b9a17a84c84d179c1cafd3a3425c62751a /pkgs/tools/typesetting | |
parent | 0b82b9532229a28758df482218222d90d910c494 (diff) | |
parent | b57bc220cc04e3d8f931b604e5acc44544b8c1c0 (diff) | |
download | nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.gz nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.bz2 nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.lz nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.xz nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.zst nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/extra.nix | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index b9e71a7cde23..94d84fec4cee 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2014.20140528"; + texmfVersion = "2014.20140626"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "09z3jp5if0llszm02x3f93izrspjh14g77034c677r0sj4xrb63w"; + sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g"; }; - langTexmfVersion = "2014.20140528"; + langTexmfVersion = "2014.20140626"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0c7rppqya74g8fb431i3bbga88xzjiarj540fcn34plar5wz4k31"; + sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -33,6 +33,9 @@ rec { sed -e s@/usr/bin/@@g -i $(grep /usr/bin/ -rl . ) + sed -e 's@dehypht-x-2013-05-26@dehypht-x-2014-05-21@' -i $(grep 'dehypht-x' -rl $out ) + sed -e 's@dehyphn-x-2013-05-26@dehyphn-x-2014-05-21@' -i $(grep 'dehyphn-x' -rl $out ) + sed -e 's@\<env ruby@${ruby}/bin/ruby@' -i $(grep 'env ruby' -rl . ) sed -e 's@\<env perl@${perl}/bin/perl@' -i $(grep 'env perl' -rl . ) sed -e 's@\<env python@${python}/bin/python@' -i $(grep 'env python' -rl . ) diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 1195eaa58f3b..be280c5f4836 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { name = "texlive-extra-2014"; - version = "2014.20140528"; + version = "2014.20140626"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "1wlvafvc03qlic4gr883q3lvgjis0czw3z6gdp4qw8f51a0fyam9"; + sha256 = "1n7n2vssdspzg95qrikl4p8cr6axdpj6bgv2l61px7vp837ma83v"; }; buildInputs = [texLive xz]; |