11bd56b · hakyll · git.iko.soy

git.iko.soy/hakyll

Allow time 1.4.*

commit11bd56b316d1c8574baa1b511ae8a49b4b7911bc authorAdam Bergmark <adam@bergmark.nl> dateSat 1 Aug 2015, 16:27 (11 years ago) parentdf2bc9f

3 files changed+14−5

compare with master

unifiedsplit

hakyll.cabal+2−1 src/Hakyll/Web/Template/Context.hs+11−3 src/Hakyll/Web/Template/List.hs+1−1

hakyll.cabal+2−1

@@ -165,7 +165,8 @@ Library

165165 regex-tdfa >= 1.1 && < 1.3,

166166 tagsoup >= 0.13.1 && < 0.14,

167167 text >= 0.11 && < 1.3,

168− time >= 1.5 && < 1.6

168+ time >= 1.4 && < 1.6,

169+ time-locale-compat == 0.1.*

169170

170171 If flag(previewServer)

171172 Build-depends:

src/Hakyll/Web/Template/Context.hs+11−3

@@ -1,4 +1,5 @@

11--------------------------------------------------------------------------------

2+{-# LANGUAGE CPP #-}

23{-# LANGUAGE ExistentialQuantification #-}

34module Hakyll.Web.Template.Context

45 ( ContextField (..)

@@ -35,11 +36,11 @@ import Data.List (intercalate)

3536import qualified Data.Map as M

3637import Data.Monoid (Monoid (..))

3738import Data.Time.Clock (UTCTime (..))

38−import Data.Time.Format (TimeLocale, defaultTimeLocale,

39− formatTime, parseTimeM)

39+import Data.Time.Format (formatTime)

40+import qualified Data.Time.Format as TF

41+import Data.Time.Locale.Compat (TimeLocale, defaultTimeLocale)

4042import System.FilePath (splitDirectories, takeBaseName)

4143

42−

4344--------------------------------------------------------------------------------

4445import Hakyll.Core.Compiler

4546import Hakyll.Core.Compiler.Internal

@@ -345,3 +346,10 @@ missingField :: Context a

345346missingField = Context $ \k _ i -> fail $

346347 "Missing field $" ++ k ++ "$ in context for item " ++

347348 show (itemIdentifier i)

349+

350+parseTimeM :: Bool -> TimeLocale -> String -> String -> Maybe UTCTime

351+#if MIN_VERSION_time(1,5,0)

352+parseTimeM = TF.parseTimeM

353+#else

354+parseTimeM _ = TF.parseTime

355+#endif

src/Hakyll/Web/Template/List.hs+1−1

@@ -22,7 +22,7 @@ module Hakyll.Web.Template.List

2222import Control.Monad (liftM)

2323import Data.List (intersperse, sortBy)

2424import Data.Ord (comparing)

25−import Data.Time.Format (defaultTimeLocale)

25+import Data.Time.Locale.Compat (defaultTimeLocale)

2626

2727

2828--------------------------------------------------------------------------------