Merge remote-tracking branch 'upstream/master' into errors-phase-2

1 files changed, 5 insertions, 2 deletions

diff --git a/src/nix/main.cc b/src/nix/main.cc
index 5cf09c4f0..ef301580a 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -167,12 +167,15 @@ void mainWrapped(int argc, char * * argv)
 
     args.parseCmdline(argvToStrings(argc, argv));
 
-    settings.requireExperimentalFeature("nix-command");
-
     initPlugins();
 
     if (!args.command) args.showHelpAndExit();
 
+    if (args.command->first != "repl"
+        && args.command->first != "doctor"
+        && args.command->first != "upgrade-nix")
+        settings.requireExperimentalFeature("nix-command");
+
     Finally f([]() { stopProgressBar(); });
 
     startProgressBar(args.printBuildLogs);