Commit Graph

213 Commits

Author SHA1 Message Date
Vaibhav Sagar 017ce7667a Bump Megaparsec to 7.0.4 2018-11-22 01:16:11 -05:00
John Wiegley ba5b23a6e3
Bump minimum supported version to GHC 8.4.4 2018-11-19 09:46:02 -08:00
Ryan Trinkle d3682a9391
Merge branch 'master' into clean-up-default-nix 2018-11-18 15:33:43 -05:00
Ryan Trinkle df8e58d4e5 Merge remote-tracking branch 'origin/master' into abstract-scopes 2018-11-18 15:16:54 -05:00
Ryan Trinkle 68b26dad4e Expose the nixpkgs we're using (jobsets.nix uses) 2018-11-17 18:48:37 -05:00
John Ericson 85eaea06cd Clean up default.nix with lib.optionalAttrs 2018-11-16 21:18:07 -05:00
John Wiegley b5c0a0a147
Update to GHC 8.4.3 2018-10-05 11:12:30 -07:00
Domen Kožar 18d5753403
default.nix: skip profiling to speed up builds 2018-08-06 22:35:17 +01:00
John Wiegley c54bf53df6
Disable mono-traversable tests 2018-08-04 17:23:03 -04:00
John Wiegley c6718e374f
Merge remote-tracking branch 'origin/master' into pending 2018-08-04 10:54:57 -04:00
John Wiegley ac4d2cbb8e
Update default.nix 2018-08-01 09:47:30 -04:00
Matthew Bauer 55a92337c2 Add cabal-install as build tool 2018-07-30 13:27:43 -04:00
John Wiegley 9ed0597e40
Update default.nix and .cabal file 2018-07-25 11:53:48 -07:00
John Wiegley c060fa9d4e
Corrections to default.nix 2018-07-17 13:31:29 -07:00
John Wiegley e0bf2c4a36
For GHC 8.0, add a reference to hspec-discover 2018-07-09 10:41:42 -07:00
John Wiegley b0826b9166
Use megaparsec 6.5.0 2018-06-27 11:36:04 -07:00
John Wiegley 9931386c85
Update pinned version of nixpkgs in default.nix 2018-06-13 10:58:02 -07:00
John Wiegley 5c5e90170e
Drop any mention of a doProfiling flag 2018-05-30 12:10:31 -07:00
John Wiegley d40b3f15cb
Update default.nix files for profiling 2018-05-30 11:08:15 -07:00
John Wiegley 95ec4e287b
Update default.nix 2018-05-20 23:41:16 -07:00
John Wiegley 7cb68b2ae0
Correction to default.nix 2018-05-16 09:52:49 -07:00
John Wiegley 3b56b7d3d5
Fix reference to extensible-self 2018-05-16 00:21:40 -07:00
John Wiegley 5183f5ea13
Further refinements to default.nix 2018-05-16 00:11:14 -07:00
John Wiegley 5c2cc00b64
Update default.nix to allow more convenient wrappers around it 2018-05-15 17:23:40 -07:00
John Wiegley c9e1393391
Try another version of nixpkgs 2018-05-15 15:42:05 -07:00
John Wiegley 02409359b1
Use an older version of nixpkgs so that the cache is available to Travis 2018-05-15 13:03:32 -07:00
John Wiegley 44ad700a53
Minor reformatting in default.nix 2018-05-15 12:16:02 -07:00
John Wiegley 6f0c90f5d6
Change error message to say "requires at least nix 2.0" 2018-05-14 21:22:08 -07:00
John Wiegley 87bb41054b
Jailbreak concurrent-output when building for GHC 8.0 2018-05-14 21:22:07 -07:00
John Wiegley f4772727b5
Revert "Revert "Update the version of nixpkgs we are pinned to""
This reverts commit 7e1b288b9ff05f496fec1761f9962f249a2542c0.
2018-05-14 21:22:06 -07:00
John Wiegley c319d2730e
Revert "Update the version of nixpkgs we are pinned to"
This reverts commit e4a5806c766a4d1c832d245ad378b989c1aa4404.
2018-05-14 21:22:06 -07:00
John Wiegley 0b89cc7b3a
Include the appropriate version of cabal-install, so we can use --pure 2018-05-14 21:22:05 -07:00
John Wiegley 5a97378c85
Update the version of nixpkgs we are pinned to 2018-05-14 21:22:03 -07:00
Alexandre Esteves 701f15f94a Abort on nix prior to 2.0 2018-05-14 22:47:04 +01:00
John Wiegley eef2ec2512
Only use compact with GHC 8.2, as per the documentation for compact 2018-05-10 16:12:42 -07:00
John Wiegley e5d7a88bda
Define ghc-compact as required 2018-05-10 15:48:01 -07:00
John Wiegley 865984b428
Permit building with GHC 8.0, extend the Travis build matrix 2018-05-10 15:07:32 -07:00
John Wiegley 2fd9bd3fa8
Use a more explicit name than haskellPackages_8_2 2018-05-10 11:48:45 -07:00
John Wiegley 54f3220d79
Revert "Revert "Update pinned version of nixpkgs""
This reverts commit 575d317f6b.
2018-05-10 11:44:00 -07:00
John Wiegley 20e4c5ff61
Use only one version of hpack 2018-05-10 11:43:39 -07:00
John Wiegley 575d317f6b
Revert "Update pinned version of nixpkgs"
This reverts commit b3fdc43998.
2018-05-09 15:48:29 -07:00
John Wiegley b3fdc43998
Update pinned version of nixpkgs 2018-05-09 13:00:51 -07:00
John Wiegley ba0dc19d2d
Work from mightybyte: Minimize deps required, for building with GHCJS 2018-05-08 16:41:15 -07:00
John Wiegley bda103bc11 Don't include ghc-datasize if --flags=profiling is set 2018-04-30 21:48:45 -04:00
John Wiegley 7f01cc8bb8 valueSize will not work with GHC 8.4 right now
ghc-heap-view hasn't been updated yet
2018-04-28 18:29:37 -07:00
John Wiegley 8d0a67b52c Only turn on -Werror for Travis 2018-04-28 18:21:24 -07:00
John Wiegley b24598b3a3 Add top-level __valueSize
Fixes #253
2018-04-28 17:12:32 -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 caf0a4a6a2 Add support for building with GHC 8.4.1, also on Travis 2018-04-23 16:39:37 -07:00
John Wiegley 86b09103d6 Move production of a reduced test case to --reduce, improve --trace 2018-04-20 22:36:40 -07:00
John Wiegley 1e7079414e Small whitespace change in default.nix 2018-04-16 21:57:27 -07:00
John Wiegley 136708ae8a Simplify some things in default.nix 2018-04-16 15:10:47 -07:00
John Wiegley 2409e4dd8d Some minor changes in default.nix 2018-04-16 11:37:45 -07:00
Kaushik Chakraborty b2e10a5a2f
updated as suggested by @vaibhavsagar 2018-04-13 13:54:18 +05:30
Kaushik Chakraborty f58da563bb
modifications in default.nix to take care of errors running benchmarks; update README with a separate section on benchmarks 2018-04-13 12:36:45 +05:30
John Wiegley 036031ca3e Some whitespace formatting in default.nix 2018-04-11 20:21:52 -07:00
John Wiegley 22175aa927 Use the serialise library on non-Linux systems, compact on Linux 2018-04-11 17:59:42 -07:00
John Wiegley c141c8de42 Minor simplification in default.nix 2018-04-10 12:56:20 -07:00
John Wiegley 92632f46fa Set allowBroken = false; in default.nix 2018-04-10 12:52:18 -07:00
John Wiegley 939c3da0ff Revert "Change pinned version of nixpkgs"
This reverts commit bac581a183.
2018-04-10 12:52:11 -07:00
John Wiegley bac581a183 Change pinned version of nixpkgs 2018-04-10 12:49:33 -07:00
John Wiegley 63f28f30ea Add a top-level sha256 argument 2018-04-10 11:48:18 -07:00
John Wiegley 6170aa316d Enable nixpkgs parsing test on Travis 2018-04-10 11:44:41 -07:00
John Wiegley 1ac668bc13 Add hpack as a dependency 2018-04-07 18:25:13 -07:00
John Wiegley 196c6fc1b8 Whitespace fix 2018-04-07 15:07:53 -07:00
Doug Beardsley c70f67ce1e Add nix to testHaskellDepends 2018-04-07 15:07:09 -07:00
Doug Beardsley f1ef9440e0 Revert change to default.nix 2018-04-07 15:07:09 -07:00
Doug Beardsley 1b7dac071d Test to catch a bug in builtins.match
Also added infrastructure for comparing against current nix behavior,
not just current nix tests.
2018-04-07 15:07:09 -07:00
Doug Beardsley 99e4d86eff Uncomment temporarily commented instances 2018-04-05 17:06:00 -06:00
Doug Beardsley 9e1c208d8f Undo default.nix changes 2018-04-05 17:06:00 -06:00
Doug Beardsley 42fbb1faa9 The eval-okay-xml test case passes
Still need to decide what to do with commented out instances
2018-04-05 17:06:00 -06:00
John Wiegley 2dadf9c82a Re-add the ability to enable profiling to default.nix 2018-04-05 14:41:04 -07:00
John Wiegley d34131bc49 Remove something from default.nix which doesn't work 2018-04-05 13:52:13 -07:00
John Wiegley bf13e463f1 Minor simplification 2018-04-05 13:25:09 -07:00
John Wiegley 51b55f3e2d Pin insert-ordered-containers to a custom version 2018-04-05 13:23:22 -07:00
John Wiegley 727239352d Add a doProfiling argument to default.nix 2018-04-05 13:01:44 -07:00
John Wiegley 6c66b8b9e7 Update default.nix to override insert-ordered-containers 2018-04-05 12:56:41 -07:00
John Wiegley 89c314a051 Pin insert-ordered-containers 2018-04-05 10:48:09 -07:00
John Wiegley d476b3f173 Add a toXML serializer for values
Relates to issue #109
2018-04-05 01:13:13 -07:00
John Wiegley a7d65d8843 Pin the package set used by default.nix 2018-04-04 13:57:00 -07:00
John Wiegley c3eb7a94b9 Add basic support for quasi-quotation of Nix expressions in Haskell 2018-04-03 14:21:33 -07:00
John Wiegley d7228c6a75 Move language feature pragmas into each Haskell file, not .cabal 2018-04-01 22:49:12 -07:00
John Wiegley acc48c279b Add monadlist to default.nix 2018-04-01 20:56:57 -07:00
John Wiegley 852aff04e7 Break apart MonadNix, to allow greater flexibility in evaluators 2018-03-31 14:53:38 -07:00
John Wiegley d08ca26da0 Add informative backtraces on evaluation failure 2018-03-30 23:10:44 -07:00
John Wiegley 71b4bf5e8a Various fixes, and make imports local to their containing file 2018-03-30 01:50:19 -07:00
John Wiegley 4e698d76fa More fixes to lazy evaluation and scoping 2018-03-30 01:11:27 -07:00
John Wiegley 84918aa1d3 Remove the MonadFix requirement, it was not needed; fix NRecSet 2018-03-28 23:52:07 -07:00
John Wiegley b97378c581 Restore previous default.nix (mostly) 2018-03-28 15:13:02 -07:00
John Wiegley 39f772ef3c Restore monadic abstraction (to support importFile), fix attribute sets 2018-03-28 14:45:10 -07:00
John Wiegley 3a29249e43 Normalize import statements, add option parsing 2018-03-27 21:59:27 -07:00
John Wiegley 278916a9ab Further work on argument evaluation 2018-03-27 18:42:31 -07:00
Guillaume Maudoux 977e48ead5 Update default.nix 2018-02-15 12:06:09 +01:00
Domen Kožar b821021cac
Merge {build,shell,default}.nix into default.nix
cabal2nix generates all of them in one go.
2018-01-28 21:58:33 +00:00
John Wiegley 8b47c8b143 Add back *.nix files for the sake of Travis 2018-01-22 18:38:04 -08:00
John Wiegley 0bda6da9e1 Remove generated files 2018-01-22 11:51:06 -08:00
Profpatsch f72a083f0b default.nix: use default haskellPackages by default
sane defaults ;)
2017-04-21 03:53:35 +02:00
Joe Hermaszewski d3651984fb Add Show1 instances for base 4.9 2016-09-21 10:32:17 +01:00
Allen Nelson a876d49789 parseNixText function 2015-10-27 17:32:03 -05:00
Allen Nelson 892cad2b36 Correctly escape double quotes. Update nix files. Use quotes with reserved variable bindings 2015-10-15 18:38:06 -05:00
John Wiegley d678cf9cff Add data/* as Extra-source-files 2015-07-20 14:00:24 -07:00
John Wiegley 04f210c47e Bump version to 0.2.0 2015-06-23 16:50:03 -05:00
John Wiegley d68ba45367 Update default.nix 2015-06-22 20:47:07 -05:00
Benno Fünfstück 1b82727a17 Use data-fix for Fix and fix path parsing bug 2014-09-27 20:12:30 +02:00
John Wiegley 108800bb76 Update default.nix file 2014-08-28 14:46:21 -05:00
John Wiegley 748bebf965 Improvements to default.nix file 2014-08-02 11:08:46 -04:00
John Wiegley 92cf6eecf9 Switch from pretty to ansi-wl-pprint 2014-07-18 04:42:06 -05:00
Luca Bruno b12dc4f187 Pretty print nix expressions 2014-07-07 16:26:14 +02:00
John Wiegley bb3648cf73 Let is working, next is "if" syntax 2014-07-04 02:15:20 -05:00
John Wiegley 682f039023 Switch to a Parsec expression table 2014-07-01 03:11:26 -05:00
John Wiegley 9b12ebf081 Break up Parser.hs, make use of Parsec optional 2014-06-30 23:12:18 -05:00
John Wiegley 29909a2598 Setup cabal file, fix all warnings
The next step is splitting up and prettifying Parser.hs
2014-06-30 22:37:20 -05:00
John Wiegley 7d8615aaf7 First revision 2014-06-28 16:30:47 -07:00