ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

Use --extra-experimental-features as opposed to --experimental-features

Browse source
This commit is contained in:
Zhaofeng Li 2022-09-18 17:27:46 -06:00
parent d4dcf1c6e9
commit 695ec0c36f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-tests/flakes/default.nix
View file

@ -17,7 +17,7 @@ in tools.makeTest {
deployer.succeed("sed -i 's @nixpkgs@ path:${pkgs._inputs.nixpkgs.outPath}?narHash=${pkgs._inputs.nixpkgs.narHash} g' /tmp/bundle/flake.nix") deployer.succeed("sed -i 's @nixpkgs@ path:${pkgs._inputs.nixpkgs.outPath}?narHash=${pkgs._inputs.nixpkgs.narHash} g' /tmp/bundle/flake.nix")
with subtest("Lock flake dependencies"): with subtest("Lock flake dependencies"):
deployer.succeed("cd /tmp/bundle && nix --experimental-features \"nix-command flakes\" flake lock") deployer.succeed("cd /tmp/bundle && nix --extra-experimental-features \"nix-command flakes\" flake lock")
with subtest("Deploy with a plain flake without git"): with subtest("Deploy with a plain flake without git"):
deployer.succeed("cd /tmp/bundle && ${tools.colmenaExec} apply --on @target --evaluator ${evaluator}") deployer.succeed("cd /tmp/bundle && ${tools.colmenaExec} apply --on @target --evaluator ${evaluator}")

2
src/nix/evaluator/nix_eval_jobs.rs
View file

@ -85,7 +85,7 @@ impl DrvSetEvaluator for NixEvalJobs {
command.args(options.to_args()); command.args(options.to_args());
if expression.requires_flakes() { if expression.requires_flakes() {
command.args(&["--experimental-features", "flakes"]); command.args(&["--extra-experimental-features", "flakes"]);
} }
let mut child = command let mut child = command

4
src/nix/flake.rs
View file

@ -88,7 +88,7 @@ impl FlakeMetadata {
async fn resolve(flake: &str) -> ColmenaResult<Self> { async fn resolve(flake: &str) -> ColmenaResult<Self> {
let child = Command::new("nix") let child = Command::new("nix")
.args(&["flake", "metadata", "--json"]) .args(&["flake", "metadata", "--json"])
.args(&["--experimental-features", "nix-command flakes"]) .args(&["--extra-experimental-features", "nix-command flakes"])
.arg(flake) .arg(flake)
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.spawn()?; .spawn()?;
@ -110,7 +110,7 @@ impl FlakeMetadata {
pub async fn lock_flake_quiet(uri: &str) -> ColmenaResult<()> { pub async fn lock_flake_quiet(uri: &str) -> ColmenaResult<()> {
let status = Command::new("nix") let status = Command::new("nix")
.args(&["flake", "lock"]) .args(&["flake", "lock"])
.args(&["--experimental-features", "nix-command flakes"]) .args(&["--extra-experimental-features", "nix-command flakes"])
.arg(uri) .arg(uri)
.stderr(Stdio::null()) .stderr(Stdio::null())
.status() .status()

2
src/nix/hive/mod.rs
View file

@ -402,7 +402,7 @@ impl<'hive> NixInstantiate<'hive> {
let mut command = Command::new("nix-instantiate"); let mut command = Command::new("nix-instantiate");
if self.hive.is_flake() { if self.hive.is_flake() {
command.args(&["--experimental-features", "flakes"]); command.args(&["--extra-experimental-features", "flakes"]);
} }
let mut full_expression = self.hive.get_base_expression(); let mut full_expression = self.hive.get_base_expression();