Allow time 1.4.*

jaspervdj · Aug 1, 2015 · 11bd56b · 11bd56b
1 parent df2bc9f
commit 11bd56b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/hakyll.cabal b/hakyll.cabal
@@ -165,7 +165,8 @@ Library
     regex-tdfa      >= 1.1     && < 1.3,
     tagsoup         >= 0.13.1  && < 0.14,
     text            >= 0.11    && < 1.3,
-    time            >= 1.5     && < 1.6
+    time            >= 1.4     && < 1.6,
+    time-locale-compat == 0.1.*
 
   If flag(previewServer)
     Build-depends:

diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs
@@ -1,4 +1,5 @@
 --------------------------------------------------------------------------------
+{-# LANGUAGE CPP                       #-}
 {-# LANGUAGE ExistentialQuantification #-}
 module Hakyll.Web.Template.Context
     ( ContextField (..)
@@ -35,11 +36,11 @@ import           Data.List                     (intercalate)
 import qualified Data.Map                      as M
 import           Data.Monoid                   (Monoid (..))
 import           Data.Time.Clock               (UTCTime (..))
-import           Data.Time.Format              (TimeLocale, defaultTimeLocale,
-                                                formatTime, parseTimeM)
+import           Data.Time.Format              (formatTime)
+import qualified Data.Time.Format              as TF
+import           Data.Time.Locale.Compat       (TimeLocale, defaultTimeLocale)
 import           System.FilePath               (splitDirectories, takeBaseName)
 
-
 --------------------------------------------------------------------------------
 import           Hakyll.Core.Compiler
 import           Hakyll.Core.Compiler.Internal
@@ -345,3 +346,10 @@ missingField :: Context a
 missingField = Context $ \k _ i -> fail $
     "Missing field $" ++ k ++ "$ in context for item " ++
     show (itemIdentifier i)
+
+parseTimeM :: Bool -> TimeLocale -> String -> String -> Maybe UTCTime
+#if MIN_VERSION_time(1,5,0)
+parseTimeM = TF.parseTimeM
+#else
+parseTimeM _ = TF.parseTime
+#endif
diff --git 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           Data.Time.Format            (defaultTimeLocale)
+import           Data.Time.Locale.Compat     (defaultTimeLocale)
 
 
 --------------------------------------------------------------------------------