From 6b6bd307721cec7c00ef0f68a6d639755e8c677f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 6 Jan 2023 20:54:46 +0300 Subject: refactor(tvix/eval): move mocked builtins.derivation to tests This placeholder should not live in the main crate anymore as we will be injecting the real one from outside of eval, but there are still language tests that depend on a (simple, mockable) version of it. Change-Id: I68ea169db15cbdbeed320930d3069e21e376c90d Reviewed-on: https://cl.tvl.fyi/c/depot/+/7783 Reviewed-by: flokli Autosubmit: tazjin Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'tvix/eval/src/builtins/mod.rs') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index dcc158d10189..7fd66d5afc75 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -945,7 +945,7 @@ mod pure_builtins { } } -fn builtin_tuple(builtin: Builtin) -> (&'static str, Value) { +pub(crate) fn builtin_tuple(builtin: Builtin) -> (&'static str, Value) { (builtin.name(), Value::Builtin(builtin)) } @@ -1036,39 +1036,6 @@ pub fn placeholders() -> Vec<(&'static str, Value)> { Ok(Value::attrs(NixAttrs::from_iter(res.into_iter()))) }, ), - Builtin::new( - "derivation", - &[BuiltinArgument { - strict: true, - name: "attrs", - }], - None, - |args: Vec, vm: &mut VM| { - vm.emit_warning(WarningKind::NotImplemented("builtins.derivation")); - - // We do not implement derivations yet, so this function sets mock - // values on the fields that a real derivation would contain. - // - // Crucially this means we do not yet *validate* the values either. - let input = args[0].to_attrs()?; - let attrs = input.update(NixAttrs::from_iter( - [ - ( - "outPath", - "/nix/store/00000000000000000000000000000000-mock", - ), - ( - "drvPath", - "/nix/store/00000000000000000000000000000000-mock.drv", - ), - ("type", "derivation"), - ] - .into_iter(), - )); - - Ok(Value::Attrs(Box::new(attrs))) - }, - ), ]; ph.into_iter().map(builtin_tuple).collect() -- cgit 1.4.1