Merge pull request #43 from bitemyapp/master

Seems to work fine with newer Aeson

.travis.yml

@@ -15,11 +15,12 @@ env:
 # - GHCVER=7.2.1
 # - GHCVER=7.2.2
 # - GHCVER=7.4.1
- - GHCVER=7.4.2
+ # - GHCVER=7.4.2
 # - GHCVER=7.6.1
 # - GHCVER=7.6.2
  - GHCVER=7.6.3
- - GHCVER=7.8.1
+ - GHCVER=7.8.4
+ - GHCVER=7.10.1
 # - HPVER=2013.2.0.0
 # - HPVER=2012.4.0.0
 # - HPVER=2012.2.0.0
@@ -60,35 +61,35 @@ before_install:
 
  - sudo add-apt-repository -y ppa:hvr/ghc
  - sudo apt-get update
- - sudo apt-get install cabal-install-1.18 ghc-$GHCVER
+ - sudo apt-get install cabal-install-1.22 ghc-$GHCVER
  - export PATH=/opt/ghc/$GHCVER/bin:$PATH
 
 install:
- - cabal-1.18 update
- - cabal-1.18 install --only-dependencies --enable-tests --enable-benchmarks
+ - cabal-1.22 update
+ - cabal-1.22 install --only-dependencies --enable-tests --enable-benchmarks
 
 # Here starts the actual work to be performed for the package under
 # test; any command which exits with a non-zero exit code causes the
 # build to fail.
 script:
  # -v2 provides useful information for debugging
- - cabal-1.18 configure --enable-tests --enable-benchmarks -v2
+ - cabal-1.22 configure --enable-tests --enable-benchmarks -v2
 
  # this builds all libraries and executables
  # (including tests/benchmarks)
- - cabal-1.18 build
+ - cabal-1.22 build
 
- - cabal-1.18 test
- - cabal-1.18 check
+ - cabal-1.22 test
+ - cabal-1.22 check
 
  # tests that a source-distribution can be generated
- - cabal-1.18 sdist
+ - cabal-1.22 sdist
 
  # check that the generated source-distribution can be built & installed
- - export SRC_TGZ=$(cabal-1.18 info . | awk '{print $2 ".tar.gz";exit}') ;
+ - export SRC_TGZ=$(cabal-1.22 info . | awk '{print $2 ".tar.gz";exit}') ;
    cd dist/;
    if [ -f "$SRC_TGZ" ]; then
-      cabal-1.18 install "$SRC_TGZ";
+      cabal-1.22 install "$SRC_TGZ";
    else
       echo "expected '$SRC_TGZ' not found";
       exit 1;

ekg.cabal

@@ -37,7 +37,7 @@ library
     System.Remote.Snap
 
   build-depends:
-    aeson < 0.9,
+    aeson < 0.11,
     base >= 4.5 && < 4.9,
     bytestring < 1.0,
     ekg-core >= 0.1 && < 0.2,