Commit graph

1292 commits

Author SHA1 Message Date
Matthew Bauer 10fe907c50 Add builtins.mapAttrs
Fixes #341
2018-08-09 18:23:13 -04:00
Matthew Bauer ecc8d716ef Fix function equals test
I still don’t understand what Nix is doing behind the scenes here.
This is the original test case. Apparently it only happens with let
bindings?

Fixes #340
2018-08-09 16:21:02 -04:00
Matthew Bauer d538a96723 Fix missing parenthesis in pretty printing selector
Fixes #327

Another case of missing parenthesis. From the issue:

> prettyNix $ ("x" @@ "y") @. "z"
  x y.z

When it should be:
  (x y).z

Adding non-associative wrapParens seems to fix it. Not sure if this is
the best way but trying a few things & running the test suite still
seem to work.
2018-08-08 17:17:19 -04:00
John Wiegley 266793a287
Improve an error message 2018-08-07 14:06:50 -04:00
John Wiegley 3c979091b8
Merge pull request #346 from domenkozar/disable-profiling
default.nix: skip profiling to speed up builds
2018-08-06 17:59:05 -04:00
Domen Kožar 18d5753403
default.nix: skip profiling to speed up builds 2018-08-06 22:35:17 +01:00
John Wiegley 456e0811bc
Merge remote-tracking branch 'origin/master' into pending 2018-08-06 16:15:14 -04:00
John Wiegley 6738e06d81
Merge pull request #344 from domenkozar/addErrorContext
Implement addErrorContext as id
2018-08-06 16:10:19 -04:00
Domen Kožar 6033a49e6d
Implement addErrorContext as id 2018-08-06 21:09:30 +01:00
John Wiegley a556443aea
Merge pull request #345 from domenkozar/travis
travis: download cachix with smaller closure, pin nixpkgs
2018-08-06 16:07:52 -04:00
Domen Kožar 683296954e
allow failures on ghc802 for now 2018-08-06 19:03:18 +01:00
Domen Kožar ca5f0d5d13
travis: fix syntax 2018-08-06 19:01:52 +01:00
Domen Kožar 4e72e2b356
build.sh: allow passing extra flags like -K or -j1 2018-08-06 19:01:50 +01:00
Domen Kožar 6608dc25b3
travis: don't error out when signing key is not exposed 2018-08-06 19:01:19 +01:00
Domen Kožar 1a8baf46c9
download cachix with smaller closure, pin nixpkgs 2018-08-06 19:00:58 +01:00
John Wiegley fff590f74a
Add Cachix signing key for Travis 2018-08-05 16:12:11 -04:00
John Wiegley b0541ebd24
Some minor refactoring 2018-08-05 16:12:04 -04:00
John Wiegley 023dbe55ea
Change tracing output from normalFormBy 2018-08-05 15:51:59 -04:00
John Wiegley f262046f34
Change coerceToString to also take a coerceMore argument 2018-08-05 15:51:42 -04:00
John Wiegley 49584cbae5
Reformat a function body 2018-08-05 15:49:16 -04:00
John Wiegley 2e04e5a7b2
Change rendering of NormalLoop errors 2018-08-05 15:48:52 -04:00
John Wiegley e8a7368a92
Some whitespace changes 2018-08-05 15:48:44 -04:00
John Wiegley c3e3e27ee3
Merge remote-tracking branch 'origin/master' into pending 2018-08-05 12:20:24 -04:00
John Wiegley 1af979e836
true and false shouldn't be in the reservedNames list
Fixes #343
2018-08-05 12:20:00 -04:00
John Wiegley 03efacd538
Add a commented out test for #343 2018-08-05 12:15:06 -04:00
John Wiegley 80b1d5437a
Merge pull request #342 from orblivion/orblivion-add-overrides-tests
Adding tests for __overrides
2018-08-05 12:05:22 -04:00
John Wiegley 8e664631e2
If an exception occurs when forcing a thunk, cleanup the "active" bit 2018-08-05 12:00:43 -04:00
John Wiegley edaf59b56a
Add a bogus MonadCatch instance for (Lint s) 2018-08-05 12:00:33 -04:00
Daniel Krol d7544f5c0d Adding tests for __overrides
* `__overrides` key isn't sticking around in the resultant attribute sets
* `inherit __overrides` blows up altogether (whereas it doesn't in nix)
2018-08-05 11:53:33 -04:00
John Wiegley 842634971e
Comment out two eval tests, to be addressed by issue #340 2018-08-05 10:53:32 -04:00
John Wiegley 7cc206a278
ALL_TESTS should also imply MATCHING_TESTS 2018-08-05 10:48:47 -04:00
John Wiegley bf8d9c177e
Add a rec set test when using pathed names 2018-08-05 10:42:55 -04:00
John Wiegley bef6db5beb
Minor reformatting 2018-08-05 10:40:28 -04:00
John Wiegley 719ddc44cc
Merge pull request #339 from orblivion/orblivion-fix-uncurry
Fix previous attempted cosmetic refactor which broke eval-okay-overrides test
2018-08-05 10:34:13 -04:00
Daniel Krol 13f548c7af Fix previous attempted cosmetic refactor which broke eval-okay-overrides test 2018-08-05 10:25:22 -04:00
John Wiegley a2771e6f23
Merge remote-tracking branch 'origin/master' into pending 2018-08-05 09:54:08 -04:00
John Wiegley 6830d88523
Fix the way that rec { foo.bar = bar; } is desugared
Fixes #338
2018-08-05 09:53:20 -04:00
John Wiegley 7b2f66e59e
Improve the Expectation error 2018-08-04 19:05:01 -04:00
John Wiegley f05e1fb404
Merge pull request #337 from orblivion/orblivion-cleanup-lambda
Change a lambda to an `uncurry`
2018-08-04 18:36:11 -04:00
Daniel Krol e8d75e4ab6 Change a lambda to an uncurry 2018-08-04 17:47:55 -04:00
John Wiegley be8da6aa3c
Ensure that the nixpkgs tarball actually gets downloaded 2018-08-04 17:39:55 -04:00
John Wiegley 582a2b0a76
Make 'builtins' available in the repl 2018-08-04 17:34:50 -04:00
John Wiegley c54bf53df6
Disable mono-traversable tests 2018-08-04 17:23:03 -04:00
John Wiegley 8bfec34901
Resolve a compiler warning 2018-08-04 16:40:17 -04:00
John Wiegley 50740972de
'import' should never carry over the lexical scope of its parent file
Fixes #334
2018-08-04 15:08:36 -04:00
John Wiegley 705d7c474d
Add --scopes option to print out scoping information 2018-08-04 14:40:04 -04:00
John Wiegley 36864cdbb4
Fix to .travis.yml 2018-08-04 13:33:38 -04:00
John Wiegley c6718e374f
Merge remote-tracking branch 'origin/master' into pending 2018-08-04 10:54:57 -04:00
John Wiegley 743b05bcb8
Attempt to enable Cachix 2018-08-03 21:24:21 -04:00
John Wiegley 8f9c79eca3
Merge pull request #333 from pikajude/pathexists-fix
Catch InappropriateType error in pathExists
2018-08-02 11:22:51 -04:00