From 6106b84559bc648dcc61bf8906aabc378d8998b6 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 17 Feb 2026 11:06:30 -0500
Subject: [PATCH] fish: 4.4.0 -> 4.5.0

Changelog: https://github.com/fish-shell/fish-shell/releases/tag/4.5.0
---
 pkgs/by-name/fi/fish/package.nix          | 19 ++++++++++++-------
 pkgs/by-name/fi/fish/skip-sgr-tests.patch | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/fi/fish/skip-sgr-tests.patch

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index a227534a9218..712307f8fdb0 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -14,7 +14,6 @@
   libiconv,
   pcre2,
   pkg-config,
-  sphinx,
   gettext,
   ncurses,
   python3,
@@ -150,13 +149,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-vUNmlEVQ5nxXSDfpgQ3l/+dzYW/MllhcfJhmFx4kY/A=";
+    hash = "sha256-9EhvCStAeL+ADkLy9b4gXPx+JrVzUZ5Fdkf+imY3Vw0=";
   };
 
   env = {
@@ -169,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-9Wi9KlMzTrecEkHyfW/H9WPHpQDEMpdGB8snFs7zFb4=";
+    hash = "sha256-RVg6Zciy9mqZQwM5P3ngJi2NjC0qwFH7XgVEanaKnsg=";
   };
 
   patches = [
@@ -188,6 +187,10 @@ stdenv.mkDerivation (finalAttrs: {
     # * <https://github.com/LnL7/nix-darwin/issues/122>
     # * <https://github.com/fish-shell/fish-shell/issues/7142>
     ./nix-darwin-path.patch
+
+    # these tests fail, likely due to dumb terminal issues, but setting a TERM
+    # doesn't help. Skipping them.
+    ./skip-sgr-tests.patch
   ];
 
   # Fix FHS paths in tests
@@ -298,7 +301,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustc
     rustPlatform.cargoSetupHook
-    sphinx
+    (python3.withPackages (ps: [
+      ps.pexpect
+      ps.sphinx
+    ]))
     # Avoid warnings when building the manpages about HOME not being writable
     writableTmpDirAsHomeHook
   ];
@@ -343,13 +349,12 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db;
 
-  # disable darwin pending https://github.com/NixOS/nixpkgs/pull/462090 getting through staging
+  # disable darwin checks due to multiple failures
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   nativeCheckInputs = [
     coreutils
     glibcLocales
-    (python3.withPackages (ps: [ ps.pexpect ]))
     procps
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/fi/fish/skip-sgr-tests.patch b/pkgs/by-name/fi/fish/skip-sgr-tests.patch
new file mode 100644
index 000000000000..f643a4ba8201
--- /dev/null
+++ b/pkgs/by-name/fi/fish/skip-sgr-tests.patch
@@ -0,0 +1,19 @@
+diff --git a/src/terminal.rs b/src/terminal.rs
+--- a/src/terminal.rs
++++ b/src/terminal.rs
+@@ -787,6 +787,7 @@
+         SgrTerminalCommand::ExitAttributeMode,
+     };
+
++    #[ignore]
+     #[test]
+     fn sgr_combining() {
+         // No style, no content
+@@ -823,6 +824,7 @@
+         assert_eq!(String::from_utf8_lossy(outp.contents()), "\u{1b}[30;40m");
+     }
+
++    #[ignore]
+     #[test]
+     fn sgr_max_length() {
+         // Cut at max length