Merging from trunk. I had to do two manual merges, quite trivial I think.

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

4 files changed, 10 insertions, 56 deletions

diff --git a/pkgs/shells/zsh/4.3.4.nix b/pkgs/shells/zsh/4.3.4.nix
deleted file mode 100644
index ea9a82cf6839..000000000000
--- a/pkgs/shells/zsh/4.3.4.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "zsh-4.3.4";
-
-  src = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.4.tar.bz2;
-    sha256 = "1inypy60h7hir8hwidid85pbajrb5w09fl222p0h4fnsn0nf583g";
-  };
-
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/4.3.5.nix b/pkgs/shells/zsh/4.3.5.nix
deleted file mode 100644
index c626db491075..000000000000
--- a/pkgs/shells/zsh/4.3.5.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-let documentation = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.5-doc.tar.bz2;
-    sha256 = "0jf35xibp8wfka7rdk9q8spkwprlhjx1sp7vp6img8wks12cvlkx";
-  };
-in
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = fetchurl {
-    url = mirror://sourceforge/zsh/zsh-4.3.5.tar.bz2;
-    sha256 = "0191j3liflkjrj39i2yrs3ab9jcx4zd93rirx3j17dymfgqlvrzb";
-  };
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  postInstall = ''
-    ensureDir $out/share/
-    tar xf ${documentation} -C $out/share
-  '';
-
-  buildInputs = [ncurses coreutils];
-}
diff --git a/pkgs/shells/zsh/cvs.nix b/pkgs/shells/zsh/cvs.nix
deleted file mode 100644
index db34f0666d50..000000000000
--- a/pkgs/shells/zsh/cvs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-args: with args;
-# cvs does include docs
-# the cvs snapshot is updated occasionally. see bleedingEdgeRepos
-
-stdenv.mkDerivation {
-  name = "zsh-${version}";
-
-  src = sourceByName "zsh";
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
-
-  preConfigure = "autoconf; autoheader";
-
-  postInstall = ''
-    ensureDir $out/share/
-    cp -R Doc $out/share
-  '';
-
-  buildInputs = [ncurses coreutils autoconf yodl ];
-}
diff --git a/pkgs/shells/zsh/4.3.9.nix b/pkgs/shells/zsh/default.nix
index 6a1d0d14dee9..eacda19a8de2 100644
--- a/pkgs/shells/zsh/4.3.9.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,9 +1,16 @@
-args: with args;
-let documentation = fetchurl {
+{ stdenv, fetchurl, ncurses, coreutils }:
+
+let
+
+  version = "4.3.9";
+
+  documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
     sha256 = "0rc19q5r8x2yln7synpqzxngm7g4g6idrpgc1i0jsawc48m7dbhm";
   };
+  
 in
+
 stdenv.mkDerivation {
   name = "zsh-${version}";
 
@@ -11,6 +18,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
     sha256 = "1aw28c5w83vl2ckbvf6ljj00s36icyrnxcm1r6q63863dmn6vpcg";
   };
+  
   configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
 
   postInstall = ''