mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

Merge #223108: fish: 3.6.0 -> 3.6.1

Browse source
This commit is contained in:
Vladimír Čunát 2023-03-26 15:30:48 +02:00
parent 83b56d0fd8 75cf58e348
commit 92b37e5136
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/shells/fish/default.nix
View file

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