maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/build/protos): add additional_files field

Browse source 
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>
This commit is contained in:
Florian Klink 2024-01-01 17:07:42 +02:00 • committed by clbot
parent 6b136dfd23
commit e6782bb7c4
3 changed files with 142 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/glue/src/tvix_build.rs
View file

@ -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()],
},