From 44805f96efbb22fcb412b49d18d580a47549c078 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 15 Mar 2023 19:09:18 -1000
Subject: [PATCH] ;dev: ui, web: fixes for ghc 9.6; cleanup (#2011)

---
 hledger-lib/package.yaml                   | 1 -
 hledger-ui/Hledger/UI/ErrorScreen.hs       | 2 +-
 hledger-ui/Hledger/UI/TransactionScreen.hs | 2 +-
 hledger-ui/package.yaml                    | 3 +--
 hledger-web/package.yaml                   | 3 +--
 hledger/package.yaml                       | 3 +--
 stack9.0.yaml                              | 1 -
 7 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml
index b4095efd6..690fe2ce7 100644
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@@ -39,7 +39,6 @@ dependencies:
 - ansi-terminal >=0.9
 - array
 - blaze-markup >=0.5.1
-# - breakpoint >=0.1.2.0
 - bytestring
 - call-stack
 - cmdargs >=0.10
diff --git a/hledger-ui/Hledger/UI/ErrorScreen.hs b/hledger-ui/Hledger/UI/ErrorScreen.hs
index 2f2199828..ee51b213f 100644
--- a/hledger-ui/Hledger/UI/ErrorScreen.hs
+++ b/hledger-ui/Hledger/UI/ErrorScreen.hs
@@ -19,7 +19,7 @@ where
 import Brick
 -- import Brick.Widgets.Border ("border")
 import Control.Monad
-import Control.Monad.Except (liftIO)
+import Control.Monad.IO.Class (liftIO)
 import Data.Time.Calendar (Day)
 import Data.Void (Void)
 import Graphics.Vty (Event(..),Key(..),Modifier(..))
diff --git a/hledger-ui/Hledger/UI/TransactionScreen.hs b/hledger-ui/Hledger/UI/TransactionScreen.hs
index 896bbdfe7..a78175a06 100644
--- a/hledger-ui/Hledger/UI/TransactionScreen.hs
+++ b/hledger-ui/Hledger/UI/TransactionScreen.hs
@@ -13,7 +13,7 @@ module Hledger.UI.TransactionScreen
 ) where
 
 import Control.Monad
-import Control.Monad.Except (liftIO)
+import Control.Monad.IO.Class (liftIO)
 import Data.List
 import Data.Maybe
 import qualified Data.Text as T
diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml
index 6f8f6ae4e..d1bf4002b 100644
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@@ -49,12 +49,11 @@ ghc-options:
 - -Wno-unused-do-bind
 
 dependencies:
-- base >=4.14 && <4.18
+- base >=4.14 && <4.19
 - hledger-lib >=1.29.99 && <1.30
 - hledger >=1.29.99 && <1.30
 - ansi-terminal >=0.9
 - async
-# - breakpoint >=0.1.2.0
 - cmdargs >=0.8
 - containers >=0.5.9
 - data-default
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index 7c87be372..e06f8e95d 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -78,8 +78,7 @@ when:
   ghc-options: -O0
 
 dependencies:
-- base >=4.14 && <4.18
-# - breakpoint >=0.1.2.0
+- base >=4.14 && <4.19
 
 library:
   source-dirs: .
diff --git a/hledger/package.yaml b/hledger/package.yaml
index 4e4ca9e0d..c1616b5a0 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -94,11 +94,10 @@ ghc-options:
 - -optP-Wno-nonportable-include-path
 
 dependencies:
-- base >=4.14 && <4.18
+- base >=4.14 && <4.19
 - hledger-lib >=1.29.99 && <1.30
 - aeson >=1
 - ansi-terminal >=0.9
-# - breakpoint >=0.1.2.0
 - bytestring
 - cmdargs >=0.10
 - containers >=0.5.9
diff --git a/stack9.0.yaml b/stack9.0.yaml
index e5a00c149..33af9ab28 100644
--- a/stack9.0.yaml
+++ b/stack9.0.yaml
@@ -24,7 +24,6 @@ extra-deps:
 - text-builder-0.6.7
 - text-builder-dev-0.3.3.2
 - isomorphism-class-0.1.0.7
-# - breakpoint-0.1.2.0
 # for hledger:
 # for hledger-ui:
 - brick-1.5