diff options
author | Ryan Lahfa <tvl@lahfa.xyz> | 2023-12-26T01·03+0100 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-01-03T23·23+0000 |
commit | 099ca6b7c0b95d1e7d5134ac465b50bbd86660c5 (patch) | |
tree | 7f582c23f9fbfa2a8d5a1ca4eb02b1bd8651fcbf /tvix/cli | |
parent | 15309c7debfeb94977d1622dc6ed604d32710435 (diff) |
feat(tvix/glue): contextful derivation r/7338
We calculate the input context by performing the union of context over all input of the derivation. Then, we just pass the rest of it to the remaining machinery. Finally, we re-emit an `outPath` and a `drvPath` containing the expected contexts. Change-Id: I74905fb258b5bee8b08d1208c9eb87f51b92a890 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10436 Autosubmit: raitobezarius <tvl@lahfa.xyz> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/cli')
-rw-r--r-- | tvix/cli/src/main.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 8d3f793f52af..17632cad1aab 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -91,15 +91,12 @@ fn interpret(code: &str, path: Option<PathBuf>, args: &Args, explain: bool) -> b let known_paths: Rc<RefCell<KnownPaths>> = Default::default(); add_derivation_builtins(&mut eval, known_paths.clone()); configure_nix_path(&mut eval, &args.nix_search_path); - eval.io_handle = Box::new(tvix_glue::tvix_io::TvixIO::new( - known_paths, - TvixStoreIO::new( - blob_service, - directory_service, - path_info_service.into(), // we need an Arc<_> here. - tokio_runtime.handle().clone(), - ), - )); + eval.io_handle = Box::new(tvix_glue::tvix_io::TvixIO::new(TvixStoreIO::new( + blob_service, + directory_service, + path_info_service.into(), // we need an Arc<_> here. + tokio_runtime.handle().clone(), + ))); let source_map = eval.source_map(); let result = { |