summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@nextrem.ch>2021-04-07 22:23:00 +0200
committerGitHub <noreply@github.com>2021-04-07 22:23:00 +0200
commitc53e14fbabee60bc3451a379097fe7622dc6120a (patch)
tree523a4652f2ca6f03cceb8c726bca1fb4a1d518f9 /pkgs/shells
parent547cbbe6a4fab70f6d75f37564d392f06eedeaf6 (diff)
parent563451277f2a79fc933f487b1e7f1b563005f950 (diff)
downloadnixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.tar
nixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.tar.gz
nixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.tar.bz2
nixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.tar.lz
nixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.tar.xz
nixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.tar.zst
nixpkgs-c53e14fbabee60bc3451a379097fe7622dc6120a.zip
Merge pull request #118752 from cole-h/fish
fish: 3.2.1 -> 3.2.2
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/fish/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index c467c04c3ff..b2677715d51 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -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