Compare commits

..

No commits in common. "1b564b20548de0e3ff48474493719e6f8cc94049" and "faeb54c390313af76e3b3b52e86cbef90996ba75" have entirely different histories.

5 changed files with 8 additions and 9 deletions

6
flake.lock generated
View File

@ -57,11 +57,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744348691, "lastModified": 1744174375,
"narHash": "sha256-dIPrBepej1ebT1IaWEFLI5mpQO65+oM+SArkrNI9gjo=", "narHash": "sha256-oxI9TLgnQbQ/WL0tIwVSIooLbXq4PW1QUhf5aQmXFgk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6b93024f590b15b1f3888fcc6e56a0866e0c26c2", "rev": "ef3a956f697525883b77192cbe208233ea0f8f79",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -4,7 +4,7 @@
nixConfig = { nixConfig = {
substituters = [ substituters = [
"https://cache.nixos.org/?priority=1&want-mass-query=true" "https://cache.nixos.org/?priority=1&want-mass-query=true"
#"https://attic.nayeonie.com/nix-cache" "https://attic.nayeonie.com/nix-cache"
"https://nix-community.cachix.org/?priority=10&want-mass-query=true" "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
]; ];
trusted-substituters = [ trusted-substituters = [
@ -17,7 +17,6 @@
"nix-cache:trR+y5nwpQHR4hystoogubFmp97cewkjWeqqbygRQRs=" "nix-cache:trR+y5nwpQHR4hystoogubFmp97cewkjWeqqbygRQRs="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
fallback = true;
}; };
inputs = { inputs = {

View File

@ -23,7 +23,7 @@ def build_output(path: str, output: str) -> str | None:
""" """
logger.info(f"build {output}") logger.info(f"build {output}")
logger.debug(f"outputting to {OUTPUT_DIR}/{output}.nixoutput") logger.debug(f"outputting to {OUTPUT_DIR}/{output}.nixoutput")
out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput --accept-flake-config") out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput")
logger.debug("output") logger.debug("output")
logger.debug(out[0]) logger.debug(out[0])
logger.debug("error") logger.debug("error")

View File

@ -21,7 +21,7 @@ def evaluate_output(path: str, output: str) -> str | None:
:raises RuntimeError: evaluation succeeds but no derivation is found :raises RuntimeError: evaluation succeeds but no derivation is found
""" """
logger.info(f"evaluating {output}") logger.info(f"evaluating {output}")
out = bash_wrapper(f"nix eval {path}#{output} --accept-flake-config") out = bash_wrapper(f"nix eval {path}#{output}")
logger.debug(out[0]) logger.debug(out[0])
logger.debug(out[1]) logger.debug(out[1])
logger.debug(out[2]) logger.debug(out[2])

View File

@ -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 :param path_to_flake: path to flake to be checked
:returns a list of all valid derivations in the flake :returns a list of all valid derivations in the flake
""" """
flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going --accept-flake-config", path=path_to_flake) flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going", path=path_to_flake)
if flake_check[2] != 0: if flake_check[2] != 0:
logger.warning( logger.warning(
"nix flake check returned non-zero exit code, collecting all available outputs" "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: if nix_path is None:
status_msg = "nix is not available in the PATH, please verify that it is installed" status_msg = "nix is not available in the PATH, please verify that it is installed"
raise RuntimeError(status_msg) raise RuntimeError(status_msg)
flake_show = bash_wrapper(f"{nix_path} flake show --json --accept-flake-path", path=path_to_flake) flake_show = bash_wrapper(f"{nix_path} flake show --json", path=path_to_flake)
if flake_show[2] != 0: if flake_show[2] != 0:
logger.error("flake show returned non-zero exit code") logger.error("flake show returned non-zero exit code")
logger.warning("falling back to full evaluation via nix flake check") logger.warning("falling back to full evaluation via nix flake check")