e4ed109 · streamly · git.iko.soy

.travis.yml+11−6

compare with master

unifiedsplit

@@ -18,13 +18,16 @@ matrix:

18 #- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22

19 #addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

20

21− - env: BUILD=stack RESOLVER=lts-6.35 CABALVER=1.22

21+ - env: BUILD=stack RESOLVER=lts-6.35 STACK_YAML=stack-7.10.yaml STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" CABALVER=1.22

22− addons: {apt: {packages: [libgmp-dev,cabal-install-1.22], sources: [hvr-ghc]}}

22+ addons: {apt: {packages: [libgmp-dev,cabal-install-1.22,libsdl1.2-dev], sources: [hvr-ghc]}}

23

24 # stack/linux use a pre-installed cabal-install for faster builds

25 # GHC 8.0.1

26− - env: BUILD=stack RESOLVER=lts-7.24 CABALVER=1.24

26+ - env: BUILD=stack RESOLVER=lts-7.24 STACK_YAML=stack-8.0.yaml STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" CABALVER=1.24

27− addons: {apt: {packages: [libgmp-dev,cabal-install-1.24], sources: [hvr-ghc]}}

27+ addons: {apt: {packages: [libgmp-dev,cabal-install-1.24,libsdl1.2-dev], sources: [hvr-ghc]}}

28+

29+ - env: BUILD=stack RESOLVER=lts-9.16 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" CABALVER=1.24

30+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,libsdl1.2-dev], sources: [hvr-ghc]}}

28

31

29 # Note COVERALLS (hpc-coveralls) requires cabal build

32 # Note COVERALLS (hpc-coveralls) requires cabal build

30 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 COVERALLS=y

33 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 COVERALLS=y

@@ -45,7 +48,7 @@ matrix:

45 os: osx

48 os: osx

46

49

47 # GHC 8.0.2

50 # GHC 8.0.2

48− - env: BUILD=stack RESOLVER=lts-9.3

51+ - env: BUILD=stack RESOLVER=lts-9.16

49 os: osx

52 os: osx

50

53

51 allow_failures:

54 allow_failures:

@@ -56,7 +59,7 @@ install: true

56script:

59script:

57 - |

60 - |

58 # Customizable options

61 # Customizable options

59− PACKAGE_TEST_VER="536355be0507c234e5b4ea51dafdb8c3d1ede948"

62+ PACKAGE_TEST_VER="df401952254b782379b3d109bd051a4a56e61635"

60 GHC_OPTIONS="-O0 -Werror"

63 GHC_OPTIONS="-O0 -Werror"

61 test -n "$COVERALLS" && \

64 test -n "$COVERALLS" && \

62 COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines \

65 COVERALLS_OPTIONS="--coverage-mode=StrictlyFullLines \

@@ -80,6 +83,8 @@ script:

80 PATH=$PATH

83 PATH=$PATH

81 BUILD=$BUILD

84 BUILD=$BUILD

82 RESOLVER=$RESOLVER

85 RESOLVER=$RESOLVER

86+ STACK_YAML=$STACK_YAML

87+ STACK_BUILD_OPTIONS="$STACK_BUILD_OPTIONS"

83 GHCVER=$GHCVER

88 GHCVER=$GHCVER

84 GHC_OPTIONS="$GHC_OPTIONS"

89 GHC_OPTIONS="$GHC_OPTIONS"

85 COVERALLS_OPTIONS="$COVERALLS_OPTIONS"

90 COVERALLS_OPTIONS="$COVERALLS_OPTIONS"

appveyor.yml+1−1

@@ -17,7 +17,7 @@ environment:

17 PATH: "%PATH%;%APPDATA%\\local\\bin"

18 CABAL_REINIT_CONFIG: "y"

19 TEST_INSTALL: "y"

20− PACKAGE_TEST_VER: "536355be0507c234e5b4ea51dafdb8c3d1ede948"

20+ PACKAGE_TEST_VER: "df401952254b782379b3d109bd051a4a56e61635"

21

22cache:

23 - "%STACK_ROOT%" # stack root

src/Streamly/Examples/AcidRainGame.hs+1−1

@@ -8,7 +8,7 @@ module Streamly.Examples.AcidRainGame where

8import Streamly

9import Control.Concurrent (threadDelay)

