From 54014d8c047d5e14f35ed1114b0db90c10aee6c1 Mon Sep 17 00:00:00 2001 From: Luis Saavedra Date: Mon, 28 Apr 2025 16:18:05 -0500 Subject: [PATCH] feat(back): #1432 support experimental-features - Support experimental-features on makes Signed-off-by: Luis Saavedra --- .gitignore | 1 + .mailmap | 2 ++ src/cli/main/cli.py | 9 ++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 56af692d..1d681843 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ __pycache__ .vscode node_modules +result \ No newline at end of file diff --git a/.mailmap b/.mailmap index 3592608c..624e28f7 100644 --- a/.mailmap +++ b/.mailmap @@ -31,8 +31,10 @@ Julian Gomez <60365681+jgomezb11@users.noreply.github.com> Julian Gomez <6036568 Julian Gomez Julian Gomez Karen Camargo Karen Camargo Kevin Amado Kevin Amado +Luis Saavedra <40694133+ludsrill@users.noreply.github.com> Luis Saavedra <40694133+ludsrill@users.noreply.github.com> Luis Saavedra Luis David Saavedra <40694133+ludsrill@users.noreply.github.com> Luis Saavedra Luis Saavedra +Luis Saavedra Luis Saavedra Robin Hafid Robin Hafid Robin Quintero Robin Quintero Sebastian Cardona Sebastian Cardona <132764573+sebas031811@users.noreply.github.com> diff --git a/src/cli/main/cli.py b/src/cli/main/cli.py index c59b8c2e..3c698d7e 100644 --- a/src/cli/main/cli.py +++ b/src/cli/main/cli.py @@ -277,6 +277,7 @@ def _nix_build( *["--argstr", "projectSrc", head], *["--argstr", "attrPaths", attr_paths], *["--attr", attr], + *["--option", "experimental-features", "flakes nix-command"], *["--option", "cores", "0"], *["--option", "narinfo-cache-negative-ttl", "1"], *["--option", "narinfo-cache-positive-ttl", "1"], @@ -294,6 +295,7 @@ def _nix_hashes(paths: bytes) -> List[str]: cmd = [ "xargs", f"{__NIX__}/bin/nix-store", + "--option", "experimental-features", "flakes nix-command", "--query", "--hash", ] @@ -306,13 +308,18 @@ def _nix_hashes(paths: bytes) -> List[str]: def _nix_build_requisites(path: str) -> List[Tuple[str, str]]: """Answer the question: what do I need to build `out`.""" - cmd = [f"{__NIX__}/bin/nix-store", "--query", "--deriver", path] + cmd = [f"{__NIX__}/bin/nix-store", + "--option", "experimental-features", "flakes nix-command", + "--query", + "--deriver", + path] out, stdout, _ = _run_outputs(cmd, stderr=None) if out != 0: raise SystemExit(out) cmd = [ f"{__NIX__}/bin/nix-store", + "--option", "experimental-features", "flakes nix-command", "--query", "--requisites", "--include-outputs",