diff options
| author | Florian Klink <flokli@flokli.de> | 2024-01-16T12·19+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2024-01-18T09·09+0000 |
| commit | e0a867cabff021348cc283b25467cfd40b8eb15a (patch) | |
| tree | 9b4f1fd63460ba8385b38259481a7bb32363801b /tvix/glue/src | |
| parent | 44d24852c3c62320cb2a4c9b9627e744c518f207 (diff) | |
refactor(tvix/eval): generalize EvalIO container r/7407
Don't restrict to a Box<dyn EvalIO>. There's still one or two places where we do restrict, this will be solved by b/262. Change-Id: Ic8d927d6ea81fa12d90b1e4352f35ffaafbd1adf Reviewed-on: https://cl.tvl.fyi/c/depot/+/10639 Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/glue/src')
| -rw-r--r-- | tvix/glue/src/builtins/mod.rs | 4 | ||||
| -rw-r--r-- | tvix/glue/src/lib.rs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tvix/glue/src/builtins/mod.rs b/tvix/glue/src/builtins/mod.rs index 3656bb9d16..22166055d0 100644 --- a/tvix/glue/src/builtins/mod.rs +++ b/tvix/glue/src/builtins/mod.rs @@ -14,8 +14,8 @@ pub use derivation_error::Error as DerivationError; /// /// As they need to interact with `known_paths`, we also need to pass in /// `known_paths`. -pub fn add_derivation_builtins( - eval: &mut tvix_eval::Evaluation, +pub fn add_derivation_builtins<IO>( + eval: &mut tvix_eval::Evaluation<IO>, known_paths: Rc<RefCell<KnownPaths>>, ) { eval.builtins diff --git a/tvix/glue/src/lib.rs b/tvix/glue/src/lib.rs index 31bcbede37..b2f586ce52 100644 --- a/tvix/glue/src/lib.rs +++ b/tvix/glue/src/lib.rs @@ -11,7 +11,10 @@ mod tests; /// Tell the Evaluator to resolve `<nix>` to the path `/__corepkgs__`, /// which has special handling in [tvix_io::TvixIO]. /// This is used in nixpkgs to import `fetchurl.nix` from `<nix>`. -pub fn configure_nix_path(eval: &mut tvix_eval::Evaluation, nix_search_path: &Option<String>) { +pub fn configure_nix_path<IO>( + eval: &mut tvix_eval::Evaluation<IO>, + nix_search_path: &Option<String>, +) { eval.nix_path = nix_search_path .as_ref() .map(|p| format!("nix=/__corepkgs__:{}", p)) |