From 843d394077ed2755d7c8d442d66d0834cbad2045 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 28 Nov 2019 13:43:54 -0800 Subject: [PATCH] cli, ui, web: support GHC 8.8, add stack-ghc8.8.yaml (#1090) hledger-web needs an unreleased version of json. --- hledger-ui/hledger-ui.cabal | 4 ++-- hledger-ui/package.yaml | 2 +- hledger-web/hledger-web.cabal | 4 ++-- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 10 +++++----- hledger/package.yaml | 2 +- stack-ghc8.8.yaml | 37 +++++++++++++++++++++++++++++++++++ 7 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 stack-ghc8.8.yaml diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 695b50e70..be503f666 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: d802046cb126963afe47e064dc4101eb5f6ef3fb0df70cdb03a375485860a744 +-- hash: 5758671e5b0acb2bf4a05c9dd25f367c82d96e8bfe00e1f5406ae45e063e18cc name: hledger-ui version: 1.15.99 @@ -68,7 +68,7 @@ executable hledger-ui build-depends: ansi-terminal >=0.6.2.3 , async - , base >=4.9 && <4.13 + , base >=4.9 && <4.14 , 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 2b2b8acc6..47f2e8c61 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -44,7 +44,7 @@ dependencies: - hledger >=1.15.99 && <1.16 - ansi-terminal >=0.6.2.3 - async -- base >=4.9 && <4.13 +- base >=4.9 && <4.14 - 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 7db401ca4..74fe07834 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: 4595326c17d463479b0d80c19012ffd367ef2cedbbdee610e8792fd88d4e4c4c +-- hash: 099ba14e8b1770fb6354f5b6bf32275b52f20dcbafbf17f71515b09523077db4 name: hledger-web version: 1.15.99 @@ -155,7 +155,7 @@ library build-depends: Decimal , aeson - , base >=4.9 && <4.13 + , base >=4.9 && <4.14 , blaze-html , blaze-markup , bytestring diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 79ea09fbc..0628e1000 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -102,7 +102,7 @@ library: - hledger-lib >=1.15.99 && <1.16 - hledger >=1.15.99 && <1.16 - aeson - - base >=4.9 && <4.13 + - base >=4.9 && <4.14 - blaze-html - blaze-markup - bytestring diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index d9b15cde4..941890365 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 8a2b2b502050a55652603b9859bcf11a6dbf6cb265a4b7305e36bd31e288af3a +-- hash: 75d5808338f41ef33fa1176ecc21a128e86171392a9526870a2bccd75adabb7c name: hledger version: 1.15.99 @@ -149,7 +149,7 @@ library Decimal , Diff , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.13 + , base >=4.9 && <4.14 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -201,7 +201,7 @@ executable hledger build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.13 + , base >=4.9 && <4.14 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -253,7 +253,7 @@ test-suite test build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.13 + , base >=4.9 && <4.14 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 @@ -304,7 +304,7 @@ benchmark bench build-depends: Decimal , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.13 + , base >=4.9 && <4.14 , base-compat-batteries >=0.10.1 && <0.12 , bytestring , cmdargs >=0.10 diff --git a/hledger/package.yaml b/hledger/package.yaml index e2289a5cf..05071cde9 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -107,7 +107,7 @@ ghc-options: dependencies: - hledger-lib >=1.15.99 && <1.16 - ansi-terminal >=0.6.2.3 -- base >=4.9 && <4.13 +- base >=4.9 && <4.14 - base-compat-batteries >=0.10.1 && <0.12 - bytestring - cmdargs >=0.10 diff --git a/stack-ghc8.8.yaml b/stack-ghc8.8.yaml new file mode 100644 index 000000000..8df6548c1 --- /dev/null +++ b/stack-ghc8.8.yaml @@ -0,0 +1,37 @@ +# stack build plan using GHC 8.8.1 + +resolver: nightly-2019-11-28 + +packages: +- hledger-lib +- hledger +- hledger-ui +- hledger-web + +nix: + pure: false + packages: [perl gmp ncurses zlib] + +# allow-newer: true + +extra-deps: +# for hledger-lib: +# testing: +# - base-compat-batteries-0.11.0 +# - base-compat-0.11.0 +# for hledger: +# for hledger-ui: +- brick-0.50.1 +- vty-5.26 +# for hledger-web: +- git: https://github.com/GaloisInc/json.git + commit: 9d36ca5d865be7e4b2126b68a444b901941d2492 + +# Workaround for https://github.com/commercialhaskell/stack/issues/3922 +# Try dropping this.. after stack 2 has been out a while ? Or now ? How about now ? +#- haskell-src-exts-1.21.0 + +# Use at least 0.46 to work around https://github.com/simonmichael/hledger/issues/1039 +# (hledger-web build failure with GHC 8.6 on Windows 7) +# Might also be fixed by using GHC 8.6.5+, mixed reports +#- unix-time-0.4.6