diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-16T12·49+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-16T12·49+0000 |
| commit | fb9368b5a0b2457b28f19d4902bc0790123338a2 (patch) | |
| tree | 8e0d68ccc2951c44cfd442b3dad261e190127013 /tests/lang | |
| parent | 64fd29855a8ae49cacdaff424679821b4fd3bf57 (diff) | |
| parent | 4aced7f8d0d5d2c1057b0f46a70a37a577f81fa5 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'tests/lang')
| -rw-r--r-- | tests/lang/eval-okay-listtoattrs.exp | 2 | ||||
| -rw-r--r-- | tests/lang/eval-okay-listtoattrs.nix | 3 | ||||
| -rw-r--r-- | tests/lang/eval-okay-overrides.exp | 1 | ||||
| -rw-r--r-- | tests/lang/eval-okay-overrides.nix | 9 |
4 files changed, 13 insertions, 2 deletions
diff --git a/tests/lang/eval-okay-listtoattrs.exp b/tests/lang/eval-okay-listtoattrs.exp index 11d29b588ac1..74abef7bc6ed 100644 --- a/tests/lang/eval-okay-listtoattrs.exp +++ b/tests/lang/eval-okay-listtoattrs.exp @@ -1 +1 @@ -"AA" +"AAbar" diff --git a/tests/lang/eval-okay-listtoattrs.nix b/tests/lang/eval-okay-listtoattrs.nix index d5cd726b0c64..4186e029b538 100644 --- a/tests/lang/eval-okay-listtoattrs.nix +++ b/tests/lang/eval-okay-listtoattrs.nix @@ -7,4 +7,5 @@ let 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 concat (map (x: x.a) r.result) + x = builtins.listToAttrs [ (asi "foo" "bar") (asi "foo" "bla") ]; +in concat (map (x: x.a) r.result) + x.foo diff --git a/tests/lang/eval-okay-overrides.exp b/tests/lang/eval-okay-overrides.exp new file mode 100644 index 000000000000..0cfbf08886fc --- /dev/null +++ b/tests/lang/eval-okay-overrides.exp @@ -0,0 +1 @@ +2 diff --git a/tests/lang/eval-okay-overrides.nix b/tests/lang/eval-okay-overrides.nix new file mode 100644 index 000000000000..358742b36e22 --- /dev/null +++ b/tests/lang/eval-okay-overrides.nix @@ -0,0 +1,9 @@ +let + + overrides = { a = 2; }; + +in (rec { + __overrides = overrides; + x = a; + a = 1; +}).x |