Removed `ipython-kernel`, merged back.

Separating packages not working so well.

ihaskell.cabal

@@ -7,7 +7,7 @@ name:                ihaskell
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.3.0.4
+version:             0.3.0.5
 
 -- A short (one-line) description of the package.
 synopsis:            A Haskell backend kernel for the IPython project.
@@ -53,8 +53,8 @@ library
   default-language:    Haskell2010
   ghc-options: -threaded
   build-depends:       
-                       base                 ==4.6.*,
                        aeson                >=0.6 && < 0.8,
+                       base                 ==4.6.*,
                        base64-bytestring    >=1.0,
                        bytestring           >=0.10,
                        cereal               >=0.3,
@@ -65,15 +65,14 @@ library
                        filepath             -any,
                        ghc                  ==7.6.*,
                        ghc-parser           >=0.1.1,
-                       ghci-lib             >=0.1,
                        ghc-paths            ==0.1.*,
+                       ghci-lib             >=0.1,
                        haskeline            -any,
                        here                 ==1.2.*,
                        hlint                -any,
                        hspec                -any,
                        HTTP                 -any,
                        HUnit                -any,
-                       ipython-kernel       -any,
                        MissingH             >=1.2,
                        mtl                  >=2.1,
                        parsec               -any,
@@ -81,17 +80,19 @@ library
                        random               >=1.0,
                        shelly               ==1.5.*,
                        split                >= 0.2,
+                       stm                  -any,
                        strict               >=0.3,
                        system-argv0         -any,
                        system-filepath      -any,
                        tar                  -any,
+                       text                 >=0.11,
                        transformers         -any,
                        unix                 >= 2.6,
                        unordered-containers -any,
-                       stm                  -any,
-                       text                 -any,
                        utf8-string          -any,
-                       vector               -any
+                       uuid                 >=1.3,
+                       vector               -any,
+                       zeromq4-haskell      >=0.1
 
   exposed-modules: IHaskell.Display
                    IHaskell.Convert
@@ -110,6 +111,13 @@ library
                    IHaskell.Flags
                    IHaskell.Types
                    IHaskell.BrokenPackages
+                   IHaskell.IPython.Kernel
+                   IHaskell.IPython.Types
+                   IHaskell.IPython.ZeroMQ
+                   IHaskell.IPython.Stdin
+                   IHaskell.IPython.Message.Writer
+                   IHaskell.IPython.Message.Parser
+                   IHaskell.IPython.Message.UUID
                    Paths_ihaskell
 --  other-modules: 
 --                   Paths_ihaskell

ipython-kernel/LICENSE

-The MIT License (MIT)
-
-Copyright (c) 2013 Andrew Gibiansky
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ipython-kernel/Setup.hs

-import Distribution.Simple
-main = defaultMain

ipython-kernel/ipython-kernel.cabal

-name:                ipython-kernel
-version:             0.1.0.0
-synopsis:            A library for creating kernels for IPython frontends
-
-description:         ipython-kernel is a library for communicating with frontends for the interactive IPython framework. It is used extensively in IHaskell, the interactive Haskell environment.
-homepage:            http://github.com/gibiansky/IHaskell
-license:             MIT
-license-file:        LICENSE
-author:              Andrew Gibiansky
-maintainer:          andrew.gibiansky@gmail.com
-
-category:            Development
-build-type:          Simple
-
-cabal-version:       >=1.16
-
-library
-  exposed-modules:     IPython.Kernel
-                       IPython.Types
-                       IPython.ZeroMQ
-                       IPython.Stdin
-                       IPython.Message.Writer
-                       IPython.Message.Parser
-                       IPython.Message.UUID
-  -- other-modules:       
-  other-extensions:    OverloadedStrings
-  hs-source-dirs:      src
-  default-language:    Haskell2010
-  build-depends:       base            >=4.6 && <4.7,
-                       aeson           >=0.6 && <0.8,
-                       bytestring      >=0.10,
-                       cereal          >=0.3,
-                       containers      >=0.5,
-                       text            >=0.11,
-                       unix            >=2.6,
-                       uuid            >=1.3,
-                       zeromq4-haskell >=0.1

src/IHaskell/Eval/Evaluate.hs

@@ -70,7 +70,7 @@ import IHaskell.Display
 import qualified IHaskell.Eval.Hoogle as Hoogle
 import IHaskell.Eval.Util
 import IHaskell.BrokenPackages
-import qualified  IPython.Message.UUID      as UUID
+import qualified  IHaskell.IPython.Message.UUID      as UUID
 
 import Paths_ihaskell (version)
 import Data.Version (versionBranch)

ipython-kernel/src/IPython/Kernel.hs → src/IHaskell/IPython/Kernel.hs

 -- | This module exports all the types and functions necessary to create an
 -- IPython language kernel that supports the @ipython console@ and @ipython
 -- notebook@ frontends. 
