d6e68fc · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

fix building on GHC 7.10

d6e68fcCharles Strahan12 years ago

hakyll.cabal+29−28

compare with master

unifiedsplit

@@ -140,34 +140,35 @@ Library

140 Paths_hakyll

141

142 Build-Depends:

143− base >= 4 && < 5,

143+ base >= 4 && < 5,

144− binary >= 0.5 && < 0.8,

144+ binary >= 0.5 && < 0.8,

145− blaze-html >= 0.5 && < 0.9,

145+ blaze-html >= 0.5 && < 0.9,

146− blaze-markup >= 0.5.1 && < 0.8,

146+ blaze-markup >= 0.5.1 && < 0.8,

147− bytestring >= 0.9 && < 0.11,

147+ bytestring >= 0.9 && < 0.11,

148− cmdargs >= 0.10 && < 0.11,

148+ cmdargs >= 0.10 && < 0.11,

149− containers >= 0.3 && < 0.6,

149+ containers >= 0.3 && < 0.6,

150− cryptohash >= 0.7 && < 0.12,

150+ cryptohash >= 0.7 && < 0.12,

151− data-default >= 0.4 && < 0.6,

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

152− deepseq >= 1.3 && < 1.5,

152+ deepseq >= 1.3 && < 1.5,

153− directory >= 1.0 && < 1.3,

153+ directory >= 1.0 && < 1.3,

154− filepath >= 1.0 && < 1.5,

154+ filepath >= 1.0 && < 1.5,

155− lrucache >= 1.1.1 && < 1.3,

155+ lrucache >= 1.1.1 && < 1.3,

156− mtl >= 1 && < 2.3,

156+ mtl >= 1 && < 2.3,

157− network >= 2.6 && < 2.7,

157+ network >= 2.6 && < 2.7,

158− network-uri >= 2.6 && < 2.7,

158+ network-uri >= 2.6 && < 2.7,

159− old-locale >= 1.0 && < 1.1,

159+ old-locale >= 1.0 && < 1.1,

160− old-time >= 1.0 && < 1.2,

160+ old-time >= 1.0 && < 1.2,

161− pandoc >= 1.12.4 && < 1.14,

161+ pandoc >= 1.12.4 && < 1.14,

162− pandoc-citeproc >= 0.4 && < 0.7,

162+ pandoc-citeproc >= 0.4 && < 0.7,

163− parsec >= 3.0 && < 3.2,

163+ parsec >= 3.0 && < 3.2,

164− process >= 1.0 && < 1.3,

164+ process >= 1.0 && < 1.3,

165− random >= 1.0 && < 1.2,

165+ random >= 1.0 && < 1.2,

166− regex-base >= 0.93 && < 0.94,

166+ regex-base >= 0.93 && < 0.94,

167− regex-tdfa >= 1.1 && < 1.3,

167+ regex-tdfa >= 1.1 && < 1.3,

168− tagsoup >= 0.13.1 && < 0.14,

168+ tagsoup >= 0.13.1 && < 0.14,

169− text >= 0.11 && < 1.3,

169+ text >= 0.11 && < 1.3,

170− time >= 1.1 && < 1.6

170+ time >= 1.1 && < 1.6,

171+ time-locale-compat >= 0.1.0.0 && < 0.1.1.0

171

172

172 If flag(previewServer)

173 If flag(previewServer)

173 Build-depends:

174 Build-depends:

src/Hakyll/Core/Util/String.hs+1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE FlexibleContexts #-}

1--------------------------------------------------------------------------------

2--------------------------------------------------------------------------------

2-- | Miscellaneous string manipulation functions.

3-- | Miscellaneous string manipulation functions.

3module Hakyll.Core.Util.String

4module Hakyll.Core.Util.String

src/Hakyll/Web/Template/Context.hs+1−1

@@ -36,7 +36,7 @@ import Data.Monoid (Monoid (..))

36import Data.Time.Clock (UTCTime (..))

37import Data.Time.Format (formatTime, parseTime)

38import System.FilePath (takeBaseName, splitDirectories)

39−import System.Locale (TimeLocale, defaultTimeLocale)

39+import Data.Time.Locale.Compat (TimeLocale, defaultTimeLocale)

42--------------------------------------------------------------------------------

src/Hakyll/Web/Template/List.hs+1−1

@@ -22,7 +22,7 @@ module Hakyll.Web.Template.List

22import Control.Monad (liftM)

23import Data.List (intersperse, sortBy)

24import Data.Ord (comparing)

25−import System.Locale (defaultTimeLocale)

25+import Data.Time.Locale.Compat (defaultTimeLocale)

28--------------------------------------------------------------------------------