Merge branch 'stable'

commercialhaskell · Dec 16, 2015 · b6066eb · b6066eb
2 parents a703101 + 8b39829
commit b6066eb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/stack.cabal b/stack.cabal
@@ -162,14 +162,14 @@ library
                    , http-client >= 0.4.17
                    , http-client-tls >= 0.2.2
                    , http-conduit >= 2.1.7
-                   , http-types >= 0.8.6
+                   , http-types >= 0.8.6 && < 0.10
                    , lifted-base
                    , monad-control
                    , monad-logger >= 0.3.13.1
                    , monad-loops >= 0.4.2.1
                    , mtl >= 2.1.3.1
                    , old-locale >= 1.0.0.6
-                   , optparse-applicative
+                   , optparse-applicative < 0.13
                    , path >= 0.5.1
                    , persistent >= 2.1.2
                    , persistent-sqlite >= 2.1.4
@@ -179,7 +179,7 @@ library
                    , resourcet >= 1.1.4.1
                    , retry >= 0.6 && < 0.8
                    , safe >= 0.3
-                   , semigroups >= 0.5 && < 0.18
+                   , semigroups >= 0.5 && < 0.19
                    , split
                    , stm >= 2.4.4
                    , streaming-commons >= 0.1.10.0
@@ -197,7 +197,7 @@ library
                    , vector-binary-instances
                    , void >= 0.7
                    , yaml >= 0.8.10.1
-                   , zlib >= 0.5.4.2
+                   , zlib >= 0.5.4.2 && < 0.7
                    , deepseq >= 1.4
                    , file-embed
                    , word8
@@ -231,7 +231,7 @@ executable stack
                 , monad-logger >= 0.3.13.1
                 , mtl >= 2.1.3.1
                 , old-locale >= 1.0.0.6
-                , optparse-applicative >= 0.11.0.2
+                , optparse-applicative >= 0.11.0.2 && < 0.13
                 , path
                 , process
                 , resourcet >= 1.1.4.1
@@ -288,7 +288,7 @@ test-suite stack-test
                 , resourcet
                 , Cabal
                 , text
-                , optparse-applicative
+                , optparse-applicative < 0.13
                 , bytestring
                 , QuickCheck
                 , retry >= 0.6 && < 0.8