slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to base-compat-batteries to fix ghc 7.10 support (#794)

Browse Source 
base-compat-batteries provides the same API across more ghc versions
than base-compat does, at the cost of more dependencies. Eg it exports
Prelude.Compat ((<>)) with ghc 7.10/base 4.8, which we expect.
My belief is that several of our deps already require it so the added
cost is not too great. We should probably go back to base-compat when
possible though, eg when we stop supporting ghc 7.10.
This commit is contained in:
Simon Michael 2018-06-04 16:28:28 -07:00
parent 08f8be3cb4
commit 0ce9c5728a
15 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Data/Dates.hs
View File

@ -74,9 +74,9 @@ module Hledger.Data.Dates (
where where
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat import "base-compat-batteries" Prelude.Compat
import Control.Monad import Control.Monad
import "base-compat" Data.List.Compat import "base-compat-batteries" Data.List.Compat
import Data.Default import Data.Default
import Data.Maybe import Data.Maybe
import Data.Text (Text) import Data.Text (Text)

2
hledger-lib/Hledger/Data/StringFormat.hs
View File

@ -14,7 +14,7 @@ module Hledger.Data.StringFormat (
) where ) where
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat import "base-compat-batteries" Prelude.Compat
import Numeric import Numeric
import Data.Char (isPrint) import Data.Char (isPrint)
import Data.Maybe import Data.Maybe

6
hledger-lib/Hledger/Read/Common.hs
View File

@ -95,8 +95,8 @@ module Hledger.Read.Common (
where where
--- * imports --- * imports
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat hiding (readFile) import "base-compat-batteries" Prelude.Compat hiding (readFile)
import "base-compat" Control.Monad.Compat import "base-compat-batteries" Control.Monad.Compat
import Control.Monad.Except (ExceptT(..), runExceptT, throwError) --, catchError) import Control.Monad.Except (ExceptT(..), runExceptT, throwError) --, catchError)
import Control.Monad.State.Strict import Control.Monad.State.Strict
import Data.Char import Data.Char
@ -104,7 +104,7 @@ import Data.Data
import Data.Decimal (DecimalRaw (Decimal), Decimal) import Data.Decimal (DecimalRaw (Decimal), Decimal)
import Data.Default import Data.Default
import Data.Functor.Identity import Data.Functor.Identity
import "base-compat" Data.List.Compat import "base-compat-batteries" Data.List.Compat
import Data.List.NonEmpty (NonEmpty(..)) import Data.List.NonEmpty (NonEmpty(..))
import Data.Maybe import Data.Maybe
import qualified Data.Map as M import qualified Data.Map as M

4
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -29,14 +29,14 @@ module Hledger.Read.CsvReader (
) )
where where
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat hiding (getContents) import "base-compat-batteries" Prelude.Compat hiding (getContents)
import Control.Exception hiding (try) import Control.Exception hiding (try)
import Control.Monad import Control.Monad
import Control.Monad.Except import Control.Monad.Except
import Control.Monad.State.Strict (StateT, get, modify', evalStateT) import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
-- import Test.HUnit -- import Test.HUnit
import Data.Char (toLower, isDigit, isSpace) import Data.Char (toLower, isDigit, isSpace)
import "base-compat" Data.List.Compat import "base-compat-batteries" Data.List.Compat
import Data.List.NonEmpty (fromList) import Data.List.NonEmpty (fromList)
import Data.Maybe import Data.Maybe
import Data.Ord import Data.Ord

2
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -72,7 +72,7 @@ module Hledger.Read.JournalReader (
where where
--- * imports --- * imports
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat hiding (readFile) import "base-compat-batteries" Prelude.Compat hiding (readFile)
import qualified Control.Exception as C import qualified Control.Exception as C
import Control.Monad import Control.Monad
import Control.Monad.Except (ExceptT(..), runExceptT, throwError) import Control.Monad.Except (ExceptT(..), runExceptT, throwError)

2
hledger-lib/Hledger/Read/TimeclockReader.hs
View File

@ -52,7 +52,7 @@ module Hledger.Read.TimeclockReader (
) )
where where
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat import "base-compat-batteries" Prelude.Compat
import Control.Monad import Control.Monad
import Control.Monad.Except (ExceptT) import Control.Monad.Except (ExceptT)
import Control.Monad.State.Strict import Control.Monad.State.Strict

2
hledger-lib/Hledger/Read/TimedotReader.hs
View File

@ -35,7 +35,7 @@ module Hledger.Read.TimedotReader (
) )
where where
import Prelude () import Prelude ()
import "base-compat" Prelude.Compat import "base-compat-batteries" Prelude.Compat
import Control.Monad import Control.Monad
import Control.Monad.Except (ExceptT) import Control.Monad.Except (ExceptT)
import Control.Monad.State.Strict import Control.Monad.State.Strict

