Merge pull request #344 from cstrahan/ghc710fix

fix building on GHC 7.10

4 files changed, 32 insertions, 30 deletions

diff --git a/hakyll.cabal b/hakyll.cabal
index 1fe7c3f..d5568b0 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -140,34 +140,35 @@ Library
     Paths_hakyll
 
   Build-Depends:
-    base            >= 4      && < 5,
-    binary          >= 0.5    && < 0.8,
-    blaze-html      >= 0.5    && < 0.9,
-    blaze-markup    >= 0.5.1  && < 0.8,
-    bytestring      >= 0.9    && < 0.11,
-    cmdargs         >= 0.10   && < 0.11,
-    containers      >= 0.3    && < 0.6,
-    cryptohash      >= 0.7    && < 0.12,
-    data-default    >= 0.4    && < 0.6,
-    deepseq         >= 1.3    && < 1.5,
-    directory       >= 1.0    && < 1.3,
-    filepath        >= 1.0    && < 1.5,
-    lrucache        >= 1.1.1  && < 1.3,
-    mtl             >= 1      && < 2.3,
-    network         >= 2.6    && < 2.7,
-    network-uri     >= 2.6    && < 2.7,
-    old-locale      >= 1.0    && < 1.1,
-    old-time        >= 1.0    && < 1.2,
-    pandoc          >= 1.12.4 && < 1.14,
-    pandoc-citeproc >= 0.4    && < 0.7,
-    parsec          >= 3.0    && < 3.2,
-    process         >= 1.0    && < 1.3,
-    random          >= 1.0    && < 1.2,
-    regex-base      >= 0.93   && < 0.94,
-    regex-tdfa      >= 1.1    && < 1.3,
-    tagsoup         >= 0.13.1 && < 0.14,
-    text            >= 0.11   && < 1.3,
-    time            >= 1.1    && < 1.6
+    base               >= 4       && < 5,
+    binary             >= 0.5     && < 0.8,
+    blaze-html         >= 0.5     && < 0.9,
+    blaze-markup       >= 0.5.1   && < 0.8,
+    bytestring         >= 0.9     && < 0.11,
+    cmdargs            >= 0.10    && < 0.11,
+    containers         >= 0.3     && < 0.6,
+    cryptohash         >= 0.7     && < 0.12,
+    data-default       >= 0.4     && < 0.6,
+    deepseq            >= 1.3     && < 1.5,
+    directory          >= 1.0     && < 1.3,
+    filepath           >= 1.0     && < 1.5,
+    lrucache           >= 1.1.1   && < 1.3,
+    mtl                >= 1       && < 2.3,
+    network            >= 2.6     && < 2.7,
+    network-uri        >= 2.6     && < 2.7,
+    old-locale         >= 1.0     && < 1.1,
+    old-time           >= 1.0     && < 1.2,
+    pandoc             >= 1.12.4  && < 1.14,
+    pandoc-citeproc    >= 0.4     && < 0.7,
+    parsec             >= 3.0     && < 3.2,
+    process            >= 1.0     && < 1.3,
+    random             >= 1.0     && < 1.2,
+    regex-base         >= 0.93    && < 0.94,
+    regex-tdfa         >= 1.1     && < 1.3,
+    tagsoup            >= 0.13.1  && < 0.14,
+    text               >= 0.11    && < 1.3,
+    time               >= 1.1     && < 1.6,
+    time-locale-compat >= 0.1.0.0 && < 0.1.1.0
 
   If flag(previewServer)
     Build-depends:
diff --git a/src/Hakyll/Core/Util/String.hs b/src/Hakyll/Core/Util/String.hs
index b46f7b8..23bdd39 100644
--- a/src/Hakyll/Core/Util/String.hs
+++ b/src/Hakyll/Core/Util/String.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 --------------------------------------------------------------------------------
 -- | Miscellaneous string manipulation functions.
 module Hakyll.Core.Util.String
diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs
index 63828ed..a0f2779 100644
--- a/src/Hakyll/Web/Template/Context.hs
+++ b/src/Hakyll/Web/Template/Context.hs
@@ -37,7 +37,7 @@ import           Data.Monoid                   (Monoid (..))
 import           Data.Time.Clock               (UTCTime (..))
 import           Data.Time.Format              (formatTime, parseTime)
 import           System.FilePath               (takeBaseName, splitDirectories)
-import           System.Locale                 (TimeLocale, defaultTimeLocale)
+import           Data.Time.Locale.Compat       (TimeLocale, defaultTimeLocale)
 
 
 --------------------------------------------------------------------------------
diff --git a/src/Hakyll/Web/Template/List.hs b/src/Hakyll/Web/Template/List.hs
index 1f2a570..4d769fc 100644
--- a/src/Hakyll/Web/Template/List.hs
+++ b/src/Hakyll/Web/Template/List.hs
@@ -22,7 +22,7 @@ module Hakyll.Web.Template.List
 import           Control.Monad               (liftM)
 import           Data.List                   (intersperse, sortBy)
 import           Data.Ord                    (comparing)
-import           System.Locale               (defaultTimeLocale)
+import           Data.Time.Locale.Compat     (defaultTimeLocale)
 
 
 --------------------------------------------------------------------------------