From 1a17758b78d2d3afd9af7e22c29111d4f0d247d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 10 Feb 2022 14:12:10 +0100
Subject: [PATCH] fish: upstream patch to fix tests after pcre2 update

---
 pkgs/shells/fish/default.nix              | 3 +++
 pkgs/shells/fish/tests-pcre2-update.patch | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 pkgs/shells/fish/tests-pcre2-update.patch

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index cf264f11de8c..e0ab463b4180 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , coreutils
 , which
 , gnused
@@ -146,6 +147,8 @@ let
       sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=";
     };
 
+    patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4
+
     # Fix FHS paths in tests
     postPatch = ''
       # src/fish_tests.cpp
diff --git a/pkgs/shells/fish/tests-pcre2-update.patch b/pkgs/shells/fish/tests-pcre2-update.patch
new file mode 100644
index 000000000000..5e0c327c540a
--- /dev/null
+++ b/pkgs/shells/fish/tests-pcre2-update.patch
@@ -0,0 +1,7 @@
+Adapted formating to 3.3.1 from
+https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a
+--- a/src/fish_tests.cpp
++++ b/src/fish_tests.cpp
+@@ -5726,2 +5725,0 @@
+-        {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
+-        {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},