Update URLs for TeXLive

svn path=/nixpkgs/trunk/; revision=15544

2 files changed, 7 insertions, 6 deletions

diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix
index 2c90e2176243f..477de2e946e5a 100644
--- a/pkgs/misc/tex/texlive/default.nix
+++ b/pkgs/misc/tex/texlive/default.nix
@@ -1,13 +1,13 @@
 args : with args; 
 rec {
   src = fetchurl { 
-    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2007.dfsg.1.orig.tar.gz;
-    sha256 = "17wdn9vl4pa897046jpzxl6bl2ppr7swwb8x0jafwvbcnmywndag";
+    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2007.dfsg.2.orig.tar.gz;
+    sha256 = "0gqdz3sxpr6ibmasn847fg7q4m5rs4a370vld57kyl5djfrk33mq";
   };
   
   texmfSrc = fetchurl { 
-    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2007.orig.tar.gz;
-    sha256 = "16a4dyliidk43qj0m4gpsl9ln7nqsdcdx1lkbk4wrm03xpx87zvh";
+    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2007.dfsg.2.orig.tar.gz;
+    sha256 = "0qmwcz7d09ksrq26x4bqy5v3xjc4w2qkzfc1h6y9hs0gds6n8lnq";
   };
 
   langTexmfSrc = fetchurl {
@@ -29,6 +29,7 @@ rec {
     sed -e s@/usr/bin/@@g -i $(grep /usr/bin/ -rl . )
     sed -e '/ubidi_open/i#include <unicode/urename.h>' -i $(find . -name configure)
     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' )
 
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix
index 63592984849bb..168b9706f2d0d 100644
--- a/pkgs/misc/tex/texlive/extra.nix
+++ b/pkgs/misc/tex/texlive/extra.nix
@@ -2,8 +2,8 @@ args: with args;
 rec {
   name = "texlive-extra-2007";
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.2.orig.tar.gz;
-    sha256 = "1sdhidjafv5cls7r9g60qq3cw655kw91ms4may39pcm8wdbhqs77";
+    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.17.orig.tar.gz;
+    sha256 = "093i40616vphyxycdi4z55sd2m0qfjypgprm7v182mgf55i2hpzc";
   };
 
   buildInputs = [texLive];