Commit Graph

1022 Commits

Author SHA1 Message Date
John Wiegley
5176cffd2d
Add a Docker build, as another way of testing out hnix 2018-05-07 12:45:37 -07:00
John Wiegley
080f5ead1d
When running nix-instantiate in the tests, use a temporary store 2018-05-07 12:38:24 -07:00
John Wiegley
ce3b0d70e9
Move all of the parsing code into a single module, for optimization 2018-05-07 12:06:56 -07:00
John Wiegley
e6e117f6b7
Disable the builtins.path test for now, until #128 is fixed 2018-05-07 12:06:45 -07:00
John Wiegley
ee1f148235
Change to the build matrix 2018-05-06 23:17:26 -07:00
John Wiegley
ef70f44be1
Don't use sudo: false in .travis.yml 2018-05-06 22:14:54 -07:00
John Wiegley
76a54f5580
Fix to the pretty printing of @ names 2018-05-06 22:14:01 -07:00
John Wiegley
1a376598a6
Pretty print expressions when using -v5 and just --parse 2018-05-06 22:13:44 -07:00
John Wiegley
2457efdaa3
Only invoke pretty/parser tests if PRETTY_TESTS=<N> for some N>0 2018-05-06 22:13:30 -07:00
John Wiegley
ac3ab07b8b
Disable caching for Travis builds, it exceeds the one hour time limit 2018-05-06 21:09:07 -07:00
John Wiegley
9bf8b4e8be
Increase the build timeout in .travis.yml, maybe it will let caching work? 2018-05-06 20:43:32 -07:00
John Wiegley
71820ca2da
Expand the build matrix 2018-05-06 19:58:57 -07:00
John Wiegley
17ad13082c
Build the pending branch, to allow for Travis testing outside of master 2018-05-06 19:58:00 -07:00
John Wiegley
fbd6c94eaf
Use nix-shell in .travis.yml, not nix-env 2018-05-06 19:57:39 -07:00
John Wiegley
540052e28d
More Travis changes 2018-05-06 19:55:23 -07:00
John Wiegley
109ba50877
Update .travis.yml 2018-05-06 16:23:12 -07:00
John Wiegley
449f961dcd
Update .travis.yml 2018-05-06 16:22:03 -07:00
John Wiegley
c0a670e944
Update .travis.yml 2018-05-06 16:15:24 -07:00
John Wiegley
fb5993c0fa
Add some additional testing files 2018-05-06 12:56:43 -07:00
John Wiegley
439c819bba
Merge pull request #306 from jwiegley/cache
Try using caching on Travis
2018-05-06 12:50:40 -07:00
John Wiegley
9a499a4bd4
Build with profiling enabled, as an extra check
Since this is a superset of what is needed to build without profiling.
2018-05-06 12:49:34 -07:00
John Wiegley
e2a6a65d35 Try using caching on Travis 2018-05-06 12:30:54 -07:00
John Wiegley
ce35811f29 Resolve a build warning 2018-05-06 12:30:16 -07:00
John Wiegley
1a7ec43199 Disable PrettyParseTests for now 2018-05-06 11:14:53 -07:00
John Wiegley
90a42c3c7d
Merge pull request #301 from jwiegley/master
Make use of lens-family to provide some utility lenses/traversals
2018-05-06 10:44:26 -07:00
John Wiegley
1895cff9cc Update hnix.cabal 2018-05-06 10:43:51 -07:00
John Wiegley
b79a44bd95 Don't include Control.Applicative where not necessary 2018-05-06 10:43:43 -07:00
John Wiegley
e7a6456a35 Make use of lens-family to provide some utility lenses/traversals 2018-05-06 10:43:43 -07:00
John Wiegley
05088a9dbd
Merge pull request #302 from BlairArchibald/fix/280
Fix #280. unsafeGetAttrPos should return null.
2018-05-06 10:41:38 -07:00
John Wiegley
b886e5825e
Merge pull request #229 from mpickering/quickcheck-expr
Add QuickCheck test for pretty printer and parser
2018-05-06 10:41:05 -07:00
Blair Archibald
aae7f13ab1 Fix #280. unsafeGetAttrPos should return null.
According to the expected test output, unsafeGetAttrPos should fail silently and
return null if it can't find a position for the field (e.g when looking up
builtins).
2018-05-06 13:17:43 +01:00
Matthew Pickering
ae0167110d Escape paths when used in a selector
./a."abc" gets parsed as App (./a.) "abc"
when pretty printing, it is necessary to escape the path to
${./a}."abc" so that it is then parsed correctly.
2018-05-06 10:31:52 +00:00
Matthew Pickering
34d0552517 Fix pretty printing of EscapedNewline 2018-05-06 10:31:52 +00:00
Matthew Pickering
b0ed29b3df Add QuickCheck test for pretty printer and parser
I have not spent any time optimising the generated programs but they do
not look totally unreasonable from a cursory inspection.

