diff --git a/pkgs/by-name/fi/fish/nix-darwin-path.patch b/pkgs/by-name/fi/fish/nix-darwin-path.patch
index 8e92dcf1e9ce..cca5b1ccd81d 100644
--- a/pkgs/by-name/fi/fish/nix-darwin-path.patch
+++ b/pkgs/by-name/fi/fish/nix-darwin-path.patch
@@ -1,12 +1,12 @@
 diff --git a/share/config.fish b/share/config.fish
-index 73148ac25..1964e30be 100644
+index b246916a5..05252c35f 100644
 --- a/share/config.fish
 +++ b/share/config.fish
-@@ -175,6 +175,7 @@ and __fish_set_locale
+@@ -132,6 +132,7 @@ and __fish_set_locale
+ # This used to be in etc/config.fish - keep it here to keep the semantics
  #
- if status --is-login
-     if command -sq /usr/libexec/path_helper
-+        and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE
-         __fish_macos_set_env PATH /etc/paths '/etc/paths.d'
-         if test -n "$MANPATH"
-             __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d'
+ if status is-login && command -sq /usr/libexec/path_helper
++    and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE
+     __fish_macos_set_env PATH /etc/paths '/etc/paths.d'
+     if test -n "$MANPATH"
+         __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d'
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index a991b9b5683c..300538248ede 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -150,13 +150,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.7.1";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-u0mBdWkxP4zI6NUhJ0LJrEDrbAAfTDi8IapsWWC9yWc=";
+    hash = "sha256-ttjLM1uBY8sL+jVcxdHUnHYlRFe5jGjnkgBLy17qGso=";
   };
 
   env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-d4YA9fnDQyfyK675nP+tiTqJ1o2jqjwPHU1trXd8MCA=";
+    hash = "sha256-w8MuabpZ5ronQL3iaXbLErxPlTe1Mg8OsRb5foR59II=";
   };
 
   patches = [