summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md4
-rw-r--r--Hledger/UI/Main.hs11
-rw-r--r--hledger-ui.cabal8
3 files changed, 16 insertions, 7 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 7cb9478..c2c5518 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
User-visible changes in hledger-ui.
See also the hledger changelog.
+# 1.14.2 2019-03-20
+
+- support brick 0.47+ as well, to get into stackage nightly.
+
# 1.14.1 2019-03-20
- require brick <0.47 to fix build (#995)
diff --git a/Hledger/UI/Main.hs b/Hledger/UI/Main.hs
index e7415ab..2aff7da 100644
--- a/Hledger/UI/Main.hs
+++ b/Hledger/UI/Main.hs
@@ -230,8 +230,13 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{inputopts_=_iopts,reportopts_=rop
-- and start the app. Must be inside the withManager block
#if MIN_VERSION_vty(5,15,0)
- let myVty = mkVty mempty
+ let mkvty = mkVty mempty
#else
- let myVty = mkVty def
+ let mkvty = mkVty def
+#endif
+#if MIN_VERSION_brick(0,47,0)
+ vty0 <- mkvty
+ void $ customMain vty0 mkvty (Just eventChan) brickapp ui
+#else
+ void $ customMain mkvty (Just eventChan) brickapp ui
#endif
- void $ customMain myVty (Just eventChan) brickapp ui
diff --git a/hledger-ui.cabal b/hledger-ui.cabal
index 503347a..6d2f8ef 100644
--- a/hledger-ui.cabal
+++ b/hledger-ui.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
--- hash: 2ae377e0bb3586d7496e90392593821cb19aedaa42e2c66c4da319e0d0fbbc95
+-- hash: f9ea5523eba91a10f52f9d821483b82f77605674174f9f062dc10116047094d8
name: hledger-ui
-version: 1.14.1
+version: 1.14.2
synopsis: Curses-style user interface for the hledger accounting tool
description: This is hledger's curses-style interface.
It is simpler and more convenient for browsing data than the command-line interface,
@@ -64,7 +64,7 @@ executable hledger-ui
hs-source-dirs:
./.
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.14.1"
+ cpp-options: -DVERSION="1.14.2"
build-depends:
ansi-terminal >=0.6.2.3
, async
@@ -94,7 +94,7 @@ executable hledger-ui
buildable: False
else
build-depends:
- brick >=0.23 && <0.47
+ brick >=0.23
, unix
, vty >=5.5
if flag(threaded)