hakyll 4.7.1.0 → 4.7.2.0

raw patch · 6 files changed

+13/−11 lines, 6 filesdep ~pandocPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: pandoc

API changes (from Hackage documentation)

- Hakyll.Core.Configuration: deployCommand :: Configuration -> String

- Hakyll.Core.Configuration: deploySite :: Configuration -> Configuration -> IO ExitCode

- Hakyll.Core.Configuration: destinationDirectory :: Configuration -> FilePath

- Hakyll.Core.Configuration: ignoreFile :: Configuration -> FilePath -> Bool

- Hakyll.Core.Configuration: inMemoryCache :: Configuration -> Bool

- Hakyll.Core.Configuration: instance Default Configuration

- Hakyll.Core.Configuration: previewHost :: Configuration -> String

- Hakyll.Core.Configuration: previewPort :: Configuration -> Int

- Hakyll.Core.Configuration: providerDirectory :: Configuration -> FilePath

- Hakyll.Core.Configuration: storeDirectory :: Configuration -> FilePath

- Hakyll.Core.Configuration: tmpDirectory :: Configuration -> FilePath

- Hakyll.Core.Dependencies: instance Binary Dependency

- Hakyll.Core.Dependencies: instance Show Dependency

- Hakyll.Core.Dependencies: instance Show DependencyState

- Hakyll.Core.Dependencies: instance Typeable Dependency

- Hakyll.Core.File: instance Binary CopyFile

- Hakyll.Core.File: instance Binary TmpFile

- Hakyll.Core.File: instance Eq CopyFile

- Hakyll.Core.File: instance Ord CopyFile

- Hakyll.Core.File: instance Show CopyFile

- Hakyll.Core.File: instance Typeable CopyFile

- Hakyll.Core.File: instance Typeable TmpFile

- Hakyll.Core.File: instance Writable CopyFile

- Hakyll.Core.File: instance Writable TmpFile

- Hakyll.Core.Identifier: instance Binary Identifier

- Hakyll.Core.Identifier: instance Eq Identifier

- Hakyll.Core.Identifier: instance IsString Identifier

- Hakyll.Core.Identifier: instance NFData Identifier

- Hakyll.Core.Identifier: instance Ord Identifier

- Hakyll.Core.Identifier: instance Show Identifier

- Hakyll.Core.Identifier: instance Typeable Identifier

- Hakyll.Core.Identifier.Pattern: instance Binary GlobComponent

- Hakyll.Core.Identifier.Pattern: instance Binary Pattern

- Hakyll.Core.Identifier.Pattern: instance Eq GlobComponent

- Hakyll.Core.Identifier.Pattern: instance IsString Pattern

- Hakyll.Core.Identifier.Pattern: instance Monoid Pattern

- Hakyll.Core.Identifier.Pattern: instance Show GlobComponent

- Hakyll.Core.Identifier.Pattern: instance Show Pattern

- Hakyll.Core.Item: instance Binary a => Binary (Item a)

- Hakyll.Core.Item: instance Foldable Item

- Hakyll.Core.Item: instance Functor Item

- Hakyll.Core.Item: instance Show a => Show (Item a)

- Hakyll.Core.Item: instance Traversable Item

- Hakyll.Core.Item: instance Typeable Item

- Hakyll.Core.Item: itemBody :: Item a -> a

- Hakyll.Core.Item: itemIdentifier :: Item a -> Identifier

- Hakyll.Core.Routes: instance Monoid Routes

- Hakyll.Core.Writable: instance Writable ()

- Hakyll.Core.Writable: instance Writable ByteString

- Hakyll.Core.Writable: instance Writable Html

- Hakyll.Core.Writable: instance Writable [Char]

- Hakyll.Core.Writable: instance Writable [Word8]

- Hakyll.Main: instance Data HakyllArgs

- Hakyll.Main: instance Show HakyllArgs

- Hakyll.Main: instance Typeable HakyllArgs

- Hakyll.Web.Feed: feedAuthorEmail :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedAuthorName :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedDescription :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedRoot :: FeedConfiguration -> String

- Hakyll.Web.Feed: feedTitle :: FeedConfiguration -> String

- Hakyll.Web.Feed: instance Eq FeedConfiguration

- Hakyll.Web.Feed: instance Show FeedConfiguration

- Hakyll.Web.Paginate: instance Show Paginate

- Hakyll.Web.Paginate: paginateDependency :: Paginate -> Dependency

