git.iko.soy/streamly
on master help sign in
Upgrade stack/lts to 16.12
c6fdb3aHarendra Kumar
.travis.yml+5−4
compare with master
unifiedsplit
@@ -146,8 +146,9 @@ matrix:
146 #- env: BUILD=stack RESOLVER=nightly
146 #- env: BUILD=stack RESOLVER=nightly
147 # addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}
147 # addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}
148
148
149+ - name: "GHC 8.8+stack lts-16.12+examples-sdl"
149− - env: BUILD=stack RESOLVER=lts-14.25 GHCVER=8.6 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" SDIST_OPTIONS="--ignore-check"
150+ env: BUILD=stack RESOLVER=lts-16.12 GHCVER=8.8 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" SDIST_OPTIONS="--ignore-check"
150− addons: {apt: {packages: [cabal-install-2.4,libsdl1.2-dev], sources: [hvr-ghc]}}
151+ addons: {apt: {packages: [cabal-install-3.2,libsdl1.2-dev], sources: [hvr-ghc]}}
151 os: linux
152 os: linux
152 arch: amd64
153 arch: amd64
153
154
@@ -175,9 +176,9 @@ matrix:
175 # OS X builds
176 # OS X builds
176 # --------------------------------------------------------------------------
177 # --------------------------------------------------------------------------
177
178
178− # GHC 8.6 cabal build using stack!
179 # On OSX autoreconf is not installed therefore disable sdist build
179 # On OSX autoreconf is not installed therefore disable sdist build
180+ - name: "GHC 8.8"
180− - env: BUILD=cabal-v2 RESOLVER=lts-14.25 GHCVER=8.6 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y
181+ env: BUILD=stack RESOLVER=lts-16.12 GHCVER=8.8 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y SDIST_OPTIONS="--ignore-check"
181 os: osx
182 os: osx
182
183
183 # GHC 8.4/stack
184 # GHC 8.4/stack
appveyor.yml+1−1
@@ -36,7 +36,7 @@ environment:
36 # version.
36 # version.
37 #STACKVER: "1.6.5"
37 #STACKVER: "1.6.5"
38 STACK_UPGRADE: "y"
38 STACK_UPGRADE: "y"
39− RESOLVER: "lts-14.25"
39+ RESOLVER: "lts-16.12"
40 STACK_ROOT: "c:\\sr"
40 STACK_ROOT: "c:\\sr"
41
41
42 # ------------------------------------------------------------------------
42 # ------------------------------------------------------------------------
examples/MergeSort.hs−1
@@ -9,7 +9,6 @@
9import Data.Word
9import Data.Word
10import System.Random (getStdGen, randoms)
10import System.Random (getStdGen, randoms)
11import Data.List (sort)
11import Data.List (sort)
12−import Data.Ord (compare)
13
12
14import Streamly
13import Streamly
15import qualified Streamly.Prelude as S
14import qualified Streamly.Prelude as S
stack.yaml+5−8
@@ -1,15 +1,12 @@
1−resolver: lts-14.25
1+resolver: lts-16.12
2packages:
2packages:
3- '.'
3- '.'
4- './benchmark'
4- './benchmark'
5extra-deps:
5extra-deps:
6− - SDL-0.6.6.0
6+- SDL-0.6.7.0@sha256:9d6ba75c0cab575ec38468c8277803983e985f9622437aeca6a53e6a7337a7d5,2045
7− - Chart-1.9.1
7+- QuickCheck-2.14.1@sha256:01e46d7b0a8d3148288ec977625f62d5516ebb5031a50c63f0453863301b4a79,7736
8− - Chart-diagrams-1.9.2
8+- random-1.2.0@sha256:4969b16ef23e9a57a415abcd39d982c81844031557b66349651b0fe3255b8986,6094
9− - bench-show-0.2.2
9+- splitmix-0.1.0.1@sha256:22f9662e7e8b173421872241edd39350078a9ed4bb9e9f503948c5b483c79276,5253
10− - inspection-testing-0.4.2.1
11− - fusion-plugin-types-0.1.0
12− - fusion-plugin-0.2.0
13
10
14#allow-newer: true
11#allow-newer: true
15flags: {}
12flags: {}