From f5a7c84065184fd00d831d878be05019eb707c1d Mon Sep 17 00:00:00 2001
From: Stephen Morgan <morgan.stephen99@gmail.com>
Date: Wed, 26 Aug 2020 17:52:16 +1000
Subject: [PATCH] ui: Bump version of vty, present in all supported stackage,
 to get rid of CPP.

---
 hledger-ui/Hledger/UI/Main.hs | 7 -------
 hledger-ui/hledger-ui.cabal   | 6 +++---
 hledger-ui/package.yaml       | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs
index b51d4fa88..a8fed5891 100644
--- a/hledger-ui/Hledger/UI/Main.hs
+++ b/hledger-ui/Hledger/UI/Main.hs
@@ -16,9 +16,6 @@ import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async
 import Control.Monad
 -- import Control.Monad.IO.Class (liftIO)
-#if !MIN_VERSION_vty(5,15,0)
-import Data.Default (def)
-#endif
 -- import Data.Monoid              --
 import Data.List
 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
-#if MIN_VERSION_vty(5,15,0)
         let mkvty = mkVty mempty
-#else
-        let mkvty = mkVty def
-#endif
 #if MIN_VERSION_brick(0,47,0)
         vty0 <- mkvty
         void $ customMain vty0 mkvty (Just eventChan) brickapp ui
diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index 16c64749c..7a61cc3d1 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -1,10 +1,10 @@
 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
 --
--- hash: 4508b3e1554f07f5381ff30cf41a11d1ddd090adf8ce181d3d5aba990fd29813
+-- hash: 67cb06231a9cca7ebcd922f7528bc853a5f78e009d69a0afc41e599c78eac8ec
 
 name:           hledger-ui
 version:        1.18.99
@@ -93,7 +93,7 @@ executable hledger-ui
     , transformers
     , unix
     , vector
-    , vty >=5.5
+    , vty >=5.15
   if os(windows)
     buildable: False
   else
diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml
index d8011b480..a37543cdb 100644
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@@ -68,7 +68,7 @@ dependencies:
 - vector
 # not installable on windows, cf buildable flag below
 - brick >=0.23
-- vty >=5.5
+- vty >=5.15
 - unix
 
 when: