From 771019be266109c410700c90d39bc0a68c2ab360 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 13 Mar 2025 12:39:28 +0100
Subject: [PATCH 1/3] fish: 4.0.0 -> 4.0.1

https://github.com/fish-shell/fish-shell/releases/tag/4.0.1
---
 pkgs/by-name/fi/fish/package.nix | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 27c3c137859f..3ae0a4e0e7e3 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   coreutils,
   darwin,
   glibcLocales,
@@ -153,13 +152,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-BLbL5Tj3FQQCOeX5TWXMaxCpvdzZtKe5dDQi66uU/BM=";
+    hash = "sha256-Mj4v2ubYr4ufs7aU/1AdY239byiCJHKXam64af/VO3U=";
   };
 
   env = {
@@ -170,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-4ol4LvabhtjiMMWwV1wrcywFePOmU0Jub1sy+Ay7mLA=";
+    hash = "sha256-4kqBrpeneCpF0WohP1ZArKrV3duHAE01XA5+GT9f56w=";
   };
 
   patches = [
@@ -189,18 +188,6 @@ stdenv.mkDerivation (finalAttrs: {
     # * <https://github.com/LnL7/nix-darwin/issues/122>
     # * <https://github.com/fish-shell/fish-shell/issues/7142>
     ./nix-darwin-path.patch
-
-    (fetchpatch2 {
-      name = "cargo_version.diff";
-      url = "https://github.com/fish-shell/fish-shell/commit/1e069b0fff20b153bc7f824f9f9b820ca4117e1e.diff?full_index=1";
-      hash = "sha256-XFJ0fT2Zanvdqt/iwgyH2IA/kIOcOHMNdsmuzjTX5qs=";
-    })
-
-    # Fixes a build issue in kitty, see https://github.com/fish-shell/fish-shell/commit/97f0809b62a1fa77df1b9fcbbfe623b6187b5013
-    # The first patch is needed since it introduces the BufferedOutputter type that's
-    # used by the second one.
-    ./reduce_writes.patch
-    ./osc_133.patch
   ];
 
   # Fix FHS paths in tests

From 9b58e094df9cd044bff05a8affc2631e2bfd81c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= <lotte@chir.rs>
Date: Wed, 5 Mar 2025 09:46:24 +0100
Subject: [PATCH 2/3] fish: fix cross-compile

its rust cmake module is not able to accurately determine the target
architecture for the rust compiler. This results in the rust part being
built for the build platform.
---
 pkgs/by-name/fi/fish/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 3ae0a4e0e7e3..778410e8e294 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -268,6 +268,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags =
     [
       "-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish"
+      "-DRust_CARGO_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "-DMAC_CODESIGN_ID=OFF"

From b47e684d458a5838e6346fee088f4cb0611e487e Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 13 Mar 2025 15:47:51 +0100
Subject: [PATCH 3/3] fish: add myself as maintainer

---
 pkgs/by-name/fi/fish/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 778410e8e294..96386d8c2a0b 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -386,6 +386,7 @@ stdenv.mkDerivation (finalAttrs: {
       cole-h
       winter
       sigmasquadron
+      rvdp
     ];
     mainProgram = "fish";
   };