pkg: Drop base-compat-batteries dependency.

Our supported stackage versions are now new enough that we don't need
any of the compatibility features anymore.

bin/hledger-check-fancyassertions.hs

@@ -118,7 +118,6 @@ import qualified Hledger.Read as H
 import qualified Hledger.Utils.Parse as H
 import Lens.Micro (set)
 import Options.Applicative
-import "base-compat" Prelude.Compat ((<>))
 import System.Exit (exitFailure)
 import System.FilePath (FilePath)
 import qualified Text.Megaparsec as P

hledger-lib/Hledger/Data/Dates.hs

@@ -79,18 +79,16 @@ module Hledger.Data.Dates (
 )
 where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat hiding (fail)
-import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (MonadFail, fail)
+import qualified Control.Monad.Fail as Fail (MonadFail, fail)
 import Control.Applicative (liftA2)
 import Control.Applicative.Permutations
 import Control.Monad (guard, unless)
-import "base-compat-batteries" Data.List.Compat
 import Data.Char (digitToInt, isDigit, ord)
 import Data.Default (def)
 import Data.Foldable (asum)
 import Data.Function (on)
 import Data.Functor (($>))
+import Data.List (elemIndex, group, sort, sortBy)
 import Data.Maybe (catMaybes, fromMaybe, isJust, mapMaybe)
 import Data.Ord (comparing)
 import qualified Data.Set as Set

hledger-lib/Hledger/Data/StringFormat.hs

@@ -17,8 +17,6 @@ module Hledger.Data.StringFormat (
         , tests_StringFormat
         ) where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat
 import Numeric (readDec)
 import Data.Char (isPrint)
 import Data.Default (Default(..))

hledger-lib/Hledger/Read/Common.hs

@@ -119,10 +119,8 @@ module Hledger.Read.Common (
 where
 
 --- ** imports
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat hiding (fail, readFile)
 import Control.Applicative.Permutations (runPermutation, toPermutationWithDefault)
-import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail)
+import qualified Control.Monad.Fail as Fail (fail)
 import Control.Monad.Except (ExceptT(..), liftEither, runExceptT, throwError)
 import Control.Monad.State.Strict hiding (fail)
 import Data.Bifunctor (bimap, second)
@@ -131,7 +129,7 @@ import Data.Decimal (DecimalRaw (Decimal), Decimal)
 import Data.Either (lefts, rights)
 import Data.Function ((&))
 import Data.Functor ((<&>))
-import "base-compat-batteries" Data.List.Compat
+import Data.List (find, genericReplicate)
 import Data.List.NonEmpty (NonEmpty(..))
 import Data.Maybe (catMaybes, fromMaybe, isJust, listToMaybe)
 import qualified Data.Map as M

hledger-lib/Hledger/Read/CsvReader.hs

