From 7df4ef983e96f604fa84abe4aeb54dcb00a72add Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 13:12:35 +0200 Subject: Test the delayed with a bit more --- tests/lang/eval-okay-delayed-with.exp | 2 +- tests/lang/eval-okay-delayed-with.nix | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'tests/lang') diff --git a/tests/lang/eval-okay-delayed-with.exp b/tests/lang/eval-okay-delayed-with.exp index eaacb55c1..8e7c61ab8 100644 --- a/tests/lang/eval-okay-delayed-with.exp +++ b/tests/lang/eval-okay-delayed-with.exp @@ -1 +1 @@ -"b-overridden" +"b-overridden b-overridden a" diff --git a/tests/lang/eval-okay-delayed-with.nix b/tests/lang/eval-okay-delayed-with.nix index 82934d6a9..3fb023e1c 100644 --- a/tests/lang/eval-okay-delayed-with.nix +++ b/tests/lang/eval-okay-delayed-with.nix @@ -1,4 +1,5 @@ let + pkgs_ = with pkgs; { a = derivation { name = "a"; @@ -13,14 +14,16 @@ let system = builtins.currentSystem; builder = "/bin/sh"; args = [ "-c" "touch $out" ]; + inherit a; }; c = b; }; - packageOverrides = p: { - b = derivation (p.b.drvAttrs // { name = "b-overridden"; }); + packageOverrides = pkgs: with pkgs; { + b = derivation (b.drvAttrs // { name = "${b.name}-overridden"; }); }; pkgs = pkgs_ // (packageOverrides pkgs_); -in pkgs.a.b.name + +in "${pkgs.a.b.name} ${pkgs.c.name} ${pkgs.b.a.name}" -- cgit v1.2.3