summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES7
-rw-r--r--Hledger/UI/Main.hs11
-rw-r--r--hledger-ui.cabal8
3 files changed, 19 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index f9d11c2..3f620aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
User-visible changes in hledger-ui. See also hledger, hledger-lib.
+# 1.10.1 (2018/7/3)
+
+* restore support for fsnotify 0.2.1.2, as well as 0.3.x (#833)
+
+* fix a vty version bound & possibly build failures with old vty (#494)
+
+
# 1.10 (2018/6/30)
* the effect of --value, --forecast, and --anon flags is now preserved on reload (#753)
diff --git a/Hledger/UI/Main.hs b/Hledger/UI/Main.hs
index b7c138b..63d3542 100644
--- a/Hledger/UI/Main.hs
+++ b/Hledger/UI/Main.hs
@@ -15,7 +15,7 @@ import Control.Concurrent (threadDelay)
import Control.Concurrent.Async
import Control.Monad
-- import Control.Monad.IO.Class (liftIO)
-#if !MIN_VERSION_vty(0,15,0)
+#if !MIN_VERSION_vty(5,15,0)
import Data.Default (def)
#endif
-- import Data.Monoid --
@@ -212,7 +212,12 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do
d
-- predicate: ignore changes not involving our files
(\fev -> case fev of
- Modified f _ False -> f `elem` files
+#if MIN_VERSION_fsnotify(0,3,0)
+ Modified f _ False
+#else
+ Modified f _
+#endif
+ -> f `elem` files
-- Added f _ -> f `elem` files
-- Removed f _ -> f `elem` files
-- we don't handle adding/removing journal files right now
@@ -228,7 +233,7 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do
)
-- and start the app. Must be inside the withManager block
-#if MIN_VERSION_vty(0,15,0)
+#if MIN_VERSION_vty(5,15,0)
let myVty = mkVty mempty
#else
let myVty = mkVty def
diff --git a/hledger-ui.cabal b/hledger-ui.cabal
index 9d50b38..80a04a4 100644
--- a/hledger-ui.cabal
+++ b/hledger-ui.cabal
@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
--- hash: 93120fb2299854b48774c4d03660702d22bd43021aa4030f664636b8bc0d0738
+-- hash: 6d33330b300e0157396548bad1c303fa608cb5f611d108f4f0080e130b12c04e
name: hledger-ui
-version: 1.10
+version: 1.10.1
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,
@@ -63,7 +63,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.10"
+ cpp-options: -DVERSION="1.10.1"
build-depends:
HUnit
, ansi-terminal >=0.6.2.3
@@ -75,7 +75,7 @@ executable hledger-ui
, data-default
, directory
, filepath
- , fsnotify >=0.3.0.1
+ , fsnotify >=0.2.1.2 && <0.4
, hledger >=1.10 && <1.11
, hledger-lib >=1.10 && <1.11
, megaparsec >=6.4.1