Commit graph

1594 commits

Author SHA1 Message Date
Ken Micklas ec62bce3a0 Fix pointer equality case in thunkEq 2019-03-09 21:57:38 -05:00
Ken Micklas 5129beaef8 Remove bad runFreshIdT use 2019-03-09 21:43:19 -05:00
Ken Micklas 695dd58d3c Fix failable pattern in fresh 2019-03-09 21:40:59 -05:00
Ken Micklas 3a7b023464 Remove monad-st dependency 2019-03-09 21:31:42 -05:00
Ken Micklas 2366aff91d Use valueEq when not pointer equal 2019-03-09 20:49:25 -05:00
Ken Micklas 4895255155 Fix syntax error in test 2019-03-09 20:40:30 -05:00
Ken Micklas 8ddbe165e6 Only short-circuit pointer equality for correct types 2019-03-09 20:40:12 -05:00
Ken Micklas 05fccda825 Revert "Use thunk ID to short-circuit thunkEq"
This reverts commit c287ab8b59.
2019-03-09 20:35:39 -05:00
Ken Micklas 6a5718458d Fix MonadFreshId instances in wrong places 2019-03-09 20:26:56 -05:00
Ken Micklas 6e48df506e Fix exe Main 2019-03-09 20:26:56 -05:00
Ken Micklas 46db352af8 Add all the effects instances for FreshIdT 2019-03-09 20:26:56 -05:00
Ken Micklas c287ab8b59 Use thunk ID to short-circuit thunkEq 2019-03-09 20:26:19 -05:00
Ken Micklas d9293cf034 Fix Nix.Exec 2019-03-09 20:26:19 -05:00
Ken Micklas 91d5be6e49 Fix Nix.Lint 2019-03-09 20:26:19 -05:00
Ken Micklas 3b4af6f781 Move MonadAtomicRef ST instance to Nix.Thunk 2019-03-09 20:26:19 -05:00
Ken Micklas ae09c47b7d Fix Nix.Type.Infer 2019-03-09 20:26:19 -05:00
Ken Micklas 842dadf6da Use non-standalone GND for FreshIdT 2019-03-09 20:26:19 -05:00
Ken Micklas 69fa8884c1 Add MonadAtomicRef instance for ST 2019-03-09 20:26:19 -05:00
Ken Micklas a1fd246d01 Add MonadFix instance for FreshIdT 2019-03-09 20:26:19 -05:00
Ken Micklas fd63be4f96 Add MonadFreshId instance for FreshIdT 2019-03-09 20:26:19 -05:00
Ken Micklas 3671e6993e Fix FreshIdT instances 2019-03-09 20:26:19 -05:00
John Ericson 1abe4064c6 WIP more instances 2019-03-09 20:26:19 -05:00
John Ericson 3b5649c0a2 WIP fix equality 2019-03-09 20:26:19 -05:00
Vaibhav Sagar 4b8dff9aa8 Nix.Builtins: add getContext and appendContext primops 2019-03-09 19:30:56 -05:00
John Wiegley a6d753bbdd
Remove an unnecessary import 2019-03-09 16:00:30 -08:00
Ryan Trinkle 6f873f48bd
Merge pull request #453 from haskell-nix/ryantrinkle/splitVersion
Improve error message in case `read` fails in splitVersion
2019-03-09 18:37:49 -05:00
Ryan Trinkle 834446463c
Merge branch 'master' into ryantrinkle/splitVersion 2019-03-09 18:37:43 -05:00
Ryan Trinkle a2b77f1d8a
Merge branch 'master' into ryantrinkle/splitVersion 2019-03-09 18:36:24 -05:00
Ryan Trinkle ee09b8f4be
Merge pull request #378 from haskell-nix/eliminate-MonadIO
WIP: Eliminate MonadIO
2019-03-09 18:36:09 -05:00
Ryan Trinkle e7fd5cc69b
Merge pull request #454 from haskell-nix/ryantrinkle/argsList
When forming derivationStrict arguments, supply `args` as a list rather than a string
2019-03-09 18:35:14 -05:00
Ryan Trinkle 883505f062
Merge branch 'master' into ryantrinkle/argsList 2019-03-09 18:34:19 -05:00
Ryan Trinkle 44e9d1e6c9
Merge pull request #459 from haskell-nix/ryantrinkle/ellipsisBinds
Ellipsis shouldn't introduce anything into scope
2019-03-09 18:33:59 -05:00
Ryan Trinkle cefb1b60e9 Merge branch 'master' into eliminate-MonadIO 2019-03-09 18:18:53 -05:00
Ryan Trinkle ae463c83e8
Merge branch 'master' into ryantrinkle/ellipsisBinds 2019-03-09 18:02:22 -05:00
Ryan Trinkle d8a66c09ab Ellipsis shouldn't introduce anything into scope 2019-03-09 17:59:59 -05:00
John Wiegley 3b2593df47
Merge branch 'master' into ryantrinkle/splitVersion 2019-03-09 14:51:39 -08:00
John Wiegley 92c0f5a307
Merge branch 'master' into ryantrinkle/argsList 2019-03-09 14:51:21 -08:00
John Wiegley 20594df834
Merge pull request #455 from haskell-nix/ryantrinkle/jsonOutPath
When converting to JSON, if NVSet has an "outPath" attribute, use that instead of converting the object's attributes
2019-03-09 14:51:10 -08:00
Ryan Trinkle b95710470c When converting to JSON, if NVSet has an "outPath" attribute, use that instead of converting the object's attributes 2019-03-09 16:06:54 -05:00
Ryan Trinkle bd867a3bef When forming derivationStrict arguments, supply args as a list rather than a string
Perhaps this used to be different, but as of nix-instantiate 2.1.3, `args` may not be a string
2019-03-09 16:04:41 -05:00
Ryan Trinkle 4e9ec1a964 Improve error message in case read fails in splitVersion 2019-03-09 15:55:31 -05:00
Ryan Trinkle 4ee68caa70 PRETTY_TESTS is assumed to be an integer, not yes/no 2019-03-09 15:53:07 -05:00
Ryan Trinkle c738f552b8 Disable new tests that have never yet passed 2019-03-09 15:16:22 -05:00
John Wiegley 07e6a5a381
Merge branch 'pending' 2019-03-09 11:39:19 -08:00
John Wiegley 5581fe7320
Merge pull request #446 from haskell-nix/doug-string-context-01
Add test for currentSystem and remove hacky call
2019-03-09 11:38:11 -08:00
John Wiegley 7395206f23
Merge branch 'master' into doug-string-context-01 2019-03-09 11:02:54 -08:00
Ryan Trinkle e629912c5c
Merge pull request #439 from haskell-nix/je-bump-cxx-nix
Bump C++ Nix submodule
2019-03-09 11:31:27 -05:00
Doug Beardsley aa4156c5f6 Add test for currentSystem and remove hacky call 2019-03-08 23:22:43 -05:00
John Ericson 43f53d250a Bump C++ Nix submodule
Merge upstream master into our master, which is one commit ahead with a
doc change.
2019-03-08 22:45:29 -05:00
John Wiegley 624ec11234
Begin adding very basic source line printing 2019-03-03 14:48:49 -08:00