Remove directory compat
directory 1.1 depends on base 4.5 (ghc 7.4) which we are no longer supporting. So we don't have to use a compatibility layer for it.
This commit is contained in:
parent
7f676b534a
commit
f72e3b58e8
3 changed files with 2 additions and 24 deletions
|
@ -416,7 +416,6 @@ Library
|
|||
Text.Pandoc.Highlighting,
|
||||
Text.Pandoc.Compat.Time,
|
||||
Text.Pandoc.Compat.TagSoupEntity,
|
||||
Text.Pandoc.Compat.Directory,
|
||||
Paths_pandoc
|
||||
|
||||
Buildable: True
|
||||
|
@ -425,7 +424,7 @@ Executable pandoc
|
|||
Build-Depends: pandoc,
|
||||
pandoc-types >= 1.16 && < 1.17,
|
||||
base >= 4.2 && <5,
|
||||
directory >= 1 && < 1.3,
|
||||
directory >= 1.2 && < 1.3,
|
||||
filepath >= 1.1 && < 1.5,
|
||||
text >= 0.11 && < 1.3,
|
||||
bytestring >= 0.9 && < 0.11,
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
{-# 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
|
||||
|
|
@ -49,7 +49,7 @@ import Control.Monad.Reader (Reader, runReader, asks)
|
|||
import Text.Pandoc.Error
|
||||
|
||||
import Data.Time.LocalTime (getZonedTime)
|
||||
import Text.Pandoc.Compat.Directory(getModificationTime)
|
||||
import System.Directory(getModificationTime)
|
||||
import Data.Time.Format (formatTime)
|
||||
import Text.Pandoc.Compat.Time (defaultTimeLocale)
|
||||
import System.IO.Error (catchIOError)
|
||||
|
|
Loading…
Add table
Reference in a new issue