Fixes #158
2018-05-06 10:31:52 +00:00
John Wiegley
9e50e9e069 Make use of attrsetGet in another place 2018-05-06 00:35:29 -07:00
John Wiegley
11a89d2b40 Add a Calling info frame 2018-05-06 00:35:21 -07:00
John Wiegley
888944ebff Some very minor fixes to warnings 2018-05-06 00:34:38 -07:00
John Wiegley
0c58a5b6c1 Further README fix 2018-05-03 11:42:57 -07:00
John Wiegley
bf89470ef4 Fix Gitter link in README.md
Fixes #290
2018-05-03 11:41:49 -07:00
John Wiegley
34d641a2fe
Merge pull request #288 from jwiegley/master
Pull request for master
2018-05-02 22:09:31 -07:00
John Wiegley
b1b027286b Fix a warning in Builtins.hs 2018-05-02 21:39:23 -07:00
John Wiegley
a627d885e8 Implement builtins.fetchurl
Squashed commit of the following:

commit 15b10d898e
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 16:33:30 2018 -0700

    Update Exec.hs

commit d4a886dccf
Merge: 02afb27 4caacc1
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 16:08:55 2018 -0700

    Merge branch 'master' into http

commit 02afb275f2
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 16:08:42 2018 -0700

    Update Exec.hs

commit 3733ce5888
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 16:07:08 2018 -0700

    Update Builtins.hs

commit 4402be6d04
Merge: 2c60097 13f3ebd
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 15:06:28 2018 -0700

    Merge branch 'master' into http

commit 2c600976bb
Merge: 4a9d1a5 555ce95
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 14:25:59 2018 -0700

    Merge branch 'master' into http

commit 4a9d1a56d4
Merge: 4dd46f2 431006f
Author: John Wiegley <johnw@newartisans.com>
Date:   Wed May 2 14:20:57 2018 -0700

    Merge branch 'master' into http

commit 4dd46f21e3
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sun Apr 29 12:51:11 2018 -0700

    generated hnix.cabal

commit c87ae993fb
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 16:55:11 2018 -0700

    remove dep from hnix.cabal

commit 0bb8856c87
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 16:53:54 2018 -0700

    remove http-client stuff from default.nix

commit d298756a2b
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 15:49:59 2018 -0700

    getURL is implemented for both http and https

commit a3d66c07a0
Merge: c4cb48a a73eae5
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 15:14:32 2018 -0700

    Merge branch 'builtin2' into http

commit c4cb48a8a7
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 15:13:25 2018 -0700

    add getURL function

commit ff23fc18ed
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 15:06:40 2018 -0700

    use http-client-* instead of HTTP

commit fcbe40f3be
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 14:58:07 2018 -0700

    add HTTP

commit a73eae573a
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date:   Sat Apr 28 14:36:24 2018 -0700

    implement fetchurl (as a copy of fetchTarball)
2018-05-02 21:38:39 -07:00
hsloan
c1561ea711 Implement builtins.currentTime 2018-05-02 21:32:00 -07:00
Alex Rozenshteyn
a355366f32 Add builtins.hasContext 2018-05-02 20:54:51 -07:00
John Wiegley
4caacc1806
Merge pull request #287 from jwiegley/master
Pull request for master
2018-05-02 16:02:43 -07:00
John Wiegley
fe4629c3a4 More fixes to type inference 2018-05-02 15:08:53 -07:00
John Wiegley
a2e9334648 Factor out a staticImport function in Reduce.hs 2018-05-02 15:08:53 -07:00
John Wiegley
13f3ebddd4
Merge pull request #286 from jwiegley/merge257
Pull request for merge257
2018-05-02 15:05:10 -07:00
John Wiegley
593992eb26
Merge branch 'master' into merge257 2018-05-02 14:24:57 -07:00
John Wiegley
555ce952ae
Merge pull request #285 from jwiegley/pending
Further corrections to type checking functions that take sets
2018-05-02 14:24:05 -07:00