From df55bf23c95e895d8a859c92d3eac4c1eb46baa4 Mon Sep 17 00:00:00 2001 From: fr33domlover Date: Mon, 7 Mar 2016 01:12:55 +0000 Subject: [PATCH] Rely on stack for dep versions and upgrade to LTS 5.5 --- stack.yaml | 2 +- vervis.cabal | 54 +++++++++++++++++++++++++--------------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/stack.yaml b/stack.yaml index 36cafda..a9c2189 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,7 +3,7 @@ # 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.1 +resolver: lts-5.5 # Local packages, usually specified by relative directory name packages: diff --git a/vervis.cabal b/vervis.cabal index 8d57d61..2a7042a 100644 --- a/vervis.cabal +++ b/vervis.cabal @@ -90,56 +90,54 @@ library -- , hourglass -- , time-units -- , unordered-containers >=0.2.5 - build-depends: aeson >= 0.6 && < 0.11 - , base >= 4 && < 5 + build-depends: aeson + , base , base64-bytestring , blaze-html - , bytestring >= 0.9 && < 0.11 + , bytestring , case-insensitive - , classy-prelude >= 0.10.2 - , classy-prelude-conduit >= 0.10.2 - --, classy-prelude-yesod >= 0.10.2 - , conduit >= 1.0 && < 2.0 + , classy-prelude + , classy-prelude-conduit + , conduit , containers , data-default - , directory >= 1.1 && < 1.3 + , directory , dlist , esqueleto - , fast-logger >= 2.2 && < 2.5 + , fast-logger , fgl , file-embed , filepath , hashable , hit - , hjsmin >= 0.1 && < 0.2 + , hjsmin , hourglass - , http-conduit >= 2.1 && < 2.2 + , http-conduit , http-types - , monad-control >= 0.3 && < 1.1 - , monad-logger >= 0.3 && < 0.4 - , persistent >= 2.0 && < 2.3 - , persistent-postgresql >= 2.1.1 && < 2.3 - , persistent-template >= 2.0 && < 2.3 + , monad-control + , monad-logger + , persistent + , persistent-postgresql + , persistent-template , safe - , shakespeare >= 2.0 && < 2.1 + , shakespeare , ssh , template-haskell - , text >= 0.11 && < 2.0 + , text , time , transformers , unordered-containers - --, vector , wai - , wai-extra >= 3.0 && < 3.1 - , wai-logger >= 2.2 && < 2.3 - , warp >= 3.0 && < 3.3 - , yaml >= 0.8 && < 0.9 - , yesod >= 1.4.1 && < 1.5 - , yesod-auth >= 1.4.0 && < 1.5 + , wai-extra + , wai-logger + , warp + , yaml + , yesod + , yesod-auth , yesod-auth-hashdb - , yesod-core >= 1.4.17 && < 1.5 - , yesod-form >= 1.4.0 && < 1.5 - , yesod-static >= 1.4.0.3 && < 1.6 + , yesod-core + , yesod-form + , yesod-static , yesod-persistent hs-source-dirs: src default-language: Haskell2010