diff --git a/Echo.hs b/Echo.hs index eff2102..397fb99 100644 --- a/Echo.hs +++ b/Echo.hs @@ -11,7 +11,9 @@ module Echo where import Control.Concurrent.MVar import Control.Monad.Trans (MonadIO(..)) +#if !MIN_VERSION_time(1,5,0) import System.Locale +#endif import Data.Time import Language.Haskell.TH import Language.Haskell.TH.Lift diff --git a/stackage-server.cabal b/stackage-server.cabal index 49207f2..656c7a1 100644 --- a/stackage-server.cabal +++ b/stackage-server.cabal @@ -98,7 +98,7 @@ library , blaze-markup >= 0.6 , byteable , bytestring >= 0.9 - , classy-prelude-yesod >= 0.9.2 + , classy-prelude-yesod >= 0.9.2 && < 0.12 , conduit >= 1.0 , conduit-extra , cryptohash @@ -133,13 +133,13 @@ library , wai-extra >= 2.1 , wai-logger >= 2.1 , warp >= 2.1 - , xml-conduit + , xml-conduit < 1.3 , yaml >= 0.8 , yesod >= 1.2.5 , yesod-auth >= 1.3 , yesod-core >= 1.2.19 , yesod-form >= 1.3.14 - , yesod-static >= 1.2 + , yesod-static >= 1.2 && < 1.5 , zlib , unordered-containers , hashable @@ -164,7 +164,7 @@ library , deepseq , deepseq-generics , auto-update - , stackage-types >= 1.0.1 + , stackage-types >= 1.0.1.1 , stackage-build-plan >= 0.1.1 , yesod-sitemap , streaming-commons