- Hakyll.Web.Paginate: paginateMakeId :: Paginate -> PageNumber -> Identifier

- Hakyll.Web.Paginate: paginateMap :: Paginate -> Map PageNumber [Identifier]

- Hakyll.Web.Pandoc.Biblio: instance Binary Biblio

- Hakyll.Web.Pandoc.Biblio: instance Binary CSL

- Hakyll.Web.Pandoc.Biblio: instance Show Biblio

- Hakyll.Web.Pandoc.Biblio: instance Show CSL

- Hakyll.Web.Pandoc.Biblio: instance Typeable Biblio

- Hakyll.Web.Pandoc.Biblio: instance Typeable CSL

- Hakyll.Web.Pandoc.Biblio: instance Writable Biblio

- Hakyll.Web.Pandoc.Biblio: instance Writable CSL

- Hakyll.Web.Pandoc.FileType: instance Eq FileType

- Hakyll.Web.Pandoc.FileType: instance Ord FileType

- Hakyll.Web.Pandoc.FileType: instance Read FileType

- Hakyll.Web.Pandoc.FileType: instance Show FileType

- Hakyll.Web.Tags: instance Show Tags

- Hakyll.Web.Tags: tagsDependency :: Tags -> Dependency

- Hakyll.Web.Tags: tagsMakeId :: Tags -> String -> Identifier

- Hakyll.Web.Tags: tagsMap :: Tags -> [(String, [Identifier])]

- Hakyll.Web.Template.Context: instance Monoid (Context a)

- Hakyll.Web.Template.Context: unContext :: Context a -> String -> [String] -> Item a -> Compiler ContextField

+ Hakyll.Core.Configuration: [deployCommand] :: Configuration -> String

+ Hakyll.Core.Configuration: [deploySite] :: Configuration -> Configuration -> IO ExitCode

+ Hakyll.Core.Configuration: [destinationDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: [ignoreFile] :: Configuration -> FilePath -> Bool

+ Hakyll.Core.Configuration: [inMemoryCache] :: Configuration -> Bool

+ Hakyll.Core.Configuration: [previewHost] :: Configuration -> String

+ Hakyll.Core.Configuration: [previewPort] :: Configuration -> Int

+ Hakyll.Core.Configuration: [providerDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: [storeDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: [tmpDirectory] :: Configuration -> FilePath

+ Hakyll.Core.Configuration: instance Data.Default.Class.Default Hakyll.Core.Configuration.Configuration

+ Hakyll.Core.Dependencies: instance Data.Binary.Class.Binary Hakyll.Core.Dependencies.Dependency

+ Hakyll.Core.Dependencies: instance GHC.Show.Show Hakyll.Core.Dependencies.Dependency

+ Hakyll.Core.Dependencies: instance GHC.Show.Show Hakyll.Core.Dependencies.DependencyState

+ Hakyll.Core.File: instance Data.Binary.Class.Binary Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance Data.Binary.Class.Binary Hakyll.Core.File.TmpFile

+ Hakyll.Core.File: instance GHC.Classes.Eq Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance GHC.Classes.Ord Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance GHC.Show.Show Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance Hakyll.Core.Writable.Writable Hakyll.Core.File.CopyFile

+ Hakyll.Core.File: instance Hakyll.Core.Writable.Writable Hakyll.Core.File.TmpFile

+ Hakyll.Core.Identifier: instance Control.DeepSeq.NFData Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance Data.Binary.Class.Binary Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance Data.String.IsString Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance GHC.Classes.Eq Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance GHC.Classes.Ord Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier: instance GHC.Show.Show Hakyll.Core.Identifier.Identifier

+ Hakyll.Core.Identifier.Pattern: instance Data.Binary.Class.Binary Hakyll.Core.Identifier.Pattern.GlobComponent

+ Hakyll.Core.Identifier.Pattern: instance Data.Binary.Class.Binary Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Identifier.Pattern: instance Data.String.IsString Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Identifier.Pattern: instance GHC.Base.Monoid Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Identifier.Pattern: instance GHC.Classes.Eq Hakyll.Core.Identifier.Pattern.GlobComponent

+ Hakyll.Core.Identifier.Pattern: instance GHC.Show.Show Hakyll.Core.Identifier.Pattern.GlobComponent

+ Hakyll.Core.Identifier.Pattern: instance GHC.Show.Show Hakyll.Core.Identifier.Pattern.Pattern

+ Hakyll.Core.Item: [itemBody] :: Item a -> a

+ Hakyll.Core.Item: [itemIdentifier] :: Item a -> Identifier

+ Hakyll.Core.Item: instance Data.Binary.Class.Binary a => Data.Binary.Class.Binary (Hakyll.Core.Item.Item a)

+ Hakyll.Core.Item: instance Data.Foldable.Foldable Hakyll.Core.Item.Item

+ Hakyll.Core.Item: instance Data.Traversable.Traversable Hakyll.Core.Item.Item

+ Hakyll.Core.Item: instance GHC.Base.Functor Hakyll.Core.Item.Item

+ Hakyll.Core.Item: instance GHC.Show.Show a => GHC.Show.Show (Hakyll.Core.Item.Item a)

+ Hakyll.Core.Routes: instance GHC.Base.Monoid Hakyll.Core.Routes.Routes

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable ()

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable Data.ByteString.Internal.ByteString

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable Data.ByteString.Lazy.Internal.ByteString

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable Text.Blaze.Html.Html

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable [GHC.Types.Char]

+ Hakyll.Core.Writable: instance Hakyll.Core.Writable.Writable [GHC.Word.Word8]

+ Hakyll.Main: instance Data.Data.Data Hakyll.Main.HakyllArgs

+ Hakyll.Main: instance GHC.Show.Show Hakyll.Main.HakyllArgs

+ Hakyll.Web.Feed: [feedAuthorEmail] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedAuthorName] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedDescription] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedRoot] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: [feedTitle] :: FeedConfiguration -> String

