about summary refs log tree commit diff
path: root/tvix/glue/src
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-01-01T15·07+0200
committerclbot <clbot@tvl.fyi>2024-01-03T13·18+0000
commite6782bb7c4ffad9d0ecf0bca5acb16f2b7698594 (patch)
treed9c8e9e4f0e1c6de081c841dd86f2413cb23ce2b /tvix/glue/src
parent6b136dfd23c03cc61d189ad5d41dd881e45b677e (diff)
feat(tvix/build/protos): add additional_files field r/7312
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 <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/glue/src')
-rw-r--r--tvix/glue/src/tvix_build.rs4
1 files changed, 4 insertions, 0 deletions
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()],
             },