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

fish: fix merge conflict

Browse Source 
patches got duplicated
This commit is contained in:
Jakob Gillich 2016-01-05 18:00:34 +01:00
parent 6059831148
commit 5e5ecb7b6f
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}"; name = "fish-${version}";
version = "2.2.0"; version = "2.2.0";
patches = [ ./command-not-found.patch ]; patches = [ ./etc_config.patch ./builtin_status.patch ./command-not-found.patch ];
src = fetchurl { src = fetchurl {
url = "http://fishshell.com/files/${version}/${name}.tar.gz"; url = "http://fishshell.com/files/${version}/${name}.tar.gz";
sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7"; 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 ]; buildInputs = [ ncurses libiconv ];
# Required binaries during execution # Required binaries during execution