From ec39c87ca802000ae9e0c15c46a10c2c2f92159b Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 4 Jun 2018 16:32:57 -0700
Subject: [PATCH] disambiguate the base-compat imports in hledger package too
 (#794)

---
 hledger/Hledger/Cli/CliOptions.hs    | 6 +++---
 hledger/Hledger/Cli/Commands/Add.hs  | 6 +++---
 hledger/Hledger/Cli/Commands/Help.hs | 3 ++-
 hledger/Hledger/Cli/DocFiles.hs      | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/hledger/Hledger/Cli/CliOptions.hs b/hledger/Hledger/Cli/CliOptions.hs
index 98ca4aa33..8fbcc139a 100644
--- a/hledger/Hledger/Cli/CliOptions.hs
+++ b/hledger/Hledger/Cli/CliOptions.hs
@@ -5,7 +5,7 @@ related utilities used by hledger commands.
 
 -}
 
-{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, TypeFamilies, OverloadedStrings #-}
+{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, TypeFamilies, OverloadedStrings, PackageImports #-}
 
 module Hledger.Cli.CliOptions (
 
@@ -71,7 +71,7 @@ module Hledger.Cli.CliOptions (
 where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import qualified Control.Exception as C
 import Control.Monad (when)
 import Data.Char
@@ -80,7 +80,7 @@ import Data.Default
 import Data.Functor.Compat ((<$>))
 #endif
 import Data.Functor.Identity (Identity)
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.List.Split (splitOneOf)
 import Data.Ord
 import Data.Maybe
diff --git a/hledger/Hledger/Cli/Commands/Add.hs b/hledger/Hledger/Cli/Commands/Add.hs
index 3af5ca493..228ed0705 100644
--- a/hledger/Hledger/Cli/Commands/Add.hs
+++ b/hledger/Hledger/Cli/Commands/Add.hs
@@ -3,7 +3,7 @@ A history-aware add command to help with data entry.
 |-}
 
 {-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-do-bind #-}
-{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings, PackageImports #-}
 
 module Hledger.Cli.Commands.Add (
    addmode
@@ -15,7 +15,7 @@ module Hledger.Cli.Commands.Add (
 where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Control.Exception as E
 import Control.Monad
 import Control.Monad.Trans.Class
@@ -23,7 +23,7 @@ import Control.Monad.State.Strict (evalState, evalStateT)
 import Control.Monad.Trans (liftIO)
 import Data.Char (toUpper, toLower)
 import Data.Functor.Identity (Identity(..))
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import qualified Data.Set as S
 import Data.Maybe
 import Data.Text (Text)
diff --git a/hledger/Hledger/Cli/Commands/Help.hs b/hledger/Hledger/Cli/Commands/Help.hs
index 14d6f774b..b6341c665 100644
--- a/hledger/Hledger/Cli/Commands/Help.hs
+++ b/hledger/Hledger/Cli/Commands/Help.hs
@@ -7,6 +7,7 @@ The help command.
 --TODO substring matching
 
 {-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE PackageImports #-}
 
 module Hledger.Cli.Commands.Help (
 
@@ -16,7 +17,7 @@ module Hledger.Cli.Commands.Help (
   ) where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Data.Char
 import Data.List
 import Data.Maybe
diff --git a/hledger/Hledger/Cli/DocFiles.hs b/hledger/Hledger/Cli/DocFiles.hs
index 1b60e481f..066ef8821 100644
--- a/hledger/Hledger/Cli/DocFiles.hs
+++ b/hledger/Hledger/Cli/DocFiles.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskell, OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell, OverloadedStrings, PackageImports #-}
 {-|
 
 Embedded documentation files in various formats, and helpers for viewing them.
@@ -21,7 +21,7 @@ module Hledger.Cli.DocFiles (
   ) where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Data.FileEmbed
 import Data.String
 import System.IO