diff options
| -rw-r--r-- | hakyll.cabal | 77 | ||||
| -rw-r--r-- | src/Hakyll/Core/Rules.hs | 7 | ||||
| -rw-r--r-- | src/Hakyll/Core/Run.hs | 8 |
3 files changed, 59 insertions, 33 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index 0538a18..63eaf61 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -33,36 +33,59 @@ library containers == 0.*, pandoc == 1.*, regex-base >= 0.93, - regex-tdfa >= 1.1, - network == 2.*, + regex-pcre >= 0.93, mtl >= 1, old-locale == 1.*, old-time == 1.*, time >= 1.1, binary >= 0.5, - hamlet >= 0.4.2, - blaze-html >= 0.2 && <= 0.3 - exposed-modules: Network.Hakyll.SimpleServer - Text.Hakyll - Text.Hakyll.Context - Text.Hakyll.ContextManipulations - Text.Hakyll.CreateContext - Text.Hakyll.File - Text.Hakyll.HakyllMonad - Text.Hakyll.Regex - Text.Hakyll.Render - Text.Hakyll.HakyllAction - Text.Hakyll.Paginate - Text.Hakyll.Page - Text.Hakyll.Pandoc - Text.Hakyll.Util - Text.Hakyll.Tags - Text.Hakyll.Feed - Text.Hakyll.Configurations.Static + hamlet >= 0.7, + blaze-html >= 0.4, + snap-server >= 0.4, + snap-core >= 0.4, + bytestring >= 0.9, + utf8-string >= 0.3, + hinotify >= 0.3, + tagsoup >= 0.12, + hopenssl >= 1.4 + exposed-modules: Hakyll + Hakyll.Main + Hakyll.Web.Util.String + Hakyll.Web.Preview.Server + Hakyll.Web.Preview.INotify + Hakyll.Web.CompressCss + Hakyll.Web.Template + Hakyll.Web.Feed + Hakyll.Web.Tags + Hakyll.Web.Pandoc + Hakyll.Web.FileType + Hakyll.Web.Page + Hakyll.Web.Template.Read + Hakyll.Web.RelativizeUrls + Hakyll.Web.Page.Read + Hakyll.Web.Page.Metadata + Hakyll.Web + Hakyll.Core.ResourceProvider.FileResourceProvider + Hakyll.Core.Configuration + Hakyll.Core.Identifier.Pattern + Hakyll.Core.Util.Arrow + Hakyll.Core.Util.File + Hakyll.Core.ResourceProvider + Hakyll.Core.CompiledItem + Hakyll.Core.Compiler + Hakyll.Core.Run + Hakyll.Core.Store + Hakyll.Core.Writable + Hakyll.Core.Identifier + Hakyll.Core.DirectedGraph.Dot + Hakyll.Core.DirectedGraph.DependencySolver + Hakyll.Core.DirectedGraph + Hakyll.Core.Rules + Hakyll.Core.Routes other-modules: Paths_hakyll - Text.Hakyll.Internal.Cache - Text.Hakyll.Internal.CompressCss - Text.Hakyll.Internal.FileType - Text.Hakyll.Internal.Template - Text.Hakyll.Internal.Template.Template - Text.Hakyll.Internal.Template.Hamlet + Hakyll.Web.Template.Read.Hakyll + Hakyll.Web.Template.Read.Hamlet + Hakyll.Web.Template.Internal + Hakyll.Web.Page.Internal + Hakyll.Core.Compiler.Internal + Hakyll.Core.DirectedGraph.Internal diff --git a/src/Hakyll/Core/Rules.hs b/src/Hakyll/Core/Rules.hs index 4aa497c..28aac1f 100644 --- a/src/Hakyll/Core/Rules.hs +++ b/src/Hakyll/Core/Rules.hs @@ -16,10 +16,11 @@ module Hakyll.Core.Rules ) where import Control.Applicative (Applicative, (<$>)) -import Control.Monad.Writer -import Control.Monad.Reader +import Control.Monad.Writer (WriterT, execWriterT, tell) +import Control.Monad.Reader (ReaderT, runReaderT, ask) import Control.Arrow (second, (>>>), arr, (>>^)) -import Control.Monad.State +import Control.Monad.State (State, evalState, get, put) +import Data.Monoid (Monoid, mempty, mappend) import Data.Typeable (Typeable) import Data.Binary (Binary) diff --git a/src/Hakyll/Core/Run.hs b/src/Hakyll/Core/Run.hs index 407a2b1..de4114c 100644 --- a/src/Hakyll/Core/Run.hs +++ b/src/Hakyll/Core/Run.hs @@ -6,9 +6,11 @@ module Hakyll.Core.Run ) where import Prelude hiding (reverse) -import Control.Applicative -import Control.Monad.Reader -import Control.Monad.State +import Control.Monad (filterM) +import Control.Monad.Trans (liftIO) +import Control.Applicative (Applicative, (<$>)) +import Control.Monad.Reader (ReaderT, runReaderT, ask) +import Control.Monad.State (StateT, evalStateT, get, modify) import Control.Arrow ((&&&)) import qualified Data.Map as M import Data.Monoid (mempty, mappend) |