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

Merge pull request #3422 from jbedo/master

Browse Source 
Updated texlive to latest release
This commit is contained in:
John Wiegley 2014-08-02 18:55:05 -04:00
commit 141b69415c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -5,16 +5,16 @@ rec {
sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
}; };
texmfVersion = "2014.20140626"; texmfVersion = "2014.20140717";
texmfSrc = fetchurl { texmfSrc = fetchurl {
url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g"; sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9";
}; };
langTexmfVersion = "2014.20140626"; langTexmfVersion = "2014.20140717";
langTexmfSrc = fetchurl { langTexmfSrc = fetchurl {
url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r"; sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7";
}; };
passthru = { inherit texmfSrc langTexmfSrc; }; passthru = { inherit texmfSrc langTexmfSrc; };
@ -120,7 +120,7 @@ rec {
configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
"--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
"--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2"
"--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ]
++ stdenv.lib.optionals stdenv.isDarwin [ ++ stdenv.lib.optionals stdenv.isDarwin [
# TODO: We should be able to fix these tests # TODO: We should be able to fix these tests

6
pkgs/tools/typesetting/tex/texlive/extra.nix
View File

@ -1,11 +1,11 @@
args: with args; args: with args;
rec { rec {
name = "texlive-extra-2014"; name = "texlive-extra-2014";
version = "2014.20140626"; version = "2014.20140717";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
sha256 = "1n7n2vssdspzg95qrikl4p8cr6axdpj6bgv2l61px7vp837ma83v"; sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q";
}; };
buildInputs = [texLive xz]; buildInputs = [texLive xz];
@ -20,7 +20,7 @@ rec {
description = "Extra components for TeXLive"; description = "Extra components for TeXLive";
maintainers = [ args.lib.maintainers.raskin ]; maintainers = [ args.lib.maintainers.raskin ];
# Actually, arch-independent.. # Actually, arch-independent..
hydraPlatforms = []; hydraPlatforms = [];
}; };
} }