picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1594 commits 1 branch 0 tags 3.5 MiB
Commit graph

1594 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Wiegley 269faf88a8
Jailbreak the these package for 8.6.3 2019-02-16 17:26:36 -08:00
John Wiegley a9ba6f1735
Bump the default version to GHC 8.6.3 2019-02-16 15:39:03 -08:00
John Wiegley e7efbb4f06
Merge pull request #430 from Mic92/help 
improve hnix REPL help
 2019-01-27 21:55:08 -08:00
Jörg Thalheim 8b10c79e41
improve hnix REPL help 
all commands needs to prefixed by :
 2019-01-27 20:07:43 +00:00
John Wiegley 3216a7f4ce
Create a stand-in function for pretty source location info 2019-01-08 11:00:09 -08:00
John Wiegley b6dfaa22e9
Resolve a compile-time warning 2019-01-08 10:24:40 -08:00
John Wiegley d4d73ae12c
Merge remote-tracking branch 'origin/master' into pending 2019-01-08 10:22:49 -08:00
John Wiegley ed12ee1077
Disable using ghc-datasize for now 2019-01-08 10:22:39 -08:00
John Wiegley 617d0867ab
Merge pull request #427 from kmicklas/json-stringcontext 
Use WithStringContext(T) for nvalueToJSON
 2018-12-14 09:28:29 -08:00
Ken Micklas 4f61c4f3e7 Use extractNixString for JSON string 2018-12-14 12:04:20 -05:00
Ken Micklas ad0d2d2bf8 Use WithStringContext(T) for nvalueToJSON 2018-12-13 16:59:51 -05:00
John Wiegley e360468c20
Merge pull request #422 from kmicklas/xml-string-context 
Accumulate string context in builtins.toXML
 2018-12-10 21:12:38 -08:00
Ken Micklas 824615aabe Merge branch 'master' into xml-string-context 2018-12-10 15:48:29 -05:00
Ken Micklas 195d4531cd Fix build in tests 2018-12-10 15:33:29 -05:00
John Wiegley 281644a3b2
Merge pull request #405 from haskell-nix/remove-fromnix-text-instances 
Remove {To,From}{Nix,Value} Text instances
 2018-12-09 11:13:23 -08:00
Doug Beardsley 7d2f9d874a Move json code into separate module 2018-12-09 13:57:58 -05:00
Doug Beardsley df26aa12e9 Merge remote-tracking branch 'origin/master' into remove-fromnix-text-instances 2018-12-09 13:57:15 -05:00
Ken Micklas 810821087a Fix hnix exe type error 2018-12-07 17:02:38 -05:00
Ken Micklas b1d48c5364 Accumulate string context in builtins.toXML 2018-12-06 18:11:06 -05:00
Ken Micklas dcbde8c2d5 Add WithStringContext 2018-12-06 18:11:06 -05:00
Doug Beardsley 95d4b9406d Really add toJSON test case 2018-12-05 15:01:55 -05:00
Doug Beardsley 38147f81a9 Fix toJSON context handling and add test case 2018-12-05 14:59:42 -05:00
Doug Beardsley 5c6b1ff285 Fix replaceStrings and add test case to catch mistake 2018-12-05 11:53:59 -05:00
Doug Beardsley 5b1117f6b9 Add test case for placeholder and get it passing 2018-12-05 08:43:31 -05:00
Doug Beardsley 23250a3433 Misc cleanup 2018-12-05 06:26:59 -05:00
John Wiegley 9b161172a5
Merge pull request #421 from NinjaTrappeur/storedir-string 
Change builtins.storeDir type to String
 2018-12-03 12:57:19 -08:00
Doug Beardsley 1748e7ce7a Fix behavior of baseNameOf 2018-12-03 05:00:50 -05:00
Doug Beardsley 34e79f465f Add failing test case demonstrating baseNameOf problem 2018-12-03 04:42:50 -05:00
Doug Beardsley 4b28407936 Fix eval-okay-context test failure 2018-12-03 00:48:15 -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
Doug Beardsley ab3fc101dd Merge branch 'master' into remove-fromnix-text-instances 2018-11-29 10:36:03 -05:00
John Wiegley 0b34b7060b
Merge pull request #420 from haskell-nix/revert-xml-string-context-build-fixes 
Revert "Fix compilation"
 2018-11-27 11:54:38 -08:00
Shea Levy f63ec259e0
Partial Revert "Revert "Fix compilation"" 
Still need the repl fix.

This reverts commit 2bba6c84e6.
 2018-11-27 14:37:31 -05:00
Shea Levy 2bba6c84e6
Revert "Fix compilation" 
This fix isn't necessary now that the XML context change is
reverted.

This reverts commit 51d493f484.
 2018-11-27 14:22:04 -05:00
John Wiegley 83e5dc7aa3
Merge pull request #418 from haskell-nix/revert-xml-string-context 
Revert "Merge pull request #413 from haskell-nix/xml-string-context"
 2018-11-26 12:00:23 -08:00
John Wiegley cb2cbbd409
Merge pull request #417 from domenkozar/fixCompilation 
Fix compilation + warnings
 2018-11-26 11:58:21 -08:00
Shea Levy 952e2603ea
Revert "Merge pull request #413 from haskell-nix/xml-string-context" 
Let's try to find a way to avoid exporting the NixString constructors
first.

This reverts commit ed07384563, reversing
changes made to 4bfe2cc60c.
 2018-11-25 08:03:30 -05:00
Domen Kožar 48fe67748b
Fix warnings 2018-11-25 10:08:17 +00:00
Domen Kožar 51d493f484
Fix compilation 2018-11-25 10:01:14 +00:00
John Wiegley ed07384563
Merge pull request #413 from haskell-nix/xml-string-context 
Accumulate string context in builtins.toXML
 2018-11-24 19:15:06 -08:00
John Wiegley 4bfe2cc60c
Merge pull request #408 from domenkozar/type-string-context 
Distinguish string with or without context when revealing type
 2018-11-24 19:12:42 -08:00
John Wiegley 98c57eb7ce
Merge pull request #409 from domenkozar/repl-typeof 
add typeof and partial binding tracking
 2018-11-24 19:11:46 -08:00
John Wiegley a6565b62a4
Merge pull request #414 from domenkozar/issue-412 
Make -v1 default for better usability on errors
 2018-11-24 19:11:02 -08:00
John Wiegley 2735ae87f8
Merge pull request #415 from domenkozar/thunk-loop 
thunk loop -> infinite recursion
 2018-11-24 19:09:42 -08:00
John Wiegley f7a370b53f
Correct an informational message 2018-11-24 19:09:28 -08:00
John Wiegley ab4dfce90a
Merge pull request #416 from Infinisil/developPackageName 
Fix Nix build for external imports
 2018-11-24 19:04:43 -08:00
Silvan Mosberger 8ef09e6efa
Fix Nix build for external imports 
Previously `import (pkgs.fetchgit { url = ...; rev = ...; sha256 = ...; })`
would give a cabal2nix error
 2018-11-24 21:50:37 +01:00
Doug Beardsley a39a5518ea Merge remote-tracking branch 'origin/pending' into remove-fromnix-text-instances 2018-11-24 15:22:54 -05:00
Doug Beardsley 81c649b96e Fix comment 2018-11-24 15:22:02 -05:00
Domen Kožar c450af4dcd
repl: add welcome text and :help command 2018-11-24 20:17:45 +00:00