mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-24 20:02:58 +03:00
fish: fix merge conflict
patches got duplicated
This commit is contained in:
parent
6059831148
commit
5e5ecb7b6f
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user