54947ea · streamly · git.iko.soy

git.iko.soy/streamly

on master help sign in

update stack.yaml for new stack version

54947eaHarendra Kumar7 years ago

.travis.yml+18−21

compare with master

unifiedsplit

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

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

82 # --------------------------------------------------------------------------

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−

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

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

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

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

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

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

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

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

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

90+ #- env: BUILD=cabal-new GHCVER=8.6.5 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]}}

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

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

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

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

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

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

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

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

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

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

101

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

100+ # version

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

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

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

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

104

103

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

105+ # warnings.

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

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

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

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

107

108

108 # You can specify build flags like this:

109 # You can specify build flags like this:

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

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

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

131 # are: STACK_YAML, STACK_OPTIONS, STACK_BUILD_OPTIONS

132 # are: STACK_YAML, STACK_OPTIONS, STACK_BUILD_OPTIONS

132 # --------------------------------------------------------------------------

133 # --------------------------------------------------------------------------

133

134

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

135 #- env: BUILD=stack RESOLVER=nightly

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

137

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

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

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

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

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

141

140

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

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

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

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

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

145

143

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

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

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

148 # So disable the benchmarks for this build.

145 # So disable the benchmarks for this build.

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

146 - 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:

151

148

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

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

153 # version

150 # 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"

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"

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

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

156

153

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

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

158 # warnings.

155 # 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"

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"

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

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

161

158

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

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

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

160 #- 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:

106 docs/streamly-vs-async.md

107 docs/transformers.md

108 bench.sh

109− stack-7.10.yaml

110− stack-8.0.yaml

111 stack.yaml

109 stack.yaml

112 src/Streamly/Streams/Instances.hs

110 src/Streamly/Streams/Instances.hs

113 src/Streamly/Streams/inline.hs

111 src/Streamly/Streams/inline.hs

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

263

261

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

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

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

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

266− , deepseq >= 1.4.3 && < 1.5

264+ , deepseq >= 1.4.2 && < 1.5

267 , containers >= 0.5 && < 0.7

265 , containers >= 0.5 && < 0.7

268 , heaps >= 0.3 && < 0.4

266 , heaps >= 0.3 && < 0.4

269

267

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

535 build-depends:

533 build-depends:

536 streamly

534 streamly

537 , base >= 4.8 && < 5

535 , base >= 4.8 && < 5

538− , deepseq >= 1.4.3 && < 1.5

536+ , deepseq >= 1.4.2 && < 1.5

539 , random >= 1.0 && < 2.0

537 , random >= 1.0 && < 2.0

540 , gauge >= 0.2.4 && < 0.3

538 , gauge >= 0.2.4 && < 0.3

541 if impl(ghc < 8.0)

539 if impl(ghc < 8.0)

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

570 build-depends:

568 build-depends:

571 streamly

569 streamly

572 , base >= 4.8 && < 5

570 , base >= 4.8 && < 5

573− , deepseq >= 1.4.3 && < 1.5

571+ , deepseq >= 1.4.2 && < 1.5

574 , random >= 1.0 && < 2.0

572 , random >= 1.0 && < 2.0

575 , gauge >= 0.2.4 && < 0.3

573 , gauge >= 0.2.4 && < 0.3

576 if impl(ghc < 8.0)

574 if impl(ghc < 8.0)

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

604 build-depends:

602 build-depends:

605 streamly

603 streamly

606 , base >= 4.8 && < 5

604 , base >= 4.8 && < 5

607− , deepseq >= 1.4.3 && < 1.5

605+ , deepseq >= 1.4.2 && < 1.5

608 , random >= 1.0 && < 2.0

606 , random >= 1.0 && < 2.0

609 , gauge >= 0.2.4 && < 0.3

607 , gauge >= 0.2.4 && < 0.3

610 if impl(ghc < 8.0)

608 if impl(ghc < 8.0)

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

639 build-depends:

637 build-depends:

640 streamly

638 streamly

641 , base >= 4.8 && < 5

639 , base >= 4.8 && < 5

642− , deepseq >= 1.4.3 && < 1.5

640+ , deepseq >= 1.4.2 && < 1.5

643 , random >= 1.0 && < 2.0

641 , random >= 1.0 && < 2.0

644 , gauge >= 0.2.4 && < 0.3

642 , gauge >= 0.2.4 && < 0.3

645 if impl(ghc < 8.0)

643 if impl(ghc < 8.0)

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

674 build-depends:

672 build-depends:

675 streamly

673 streamly

676 , base >= 4.8 && < 5

674 , base >= 4.8 && < 5

677− , deepseq >= 1.4.3 && < 1.5

675+ , deepseq >= 1.4.2 && < 1.5

678 , random >= 1.0 && < 2.0

676 , random >= 1.0 && < 2.0

679 , gauge >= 0.2.4 && < 0.3

677 , gauge >= 0.2.4 && < 0.3

680 if impl(ghc < 8.0)

678 if impl(ghc < 8.0)

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

710 , base >= 4.8 && < 5

708 , base >= 4.8 && < 5

711 , gauge >= 0.2.4 && < 0.3

709 , gauge >= 0.2.4 && < 0.3

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

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

713− , deepseq >= 1.4.3 && < 1.5

711+ , deepseq >= 1.4.2 && < 1.5

714

712

715-------------------------------------------------------------------------------

713-------------------------------------------------------------------------------

716-- Internal benchmarks for unexposed modules

714-- Internal benchmarks for unexposed modules

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

767 buildable: True

765 buildable: True

768 build-depends:

766 build-depends:

769 base >= 4.8 && < 5

767 base >= 4.8 && < 5

770− , deepseq >= 1.4.3 && < 1.5

768+ , deepseq >= 1.4.2 && < 1.5

771 , random >= 1.0 && < 2.0

769 , random >= 1.0 && < 2.0

772 , gauge >= 0.2.4 && < 0.3

770 , gauge >= 0.2.4 && < 0.3

773

771

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

822 , gauge >= 0.2.4 && < 0.3

820 , gauge >= 0.2.4 && < 0.3

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

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

824 , containers >= 0.5 && < 0.7

822 , containers >= 0.5 && < 0.7

825− , deepseq >= 1.4.3 && < 1.5

823+ , deepseq >= 1.4.2 && < 1.5

826 , heaps >= 0.3 && < 0.4

824 , heaps >= 0.3 && < 0.4

827 , random >= 1.0 && < 2.0

825 , random >= 1.0 && < 2.0

828

826