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

pkgs/tools/archivers/unzip/default.nix

@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, bzip2 }:
+{ stdenv, fetchurl, bzip2
+, enableNLS ? false, libnatspec }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
   name = "unzip-6.0";
   
   src = fetchurl {
@@ -8,11 +9,11 @@ stdenv.mkDerivation {
     sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
   };
 
-  buildInputs = [ bzip2 ];
+  buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
 
   makefile = "unix/Makefile";
 
-  NIX_LDFLAGS = "-lbz2";
+  NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
 
   buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2";
 
@@ -28,4 +29,13 @@ stdenv.mkDerivation {
     license = "free"; # http://www.info-zip.org/license.html
     meta.platforms = stdenv.lib.platforms.all;
   };
-}
+} // (if enableNLS then {
+  patches =
+    [ ( fetchurl {
+        url =
+        "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
+        name = "unzip-6.0-natspec.patch";
+        sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
+      })
+    ];
+} else {}))