From 5e5ecb7b6f476af51dcad4ac05b556a3860cad6f Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Tue, 5 Jan 2016 18:00:34 +0100
Subject: fish: fix merge conflict

patches got duplicated
---
 pkgs/shells/fish/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 0fa8e82fb89..1419b180d72 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -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
-- 
cgit 1.4.1