Merge pull request #31646 from yrashk/30645-fish

fish-foreign-env: suppress additional harmless warnings

pkgs/shells/fish-foreign-env/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
         -i $out/share/fish-foreign-env/functions/*
   '';
 
-  patches = [ ./hide-path-warnings.patch ];
+  patches = [ ./suppress-harmless-warnings.patch ];
 
   meta = with stdenv.lib; {
     description = "A foreign environment interface for Fish shell";

pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch

@@ -1,16 +1,23 @@
 diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish
-index 34a25e3..6837e7f 100644
+index 34a25e3..3d94135 100644
 --- a/functions/fenv.apply.fish
 +++ b/functions/fenv.apply.fish
-@@ -30,8 +30,9 @@ function fenv.apply
+@@ -27,11 +27,17 @@ function fenv.apply
+     for variable in $variables
+         set key (echo $variable | sed 's/=.*//')
+         set value (echo $variable | sed 's/[^=]*=//')
++        set ignore PATH _
  
          if test "$key" = 'PATH'
            set value (echo $value | tr ':' '\n')
+         end
+ 
+-        set -g -x $key $value
++        if contains $key $ignore
 +          set -g -x $key $value ^/dev/null
 +        else
 +          set -g -x $key $value
-         end
--
--        set -g -x $key $value
++        end
++
      end
  end