diff options
author | Vincent Ambo <mail@tazj.in> | 2022-11-05T12·07+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-11-06T08·10+0000 |
commit | 290a8190189891fc46d7a0b48ed6a2d28b9a4878 (patch) | |
tree | 2ec10aa361906b41a8cfbc6229c34b1e93613f2a /tvix/eval/src | |
parent | c877e1d920f3dce5598fd50f68c05b5e876dea5f (diff) |
feat(tvix/eval): placeholder builtin implementations r/5255
Adds initial placeholders for builtins.{derivation, unsafeDiscardStringContext}. Change-Id: I67a126c9b9f9f4f11e2256e69b9a32ebd9eb1b0e Reviewed-on: https://cl.tvl.fyi/c/depot/+/7187 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'tvix/eval/src')
-rw-r--r-- | tvix/eval/src/builtins/mod.rs | 52 | ||||
-rw-r--r-- | tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp (renamed from tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp) | 0 | ||||
-rw-r--r-- | tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix (renamed from tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix) | 0 |
3 files changed, 43 insertions, 9 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index a6fcb8742c56..045487cbf676 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -19,7 +19,7 @@ use crate::{ vm::VM, }; -use crate::arithmetic_op; +use crate::{arithmetic_op, unwrap_or_clone_rc}; use self::versions::{VersionPart, VersionPartsIter}; @@ -829,14 +829,48 @@ fn pure_builtins() -> Vec<Builtin> { /// /// These are used as a crutch to make progress on nixpkgs evaluation. fn placeholders() -> Vec<Builtin> { - vec![Builtin::new( - "addErrorContext", - &[false, false], - |mut args: Vec<Value>, vm: &mut VM| { - vm.emit_warning(WarningKind::NotImplemented("builtins.addErrorContext")); - Ok(args.pop().unwrap()) - }, - )] + vec![ + Builtin::new( + "addErrorContext", + &[false, false], + |mut args: Vec<Value>, vm: &mut VM| { + vm.emit_warning(WarningKind::NotImplemented("builtins.addErrorContext")); + Ok(args.pop().unwrap()) + }, + ), + Builtin::new( + "unsafeDiscardStringContext", + &[true], + |mut args: Vec<Value>, vm: &mut VM| { + vm.emit_warning(WarningKind::NotImplemented( + "builtins.unsafeDiscardStringContext", + )); + Ok(args.pop().unwrap()) + }, + ), + Builtin::new("derivation", &[true], |args: Vec<Value>, 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 attrs = unwrap_or_clone_rc(args[0].to_attrs()?); + let attrs = attrs.update(NixAttrs::from_map(BTreeMap::from([ + ( + "outPath".into(), + "/nix/store/00000000000000000000000000000000-mock".into(), + ), + ( + "drvPath".into(), + "/nix/store/00000000000000000000000000000000-mock.drv".into(), + ), + ("type".into(), "derivation".into()), + ]))); + + Ok(Value::Attrs(Rc::new(attrs))) + }), + ] } // we set TVIX_CURRENT_SYSTEM in build.rs pub const CURRENT_PLATFORM: &str = env!("TVIX_CURRENT_SYSTEM"); diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp index eaacb55c1aff..eaacb55c1aff 100644 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp +++ b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix index 84b388c27130..84b388c27130 100644 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix +++ b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix |