on master help sign in
Update cabal file, fix warnings
commit4e0abd872ac36eadb103a909bcd9f970667a9270 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateFri 11 Feb 2011, 08:39 (16 years ago) parent84d9204
3 files changed+59−33
hakyll.cabal+50−27 src/Hakyll/Core/Rules.hs+4−3 src/Hakyll/Core/Run.hs+5−3
hakyll.cabal+50−27
@@ -33,36 +33,59 @@ library
3333 containers == 0.*,
3434 pandoc == 1.*,
3535 regex-base >= 0.93,
36− regex-tdfa >= 1.1,
37− network == 2.*,
36+ regex-pcre >= 0.93,
3837 mtl >= 1,
3938 old-locale == 1.*,
4039 old-time == 1.*,
4140 time >= 1.1,
4241 binary >= 0.5,
43− hamlet >= 0.4.2,
44− blaze-html >= 0.2 && <= 0.3
45− exposed-modules: Network.Hakyll.SimpleServer
46− Text.Hakyll
47− Text.Hakyll.Context
48− Text.Hakyll.ContextManipulations
49− Text.Hakyll.CreateContext
50− Text.Hakyll.File
51− Text.Hakyll.HakyllMonad
52− Text.Hakyll.Regex
53− Text.Hakyll.Render
54− Text.Hakyll.HakyllAction
55− Text.Hakyll.Paginate
56− Text.Hakyll.Page
57− Text.Hakyll.Pandoc
58− Text.Hakyll.Util
59− Text.Hakyll.Tags
60− Text.Hakyll.Feed
61− Text.Hakyll.Configurations.Static
42+ hamlet >= 0.7,
43+ blaze-html >= 0.4,
44+ snap-server >= 0.4,
45+ snap-core >= 0.4,
46+ bytestring >= 0.9,
47+ utf8-string >= 0.3,
48+ hinotify >= 0.3,
49+ tagsoup >= 0.12,
50+ hopenssl >= 1.4
51+ exposed-modules: Hakyll
52+ Hakyll.Main
53+ Hakyll.Web.Util.String
54+ Hakyll.Web.Preview.Server
55+ Hakyll.Web.Preview.INotify
56+ Hakyll.Web.CompressCss
57+ Hakyll.Web.Template
58+ Hakyll.Web.Feed
59+ Hakyll.Web.Tags
60+ Hakyll.Web.Pandoc
61+ Hakyll.Web.FileType
62+ Hakyll.Web.Page
63+ Hakyll.Web.Template.Read
64+ Hakyll.Web.RelativizeUrls
65+ Hakyll.Web.Page.Read
66+ Hakyll.Web.Page.Metadata
67+ Hakyll.Web
68+ Hakyll.Core.ResourceProvider.FileResourceProvider
69+ Hakyll.Core.Configuration
70+ Hakyll.Core.Identifier.Pattern
71+ Hakyll.Core.Util.Arrow
72+ Hakyll.Core.Util.File
73+ Hakyll.Core.ResourceProvider
74+ Hakyll.Core.CompiledItem
75+ Hakyll.Core.Compiler
76+ Hakyll.Core.Run
77+ Hakyll.Core.Store
78+ Hakyll.Core.Writable
79+ Hakyll.Core.Identifier
80+ Hakyll.Core.DirectedGraph.Dot
81+ Hakyll.Core.DirectedGraph.DependencySolver
82+ Hakyll.Core.DirectedGraph
83+ Hakyll.Core.Rules
84+ Hakyll.Core.Routes
6285 other-modules: Paths_hakyll
63− Text.Hakyll.Internal.Cache
64− Text.Hakyll.Internal.CompressCss
65− Text.Hakyll.Internal.FileType
66− Text.Hakyll.Internal.Template
67− Text.Hakyll.Internal.Template.Template
68− Text.Hakyll.Internal.Template.Hamlet
86+ Hakyll.Web.Template.Read.Hakyll
87+ Hakyll.Web.Template.Read.Hamlet
88+ Hakyll.Web.Template.Internal
89+ Hakyll.Web.Page.Internal
90+ Hakyll.Core.Compiler.Internal
91+ Hakyll.Core.DirectedGraph.Internal
src/Hakyll/Core/Rules.hs+4−3
@@ -16,10 +16,11 @@ module Hakyll.Core.Rules
1616 ) where
1717
1818import Control.Applicative (Applicative, (<$>))
19−import Control.Monad.Writer
20−import Control.Monad.Reader
19+import Control.Monad.Writer (WriterT, execWriterT, tell)
20+import Control.Monad.Reader (ReaderT, runReaderT, ask)
2121import Control.Arrow (second, (>>>), arr, (>>^))
22−import Control.Monad.State
22+import Control.Monad.State (State, evalState, get, put)
23+import Data.Monoid (Monoid, mempty, mappend)
2324
2425import Data.Typeable (Typeable)
2526import Data.Binary (Binary)
src/Hakyll/Core/Run.hs+5−3
@@ -6,9 +6,11 @@ module Hakyll.Core.Run
66 ) where
77
88import Prelude hiding (reverse)
9−import Control.Applicative
10−import Control.Monad.Reader
11−import Control.Monad.State
9+import Control.Monad (filterM)
10+import Control.Monad.Trans (liftIO)
11+import Control.Applicative (Applicative, (<$>))
12+import Control.Monad.Reader (ReaderT, runReaderT, ask)
13+import Control.Monad.State (StateT, evalStateT, get, modify)
1214import Control.Arrow ((&&&))
1315import qualified Data.Map as M
1416import Data.Monoid (mempty, mappend)