From e6782bb7c4ffad9d0ecf0bca5acb16f2b7698594 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 1 Jan 2024 17:07:42 +0200 Subject: feat(tvix/build/protos): add additional_files field Nix builds also have some other inputs, outside of inputs_dir, used in derivations setting `passAsFile` and `__structuredAttrs`. This extends our `BuildRequest` structure to accomodate these usecases. Change-Id: I8de6516eb467fa48a4961d88933ebd548f131049 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10519 Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: flokli --- tvix/glue/src/tvix_build.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tvix/glue/src') diff --git a/tvix/glue/src/tvix_build.rs b/tvix/glue/src/tvix_build.rs index b647c7d40545..85a9ba40ac16 100644 --- a/tvix/glue/src/tvix_build.rs +++ b/tvix/glue/src/tvix_build.rs @@ -151,6 +151,8 @@ where constraints, working_dir: "build".into(), scratch_paths: vec!["build".into(), "nix/store".into()], + // TODO: handle passAsFile, structuredAttrs. + additional_files: vec![], } } @@ -250,6 +252,7 @@ mod test { available_ro_paths: vec![], provide_bin_sh: true, }), + additional_files: vec![], working_dir: "build".into(), scratch_paths: vec!["build".into(), "nix/store".into()], }, @@ -318,6 +321,7 @@ mod test { available_ro_paths: vec![], provide_bin_sh: true, }), + additional_files: vec![], working_dir: "build".into(), scratch_paths: vec!["build".into(), "nix/store".into()], }, -- cgit 1.4.1