Commit graph

1594 commits

Author SHA1 Message Date
John Wiegley 505591515f
More work on Value.hs 2019-03-12 23:44:42 -07:00
John Wiegley 28a1410013
Split off NCited into its own file 2019-03-12 07:21:24 -07:00
John Wiegley 3cb9834792
Begin abstracting the thunk/value data representation 2019-03-11 22:41:56 -07:00
John Wiegley 107f29d3fd
Move certain constraints from MonadThunk to the BasicThunk instance 2019-03-11 13:55:40 -07:00
John Wiegley 2e2ee3589c
Mix-in provenance information as a functoral layer, rather than directly
This changes nothing about how the code is structured just yet, but paves the
way for fully generalizing this up to the point where the thunk/value
representation is chosen. By making information like this functoral, we allow
full re-use of the NThunk/NValue machinery.
2019-03-11 08:44:22 -07:00
John Wiegley 39fd51c1a8 Split Nix.Thunk into Nix.Var, Nix.Thunk and Nix.Thunk.Basic
This is in preparation for further generalization of the thunk/value scheme
used by the execution code.
2019-03-11 08:42:46 -07:00
John Wiegley bda79c984b
Merge branch 'master' into vs-context-primops 2019-03-11 08:41:42 -07:00
John Wiegley f397b80a9c Factor out citation information to its own data structure 2019-03-10 16:07:13 -07:00
John Wiegley dc12cdf92e
Add a test to ensure that we report infinite recursion 2019-03-10 14:19:15 -07:00
Emmanuel Denloye-Ito af9f69d517 fromJSON tests are now working. Yeah! 2019-03-10 14:14:14 -07:00
Emmanuel Denloye-Ito 5e0617a952 spelling error 2019-03-10 14:14:14 -07:00
Emmanuel Denloye-Ito 7a9b70f139 Found failing case: "stringed" numbers as key 2019-03-10 14:14:14 -07:00
John Wiegley 5884b3ab11
Correct to source position rendering 2019-03-10 14:12:40 -07:00
John Wiegley 41d44b018c Guard against infinitely recursive function calls
Fixes #432
2019-03-10 14:11:03 -07:00
John Wiegley 7bb233cb2b
Merge branch 'master' into vs-context-primops 2019-03-10 13:54:43 -07:00
Ken Micklas 468dc493bd Ignore hash in appendContext test 2019-03-10 16:44:09 -04:00
Ken Micklas 765b2f9cfc Return string instead of context in appendContext 2019-03-10 16:41:00 -04:00
Ken Micklas 9ce7d7ebe2 Add fromNixLikeContext 2019-03-10 16:40:51 -04:00
Ken Micklas 45400aae58 Allow missing keys in appendContext 2019-03-10 16:21:31 -04:00
Ken Micklas a25c01b218 Fix path name in appendContext test 2019-03-10 16:21:21 -04:00
Ken Micklas 616cb998c6 Ignore output hash in getContext test 2019-03-10 16:02:15 -04:00
Ken Micklas 37758c6190 Omit empty keys for NixLikeContextValues 2019-03-10 15:59:41 -04:00
Ken Micklas 37152002b0 Implement appendContext 2019-03-10 15:45:53 -04:00
hsloan f2033c0694 change test directory 2019-03-10 11:38:41 -07:00
hsloan e384945867 add eval-compare test 2019-03-10 11:38:41 -07:00
Emmanuel Denloye-Ito c51d966d44 Add tests for mapAttrs and changed hackyMakeNixStringWithoutContext to principledMakeNixStringWithoutContext in Builtins.hs 2019-03-10 11:17:36 -07:00
Emmanuel Denloye-Ito 586f1de62d Less than test (#461)
References issue #438 

Co-authored-by: John Wiegley <johnw@newartisans.com>
2019-03-10 11:16:36 -07:00
John Wiegley 602b71c173 Render source line locations more attractively 2019-03-10 11:15:28 -07:00
Doug Beardsley 34c9d63990 Bump hnix-store version 2019-03-10 11:14:38 -07:00
John Ericson d25d6cf698 Fix release.nix 2019-03-10 11:13:32 -07:00
John Wiegley 7f572057a5
Remove the caching build from the Travis build matrix 2019-03-10 11:10:37 -07:00
Ken Micklas 22048ccc89 Clean up syntax in getContext 2019-03-10 14:09:29 -04:00
Ken Micklas 345f2d817f Add trailing newlines to context primop tests 2019-03-10 13:54:24 -04:00
Ken Micklas 718c94e0bb Merge branch 'master' into vs-context-primops 2019-03-10 13:48:58 -04:00
John Wiegley 106fd7957f
Update to the latest hnix conventions 2019-03-10 10:41:31 -07:00
Madeline Haraj 28ab983408
Add syntactic holes 2019-03-10 10:23:28 -07:00
Emily Pillmore f3970d49b9
Add principled 'fetchurl' + tests
Tests are masked until store work is done
2019-03-10 10:07:03 -07:00
Doug Beardsley 2f27ea81c8 Make nix dep match the submodule version 2019-03-10 10:03:39 -07:00
Doug Beardsley 048638f6a1 Add tests for getContext and appendContext 2019-03-10 12:59:00 -04:00
John Ericson 5ddb79009d Depend on hnix-store-core and use it for printHash32 2019-03-10 08:59:05 -07:00
John Ericson 5f1605bcbf Pull in hnix-store and its overlays 2019-03-10 08:59:05 -07:00
John Wiegley eae6bf542f Split MonadFreshId off into its own file 2019-03-10 08:58:27 -07:00
John Ericson 50b1046536 Expose a haskell package set, don't use inNixStore for shell 2019-03-10 08:50:04 -07:00
John Wiegley 977d0de913
Add cabal.project* to gitignore 2019-03-10 08:37:36 -07:00
John Wiegley 23aae87db7
Merge pull request #463 from kmicklas/remove-hspec-discover
Remove unused dependency on hspec-discover
2019-03-10 08:35:13 -07:00
John Wiegley 1b4572160c
Merge pull request #462 from kmicklas/km-fix-structure-eq
Use fresh name supply to implement pointer equality for thunks
2019-03-10 08:28:10 -07:00
Ken Micklas 81f702f98d Remove unused dependency on hspec-discover 2019-03-09 22:33:32 -05:00
Ken Micklas 75fb76a7c0 Revert "Add all the effects instances for FreshIdT"
This reverts commit 46db352af8.
2019-03-09 22:03:30 -05:00
Ken Micklas 4d45ef67ff Fix typo in test name 2019-03-09 22:02:28 -05:00
Ken Micklas 3875f2a075 Fix typo in test 2019-03-09 22:01:45 -05:00