Tweaks

.gitignore

@@ -22,5 +22,4 @@ cabal.sandbox.config
 .tmp1
 .tmp2
 .tmp3
-.stack-work
-ghc-parser/*
+.stack-work
\ No newline at end of file
\ No newline at end of file

ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs

@@ -2,12 +2,12 @@
 
 module IHaskell.Display.Diagrams (diagram, animation) where
 
-import           System.Directory
 import qualified Data.ByteString.Char8 as Char
+import           System.Directory
 import           System.IO.Unsafe
 
-import           Diagrams.Prelude
 import           Diagrams.Backend.Cairo
+import           Diagrams.Prelude
 
 import           IHaskell.Display
 import           IHaskell.Display.Diagrams.Animation
@@ -20,6 +20,7 @@ instance IHaskellDisplay (QDiagram Cairo V2 Double Any) where
 
 diagramData :: Diagram Cairo -> OutputType -> IO DisplayData
 diagramData renderable format = do
+  putStrLn "About to switch to tmp dir!"
   switchToTmpDir
 
   -- Compute width and height.
@@ -29,12 +30,17 @@ diagramData renderable format = do
       imgHeight = 300
       imgWidth = aspect * imgHeight
 
+  putStrLn "Going to do renderCairo!"
+
   -- Write the image.
   let filename = ".ihaskell-diagram." ++ extension format
   renderCairo filename (mkSizeSpec2D (Just imgWidth) (Just imgHeight)) renderable
 
+  putStrLn "Did renderCairo, about to readFile"
+
   -- Convert to base64.
   imgData <- Char.readFile filename
+  putStrLn "Did readFile"
   let value =
         case format of
           PNG -> png (floor imgWidth) (floor imgHeight) $ base64 imgData

ipython-kernel/src/IHaskell/IPython/Message/Parser.hs

@@ -7,7 +7,7 @@
 -- the low-level 0MQ interface.
 module IHaskell.IPython.Message.Parser (parseMessage) where
 
-import           Control.Applicative ((<|>), (<$>), (<*>))
+-- import           Control.Applicative ((<|>), (<$>), (<*>))
 import           Data.Aeson ((.:), (.:?), decode, Result(..), Object, Value(..))
 import           Data.Aeson.Types (parse, parseEither)
 import           Data.ByteString hiding (unpack)

ipython-kernel/src/IHaskell/IPython/Message/UUID.hs

@@ -4,7 +4,7 @@
 module IHaskell.IPython.Message.UUID (UUID, random, randoms, uuidToString) where
 
 import           Control.Monad (mzero, replicateM)
-import           Control.Applicative ((<$>))
+-- import           Control.Applicative ((<$>))
 import           Data.Text (pack)
 import           Data.Aeson
 import           Data.UUID.V4 (nextRandom)

ipython-kernel/src/IHaskell/IPython/Message/Writer.hs

@@ -7,12 +7,12 @@ module IHaskell.IPython.Message.Writer (ToJSON(..)) where
 
 import           Data.Aeson
 import           Data.Map (Map)
-import           Data.Monoid (mempty)
+-- import           Data.Monoid (mempty)
 import           Data.Text (Text, pack)
 
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Lazy as L
-import           Data.Text.Encoding
+-- import qualified Data.ByteString as B
+-- import qualified Data.ByteString.Lazy as L
+-- import           Data.Text.Encoding
 
 import           IHaskell.IPython.Types
 

ipython-kernel/src/IHaskell/IPython/Types.hs

@@ -34,13 +34,13 @@ module IHaskell.IPython.Types (
     extractPlain,
     ) where
 
-import           Control.Applicative ((<$>), (<*>))
+-- import           Control.Applicative ((<$>), (<*>))
 import           Data.Aeson
 import           Data.ByteString (ByteString)
 import           Data.List (find)
 import           Data.Map (Map)
 import           Data.Serialize
-import qualified Data.String as S
+-- import qualified Data.String as S
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text

ipython-kernel/src/IHaskell/IPython/ZeroMQ.hs

@@ -18,9 +18,9 @@ import           Control.Concurrent
 import           Control.Exception
 import           Control.Monad
 import           Data.Aeson
-import qualified Data.ByteString.Lazy as LBS
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as Char
+import qualified Data.ByteString.Lazy as LBS
 import           Data.Char
 import           Data.Digest.Pure.SHA as SHA
 import           Data.Monoid ((<>))
@@ -28,16 +28,16 @@ import qualified Data.Text.Encoding as Text
 import           System.ZMQ4 as ZMQ4 hiding (stdin)
 import           Text.Read (readMaybe)
 
-import           IHaskell.IPython.Types
 import           IHaskell.IPython.Message.Parser
-import           IHaskell.IPython.Message.Writer
+import           IHaskell.IPython.Message.Writer ()
+import           IHaskell.IPython.Types
 
 -- | The channel interface to the ZeroMQ sockets. All communication is done via Messages, which are
 -- encoded and decoded into a lower level form before being transmitted to IPython. These channels
 -- should functionally serve as high-level sockets which speak Messages instead of ByteStrings.
 data ZeroMQInterface =
        Channels
-         { 
+         {
          -- | A channel populated with requests from the frontend.
          shellRequestChannel :: Chan Message
          -- | Writing to this channel causes a reply to be sent to the frontend.

ipython-kernel/stack.yaml

-flags:
-  ipython-kernel:
-    examples: false
-packages:
-- '.'
-extra-deps: []
-resolver: nightly-2015-08-15