Merge pull request #11 from delanoe/anoe

FIX aeson lib dependency upgrade.

QuickPlot.cabal

@@ -1,5 +1,5 @@
 name:                QuickPlot
-version:             0.1.0.1
+version:             0.1.0.2
 synopsis:            Quick and easy data visualization with Haskell
 description:         Please see README.md
 homepage:            http://github.com/tepf/QuickPlot#readme
@@ -26,7 +26,7 @@ library
                        , QuickPlot.Plotly
                        , QuickPlot.Vis
     build-depends:       base >= 4.7 && < 5
-                       , aeson >= 0.9.0.1
+                       , aeson >= 0.11.2.0
                        , bytestring >= 0.10.6
                        , text >= 1.2.2
                        , snap >= 0.14.0.6

src/QuickPlot/IPC/QQ.hs

@@ -12,7 +12,6 @@ import qualified Data.Text as T
 import           Data.Aeson hiding (json)
 import           QuickPlot.IPC.QQParser
 
-
 json :: QuasiQuoter
 json = QuasiQuoter { quoteExp  = jsonExp
                    , quotePat  = const $ error "No quotePat defined for jsonQQ"
@@ -27,10 +26,6 @@ jsonExp string =
         Right val -> [| val |]
 
 
-instance Lift Value where
-    lift value = [| value |]
-
-
 instance Lift JSONValue where
     lift (JSONString string)  = [| String (T.pack string) |]
     lift JSONNull             = [| Null |]

stack.yaml

@@ -1,35 +1,11 @@
-# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
-
-# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-5.2
-
-# Local packages, usually specified by relative directory name
-packages:
-- '.'
-
-# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
-extra-deps: []
-
-# Override default flag values for local packages and extra-deps
 flags: {}
-
-# Extra package databases containing global packages
 extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: >= 1.0.0
-
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
+packages:
+- '.'
+extra-deps:
+- aeson-0.11.2.0
+- base-orphans-0.5.4
+- cpphs-1.20.1
+- fail-4.9.0.0
+- text-1.2.2.0
+resolver: lts-5.2