Merge remote-tracking branch 'upstream/master' into source-path

1 files changed, 8 insertions, 0 deletions

diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc
index 9185ba407..3997c98bf 100644
--- a/src/nix/upgrade-nix.cc
+++ b/src/nix/upgrade-nix.cc
@@ -32,6 +32,14 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand
         });
     }
 
+    /**
+     * This command is stable before the others
+     */
+    std::optional<ExperimentalFeature> experimentalFeature() override
+    {
+        return std::nullopt;
+    }
+
     std::string description() override
     {
         return "upgrade Nix to the stable version declared in Nixpkgs";