Commit graph

208 commits

Author SHA1 Message Date
John Wiegley 9f1519d9ca
Bump version to 0.7.1 2020-03-03 13:14:20 -08:00
Simon Jakobi 1b6ab11a53 Allow prettyprinter 1.6 2020-03-03 13:14:02 -08:00
John Wiegley 24049aa7b1
Bump version to 0.7.0 2020-03-03 13:01:36 -08:00
John Wiegley 583c048e15
Update version to 0.7.0 2020-03-02 14:56:15 -08:00
John Wiegley 9d63f952e9
Merge remote-tracking branch 'sjakobi/ghc-gte-8.4' 2020-01-13 18:13:37 -08:00
Simon Jakobi 6c9c7c310c Remove unused dependency on regex-tdfa-text 2019-12-05 16:25:55 +01:00
Simon Jakobi 8ce466ee80 Allow megaparsec-8 2019-11-09 20:23:42 -08:00
Simon Jakobi e22882489c Allow prettyprinter-1.5 2019-11-09 20:23:25 -08:00
Simon Jakobi 57d63aa381 Allow parser-combinators-1.1.*
This fixes `nix-build`.
2019-10-22 10:02:59 -07:00
Simon Jakobi 7603e3634c Simplify hnix.cabal some more 2019-10-22 00:27:44 +02:00
Simon Jakobi 5c8c1cc16f We unconditionally depend on deepseq >= 1.4.3 now 2019-10-22 00:18:12 +02:00
Simon Jakobi 5f4cef9922 We unconditionally have hashable >= 1.2.5 now 2019-10-22 00:03:52 +02:00
Simon Jakobi 3d6f34f280 Simplify conditional build-depends 2019-10-22 00:03:39 +02:00
Simon Jakobi 8ed7d765dd Require base >= 4.11
There were multiple build failures with GHC-8.2 due
to (<>) and Semigroup not being in scope.
2019-10-21 23:46:35 +02:00
Simon Jakobi 2df4986aa6 Bump bounds for regex-tdfa, semialign and semialign-indexed 2019-10-21 14:44:47 -07:00
Simon Jakobi e2d2543951 Allow prettyprinter-1.4.0 2019-10-21 08:52:05 -07:00
quasicomputational 91262e7602 Allow most recent versions of dependencies.
The only actual breaking change affecting `hnix` is `these` splitting
into three packages and renaming some things. Otherwise, as the
package should work fine with either the newer or older versions, I
have left the previous bounds in place and added the new ones
disjunctively.

This will help somewhat with #494.
2019-09-06 13:19:14 -07:00
John Wiegley 38219591d4
Bump version to 0.6.1 2019-04-18 17:45:48 -07:00
John Wiegley 9e22c63bd5 Simplify Standard.hs further by creating Nix.Utils.Fix1 2019-03-23 00:49:03 -07:00
John Wiegley 77c52fd43c Revise Nix.Standard 2019-03-23 00:49:03 -07:00
Greg Hale 8029d6c2cd Tweak cabal file and default.nix for ghc844 support 2019-03-21 09:13:00 -04:00
Greg Hale 522b24e969 Fix dependency bounds 2019-03-19 21:52:55 -04:00
Greg Hale ccfaae70fe Add conservative dependency bounds to all dependencies 2019-03-19 21:20:05 -04:00
John Wiegley 2c0c896871
Everything compiling again, but 25 tests failing 2019-03-18 17:30:31 -07:00
John Wiegley df3e79d945
Port over most of Builtins.hs 2019-03-18 15:27:12 -07:00
John Wiegley 522585a7f1
Begin work on harmonizing the two different value representations 2019-03-18 11:41:46 -07:00
John Wiegley f5d070af16
Bump version to 0.6.0 2019-03-17 23:07:27 -07:00
John Wiegley 18c49f6a0d
Reorganize code in Nix.Value, creating new Nix.Value.Equal 2019-03-17 22:44:22 -07:00
John Wiegley 7b5d134d22
Factor out FreshIdT from Standard 2019-03-17 19:04:38 -07:00
John Wiegley 015ced236e
Simplify Standard by splitting off Cited.Basic 2019-03-17 18:43:23 -07:00
John Wiegley 145e69c9a4
Further work on Standard.hs 2019-03-15 22:54:29 -07:00
John Wiegley 209a9ae9a5
Create Nix/Thunk/Standard.hs 2019-03-15 17:59:38 -07:00
John Wiegley e9236aa55c
Now down to Main.hs and the tests 2019-03-15 17:20:10 -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 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 Ericson 5ddb79009d Depend on hnix-store-core and use it for printHash32 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 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
Ken Micklas 81f702f98d Remove unused dependency on hspec-discover 2019-03-09 22:33:32 -05:00
Ken Micklas 3a7b023464 Remove monad-st dependency 2019-03-09 21:31:42 -05:00
John Ericson 3b5649c0a2 WIP fix equality 2019-03-09 20:26:19 -05:00
John Wiegley ed12ee1077
Disable using ghc-datasize for now 2019-01-08 10:22:39 -08:00
Doug Beardsley 7d2f9d874a Move json code into separate module 2018-12-09 13:57:58 -05:00
Félix Baylac 512a8e0f10 Change builtins.storeDir type to String
Co-authored-by: Basile Henry <bjm.henry@gmail.com>
2018-12-02 20:59:50 +00:00
John Wiegley 01e805e106
Update default.nix to use megaparsec 7.0.4 2018-11-22 09:53:04 -08:00
John Wiegley 2447e7e044
Remove the use of hpack
Fixes #411
2018-11-22 09:15:50 -08:00
John Wiegley e0669ce3c3
Merge branch 'master' into doOptimize-doProfiling 2018-11-22 08:57:09 -08: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