forked from lix-project/lix
Punt on improper global flags for now
See the note in the test. We don't want these flags showing up for commands where they are irrelevant. Eventually, this needs a proper fix, but it need not be a blocker for stabilize: for a quick-n-dirty punt, just put these flags behind the `nix-command` unstable feature. This is fine because they are only relevant for commands which we don't need to stabilize for a while.
This commit is contained in:
parent
570829d67e
commit
7c4dea3cf3
|
@ -82,6 +82,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
|
|||
.description = "Print full build logs on standard error.",
|
||||
.category = loggingCategory,
|
||||
.handler = {[&]() { logger->setPrintBuildLogs(true); }},
|
||||
.experimentalFeature = Xp::NixCommand,
|
||||
});
|
||||
|
||||
addFlag({
|
||||
|
@ -97,6 +98,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
|
|||
.description = "Disable substituters and consider all previously downloaded files up-to-date.",
|
||||
.category = miscCategory,
|
||||
.handler = {[&]() { useNet = false; }},
|
||||
.experimentalFeature = Xp::NixCommand,
|
||||
});
|
||||
|
||||
addFlag({
|
||||
|
@ -104,6 +106,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
|
|||
.description = "Consider all previously downloaded files out-of-date.",
|
||||
.category = miscCategory,
|
||||
.handler = {[&]() { refresh = true; }},
|
||||
.experimentalFeature = Xp::NixCommand,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -21,3 +21,15 @@ both_ways store gc --help
|
|||
|
||||
expect 1 nix --experimental-features 'nix-command' show-config --flake-registry 'https://no'
|
||||
nix --experimental-features 'nix-command flakes' show-config --flake-registry 'https://no'
|
||||
|
||||
# Double check this is stable
|
||||
nix --experimental-features '' --help
|
||||
|
||||
# These 3 arguments are currently given to all commands, which is wrong (as not
|
||||
# all care). To deal with fixing later, we simply make them require the
|
||||
# nix-command experimental features --- it so happens that the commands we wish
|
||||
# stabilizing to do not need them anyways.
|
||||
for arg in '--print-build-logs' '--offline' '--refresh'; do
|
||||
nix --experimental-features 'nix-command' "$arg" --help
|
||||
! nix --experimental-features '' "$arg" --help
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue