From fb0528c5dada2d3af6152b37a46e505e6bb2ac94 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Thu, 27 Aug 2020 11:58:28 -0400 Subject: fix(tvix): Pass all args when auto-calling a function with an ellipsis The command line options --arg and --argstr that are used by a bunch of CLI commands to pass arguments to top-level functions in files go through the same code-path as auto-calling top-level functions with their default arguments - this, however, was only passing the arguments that were *explicitly* mentioned in the formals of the function - in the case of an as-pattern with an ellipsis (eg args @ { ... }) extra passed arguments would get omitted. This fixes that to instead pass *all* specified auto args in the case that our function has an ellipsis. Submitted upstream at https://github.com/NixOS/nix/pull/3965 Fixes: #46 Change-Id: I32b7ee0e5bacf75b2bc43a3f0796f533f4bd5959 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1863 Reviewed-by: tazjin Tested-by: BuildkiteCI --- third_party/nix/src/nix-build/nix-build.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'third_party/nix/src/nix-build') diff --git a/third_party/nix/src/nix-build/nix-build.cc b/third_party/nix/src/nix-build/nix-build.cc index 67cd8252f07e..30ab2a8136d2 100644 --- a/third_party/nix/src/nix-build/nix-build.cc +++ b/third_party/nix/src/nix-build/nix-build.cc @@ -270,6 +270,7 @@ static void _main(int argc, char** argv) { if (packages) { std::ostringstream joined; + // TODO(grfn): Generate a syntax tree here, not a string joined << "with import { }; (pkgs.runCommandCC or " "pkgs.runCommand) \"shell\" { buildInputs = [ "; for (const auto& i : left) { -- cgit 1.4.1