about summary refs log tree commit diff
path: root/corp
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2022-10-10T03·46-0400
committergrfn <grfn@gws.fyi>2022-10-10T20·23+0000
commit273ba73754e9b10f768830d5a6835bf3d14e0d8a (patch)
treeb0727d0a5bb1ca804acbcc4e035ba885efd929a2 /corp
parent5e2b44b4161dba88dfd34f3cd649f592c304ae5b (diff)
feat(tvix/eval): Initial resolution of `<...>` paths r/5087
This commit implements (lazy) resolution of `<...>` paths via either the
NIX_PATH environment variable, or the -I command-line flag - both
handled via EvalOptions. As a result, EvalOptions can no longer derive
Copy, meaning we have to clone it at each line of the repl - this is
probably not a huge deal as repl performance is not exactly an inner
loop and we're not cloning very much.

Internally, this works by creating a thunk which pushes a constant
containing the string inside the brackets to the stack, then a new
opcode to resolve that path via the `NixPath`. To get that opcode to
work, we now have to pass in the NixPath when constructing the VM.

This (intentionally) leaves out proper implementation of path resolution
via `findFile` (cppnix just calls whatever identifier called findFile is
in scope!!!) as that's widely considered a bit of a misfeature, but if
we do decide to implement that down the road it likely wouldn't be more
than a few extra ops within the thunk introduced here.

Change-Id: Ibc979b7e425b65cbe88599940520239a4a10cee2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6918
Autosubmit: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'corp')
-rw-r--r--corp/tvixbolt/src/main.rs12
1 files changed, 10 insertions, 2 deletions
diff --git a/corp/tvixbolt/src/main.rs b/corp/tvixbolt/src/main.rs
index 8099a5238d..e6dda736f4 100644
--- a/corp/tvixbolt/src/main.rs
+++ b/corp/tvixbolt/src/main.rs
@@ -286,9 +286,17 @@ fn eval(trace: bool, code: &str) -> Output {
     }
 
     let result = if trace {
-        tvix_eval::run_lambda(&mut TracingObserver::new(&mut out.trace), result.lambda)
+        tvix_eval::run_lambda(
+            Default::default(),
+            &mut TracingObserver::new(&mut out.trace),
+            result.lambda,
+        )
     } else {
-        tvix_eval::run_lambda(&mut NoOpObserver::default(), result.lambda)
+        tvix_eval::run_lambda(
+            Default::default(),
+            &mut NoOpObserver::default(),
+            result.lambda,
+        )
     };
 
     match result {