3ecc8d1 · typeable/pandoc

git.iko.soy/typeable/pandoc

Drop support for ghc < 8.

commit3ecc8d154b8c00263e1eff45450836087a7d0b80 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 27 Mar 2019, 11:38 (8 years ago) parenta43c0bf

5 files changed+2−18

compare with master

unifiedsplit

CONTRIBUTING.md+1−1 pandoc.cabal+1−2 src/Text/Pandoc/Class.hs−8 src/Text/Pandoc/PDF.hs−4 src/Text/Pandoc/Readers/Docx.hs−3

CONTRIBUTING.md+1−1

@@ -144,7 +144,7 @@ Please follow these guidelines:

1441449. It is better not to introduce new dependencies. Dependencies on

145145 external C libraries should especially be avoided.

146146

147−10. We aim for compatibility with ghc versions from 7.10.3 to the

147+10. We aim for compatibility with ghc versions from 8.0 to the

148148 latest release. All pull requests and commits are tested

149149 automatically on CircleCI.

150150

pandoc.cabal+1−2

@@ -11,8 +11,7 @@ bug-reports: https://github.com/jgm/pandoc/issues

1111stability: alpha

1212homepage: https://pandoc.org

1313category: Text

14−tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4,

15− GHC == 8.6.3

14+tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.3

1615synopsis: Conversion between markup formats

1716description: Pandoc is a Haskell library for converting from one markup

1817 format to another, and a command-line tool that uses

src/Text/Pandoc/Class.hs−8

@@ -9,10 +9,6 @@

99{-# LANGUAGE FlexibleContexts #-}

1010{-# LANGUAGE UndecidableInstances #-}

1111{-# LANGUAGE ScopedTypeVariables #-}

12−#if MIN_VERSION_base(4,8,0)

13−#else

14−{-# LANGUAGE OverlappingInstances #-}

15−#endif

1612{- |

1713 Module : Text.Pandoc.Class

@@ -1041,11 +1037,7 @@ instance (MonadTrans t, PandocMonad m, Functor (t m),

10411037 putCommonState = lift . putCommonState

10421038 logOutput = lift . logOutput

10431039

1044−#if MIN_VERSION_base(4,8,0)

10451040instance {-# OVERLAPS #-} PandocMonad m => PandocMonad (ParsecT s st m) where

1046−#else

1047−instance PandocMonad m => PandocMonad (ParsecT s st m) where

1048−#endif

10491041 lookupEnv = lift . lookupEnv

10501042 getCurrentTime = lift getCurrentTime

10511043 getCurrentTimeZone = lift getCurrentTimeZone

src/Text/Pandoc/PDF.hs−4

@@ -34,11 +34,7 @@ import System.FilePath

3434import System.IO (stdout)

3535import System.IO.Temp (withSystemTempDirectory, withTempDirectory,

3636 withTempFile)

37−#if MIN_VERSION_base(4,8,3)

3837import System.IO.Error (IOError, isDoesNotExistError)

39−#else

40−import System.IO.Error (isDoesNotExistError)

41−#endif

4238import Text.Pandoc.Definition

4339import Text.Pandoc.Error (PandocError (PandocPDFProgramNotFoundError))

4440import Text.Pandoc.MIME (getMimeType)

src/Text/Pandoc/Readers/Docx.hs−3

@@ -79,9 +79,6 @@ import Text.Pandoc.Readers.Docx.Parse

7979import Text.Pandoc.Shared

8080import Text.Pandoc.Walk

8181import Text.TeXMath (writeTeX)

82−#if !(MIN_VERSION_base(4,8,0))

83−import Data.Traversable (traverse)

84−#endif

8582import Control.Monad.Except (throwError)

8683import Text.Pandoc.Class (PandocMonad)

8784import qualified Text.Pandoc.Class as P