ui: Bump version of vty, present in all supported stackage, to get rid of CPP.

This commit is contained in:
Stephen Morgan 2020-08-26 17:52:16 +10:00 committed by Simon Michael
parent 2fd678e415
commit f5a7c84065
3 changed files with 4 additions and 11 deletions

View File

@ -16,9 +16,6 @@ import Control.Concurrent (threadDelay)
import Control.Concurrent.Async import Control.Concurrent.Async
import Control.Monad import Control.Monad
-- import Control.Monad.IO.Class (liftIO) -- import Control.Monad.IO.Class (liftIO)
#if !MIN_VERSION_vty(5,15,0)
import Data.Default (def)
#endif
-- import Data.Monoid -- -- import Data.Monoid --
import Data.List import Data.List
import Data.List.Extra (nubSort) import Data.List.Extra (nubSort)
@ -227,11 +224,7 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{inputopts_=_iopts,reportopts_=rop
) )
-- and start the app. Must be inside the withManager block -- and start the app. Must be inside the withManager block
#if MIN_VERSION_vty(5,15,0)
let mkvty = mkVty mempty let mkvty = mkVty mempty
#else
let mkvty = mkVty def
#endif
#if MIN_VERSION_brick(0,47,0) #if MIN_VERSION_brick(0,47,0)
vty0 <- mkvty vty0 <- mkvty
void $ customMain vty0 mkvty (Just eventChan) brickapp ui void $ customMain vty0 mkvty (Just eventChan) brickapp ui

View File

@ -1,10 +1,10 @@
cabal-version: 1.12 cabal-version: 1.12
-- This file has been generated from package.yaml by hpack version 0.33.0. -- This file has been generated from package.yaml by hpack version 0.34.2.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 4508b3e1554f07f5381ff30cf41a11d1ddd090adf8ce181d3d5aba990fd29813 -- hash: 67cb06231a9cca7ebcd922f7528bc853a5f78e009d69a0afc41e599c78eac8ec
name: hledger-ui name: hledger-ui
version: 1.18.99 version: 1.18.99
@ -93,7 +93,7 @@ executable hledger-ui
, transformers , transformers
, unix , unix
, vector , vector
, vty >=5.5 , vty >=5.15
if os(windows) if os(windows)
buildable: False buildable: False
else else

View File

@ -68,7 +68,7 @@ dependencies:
- vector - vector
# not installable on windows, cf buildable flag below # not installable on windows, cf buildable flag below
- brick >=0.23 - brick >=0.23
- vty >=5.5 - vty >=5.15
- unix - unix
when: when: