[Backport release-25.05] fish: 4.0.2 -> 4.0.6 (#442617)

This commit is contained in:
Ramses
2025-09-13 19:43:27 +03:00
committed by GitHub

View File

@@ -152,13 +152,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fish";
version = "4.0.2";
version = "4.0.6";
src = fetchFromGitHub {
owner = "fish-shell";
repo = "fish-shell";
tag = finalAttrs.version;
hash = "sha256-UpoZPipXZbzLWCOXzDjfyTDrsKyXGbh3Rkwj5IeWeY4=";
hash = "sha256-qkPKpZvTVDEV7A/xX2bYgTf+o24mswRDr5UBXOsV5jQ=";
};
env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src patches;
hash = "sha256-FkJB33vVVz7Kh23kfmjQDn61X2VkKLG9mUt8f3TrCHg=";
hash = "sha256-myDme0aHEJPUDIcIN3j6i93oPrQ0Li4rIdepBp/C/R4=";
};
patches = [
@@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
rm tests/pexpects/job_summary.py
rm tests/pexpects/signals.py
rm tests/pexpects/fg.py
rm tests/checks/fish_exit.fish
''
+ lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin) ''
# This test seems to consistently fail on aarch64 and darwin