97035c5 · streamly · git.iko.soy

git.iko.soy/streamly

Fix GHC-8.6 build

Fix build for ghc-8.0.2 fix sdl install in CI

commit97035c5c0b69e411f0723cee780ff64a1863427a authorHarendra Kumar <harendra.kumar@gmail.com> dateMon 31 Dec 2018, 01:25 (8 years ago) parentf44f56e

3 files changed+8−6

compare with master

unifiedsplit

.travis.yml+6−4 streamly.cabal+1−1 test/Prop.hs+1−1

.travis.yml+6−4

@@ -82,14 +82,16 @@ matrix:

8282 - env: BUILD=stack RESOLVER=lts-6 GHCVER=7.10.3 GHC_OPTIONS="" STACK_YAML=stack-7.10.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

8383 addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}

8484

85− - env: BUILD=stack RESOLVER=lts-9 GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

85+ # Disable warnings because COMPLETE pragma is not available in this GHC

86+ # version

87+ - env: BUILD=stack RESOLVER=lts-9 GHCVER=8.0.2 GHC_OPTIONS="" STACK_YAML=stack-8.0.yaml DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

8688 addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}

8789

8890 # Use cabal-install-1.24 for stack solver to work

8991 # GHC-8.2.2 hogs memory leading to out-of-memory when compiling benchmarks

9092 # So disable the benchmarks for this build.

9193 - env: BUILD=stack GHCVER=8.2.2 RESOLVER=lts-11 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y DISABLE_BENCH=y

92− addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}

94+ addons: {apt: {packages: [cabal-install-2.4], sources: [hvr-ghc]}}

9395

9496 # Use cabal-install-1.24 for stack solver to work

9597 #- env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y

@@ -125,7 +127,7 @@ matrix:

125127 addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}

126128

127129 - env: BUILD=stack RESOLVER=lts-13 GHCVER=8.6.3 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

128− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}

130+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3,libsdl1.2-dev], sources: [hvr-ghc]}}

129131

130132 #- env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""

131133 # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}

@@ -168,7 +170,7 @@ matrix:

168170 allow_failures:

169171 - env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y

170172 - env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""

171− - env: BUILD=stack RESOLVER=lts-11 HLINT_COMMANDS="hlint lint ."

173+ - env: BUILD=stack RESOLVER=lts-13 HLINT_COMMANDS="hlint lint ."

172174

173175# ------------------------------------------------------------------------

174176# Settings beyond this point are advanced and normally not tweaked

streamly.cabal+1−1

@@ -627,7 +627,7 @@ executable ListDir

627627 build-Depends:

628628 streamly

629629 , base >= 4.8 && < 5

630− , path-io >= 0.1.0 && < 1.4

630+ , path-io >= 0.1.0 && < 1.5

631631 if impl(ghc < 8.0)

632632 build-depends:

633633 transformers >= 0.4 && < 0.6

test/Prop.hs+1−1

@@ -138,7 +138,7 @@ constructWithDoubleFromThenTo op l =

138138 forAll (choose (-9007199254740999,9007199254740999)) $ \next ->

139139 forAll (choose (-9007199254740999,9007199254740999)) $ \to ->

140140 let list len = take len [from,next..to]

141− stream len = S.take len $ S.fracFromThenTo from next to

141+ stream len = S.take len $ S.enumerateFromThenTo from next to

142142 in constructWithLen stream list op l

143143#endif

144144