diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-06 00:02:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 00:02:22 +0000 |
| commit | 2622221e95392f62f81ae60c35504e338e9ac2cf (patch) | |
| tree | a23c2759fc45495f899f07220bb1d8b1ecde1253 /pkgs/shells | |
| parent | 9497a77fed58d22866d632901da3ed344e82f2b5 (diff) | |
| parent | ad7955279dd0dcab03e02767a5794668cb160c04 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 1fa5b9c6151ab..b756da0754ebc 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.1"; + version = "3.6.4"; 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 = "sha256-VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI="; + hash = "sha256-Dz9hDlgN4JL76ILIqnZiPs+Ruxb98FQyQebpDV1Lw5M="; }; # Fix FHS paths in tests @@ -156,6 +156,8 @@ let sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp + # disable flakey test + sed -i '/{TEST_GROUP("history_races"), history_tests_t::test_history_races},/d' src/fish_tests.cpp # tests/checks/cd.fish sed -i 's|/bin/pwd|${coreutils}/bin/pwd|' tests/checks/cd.fish |