+ Hakyll.Web.Feed: instance GHC.Classes.Eq Hakyll.Web.Feed.FeedConfiguration

+ Hakyll.Web.Feed: instance GHC.Show.Show Hakyll.Web.Feed.FeedConfiguration

+ Hakyll.Web.Paginate: [paginateDependency] :: Paginate -> Dependency

+ Hakyll.Web.Paginate: [paginateMakeId] :: Paginate -> PageNumber -> Identifier

+ Hakyll.Web.Paginate: [paginateMap] :: Paginate -> Map PageNumber [Identifier]

+ Hakyll.Web.Paginate: instance GHC.Show.Show Hakyll.Web.Paginate.Paginate

+ Hakyll.Web.Pandoc.Biblio: instance Data.Binary.Class.Binary Hakyll.Web.Pandoc.Biblio.Biblio

+ Hakyll.Web.Pandoc.Biblio: instance Data.Binary.Class.Binary Hakyll.Web.Pandoc.Biblio.CSL

+ Hakyll.Web.Pandoc.Biblio: instance GHC.Show.Show Hakyll.Web.Pandoc.Biblio.Biblio

+ Hakyll.Web.Pandoc.Biblio: instance GHC.Show.Show Hakyll.Web.Pandoc.Biblio.CSL

+ Hakyll.Web.Pandoc.Biblio: instance Hakyll.Core.Writable.Writable Hakyll.Web.Pandoc.Biblio.Biblio

+ Hakyll.Web.Pandoc.Biblio: instance Hakyll.Core.Writable.Writable Hakyll.Web.Pandoc.Biblio.CSL

+ Hakyll.Web.Pandoc.FileType: instance GHC.Classes.Eq Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Pandoc.FileType: instance GHC.Classes.Ord Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Pandoc.FileType: instance GHC.Read.Read Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Pandoc.FileType: instance GHC.Show.Show Hakyll.Web.Pandoc.FileType.FileType

+ Hakyll.Web.Tags: [tagsDependency] :: Tags -> Dependency

+ Hakyll.Web.Tags: [tagsMakeId] :: Tags -> String -> Identifier

+ Hakyll.Web.Tags: [tagsMap] :: Tags -> [(String, [Identifier])]

+ Hakyll.Web.Tags: instance GHC.Show.Show Hakyll.Web.Tags.Tags

+ Hakyll.Web.Template.Context: [unContext] :: Context a -> String -> [String] -> Item a -> Compiler ContextField

+ Hakyll.Web.Template.Context: instance GHC.Base.Monoid (Hakyll.Web.Template.Context.Context a)

Files

hakyll.cabal +3/−3
src/Hakyll/Core/Compiler.hs +4/−3
src/Hakyll/Core/Item.hs +1/−1
src/Hakyll/Preview/Poll.hs +2/−1
src/Hakyll/Web/Template/Context.hs +2/−2
src/Hakyll/Web/Template/Internal.hs +1/−1

