516 Commits

Author SHA1 Message Date
Andrew Gibiansky
ddc8f62369 nb change 2014-03-18 10:44:47 -07:00
Andrew Gibiansky
e2eef7094a everything is clean and works, i think 2014-03-18 01:18:03 -07:00
Andrew Gibiansky
3ca98642b8 parsec working! all cleaned up 2014-03-18 01:02:18 -07:00
Andrew Gibiansky
f07febc32a cleaned things up, and initial version of stuff works!! 2014-03-17 20:25:53 -07:00
Andrew Gibiansky
721c5d1d45 comms work now 2014-03-17 13:11:48 -07:00
Andrew Gibiansky
631bebe143 Backend should now start comms. Untested. 2014-03-17 11:35:50 -07:00
Andrew Gibiansky
9f83db983f Progress on adding comms. Added things to Evaluate.hs; incomplete!!! 2014-03-16 22:15:09 -07:00
Andrew Gibiansky
3762c2acff demo for frontend 2014-03-16 21:33:33 -07:00
Andrew Gibiansky
91b634b652 Adding parsec ihaskell-display. So far, no comm. 2014-03-16 17:23:13 -07:00
Andrew Gibiansky
42d2493091 Adding types and scaffold for widgets. 2014-03-16 16:37:32 -07:00
Andrew Gibiansky
47e0bbec9c Changing diagrams dependencies a bit. 2014-03-16 14:39:17 -07:00
Andrew Gibiansky
152ddb5cf9 add -threaded to cabal file 2014-03-10 16:51:47 -07:00
Andrew Gibiansky
3ef3a71016 Merge remote-tracking branch 'gregwebs/docker3'
Conflicts:
	README.md
2014-03-09 20:41:36 -07:00
Greg Weber
1217d2d339 update README to use docker index build 2014-03-09 19:16:35 -07:00
Greg Weber
70c5505ab4 use own haskell-platform build with a proper user 2014-03-09 19:16:16 -07:00
Andrew Gibiansky
a6a9412dba minor update, closes #154 2014-03-09 18:00:09 -07:00
Andrew Gibiansky
0b750e1577 Adding --help support. 2014-03-09 17:57:08 -07:00
Andrew Gibiansky
80d02adc2e fixing cabal from debug state, oops 2014-03-09 17:44:46 -07:00
Andrew Gibiansky
2b4af24b75 undoing debugging printDisplay 2014-03-09 17:27:13 -07:00
Andrew Gibiansky
59322359ce Adding displayFromChan, as per aavogt's PR. 2014-03-09 17:25:45 -07:00
Andrew Gibiansky
79db72cf17 Updates to Display for using Text. Now compiles and runs. 2014-03-09 13:49:43 -07:00
Andrew Gibiansky
fb22bcf468 Fixed text/bytestring handling in Main, as per @aavogt's PR 2014-03-09 13:21:26 -07:00
Andrew Gibiansky
0f6651e987 Adding semigroup instance for Display. 2014-03-09 13:12:52 -07:00
Andrew Gibiansky
4afb19064c Adding command-line handling for conversions (@aavogt) 2014-03-09 13:11:33 -07:00
Andrew Gibiansky
636f243e0a Adding conversion files from @aavogt 2014-03-09 12:25:13 -07:00
Andrew Gibiansky
4867841c9e Changing cabal file as per @aavogt's PR 2014-03-09 12:24:15 -07:00
Andrew Gibiansky
f5319a2c5c Switching to aeson >= 0.6 && < 0.8, as per @aavgt's PR 2014-03-09 12:21:27 -07:00
Andrew Gibiansky
c2437394a6 Adding rlangqq 2014-03-09 12:17:05 -07:00
Andrew Gibiansky
958560e012 Incorporating @aavogt changes for ihaskell-magic 2014-03-09 12:16:28 -07:00
Andrew Gibiansky
f5b12be340 Change diagrams dependency to diagrams-core. 2014-03-09 12:14:26 -07:00
Andrew Gibiansky
106fa9a365 Better error message if running build.sh from outside cabal dir 2014-03-09 12:10:37 -07:00
Andrew Gibiansky
7d21ac42ae make note of IHASKELL_IPYTHON_ARGS 2014-03-09 10:54:05 -07:00
Andrew Gibiansky
eb75fd139f minor nb updates 2014-03-09 10:43:59 -07:00
Andrew Gibiansky
ca46819881 Merge branch 'master' of github.com:gibiansky/IHaskell 2014-03-09 10:43:46 -07:00
Andrew Gibiansky
1341a5380f Adding IHASKELL_IPYTHON_ARGS support, closes #208 2014-03-09 10:43:24 -07:00
Andrew Gibiansky
279a3043da update readme with ipython info, closes #175 2014-03-09 10:34:39 -07:00
Andrew Gibiansky
17d9eb476d Merge pull request #216 from gregwebs/master
update docker documentation
2014-03-09 09:41:02 -07:00
Greg Weber
66200654e8 update docker documentation 2014-03-09 09:39:32 -07:00
Andrew Gibiansky
80d61a6681 Update README.md 2014-03-09 09:34:28 -07:00
Andrew Gibiansky
64dc3e934e Merge pull request #215 from gregwebs/docker2
Docker2
2014-03-09 09:31:42 -07:00
Greg Weber
bb73ecca55 use wisdom from alanz/ihaskell 2014-03-09 09:24:48 -07:00
Andrew Gibiansky
33562e89d5 Fixing #211 2014-03-08 22:10:57 -08:00
Andrew Gibiansky
26f0b0ee24 Merge branch 'master' of github.com:gibiansky/IHaskell 2014-03-08 21:50:19 -08:00
Andrew Gibiansky
731dd7000c Merge pull request #213 from jhenahan/cereal4
Update to cereal 4
2014-03-08 21:50:14 -08:00
Andrew Gibiansky
a6c7ec2454 minor stupid things 2014-03-08 21:50:06 -08:00
Greg Weber
30d24eec7c add Dockerfile. addresses #136 2014-03-08 20:03:22 -08:00
Jack Henahan
01b603e440 Update to cereal 4
Build goes smoothly, tests pass.
2014-03-08 19:36:28 -05:00
Andrew Gibiansky
7d4a92ef4d moving juicy pixels 2014-03-06 18:23:15 -08:00
Andrew Gibiansky
07044aeaea Merge pull request #209 from hansroland/ihaskell-juicypixels
IHaskellDisplay instances for the image types of the JuicyPixels package
2014-03-04 13:03:02 -08:00
roland
d722bb783b add support for ihaskell-juicypixels 2014-03-04 21:54:46 +01:00