Author: simons
Date: Sat Sep 24 07:58:19 2011
New Revision: 29467
URL: https://ssl.nixos.org/websvn/nix/?rev=29467&sc=1
Log:
pkgs/shells/bash/default.nix: revert my earlier revision 29244
Including the bash-completion package in bash itself sounded like a good idea
at the time, but it wasn't. After having actually integrated completion support
into NixOS, it has become obvious that this property isn't required at all.
Keeping bash-completion separate from bash works just fine. Anyone who wants
completion support can just install that package.
Modified:
nixpkgs/trunk/pkgs/shells/bash/default.nix
Modified: nixpkgs/trunk/pkgs/shells/bash/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/shells/bash/default.nix Sat Sep 24 07:27:07 2011
(r29466)
+++ nixpkgs/trunk/pkgs/shells/bash/default.nix Sat Sep 24 07:58:19 2011
(r29467)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null,
bison, bashCompletion ? null}:
+{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null,
bison }:
assert interactive -> readline != null;
@@ -52,10 +52,7 @@
# Add an `sh' -> `bash' symlink.
ln -s bash "$out/bin/sh"
- '' + (if interactive && bashCompletion != null then ''
- ensureDir "$out/etc"
- echo >"$out/etc/bash_completion" '.
"${bashCompletion}/etc/bash_completion"'
- '' else ''
+ '' + (if interactive then "" else ''
# Install the completion examples.
ensureDir "$out/etc"
cp -v "examples/complete/bash_completion" "$out/etc"
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
