From 8522474edc073a68a84a58a8ef0cee3dc8c7d60d Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Wed, 2 Apr 2025 17:46:47 -0400 Subject: [PATCH] accept flake config by default --- flupdt/flake_build.py | 2 +- flupdt/flake_eval.py | 2 +- flupdt/flake_show.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flupdt/flake_build.py b/flupdt/flake_build.py index 1a57d55..003af05 100644 --- a/flupdt/flake_build.py +++ b/flupdt/flake_build.py @@ -23,7 +23,7 @@ def build_output(path: str, output: str) -> str | None: """ logger.info(f"build {output}") logger.debug(f"outputting to {OUTPUT_DIR}/{output}.nixoutput") - out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput") + out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput --accept-flake-config") logger.debug("output") logger.debug(out[0]) logger.debug("error") diff --git a/flupdt/flake_eval.py b/flupdt/flake_eval.py index e88d03c..2a5d8c7 100644 --- a/flupdt/flake_eval.py +++ b/flupdt/flake_eval.py @@ -21,7 +21,7 @@ def evaluate_output(path: str, output: str) -> str | None: :raises RuntimeError: evaluation succeeds but no derivation is found """ logger.info(f"evaluating {output}") - out = bash_wrapper(f"nix eval {path}#{output}") + out = bash_wrapper(f"nix eval {path}#{output} --accept-flake-config") logger.debug(out[0]) logger.debug(out[1]) logger.debug(out[2]) diff --git a/flupdt/flake_show.py b/flupdt/flake_show.py index 9704f3c..655b8f9 100644 --- a/flupdt/flake_show.py +++ b/flupdt/flake_show.py @@ -53,7 +53,7 @@ def get_derivations_from_check(nix_path: str, path_to_flake: str) -> list[str]: :param path_to_flake: path to flake to be checked :returns a list of all valid derivations in the flake """ - flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going", path=path_to_flake) + flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going --accept-flake-config", path=path_to_flake) if flake_check[2] != 0: logger.warning( "nix flake check returned non-zero exit code, collecting all available outputs" @@ -83,7 +83,7 @@ def get_derivations(path_to_flake: str) -> list[str]: if nix_path is None: status_msg = "nix is not available in the PATH, please verify that it is installed" raise RuntimeError(status_msg) - flake_show = bash_wrapper(f"{nix_path} flake show --json", path=path_to_flake) + flake_show = bash_wrapper(f"{nix_path} flake show --json --accept-flake-path", path=path_to_flake) if flake_show[2] != 0: logger.error("flake show returned non-zero exit code") logger.warning("falling back to full evaluation via nix flake check")