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, 17 insertions, 0 deletions

diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix
new file mode 100644
index 0000000000000..936e4a31af123
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/lkproof/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "lkproof-3.1";
+  
+  src = fetchurl {
+    url = http://mirror.ctan.org/macros/latex/contrib/lkproof.zip;
+    sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly";
+  };
+  
+  buildInputs = [ unzip ];
+
+  installPhase = "
+    mkdir -p $out/share/texmf-nix/tex/generic/lkproof
+    cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof
+  ";
+}