54947ea · streamly · git.iko.soy

git.iko.soy/streamly

update stack.yaml for new stack version

Use cabal build for GHC8.0.2 hspec-core-2.4.4 fails to build and I am not able to get the extra-deps right to avoid it. remove stack-8.0.yaml from cabal file use cabal build for ghc-7.10.3 as well

commit54947ea0b3776f8b42f2b2d3f13e1879f3c098a1 authorHarendra Kumar <harendra.kumar@gmail.com> dateSat 15 Jun 2019, 18:59 (7 years ago) parentcf2d810

4 files changed+27−72

compare with master

unifiedsplit

.travis.yml+18−21 stack-7.10.yaml−21 stack-8.0.yaml−19 streamly.cabal+9−11

.travis.yml+18−21

@@ -81,17 +81,14 @@ matrix:

8181 # CABAL_CONFIGURE_OPTIONS (cabal), CABAL_NEWBUILD_OPTIONS (cabal-new)

8282 # --------------------------------------------------------------------------

8383

84− # Using stack builds, cabal builds get terminated because the tests

85− # take more than 10 minutes and it does not produce any output until the end.

86−

8784 #- env: BUILD=cabal-new GHCVER=head

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

8986

90− - env: BUILD=cabal-new GHCVER=8.6.4 GHC_OPTIONS="" CABAL_NEWBUILD_OPTIONS="--flags streamk"

91− addons: {apt: {packages: [cabal-install-head,ghc-8.6.4], sources: [hvr-ghc]}}

87+ - env: BUILD=cabal-new GHCVER=8.6.5 GHC_OPTIONS="" CABAL_NEWBUILD_OPTIONS="--flags streamk"

88+ addons: {apt: {packages: [cabal-install-head,ghc-8.6.5], sources: [hvr-ghc]}}

9289

93− - env: BUILD=cabal-new GHCVER=8.6.4 GHC_OPTIONS="" CABAL_NEWBUILD_OPTIONS="--flags examples-sdl"

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

90+ #- env: BUILD=cabal-new GHCVER=8.6.5 GHC_OPTIONS="" CABAL_NEWBUILD_OPTIONS="--flags examples-sdl"

91+ # addons: {apt: {packages: [cabal-install-head,ghc-8.6.4,libsdl1.2-dev], sources: [hvr-ghc]}}

9592

9693 - env: BUILD=cabal-new GHC_OPTIONS="" GHCVER=8.4.4

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

@@ -99,11 +96,15 @@ matrix:

9996 #- env: BUILD=cabal-new GHCVER=8.2.2

10097 # addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

10198

102− #- env: BUILD=cabal GHCVER=8.0.2

103− # addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}

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

100+ # version

101+ - env: BUILD=cabal-new GHCVER=8.0.2 GHC_OPTIONS="" CABAL_NEWBUILD_OPTIONS="--flags examples-sdl"

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

104103

105− #- env: BUILD=cabal GHCVER=7.10.3

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

104+ # For 7.10.3 we disable -Werror because of some bogus SPECIALIZE pragma

105+ # warnings.

106+ - env: BUILD=cabal-new GHCVER=7.10.3 GHC_OPTIONS="" CABAL_NEWBUILD_OPTIONS="--flags examples-sdl"

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

107108

108109 # You can specify build flags like this:

109110 #- env: BUILD=cabal-new CABAL_NEWBUILD_OPTIONS="--flags=dev"

@@ -131,19 +132,15 @@ matrix:

131132 # are: STACK_YAML, STACK_OPTIONS, STACK_BUILD_OPTIONS

132133 # --------------------------------------------------------------------------

133134

134− # Using cabal-install-1.24 for stack solver to work

135135 #- env: BUILD=stack RESOLVER=nightly

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

137137

138− # Use cabal-install-1.24 if you want stack solver to work

139− #- env: BUILD=stack RESOLVER=lts-13 GHCVER=8.6

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

138+ - env: BUILD=stack RESOLVER=lts-13 GHCVER=8.6 STACK_BUILD_OPTIONS="--flag streamly:examples-sdl"

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

141140

142− # Use cabal-install-1.24 if you want stack solver to work

143141 #- env: BUILD=stack RESOLVER=lts-12 GHCVER=8.4

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

145143

146− # Use cabal-install-1.24 for stack solver to work

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

148145 # So disable the benchmarks for this build.

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

@@ -151,13 +148,13 @@ matrix:

151148

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

153150 # version

154− - 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"

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

151+ #- 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"

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

156153

157154 # For 7.10.3 we disable -Werror because of some bogus SPECIALIZE pragma

158155 # warnings.

159− - 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"

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

156+ #- 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"

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

161158

162159 # You can keep a STACK_YAML file at any path location

163160 #- env: BUILD=stack STACK_YAML=.ci/stack-8.0.yaml

stack-7.10.yamldeleted−21

@@ -1,21 +0,0 @@

1−resolver: lts-6.35

2−packages:

3−- '.'

4−extra-deps:

5− - QuickCheck-2.10

6− - lockfree-queue-0.2.3.1

7− - http-conduit-2.2.2

8− - http-client-0.5.0

9− - http-client-tls-0.3.0

10− - SDL-0.6.5.1

11− - gauge-0.2.4

12− - basement-0.0.7

13− - deepseq-1.4.4.0

