9e4604f · typeable/pandoc

git.iko.soy/typeable/pandoc

Added compatability layer to support directory-1.1

commit9e4604fa0b20b12177fe1f24650e4dfaf388e33a authorMatthew Pickering <matthewtpickering@gmail.com> dateSat 26 Jul 2014, 23:52 (12 years ago) parent00cb983

3 files changed+25−2

compare with master

unifiedsplit

pandoc.cabal+3−1 src/Text/Pandoc/Compat/Directory.hs+21 src/Text/Pandoc/Readers/Txt2Tags.hs+1−1

pandoc.cabal+3−1

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

235235 hslua >= 0.3 && < 0.4,

236236 binary >= 0.5 && < 0.8,

237237 SHA >= 1.6 && < 1.7,

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

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

239+ old-time

239240 if flag(https)

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

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

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

319320 Text.Pandoc.Compat.Monoid,

320321 Text.Pandoc.Compat.Except,

321322 Text.Pandoc.Compat.TagSoupEntity,

323+ Text.Pandoc.Compat.Directory

322324 Paths_pandoc

323325

324326 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

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

6+import System.Directory

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

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

5151

5252import Data.Time.LocalTime (getZonedTime)

53−import System.Directory (getModificationTime)

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

5454import Data.Time.Format (formatTime)

5555import System.Locale (defaultTimeLocale)

5656import System.IO.Error (catchIOError)