aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/fish/completion.fish2
-rw-r--r--src/libmain/loggers.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/fish/completion.fish b/misc/fish/completion.fish
index c6b8ef16a..b7a272c61 100644
--- a/misc/fish/completion.fish
+++ b/misc/fish/completion.fish
@@ -14,7 +14,7 @@ function _nix_complete
# But the variable also misses the current token so it cancels out.
set -l nix_arg_to_complete (count $nix_args)
- env NIX_GET_COMPLETIONS=$nix_arg_to_complete $nix_args $current_token
+ env NIX_GET_COMPLETIONS=$nix_arg_to_complete $nix_args $current_token 2>/dev/null
end
function _nix_accepts_files
diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc
index 8c3c4e355..46438280a 100644
--- a/src/libmain/loggers.cc
+++ b/src/libmain/loggers.cc
@@ -7,7 +7,7 @@ namespace nix {
LogFormat defaultLogFormat = LogFormat::raw;
LogFormat parseLogFormat(const std::string & logFormatStr) {
- if (logFormatStr == "raw" || getEnv("NIX_GET_COMPLETIONS"))
+ if (logFormatStr == "raw")
return LogFormat::raw;
else if (logFormatStr == "raw-with-logs")
return LogFormat::rawWithLogs;