Allow aeson (>= 0.8.0.2 && < 0.10) || (>= 0.11 && < 0.12)

Also bump to lts-5, since lts-4 used aeson-0.10
ljli · Feb 9, 2016 · 3e0538a · 3e0538a
1 parent 355698a
commit 3e0538a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/stack.cabal b/stack.cabal
@@ -136,7 +136,7 @@ library
                      Data.Set.Monad
                      Distribution.Version.Extra
   build-depends:     Cabal >= 1.18.1.5
-                   , aeson >= 0.8.0.2 && < 0.11
+                   , aeson (>= 0.8.0.2 && < 0.10) || (>= 0.11 && < 0.12)
                    , ansi-terminal >= 0.6.2.3
                    , async >= 2.0.2 && < 2.2
                    , attoparsec >= 0.12.1.5 && < 0.14

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-4.0
+resolver: lts-5.0
 image:
   containers:
     - base: "fpco/ubuntu-with-libgmp:14.04"
@@ -9,6 +9,3 @@ nix:
   enable: false
   packages:
     - zlib
-extra-deps:
-# Should be removed once gitrev is updated in stackage (lts-5)
-- gitrev-1.2.0