Commit graph

189 commits

Author SHA1 Message Date
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
John Ericson f227911ce0 Merge remote-tracking branch 'origin/master' into prettyprinter 2018-11-20 18:23:15 -05:00
John Wiegley ba5b23a6e3
Bump minimum supported version to GHC 8.4.4 2018-11-19 09:46:02 -08:00
John Ericson 04abd357bd Switch to prettyprinter 2018-11-17 12:02:26 -05:00
Ryan Trinkle 6d2daf0ecd WIP: Refactor MonadVar to use ref-tf's MonadRef instead
TODO:
* Upstream GEq (STRef s)
* Eliminate shim functions
2018-11-16 14:11:37 -05:00
gb 4baa4f7108 change Nix.NixString module to Nix.String 2018-09-23 16:03:44 -04:00
gb 6f1ed3c2e9 documented methods;added more methods with deprecation 2018-09-15 20:04:54 -04:00
gb a57aa711df tests run 2018-09-09 11:47:04 -04:00
John Wiegley b9b0723037
Update hnix.cabal 2018-08-23 21:06:56 -07:00
John Wiegley f0b6b6b223
Change NValueNF to use Free instead of Fix
This allows us to detect and report cycles during normalization.

See #348
2018-08-09 22:09:00 -04:00
gb fd2bbb66e9 fixes to match latest master: tests ran 2018-07-28 15:32:15 -04:00
John Wiegley 9ed0597e40
Update default.nix and .cabal file 2018-07-25 11:53:48 -07:00
John Wiegley 4fffd51438
Bump version to 0.5.2, regenerate hnix.cabal 2018-07-19 15:15:25 -07:00
John Wiegley 578a3551c9
Merge remote-tracking branch 'origin/master' into pending 2018-07-19 15:14:16 -07:00
Silvan Mosberger 69dcb30c89
Loosen deriving-compat bounds 2018-07-19 19:30:57 +02:00
John Wiegley c060fa9d4e
Corrections to default.nix 2018-07-17 13:31:29 -07:00
John Wiegley 2a598d539e
Merge remote-tracking branch 'origin/master' into pending 2018-07-17 11:39:04 -07:00
John Wiegley 74df7d67f1
Add a build-tool-depends section to package.yaml 2018-06-27 12:51:34 -07:00
John Wiegley b0826b9166
Use megaparsec 6.5.0 2018-06-27 11:36:04 -07:00
Félix Baylac-Jacqué 721ddd4f53
Test NSelect reduction 2018-06-25 17:19:39 +02:00