diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-03-26 15:30:48 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-03-26 15:30:48 +0200 |
commit | 92b37e5136c3b5c80a679fc82684865295d3d99c (patch) | |
tree | 2ea7615ec6fa2b558899038229412343bce411d7 /pkgs/shells | |
parent | 83b56d0fd893bbbe799017604fe61440f49dbd44 (diff) | |
parent | 75cf58e348d9c15d555c6c7f155cd7092f2d4838 (diff) |
Merge #223108: fish: 3.6.0 -> 3.6.1
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/fish/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index a24a38081afe2..cd8fe4d0ca264 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 @@ -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 |