diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2015-04-08 00:21:06 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2015-04-08 00:21:06 +0200 |
| commit | 297a6e76873e4e14d42ca8a86175d9dca20cd31e (patch) | |
| tree | 11d25b4dbf0e3e586e9a36b59dbc4819db3e88c8 /src | |
| parent | 2819aebaf71ec0482d5c03bfb26a45f251474bb8 (diff) | |
| parent | d6e68fc3170f3a9dcc7533a93922a7f16277ce4c (diff) | |
| download | hakyll-297a6e76873e4e14d42ca8a86175d9dca20cd31e.tar.gz | |
Merge pull request #344 from cstrahan/ghc710fix
fix building on GHC 7.10
Diffstat (limited to 'src')
| -rw-r--r-- | src/Hakyll/Core/Util/String.hs | 1 | ||||
| -rw-r--r-- | src/Hakyll/Web/Template/Context.hs | 2 | ||||
| -rw-r--r-- | src/Hakyll/Web/Template/List.hs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/Hakyll/Core/Util/String.hs b/src/Hakyll/Core/Util/String.hs index b46f7b8..23bdd39 100644 --- a/src/Hakyll/Core/Util/String.hs +++ b/src/Hakyll/Core/Util/String.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE FlexibleContexts #-} -------------------------------------------------------------------------------- -- | Miscellaneous string manipulation functions. module Hakyll.Core.Util.String diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs index 63828ed..a0f2779 100644 --- a/src/Hakyll/Web/Template/Context.hs +++ b/src/Hakyll/Web/Template/Context.hs @@ -37,7 +37,7 @@ import Data.Monoid (Monoid (..)) import Data.Time.Clock (UTCTime (..)) import Data.Time.Format (formatTime, parseTime) import System.FilePath (takeBaseName, splitDirectories) -import System.Locale (TimeLocale, defaultTimeLocale) +import Data.Time.Locale.Compat (TimeLocale, defaultTimeLocale) -------------------------------------------------------------------------------- diff --git a/src/Hakyll/Web/Template/List.hs b/src/Hakyll/Web/Template/List.hs index 1f2a570..4d769fc 100644 --- a/src/Hakyll/Web/Template/List.hs +++ b/src/Hakyll/Web/Template/List.hs @@ -22,7 +22,7 @@ module Hakyll.Web.Template.List import Control.Monad (liftM) import Data.List (intersperse, sortBy) import Data.Ord (comparing) -import System.Locale (defaultTimeLocale) +import Data.Time.Locale.Compat (defaultTimeLocale) -------------------------------------------------------------------------------- |