Merge trunk

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

1 files changed, 43 insertions, 5 deletions

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 037ceddfd0183..6b199e165d0dc 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "4.3.10";
+  version = "4.3.15";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9";
+    sha256 = "73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4";
   };
   
 in
@@ -16,15 +16,53 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c";
+    sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486";
   };
   
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
+  buildInputs = [ ncurses coreutils ];
 
+  preConfigure = ''
+    configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp"
+  '';
+
+  # XXX: think/discuss about this, also with respect to nixos vs nix-on-X
   postInstall = ''
     ensureDir $out/share/
     tar xf ${documentation} -C $out/share
+    ensureDir $out/etc/
+    cat > $out/etc/zprofile <<EOF
+if test -e /etc/NIXOS; then
+  if test -r /etc/zprofile; then
+    . /etc/zprofile
+  else
+    emulate bash
+    alias shopt=false
+    . /etc/profile
+    unalias shopt
+    emulate zsh
+  fi
+  if test -r /etc/zprofile.local; then
+    . /etc/zprofile.local
+  fi
+else
+  # on non-nixos we just source the global /etc/zprofile as if we did
+  # not use the configure flag
+  if test -r /etc/zprofile; then
+    . /etc/zprofile
+  fi
+fi
+EOF
+    $out/bin/zsh -c "zcompile $out/etc/zprofile"
+    mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
   '';
+  # XXX: patch zsh to take zwc if newer _or equal_
 
-  buildInputs = [ncurses coreutils];
+  meta = {
+    description = "the Z shell";
+    longDescription = "Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor.  Of the standard shells, zsh most closely resembles ksh but includes many enhancements.  Zsh has command line editing, builtin spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and a host of other features.";
+    license = "MIT-like";
+    homePage = "http://www.zsh.org/";
+    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
 }