hakyll 4.7.2.1 → 4.7.2.2

raw patch · 3 files changed

+40/−31 lines, 3 filesdep +time-locale-compatdep ~timePVP ok

version bump matches the API change (PVP)

Dependencies added: time-locale-compat

Dependency ranges changed: time

API changes (from Hackage documentation)

Files

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

@@ -1,5 +1,5 @@ Name:    hakyll-Version: 4.7.2.1+Version: 4.7.2.2  Synopsis: A static website compiler library Description:@@ -140,32 +140,33 @@     Paths_hakyll    Build-Depends:-    base            >= 4       && < 5,-    binary          >= 0.5     && < 0.8,-    blaze-html      >= 0.5     && < 0.9,-    blaze-markup    >= 0.5.1   && < 0.8,-    bytestring      >= 0.9     && < 0.11,-    cmdargs         >= 0.10    && < 0.11,-    containers      >= 0.3     && < 0.6,-    cryptohash      >= 0.7     && < 0.12,-    data-default    >= 0.4     && < 0.6,-    deepseq         >= 1.3     && < 1.5,-    directory       >= 1.0     && < 1.3,-    filepath        >= 1.0     && < 1.5,-    lrucache        >= 1.1.1   && < 1.3,-    mtl             >= 1       && < 2.3,-    network         >= 2.6     && < 2.7,-    network-uri     >= 2.6     && < 2.7,-    pandoc          >= 1.14    && < 1.16,-    pandoc-citeproc >= 0.4     && < 0.8,-    parsec          >= 3.0     && < 3.2,-    process         >= 1.0     && < 1.3,-    random          >= 1.0     && < 1.2,-    regex-base      >= 0.93    && < 0.94,-    regex-tdfa      >= 1.1     && < 1.3,-    tagsoup         >= 0.13.1  && < 0.14,-    text            >= 0.11    && < 1.3,-    time            >= 1.5     && < 1.6+    base               >= 4       && < 5,+    binary             >= 0.5     && < 0.8,+    blaze-html         >= 0.5     && < 0.9,+    blaze-markup       >= 0.5.1   && < 0.8,+    bytestring         >= 0.9     && < 0.11,+    cmdargs            >= 0.10    && < 0.11,+    containers         >= 0.3     && < 0.6,+    cryptohash         >= 0.7     && < 0.12,+    data-default       >= 0.4     && < 0.6,+    deepseq            >= 1.3     && < 1.5,+    directory          >= 1.0     && < 1.3,+    filepath           >= 1.0     && < 1.5,+    lrucache           >= 1.1.1   && < 1.3,+    mtl                >= 1       && < 2.3,+    network            >= 2.6     && < 2.7,+    network-uri        >= 2.6     && < 2.7,+    pandoc             >= 1.14    && < 1.16,+    pandoc-citeproc    >= 0.4     && < 0.8,+    parsec             >= 3.0     && < 3.2,+    process            >= 1.0     && < 1.3,+    random             >= 1.0     && < 1.2,+    regex-base         >= 0.93    && < 0.94,+    regex-tdfa         >= 1.1     && < 1.3,+    tagsoup            >= 0.13.1  && < 0.14,+    text               >= 0.11    && < 1.3,+    time               >= 1.4     && < 1.6,+    time-locale-compat >= 0.1     && < 0.2    If flag(previewServer)     Build-depends:

@@ -1,4 +1,5 @@ --------------------------------------------------------------------------------+{-# LANGUAGE CPP                       #-} {-# LANGUAGE ExistentialQuantification #-} module Hakyll.Web.Template.Context     ( ContextField (..)@@ -35,11 +36,11 @@ 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 $ \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

@@ -22,7 +22,7 @@ import           Control.Monad               (liftM) import           Data.List                   (intersperse, sortBy) import           Data.Ord                    (comparing)-import           Data.Time.Format            (defaultTimeLocale)+import           Data.Time.Locale.Compat     (defaultTimeLocale)   --------------------------------------------------------------------------------