diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
| commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
| tree | 3e70796a291acc704ef5382f5af4866cab64e537 /pkgs/shells | |
| parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
| parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
| download | nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index e69c033cf404..adfe44b3bac1 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; # Required binaries during execution - # Python27: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ python27 which groff gettext man_db bc ]; + # Python: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ python which groff gettext man_db bc ]; postInstall = '' sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" |