git.iko.soy/streamly
on master help sign in
Upgrade stack/lts to 16.12
commitc6fdb3ac0a7f58b2bfcf73658478488a7375b0ba authorHarendra Kumar <harendra@composewell.com> dateThu 3 Sep 2020, 09:36 (6 years ago) parentd707475
4 files changed+11−14
compare with master
unifiedsplit
.travis.yml+5−4 appveyor.yml+1−1 examples/MergeSort.hs−1 stack.yaml+5−8
.travis.yml+5−4
@@ -146,8 +146,9 @@ matrix:
146146 #- env: BUILD=stack RESOLVER=nightly
147147 # addons: {apt: {packages: [cabal-install-1.24], sources: [hvr-ghc]}}
148148
149− - env: BUILD=stack RESOLVER=lts-14.25 GHCVER=8.6 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]}}
149+ - name: "GHC 8.8+stack lts-16.12+examples-sdl"
150+ env: BUILD=stack RESOLVER=lts-16.12 GHCVER=8.8 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl" SDIST_OPTIONS="--ignore-check"
151+ addons: {apt: {packages: [cabal-install-3.2,libsdl1.2-dev], sources: [hvr-ghc]}}
151152 os: linux
152153 arch: amd64
153154
@@ -175,9 +176,9 @@ matrix:
175176 # OS X builds
176177 # --------------------------------------------------------------------------
177178
178− # GHC 8.6 cabal build using stack!
179179 # On OSX autoreconf is not installed therefore disable sdist build
180− - env: BUILD=cabal-v2 RESOLVER=lts-14.25 GHCVER=8.6 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y
180+ - name: "GHC 8.8"
181+ env: BUILD=stack RESOLVER=lts-16.12 GHCVER=8.8 GHC_OPTIONS="" DISABLE_SDIST_BUILD=y SDIST_OPTIONS="--ignore-check"
181182 os: osx
182183
183184 # GHC 8.4/stack
appveyor.yml+1−1
@@ -36,7 +36,7 @@ environment:
3636 # version.
3737 #STACKVER: "1.6.5"
3838 STACK_UPGRADE: "y"
39− RESOLVER: "lts-14.25"
39+ RESOLVER: "lts-16.12"
4040 STACK_ROOT: "c:\\sr"
4141
4242 # ------------------------------------------------------------------------
examples/MergeSort.hs−1
@@ -9,7 +9,6 @@
99import Data.Word
1010import System.Random (getStdGen, randoms)
1111import Data.List (sort)
12−import Data.Ord (compare)
1312
1413import Streamly
1514import qualified Streamly.Prelude as S
stack.yaml+5−8
@@ -1,15 +1,12 @@
1−resolver: lts-14.25
1+resolver: lts-16.12
22packages:
33- '.'
44- './benchmark'
55extra-deps:
6− - SDL-0.6.6.0
7− - Chart-1.9.1
8− - Chart-diagrams-1.9.2
9− - bench-show-0.2.2
10− - inspection-testing-0.4.2.1
11− - fusion-plugin-types-0.1.0
12− - fusion-plugin-0.2.0
6+- SDL-0.6.7.0@sha256:9d6ba75c0cab575ec38468c8277803983e985f9622437aeca6a53e6a7337a7d5,2045
7+- QuickCheck-2.14.1@sha256:01e46d7b0a8d3148288ec977625f62d5516ebb5031a50c63f0453863301b4a79,7736
8+- random-1.2.0@sha256:4969b16ef23e9a57a415abcd39d982c81844031557b66349651b0fe3255b8986,6094
9+- splitmix-0.1.0.1@sha256:22f9662e7e8b173421872241edd39350078a9ed4bb9e9f503948c5b483c79276,5253
1310
1411#allow-newer: true
1512flags: {}