nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-18 07:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: 3.3.1 -> 3.4.0

Browse Source
This commit is contained in:
Kid 2022-03-12 18:44:05 +00:00 committed by GitHub
parent 8ea30cd886
commit 95de56ba01
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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