From b27114d16bb4fb0f05ceb1679c163abeff93455e Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 25 Mar 2023 10:29:55 -0700 Subject: [PATCH 1/2] fish: 3.6.0 -> 3.6.1 https://github.com/fish-shell/fish-shell/releases/tag/3.6.1 --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index a24a38081afe..2e631fecb288 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -135,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -145,7 +145,7 @@ 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"; - hash = "sha512-oR6nYa2s4C73+IsliTMoAFzvB/ktNi+8eUVA3KJunPyXCHjQMSyuvRnWRIPp88PiStbCffziZNF3+T1lx+9plg=="; + hash = "sha256-VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI="; }; # Fix FHS paths in tests From 75cf58e348d9c15d555c6c7f155cd7092f2d4838 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 25 Mar 2023 13:03:48 -0700 Subject: [PATCH 2/2] fish: disable flaky pexpect test on darwin --- pkgs/shells/fish/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 2e631fecb288..cd8fe4d0ca26 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -181,6 +181,10 @@ let rm tests/pexpects/exit.py rm tests/pexpects/job_summary.py rm tests/pexpects/signals.py + + # pexpect tests are flaky in general + # See https://github.com/fish-shell/fish-shell/issues/8789 + rm tests/pexpects/bind.py '' + lib.optionalString stdenv.isLinux '' # pexpect tests are flaky on aarch64-linux (also x86_64-linux) # See https://github.com/fish-shell/fish-shell/issues/8789