From f061086a93400c34f19eb54f0b34637af9f0d9cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Mar 2010 13:35:29 +0000 Subject: [PATCH] * Fix the broken test for listToAttrs. --- tests/lang/eval-okay-listtoattrs.exp | 1 + ...{eval-okay-listToAttrs.nix => eval-okay-listtoattrs.nix} | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 tests/lang/eval-okay-listtoattrs.exp rename tests/lang/{eval-okay-listToAttrs.nix => eval-okay-listtoattrs.nix} (75%) diff --git a/tests/lang/eval-okay-listtoattrs.exp b/tests/lang/eval-okay-listtoattrs.exp new file mode 100644 index 0000000000..49adcc16f6 --- /dev/null +++ b/tests/lang/eval-okay-listtoattrs.exp @@ -0,0 +1 @@ +Str("AA",[]) diff --git a/tests/lang/eval-okay-listToAttrs.nix b/tests/lang/eval-okay-listtoattrs.nix similarity index 75% rename from tests/lang/eval-okay-listToAttrs.nix rename to tests/lang/eval-okay-listtoattrs.nix index f5eae92ccd..d5cd726b0c 100644 --- a/tests/lang/eval-okay-listToAttrs.nix +++ b/tests/lang/eval-okay-listtoattrs.nix @@ -1,8 +1,10 @@ # this test shows how to use listToAttrs and that evaluation is still lazy (throw isn't called) +with import ./lib.nix; + let - asi = attr: value : { inherit attr value; }; + asi = name: value : { inherit name value; }; list = [ ( asi "a" "A" ) ( asi "b" "B" ) ]; a = builtins.listToAttrs list; b = builtins.listToAttrs ( list ++ list ); r = builtins.listToAttrs [ (asi "result" [ a b ]) ( asi "throw" (throw "this should not be thrown")) ]; -in r.result +in concat (map (x: x.a) r.result)