From 0db46dacea88bc15f06d586bee7acf2f50645f0a Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Mon, 19 Feb 2024 10:17:13 -0500 Subject: feat(tvix/glue): Init fetcher builtins 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 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/cli/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tvix/cli/src/main.rs') diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 24b180c1f289..65f5d5363c1d 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -9,6 +9,7 @@ use tvix_build::buildservice; use tvix_eval::builtins::impure_builtins; use tvix_eval::observer::{DisassemblingObserver, TracingObserver}; use tvix_eval::{EvalIO, Value}; +use tvix_glue::builtins::add_fetcher_builtins; use tvix_glue::tvix_io::TvixIO; use tvix_glue::tvix_store_io::TvixStoreIO; use tvix_glue::{builtins::add_derivation_builtins, configure_nix_path}; @@ -128,7 +129,8 @@ fn interpret(code: &str, path: Option, args: &Args, explain: bool) -> b ); eval.strict = args.strict; 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, &args.nix_search_path); let source_map = eval.source_map(); -- cgit 1.4.1