-module IPython.Kernel (
-  module IPython.Types,
-  module IPython.Message.Writer,
-  module IPython.Message.Parser,
-  module IPython.Message.UUID,
-  module IPython.ZeroMQ,
+module IHaskell.IPython.Kernel (
+  module IHaskell.IPython.Types,
+  module IHaskell.IPython.Message.Writer,
+  module IHaskell.IPython.Message.Parser,
+  module IHaskell.IPython.Message.UUID,
+  module IHaskell.IPython.ZeroMQ,
   ) where
 
-import IPython.Types
-import IPython.Message.Writer
-import IPython.Message.Parser
-import IPython.Message.UUID
-import IPython.ZeroMQ
+import IHaskell.IPython.Types
+import IHaskell.IPython.Message.Writer
+import IHaskell.IPython.Message.Parser
+import IHaskell.IPython.Message.UUID
+import IHaskell.IPython.ZeroMQ

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

@@ -4,7 +4,7 @@
 -- This module is responsible for converting from low-level ByteStrings
 -- obtained from the 0MQ sockets into Messages. The only exposed function is
 -- `parseMessage`, which should only be used in the low-level 0MQ interface.
-module IPython.Message.Parser (parseMessage) where
+module IHaskell.IPython.Message.Parser (parseMessage) where
 
 import            Data.Aeson            ((.:), decode, Result(..), Object)
 import            Control.Applicative   ((<|>))
@@ -15,7 +15,7 @@ import            Data.Text             (Text)
 
 import qualified  Data.ByteString.Lazy as Lazy
 
-import IPython.Types
+import IHaskell.IPython.Types
 
 type LByteString = Lazy.ByteString
 

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

 -- | Description : UUID generator and data structure
 --
 -- Generate, parse, and pretty print UUIDs for use with IPython.
-module IPython.Message.UUID (
+module IHaskell.IPython.Message.UUID (
   UUID,
   random, randoms,
   ) where

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

@@ -2,7 +2,7 @@
 -- | Description : @ToJSON@ for Messages
 --
 -- This module contains the @ToJSON@ instance for @Message@.
-module IPython.Message.Writer (
+module IHaskell.IPython.Message.Writer (
   ToJSON(..)
 )  where
 
@@ -15,7 +15,7 @@ import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString as B
 import Data.Text.Encoding
 
-import IPython.Types
+import IHaskell.IPython.Types
 
 -- Convert message bodies into JSON.
 instance ToJSON Message where

ipython-kernel/src/IPython/Stdin.hs → src/IHaskell/IPython/Stdin.hs

@@ -28,7 +28,7 @@
 -- and @recordKernelProfile@. Note that if this is being used from within
 -- the GHC API, @fixStdin@ /must/ be called from within the GHC session
 -- not from the host code.
-module IPython.Stdin (
+module IHaskell.IPython.Stdin (
   fixStdin,
   recordParentHeader,
   recordKernelProfile
@@ -45,9 +45,9 @@ import            System.Posix.IO
 import            System.IO.Unsafe
 import qualified  Data.Map                    as Map
 
-import            IPython.Types
-import            IPython.ZeroMQ
-import            IPython.Message.UUID       as UUID
+import            IHaskell.IPython.Types
+import            IHaskell.IPython.ZeroMQ
+import            IHaskell.IPython.Message.UUID       as UUID
 
 stdinInterface :: MVar ZeroMQStdin
 {-# NOINLINE stdinInterface #-}

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

 {-# LANGUAGE OverloadedStrings, DeriveDataTypeable, DeriveGeneric #-}
 -- | This module contains all types used to create an IPython language
 -- kernel.
-module IPython.Types (
+module IHaskell.IPython.Types (
   -- * IPython kernel profile
   Profile(..),
   Transport(..),
@@ -34,7 +34,7 @@ import qualified  Data.Text                   as Text
 import qualified  Data.Text.Encoding          as Text
 import            Data.Text                   (Text)
 import            Data.Serialize
-import            IPython.Message.UUID
+import            IHaskell.IPython.Message.UUID
 import            GHC.Generics                (Generic)
 import            Data.Typeable
 import            Data.List                   (find)

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

@@ -4,7 +4,7 @@
 -- The "ZeroMQ" module abstracts away the low-level 0MQ based interface with IPython,
 -- replacing it instead with a Haskell Channel based interface. The `serveProfile` function
 -- takes a IPython profile specification and returns the channel interface to use.
-module IPython.ZeroMQ (
+module IHaskell.IPython.ZeroMQ (
   ZeroMQInterface (..),
   ZeroMQStdin(..),
   serveProfile,
@@ -19,9 +19,9 @@ import            System.IO.Unsafe
 import            Data.Aeson            (encode)
 import            System.ZMQ4           hiding (stdin)
 
-import IPython.Types
-import IPython.Message.Parser
-import IPython.Message.Writer
+import IHaskell.IPython.Types
+import IHaskell.IPython.Message.Parser
+import IHaskell.IPython.Message.Writer
 
 -- | 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

src/IHaskell/Types.hs

@@ -41,7 +41,7 @@ import            Data.Aeson                      (Value)
 import            Text.Read                       as Read hiding (pfail, String)
 import            Text.ParserCombinators.ReadP
 
-import IPython.Kernel
+import IHaskell.IPython.Kernel
 
 data ViewFormat
      = Pdf

src/Main.hs

@@ -27,11 +27,11 @@ import            IHaskell.Eval.Info
 import            IHaskell.Flags
 import            IHaskell.IPython
 import            IHaskell.Types
-import            IPython.ZeroMQ
-import            IPython.Types
+import            IHaskell.IPython.ZeroMQ
+import            IHaskell.IPython.Types
 import qualified  Data.ByteString.Char8     as Chars
-import qualified  IPython.Message.UUID      as UUID
-import qualified  IPython.Stdin             as Stdin
+import qualified  IHaskell.IPython.Message.UUID      as UUID
+import qualified  IHaskell.IPython.Stdin             as Stdin
 
 -- GHC API imports.
 import GHC        hiding (extensions, language)