Commit graph

1594 commits

Author SHA1 Message Date
Domen Kožar e0af60ef67
thunk loop -> infinite recursion 2018-11-24 14:22:46 +00:00
Domen Kožar 28bfc2cbe8
Make -v1 default for better usability on errors 2018-11-24 14:13:24 +00:00
Ken Micklas 1457362184 Accumulate string context in builtins.toXML 2018-11-23 12:48:44 -05:00
Ken Micklas a43da72f9e Expose internals of NixString 2018-11-23 12:48:44 -05:00
Domen Kožar b0f346fc5a
Fix GHC 8.6 compilation 2018-11-23 13:43:36 +00:00
Domen Kožar 0c9aef937b
add typeof to repl 2018-11-23 13:30:19 +00:00
John Wiegley 2e4e5e0077
Whitespace fix 2018-11-22 11:23:54 -08:00
John Wiegley 8dc9cd7b58
Some cleanup in default.nix 2018-11-22 11:21:06 -08:00
John Wiegley 197adf01b9
Refer to megaparsec_7_0_4 2018-11-22 10:04:33 -08:00
John Wiegley 01e805e106
Update default.nix to use megaparsec 7.0.4 2018-11-22 09:53:04 -08:00
John Wiegley d8281b10f1
Merge pull request #373 from Infinisil/fix/freeVars
freeVars: Fix inherit's in rec sets and let in
2018-11-22 09:49:56 -08:00
John Wiegley a6a3651aea
Merge pull request #376 from Ericson2314/clean-up-default-nix
Clean up default.nix with `lib.optionalAttrs`
2018-11-22 09:49:47 -08:00
John Wiegley 73e520923c
Merge branch 'master' into clean-up-default-nix 2018-11-22 09:49:40 -08:00
John Wiegley e8a6fbab16
Merge branch 'master' into fix/freeVars 2018-11-22 09:49:22 -08:00
John Wiegley 2447e7e044
Remove the use of hpack
Fixes #411
2018-11-22 09:15:50 -08:00
John Wiegley 1ac98e9db9
Merge pull request #407 from domenkozar/doOptimize-doProfiling
Be able to pass doOptimize/doProfiling flags to nix build
2018-11-22 08:57:21 -08:00
John Wiegley e0669ce3c3
Merge branch 'master' into doOptimize-doProfiling 2018-11-22 08:57:09 -08:00
John Wiegley 9576a81e71
Merge pull request #380 from haskell-nix/vs-megaparsec-7
Bump Megaparsec to 7.0.4
2018-11-22 08:56:31 -08:00
Domen Kožar 39ef69f2f9
Merge branch 'master' into type-string-context 2018-11-22 09:55:23 +00:00
Domen Kožar ef3bc04a7c
Be able to pass doOptimize/doProfiling flags to nix build 2018-11-22 09:53:43 +00:00
Vaibhav Sagar 017ce7667a Bump Megaparsec to 7.0.4 2018-11-22 01:16:11 -05:00
John Wiegley 3c04c87ece
Merge pull request #374 from haskell-nix/expose-valueToExpr
Expose value to expr
2018-11-21 18:04:20 -08:00
John Wiegley bf43c6b53f
Merge branch 'master' into expose-valueToExpr 2018-11-21 16:03:36 -08:00
John Wiegley 5ff896f571
Merge pull request #388 from haskell-nix/prettyprinter
Switch to prettyprinter library from ansi-wl-pprint
2018-11-21 15:59:49 -08:00
John Wiegley 8024ab8a71
Merge pull request #372 from domenkozar/ghc-8.6
GHC 8.6
2018-11-21 15:47:32 -08:00
Doug Beardsley 31c327c406 Rename back to hacky 2018-11-21 01:55:56 -05:00
Doug Beardsley 09d9919367 Fix misleading name 2018-11-21 01:54:15 -05:00
Doug Beardsley 9e11410f6e Make note to fix toFile 2018-11-21 01:50:24 -05:00
Doug Beardsley d87122a0f2 Fix context handling in replaceStrings 2018-11-21 01:21:53 -05:00
Domen Kožar 58a83622eb
GHC 8.6 support 2018-11-20 23:44:59 +00:00
John Ericson f227911ce0 Merge remote-tracking branch 'origin/master' into prettyprinter 2018-11-20 18:23:15 -05:00
Domen Kožar 2cc20c045f
Distinguish string with or without context when revealing type 2018-11-20 12:20:16 +00:00
Patrick Hilhorst 717368c4f9 Missed renaming freeVarsEqual at the call site 2018-11-20 04:40:09 +01:00
John Wiegley bf57d2d6eb
Merge pull request #402 from haskell-nix/johnw/ghc844
Bump minimum supported version to GHC 8.4.4
2018-11-19 18:19:31 -08:00
John Wiegley ba5b23a6e3
Bump minimum supported version to GHC 8.4.4 2018-11-19 09:46:02 -08:00
Doug Beardsley 8a97be7250 Fix behavior of match to properly return nulls 2018-11-19 09:01:34 -05:00
Doug Beardsley 752ff745a8 Remove unnecessary cases 2018-11-19 07:13:19 -05:00
Doug Beardsley a29a54b4f9 Merge remote-tracking branch 'origin/pending' into remove-fromnix-text-instances 2018-11-19 07:10:02 -05:00
Doug Beardsley 5dd3e2d7ce Remove Text FromValue, ToValue, FromNix, and ToNix
This commit makes the handling of string context much more explicit and correct
throughout entire codebase.
2018-11-19 07:04:08 -05:00
Patrick Hilhorst 2a5df57fd0
Fix for Set import
Co-Authored-By: Infinisil <infinisil@icloud.com>
2018-11-18 22:02:16 +01:00
Ryan Trinkle 40291fec68
Merge branch 'master' into fix/freeVars 2018-11-18 15:33:56 -05:00
Ryan Trinkle 40ba43579f
Merge branch 'master' into expose-valueToExpr 2018-11-18 15:33:52 -05:00
Ryan Trinkle d3682a9391
Merge branch 'master' into clean-up-default-nix 2018-11-18 15:33:43 -05:00
Ryan Trinkle 049c25a291
Merge branch 'master' into eliminate-MonadIO 2018-11-18 15:33:41 -05:00
Ryan Trinkle 6d9deac55f
Merge branch 'master' into prettyprinter 2018-11-18 15:33:10 -05:00
Ryan Trinkle 07dd6ac3f3
Merge pull request #403 from haskell-nix/abstract-scopes
Abstract out IO and some scoping stuff
2018-11-18 15:31:05 -05:00
Ryan Trinkle df8e58d4e5 Merge remote-tracking branch 'origin/master' into abstract-scopes 2018-11-18 15:16:54 -05:00
Ryan Trinkle 0a82ab26ce Merge remote-tracking branch 'origin/pending' into abstract-scopes 2018-11-18 15:04:30 -05:00
Ryan Trinkle 42afdc21da Try to enable hydra testing of "pending" branch 2018-11-18 14:30:21 -05:00
Ryan Trinkle c1fd6245d0 Disable old and broken tests for hydra 2018-11-18 14:29:32 -05:00