don't override existing experimental features

This way nix-update can be used on repos that uses flake builtins.
This commit is contained in:
Jörg Thalheim 2022-05-19 09:52:15 +02:00
parent 122512a449
commit 501befb415
No known key found for this signature in database
6 changed files with 7 additions and 7 deletions

View File

@ -153,7 +153,7 @@ def validate_git_dir(import_path: str) -> str:
def nix_run(options: Options) -> None:
cmd = ["nix", "shell", "--experimental-features", "nix-command"]
cmd = ["nix", "shell", "--extra-experimental-features", "nix-command"]
run(
cmd + ["-f", options.import_path, options.attribute],
stdout=None,
@ -165,7 +165,7 @@ def nix_build(options: Options) -> None:
cmd = [
"nix",
"build",
"--experimental-features",
"--extra-experimental-features",
"nix-command",
"-f",
options.import_path,

View File

@ -81,7 +81,7 @@ def eval_attr(opts: Options) -> Package:
"eval",
"--json",
"--impure",
"--experimental-features",
"--extra-experimental-features",
"nix-command",
"--expr",
expr,

View File

@ -48,7 +48,7 @@ def to_sri(hashstr: str) -> str:
cmd = [
"nix",
"--experimental-features",
"--extra-experimental-features",
"nix-command",
"hash",
"to-sri",

View File

@ -15,7 +15,7 @@ def test_update(helpers: conftest.Helpers) -> None:
"nix",
"eval",
"--raw",
"--experimental-features",
"--extra-experimental-features",
"nix-command",
"-f",
path,

View File

@ -15,7 +15,7 @@ def test_update(helpers: conftest.Helpers) -> None:
"nix",
"eval",
"--raw",
"--experimental-features",
"--extra-experimental-features",
"nix-command",
"-f",
path,

View File

@ -15,7 +15,7 @@ def test_update(helpers: conftest.Helpers) -> None:
"nix",
"eval",
"--raw",
"--experimental-features",
"--extra-experimental-features",
"nix-command",
"-f",
path,