From 34ce8ffb49aa38c69483f5584d0fe7881e2bd81a Mon Sep 17 00:00:00 2001
From: Jhony Angulo <leohjaf@gmail.com>
Date: Fri, 14 Nov 2025 19:54:58 -0500
Subject: [PATCH 1/2] fish: ensure pexpect available for tests

---
 pkgs/by-name/fi/fish/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 38d808c899ac2..58f5a427b4b46 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -147,6 +147,7 @@ let
       test $fenv_status -eq 0
     end # fenv
   '';
+  testPython = python3.withPackages (ps: [ ps.pexpect ]);
 
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -317,6 +318,7 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure = ''
     patchShebangs ./build_tools/git_version_gen.sh
     patchShebangs ./tests/test_driver.py
+    substituteInPlace ./tests/test_driver.py --replace-warn '"python3",' '"${testPython}/bin/python3",'
   ''
   + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     export CMAKE_PREFIX_PATH=
@@ -336,7 +338,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeCheckInputs = [
     coreutils
     glibcLocales
-    (python3.withPackages (ps: [ ps.pexpect ]))
+    testPython
     procps
     sphinx
   ]
@@ -350,6 +352,7 @@ stdenv.mkDerivation (finalAttrs: {
   checkTarget = "fish_run_tests";
   preCheck = ''
     export TERMINFO="${ncurses}/share/terminfo"
+    export PATH=${testPython}/bin:$PATH
   '';
 
   nativeInstallCheckInputs = [

From 6e211d9ab5a4219654e872af1675b143fc01d827 Mon Sep 17 00:00:00 2001
From: Jhony Angulo <leohjaf@gmail.com>
Date: Fri, 14 Nov 2025 20:44:36 -0500
Subject: [PATCH 2/2] fish: drop PATH override in preCheck

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

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 58f5a427b4b46..f8e89c793b341 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -352,7 +352,6 @@ stdenv.mkDerivation (finalAttrs: {
   checkTarget = "fish_run_tests";
   preCheck = ''
     export TERMINFO="${ncurses}/share/terminfo"
-    export PATH=${testPython}/bin:$PATH
   '';
 
   nativeInstallCheckInputs = [