on master help sign in
Drop old-time, old-locale, time-locale-compat deps
commitb034bcea95385b93114aa648bb69f6c56a482893 authorJasper Van der Jeugt <m@jaspervdj.be> dateTue 23 Jun 2015, 14:01 (11 years ago) parenta43b4ee
3 files changed+59−65
hakyll.cabal+52−58 src/Hakyll/Web/Template/Context.hs+6−6 src/Hakyll/Web/Template/List.hs+1−1
hakyll.cabal+52−58
@@ -140,35 +140,32 @@ Library
140140 Paths_hakyll
141141
142142 Build-Depends:
143− base >= 4 && < 5,
144− binary >= 0.5 && < 0.8,
145− blaze-html >= 0.5 && < 0.9,
146− blaze-markup >= 0.5.1 && < 0.8,
147− bytestring >= 0.9 && < 0.11,
148− cmdargs >= 0.10 && < 0.11,
149− containers >= 0.3 && < 0.6,
150− cryptohash >= 0.7 && < 0.12,
151− data-default >= 0.4 && < 0.6,
152− deepseq >= 1.3 && < 1.5,
153− directory >= 1.0 && < 1.3,
154− filepath >= 1.0 && < 1.5,
155− lrucache >= 1.1.1 && < 1.3,
156− mtl >= 1 && < 2.3,
157− network >= 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,
162− pandoc-citeproc >= 0.4 && < 0.8,
163− parsec >= 3.0 && < 3.2,
164− process >= 1.0 && < 1.3,
165− random >= 1.0 && < 1.2,
166− regex-base >= 0.93 && < 0.94,
167− regex-tdfa >= 1.1 && < 1.3,
168− tagsoup >= 0.13.1 && < 0.14,
169− text >= 0.11 && < 1.3,
170− time >= 1.1 && < 1.6,
171− time-locale-compat >= 0.1.0.0 && < 0.1.1.0
143+ base >= 4 && < 5,
144+ binary >= 0.5 && < 0.8,
145+ blaze-html >= 0.5 && < 0.9,
146+ blaze-markup >= 0.5.1 && < 0.8,
147+ bytestring >= 0.9 && < 0.11,
148+ cmdargs >= 0.10 && < 0.11,
149+ containers >= 0.3 && < 0.6,
150+ cryptohash >= 0.7 && < 0.12,
151+ data-default >= 0.4 && < 0.6,
152+ deepseq >= 1.3 && < 1.5,
153+ directory >= 1.0 && < 1.3,
154+ filepath >= 1.0 && < 1.5,
155+ lrucache >= 1.1.1 && < 1.3,
156+ mtl >= 1 && < 2.3,
157+ network >= 2.6 && < 2.7,
158+ network-uri >= 2.6 && < 2.7,
159+ pandoc >= 1.14 && < 1.15,
160+ pandoc-citeproc >= 0.4 && < 0.8,
161+ parsec >= 3.0 && < 3.2,
162+ process >= 1.0 && < 1.3,
163+ random >= 1.0 && < 1.2,
164+ regex-base >= 0.93 && < 0.94,
165+ regex-tdfa >= 1.1 && < 1.3,
166+ tagsoup >= 0.13.1 && < 0.14,
167+ text >= 0.11 && < 1.3,
168+ time >= 1.5 && < 1.6
172169
173170 If flag(previewServer)
174171 Build-depends:
@@ -228,35 +225,32 @@ Test-suite hakyll-tests
228225 test-framework-hunit >= 0.3 && < 0.4,
229226 test-framework-quickcheck2 >= 0.3 && < 0.4,
230227 -- Copy pasted from hakyll dependencies:
231− base >= 4 && < 5,
232− binary >= 0.5 && < 0.8,
233− blaze-html >= 0.5 && < 0.9,
234− blaze-markup >= 0.5.1 && < 0.8,
235− bytestring >= 0.9 && < 0.11,
236− cmdargs >= 0.10 && < 0.11,
237− containers >= 0.3 && < 0.6,
238− cryptohash >= 0.7 && < 0.12,
239− data-default >= 0.4 && < 0.6,
240− deepseq >= 1.3 && < 1.5,
241− directory >= 1.0 && < 1.3,
242− filepath >= 1.0 && < 1.5,
243− lrucache >= 1.1.1 && < 1.3,
244− mtl >= 1 && < 2.3,
245− network >= 2.6 && < 2.7,
246− 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,
250− pandoc-citeproc >= 0.4 && < 0.8,
251− parsec >= 3.0 && < 3.2,
252− process >= 1.0 && < 1.3,
253− random >= 1.0 && < 1.2,
254− regex-base >= 0.93 && < 0.94,
255− regex-tdfa >= 1.1 && < 1.3,
256− tagsoup >= 0.13.1 && < 0.14,
257− text >= 0.11 && < 1.3,
258− time >= 1.1 && < 1.6,
259− time-locale-compat >= 0.1.0.0 && < 0.1.1.0
228+ base >= 4 && < 5,
229+ binary >= 0.5 && < 0.8,
230+ blaze-html >= 0.5 && < 0.9,
231+ blaze-markup >= 0.5.1 && < 0.8,
232+ bytestring >= 0.9 && < 0.11,
233+ cmdargs >= 0.10 && < 0.11,
234+ containers >= 0.3 && < 0.6,
235+ cryptohash >= 0.7 && < 0.12,
236+ data-default >= 0.4 && < 0.6,
237+ deepseq >= 1.3 && < 1.5,
238+ directory >= 1.0 && < 1.3,
239+ filepath >= 1.0 && < 1.5,
240+ lrucache >= 1.1.1 && < 1.3,
241+ mtl >= 1 && < 2.3,
242+ network >= 2.6 && < 2.7,
243+ network-uri >= 2.6 && < 2.7,
244+ pandoc >= 1.14 && < 1.15,
245+ pandoc-citeproc >= 0.4 && < 0.8,
246+ parsec >= 3.0 && < 3.2,
247+ process >= 1.0 && < 1.3,
248+ random >= 1.0 && < 1.2,
249+ regex-base >= 0.93 && < 0.94,
250+ regex-tdfa >= 1.1 && < 1.3,
251+ tagsoup >= 0.13.1 && < 0.14,
252+ text >= 0.11 && < 1.3,
253+ time >= 1.5 && < 1.6
260254
261255 If flag(previewServer)
262256 Build-depends:
src/Hakyll/Web/Template/Context.hs+6−6
@@ -29,15 +29,15 @@ module Hakyll.Web.Template.Context
2929
3030
3131--------------------------------------------------------------------------------
32−import Control.Applicative (Alternative (..), (<$>), pure)
32+import Control.Applicative (Alternative (..), pure, (<$>))
3333import Control.Monad (msum)
3434import Data.List (intercalate)
3535import qualified Data.Map as M
3636import Data.Monoid (Monoid (..))
3737import Data.Time.Clock (UTCTime (..))
38−import Data.Time.Format (formatTime, parseTime)
39−import System.FilePath (takeBaseName, splitDirectories)
40−import Data.Time.Locale.Compat (TimeLocale, defaultTimeLocale)
38+import Data.Time.Format (TimeLocale, defaultTimeLocale,
39+ formatTime, parseTime)
40+import System.FilePath (splitDirectories, takeBaseName)
4141
4242
4343--------------------------------------------------------------------------------
@@ -47,7 +47,7 @@ import Hakyll.Core.Identifier
4747import Hakyll.Core.Item
4848import Hakyll.Core.Metadata
4949import Hakyll.Core.Provider
50−import Hakyll.Core.Util.String (splitAll, needlePrefix)
50+import Hakyll.Core.Util.String (needlePrefix, splitAll)
5151import Hakyll.Web.Html
5252
5353
@@ -238,7 +238,7 @@ titleField = mapContext takeBaseName . pathField
238238-- Alternatively, when the metadata has a field called @path@ in a
239239-- @folder/yyyy-mm-dd-title.extension@ format (the convention for pages)
240240-- 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
242242-- that begins with @yyyy-mm-dd@ . For example:
243243-- @folder//yyyy-mm-dd-title//dist//main.extension@ .
244244-- 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
2222import Control.Monad (liftM)
2323import Data.List (intersperse, sortBy)
2424import Data.Ord (comparing)
25−import Data.Time.Locale.Compat (defaultTimeLocale)
25+import Data.Time.Format (defaultTimeLocale)
2626
2727
2828--------------------------------------------------------------------------------