14− - typed-process-0.2.4.0@sha256:fb1574481a394bec4f49016fc42f2404cea4acf5b129329459dae5e416da560e

15− - network-2.6.3.6@sha256:1ca79d81af02d7acd6032d5e6c9bde4618a8fdcfbe19bd42b49d420183975df0

16−

17−flags: {}

18−extra-package-dbs: []

19−# For mac ports installed SDL library on Mac OS X

20−extra-include-dirs:

21−- /opt/local/include

stack-8.0.yamldeleted−19

@@ -1,19 +0,0 @@

1−resolver: lts-9.21

2−packages:

3−- '.'

4−extra-deps:

5− - QuickCheck-2.10

6− - lockfree-queue-0.2.3.1

7− - SDL-0.6.5.1

8− - gauge-0.2.4

9− - basement-0.0.4

10− - deepseq-1.4.4.0

11− - typed-process-0.2.4.0@sha256:fb1574481a394bec4f49016fc42f2404cea4acf5b129329459dae5e416da560e

12− - network-2.8.0.1

13−

14−flags: {}

15−extra-package-dbs: []

16−rebuild-ghc-options: true

17−# For mac ports installed SDL library on Mac OS X

18−#extra-include-dirs:

19−#- /opt/local/include

streamly.cabal+9−11

@@ -106,8 +106,6 @@ extra-source-files:

106106 docs/streamly-vs-async.md

107107 docs/transformers.md

108108 bench.sh

109− stack-7.10.yaml

110− stack-8.0.yaml

111109 stack.yaml

112110 src/Streamly/Streams/Instances.hs

113111 src/Streamly/Streams/inline.hs

@@ -263,7 +261,7 @@ library

263261

264262 build-depends: base >= 4.8 && < 5

265263 , ghc-prim >= 0.2 && < 0.6

266− , deepseq >= 1.4.3 && < 1.5

264+ , deepseq >= 1.4.2 && < 1.5

267265 , containers >= 0.5 && < 0.7

268266 , heaps >= 0.3 && < 0.4

269267

@@ -535,7 +533,7 @@ benchmark linear

535533 build-depends:

536534 streamly

537535 , base >= 4.8 && < 5

538− , deepseq >= 1.4.3 && < 1.5

536+ , deepseq >= 1.4.2 && < 1.5

539537 , random >= 1.0 && < 2.0

540538 , gauge >= 0.2.4 && < 0.3

541539 if impl(ghc < 8.0)

@@ -570,7 +568,7 @@ benchmark linear-async

570568 build-depends:

571569 streamly

572570 , base >= 4.8 && < 5

573− , deepseq >= 1.4.3 && < 1.5

571+ , deepseq >= 1.4.2 && < 1.5

574572 , random >= 1.0 && < 2.0

575573 , gauge >= 0.2.4 && < 0.3

576574 if impl(ghc < 8.0)

@@ -604,7 +602,7 @@ benchmark linear-rate

604602 build-depends:

605603 streamly

606604 , base >= 4.8 && < 5

607− , deepseq >= 1.4.3 && < 1.5

605+ , deepseq >= 1.4.2 && < 1.5

608606 , random >= 1.0 && < 2.0

609607 , gauge >= 0.2.4 && < 0.3

610608 if impl(ghc < 8.0)

@@ -639,7 +637,7 @@ benchmark nested

639637 build-depends:

640638 streamly

641639 , base >= 4.8 && < 5

642− , deepseq >= 1.4.3 && < 1.5

640+ , deepseq >= 1.4.2 && < 1.5

643641 , random >= 1.0 && < 2.0

644642 , gauge >= 0.2.4 && < 0.3

645643 if impl(ghc < 8.0)

@@ -674,7 +672,7 @@ benchmark array

674672 build-depends:

675673 streamly

676674 , base >= 4.8 && < 5

677− , deepseq >= 1.4.3 && < 1.5

675+ , deepseq >= 1.4.2 && < 1.5

678676 , random >= 1.0 && < 2.0

679677 , gauge >= 0.2.4 && < 0.3

680678 if impl(ghc < 8.0)

@@ -710,7 +708,7 @@ benchmark fileio

710708 , base >= 4.8 && < 5

711709 , gauge >= 0.2.4 && < 0.3

712710 , typed-process >= 0.2.3 && < 0.3

713− , deepseq >= 1.4.3 && < 1.5

711+ , deepseq >= 1.4.2 && < 1.5

714712

715713-------------------------------------------------------------------------------

716714-- Internal benchmarks for unexposed modules

@@ -767,7 +765,7 @@ benchmark base

767765 buildable: True

768766 build-depends:

769767 base >= 4.8 && < 5

770− , deepseq >= 1.4.3 && < 1.5

768+ , deepseq >= 1.4.2 && < 1.5

771769 , random >= 1.0 && < 2.0

772770 , gauge >= 0.2.4 && < 0.3

773771

@@ -822,7 +820,7 @@ executable nano-bench

822820 , gauge >= 0.2.4 && < 0.3

823821 , ghc-prim >= 0.2 && < 0.6

824822 , containers >= 0.5 && < 0.7

825− , deepseq >= 1.4.3 && < 1.5

823+ , deepseq >= 1.4.2 && < 1.5

826824 , heaps >= 0.3 && < 0.4

827825 , random >= 1.0 && < 2.0

828826