diff options
Diffstat (limited to 'tvix/glue/src/builtins')
-rw-r--r-- | tvix/glue/src/builtins/fetchers.rs | 42 | ||||
-rw-r--r-- | tvix/glue/src/builtins/mod.rs | 18 |
2 files changed, 57 insertions, 3 deletions
diff --git a/tvix/glue/src/builtins/fetchers.rs b/tvix/glue/src/builtins/fetchers.rs new file mode 100644 index 000000000000..7a5d49a725d1 --- /dev/null +++ b/tvix/glue/src/builtins/fetchers.rs @@ -0,0 +1,42 @@ +//! Contains builtins that fetch paths from the Internet + +use crate::tvix_store_io::TvixStoreIO; +use std::rc::Rc; +use tvix_eval::builtin_macros::builtins; +use tvix_eval::Value; + +#[allow(unused_variables)] // for the `state` arg, for now +#[builtins(state = "Rc<TvixStoreIO>")] +pub(crate) mod fetcher_builtins { + use super::*; + + use tvix_eval::generators::Gen; + use tvix_eval::{generators::GenCo, ErrorKind}; + + #[builtin("fetchurl")] + async fn builtin_fetchurl( + state: Rc<TvixStoreIO>, + co: GenCo, + url: Value, + ) -> Result<Value, ErrorKind> { + Err(ErrorKind::NotImplemented("fetchurl")) + } + + #[builtin("fetchTarball")] + async fn builtin_fetch_tarball( + state: Rc<TvixStoreIO>, + co: GenCo, + args: Value, + ) -> Result<Value, ErrorKind> { + Err(ErrorKind::NotImplemented("fetchTarball")) + } + + #[builtin("fetchGit")] + async fn builtin_fetch_git( + state: Rc<TvixStoreIO>, + co: GenCo, + args: Value, + ) -> Result<Value, ErrorKind> { + Err(ErrorKind::NotImplemented("fetchGit")) + } +} diff --git a/tvix/glue/src/builtins/mod.rs b/tvix/glue/src/builtins/mod.rs index dff6a8947c16..4a59ec9ea6e5 100644 --- a/tvix/glue/src/builtins/mod.rs +++ b/tvix/glue/src/builtins/mod.rs @@ -6,6 +6,7 @@ use crate::tvix_store_io::TvixStoreIO; mod derivation; mod derivation_error; +mod fetchers; pub use derivation_error::Error as DerivationError; @@ -17,20 +18,30 @@ pub use derivation_error::Error as DerivationError; /// `known_paths`. pub fn add_derivation_builtins<IO>(eval: &mut tvix_eval::Evaluation<IO>, io: Rc<TvixStoreIO>) { eval.builtins - .extend(derivation::derivation_builtins::builtins(io)); + .extend(derivation::derivation_builtins::builtins(Rc::clone(&io))); // Add the actual `builtins.derivation` from compiled Nix code eval.src_builtins .push(("derivation", include_str!("derivation.nix"))); } +/// Adds fetcher builtins to the passed [tvix_eval::Evaluation]: +/// +/// * `fetchurl` +/// * `fetchTarball` +/// * `fetchGit` +pub fn add_fetcher_builtins<IO>(eval: &mut tvix_eval::Evaluation<IO>, io: Rc<TvixStoreIO>) { + eval.builtins + .extend(fetchers::fetcher_builtins::builtins(Rc::clone(&io))); +} + #[cfg(test)] mod tests { use std::{rc::Rc, sync::Arc}; use crate::tvix_store_io::TvixStoreIO; - use super::add_derivation_builtins; + use super::{add_derivation_builtins, add_fetcher_builtins}; use nix_compat::store_path::hash_placeholder; use test_case::test_case; use tvix_build::buildservice::DummyBuildService; @@ -57,7 +68,8 @@ mod tests { let mut eval = tvix_eval::Evaluation::new(io.clone() as Rc<dyn EvalIO>, false); - add_derivation_builtins(&mut eval, io); + add_derivation_builtins(&mut eval, Rc::clone(&io)); + add_fetcher_builtins(&mut eval, io); // run the evaluation itself. eval.evaluate(str, None) |