Skip to content

update LTS to 13.28 with GHC-8.6.5 and fix dependency changes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jupyter.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: jupyter
version: 0.9.0
version: 0.9.1
synopsis: A library for creating and using Jupyter kernels.

description: An implementation of the Jupyter messaging protocol, used to implement Jupyter kernels in Haskell or communicate with existing Jupyter kernels via the messaging protocol.
Expand Down
4 changes: 3 additions & 1 deletion src/Jupyter/Client.hs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ A more detailed example is provided in the
directory, and more information about the client and kernel interfaces can be found on the @jupyter@
<https://github.com/gibiansky/jupyter-haskell README>.
-}

{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
Expand Down Expand Up @@ -96,6 +97,7 @@ import Control.Concurrent (threadDelay)
import Control.Exception (bracket, catch)
import Control.Monad (forever)
import Data.Maybe (fromMaybe)
import Control.Monad.Fail (MonadFail)

-- Imports from 'bytestring'
import Data.ByteString (ByteString)
Expand Down Expand Up @@ -145,7 +147,7 @@ data ClientState = forall z.
-- Use 'sendClientRequest' and 'sendClientComm' to construct 'Client' values, the 'Monad' interface to
-- manipulate them, and 'runClient' to supply all needed connection info and run the action.
newtype Client a = Client { unClient :: ReaderT ClientState IO a }
deriving (Functor, Applicative, Monad, MonadIO, MonadReader ClientState, MonadThrow, MonadCatch, MonadMask)
deriving (Functor, Applicative, Monad, MonadIO, MonadReader ClientState, MonadThrow, MonadCatch, MonadMask, MonadFail)

-- | A connection to a kernel from a client.
--
Expand Down
2 changes: 1 addition & 1 deletion src/Jupyter/Messages.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ instance ToJSON Comm where
-- 'displayJavascript', etc, utilities; the 'Monoid' instance can be used to combine 'DisplayData'
-- values to create values with multiple possible representations.
newtype DisplayData = DisplayData (Map MimeType Text)
deriving (Eq, Ord, Show, Monoid)
deriving (Eq, Ord, Show, Semigroup, Monoid)

-- | Create a @text/plain@ 'DisplayData' bundle out of a bit of 'Text'.
displayPlain :: Text -> DisplayData
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
flags: {}
packages:
- '.'
resolver: lts-6.2
resolver: lts-13.28