11bd56b · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Allow time 1.4.*

11bd56bAdam Bergmark11 years ago

hakyll.cabal+2−1

compare with master

unifiedsplit

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

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

166 tagsoup >= 0.13.1 && < 0.14,

167 text >= 0.11 && < 1.3,

168− time >= 1.5 && < 1.6

168+ time >= 1.4 && < 1.6,

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

169

170

170 If flag(previewServer)

171 If flag(previewServer)

171 Build-depends:

172 Build-depends:

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

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

1--------------------------------------------------------------------------------

2+{-# LANGUAGE CPP #-}

2{-# LANGUAGE ExistentialQuantification #-}

3{-# LANGUAGE ExistentialQuantification #-}

3module Hakyll.Web.Template.Context

4module Hakyll.Web.Template.Context

4 ( ContextField (..)

5 ( ContextField (..)

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

35import qualified Data.Map as M

36import qualified Data.Map as M

36import Data.Monoid (Monoid (..))

37import Data.Monoid (Monoid (..))

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

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

39+import Data.Time.Format (formatTime)

40+import qualified Data.Time.Format as TF

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

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

39− formatTime, parseTimeM)

40import System.FilePath (splitDirectories, takeBaseName)

42import System.FilePath (splitDirectories, takeBaseName)

42−

43--------------------------------------------------------------------------------

44--------------------------------------------------------------------------------

44import Hakyll.Core.Compiler

45import Hakyll.Core.Compiler

45import Hakyll.Core.Compiler.Internal

46import Hakyll.Core.Compiler.Internal

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

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

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

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

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

347 show (itemIdentifier i)

348 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

22import Control.Monad (liftM)

23import Data.List (intersperse, sortBy)

24import Data.Ord (comparing)

25−import Data.Time.Format (defaultTimeLocale)

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

28--------------------------------------------------------------------------------