f9872ba · hakyll · git.iko.soy

src/Hakyll/Core/Item.hs+1−1

compare with master

unifiedsplit

@@ -10,7 +10,7 @@ module Hakyll.Core.Item

10

11

12--------------------------------------------------------------------------------

13−import Control.Applicative (Applicative, (<$>), (<*>))

13+import Control.Applicative ((<$>), (<*>))

14import Data.Binary (Binary (..))

15import Data.Foldable (Foldable (..))

16import Data.Traversable (Traversable (..))

src/Hakyll/Preview/Poll.hs+2−1

@@ -14,7 +14,7 @@ import Control.Exception (AsyncException, fromException,

14import Control.Monad (forever, void, when)

15import Filesystem.Path.CurrentOS (decodeString, encodeString)

16import System.Directory (canonicalizePath)

17−import System.FilePath (pathSeparators, (</>))

17+import System.FilePath (pathSeparators)

18import System.FSNotify (Event (..), startManager,

19 watchTree)

20

@@ -23,6 +23,7 @@ import Control.Concurrent (threadDelay)

23import Control.Exception (IOException, throw, try)

24import System.Directory (doesFileExist)

25import System.Exit (exitFailure)

26+import System.FilePath ((</>))

26import System.IO (Handle, IOMode (ReadMode),

27import System.IO (Handle, IOMode (ReadMode),

27 hClose, openFile)

28 hClose, openFile)

28import System.IO.Error (isPermissionError)

29import System.IO.Error (isPermissionError)

src/Hakyll/Web/Template/Context.hs+2−2

@@ -36,7 +36,7 @@ import qualified Data.Map as M

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

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

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

39− formatTime, parseTime)

39+ formatTime, parseTimeM)

40import System.FilePath (splitDirectories, takeBaseName)

41

42

@@ -282,7 +282,7 @@ getItemUTC locale id' = do

282 where

283 empty' = fail $ "Hakyll.Web.Template.Context.getItemUTC: " ++

284 "could not parse time for " ++ show id'

285− parseTime' = parseTime locale

285+ parseTime' = parseTimeM True locale

286 formats =

287 [ "%a, %d %b %Y %H:%M:%S %Z"

288 , "%Y-%m-%dT%H:%M:%S%Z"

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

@@ -128,7 +128,7 @@ readTemplate input = case P.parse template "" input of

128--------------------------------------------------------------------------------

129template :: P.Parser Template

130template = Template <$>

132

133

134--------------------------------------------------------------------------------