@@ -37,8 +37,6 @@ module Hledger.Read.CsvReader (
 where
 
 --- ** imports
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat hiding (fail)
 import Control.Applicative        (liftA2)
 import Control.Exception          (IOException, handle, throw)
 import Control.Monad              (unless, when)
@@ -49,7 +47,7 @@ import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
 import Control.Monad.Trans.Class  (lift)
 import Data.Char                  (toLower, isDigit, isSpace, isAlphaNum, isAscii, ord)
 import Data.Bifunctor             (first)
-import "base-compat-batteries" Data.List.Compat
+import Data.List (elemIndex, foldl', intersperse, mapAccumL, nub, sortBy)
 import Data.Maybe (catMaybes, fromMaybe, isJust)
 import Data.MemoUgly (memo)
 import Data.Ord (comparing)

hledger-lib/Hledger/Read/JournalReader.hs

@@ -71,9 +71,7 @@ module Hledger.Read.JournalReader (
 where
 
 --- ** imports
--- import qualified Prelude (fail)
--- import "base-compat-batteries" Prelude.Compat hiding (fail, readFile)
-import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail)
+import qualified Control.Monad.Fail as Fail (fail)
 import qualified Control.Exception as C
 import Control.Monad (forM_, when, void)
 import Control.Monad.IO.Class (MonadIO, liftIO)

hledger-lib/Hledger/Read/TimeclockReader.hs

@@ -57,8 +57,6 @@ module Hledger.Read.TimeclockReader (
 where
 
 --- ** imports
-import           Prelude ()
-import "base-compat-batteries" Prelude.Compat
 import           Control.Monad
 import           Control.Monad.Except (ExceptT)
 import           Control.Monad.State.Strict

hledger-lib/Hledger/Read/TimedotReader.hs

@@ -40,8 +40,6 @@ module Hledger.Read.TimedotReader (
 where
 
 --- ** imports
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat
 import Control.Monad
 import Control.Monad.Except (ExceptT)
 import Control.Monad.State.Strict

hledger-lib/Text/Megaparsec/Custom.hs

@@ -47,9 +47,6 @@ module Text.Megaparsec.Custom (
 )
 where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat hiding (readFile)
-
 import Control.Monad.Except
 import Control.Monad.State.Strict (StateT, evalStateT)
 import qualified Data.List.NonEmpty as NE

hledger-lib/hledger-lib.cabal

@@ -100,7 +100,6 @@ library
     , ansi-terminal >=0.9
     , array
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , blaze-markup >=0.5.1
     , bytestring
     , call-stack
@@ -150,7 +149,6 @@ test-suite doctest
     , ansi-terminal >=0.9
     , array
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , blaze-markup >=0.5.1
     , bytestring
     , call-stack
@@ -203,7 +201,6 @@ test-suite unittest
     , ansi-terminal >=0.9
     , array
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , blaze-markup >=0.5.1
     , bytestring
     , call-stack

hledger-lib/package.yaml

@@ -33,7 +33,6 @@ extra-source-files:
 
 dependencies:
 - base >=4.11 && <4.16
-- base-compat-batteries >=0.10.1 && <0.12
 - aeson >=1
 - aeson-pretty
 - ansi-terminal >=0.9

hledger-ui/hledger-ui.cabal

@@ -68,7 +68,6 @@ executable hledger-ui
       ansi-terminal >=0.9
     , async
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , brick >=0.23
     , cmdargs >=0.8
     , containers >=0.5.9

hledger-ui/package.yaml

@@ -46,7 +46,6 @@ dependencies:
 - ansi-terminal >=0.9
 - async
 - base >=4.11 && <4.16
-- base-compat-batteries >=0.10.1 && <0.12
 - cmdargs >=0.8
 - containers >=0.5.9
 - data-default

hledger/Hledger/Cli/CliOptions.hs

@@ -72,16 +72,13 @@ module Hledger.Cli.CliOptions (
 )
 where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat
 import qualified Control.Exception as C
 import Control.Monad (when)
 import Data.Char
 import Data.Default
 import Data.Either (fromRight, isRight)
 import Data.Functor.Identity (Identity)
-import "base-compat-batteries" Data.List.Compat
-import Data.List.Extra (groupSortOn, nubSort)
+import Data.List.Extra (groupSortOn, intercalate, isInfixOf, nubSort)
 import Data.List.Split (splitOneOf)
 import Data.Maybe
 --import Data.String.Here

hledger/Hledger/Cli/Commands/Add.hs

@@ -14,8 +14,6 @@ module Hledger.Cli.Commands.Add (
 )
 where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat hiding (fail)
 import Control.Exception as E
 import Control.Monad (when)
 import Control.Monad.Trans.Class
@@ -24,7 +22,7 @@ import Control.Monad.Trans (liftIO)
 import Data.Char (toUpper, toLower)
 import Data.Either (isRight)
 import Data.Functor.Identity (Identity(..))
-import "base-compat-batteries" Data.List.Compat
+import Data.List (isPrefixOf)
 import Data.Maybe (fromJust, fromMaybe, isJust)
 import Data.Text (Text)
 import qualified Data.Text as T

hledger/Hledger/Cli/Commands/Help.hs

@@ -17,8 +17,6 @@ module Hledger.Cli.Commands.Help (
 
   ) where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat
 import Data.Maybe
 import System.Console.CmdArgs.Explicit
 import System.Environment

hledger/Hledger/Cli/DocFiles.hs

@@ -20,8 +20,6 @@ module Hledger.Cli.DocFiles (
 
   ) where
 
-import Prelude ()
-import "base-compat-batteries" Prelude.Compat
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BC
 import Data.Maybe (fromMaybe, isNothing)

hledger/hledger.cabal

@@ -143,7 +143,6 @@ library
     , aeson >=1
     , ansi-terminal >=0.9
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , bytestring
     , cmdargs >=0.10
     , containers >=0.5.9
@@ -194,7 +193,6 @@ executable hledger
     , aeson >=1
     , ansi-terminal >=0.9
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , bytestring
     , cmdargs >=0.10
     , containers >=0.5.9
@@ -245,7 +243,6 @@ test-suite unittest
     , aeson >=1
     , ansi-terminal >=0.9
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , bytestring
     , cmdargs >=0.10
     , containers >=0.5.9
@@ -293,7 +290,6 @@ benchmark bench
     , aeson >=1
     , ansi-terminal >=0.9
     , base >=4.11 && <4.16
-    , base-compat-batteries >=0.10.1 && <0.12
     , bytestring
     , cmdargs >=0.10
     , containers >=0.5.9

hledger/package.yaml

@@ -100,7 +100,6 @@ dependencies:
 - aeson >=1
 - ansi-terminal >=0.9
 - base >=4.11 && <4.16
-- base-compat-batteries >=0.10.1 && <0.12
 - bytestring
 - cmdargs >=0.10
 - containers >=0.5.9