2c00540 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use base-compat for our custom prelude.

This should give us more complete coverage of newer base features. See #4255.

commit2c0054048553565d3ccdd3b7e415fc001d70859c authorJohn MacFarlane <jgm@berkeley.edu> dateSun 14 Jan 2018, 18:34 (9 years ago) parent9184e1a

2 files changed+7−16

compare with master

unifiedsplit

pandoc.cabal+2−1 prelude/Prelude.hs+5−15

pandoc.cabal+2−1

@@ -626,7 +626,8 @@ test-suite test-pandoc

626626 containers >= 0.4.2.1 && < 0.6,

627627 executable-path >= 0.0 && < 0.1,

628628 zip-archive >= 0.2.3.4 && < 0.4,

629− xml >= 1.3.12 && < 1.4

629+ xml >= 1.3.12 && < 1.4,

630+ base-compat >= 0.9

630631 if flag(old-locale)

631632 build-depends: old-locale >= 1 && < 1.1,

632633 time >= 1.2 && < 1.5

prelude/Prelude.hs+5−15

@@ -1,3 +1,4 @@

1+{-# LANGUAGE NoImplicitPrelude #-}

12{-# LANGUAGE PackageImports #-}

23{-# LANGUAGE CPP #-}

@@ -6,21 +7,10 @@

78module Prelude

89(

9− module P

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

11−#else

12−, Monoid(..)

13−, Applicative(..)

14−, (<$>)

15−, (<$)

16−#endif

10+ module Prelude.Compat

11+, module Monoid.Compat

1712)

1813where

1914

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

21−import "base" Prelude as P

22−#else

23−import "base" Prelude as P

24−import Control.Applicative

25−import Data.Monoid

26−#endif

15+import Prelude.Compat

16+import Monoid.Compat