From 93110772055f9ca6fd3e359943be38ac4be05a12 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 19 Nov 2016 08:53:07 -0800 Subject: [PATCH] ui: allow brick 0.14, vty 5.12, text-zipper 0.9 --- hledger-ui/Hledger/UI/AccountsScreen.hs | 2 +- hledger-ui/hledger-ui.cabal | 6 +++--- hledger-ui/package.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index 953e17d35..5bcb721be 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -124,7 +124,7 @@ asDraw UIState{aopts=UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} maxacctwidthseen = -- ltrace "maxacctwidthseen" $ V.maximum $ - V.map (\AccountsScreenItem{..} -> asItemIndentLevel + textWidth asItemDisplayAccountName) $ + V.map (\AccountsScreenItem{..} -> asItemIndentLevel + Hledger.Cli.textWidth asItemDisplayAccountName) $ -- V.filter (\(indent,_,_,_) -> (indent-1) <= fromMaybe 99999 mdepth) $ displayitems maxbalwidthseen = diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 9a6839638..fa2a1d8c5 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -75,15 +75,15 @@ executable hledger-ui , safe >= 0.2 , split >= 0.1 && < 0.3 , text >= 1.2 && < 1.3 - , text-zipper >= 0.4 && < 0.9 + , text-zipper >= 0.4 && < 0.10 , transformers , vector if os(windows) buildable: False else build-depends: - brick >= 0.12 && < 0.14 - , vty >= 5.5 && < 5.12 + brick >= 0.12 && < 0.15 + , vty >= 5.5 && < 5.13 if flag(threaded) ghc-options: -threaded if flag(oldtime) diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 504d3733e..7b4220a47 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -66,7 +66,7 @@ executables: - safe >= 0.2 - split >= 0.1 && < 0.3 - text >= 1.2 && < 1.3 - - text-zipper >= 0.4 && < 0.9 + - text-zipper >= 0.4 && < 0.10 - transformers - vector when: @@ -85,8 +85,8 @@ executables: buildable: false else: dependencies: - - brick >= 0.12 && < 0.14 - - vty >= 5.5 && < 5.12 + - brick >= 0.12 && < 0.15 + - vty >= 5.5 && < 5.13 - condition: flag(threaded) ghc-options: -threaded - condition: flag(oldtime)