@@ -90,7 +90,7 @@ let
9090
9191 fish = stdenv.mkDerivation rec {
9292 pname = "fish";
93− version = "3.0.2";
93+ version = "3.1.0";
9494
9595 etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
9696
@@ -98,7 +98,7 @@ let
9898 # There are differences between the release tarball and the tarball github packages from the tag
9999 # Hence we cannot use fetchFromGithub
100100 url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
101− sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
101+ sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5";
102102 };
103103
104104 nativeBuildInputs = [ cmake ];
@@ -109,11 +109,10 @@ let
109109 '';
110110
111111 patches = [
112− # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion.
113− # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0)
112+ # Fixes compilation on old Apple SDKs
114113 (fetchpatch {
115− url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch";
116− sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw";
114+ url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch";
115+ sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn";
117116 })
118117 ];
119118
@@ -128,7 +127,7 @@ let
128127 sed -r "s|command grep|command ${gnugrep}/bin/grep|" \
129128 -i "$out/share/fish/functions/grep.fish"
130129 sed -i "s|which |${which}/bin/which |" \
131− "$out/share/fish/functions/type.fish"
130+ "$out/share/fish/functions/type.fish"
132131 sed -e "s|\|cut|\|${coreutils}/bin/cut|" \
133132 -i "$out/share/fish/functions/fish_prompt.fish"
134133 sed -e "s|gettext |${gettext}/bin/gettext |" \
@@ -136,18 +135,18 @@ let
136135 -i "$out/share/fish/functions/_.fish"
137136 sed -e "s|uname|${coreutils}/bin/uname|" \
138137 -i "$out/share/fish/functions/__fish_pwd.fish" \
139− "$out/share/fish/functions/prompt_pwd.fish"
138+ "$out/share/fish/functions/prompt_pwd.fish"
140139 sed -e "s|sed |${gnused}/bin/sed |" \
141140 -i "$out/share/fish/functions/alias.fish" \
142− "$out/share/fish/functions/prompt_pwd.fish"
141+ "$out/share/fish/functions/prompt_pwd.fish"
143142 sed -i "s|nroff |${groff}/bin/nroff |" \
144− "$out/share/fish/functions/__fish_print_help.fish"
145− sed -i "s|/sbin /usr/sbin||" \
146− "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
147− sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
143+ "$out/share/fish/functions/__fish_print_help.fish"
144+ sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
148145 -i "$out/share/fish/functions/fish_default_key_bindings.fish"
149− sed -e "s|python3|${getBin python3}/bin/python3|" \
146+ sed -e "s|python3|${getBin python3}/bin/python3|" \
150147 -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish}
148+ sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \
149+ $out/share/fish/completions/{sudo.fish,doas.fish}
151150
152151 '' + optionalString stdenv.isLinux ''
153152 sed -e "s| ul| ${utillinux}/bin/ul|" \