From 607d6faab25a62e56b38cd89e7c1e4970fb44699 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 20:33:42 +0300 Subject: [PATCH] GHC 7.10 and system-filepath issues --- Echo.hs | 2 ++ stackage-server.cabal | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) 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 2fb5507..169f025 100644 --- a/stackage-server.cabal +++ b/stackage-server.cabal @@ -102,7 +102,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 @@ -137,7 +137,7 @@ 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