git.iko.soy/streamly
on master help sign in
Fix GHC-8.6 build
97035c5Harendra Kumar
.travis.yml+6−4
compare with master
unifiedsplit
@@ -82,14 +82,16 @@ matrix:
82 - 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"
82 - 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"
83 addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}
83 addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}
84
84
85+ # Disable warnings because COMPLETE pragma is not available in this GHC
86+ # version
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"
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"
86 addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}
88 addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}
87
89
88 # Use cabal-install-1.24 for stack solver to work
90 # Use cabal-install-1.24 for stack solver to work
89 # GHC-8.2.2 hogs memory leading to out-of-memory when compiling benchmarks
91 # GHC-8.2.2 hogs memory leading to out-of-memory when compiling benchmarks
90 # So disable the benchmarks for this build.
92 # So disable the benchmarks for this build.
91 - env: BUILD=stack GHCVER=8.2.2 RESOLVER=lts-11 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y DISABLE_BENCH=y
93 - 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]}}
93
95
94 # Use cabal-install-1.24 for stack solver to work
96 # Use cabal-install-1.24 for stack solver to work
95 #- env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y
97 #- env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y
@@ -125,7 +127,7 @@ matrix:
125 addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
127 addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
126
128
127 - env: BUILD=stack RESOLVER=lts-13 GHCVER=8.6.3 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"
129 - 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]}}
129
131
130 #- env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""
132 #- env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""
131 # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
133 # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
@@ -168,7 +170,7 @@ matrix:
168 allow_failures:
170 allow_failures:
169 - env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y
171 - env: BUILD=stack RESOLVER=nightly DISABLE_SDIST_BUILD=y DISABLE_DIST_CHECKS=y
170 - env: BUILD=cabal-new GHCVER=head GHC_OPTIONS=""
172 - 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 ."
172
174
173# ------------------------------------------------------------------------
175# ------------------------------------------------------------------------
174# Settings beyond this point are advanced and normally not tweaked
176# Settings beyond this point are advanced and normally not tweaked
streamly.cabal+1−1
@@ -627,7 +627,7 @@ executable ListDir
627 build-Depends:
627 build-Depends:
628 streamly
628 streamly
629 , base >= 4.8 && < 5
629 , base >= 4.8 && < 5
630− , path-io >= 0.1.0 && < 1.4
630+ , path-io >= 0.1.0 && < 1.5
631 if impl(ghc < 8.0)
631 if impl(ghc < 8.0)
632 build-depends:
632 build-depends:
633 transformers >= 0.4 && < 0.6
633 transformers >= 0.4 && < 0.6
test/Prop.hs+1−1
@@ -138,7 +138,7 @@ constructWithDoubleFromThenTo op l =
138 forAll (choose (-9007199254740999,9007199254740999)) $ \next ->
138 forAll (choose (-9007199254740999,9007199254740999)) $ \next ->
139 forAll (choose (-9007199254740999,9007199254740999)) $ \to ->
139 forAll (choose (-9007199254740999,9007199254740999)) $ \to ->
140 let list len = take len [from,next..to]
140 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
142 in constructWithLen stream list op l
142 in constructWithLen stream list op l
143#endif
143#endif
144
144