simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-11-08 07:09:28 +03:00
Code Issues Projects Releases Wiki Activity

drop GHC 7.10/base 4.8 support, finally, due to MonadFail hassles

Browse Source 
in JournalReader.hs. If you still need this, feel free to work on
those errors. But hopefully not, because dropping base 4.8 should
permit some code cleanups.
This commit is contained in:
Simon Michael 2019-09-14 03:38:30 -07:00
parent 977d4f009e
commit 24ce2686f4
9 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ cabal-version: 1.12
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 1a86e1ea033680b16a056d843fda4101e7e6c06babcc6118bffb79e0042d17a7 -- hash: 76c7a62a518ff4226e139c42540aaf8f3331fb1a7250cc7a784f9cf9a2e4b123
name: hledger-lib name: hledger-lib
version: 1.15.99 version: 1.15.99
@ -25,7 +25,7 @@ author: Simon Michael <simon@joyful.com>
maintainer: Simon Michael <simon@joyful.com> maintainer: Simon Michael <simon@joyful.com>
license: GPL-3 license: GPL-3
license-file: LICENSE license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
build-type: Simple build-type: Simple
extra-source-files: extra-source-files:
CHANGES.md CHANGES.md
@ -107,7 +107,7 @@ library
, Glob >=0.9 , Glob >=0.9
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring
@ -210,7 +210,7 @@ test-suite doctests
, Glob >=0.7 , Glob >=0.7
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring
@ -317,7 +317,7 @@ test-suite easytests
, Glob >=0.9 , Glob >=0.9
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, array , array
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, blaze-markup >=0.5.1 , blaze-markup >=0.5.1
, bytestring , bytestring

4
hledger-lib/package.yaml
View File

@ -18,7 +18,7 @@ github: simonmichael/hledger
homepage: http://hledger.org homepage: http://hledger.org
bug-reports: http://bugs.hledger.org bug-reports: http://bugs.hledger.org
stability: stable stability: stable
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
extra-source-files: extra-source-files:
- CHANGES.md - CHANGES.md
@ -39,7 +39,7 @@ extra-source-files:
#data-files: #data-files:
dependencies: dependencies:
- base >=4.8 && <4.13 - base >=4.9 && <4.13
- base-compat-batteries >=0.10.1 && <0.12 - base-compat-batteries >=0.10.1 && <0.12
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- array - array

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

@ -4,7 +4,7 @@ cabal-version: 1.12
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: e67b3a88332a7f2f449bef9062a1b88b69fa7a1cfaf9be253f502a54b31bfc69 -- hash: d802046cb126963afe47e064dc4101eb5f6ef3fb0df70cdb03a375485860a744
name: hledger-ui name: hledger-ui
version: 1.15.99 version: 1.15.99
@ -27,7 +27,7 @@ author: Simon Michael <simon@joyful.com>
maintainer: Simon Michael <simon@joyful.com> maintainer: Simon Michael <simon@joyful.com>
license: GPL-3 license: GPL-3
license-file: LICENSE license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
build-type: Simple build-type: Simple
extra-source-files: extra-source-files:
CHANGES.md CHANGES.md
@ -68,7 +68,7 @@ executable hledger-ui
build-depends: build-depends:
ansi-terminal >=0.6.2.3 ansi-terminal >=0.6.2.3
, async , async
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, cmdargs >=0.8 , cmdargs >=0.8
, containers , containers

4
hledger-ui/package.yaml
View File

@ -20,7 +20,7 @@ github : simonmichael/hledger
homepage : http://hledger.org homepage : http://hledger.org
bug-reports : http://bugs.hledger.org bug-reports : http://bugs.hledger.org
stability : stable stability : stable
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
extra-source-files: extra-source-files:
- CHANGES.md - CHANGES.md
@ -44,7 +44,7 @@ dependencies:
- hledger >=1.15.99 && <1.16 - hledger >=1.15.99 && <1.16
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- async - async
- base >=4.8 && <4.13 - base >=4.9 && <4.13
- base-compat-batteries >=0.10.1 && <0.12 - base-compat-batteries >=0.10.1 && <0.12
- cmdargs >=0.8 - cmdargs >=0.8
- containers - containers

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

