Merge remote-tracking branch 'piyush-kurur/master'
Conflicts: hakyll.cabal
This commit is contained in:
commit
d840363bf0
2 changed files with 6 additions and 0 deletions
|
@ -143,6 +143,7 @@ Library
|
|||
citeproc-hs >= 0.3.2 && < 0.4,
|
||||
containers >= 0.3 && < 0.6,
|
||||
cryptohash >= 0.7 && < 0.9,
|
||||
data-default >= 0.4 && < 0.6,
|
||||
deepseq >= 1.3 && < 1.4,
|
||||
directory >= 1.0 && < 1.3,
|
||||
filepath >= 1.0 && < 1.4,
|
||||
|
@ -216,6 +217,7 @@ Test-suite hakyll-tests
|
|||
citeproc-hs >= 0.3.2 && < 0.4,
|
||||
containers >= 0.3 && < 0.6,
|
||||
cryptohash >= 0.7 && < 0.9,
|
||||
data-default >= 0.4 && < 0.6,
|
||||
deepseq >= 1.3 && < 1.4,
|
||||
directory >= 1.0 && < 1.3,
|
||||
filepath >= 1.0 && < 1.4,
|
||||
|
|
|
@ -8,6 +8,7 @@ module Hakyll.Core.Configuration
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Data.Default (Default(..))
|
||||
import Data.List (isPrefixOf, isSuffixOf)
|
||||
import System.FilePath (normalise, takeFileName)
|
||||
|
||||
|
@ -56,6 +57,9 @@ data Configuration = Configuration
|
|||
inMemoryCache :: Bool
|
||||
}
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
instance Default Configuration where
|
||||
def = defaultConfiguration
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- | Default configuration for a hakyll application
|
||||
|
|
Loading…
Reference in a new issue