Added compatability layer to support directory-1.1

This commit is contained in:
Matthew Pickering 2014-07-26 23:52:40 +01:00
parent 00cb9836b8
commit 9e4604fa0b
3 changed files with 25 additions and 2 deletions

View file

@ -235,7 +235,8 @@ Library
hslua >= 0.3 && < 0.4,
binary >= 0.5 && < 0.8,
SHA >= 1.6 && < 1.7,
haddock-library >= 1.1 && < 1.2
haddock-library >= 1.1 && < 1.2,
old-time
if flag(https)
Build-Depends: http-client >= 0.3.2 && < 0.4,
http-client-tls >= 0.2 && < 0.3,
@ -319,6 +320,7 @@ Library
Text.Pandoc.Compat.Monoid,
Text.Pandoc.Compat.Except,
Text.Pandoc.Compat.TagSoupEntity,
Text.Pandoc.Compat.Directory
Paths_pandoc
Buildable: True

View file

@ -0,0 +1,21 @@
{-# LANGUAGE CPP #-}
module Text.Pandoc.Compat.Directory ( getModificationTime )
where
#if MIN_VERSION_directory(1,2,0)
import System.Directory
#else
import qualified System.Directory as S
import Data.Time.Clock (UTCTime)
import Data.Time.Clock.POSIX
import System.Time
getModificationTime :: FilePath -> IO UTCTime
getModificationTime fp = convert `fmap` S.getModificationTime fp
where
convert (TOD x _) = posixSecondsToUTCTime (realToFrac x)
#endif

View file

@ -50,7 +50,7 @@ import Data.Default
import Control.Monad.Reader (Reader, runReader, asks)
import Data.Time.LocalTime (getZonedTime)
import System.Directory (getModificationTime)
import Text.Pandoc.Compat.Directory(getModificationTime)
import Data.Time.Format (formatTime)
import System.Locale (defaultTimeLocale)
import System.IO.Error (catchIOError)