mirror of
https://github.com/Mic92/nix-update.git
synced 2024-09-17 13:27:27 +03:00
don't override existing experimental features
This way nix-update can be used on repos that uses flake builtins.
This commit is contained in:
parent
122512a449
commit
501befb415
@ -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,
|
||||
|
@ -81,7 +81,7 @@ def eval_attr(opts: Options) -> Package:
|
||||
"eval",
|
||||
"--json",
|
||||
"--impure",
|
||||
"--experimental-features",
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"--expr",
|
||||
expr,
|
||||
|
@ -48,7 +48,7 @@ def to_sri(hashstr: str) -> str:
|
||||
|
||||
cmd = [
|
||||
"nix",
|
||||
"--experimental-features",
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"hash",
|
||||
"to-sri",
|
||||
|
@ -15,7 +15,7 @@ def test_update(helpers: conftest.Helpers) -> None:
|
||||
"nix",
|
||||
"eval",
|
||||
"--raw",
|
||||
"--experimental-features",
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"-f",
|
||||
path,
|
||||
|
@ -15,7 +15,7 @@ def test_update(helpers: conftest.Helpers) -> None:
|
||||
"nix",
|
||||
"eval",
|
||||
"--raw",
|
||||
"--experimental-features",
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"-f",
|
||||
path,
|
||||
|
@ -15,7 +15,7 @@ def test_update(helpers: conftest.Helpers) -> None:
|
||||
"nix",
|
||||
"eval",
|
||||
"--raw",
|
||||
"--experimental-features",
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"-f",
|
||||
path,
|
||||
|
Loading…
Reference in New Issue
Block a user