d8a3d7e · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Merge pull request #360 from bergmark/time-1.4

d8a3d7eJasper Van der Jeugt11 years ago

hakyll.cabal+27−26

compare with master

unifiedsplit

@@ -140,32 +140,33 @@ Library

140 Paths_hakyll

141

142 Build-Depends:

143− base >= 4 && < 5,

143+ base >= 4 && < 5,

144− binary >= 0.5 && < 0.8,

144+ binary >= 0.5 && < 0.8,

145− blaze-html >= 0.5 && < 0.9,

145+ blaze-html >= 0.5 && < 0.9,

146− blaze-markup >= 0.5.1 && < 0.8,

146+ blaze-markup >= 0.5.1 && < 0.8,

147− bytestring >= 0.9 && < 0.11,

147+ bytestring >= 0.9 && < 0.11,

148− cmdargs >= 0.10 && < 0.11,

148+ cmdargs >= 0.10 && < 0.11,

149− containers >= 0.3 && < 0.6,

149+ containers >= 0.3 && < 0.6,

150− cryptohash >= 0.7 && < 0.12,

150+ cryptohash >= 0.7 && < 0.12,

151− data-default >= 0.4 && < 0.6,

151+ data-default >= 0.4 && < 0.6,

152− deepseq >= 1.3 && < 1.5,

152+ deepseq >= 1.3 && < 1.5,

153− directory >= 1.0 && < 1.3,

153+ directory >= 1.0 && < 1.3,

154− filepath >= 1.0 && < 1.5,

154+ filepath >= 1.0 && < 1.5,

155− lrucache >= 1.1.1 && < 1.3,

155+ lrucache >= 1.1.1 && < 1.3,

156− mtl >= 1 && < 2.3,

156+ mtl >= 1 && < 2.3,

157− network >= 2.6 && < 2.7,

157+ network >= 2.6 && < 2.7,

158− network-uri >= 2.6 && < 2.7,

158+ network-uri >= 2.6 && < 2.7,

159− pandoc >= 1.14 && < 1.16,

159+ pandoc >= 1.14 && < 1.16,

160− pandoc-citeproc >= 0.4 && < 0.8,

160+ pandoc-citeproc >= 0.4 && < 0.8,

161− parsec >= 3.0 && < 3.2,

161+ parsec >= 3.0 && < 3.2,

162− process >= 1.0 && < 1.3,

162+ process >= 1.0 && < 1.3,

163− random >= 1.0 && < 1.2,

163+ random >= 1.0 && < 1.2,

164− regex-base >= 0.93 && < 0.94,

164+ regex-base >= 0.93 && < 0.94,

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

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

166− tagsoup >= 0.13.1 && < 0.14,

166+ tagsoup >= 0.13.1 && < 0.14,

167− text >= 0.11 && < 1.3,

167+ text >= 0.11 && < 1.3,

168− time >= 1.5 && < 1.6

168+ time >= 1.4 && < 1.6,

169+ time-locale-compat >= 0.1 && < 0.2

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--------------------------------------------------------------------------------