Merge remote-tracking branch 'detsys-priv/detsys-main' into sync-2.24.2

src/libutil/args.cc

@@ -582,7 +582,7 @@ Strings argvToStrings(int argc, char * * argv)
 
 std::optional<ExperimentalFeature> Command::experimentalFeature ()
 {
-    return { Xp::NixCommand };
+    return {};
 }
 
 MultiCommand::MultiCommand(std::string_view commandName, const Commands & commands_)

src/libutil/config.hh

@@ -386,7 +386,7 @@ struct ExperimentalFeatureSettings : Config {
           Example:
 
           ```
-          experimental-features = nix-command
+          experimental-features = ca-derivations
           ```
 
           The following experimental features are available:

src/libutil/experimental-features.cc

@@ -86,15 +86,6 @@ constexpr std::array<ExperimentalFeatureDetails, numXpFeatures> xpFeatureDetails
         )",
         .trackingUrl = "https://github.com/NixOS/nix/milestone/31",
     },
-    {
-        .tag = Xp::NixCommand,
-        .name = "nix-command",
-        .description = R"(
-            Enable the new `nix` subcommands. See the manual on
-            [`nix`](@docroot@/command-ref/new-cli/nix.md) for details.
-        )",
-        .trackingUrl = "https://github.com/NixOS/nix/milestone/28",
-    },
     {
         .tag = Xp::GitHashing,
         .name = "git-hashing",
@@ -310,7 +301,7 @@ static_assert(
  * A set of previously experimental features that are now considered
  * stable. We don't warn if users have these in `experimental-features`.
  */
-std::set<std::string> stabilizedFeatures{"flakes"};
+std::set<std::string> stabilizedFeatures{"flakes", "nix-command"};
 
 const std::optional<ExperimentalFeature> parseExperimentalFeature(const std::string_view & name)
 {

src/libutil/experimental-features.hh

@@ -19,7 +19,6 @@ enum struct ExperimentalFeature
     CaDerivations,
     ImpureDerivations,
     FetchTree,
-    NixCommand,
     GitHashing,
     RecursiveNix,
     NoUrlLiterals,