Merge branch 'master' into stdenv-updates.

Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
parent 473ba2212d 9ada368ef8
commit f67d5a9a39
841 changed files with 15333 additions and 6120 deletions
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -11,11 +11,6 @@ stdenv.mkDerivation {
    sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804";
  };

-  postInstall = ''
-    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 = {