From 37ebce18baba1bf4fc1fd84ef40bb6ded9489eec Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Mon, 13 Feb 2017 05:28:11 -0800 Subject: [PATCH] stack.cabal: relax upper bounds for ghc 8.0.2 (fixes #3001) Hackage metadata has also been updated for stack-1.3.2 --- stack-nightly.yaml | 6 +++++- stack.cabal | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 8d4fc5e5f4..12e09c2b62 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2016-12-27 +resolver: nightly-2017-02-13 image: containers: - base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile @@ -8,3 +8,7 @@ nix: enable: false packages: - zlib +extra-deps: + - store-0.3 + - store-core-0.3 + - th-utilities-0.2.0.1 diff --git a/stack.cabal b/stack.cabal index 343d07e794..e08a8bc833 100644 --- a/stack.cabal +++ b/stack.cabal @@ -177,7 +177,7 @@ library System.Process.Read System.Process.Run build-depends: Cabal >= 1.18.1.5 && < 1.25 - , aeson (>= 1.0 && < 1.1) + , aeson (>= 1.0 && < 1.2) , ansi-terminal >= 0.6.2.3 , async >= 2.0.2 && < 2.2 , attoparsec >= 0.12.1.5 && < 0.14 @@ -196,7 +196,7 @@ library , containers >= 0.5.5.1 , cryptohash >= 0.11.6 , cryptohash-conduit - , directory >= 1.2.1.0 + , directory >= 1.2.1.0 && < 1.4 , either , errors < 2.2 , exceptions >= 0.8.0.2 @@ -254,7 +254,7 @@ library , unicode-transforms >= 0.1 && <0.3 , unix-compat , unordered-containers >= 0.2.5.1 - , vector >= 0.10.12.3 && < 0.12 + , vector >= 0.10.12.3 && < 0.13 , vector-binary-instances , yaml >= 0.8.20 , zlib >= 0.5.4.2 && < 0.7 @@ -262,7 +262,7 @@ library , hastache , project-template >= 0.2 , zip-archive < 0.4 - , hpack >= 0.14.0 && < 0.16 + , hpack >= 0.14.0 && < 0.18 , store >= 0.2.1.0 , annotated-wl-pprint , file-embed >= 0.0.10 @@ -286,11 +286,11 @@ executable stack , base >=4.7 && < 5 , bytestring >= 0.10.4.0 , containers >= 0.5.5.1 - , directory >= 1.2.1.0 + , directory >= 1.2.1.0 && < 1.4 , either , filelock >= 0.1.0.1 , filepath >= 1.3.0.2 - , hpack >= 0.14.0 && < 0.16 + , hpack >= 0.14.0 && < 0.18 , http-client >= 0.5.3.3 -- https://github.com/basvandijk/lifted-base/issues/31 , lifted-base < 0.2.3.7 || > 0.2.3.7 @@ -344,10 +344,10 @@ test-suite stack-test , conduit-extra , containers >= 0.5.5.1 , cryptohash - , directory >= 1.2.1.0 + , directory >= 1.2.1.0 && < 1.4 , exceptions , filepath - , hspec >= 2.2 && <2.4 + , hspec >= 2.2 && <2.5 , http-client-tls , http-conduit , monad-logger @@ -365,7 +365,7 @@ test-suite stack-test , smallcheck , bytestring , store >= 0.2.1.0 - , vector + , vector >= 0.10.12.3 && < 0.13 , template-haskell , yaml default-language: Haskell2010 @@ -387,9 +387,9 @@ test-suite stack-integration-test , conduit >= 1.2.8 , conduit-extra >= 1.1.14 , containers >= 0.5.5.1 - , directory >= 1.2.1.0 + , directory >= 1.2.1.0 && < 1.4 , filepath >= 1.3.0.2 - , hspec >= 2.2 && < 2.4 + , hspec >= 2.2 && < 2.5 , process >= 1.2.0.0 && < 1.5 , resourcet , temporary