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

src/libstore/build/derivation-goal.cc

@@ -988,9 +988,7 @@ Goal::Co DerivationGoal::buildDone()
                     msg += line;
                     msg += "\n";
                 }
-                auto nixLogCommand = experimentalFeatureSettings.isEnabled(Xp::NixCommand)
-                    ? "nix log"
-                    : "nix-store -l";
+                auto nixLogCommand = "nix log";
                 msg += fmt("For full logs, run '" ANSI_BOLD "%s %s" ANSI_NORMAL "'.",
                     nixLogCommand,
                     worker.store.printStorePath(drvPath));

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,

src/nix/main.cc

@@ -122,7 +122,6 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
             .description = "Print full build logs on standard error.",
             .category = loggingCategory,
             .handler = {[&]() { logger->setPrintBuildLogs(true); }},
-            .experimentalFeature = Xp::NixCommand,
         });
 
         addFlag({
@@ -138,7 +137,6 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
             .description = "Disable substituters and consider all previously downloaded files up-to-date.",
             .category = miscCategory,
             .handler = {[&]() { useNet = false; }},
-            .experimentalFeature = Xp::NixCommand,
         });
 
         addFlag({
@@ -146,7 +144,6 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
             .description = "Consider all previously downloaded files out-of-date.",
             .category = miscCategory,
             .handler = {[&]() { refresh = true; }},
-            .experimentalFeature = Xp::NixCommand,
         });
     }
 

src/nix/nix.md

@@ -48,11 +48,6 @@ manual](https://nixos.org/manual/nix/stable/).
 
 # Installables
 
-> **Warning** \
-> Installables are part of the unstable
-> [`nix-command` experimental feature](@docroot@/development/experimental-features.md#xp-feature-nix-command),
-> and subject to change without notice.
-
 Many `nix` subcommands operate on one or more *installables*.
 These are command line arguments that represent something that can be realised in the Nix store.
 
@@ -72,11 +67,6 @@ That is, Nix will operate on the default flake output attribute of the flake in
 
 ### Flake output attribute
 
-> **Warning** \
-> Flake output attribute installables depend on the
-> [`nix-command`](@docroot@/development/experimental-features.md#xp-feature-nix-command)
-> experimental feature, and subject to change without notice.
-
 Example: `nixpkgs#hello`
 
 These have the form *flakeref*[`#`*attrpath*], where *flakeref* is a