Merge remote-tracking branch 'origin/master' into flakes

1 files changed, 5 insertions, 2 deletions

diff --git a/src/nix/main.cc b/src/nix/main.cc
index fffdeab90..94fd33244 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -183,12 +183,15 @@ void mainWrapped(int argc, char * * argv)
 
     if (completions) return;
 
-    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);