ui: use latest brick, 0.11

hledger-ui/Hledger/UI/UITypes.hs

@@ -50,8 +50,8 @@ import Text.Show.Functions ()
 import Hledger
 import Hledger.UI.UIOptions
 
-instance Show (List n a) where show _ = "<List>"
-instance Show (Editor n) where show _ = "<Editor>"
+instance Show (List n e) where show _ = "<List>"
+instance Show (Editor l n) where show _ = "<Editor>"
 
 -- | hledger-ui's application state. This holds one or more stateful screens.
 -- As you navigate through screens, the old ones are saved in a stack.
@@ -70,11 +70,11 @@ data UIState = UIState {
 data Mode =
     Normal
   | Help
-  | Minibuffer (Editor Name)
+  | Minibuffer (Editor String Name)
   deriving (Show,Eq)
 
 -- Ignore the editor when comparing Modes.
-instance Eq (Editor n) where _ == _ = True
+instance Eq (Editor l n) where _ == _ = True
 
 -- Unique names required for widgets, viewports, cursor locations etc.
 data Name =

hledger-ui/Hledger/UI/UIUtils.hs

@@ -122,7 +122,7 @@ helpHandle ui ev =
     ui' = setMode Normal ui
 
 -- | Draw the minibuffer.
-minibuffer :: Editor Name -> Widget Name
+minibuffer :: Editor String Name -> Widget Name
 minibuffer ed =
   forceAttr (borderAttr <> "minibuffer") $
   hBox $

hledger-ui/hledger-ui.cabal

@@ -82,7 +82,7 @@ executable hledger-ui
     buildable: False
   else
     build-depends:
-        brick >= 0.7 && < 0.9
+        brick >= 0.11 && < 0.12
       , vty >= 5.5 && < 5.12
   if flag(threaded)
     ghc-options: -threaded

hledger-ui/package.yaml

@@ -85,7 +85,7 @@ executables:
           buildable: false
         else:
           dependencies:
-            - brick >= 0.7 && < 0.9
+            - brick >= 0.11 && < 0.12
             - vty >= 5.5 && < 5.12
       - condition: flag(threaded)
         ghc-options: -threaded

stack-ghc7.10.yaml

@@ -11,5 +11,6 @@ packages:
 - hledger-api
 
 extra-deps:
-- brick-0.8
+- brick-0.11
+- text-zipper-0.8.1
 - megaparsec-5.1.2

stack.yaml

@@ -12,7 +12,7 @@ packages:
 
 extra-deps:
 # for hledger-ui:
-- brick-0.8
+- brick-0.11
 - text-zipper-0.8.1
 - vty-5.11.3
 # for hledger-web: