d840363 · hakyll · git.iko.soy

git.iko.soy/hakyll

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

Conflicts: hakyll.cabal

commitd840363bf0edbbd703e1a7d2e2700c5feeedbbc6 authorJasper Van der Jeugt <m@jaspervdj.be> dateMon 11 Mar 2013, 15:53 (14 years ago) parent5c053d4 d6f6657

2 files changed+6

compare with master

unifiedsplit

hakyll.cabal+2 src/Hakyll/Core/Configuration.hs+4

hakyll.cabal+2

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

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

144144 containers >= 0.3 && < 0.6,

145145 cryptohash >= 0.7 && < 0.9,

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

146147 deepseq >= 1.3 && < 1.4,

147148 directory >= 1.0 && < 1.3,

148149 filepath >= 1.0 && < 1.4,

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

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

217218 containers >= 0.3 && < 0.6,

218219 cryptohash >= 0.7 && < 0.9,

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

219221 deepseq >= 1.3 && < 1.4,

220222 directory >= 1.0 && < 1.3,

221223 filepath >= 1.0 && < 1.4,

src/Hakyll/Core/Configuration.hs+4

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

1010--------------------------------------------------------------------------------

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

1112import Data.List (isPrefixOf, isSuffixOf)

1213import System.FilePath (normalise, takeFileName)

1314

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

5657 inMemoryCache :: Bool

5758 }

5859

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

61+instance Default Configuration where

62+ def = defaultConfiguration

5963

6064--------------------------------------------------------------------------------

6165-- | Default configuration for a hakyll application