From 6d5354076a526807fa53848c25968743b83a5b0c Mon Sep 17 00:00:00 2001
From: breakgimme <adam@plock.com>
Date: Thu, 21 May 2026 15:21:33 +0200
Subject: [PATCH] user/fish-shell: update to 4.7.1

---
 user/fish-shell/patches/none-profile.patch | 34 +++++++++-------------
 user/fish-shell/template.py                |  4 +--
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/user/fish-shell/patches/none-profile.patch b/user/fish-shell/patches/none-profile.patch
index 49a486de6cb..bb5e6f479dd 100644
--- a/user/fish-shell/patches/none-profile.patch
+++ b/user/fish-shell/patches/none-profile.patch
@@ -1,23 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c40c82d31..cd2737829 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -57,18 +57,18 @@ if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST build_types)
- endif()
-
- add_custom_target(
-   fish ALL
-   COMMAND
-     "${CMAKE_COMMAND}" -E
-       env ${VARS_FOR_CARGO}
-         ${Rust_CARGO}
--          build --bin fish
--          $<$<CONFIG:Release>:--release>
-+          auditable build --bin fish
-+          $<$<CONFIG:None>:--release>
-           $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-           --target ${Rust_CARGO_TARGET}
-           --no-default-features
-           --features=${FISH_CARGO_FEATURES}
-           ${CARGO_FLAGS}
-     &&
-     "${CMAKE_COMMAND}" -E
-       copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
+@@ -62,8 +62,8 @@ add_custom_target(
+         "${CMAKE_COMMAND}" -E
+             env ${VARS_FOR_CARGO}
+                 ${Rust_CARGO}
+-                    build --bin fish
+-                    $<$<CONFIG:Release>:--release>
++                    auditable build --bin fish
++                    $<$<CONFIG:None>:--release>
+                     $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
+                     --target ${Rust_CARGO_TARGET}
+                     --no-default-features
diff --git a/user/fish-shell/template.py b/user/fish-shell/template.py
index 386bdbc8f8a..71aab4b738d 100644
--- a/user/fish-shell/template.py
+++ b/user/fish-shell/template.py
@@ -1,5 +1,5 @@
 pkgname = "fish-shell"
-pkgver = "4.5.0"
+pkgver = "4.7.1"
 pkgrel = 0
 build_style = "cmake"
 make_check_target = "fish_run_tests"
@@ -17,7 +17,7 @@
 license = "GPL-2.0-only"
 url = "https://fishshell.com"
 source = f"https://github.com/fish-shell/fish-shell/releases/download/{pkgver}/fish-{pkgver}.tar.xz"
-sha256 = "89151f8cf14b634e080226fe696f9ce7d4d153c77629996ca4431c80482c64ed"
+sha256 = "6f4d5b438a6338e3f5dcda19a28261e2ece7a9b7ff97686685e6abdc31dbb7df"
 # uses a compiled binary to build docs
 options = ["!cross"]