d840363 · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Merge remote-tracking branch 'piyush-kurur/master'

d840363Jasper Van der Jeugt14 years ago

hakyll.cabal+2

compare with master

unifiedsplit

@@ -143,6 +143,7 @@ Library

143 citeproc-hs >= 0.3.2 && < 0.4,

144 containers >= 0.3 && < 0.6,

145 cryptohash >= 0.7 && < 0.9,

146+ data-default >= 0.4 && < 0.6,

146 deepseq >= 1.3 && < 1.4,

147 deepseq >= 1.3 && < 1.4,

147 directory >= 1.0 && < 1.3,

148 directory >= 1.0 && < 1.3,

148 filepath >= 1.0 && < 1.4,

149 filepath >= 1.0 && < 1.4,

@@ -216,6 +217,7 @@ Test-suite hakyll-tests

216 citeproc-hs >= 0.3.2 && < 0.4,

217 citeproc-hs >= 0.3.2 && < 0.4,

217 containers >= 0.3 && < 0.6,

218 containers >= 0.3 && < 0.6,

218 cryptohash >= 0.7 && < 0.9,

219 cryptohash >= 0.7 && < 0.9,

220+ data-default >= 0.4 && < 0.6,

219 deepseq >= 1.3 && < 1.4,

221 deepseq >= 1.3 && < 1.4,

220 directory >= 1.0 && < 1.3,

222 directory >= 1.0 && < 1.3,

221 filepath >= 1.0 && < 1.4,

223 filepath >= 1.0 && < 1.4,

src/Hakyll/Core/Configuration.hs+4

@@ -8,6 +8,7 @@ module Hakyll.Core.Configuration

10--------------------------------------------------------------------------------

11+import Data.Default (Default(..))

11import Data.List (isPrefixOf, isSuffixOf)

12import Data.List (isPrefixOf, isSuffixOf)

12import System.FilePath (normalise, takeFileName)

13import System.FilePath (normalise, takeFileName)

@@ -56,6 +57,9 @@ data Configuration = Configuration

56 inMemoryCache :: Bool

57 inMemoryCache :: Bool

57 }

58 }

60+--------------------------------------------------------------------------------

61+instance Default Configuration where

62+ def = defaultConfiguration

60--------------------------------------------------------------------------------

64--------------------------------------------------------------------------------

61-- | Default configuration for a hakyll application

65-- | Default configuration for a hakyll application