From e3d78fd0db378f9f59a97c2f6ac3d62c644e30cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jan 2017 18:35:47 +0100 Subject: [PATCH] hledger-ui: add support for brick 0.17 and vty 0.15 (#494) --- hledger-ui/Hledger/UI/Main.hs | 7 ++++++- hledger-ui/hledger-ui.cabal | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs index 7419e2aad..038cd063e 100644 --- a/hledger-ui/Hledger/UI/Main.hs +++ b/hledger-ui/Hledger/UI/Main.hs @@ -226,7 +226,12 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do ) -- and start the app. Must be inside the withManager block - void $ customMain (mkVty def) (Just eventChan) brickapp ui +#if MIN_VERSION_vty(0,15,0) + let myVty = mkVty mempty +#else + let myVty = mkVty def +#endif + void $ customMain myVty (Just eventChan) brickapp ui showFSNEvent (Added f _) = "Added " ++ show f showFSNEvent (Modified f _) = "Modified " ++ show f diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index d624becba..42ea89101 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -85,8 +85,8 @@ executable hledger-ui buildable: False else build-depends: - brick >= 0.12 && < 0.17 - , vty >= 5.5 && < 5.15 + brick >= 0.12 && < 0.18 + , vty >= 5.5 && < 5.16 if flag(threaded) ghc-options: -threaded if flag(oldtime)