Commit a1f723cb authored by Andrew Gibiansky's avatar Andrew Gibiansky

Merge pull request #228 from gregwebs/classy-prelude-constraints

Avoid a conflicting version of classy-prelude
parents 895c262b 7c06cf47
...@@ -59,7 +59,7 @@ library ...@@ -59,7 +59,7 @@ library
base64-bytestring >=1.0, base64-bytestring >=1.0,
bytestring >=0.10, bytestring >=0.10,
cereal >=0.3, cereal >=0.3,
classy-prelude >=0.7, classy-prelude (>= 0.7 && < 0.8.3) || (>= 0.9 && < 1.0),
cmdargs >=0.10, cmdargs >=0.10,
containers >=0.5, containers >=0.5,
directory -any, directory -any,
......
...@@ -15,7 +15,7 @@ module IHaskell.Display ( ...@@ -15,7 +15,7 @@ module IHaskell.Display (
Widget(..), Widget(..),
) where ) where
import ClassyPrelude import ClassyPrelude hiding (atomically) -- a lifted version
import Data.Serialize as Serialize import Data.Serialize as Serialize
import Data.ByteString hiding (map, pack) import Data.ByteString hiding (map, pack)
import Data.String.Utils (rstrip) import Data.String.Utils (rstrip)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment