mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-24 01:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
454 Commits 10 Branches 23 Tags
Commit Graph

454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Gibiansky
69237e6e23 moving modes to first position in args, closes #179 2014-03-02 11:15:34 -08:00
Andrew Gibiansky
3da50156fd fixing --ipython flag, closes #178 2014-03-01 18:53:22 -08:00
Andrew Gibiansky
e29336d8ce Merge branch 'master' of github.com:gibiansky/IHaskell 2014-03-01 18:38:18 -08:00
Andrew Gibiansky
2de3c749c6 significant change to ihaskell display evaluation 2014-03-01 17:16:56 -08:00
Andrew Gibiansky
5dc11f2fe7 mostly working, it not being updated 2014-02-28 23:21:13 -08:00
Andrew Gibiansky
eff713ada7 add note about python-dev being necessary on Linux 2014-02-28 22:42:51 -08:00
Andrew Gibiansky
957de8ff57 upgraded everything to aeson >= 0.7, which required fairly major changes 2014-02-28 22:20:29 -08:00
Andrew Gibiansky
95e15affc0 fixing build.sh 2014-02-28 21:16:15 -08:00
Andrew Gibiansky
df7625e8ca Replacing SVG with base64 encoded html+img tag for svg, closes #187 2014-02-28 19:49:40 -08:00
Andrew Gibiansky
4b4c233bcb allowing very new shelly 2014-02-28 16:25:48 -08:00
Andrew Gibiansky
b88d0c744b adding checks for broken packages 2014-02-28 16:19:37 -08:00
Andrew Gibiansky
a741c62b00 require shelly 1.3, and add note about why 2014-02-28 15:43:51 -08:00