diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-16 21:27:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 21:27:07 +0000 |
| commit | c8aa1483b139936fa334a262d7c09a4f6f121c91 (patch) | |
| tree | 81737c7df7c8564c78b57bfe2f1c7e7cac03cca0 /pkgs | |
| parent | 502539e2c8a8f7d54b11c56ead318e1167115204 (diff) | |
| parent | edfdc1d81898a39a5be4b91f41b13ebe5e150b78 (diff) | |
| download | nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.tar nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.tar.gz nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.tar.bz2 nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.tar.lz nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.tar.xz nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.tar.zst nixlib-c8aa1483b139936fa334a262d7c09a4f6f121c91.zip | |
Merge pull request #31646 from yrashk/30645-fish
fish-foreign-env: suppress additional harmless warnings
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/shells/fish-foreign-env/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch (renamed from pkgs/shells/fish-foreign-env/hide-path-warnings.patch) | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix index 76a979bcda1b..445e961c6499 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/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"; diff --git a/pkgs/shells/fish-foreign-env/hide-path-warnings.patch b/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch index b7ac4edc5189..5e4569f0a15c 100644 --- a/pkgs/shells/fish-foreign-env/hide-path-warnings.patch +++ b/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 |