dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #272095 from adamcstephens/fish/3.6.3

Browse Source 
fish: 3.6.1 -> 3.6.4
This commit is contained in:
maxine 2023-12-05 23:10:00 +01:00 committed by GitHub
commit bf023a99cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/shells/fish/default.nix
View File

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