public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/servers/serfdom/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-01 11:25:41 +02:00
parent 89f8af55f1 ce623950ad
commit 06fc1ec34d
244 changed files with 5400 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/shells/fish/default.nix
View File

@@ -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"