Commit Graph

850 Commits

Author SHA1 Message Date
John Wiegley c4a79a15b9 Moved nix submodule to the haskell-nix organization 2018-04-23 17:51:24 -07:00
John Wiegley 5668e01588 Add PLAN.org project planning file 2018-04-23 17:43:17 -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 2aa418d60a Record contextual provenance more fully in some places 2018-04-23 10:18:47 -07:00
John Wiegley 596f2d160b
Merge pull request #191 from mightybyte/sort-builtins
Sort the builtins for easy comparison
2018-04-23 10:08:45 -07:00
John Wiegley 4ff0c483bf Improve printing of provenance information, add more info 2018-04-23 10:06:49 -07:00
John Wiegley 3cf02e3902 Track value provenance during evaluation 2018-04-22 14:33:38 -07:00
John Wiegley a63d3ac30d Remove some commented out code 2018-04-22 14:33:38 -07:00
John Wiegley a60181df3a Add --flags=optimize for cabal configure 2018-04-22 14:33:38 -07:00
Doug Beardsley 26013d2e3b Sort the builtins for easy comparison 2018-04-22 13:48:55 -04:00
John Wiegley c7b6465016
Merge pull request #190 from domenkozar/pretty-tilde 2018-04-22 09:24:42 -07:00
Domen Kožar 7ef7a0bb00
Pretty: handle tilde in paths 2018-04-22 15:06:57 +01:00
John Wiegley 9e5c8a340e Move nNull into Annotated.hs 2018-04-21 22:16:32 -07:00
John Wiegley 8003b96f9c In Nix.Convert, instance are now for NValueF m r instead of NValue m
This will allow the re-use of many of these instances for NValueLoc m.
2018-04-21 18:18:03 -07:00
John Wiegley e934695640 Add another functional dependency to MonadThunk 2018-04-21 18:17:53 -07:00
John Wiegley 44ff385c1d Make the Deferred type Functor, Foldable and Traversable 2018-04-21 18:17:42 -07:00
John Wiegley 7cebf1e019 Very minor code simplification 2018-04-21 10:52:01 -07:00
John Wiegley c9b258788d Allow comparison of sets with null 2018-04-21 10:51:54 -07:00
John Wiegley 9937453ef2 Ensure that the --trace option persists through imports 2018-04-21 10:36:32 -07:00
John Wiegley 96a0c387dd Merge Nix.Trace and Nix.Reduce into Nix.Reduce
Since almost all of that code had to do with program reduction. addTracing and
tracingEvalExpr have moved into Exec.hs, since they depend on MonadNix.
2018-04-21 10:28:09 -07:00
John Wiegley 8a93068102 Rename Nix.Core back to Nix.Eval, since Nix.Eval was now almost empty 2018-04-21 10:11:34 -07:00
John Wiegley fc85f1a7b9 Delete some commented out code in Reduce.hs 2018-04-21 00:54:40 -07:00
John Wiegley 35d669e55c Add a missing call to withNixContext in Main.hs 2018-04-21 00:48:04 -07:00
John Wiegley 89185b5bd3 When --reduce-sets is on, try providing defaults for all function arguments 2018-04-21 00:48:04 -07:00
John Wiegley c2a79cb100 Enable --reduce-lists and --reduce-sets 2018-04-21 00:48:04 -07:00
John Wiegley f0ffb945a2
Merge pull request #186 from kaychaks/issue-177-tilde-in-path
Parser: support tilde in paths
2018-04-20 23:48:19 -07:00
Kaushik Chakraborty bbb72654d7
Parser: support tilde in paths 2018-04-21 11:47:57 +05:30
John Wiegley 86b09103d6 Move production of a reduced test case to --reduce, improve --trace 2018-04-20 22:36:40 -07:00
John Wiegley 47e8829a28 Rename Nix.StringOperations to Nix.Strings 2018-04-20 17:05:21 -07:00
John Wiegley e68e369de2 Simplify the type of 'adi' 2018-04-20 12:31:46 -07:00
John Wiegley 986a3043da Add a constant-folding tree transformer: Reduce.reduceExpr 2018-04-20 02:57:23 -07:00
John Wiegley bf0dd66624 Add pattern synonyms for matching on NExprLocF types 2018-04-20 01:33:37 -07:00
John Wiegley bc832ed58a Generalize some definitions in Trace.hs 2018-04-20 01:33:37 -07:00
John Wiegley a23d42ffc7
Merge pull request #185 from domenkozar/issue-184
Pretty: handle variadic params + tests
2018-04-19 17:28:00 -07:00
Domen Kožar 9fb4047bdc
Pretty: handle variadic params + tests 2018-04-20 01:05:20 +01:00
John Wiegley b8af0ce22b Change a use of traceM to putStrLn 2018-04-19 12:47:24 -07:00
John Wiegley 8fc1b831f9 Drop a comment 2018-04-19 12:47:20 -07:00
John Wiegley 3ad944b619 Several fixes to the --trace logic 2018-04-19 01:39:12 -07:00
John Wiegley 5039ac9c34 Clarify an unexpected situation 2018-04-19 01:20:27 -07:00
John Wiegley aad7bcd525 Pretty printer was dropping antiquoted selector paths 2018-04-19 01:20:17 -07:00
John Wiegley 9950d917a0 In Nix world, 1 is the highest precedence, 14 the lowest 2018-04-19 01:09:57 -07:00
John Wiegley dc7cc25a48 Remove an incorrect comment 2018-04-19 00:53:33 -07:00
John Wiegley 2182288bbd More fixes to --trace 2018-04-19 00:43:50 -07:00
John Wiegley 61bf676cbf Add a comment to Pretty.hs 2018-04-19 00:43:41 -07:00
John Wiegley bb0e0d987c Slight improvements to the pretty printing output 2018-04-19 00:24:01 -07:00
John Wiegley 4163d35a09 nixpkgs allows let with no bindings in some places
At the beginning of arangodb/default.nix:

```
{ stdenv, fetchFromGitHub
, openssl, zlib, python2Packages, readline, cmake, python }:

let
in stdenv.mkDerivation rec {
  version = "3.3.4";
  name    = "arangodb-${version}";
```
2018-04-18 23:42:13 -07:00
John Wiegley 512e3bb01d When using --trace, first statically import all referenced files
This helps with reducing down the test case to a single file.
2018-04-18 23:22:05 -07:00
John Wiegley 40742d3b7b Remove some tracing statements 2018-04-18 23:21:30 -07:00
John Wiegley 2c80225241 Add a new --trace option, separate from verbosity levels 2018-04-18 23:20:58 -07:00
John Wiegley c7cdbb3fbf Delete some commented out code 2018-04-18 21:54:38 -07:00