summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Network/Hakyll/SimpleServer.hs2
-rw-r--r--src/Text/Hakyll.hs5
-rw-r--r--src/Text/Hakyll/CompressCSS.hs1
-rw-r--r--src/Text/Hakyll/Context.hs2
-rw-r--r--src/Text/Hakyll/File.hs3
-rw-r--r--src/Text/Hakyll/Hakyll.hs3
-rw-r--r--src/Text/Hakyll/Page.hs6
-rw-r--r--src/Text/Hakyll/Render.hs2
-rw-r--r--src/Text/Hakyll/Render/Internal.hs1
-rw-r--r--src/Text/Hakyll/Renderables.hs3
-rw-r--r--src/Text/Hakyll/Tags.hs4
-rw-r--r--tests/Tests.hs6
12 files changed, 19 insertions, 19 deletions
diff --git a/src/Network/Hakyll/SimpleServer.hs b/src/Network/Hakyll/SimpleServer.hs
index f98c295..e26924b 100644
--- a/src/Network/Hakyll/SimpleServer.hs
+++ b/src/Network/Hakyll/SimpleServer.hs
@@ -5,9 +5,9 @@ module Network.Hakyll.SimpleServer
) where
import Prelude hiding (log)
-import Network
import Control.Monad (forever)
import Control.Monad.Reader (ReaderT, runReaderT, ask, liftIO)
+import Network
import System.IO
import System.Directory (doesFileExist, doesDirectoryExist)
import Control.Concurrent (forkIO)
diff --git a/src/Text/Hakyll.hs b/src/Text/Hakyll.hs
index ae31fc3..6718de6 100644
--- a/src/Text/Hakyll.hs
+++ b/src/Text/Hakyll.hs
@@ -5,13 +5,12 @@ module Text.Hakyll
import Control.Monad.Reader (runReaderT)
import qualified Data.Map as M
+import System.Environment (getArgs, getProgName)
+import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
import Network.Hakyll.SimpleServer (simpleServer)
import Text.Hakyll.Hakyll
-import System.Environment (getArgs, getProgName)
-import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
-
-- | Default hakyll configuration.
defaultHakyllConfiguration :: HakyllConfiguration
defaultHakyllConfiguration = HakyllConfiguration
diff --git a/src/Text/Hakyll/CompressCSS.hs b/src/Text/Hakyll/CompressCSS.hs
index f9a062c..c6693b7 100644
--- a/src/Text/Hakyll/CompressCSS.hs
+++ b/src/Text/Hakyll/CompressCSS.hs
@@ -3,6 +3,7 @@ module Text.Hakyll.CompressCSS
) where
import Data.List (isPrefixOf)
+
import Text.Hakyll.Regex (substituteRegex)
-- | Compress CSS to speed up your site.
diff --git a/src/Text/Hakyll/Context.hs b/src/Text/Hakyll/Context.hs
index 7ea6e70..56adc49 100644
--- a/src/Text/Hakyll/Context.hs
+++ b/src/Text/Hakyll/Context.hs
@@ -8,12 +8,12 @@ module Text.Hakyll.Context
import qualified Data.Map as M
import Data.Map (Map)
-
import System.Locale (defaultTimeLocale)
import System.FilePath (takeFileName)
import Data.Time.Format (parseTime, formatTime)
import Data.Time.Clock (UTCTime)
import Data.Maybe (fromMaybe)
+
import Text.Hakyll.Regex (substituteRegex)
-- | Type for a context.
diff --git a/src/Text/Hakyll/File.hs b/src/Text/Hakyll/File.hs
index 0a21638..393c4a8 100644
--- a/src/Text/Hakyll/File.hs
+++ b/src/Text/Hakyll/File.hs
@@ -17,9 +17,10 @@ import System.Directory
import System.FilePath
import Control.Monad
import Data.List (isPrefixOf)
-import Text.Hakyll.Hakyll (Hakyll)
import Control.Monad.Reader (liftIO)
+import Text.Hakyll.Hakyll (Hakyll)
+
-- | Auxiliary function to remove pathSeparators form the start. We don't deal
-- with absolute paths here. We also remove $root from the start.
removeLeadingSeparator :: FilePath -> FilePath
diff --git a/src/Text/Hakyll/Hakyll.hs b/src/Text/Hakyll/Hakyll.hs
index 521a348..af8c9c5 100644
--- a/src/Text/Hakyll/Hakyll.hs
+++ b/src/Text/Hakyll/Hakyll.hs
@@ -5,10 +5,11 @@ module Text.Hakyll.Hakyll
, askHakyll
) where
-import Text.Hakyll.Context (Context)
import Control.Monad.Reader (ReaderT, ask)
import Control.Monad (liftM)
+import Text.Hakyll.Context (Context)
+
-- | Hakyll global configuration type.
data HakyllConfiguration = HakyllConfiguration
{ -- | An additional context to use when rendering. This additional context
diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs
index eec60e9..8c0a7de 100644
--- a/src/Text/Hakyll/Page.hs
+++ b/src/Text/Hakyll/Page.hs
@@ -9,20 +9,18 @@ module Text.Hakyll.Page
import qualified Data.Map as M
import qualified Data.List as L
import Data.Maybe (fromMaybe)
-
import Control.Parallel.Strategies (rdeepseq, ($|))
import Control.Monad.Reader (liftIO)
-
import System.FilePath (takeExtension)
import System.IO
+import Text.Pandoc
+
import Text.Hakyll.Hakyll (Hakyll)
import Text.Hakyll.File
import Text.Hakyll.Util (trim)
import Text.Hakyll.Context (Context)
import Text.Hakyll.Renderable
-import Text.Pandoc
-
-- | A Page is basically key-value mapping. Certain keys have special
-- meanings, like for example url, body and title.
diff --git a/src/Text/Hakyll/Render.hs b/src/Text/Hakyll/Render.hs
index 47ce287..144c357 100644
--- a/src/Text/Hakyll/Render.hs
+++ b/src/Text/Hakyll/Render.hs
@@ -12,7 +12,6 @@ module Text.Hakyll.Render
import Control.Monad (unless)
import Control.Monad.Reader (liftIO)
-
import System.Directory (copyFile)
import Text.Hakyll.Hakyll (Hakyll)
@@ -21,7 +20,6 @@ import Text.Hakyll.Page
import Text.Hakyll.Renderable
import Text.Hakyll.File
import Text.Hakyll.CompressCSS
-
import Text.Hakyll.Render.Internal
-- | Execute an IO action only when the cache is invalid.
diff --git a/src/Text/Hakyll/Render/Internal.hs b/src/Text/Hakyll/Render/Internal.hs
index 33ffcdf..d4c1697 100644
--- a/src/Text/Hakyll/Render/Internal.hs
+++ b/src/Text/Hakyll/Render/Internal.hs
@@ -16,6 +16,7 @@ import Data.List (isPrefixOf, foldl')
import Data.Char (isAlpha)
import Data.Maybe (fromMaybe)
import Control.Parallel.Strategies (rdeepseq, ($|))
+
import Text.Hakyll.Renderable
import Text.Hakyll.Page
import Text.Hakyll.File
diff --git a/src/Text/Hakyll/Renderables.hs b/src/Text/Hakyll/Renderables.hs
index 0fd66b4..0151f10 100644
--- a/src/Text/Hakyll/Renderables.hs
+++ b/src/Text/Hakyll/Renderables.hs
@@ -5,8 +5,9 @@ module Text.Hakyll.Renderables
, createPagePath
) where
-import Text.Hakyll.Hakyll (Hakyll)
import qualified Data.Map as M
+
+import Text.Hakyll.Hakyll (Hakyll)
import Text.Hakyll.Page
import Text.Hakyll.Renderable
import Text.Hakyll.File
diff --git a/src/Text/Hakyll/Tags.hs b/src/Text/Hakyll/Tags.hs
index 79dcecd..e15a41f 100644
--- a/src/Text/Hakyll/Tags.hs
+++ b/src/Text/Hakyll/Tags.hs
@@ -9,14 +9,14 @@ module Text.Hakyll.Tags
import qualified Data.Map as M
import Data.List (intercalate)
import Control.Monad (foldM)
-import Text.Hakyll.Hakyll (Hakyll)
+import Control.Arrow (second)
+import Text.Hakyll.Hakyll (Hakyll)
import Text.Hakyll.Context (ContextManipulation, renderValue)
import Text.Hakyll.Render.Internal (finalSubstitute)
import Text.Hakyll.Regex
import Text.Hakyll.Util
import Text.Hakyll.Page
-import Control.Arrow (second)
-- | Read a tag map. This creates a map from tags to page paths. This function
-- assumes the tags are located in the @tags@ metadata field, separated by
diff --git a/tests/Tests.hs b/tests/Tests.hs
index 501c09e..018d148 100644
--- a/tests/Tests.hs
+++ b/tests/Tests.hs
@@ -1,12 +1,12 @@
+import Data.Char
+import qualified Data.Map as M
+
import Test.Framework (defaultMain, testGroup)
import Test.Framework.Providers.QuickCheck2
import Test.Framework.Providers.HUnit
import Test.QuickCheck
import Test.HUnit
-import Data.Char
-import qualified Data.Map as M
-
import Text.Hakyll.CompressCSS
import Text.Hakyll.Util
import Text.Hakyll.Regex