Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Nix
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7a61c88d

Commit 7a61c88d authored 11 years ago by Eelco Dolstra

Downloads
- Plain Diff

Merge branch 'dynamic-attrs-no-sugar' of github.com:shlevy/nix

parents 485f4740 cd49fe4f

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/libexpr/eval.cc 51 additions, 4 deletions

src/libexpr/eval.cc
src/libexpr/nixexpr.cc 35 additions, 4 deletions

src/libexpr/nixexpr.cc
src/libexpr/nixexpr.hh 26 additions, 2 deletions

src/libexpr/nixexpr.hh
src/libexpr/parser.y 113 additions, 53 deletions

src/libexpr/parser.y
tests/lang/eval-okay-dynamic-attrs-2.exp 1 addition, 0 deletions

tests/lang/eval-okay-dynamic-attrs-2.exp
tests/lang/eval-okay-dynamic-attrs-2.nix 1 addition, 0 deletions

tests/lang/eval-okay-dynamic-attrs-2.nix
tests/lang/eval-okay-dynamic-attrs.exp 1 addition, 0 deletions

tests/lang/eval-okay-dynamic-attrs.exp
tests/lang/eval-okay-dynamic-attrs.nix 17 additions, 0 deletions

tests/lang/eval-okay-dynamic-attrs.nix
tests/lang/eval-okay-redefine-builtin.exp 1 addition, 0 deletions

tests/lang/eval-okay-redefine-builtin.exp
tests/lang/eval-okay-redefine-builtin.nix 3 additions, 0 deletions

tests/lang/eval-okay-redefine-builtin.nix

with 249 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment