diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
| commit | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (patch) | |
| tree | fb0a753dab894f13519ea969ad7edcfc19e3b56f /pkgs/shells | |
| parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
| parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) | |
| download | nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.gz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.bz2 nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.lz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.xz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.zst nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.zip | |
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
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash-completion/default.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index d79c9774569b..7e4c0f230155 100644 --- 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 = { |