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

texlive: upgrade to 20140528

This commit is contained in:
John Wiegley 2014-06-09 20:51:54 -05:00
parent 6b6f098fd1
commit 5100a2bbb3
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,20 @@
args : with args; args : with args;
rec { rec {
src = fetchurl { src = fetchurl {
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2013.20130729.30972.orig.tar.xz; url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140528.34243.orig.tar.xz;
sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
}; };
texmfVersion = "2013.20140408"; texmfVersion = "2014.20140528";
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 = "1pdbbp4sy6kypiqss9zfvr3m0agqzghagfr609pfjh9ka3ihv0kh"; sha256 = "09z3jp5if0llszm02x3f93izrspjh14g77034c677r0sj4xrb63w";
}; };
langTexmfVersion = "2013.20140408"; langTexmfVersion = "2014.20140528";
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 = "05qyhcfdbrrc8mnps5sv3fggjbxdj3bp9jd12ldzkjxxdbzhp475"; sha256 = "0c7rppqya74g8fb431i3bbga88xzjiarj540fcn34plar5wz4k31";
}; };
passthru = { inherit texmfSrc langTexmfSrc; }; passthru = { inherit texmfSrc langTexmfSrc; };
@ -40,7 +40,7 @@ rec {
sed -e '/ubidi_open/i#include <unicode/urename.h>' -i $(find . -name configure) sed -e '/ubidi_open/i#include <unicode/urename.h>' -i $(find . -name configure)
sed -e 's/-lttf/-lfreetype/' -i $(find . -name configure) sed -e 's/-lttf/-lfreetype/' -i $(find . -name configure)
sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) # sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' )
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
@ -111,7 +111,7 @@ rec {
buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto
freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
poppler graphite2 lesstif zziplib harfbuzz texinfo ] poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ]
++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]; ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ];
configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
@ -134,7 +134,7 @@ rec {
phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];
name = "texlive-core-2013"; name = "texlive-core-2014";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A TeX distribution"; description = "A TeX distribution";

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-2013"; name = "texlive-extra-2014";
version = "2013.20140408"; version = "2014.20140528";
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 = "0d6b5kip7j8ljqn92bkdncvqxyk2756404hzsp4mh0s1jhfwws7y"; sha256 = "1wlvafvc03qlic4gr883q3lvgjis0czw3z6gdp4qw8f51a0fyam9";
}; };
buildInputs = [texLive xz]; buildInputs = [texLive xz];

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

@ -11012,7 +11012,8 @@ let
texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby
gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo
libjpeg bison python fontconfig flex poppler graphite2 makeWrapper; libjpeg bison python fontconfig flex poppler libpaper graphite2
makeWrapper;
inherit (xlibs) libXaw libX11 xproto libXt libXpm inherit (xlibs) libXaw libX11 xproto libXt libXpm
libXmu libXext xextproto libSM libICE; libXmu libXext xextproto libSM libICE;
ghostscript = ghostscriptX; ghostscript = ghostscriptX;