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

Merge pull request #12167 from jgillich/fish-merge-fix

Browse Source 
fish: fix merge conflict
This commit is contained in:
Arseniy Seroka 2016-01-06 01:55:40 +03:00
commit 420f55542c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,16 +5,13 @@ stdenv.mkDerivation rec {
name = "fish-${version}";
version = "2.2.0";
patches = [ ./command-not-found.patch ];
patches = [ ./etc_config.patch ./builtin_status.patch ./command-not-found.patch ];
src = fetchurl {
url = "http://fishshell.com/files/${version}/${name}.tar.gz";
sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7";
};
# builtin_status has been upstreamed https://github.com/fish-shell/fish-shell/pull/2636
patches = [ ./etc_config.patch ./builtin_status.patch ];
buildInputs = [ ncurses libiconv ];
# Required binaries during execution