git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #619 from bgamari/master
bec2577John MacFarlane
Setup.hs+7
compare with master
unifiedsplit
@@ -1,3 +1,5 @@
1+{-# LANGUAGE CPP #-}
2+
1import Distribution.Simple
3import Distribution.Simple
2import Distribution.Simple.Setup
4import Distribution.Simple.Setup
3 (copyDest, copyVerbosity, fromFlag, installVerbosity, BuildFlags(..))
5 (copyDest, copyVerbosity, fromFlag, installVerbosity, BuildFlags(..))
@@ -20,6 +22,7 @@ import System.Time
20import System.IO.Error ( isDoesNotExistError )
22import System.IO.Error ( isDoesNotExistError )
21import Data.Maybe ( catMaybes )
23import Data.Maybe ( catMaybes )
22import Data.List ( (\\) )
24import Data.List ( (\\) )
25+import Data.Time.Clock (UTCTime(..))
23
26
24main :: IO ()
27main :: IO ()
25main = do
28main = do
@@ -82,7 +85,11 @@ modifiedDependencies :: FilePath -> [FilePath] -> IO [FilePath]
82modifiedDependencies file dependencies = do
85modifiedDependencies file dependencies = do
83 fileModTime <- catch (getModificationTime file) $
86 fileModTime <- catch (getModificationTime file) $
84 \e -> if isDoesNotExistError e
87 \e -> if isDoesNotExistError e
88+#if __GLASGOW_HASKELL__ >= 706
89+ then return (UTCTime (toEnum 0) 0) -- the minimum ClockTime
90+#else
85 then return (TOD 0 0) -- the minimum ClockTime
91 then return (TOD 0 0) -- the minimum ClockTime
92+#endif
86 else ioError e
93 else ioError e
87 depModTimes <- mapM getModificationTime dependencies
94 depModTimes <- mapM getModificationTime dependencies
88 let modified = zipWith (\dep time -> if time > fileModTime then Just dep else Nothing) dependencies depModTimes
95 let modified = zipWith (\dep time -> if time > fileModTime then Just dep else Nothing) dependencies depModTimes
pandoc.cabal+8−8
@@ -199,13 +199,13 @@ Library
199 -- Note: the following is duplicated in all stanzas.
199 -- Note: the following is duplicated in all stanzas.
200 -- It needs to be duplicated because of the library & executable flags.
200 -- It needs to be duplicated because of the library & executable flags.
201 -- BEGIN DUPLICATED SECTION
201 -- BEGIN DUPLICATED SECTION
202− Build-Depends: containers >= 0.1 && < 0.5,
202+ Build-Depends: containers >= 0.1 && < 0.6,
203 parsec >= 3.1 && < 3.2,
203 parsec >= 3.1 && < 3.2,
204 mtl >= 1.1 && < 2.2,
204 mtl >= 1.1 && < 2.2,
205− network >= 2 && < 2.4,
205+ network >= 2 && < 2.5,
206 filepath >= 1.1 && < 1.4,
206 filepath >= 1.1 && < 1.4,
207 process >= 1 && < 1.2,
207 process >= 1 && < 1.2,
208− directory >= 1 && < 1.2,
208+ directory >= 1 && < 1.3,
209 bytestring >= 0.9 && < 1.0,
209 bytestring >= 0.9 && < 1.0,
210 zip-archive >= 0.1.1.7 && < 0.2,
210 zip-archive >= 0.1.1.7 && < 0.2,
211 utf8-string >= 0.3 && < 0.4,
211 utf8-string >= 0.3 && < 0.4,
@@ -311,13 +311,13 @@ Executable pandoc
311 -- Note: the following is duplicated in all stanzas.
311 -- Note: the following is duplicated in all stanzas.
312 -- It needs to be duplicated because of the library & executable flags.
312 -- It needs to be duplicated because of the library & executable flags.
313 -- BEGIN DUPLICATED SECTION
313 -- BEGIN DUPLICATED SECTION
314− Build-Depends: containers >= 0.1 && < 0.5,
314+ Build-Depends: containers >= 0.1 && < 0.6,
315 parsec >= 3.1 && < 3.2,
315 parsec >= 3.1 && < 3.2,
316 mtl >= 1.1 && < 2.2,
316 mtl >= 1.1 && < 2.2,
317− network >= 2 && < 2.4,
317+ network >= 2 && < 2.5,
318 filepath >= 1.1 && < 1.4,
318 filepath >= 1.1 && < 1.4,
319 process >= 1 && < 1.2,
319 process >= 1 && < 1.2,
320− directory >= 1 && < 1.2,
320+ directory >= 1 && < 1.3,
321 bytestring >= 0.9 && < 1.0,
321 bytestring >= 0.9 && < 1.0,
322 zip-archive >= 0.1.1.7 && < 0.2,
322 zip-archive >= 0.1.1.7 && < 0.2,
323 utf8-string >= 0.3 && < 0.4,
323 utf8-string >= 0.3 && < 0.4,
@@ -386,7 +386,7 @@ Test-Suite test-pandoc
386 pandoc-types >= 1.10 && < 1.11,
386 pandoc-types >= 1.10 && < 1.11,
387 utf8-string >= 0.3 && < 0.4,
387 utf8-string >= 0.3 && < 0.4,
388 bytestring >= 0.9 && < 1.0,
388 bytestring >= 0.9 && < 1.0,
389− directory >= 1 && < 1.2,
389+ directory >= 1 && < 1.3,
390 filepath >= 1.1 && < 1.4,
390 filepath >= 1.1 && < 1.4,
391 process >= 1 && < 1.2,
391 process >= 1 && < 1.2,
392 Diff,
392 Diff,
@@ -396,7 +396,7 @@ Test-Suite test-pandoc
396 QuickCheck >= 2.4 && < 2.6,
396 QuickCheck >= 2.4 && < 2.6,
397 HUnit >= 1.2 && < 1.3,
397 HUnit >= 1.2 && < 1.3,
398 template-haskell >= 2.4 && < 2.8,
398 template-haskell >= 2.4 && < 2.8,
399− containers >= 0.1 && < 0.5,
399+ containers >= 0.1 && < 0.6,
400 ansi-terminal == 0.5.*
400 ansi-terminal == 0.5.*
401 Other-Modules: Tests.Old
401 Other-Modules: Tests.Old
402 Tests.Helpers
402 Tests.Helpers