cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fish: 3.2.1 -> 3.2.2

Browse source 
Replacing all occurrences of `/usr` with `/nix` doesn't work, because
one test is just verifying if `wdirname` works (and `dirname /usr/lib`
is not the same as `dirname /nix/lib`).
This commit is contained in:
Cole Helbling 2021-04-07 11:18:46 -07:00
parent 9126104f42
commit 563451277f
No known key found for this signature in database
GPG key ID: B37E0F2371016A4C
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.2.1";
version = "3.2.2";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -141,14 +141,14 @@ 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";
sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s=";
sha256 = "WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk=";
};
# Fix FHS paths in tests
postPatch = ''
# src/fish_tests.cpp
sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp
sed -i 's|L"/usr"|L"/nix"|' src/fish_tests.cpp
sed -i 's|is_potential_path(L"/usr"|is_potential_path(L"/nix"|' src/fish_tests.cpp
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