hakyll.cabal view

@@ -1,5 +1,5 @@ Name:    hakyll-Version: 4.7.1.0+Version: 4.7.2.0  Synopsis: A static website compiler library Description:@@ -156,7 +156,7 @@     mtl             >= 1       && < 2.3,     network         >= 2.6     && < 2.7,     network-uri     >= 2.6     && < 2.7,-    pandoc          >= 1.14    && < 1.15,+    pandoc          >= 1.14    && < 1.16,     pandoc-citeproc >= 0.4     && < 0.8,     parsec          >= 3.0     && < 3.2,     process         >= 1.0     && < 1.3,@@ -241,7 +241,7 @@     mtl             >= 1       && < 2.3,     network         >= 2.6     && < 2.7,     network-uri     >= 2.6     && < 2.7,-    pandoc          >= 1.14    && < 1.15,+    pandoc          >= 1.14    && < 1.16,     pandoc-citeproc >= 0.4     && < 0.8,     parsec          >= 3.0     && < 3.2,     process         >= 1.0     && < 1.3,

src/Hakyll/Core/Compiler.hs view

@@ -83,19 +83,20 @@   ----------------------------------------------------------------------------------- | Get the body of the underlying resource+-- | Get the full contents of the matched source file as a string,+-- but without metadata preamble, if there was one. getResourceBody :: Compiler (Item String) getResourceBody = getResourceWith resourceBody   ----------------------------------------------------------------------------------- | Get the resource we are compiling as a string+-- | Get the full contents of the matched source file as a string. getResourceString :: Compiler (Item String) getResourceString = getResourceWith resourceString   ----------------------------------------------------------------------------------- | Get the resource we are compiling as a lazy bytestring+-- | Get the full contents of the matched source file as a lazy bytestring. getResourceLBS :: Compiler (Item ByteString) getResourceLBS = getResourceWith resourceLBS

src/Hakyll/Core/Item.hs view

@@ -10,7 +10,7 @@   ---------------------------------------------------------------------------------import           Control.Applicative           (Applicative, (<$>), (<*>))+import           Control.Applicative           ((<$>), (<*>)) import           Data.Binary                   (Binary (..)) import           Data.Foldable                 (Foldable (..)) import           Data.Traversable              (Traversable (..))

src/Hakyll/Preview/Poll.hs view

@@ -14,7 +14,7 @@ import           Control.Monad                  (forever, void, when) import           Filesystem.Path.CurrentOS      (decodeString, encodeString) import           System.Directory               (canonicalizePath)-import           System.FilePath                (pathSeparators, (</>))+import           System.FilePath                (pathSeparators) import           System.FSNotify                (Event (..), startManager,                                                  watchTree) @@ -23,6 +23,7 @@ import           Control.Exception              (IOException, throw, try) import           System.Directory               (doesFileExist) import           System.Exit                    (exitFailure)+import           System.FilePath                ((</>)) import           System.IO                      (Handle, IOMode (ReadMode),                                                  hClose, openFile) import           System.IO.Error                (isPermissionError)

src/Hakyll/Web/Template/Context.hs view

@@ -36,7 +36,7 @@ import           Data.Monoid                   (Monoid (..)) import           Data.Time.Clock               (UTCTime (..)) import           Data.Time.Format              (TimeLocale, defaultTimeLocale,-                                                formatTime, parseTime)+                                                formatTime, parseTimeM) import           System.FilePath               (splitDirectories, takeBaseName)  @@ -282,7 +282,7 @@   where     empty'     = fail $ "Hakyll.Web.Template.Context.getItemUTC: " ++         "could not parse time for " ++ show id'-    parseTime' = parseTime locale+    parseTime' = parseTimeM True locale     formats    =         [ "%a, %d %b %Y %H:%M:%S %Z"         , "%Y-%m-%dT%H:%M:%S%Z"

src/Hakyll/Web/Template/Internal.hs view

@@ -128,7 +128,7 @@ -------------------------------------------------------------------------------- template :: P.Parser Template template = Template <$>-    (P.many1 $ chunk <|> escaped <|> conditional <|> for <|> partial <|> expr)+    (P.many $ chunk <|> escaped <|> conditional <|> for <|> partial <|> expr)   --------------------------------------------------------------------------------