From a21d6e9fa6d9e0287b6db05fc663810337ef3f9a Mon Sep 17 00:00:00 2001
From: Georgi Lyubenov <godzbanebane@gmail.com>
Date: Sun, 19 Jun 2022 22:36:21 +0300
Subject: [PATCH] Future compat against liftA2 export from Prelude (#8132)

---
 src/Text/Pandoc/Parsing/Types.hs                    | 3 ++-
 src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs         | 1 +
 src/Text/Pandoc/Readers/Odt/ContentReader.hs        | 1 +
 src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs | 1 +
 src/Text/Pandoc/Readers/Odt/StyleReader.hs          | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Text/Pandoc/Parsing/Types.hs b/src/Text/Pandoc/Parsing/Types.hs
index 6e2e3e912..f3745270b 100644
--- a/src/Text/Pandoc/Parsing/Types.hs
+++ b/src/Text/Pandoc/Parsing/Types.hs
@@ -19,7 +19,8 @@ module Text.Pandoc.Parsing.Types
   )
 where
 
-import Control.Applicative (liftA2)
+import Prelude hiding (Applicative(..))
+import Control.Applicative (Applicative(..))
 import Control.Monad.Reader
   ( asks, runReader, MonadReader(ask), Reader, ReaderT(ReaderT) )
 import Text.Parsec ( Parsec , ParsecT )
diff --git a/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs b/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs
index 02a5fb8a5..a067895ec 100644
--- a/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs
+++ b/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs
@@ -21,6 +21,7 @@ with an equivalent return value.
 -- We export everything
 module Text.Pandoc.Readers.Odt.Arrows.Utils where
 
+import Prelude hiding (Applicative(..))
 import Control.Arrow
 import Control.Monad (join)
 
diff --git a/src/Text/Pandoc/Readers/Odt/ContentReader.hs b/src/Text/Pandoc/Readers/Odt/ContentReader.hs
index 998999d25..25573549e 100644
--- a/src/Text/Pandoc/Readers/Odt/ContentReader.hs
+++ b/src/Text/Pandoc/Readers/Odt/ContentReader.hs
@@ -24,6 +24,7 @@ module Text.Pandoc.Readers.Odt.ContentReader
 , read_body
 ) where
 
+import Prelude hiding (Applicative(..))
 import Control.Applicative hiding (liftA, liftA2, liftA3)
 import Control.Arrow
 import Control.Monad ((<=<))
diff --git a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
index 341903046..6740d44ad 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
@@ -54,6 +54,7 @@ module Text.Pandoc.Readers.Odt.Generic.XMLConverter
 , matchContent
 ) where
 
+import           Prelude hiding (Applicative(..))
 import           Control.Applicative  hiding ( liftA, liftA2 )
 import           Control.Monad               ( MonadPlus )
 import           Control.Arrow
diff --git a/src/Text/Pandoc/Readers/Odt/StyleReader.hs b/src/Text/Pandoc/Readers/Odt/StyleReader.hs
index ca791ad1e..7337194cb 100644
--- a/src/Text/Pandoc/Readers/Odt/StyleReader.hs
+++ b/src/Text/Pandoc/Readers/Odt/StyleReader.hs
@@ -39,6 +39,7 @@ module Text.Pandoc.Readers.Odt.StyleReader
 , readStylesAt
 ) where
 
+import Prelude hiding (Applicative(..))
 import Control.Applicative hiding (liftA, liftA2, liftA3)
 import Control.Arrow