ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

fish: upstream patch to fix tests after pcre2 update

Browse Source
This commit is contained in:
Vladimír Čunát 2022-02-10 14:12:10 +01:00
parent 948d09f199
commit 1a17758b78
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

7
pkgs/shells/fish/tests-pcre2-update.patch Normal file
View File

@ -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"},