From 588aefc53deb338fca296d682c22a7b6d024cbf7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 4 Sep 2019 23:20:58 +0200
Subject: [PATCH] nixos-option: don't break if `builtins.trace` is used in
 `<nixos-config>`

By default everything from `stderr` will be recorded in case of errors,
however this shouldn't break `nixos-option` if a simple trace call is
used that breaks the Nix expression evaluated by `nixos-option`.

Fixes #67659
---
 nixos/modules/installer/tools/nixos-option.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 4560e9c7403aa..e16325f049a04 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -82,7 +82,7 @@ evalNix(){
   set -e
 
   if test $exit_code -eq 0; then
-      sed '/^warning: Nix search path/d' <<EOF
+      sed '/^warning: Nix search path/d;/^trace:/d' <<EOF
 $result
 EOF
       return 0;