10
hledger-lib/hledger-lib.cabal
View File

@ -2,7 +2,7 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: fb6ec68fcff82e6a14e5bb15f7cb05f950ce044a69af3c3941a7134701e911b8 -- hash: 0e72f3eaeca291a51788326f145fe2e50f9febc84f8fb6d2e039f0bdd5b3f667
name: hledger-lib name: hledger-lib
version: 1.9.99 version: 1.9.99
@ -105,7 +105,7 @@ library
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
@ -200,7 +200,7 @@ test-suite doctests
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
@ -295,7 +295,7 @@ test-suite easytests
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
@ -391,7 +391,7 @@ test-suite hunittests
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10

2
hledger-lib/package.yaml
View File

@ -40,7 +40,7 @@ extra-source-files:
dependencies: dependencies:
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- base-compat >=0.10.1 && <0.11 - base-compat-batteries >=0.10.1 && <0.11
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- array - array
- blaze-markup >=0.5.1 - blaze-markup >=0.5.1

4
hledger-ui/hledger-ui.cabal
View File

@ -2,7 +2,7 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 5191302559d777c449e78ec3e41836e2777c70169c5f25eada5c8378fc081c0a -- hash: 76f2079643447fd282a8fb455594f8801e1a011cae69d7d1ec6bc3180dcf583f
name: hledger-ui name: hledger-ui
version: 1.9.99 version: 1.9.99
@ -69,7 +69,7 @@ executable hledger-ui
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, async , async
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, cmdargs >=0.8 , cmdargs >=0.8
, containers , containers
, data-default , data-default

2
hledger-ui/package.yaml
View File

@ -45,7 +45,7 @@ dependencies:
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- async - async
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- base-compat >=0.10.1 && <0.11 - base-compat-batteries >=0.10.1 && <0.11
- cmdargs >=0.8 - cmdargs >=0.8
- containers - containers
- data-default - data-default

8
hledger-web/hledger-web.cabal
View File

@ -2,7 +2,7 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 6e05f5113e2a99d4f17688d2fa94a3ed08148105067ac15db75847e621a36d88 -- hash: f9b958b9292d00ff739999dbd9f5a467b38eac93caa7d16950e03c4c15737b4c
name: hledger-web name: hledger-web
version: 1.9.99 version: 1.9.99
@ -144,7 +144,7 @@ library
build-depends: build-depends:
HUnit HUnit
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-html , blaze-html
, blaze-markup , blaze-markup
, bytestring , bytestring
@ -195,7 +195,7 @@ executable hledger-web
build-depends: build-depends:
HUnit HUnit
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-html , blaze-html
, blaze-markup , blaze-markup
, bytestring , bytestring
@ -254,7 +254,7 @@ test-suite test
build-depends: build-depends:
HUnit HUnit
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, blaze-html , blaze-html
, blaze-markup , blaze-markup
, bytestring , bytestring

2
hledger-web/package.yaml
View File

@ -65,7 +65,7 @@ dependencies:
- hledger-lib >=1.9.99 && <2.0 - hledger-lib >=1.9.99 && <2.0
- hledger >=1.9.99 && <2.0 - hledger >=1.9.99 && <2.0
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- base-compat >=0.10.1 && <0.11 - base-compat-batteries >=0.10.1 && <0.11
- blaze-html - blaze-html
- blaze-markup - blaze-markup
- bytestring - bytestring

10
hledger/hledger.cabal
View File

@ -2,7 +2,7 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 16dea93ba716dcd0bc9ad0027baacf924505a16f88444a92a28ae9e648e30ad6 -- hash: 9c5b2134da8c5338d453b421424d33bf6ad43c1c12eca02dcd6711b23d7ae77a
name: hledger name: hledger
version: 1.9.99 version: 1.9.99
@ -116,7 +116,7 @@ library
, HUnit , HUnit
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
, containers , containers
@ -168,7 +168,7 @@ executable hledger
, HUnit , HUnit
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
, containers , containers
@ -222,7 +222,7 @@ test-suite test
, HUnit , HUnit
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
, containers , containers
@ -275,7 +275,7 @@ benchmark bench
, HUnit , HUnit
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
, containers , containers

2
hledger/package.yaml
View File

@ -81,7 +81,7 @@ dependencies:
- hledger-lib >=1.9.99 && <2.0 - hledger-lib >=1.9.99 && <2.0
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- base-compat >=0.10.1 && <0.11 - base-compat-batteries >=0.10.1 && <0.11
- bytestring - bytestring
- cmdargs >=0.10 - cmdargs >=0.10
- containers - containers