about summary refs log tree commit diff
path: root/tvix/glue/benches/eval.rs
diff options
context:
space:
mode:
authorAspen Smith <root@gws.fyi>2024-02-19T15·17-0500
committerclbot <clbot@tvl.fyi>2024-02-19T16·51+0000
commit0db46dacea88bc15f06d586bee7acf2f50645f0a (patch)
tree696e6cb26777f9af85f539d5f231c408c940f222 /tvix/glue/benches/eval.rs
parentb1474529480fc9c36dedaca8ba640c11c64ad3ab (diff)
feat(tvix/glue): Init fetcher builtins r/7557
Initialize a new empty builtins module `fetcher_builtins`, which will
contain the builtins which fetch URLs from the internet:

* fetchurl
* fetchGit
* fetchTarball
* fetchTree (maybe? this is experimental)

These builtins are all implemented in CPP nix at:
https://github.com/NixOS/nix/blob/2.20.2/src/libexpr/primops/fetchTree.cc

These builtins are added to the evaluation context using a similar
mechanism to the derivation builtins, and have been added everywhere
derivation builtins were previously being added.

Change-Id: I133b91cc9560f23028621414537f712e7bd8a825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10974
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/glue/benches/eval.rs')
-rw-r--r--tvix/glue/benches/eval.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/tvix/glue/benches/eval.rs b/tvix/glue/benches/eval.rs
index 4e1886c4018e..11435707aca6 100644
--- a/tvix/glue/benches/eval.rs
+++ b/tvix/glue/benches/eval.rs
@@ -8,7 +8,9 @@ use tvix_castore::{
 };
 use tvix_eval::{builtins::impure_builtins, EvalIO};
 use tvix_glue::{
-    builtins::add_derivation_builtins, configure_nix_path, tvix_io::TvixIO,
+    builtins::{add_derivation_builtins, add_fetcher_builtins},
+    configure_nix_path,
+    tvix_io::TvixIO,
     tvix_store_io::TvixStoreIO,
 };
 use tvix_store::pathinfoservice::{MemoryPathInfoService, PathInfoService};
@@ -44,7 +46,8 @@ fn interpret(code: &str) {
     );
 
     eval.builtins.extend(impure_builtins());
-    add_derivation_builtins(&mut eval, tvix_store_io);
+    add_derivation_builtins(&mut eval, Rc::clone(&tvix_store_io));
+    add_fetcher_builtins(&mut eval, tvix_store_io);
     configure_nix_path(
         &mut eval,
         // The benchmark requires TVIX_BENCH_NIX_PATH to be set, so barf out