From 290a8190189891fc46d7a0b48ed6a2d28b9a4878 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 5 Nov 2022 15:07:02 +0300 Subject: feat(tvix/eval): placeholder builtin implementations Adds initial placeholders for builtins.{derivation, unsafeDiscardStringContext}. Change-Id: I67a126c9b9f9f4f11e2256e69b9a32ebd9eb1b0e Reviewed-on: https://cl.tvl.fyi/c/depot/+/7187 Autosubmit: tazjin Tested-by: BuildkiteCI Reviewed-by: grfn --- .../nix_tests/eval-okay-delayed-with-inherit.exp | 1 + .../nix_tests/eval-okay-delayed-with-inherit.nix | 24 ++++++++++++++++++++++ .../eval-okay-delayed-with-inherit.exp | 1 - .../eval-okay-delayed-with-inherit.nix | 24 ---------------------- 4 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp create mode 100644 tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp delete mode 100644 tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix (limited to 'tvix/eval/src/tests/nix_tests') diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp new file mode 100644 index 000000000000..eaacb55c1aff --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.exp @@ -0,0 +1 @@ +"b-overridden" diff --git a/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix new file mode 100644 index 000000000000..84b388c27130 --- /dev/null +++ b/tvix/eval/src/tests/nix_tests/eval-okay-delayed-with-inherit.nix @@ -0,0 +1,24 @@ +let + pkgs_ = with pkgs; { + a = derivation { + name = "a"; + system = builtins.currentSystem; + builder = "/bin/sh"; + args = [ "-c" "touch $out" ]; + inherit b; + }; + + inherit b; + }; + + packageOverrides = p: { + b = derivation { + name = "b-overridden"; + system = builtins.currentSystem; + builder = "/bin/sh"; + args = [ "-c" "touch $out" ]; + }; + }; + + pkgs = pkgs_ // (packageOverrides pkgs_); +in pkgs.a.b.name diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp deleted file mode 100644 index eaacb55c1aff..000000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.exp +++ /dev/null @@ -1 +0,0 @@ -"b-overridden" diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix deleted file mode 100644 index 84b388c27130..000000000000 --- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-delayed-with-inherit.nix +++ /dev/null @@ -1,24 +0,0 @@ -let - pkgs_ = with pkgs; { - a = derivation { - name = "a"; - system = builtins.currentSystem; - builder = "/bin/sh"; - args = [ "-c" "touch $out" ]; - inherit b; - }; - - inherit b; - }; - - packageOverrides = p: { - b = derivation { - name = "b-overridden"; - system = builtins.currentSystem; - builder = "/bin/sh"; - args = [ "-c" "touch $out" ]; - }; - }; - - pkgs = pkgs_ // (packageOverrides pkgs_); -in pkgs.a.b.name -- cgit 1.4.1