svn merge ^/nixpkgs/trunk

Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091

1 files changed, 44 insertions, 0 deletions

diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
new file mode 100644
index 0000000000000..bb1e3f8b4b037
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed }:
+
+stdenv.mkDerivation {
+  name = "tetex-3.0";
+  
+  src = fetchurl {
+    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-3.0.tar.gz;
+    md5 = "944a4641e79e61043fdaf8f38ecbb4b3";
+  };
+
+  texmf = fetchurl {
+    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-3.0.tar.gz;
+    md5 = "11aa15c8d3e28ee7815e0d5fcdf43fd4";
+  };
+
+  buildInputs = [ flex bison zlib libpng ncurses ed ];
+
+  patches = [ ./environment.patch ./getline.patch ];
+
+  setupHook = ./setup-hook.sh;
+
+  configureFlags =
+    [ "--disable-multiplatform"
+      "--without-x11"
+      "--without-xdvik"
+      "--without-oxdvik"
+      "--without-texinfo"
+      "--without-texi2html"
+      "--with-system-zlib"
+      "--with-system-pnglib"
+      "--with-system-ncurses"
+    ];
+
+  postUnpack =
+    ''
+      mkdir -p $out/share/texmf
+      mkdir -p $out/share/texmf-dist
+      gunzip < $texmf | (cd $out/share/texmf-dist && tar xvf -)
+    '';
+
+  meta = {
+    description = "A full-featured (La)TeX distribution";
+  };
+}