bec2577 · typeable/pandoc

git.iko.soy/typeable/pandoc

Merge pull request #619 from bgamari/master

Various version bumps

commitbec25775ba74e5cd6c750b05e95e959b2c4721eb authorJohn MacFarlane <jgm@berkeley.edu> dateFri 21 Sep 2012, 17:36 (14 years ago) parent1e7599c a96982e

2 files changed+15−8

compare with master

unifiedsplit

Setup.hs+7 pandoc.cabal+8−8

Setup.hs+7

@@ -1,3 +1,5 @@

1+{-# LANGUAGE CPP #-}

13import Distribution.Simple

24import Distribution.Simple.Setup

35 (copyDest, copyVerbosity, fromFlag, installVerbosity, BuildFlags(..))

@@ -20,6 +22,7 @@ import System.Time

2022import System.IO.Error ( isDoesNotExistError )

2123import Data.Maybe ( catMaybes )

2224import Data.List ( (\\) )

25+import Data.Time.Clock (UTCTime(..))

2326

2427main :: IO ()

2528main = do

@@ -82,7 +85,11 @@ modifiedDependencies :: FilePath -> [FilePath] -> IO [FilePath]

8285modifiedDependencies file dependencies = do

8386 fileModTime <- catch (getModificationTime file) $

8487 \e -> if isDoesNotExistError e

88+#if __GLASGOW_HASKELL__ >= 706

89+ then return (UTCTime (toEnum 0) 0) -- the minimum ClockTime

90+#else

8591 then return (TOD 0 0) -- the minimum ClockTime

92+#endif

8693 else ioError e

8794 depModTimes <- mapM getModificationTime dependencies

8895 let modified = zipWith (\dep time -> if time > fileModTime then Just dep else Nothing) dependencies depModTimes

pandoc.cabal+8−8

@@ -199,13 +199,13 @@ Library

199199 -- Note: the following is duplicated in all stanzas.

200200 -- It needs to be duplicated because of the library & executable flags.

201201 -- BEGIN DUPLICATED SECTION

202− Build-Depends: containers >= 0.1 && < 0.5,

202+ Build-Depends: containers >= 0.1 && < 0.6,

203203 parsec >= 3.1 && < 3.2,

204204 mtl >= 1.1 && < 2.2,

205− network >= 2 && < 2.4,

205+ network >= 2 && < 2.5,

206206 filepath >= 1.1 && < 1.4,

207207 process >= 1 && < 1.2,

208− directory >= 1 && < 1.2,

208+ directory >= 1 && < 1.3,

209209 bytestring >= 0.9 && < 1.0,

210210 zip-archive >= 0.1.1.7 && < 0.2,

211211 utf8-string >= 0.3 && < 0.4,

@@ -311,13 +311,13 @@ Executable pandoc

311311 -- Note: the following is duplicated in all stanzas.

312312 -- It needs to be duplicated because of the library & executable flags.

313313 -- BEGIN DUPLICATED SECTION

314− Build-Depends: containers >= 0.1 && < 0.5,

314+ Build-Depends: containers >= 0.1 && < 0.6,

315315 parsec >= 3.1 && < 3.2,

316316 mtl >= 1.1 && < 2.2,

317− network >= 2 && < 2.4,

317+ network >= 2 && < 2.5,

318318 filepath >= 1.1 && < 1.4,

319319 process >= 1 && < 1.2,

320− directory >= 1 && < 1.2,

320+ directory >= 1 && < 1.3,

321321 bytestring >= 0.9 && < 1.0,

322322 zip-archive >= 0.1.1.7 && < 0.2,

323323 utf8-string >= 0.3 && < 0.4,

@@ -386,7 +386,7 @@ Test-Suite test-pandoc

386386 pandoc-types >= 1.10 && < 1.11,

387387 utf8-string >= 0.3 && < 0.4,

388388 bytestring >= 0.9 && < 1.0,

389− directory >= 1 && < 1.2,

389+ directory >= 1 && < 1.3,

390390 filepath >= 1.1 && < 1.4,

391391 process >= 1 && < 1.2,

392392 Diff,

@@ -396,7 +396,7 @@ Test-Suite test-pandoc

396396 QuickCheck >= 2.4 && < 2.6,

397397 HUnit >= 1.2 && < 1.3,

398398 template-haskell >= 2.4 && < 2.8,

399− containers >= 0.1 && < 0.5,

399+ containers >= 0.1 && < 0.6,

400400 ansi-terminal == 0.5.*

401401 Other-Modules: Tests.Old

402402 Tests.Helpers