Commit graph

871 commits

Author SHA1 Message Date
John Wiegley 214f85ba70 Restore version of the file where hnix and nix-instantiate disagree 2018-04-25 17:32:44 -07:00
John Wiegley d0e06ce8ad Bring loop.nix down to 26 lines 2018-04-25 17:19:46 -07:00
John Wiegley 038cc22313 Reduce tests/files/loop.nix to 143 lines 2018-04-25 15:47:14 -07:00
John Wiegley 29d2ae4378 Shrink tests/files/loop.nix down to 219 lines 2018-04-25 15:32:53 -07:00
John Wiegley bb361afa3c Add an improvement to the reduction code for later 2018-04-25 14:58:16 -07:00
John Wiegley 05ca87a732 Several improvements to error reporting; add new --thunks option 2018-04-25 13:00:41 -07:00
John Wiegley 910b1a8316 Add some new testing files 2018-04-25 10:11:10 -07:00
John Wiegley 19973d7529 Drop inherit (null) ... during reduction; add a comment 2018-04-25 01:10:40 -07:00
John Wiegley 7af4c13455 Some minor improvements to evalSelect 2018-04-25 01:10:25 -07:00
John Wiegley cfdb314f9e Simplify foldl'_ a bit 2018-04-25 01:10:15 -07:00
John Wiegley 2a61ed7307 Fix to value rendering (though won't work with scripting yet) 2018-04-25 00:03:17 -07:00
John Wiegley 35b1071665 A few more provenance fixes, but more to come 2018-04-24 23:24:26 -07:00
John Wiegley 68d81dd57c More work on provenance reporting 2018-04-24 23:09:43 -07:00
John Wiegley b83ccb40f3 Add provenance to thunks, and allow provenance to stack 2018-04-24 21:41:23 -07:00
John Wiegley 7714beae81 Use GHC 8.4.2 for the GHC 8.4 build 2018-04-24 16:43:56 -07:00
John Wiegley d7185c15ab Add architecture diagram to PLAN.org 2018-04-24 14:25:14 -07:00
John Wiegley 2de8c7cf84 More fixes to error reporting 2018-04-24 12:25:40 -07:00
John Wiegley 01bcb86d3f Further improvements to error rendering, but not all done yet 2018-04-24 11:12:20 -07:00
John Wiegley 9864a8c7a5 Rework the way that info frames and error are handled
There is still work to be done to render the new "typed frames", and to
convert all the current string based frame into typed frames. This will pave
the way forward to smarter error messages that can be browsed in intelligent
environments like Emacs and the browser.
2018-04-24 02:15:28 -07:00
John Wiegley 00a9c8463f
Merge pull request #195 from adelbertc/badges
Update README and add badges
2018-04-23 21:50:57 -07:00
Adelbert Chang 46d65dcdf5 Update README and add badges 2018-04-23 21:49:55 -07:00
John Wiegley c4a79a15b9 Moved nix submodule to the haskell-nix organization 2018-04-23 17:51:24 -07:00
John Wiegley 5668e01588 Add PLAN.org project planning file 2018-04-23 17:43:17 -07:00
John Wiegley caf0a4a6a2 Add support for building with GHC 8.4.1, also on Travis 2018-04-23 16:39:37 -07:00
John Wiegley 2aa418d60a Record contextual provenance more fully in some places 2018-04-23 10:18:47 -07:00
John Wiegley 596f2d160b
Merge pull request #191 from mightybyte/sort-builtins
Sort the builtins for easy comparison
2018-04-23 10:08:45 -07:00
John Wiegley 4ff0c483bf Improve printing of provenance information, add more info 2018-04-23 10:06:49 -07:00
John Wiegley 3cf02e3902 Track value provenance during evaluation 2018-04-22 14:33:38 -07:00
John Wiegley a63d3ac30d Remove some commented out code 2018-04-22 14:33:38 -07:00
John Wiegley a60181df3a Add --flags=optimize for cabal configure 2018-04-22 14:33:38 -07:00
Doug Beardsley 26013d2e3b Sort the builtins for easy comparison 2018-04-22 13:48:55 -04:00
John Wiegley c7b6465016
Merge pull request #190 from domenkozar/pretty-tilde 2018-04-22 09:24:42 -07:00
Domen Kožar 7ef7a0bb00
Pretty: handle tilde in paths 2018-04-22 15:06:57 +01:00
John Wiegley 9e5c8a340e Move nNull into Annotated.hs 2018-04-21 22:16:32 -07:00
John Wiegley 8003b96f9c In Nix.Convert, instance are now for NValueF m r instead of NValue m
This will allow the re-use of many of these instances for NValueLoc m.
2018-04-21 18:18:03 -07:00
John Wiegley e934695640 Add another functional dependency to MonadThunk 2018-04-21 18:17:53 -07:00
John Wiegley 44ff385c1d Make the Deferred type Functor, Foldable and Traversable 2018-04-21 18:17:42 -07:00
John Wiegley 7cebf1e019 Very minor code simplification 2018-04-21 10:52:01 -07:00
John Wiegley c9b258788d Allow comparison of sets with null 2018-04-21 10:51:54 -07:00
John Wiegley 9937453ef2 Ensure that the --trace option persists through imports 2018-04-21 10:36:32 -07:00
John Wiegley 96a0c387dd Merge Nix.Trace and Nix.Reduce into Nix.Reduce
Since almost all of that code had to do with program reduction. addTracing and
tracingEvalExpr have moved into Exec.hs, since they depend on MonadNix.
2018-04-21 10:28:09 -07:00
John Wiegley 8a93068102 Rename Nix.Core back to Nix.Eval, since Nix.Eval was now almost empty 2018-04-21 10:11:34 -07:00
John Wiegley fc85f1a7b9 Delete some commented out code in Reduce.hs 2018-04-21 00:54:40 -07:00
John Wiegley 35d669e55c Add a missing call to withNixContext in Main.hs 2018-04-21 00:48:04 -07:00
John Wiegley 89185b5bd3 When --reduce-sets is on, try providing defaults for all function arguments 2018-04-21 00:48:04 -07:00
John Wiegley c2a79cb100 Enable --reduce-lists and --reduce-sets 2018-04-21 00:48:04 -07:00
John Wiegley f0ffb945a2
Merge pull request #186 from kaychaks/issue-177-tilde-in-path
Parser: support tilde in paths
2018-04-20 23:48:19 -07:00
Kaushik Chakraborty bbb72654d7
Parser: support tilde in paths 2018-04-21 11:47:57 +05:30
John Wiegley 86b09103d6 Move production of a reduced test case to --reduce, improve --trace 2018-04-20 22:36:40 -07:00
John Wiegley 47e8829a28 Rename Nix.StringOperations to Nix.Strings 2018-04-20 17:05:21 -07:00