10import Control.Monad (when)

11−import Control.Monad.State

11+import Control.Monad.State (MonadState, get, modify, runStateT)

12import Data.Semigroup (cycle1)

13

14data Event = Harm Int | Heal Int | Quit deriving (Show)

src/Streamly/Examples/MergeSortedStreams.hs+1−1

@@ -3,7 +3,7 @@

3module Streamly.Examples.MergeSortedStreams where

4

5import Data.Word

6−import System.Random

6+import System.Random (getStdGen, randoms)

7import Data.List (sort)

8import Streamly

9import qualified Streamly.Prelude as A

stack-7.10.yamlnew file+16

@@ -0,0 +1,16 @@

1+resolver: lts-6.35

2+packages:

3+- '.'

4+extra-deps:

5+ - lockfree-queue-0.2.3.1

6+ - simple-conduit-0.4.0

7+ - transient-0.5.9.2

8+ - http-conduit-2.2.2

9+ - http-client-0.5.0

10+ - http-client-tls-0.3.0

11+ - SDL-0.6.5.1

12+flags: {}

13+extra-package-dbs: []

14+# For mac ports installed SDL library on Mac OS X

15+#extra-include-dirs:

16+#- /opt/local/include

stack-8.0.yamlnew file+17

@@ -0,0 +1,17 @@

1+resolver: lts-7.24

2+packages:

3+- '.'

4+extra-deps:

5+ - lockfree-queue-0.2.3.1

6+ - simple-conduit-0.6.0

7+ - transient-0.4.4

8+ - monad-recorder-0.1.0

9+ - http-conduit-2.2.2

10+ - http-client-0.5.0

11+ - http-client-tls-0.3.0

12+ - SDL-0.6.5.1

13+flags: {}

14+extra-package-dbs: []

15+# For mac ports installed SDL library on Mac OS X

16+#extra-include-dirs:

17+#- /opt/local/include

streamly.cabal+15−7

@@ -23,6 +23,7 @@ homepage: http://github.com/harendra-kumar/streamly

23bug-reports: https://github.com/harendra-kumar/streamly/issues

24license: BSD3

25license-file: LICENSE

26+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1

26author: Harendra Kumar

27author: Harendra Kumar

27maintainer: harendra.kumar@gmail.com

28maintainer: harendra.kumar@gmail.com

28copyright: 2017 Harendra Kumar

29copyright: 2017 Harendra Kumar

@@ -31,6 +32,13 @@ stability: Experimental

31build-type: Simple

32build-type: Simple

32cabal-version: >= 1.10

33cabal-version: >= 1.10

33

34

35+extra-source-files:

36+ Changelog.md

37+ README.md

38+ stack-7.10.yaml

39+ stack-8.0.yaml

40+ stack.yaml

41+

34source-repository head

42source-repository head

35 type: git

43 type: git

36 location: https://github.com/harendra-kumar/streamly

44 location: https://github.com/harendra-kumar/streamly

@@ -112,9 +120,9 @@ library

112

120

113 if flag(examples) || flag(examples-sdl)

121 if flag(examples) || flag(examples-sdl)

114 build-Depends:

122 build-Depends:

115− http-conduit

123+ http-conduit >= 2.2.2 && < 2.3

116− , path-io

124+ , path-io >= 0.1.0 && < 1.4

117− , random

125+ , random >= 1.0.0 && < 1.2

118

126

119 if flag(examples-sdl)

127 if flag(examples-sdl)

120 build-Depends:

128 build-Depends:

@@ -208,8 +216,8 @@ executable nested-loops

208 buildable: True

216 buildable: True

209 build-Depends:

217 build-Depends:

210 streamly

218 streamly

211− , base >= 4.8 && < 5

219+ , base >= 4.8 && < 5

212− , random

220+ , random >= 1.0.0 && < 1.2

213 else

221 else

214 buildable: False

222 buildable: False

215

223

@@ -220,7 +228,7 @@ executable parallel-loops

220 buildable: True

228 buildable: True

221 build-Depends:

229 build-Depends:

222 streamly

230 streamly

223− , base >= 4.8 && < 5

231+ , base >= 4.8 && < 5

224− , random

232+ , random >= 1.0.0 && < 1.2

225 else

233 else

226 buildable: False

234 buildable: False