b034bce · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Drop old-time, old-locale, time-locale-compat deps

b034bceJasper Van der Jeugt11 years ago

hakyll.cabal+52−58

compare with master

unifiedsplit

@@ -140,35 +140,32 @@ 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,

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

161− pandoc >= 1.14 && < 1.15,

159+ pandoc >= 1.14 && < 1.15,

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

160+ pandoc-citeproc >= 0.4 && < 0.8,

163− parsec >= 3.0 && < 3.2,

161+ parsec >= 3.0 && < 3.2,

164− process >= 1.0 && < 1.3,

162+ process >= 1.0 && < 1.3,

165− random >= 1.0 && < 1.2,

163+ random >= 1.0 && < 1.2,

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

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

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

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

168− tagsoup >= 0.13.1 && < 0.14,

166+ tagsoup >= 0.13.1 && < 0.14,

169− text >= 0.11 && < 1.3,

167+ text >= 0.11 && < 1.3,

170− time >= 1.1 && < 1.6,

168+ time >= 1.5 && < 1.6

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

172

169

173 If flag(previewServer)

170 If flag(previewServer)

174 Build-depends:

171 Build-depends:

@@ -228,35 +225,32 @@ Test-suite hakyll-tests

228 test-framework-hunit >= 0.3 && < 0.4,

225 test-framework-hunit >= 0.3 && < 0.4,

229 test-framework-quickcheck2 >= 0.3 && < 0.4,

226 test-framework-quickcheck2 >= 0.3 && < 0.4,

230 -- Copy pasted from hakyll dependencies:

227 -- Copy pasted from hakyll dependencies:

231− base >= 4 && < 5,

228+ base >= 4 && < 5,

232− binary >= 0.5 && < 0.8,

229+ binary >= 0.5 && < 0.8,

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

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

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

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

235− bytestring >= 0.9 && < 0.11,

232+ bytestring >= 0.9 && < 0.11,

236− cmdargs >= 0.10 && < 0.11,

233+ cmdargs >= 0.10 && < 0.11,

237− containers >= 0.3 && < 0.6,

234+ containers >= 0.3 && < 0.6,

238− cryptohash >= 0.7 && < 0.12,

235+ cryptohash >= 0.7 && < 0.12,

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

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

240− deepseq >= 1.3 && < 1.5,

237+ deepseq >= 1.3 && < 1.5,

241− directory >= 1.0 && < 1.3,

238+ directory >= 1.0 && < 1.3,

242− filepath >= 1.0 && < 1.5,

239+ filepath >= 1.0 && < 1.5,

243− lrucache >= 1.1.1 && < 1.3,

240+ lrucache >= 1.1.1 && < 1.3,

244− mtl >= 1 && < 2.3,

241+ mtl >= 1 && < 2.3,

245− network >= 2.6 && < 2.7,

242+ network >= 2.6 && < 2.7,

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

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

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

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

249− pandoc >= 1.14 && < 1.15,

244+ pandoc >= 1.14 && < 1.15,

250− pandoc-citeproc >= 0.4 && < 0.8,

245+ pandoc-citeproc >= 0.4 && < 0.8,

251− parsec >= 3.0 && < 3.2,

246+ parsec >= 3.0 && < 3.2,

252− process >= 1.0 && < 1.3,

247+ process >= 1.0 && < 1.3,

253− random >= 1.0 && < 1.2,

248+ random >= 1.0 && < 1.2,

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

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

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

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

256− tagsoup >= 0.13.1 && < 0.14,

251+ tagsoup >= 0.13.1 && < 0.14,

257− text >= 0.11 && < 1.3,

252+ text >= 0.11 && < 1.3,

258− time >= 1.1 && < 1.6,

253+ time >= 1.5 && < 1.6

259− time-locale-compat >= 0.1.0.0 && < 0.1.1.0

260

254

261 If flag(previewServer)

255 If flag(previewServer)

262 Build-depends:

256 Build-depends:

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

@@ -29,15 +29,15 @@ module Hakyll.Web.Template.Context

31--------------------------------------------------------------------------------

32−import Control.Applicative (Alternative (..), (<$>), pure)

32+import Control.Applicative (Alternative (..), pure, (<$>))

33import Control.Monad (msum)

34import Data.List (intercalate)

35import qualified Data.Map as M

36import Data.Monoid (Monoid (..))

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

38+import Data.Time.Format (TimeLocale, defaultTimeLocale,

38−import Data.Time.Format (formatTime, parseTime)

39+ formatTime, parseTime)

39−import System.FilePath (takeBaseName, splitDirectories)

40+import System.FilePath (splitDirectories, takeBaseName)

40−import Data.Time.Locale.Compat (TimeLocale, defaultTimeLocale)

43--------------------------------------------------------------------------------

@@ -47,7 +47,7 @@ import Hakyll.Core.Identifier

47import Hakyll.Core.Item

48import Hakyll.Core.Metadata

49import Hakyll.Core.Provider

50−import Hakyll.Core.Util.String (splitAll, needlePrefix)

50+import Hakyll.Core.Util.String (needlePrefix, splitAll)

51import Hakyll.Web.Html

@@ -238,7 +238,7 @@ titleField = mapContext takeBaseName . pathField

238-- Alternatively, when the metadata has a field called @path@ in a

239-- @folder/yyyy-mm-dd-title.extension@ format (the convention for pages)

240-- and no @published@ metadata field set, this function can render

241−-- the date. This pattern matches the file name or directory names

241+-- the date. This pattern matches the file name or directory names

242-- that begins with @yyyy-mm-dd@ . For example:

243-- @folder//yyyy-mm-dd-title//dist//main.extension@ .

244-- In case of multiple matches, the rightmost one is used.

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 Data.Time.Locale.Compat (defaultTimeLocale)

25+import Data.Time.Format (defaultTimeLocale)

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