Commit Graph

2145 Commits

Author SHA1 Message Date
Rickard Nilsson bd39df38b6 evalExpr: Add support for NEnvPath 2017-10-18 16:09:06 +02:00
John Wiegley 4df691d2b3 Merge pull request #64 from vaibhavsagar/refactor-main
Reduce code duplication in main/Main.hs
2017-09-23 07:52:40 -07:00
Vaibhav Sagar 397dd29297 Reduce code duplication in main/Main.hs 2017-09-23 20:00:18 +08:00
John Wiegley b1a04469bb Merge pull request #59 from rimmington/dollar-quoting
Dollar quoting
2017-05-31 10:54:27 -07:00
Rhys 0d456691b5 Escape ${ but not plain $ in indented strings
Includes some very basic regression tests, but no change for
non-indented strings.
2017-05-31 21:24:43 +10:00
Rhys 6537b8823d Add ShorthandTests to .cabal file 2017-05-31 21:07:19 +10:00
John Wiegley aba54891c5 Merge pull request #56 from Profpatsch/mkDots-automatic-symbol-quoting
mkDots automatic symbol quoting
2017-04-21 11:31:18 -07:00
Profpatsch 8b4c137a3b Shorthands.hs, mkDot/mkDots: automatically quote non-symbols
Nix can accept (nearly?) arbitrary values as attributes, if they are quoted in
strings. So generating “dots” should always result in valid nix attributes.
This uses the same regex as the nix lexer (as of 1.11).

Also add a few tests whether it correctly generates symbol/non-symbol
attributes.
2017-04-21 03:54:06 +02:00
Profpatsch f72a083f0b default.nix: use default haskellPackages by default
sane defaults ;)
2017-04-21 03:53:35 +02:00
John Wiegley 851aaf92ff Merge pull request #54 from rimmington/ident-reserved-prefix
Correctly parse identifiers with reserved word prefixes
2017-04-17 10:05:39 -07:00
Rhys c15de4532a Correctly parse identifiers with reserved word prefixes 2017-04-17 19:33:57 +10:00
John Wiegley 38f6413075
Fix GitHub URL
Fixes #49
2016-12-20 21:13:54 -08:00
John Wiegley 07e9e66bf7
Change LICENSE to BSD3 2016-12-18 17:10:06 -08:00
John Wiegley 35f2a2248b Merge pull request #46 from rickynils/bump_to_0_3_4
Bump to 0.3.4
2016-10-20 16:24:54 -07:00
Rickard Nilsson 386c472cc7 Bump to 0.3.4 2016-10-20 22:04:00 +02:00
John Wiegley dd70e17de5 Merge pull request #45 from rickynils/eval_literal_path
evalExpr: Add support for NLiteralPath
2016-10-18 09:08:43 -07:00
Rickard Nilsson be167c3af6 evalExpr: Add support for NLiteralPath 2016-10-18 14:47:14 +02:00
John Wiegley 3a23917d59
Mention EvalTests.hs in hnix.cabal 2016-10-17 16:59:52 -07:00
John Wiegley 2f06b934ef
Bump to 0.3.3 2016-10-03 20:10:35 -07:00
John Wiegley 2c88bdb9e4 Merge pull request #42 from expipiplus1/ghc8
Add Show1 instances for base 4.9
2016-10-03 20:05:30 -07:00
John Wiegley 6769a2f007
Update version to 0.3.2 2016-10-03 10:07:20 -07:00
John Wiegley 4f42496ae9 Merge pull request #41 from expipiplus1/simple-functor
Use fmapDefault and foldMapDefault
2016-09-21 13:10:35 -07:00
Joe Hermaszewski f8fa161f5b Use fmapDefault and foldMapDefault 2016-09-21 10:33:18 +01:00
Joe Hermaszewski d3651984fb Add Show1 instances for base 4.9 2016-09-21 10:32:17 +01:00
John Wiegley e2b80391bb Merge pull request #38 from expipiplus1/derive
Derive foldable and traversable for more types
2016-06-29 13:33:29 -07:00
Joe Hermaszewski a19a943f9b Derive foldable and traversable for more types 2016-06-29 00:10:09 +01:00
John Wiegley e5f64d5387 Merge pull request #35 from expipiplus1/annotate
WIP: Annotate expressions with their location
2016-06-28 12:06:54 -07:00
John Wiegley 693d7b8e0d Merge pull request #37 from expipiplus1/patch-1
Use ghc7103 by default
2016-06-27 10:20:41 -07:00
Joe Hermaszewski 295e26b208 Export Delta 2016-06-25 21:56:41 +01:00
Joe Hermaszewski 2fc696ad4d Use ghc7103 by default
No problems compiling or testing. This has the advantage of binary packages being available on Hydra.
2016-06-25 19:52:56 +01:00
Joe Hermaszewski b29218c029 Derive Typeable for Ann 2016-06-25 17:40:21 +01:00
Joe Hermaszewski 0f180164e5 Bump version, slight changes to project.nix 2016-06-25 16:14:19 +01:00
Joe Hermaszewski e87bd3b67a Add instance for Show1 for Annotation and NExprF 2016-06-25 13:29:14 +01:00
Joe Hermaszewski 6c0683eff3 Remove whitespace gobbling from annotateLocation 2016-06-25 12:01:15 +01:00
Joe Hermaszewski 8c55ce604d Add F version to shorthands 2016-06-25 11:48:02 +01:00
Joe Hermaszewski 5f3903caeb Add Nix.Expr.Types.Annotated to cabal file 2016-06-25 11:38:31 +01:00
Joe Hermaszewski b1658d775f Add location versions of parsing functions 2016-06-25 11:38:06 +01:00
Joe Hermaszewski ea388358ab Reorder things in Annotation.hs 2016-06-25 11:37:50 +01:00
Joe Hermaszewski c11aad7253 Implement Annotation support functions 2016-06-25 11:17:18 +01:00
Joe Hermaszewski 850125ed54 Remove redundant imports 2016-06-23 23:55:19 +01:00
Joe Hermaszewski 3271e0c4c7 Initial work towards annotating expression with their location 2016-06-23 23:54:04 +01:00
Allen Nelson b4eff58b8c mkDots function 2016-02-18 16:52:05 -06:00
John Wiegley cf3002cf21 Merge pull request #32 from mbbx6spp/add-bench-deps
Add criterion dependency for benchmarking
2016-02-09 10:14:14 -05:00
Susan Potter 783a5a5475 Add criterion dependency for benchmarking 2016-02-07 17:53:22 -06:00
Allen Nelson 0a628dafbb implement more shorthand functions 2016-01-28 18:09:38 -06:00
Allen Nelson a5044cf2e3 Merge branch 'reorganize_types_more' 2016-01-25 13:24:57 -06:00
John Wiegley 28adc7bdb1 Merge pull request #31 from jwiegley/reorganize_types
Reorganize types
2016-01-25 12:57:57 -05:00
Allen Nelson 99b52fe48e separate expr into types and shorthands 2016-01-25 01:00:27 -06:00
Allen Nelson f04ccf9476 use KeyName list instead of AttrPath list 2016-01-24 18:01:45 -06:00
Allen Nelson 80a7dcb684 bump version, separate back out different kinds of params 2016-01-23 18:11:26 -06:00