Move to newer Haskell packageset (#80)

* Move to newer Haskell packageset

* Formatting

flake.nix

@@ -1,6 +1,7 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    # Temporary until `haskell-updates` is merged. Move it back to `nixpkgs-unstable` once it is.
+    nixpkgs.url = "github:nixos/nixpkgs/haskell-updates";
     flake-utils.url = "github:numtide/flake-utils/main";
     flake-compat = {
       url = "github:edolstra/flake-compat/master";

nix-tree.cabal

@@ -48,7 +48,7 @@ common common-options
   build-depends:      base
                     , relude
                     , aeson
-                    , brick >= 1 && < 2
+                    , brick >= 2.1 && < 2.4
                     , bytestring
                     , containers
                     , clock

src/NixTree/App.hs

@@ -134,9 +134,7 @@ run env = do
       return ()
 
   -- And run the application
-  let mkVty = V.mkVty V.defaultConfig
-  initialVty <- mkVty
-  _ <- B.customMain initialVty mkVty (Just chan) app appEnv
+  _ <- B.customMainWithDefaultVty (Just chan) app appEnv
 
   return ()
 

src/NixTree/Main.hs

@@ -42,8 +42,10 @@ optsParser =
                 ( Opts.metavar "INSTALLABLE"
                     <> Opts.helpDoc
                       ( Just $
-                          "A store path or a flake reference."
-                            Opts.<$$> "Paths default to \"~/.nix-profile\" and \"/var/run/current-system\""
+                          Opts.vsep
+                            [ "A store path or a flake reference.",
+                              "Paths default to \"~/.nix-profile\" and \"/var/run/current-system\""
+                            ]
                       )
                 )
           )
@@ -53,8 +55,10 @@ optsParser =
 
     keybindingsHelp :: Opts.Doc
     keybindingsHelp =
-      "Keybindings:"
-        Opts.<$$> (Opts.indent 2 . Opts.vsep $ map (Opts.text . toString) (lines helpText))
+      Opts.vsep
+        [ "Keybindings:",
+          Opts.indent 2 . Opts.vsep $ map Opts.pretty (lines helpText)
+        ]
 
 showAndFail :: Text -> IO a
 showAndFail msg = do