mirror of
https://github.com/NixOS/nix.git
synced 2025-11-22 02:09:36 +01:00
Merge pull request #30 from DeterminateSystems/stable-nix-command
Remove the `nix-command` experimental feature
This commit is contained in:
commit
bbd2c17f58
37 changed files with 41 additions and 121 deletions
|
|
@ -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_)
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ struct ExperimentalFeatureSettings : Config {
|
|||
Example:
|
||||
|
||||
```
|
||||
experimental-features = nix-command
|
||||
experimental-features = ca-derivations
|
||||
```
|
||||
|
||||
The following experimental features are available:
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
@ -302,7 +293,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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ enum struct ExperimentalFeature
|
|||
CaDerivations,
|
||||
ImpureDerivations,
|
||||
FetchTree,
|
||||
NixCommand,
|
||||
GitHashing,
|
||||
RecursiveNix,
|
||||
NoUrlLiterals,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue