stdenv-updates: merge updates from 'master' branch

3 files changed, 12 insertions, 11 deletions

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 916c7600dfd0f..d79c9774569b1 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -1,22 +1,23 @@
 { stdenv, fetchurl }:
 
 let
-  version = "1.3";
+  version = "2.0";
 in
 stdenv.mkDerivation {
   name = "bash-completion-${version}";
 
   src = fetchurl {
     url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2";
-    sha256 = "8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec";
+    sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804";
   };
 
   postInstall = ''
-    rm $out/etc/profile.d/bash_completion.sh
-    rmdir $out/etc/profile.d
-    sed -i -e "s|/etc/bash_completion|$out/etc/bash_completion|g" $out/etc/bash_completion
+    sed -i "$out/share/bash-completion/bash_completion" \
+        -e 's|: .{BASH_COMPLETION_COMPAT_DIR:=.*}|BASH_COMPLETION_COMPAT_DIR="$HOME/.nix-profile/etc/bash_completion.d"|'
   '';
 
+  doCheck = true;
+
   meta = {
     homepage = "http://bash-completion.alioth.debian.org/";
     description = "Programmable completion for the bash shell";
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 8e430df529042..a64c20520561d 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages }:
 
 buildPythonPackage rec {
-  name = "ipython-0.11";
+  name = "ipython-0.13";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    md5 = "efc899e752a4a4a67a99575cea1719ef";
+    sha256 = "1m4m0zf3llnicfgrbnl2h08p3662px7v2pzbhq4fq24vnyz6x5w2";
   };
 
   propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ];
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 9e5fa7dae0f39..be182f87f1eea 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
-stdenv.mkDerivation {
-  name = "tcsh-6.16.00";
+stdenv.mkDerivation rec {
+  name = "tcsh-6.18.01";
   
   src = fetchurl {
-    url = ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.16.00.tar.gz;
-    sha256 = "1m0p8lqqna3vpf2k4x3hia3rlrz38av67x7hb4qsiq2kfpbbh0vn";
+    url = "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz";
+    sha256 = "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q";
   };
   
   buildInputs = [ncurses];