diff options
| author | Kid <44045911+kidonng@users.noreply.github.com> | 2022-03-13 15:01:40 +0800 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2022-03-15 17:14:08 -0700 |
| commit | ec85f68183dc2e781c56d1cb3c14fc19b9618ac9 (patch) | |
| tree | 3f03de23895141c9dfb892e48fe116ce44b0fe1c /pkgs/shells | |
| parent | 457587ce8d6c71460b51665002898baaa130be84 (diff) | |
fish: 3.3.1 -> 3.4.0
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/fish/tests-pcre2-update.patch | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 622521781c1b4..b26695cab0e2c 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,11 +144,9 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; + sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U="; }; - 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 deleted file mode 100644 index 5e0c327c540a7..0000000000000 --- a/pkgs/shells/fish/tests-pcre2-update.patch +++ /dev/null @@ -1,7 +0,0 @@ -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"}, |