@ -4,7 +4,7 @@ cabal-version: 1.12
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 51a049cca192a9e8f8aad9e033c6e8dec4dfebdb19e523e26cd81c1a7f418758 -- hash: 2039eae28649153b671940fd3813fa48b76193a9948b1bd466a7ef86575af9cd
name: hledger-web name: hledger-web
version: 1.15.99 version: 1.15.99
@ -27,7 +27,7 @@ author: Simon Michael <simon@joyful.com>
maintainer: Simon Michael <simon@joyful.com> maintainer: Simon Michael <simon@joyful.com>
license: GPL-3 license: GPL-3
license-file: LICENSE license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
build-type: Simple build-type: Simple
extra-source-files: extra-source-files:
CHANGES.md CHANGES.md
@ -155,7 +155,7 @@ library
build-depends: build-depends:
Decimal Decimal
, aeson , aeson
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, blaze-html , blaze-html
, blaze-markup , blaze-markup
, bytestring , bytestring

4
hledger-web/package.yaml
View File

@ -20,7 +20,7 @@ github: simonmichael/hledger
homepage: http://hledger.org homepage: http://hledger.org
bug-reports: http://bugs.hledger.org bug-reports: http://bugs.hledger.org
stability: stable stability: stable
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
extra-source-files: extra-source-files:
- CHANGES.md - CHANGES.md
@ -102,7 +102,7 @@ library:
- hledger-lib >=1.15.99 && <1.16 - hledger-lib >=1.15.99 && <1.16
- hledger >=1.15.99 && <1.16 - hledger >=1.15.99 && <1.16
- aeson - aeson
- base >=4.8 && <4.13 - base >=4.9 && <4.13
- blaze-html - blaze-html
- blaze-markup - blaze-markup
- bytestring - bytestring

12
hledger/hledger.cabal
View File

@ -4,7 +4,7 @@ cabal-version: 1.12
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: bd203b8004a809390f7eb686721bee2a5d48e606a0aa25a873aaf2e133aada80 -- hash: cfbd7109f5527399580a07f847fc8f5d01951caffc3667948b6348f82183be52
name: hledger name: hledger
version: 1.15.99 version: 1.15.99
@ -27,7 +27,7 @@ author: Simon Michael <simon@joyful.com>
maintainer: Simon Michael <simon@joyful.com> maintainer: Simon Michael <simon@joyful.com>
license: GPL-3 license: GPL-3
license-file: LICENSE license-file: LICENSE
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
build-type: Simple build-type: Simple
extra-source-files: extra-source-files:
CHANGES.md CHANGES.md
@ -148,7 +148,7 @@ library
Decimal Decimal
, Diff , Diff
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
@ -200,7 +200,7 @@ executable hledger
build-depends: build-depends:
Decimal Decimal
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
@ -254,7 +254,7 @@ test-suite test
build-depends: build-depends:
Decimal Decimal
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10
@ -307,7 +307,7 @@ benchmark bench
build-depends: build-depends:
Decimal Decimal
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.12 , base-compat-batteries >=0.10.1 && <0.12
, bytestring , bytestring
, cmdargs >=0.10 , cmdargs >=0.10

4
hledger/package.yaml
View File

@ -20,7 +20,7 @@ github: simonmichael/hledger
homepage: http://hledger.org homepage: http://hledger.org
bug-reports: http://bugs.hledger.org bug-reports: http://bugs.hledger.org
stability: stable stability: stable
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5 tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
extra-source-files: extra-source-files:
- CHANGES.md - CHANGES.md
@ -107,7 +107,7 @@ ghc-options:
dependencies: dependencies:
- hledger-lib >=1.15.99 && <1.16 - hledger-lib >=1.15.99 && <1.16
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- base >=4.8 && <4.13 - base >=4.9 && <4.13
- base-compat-batteries >=0.10.1 && <0.12 - base-compat-batteries >=0.10.1 && <0.12
- bytestring - bytestring
- cmdargs >=0.10 - cmdargs >=0.10

3
stack-ghc7.10.yaml → stack-ghc7.10.yaml.disabled
View File

@ -1,3 +1,6 @@
# 201909: disabled due to hassles with MonadFail in JournalReader.hs.
# Feel free to work on this if you still need GHC 7 support.
# stack build plan using GHC 7.10.3 # stack build plan using GHC 7.10.3
# This is unlikely to work on OSX Sierra+ due to https://ghc.haskell.org/trac/ghc/ticket/12479 # This is unlikely to work on OSX Sierra+ due to https://ghc.haskell.org/trac/ghc/ticket/12479