From a12e5ae8a05e0075cccf02291a70dc28feabba46 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Mon, 24 Oct 2016 14:25:08 -0700 Subject: [PATCH] update bounds for GHC 8 (#73) --- grpc-haskell.cabal | 14 +++++++------- stack.yaml | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/grpc-haskell.cabal b/grpc-haskell.cabal index 628487c..c2180e1 100644 --- a/grpc-haskell.cabal +++ b/grpc-haskell.cabal @@ -25,7 +25,7 @@ flag with-examples library build-depends: - base ==4.8.* + base >=4.8 && <5.0 , clock >=0.6.0 && <0.8.0 , bytestring ==0.10.* , stm == 2.4.* @@ -96,7 +96,7 @@ library executable hellos-server if flag(with-examples) build-depends: - base ==4.8.* + base >=4.8 && <5.0 , async , bytestring == 0.10.* , containers ==0.5.* @@ -115,7 +115,7 @@ executable hellos-server executable hellos-client if flag(with-examples) build-depends: - base ==4.8.* + base >=4.8 && <5.0 , async , bytestring == 0.10.* , containers ==0.5.* @@ -134,7 +134,7 @@ executable hellos-client executable echo-server if flag(with-examples) build-depends: - base ==4.8.* + base >=4.8 && <5.0 , async , bytestring == 0.10.* , containers ==0.5.* @@ -152,7 +152,7 @@ executable echo-server executable echo-client if flag(with-examples) build-depends: - base ==4.8.* + base >=4.8 && <5.0 , async , bytestring == 0.10.* , containers ==0.5.* @@ -170,7 +170,7 @@ executable echo-client test-suite test build-depends: - base ==4.8.* + base >=4.8 && <5.0 , grpc-haskell , bytestring ==0.10.* , unix @@ -207,7 +207,7 @@ test-suite test benchmark bench type: exitcode-stdio-1.0 build-depends: - base ==4.8.* + base >=4.8 && <5.0 , grpc-haskell , async ==2.1.* , criterion ==1.1.* diff --git a/stack.yaml b/stack.yaml index e00abf4..1a17c67 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,18 +2,18 @@ # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/ # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) -resolver: lts-6.9 +resolver: lts-7.4 # Local packages, usually specified by relative directory name packages: - '.' - location: git: git@github.mv.awakenetworks.net:awakenetworks/protobuf-wire.git - commit: 38b4af244934310edacd3defce5929f44c72d5c9 + commit: 2eda7a9e33e8a2f32c3ab8c4ace338b08fb79daa extra-dep: true - location: git: git@github.com:awakenetworks/proto3-wire.git - commit: b5151914873b9ede230094e742953b5062566244 + commit: 9875a18a422884f42be0b408fcdb0b7b4904532c extra-dep: true # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) extra-deps: [managed-1.0.5]