Skip to content

Commit 37ebce1

Browse files
committed
stack.cabal: relax upper bounds for ghc 8.0.2 (fixes commercialhaskell#3001)
Hackage metadata has also been updated for stack-1.3.2
1 parent 38ca04d commit 37ebce1

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

stack-nightly.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2016-12-27
1+
resolver: nightly-2017-02-13
22
image:
33
containers:
44
- base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile
@@ -8,3 +8,7 @@ nix:
88
enable: false
99
packages:
1010
- zlib
11+
extra-deps:
12+
- store-0.3
13+
- store-core-0.3
14+
- th-utilities-0.2.0.1

stack.cabal

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ library
177177
System.Process.Read
178178
System.Process.Run
179179
build-depends: Cabal >= 1.18.1.5 && < 1.25
180-
, aeson (>= 1.0 && < 1.1)
180+
, aeson (>= 1.0 && < 1.2)
181181
, ansi-terminal >= 0.6.2.3
182182
, async >= 2.0.2 && < 2.2
183183
, attoparsec >= 0.12.1.5 && < 0.14
@@ -196,7 +196,7 @@ library
196196
, containers >= 0.5.5.1
197197
, cryptohash >= 0.11.6
198198
, cryptohash-conduit
199-
, directory >= 1.2.1.0
199+
, directory >= 1.2.1.0 && < 1.4
200200
, either
201201
, errors < 2.2
202202
, exceptions >= 0.8.0.2
@@ -254,15 +254,15 @@ library
254254
, unicode-transforms >= 0.1 && <0.3
255255
, unix-compat
256256
, unordered-containers >= 0.2.5.1
257-
, vector >= 0.10.12.3 && < 0.12
257+
, vector >= 0.10.12.3 && < 0.13
258258
, vector-binary-instances
259259
, yaml >= 0.8.20
260260
, zlib >= 0.5.4.2 && < 0.7
261261
, deepseq >= 1.4
262262
, hastache
263263
, project-template >= 0.2
264264
, zip-archive < 0.4
265-
, hpack >= 0.14.0 && < 0.16
265+
, hpack >= 0.14.0 && < 0.18
266266
, store >= 0.2.1.0
267267
, annotated-wl-pprint
268268
, file-embed >= 0.0.10
@@ -286,11 +286,11 @@ executable stack
286286
, base >=4.7 && < 5
287287
, bytestring >= 0.10.4.0
288288
, containers >= 0.5.5.1
289-
, directory >= 1.2.1.0
289+
, directory >= 1.2.1.0 && < 1.4
290290
, either
291291
, filelock >= 0.1.0.1
292292
, filepath >= 1.3.0.2
293-
, hpack >= 0.14.0 && < 0.16
293+
, hpack >= 0.14.0 && < 0.18
294294
, http-client >= 0.5.3.3
295295
-- https://github.com/basvandijk/lifted-base/issues/31
296296
, lifted-base < 0.2.3.7 || > 0.2.3.7
@@ -344,10 +344,10 @@ test-suite stack-test
344344
, conduit-extra
345345
, containers >= 0.5.5.1
346346
, cryptohash
347-
, directory >= 1.2.1.0
347+
, directory >= 1.2.1.0 && < 1.4
348348
, exceptions
349349
, filepath
350-
, hspec >= 2.2 && <2.4
350+
, hspec >= 2.2 && <2.5
351351
, http-client-tls
352352
, http-conduit
353353
, monad-logger
@@ -365,7 +365,7 @@ test-suite stack-test
365365
, smallcheck
366366
, bytestring
367367
, store >= 0.2.1.0
368-
, vector
368+
, vector >= 0.10.12.3 && < 0.13
369369
, template-haskell
370370
, yaml
371371
default-language: Haskell2010
@@ -387,9 +387,9 @@ test-suite stack-integration-test
387387
, conduit >= 1.2.8
388388
, conduit-extra >= 1.1.14
389389
, containers >= 0.5.5.1
390-
, directory >= 1.2.1.0
390+
, directory >= 1.2.1.0 && < 1.4
391391
, filepath >= 1.3.0.2
392-
, hspec >= 2.2 && < 2.4
392+
, hspec >= 2.2 && < 2.5
393393
, process >= 1.2.0.0 && < 1.5
394394
, resourcet
395395
, temporary

0 commit comments

Comments
 (0)