9e4604f · typeable/pandoc

pandoc.cabal+3−1

compare with master

unifiedsplit

@@ -235,7 +235,8 @@ Library

235 hslua >= 0.3 && < 0.4,

236 binary >= 0.5 && < 0.8,

237 SHA >= 1.6 && < 1.7,

238− haddock-library >= 1.1 && < 1.2

238+ haddock-library >= 1.1 && < 1.2,

239+ old-time

239 if flag(https)

240 if flag(https)

240 Build-Depends: http-client >= 0.3.2 && < 0.4,

241 Build-Depends: http-client >= 0.3.2 && < 0.4,

241 http-client-tls >= 0.2 && < 0.3,

242 http-client-tls >= 0.2 && < 0.3,

@@ -319,6 +320,7 @@ Library

319 Text.Pandoc.Compat.Monoid,

320 Text.Pandoc.Compat.Monoid,

320 Text.Pandoc.Compat.Except,

321 Text.Pandoc.Compat.Except,

321 Text.Pandoc.Compat.TagSoupEntity,

322 Text.Pandoc.Compat.TagSoupEntity,

323+ Text.Pandoc.Compat.Directory

322 Paths_pandoc

324 Paths_pandoc

323

325

324 Buildable: True

326 Buildable: True

src/Text/Pandoc/Compat/Directory.hsnew file+21

@@ -0,0 +1,21 @@

1+{-# LANGUAGE CPP #-}

2+module Text.Pandoc.Compat.Directory ( getModificationTime )

3+ where

4+

5+#if MIN_VERSION_directory(1,2,0)

6+import System.Directory

7+

8+

9+#else

10+import qualified System.Directory as S

11+import Data.Time.Clock (UTCTime)

12+import Data.Time.Clock.POSIX

13+import System.Time

14+

15+getModificationTime :: FilePath -> IO UTCTime

16+getModificationTime fp = convert `fmap` S.getModificationTime fp

17+ where

18+ convert (TOD x _) = posixSecondsToUTCTime (realToFrac x)

19+

20+#endif

21+

src/Text/Pandoc/Readers/Txt2Tags.hs+1−1

@@ -50,7 +50,7 @@ import Data.Default

50import Control.Monad.Reader (Reader, runReader, asks)

51

52import Data.Time.LocalTime (getZonedTime)

53−import System.Directory (getModificationTime)

53+import Text.Pandoc.Compat.Directory(getModificationTime)

54import Data.Time.Format (formatTime)

55import System.Locale (defaultTimeLocale)

56import System.IO.Error (catchIOError)