From c8cc31e07939feb707a60d2616de277f9227d6e6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 Nov 2023 16:40:32 +0200 Subject: refactor(tvix/glue): move builtins into separate directory Change-Id: I25b7197458dbfbde8623545dc0a0286eb2744f10 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9911 Autosubmit: flokli Tested-by: BuildkiteCI Reviewed-by: raitobezarius --- tvix/glue/src/lib.rs | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'tvix/glue/src/lib.rs') diff --git a/tvix/glue/src/lib.rs b/tvix/glue/src/lib.rs index 760e730217ee..6b3de0e23555 100644 --- a/tvix/glue/src/lib.rs +++ b/tvix/glue/src/lib.rs @@ -1,32 +1,9 @@ -use std::{cell::RefCell, rc::Rc}; - -use known_paths::KnownPaths; - -pub mod derivation; -pub mod errors; +pub mod builtins; pub mod known_paths; pub mod refscan; pub mod tvix_io; pub mod tvix_store_io; -/// Adds derivation-related builtins to the passed [tvix_eval::Evaluation]. -/// -/// These are `derivation` and `derivationStrict`. -/// -/// 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, - known_paths: Rc>, -) { - eval.builtins - .extend(derivation::derivation_builtins(known_paths)); - - // Add the actual `builtins.derivation` from compiled Nix code - eval.src_builtins - .push(("derivation", include_str!("derivation.nix"))); -} - /// Tell the Evaluator to resolve to the path `/__corepkgs__`, /// which has special handling in [tvix_io::TvixIO]. /// This is used in nixpkgs to import `fetchurl.nix` from ``. -- cgit 1.4.1