154a610 · streamly · git.iko.soy

git.iko.soy/streamly

Fix build for ghc-7.10.3

commit154a610eb2179c5b75211b557a528ee51698e3ae authorHarendra Kumar <harendra.kumar@gmail.com> dateTue 5 Sep 2017, 13:34 (9 years ago) parente5a180a

5 files changed+8−14

compare with master

unifiedsplit

asyncly.cabal+5−2 src/Asyncly.hs+1−1 src/Asyncly/AsyncT.hs+2−2 stack.yaml−5 test/Main.hs−4

asyncly.cabal+5−2

@@ -44,7 +44,7 @@ library

4444 , monad-control >= 1.0 && < 2

4545 , mtl >= 2.2 && < 3

4646 , stm >= 2.4.3 && < 2.5

47− , transformers >= 0.5 && < 0.6

47+ , transformers >= 0.4 && < 0.6

4848 , transformers-base >= 0.4 && < 0.5

4949

5050test-suite test

@@ -58,6 +58,9 @@ test-suite test

5858 , base >= 4.8 && < 5

5959 , hspec >= 2.0 && < 3

6060 , containers >= 0.5 && < 0.6

61+ if impl(ghc < 8.0)

62+ build-depends:

63+ transformers >= 0.4 && < 0.6

6164 default-language: Haskell2010

6265

6366benchmark bench

@@ -78,7 +81,7 @@ benchmark bench

7881 , machines >= 0.6 && < 0.7

7982 , mtl >= 2.2 && < 3

8083 , simple-conduit >= 0.6 && < 0.7

81− , transient >= 0.5 && < 0.6

84+ , transient >= 0.4 && < 0.6

8285 default-language: Haskell2010

8386

8487source-repository head

src/Asyncly.hs+1−1

@@ -153,7 +153,7 @@ module Asyncly

153153where

154154

155155import Asyncly.AsyncT

156−import Data.Monoid (Monoid(..), (<>))

156+import Data.Monoid ((<>))

157157import Control.Applicative (Alternative(..))

158158import Control.Monad (MonadPlus(..))

159159import Control.Monad.IO.Class (MonadIO (..))

src/Asyncly/AsyncT.hs+2−2

@@ -189,7 +189,7 @@ instance Monad m => Applicative (AsyncT m) where

189189------------------------------------------------------------------------------

190190

191191{-# INLINE doFork #-}

192−doFork :: (MonadIO m, MonadBaseControl IO m)

192+doFork :: MonadBaseControl IO m

193193 => m ()

194194 -> (SomeException -> m ())

195195 -> m ThreadId

@@ -627,5 +627,5 @@ forEachWith f xs g = foldr (f . g) mempty xs

627627-- Convert a callback into an 'AsyncT' computation

628628------------------------------------------------------------------------------

629629

630−fromCallback :: Monad m => (forall r. (a -> m r) -> m r) -> AsyncT m a

630+fromCallback :: (forall r. (a -> m r) -> m r) -> AsyncT m a

631631fromCallback k = AsyncT $ \ctx _ yld -> k (\a -> yld a ctx Nothing)

stack.yaml−5

@@ -1,13 +1,8 @@

11resolver: lts-9.2

22packages:

33- '.'

4−- location:

5− git: https://github.com/harendra-kumar/monad-recorder

6− commit: 05bb0cfd827d9f955108d3b03dfb20b7c6820c25

7− extra-dep: true

84extra-deps:

95 - lockfree-queue-0.2.3.1

106 - simple-conduit-0.6.0

117flags: {}

128extra-package-dbs: []

13−pvp-bounds: both

test/Main.hs−4

@@ -1,11 +1,7 @@

11module Main (main) where

3−import Control.Applicative ((<|>), empty)

4−import Control.Monad (mzero)

5−import Control.Monad.IO.Class (liftIO)

63import Control.Concurrent (threadDelay)

74import Data.List (sort)

8−import Data.Monoid ((<>))

95import Prelude hiding (take, drop)

106import Test.Hspec

117