Merge remote-tracking branch 'origin/master' into stdenv-updates.

pkgs/shells/fish/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, ncurses, which }:
+{ stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }:
 
 stdenv.mkDerivation rec {
   name = "fish-2.0.0";
@@ -16,7 +16,18 @@ stdenv.mkDerivation rec {
     autoconf
   '';
 
-  meta = {
-    homepage = http://fishshell.com;
+  postInstall = ''
+    sed -i "s|which |command -v |" "$out/share/fish/functions/type.fish"
+    sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish"
+    sed -e "s|gettext |${gettext}/bin/gettext |" \
+        -e "s|which |command -v |" \
+        -i "$out/share/fish/functions/_.fish"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Smart and user-friendly command line shell";
+    homepage = http://fishshell.com/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

pkgs/shells/ipython/default.nix

@@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null && sip != null;
 
 buildPythonPackage rec {
-  name = "ipython-1.0.0";
+  name = "ipython-1.1.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "074i08a1zr7wjpqc7rm0k3rnq0laf0gjrcxlfvvb3qc48wdm41qd";
+    sha256 = "1glivwy7k2dciy0y5i39syngip84nrqhpggn4glmpd2s49jllkkc";
   };
 
   propagatedBuildInputs = [