From 24ce2686f43b65a5da607680f279575200636d99 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 14 Sep 2019 03:38:30 -0700 Subject: [PATCH] drop GHC 7.10/base 4.8 support, finally, due to MonadFail hassles 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. --- hledger-lib/hledger-lib.cabal | 10 +++++----- hledger-lib/package.yaml | 4 ++-- hledger-ui/hledger-ui.cabal | 6 +++--- hledger-ui/package.yaml | 4 ++-- hledger-web/hledger-web.cabal | 6 +++--- hledger-web/package.yaml | 4 ++-- hledger/hledger.cabal | 12 ++++++------ hledger/package.yaml | 4 ++-- stack-ghc7.10.yaml => stack-ghc7.10.yaml.disabled | 3 +++ 9 files changed, 28 insertions(+), 25 deletions(-) rename stack-ghc7.10.yaml => stack-ghc7.10.yaml.disabled (93%) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 28a1c7b4d..ef194644b 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 1a86e1ea033680b16a056d843fda4101e7e6c06babcc6118bffb79e0042d17a7 +-- hash: 76c7a62a518ff4226e139c42540aaf8f3331fb1a7250cc7a784f9cf9a2e4b123 name: hledger-lib version: 1.15.99 @@ -25,7 +25,7 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 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 extra-source-files: CHANGES.md @@ -107,7 +107,7 @@ library , Glob >=0.9 , ansi-terminal >=0.6.2.3 , array - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , blaze-markup >=0.5.1 , bytestring @@ -210,7 +210,7 @@ test-suite doctests , Glob >=0.7 , ansi-terminal >=0.6.2.3 , array - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , blaze-markup >=0.5.1 , bytestring @@ -317,7 +317,7 @@ test-suite easytests , Glob >=0.9 , ansi-terminal >=0.6.2.3 , array - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , blaze-markup >=0.5.1 , bytestring diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 518de4270..48f6fde08 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -18,7 +18,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org 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: - CHANGES.md @@ -39,7 +39,7 @@ extra-source-files: #data-files: dependencies: -- base >=4.8 && <4.13 +- base >=4.9 && <4.13 - base-compat-batteries >=0.10.1 && <0.12 - ansi-terminal >=0.6.2.3 - array diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 8ff168d4d..695b50e70 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: e67b3a88332a7f2f449bef9062a1b88b69fa7a1cfaf9be253f502a54b31bfc69 +-- hash: d802046cb126963afe47e064dc4101eb5f6ef3fb0df70cdb03a375485860a744 name: hledger-ui version: 1.15.99 @@ -27,7 +27,7 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 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 extra-source-files: CHANGES.md @@ -68,7 +68,7 @@ executable hledger-ui build-depends: ansi-terminal >=0.6.2.3 , async - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , cmdargs >=0.8 , containers diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 53985f599..2b2b8acc6 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -20,7 +20,7 @@ github : simonmichael/hledger homepage : http://hledger.org bug-reports : http://bugs.hledger.org 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: - CHANGES.md @@ -44,7 +44,7 @@ dependencies: - hledger >=1.15.99 && <1.16 - ansi-terminal >=0.6.2.3 - async -- base >=4.8 && <4.13 +- base >=4.9 && <4.13 - base-compat-batteries >=0.10.1 && <0.12 - cmdargs >=0.8 - containers diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 556656329..8b9a29b55 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 51a049cca192a9e8f8aad9e033c6e8dec4dfebdb19e523e26cd81c1a7f418758 +-- hash: 2039eae28649153b671940fd3813fa48b76193a9948b1bd466a7ef86575af9cd name: hledger-web version: 1.15.99 @@ -27,7 +27,7 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 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 extra-source-files: CHANGES.md @@ -155,7 +155,7 @@ library build-depends: Decimal , aeson - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , blaze-html , blaze-markup , bytestring diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 9e83a1a97..2d351a140 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -20,7 +20,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org 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: - CHANGES.md @@ -102,7 +102,7 @@ library: - hledger-lib >=1.15.99 && <1.16 - hledger >=1.15.99 && <1.16 - aeson - - base >=4.8 && <4.13 + - base >=4.9 && <4.13 - blaze-html - blaze-markup - bytestring diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 7ba6b072e..74a0844c3 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: bd203b8004a809390f7eb686721bee2a5d48e606a0aa25a873aaf2e133aada80 +-- hash: cfbd7109f5527399580a07f847fc8f5d01951caffc3667948b6348f82183be52 name: hledger version: 1.15.99 @@ -27,7 +27,7 @@ author: Simon Michael maintainer: Simon Michael license: GPL-3 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 extra-source-files: CHANGES.md @@ -148,7 +148,7 @@ library Decimal , Diff , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -200,7 +200,7 @@ executable hledger build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -254,7 +254,7 @@ test-suite test build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -307,7 +307,7 @@ benchmark bench build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.8 && <4.13 + , base >=4.9 && <4.13 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 diff --git a/hledger/package.yaml b/hledger/package.yaml index fa41b4778..43040272a 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -20,7 +20,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org 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: - CHANGES.md @@ -107,7 +107,7 @@ ghc-options: dependencies: - hledger-lib >=1.15.99 && <1.16 - ansi-terminal >=0.6.2.3 -- base >=4.8 && <4.13 +- base >=4.9 && <4.13 - base-compat-batteries >=0.10.1 && <0.12 - bytestring - cmdargs >=0.10 diff --git a/stack-ghc7.10.yaml b/stack-ghc7.10.yaml.disabled similarity index 93% rename from stack-ghc7.10.yaml rename to stack-ghc7.10.yaml.disabled index 12912265e..9bbb8f42e 100644 --- a/stack-ghc7.10.yaml +++ b/stack-ghc7.10.yaml.disabled @@ -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 # This is unlikely to work on OSX Sierra+ due to https://ghc.haskell.org/trac/ghc/ticket/12479