Move to vty 6.0+

vty moved to separate different platform specific functionality to
different package. We want vty-unix.

iAlso move to brick 2.1.1 that now supports vty 6.0.

flake.nix

@@ -15,6 +15,14 @@
       url = "github:u-quark/vty?ref=gg";
       flake = false;
     };
+    vty-unix = {
+      url = "github:u-quark/vty-unix?ref=gg";
+      flake = false;
+    };
+    vty-crossplatform = {
+      url = "github:jtdaugherty/vty-crossplatform";
+      flake = false;
+    };
     brick = {
       url = "github:jtdaugherty/brick";
       flake = false;

nix/gg.nix

@@ -14,6 +14,7 @@
   http-client,
   brick,
   vty,
+  vty-unix,
   lens,
   generic-lens,
   vector,
@@ -59,13 +60,15 @@ mkDerivation {
     http-client
     brick
     vty
+    vty-unix
     lens
     generic-lens
     vector
     process
     bytestring
     MissingH
     wreq
+    colour
     # C deps
     libgit2
   ];

nix/haskell-pkgs-overlay.nix

@@ -7,7 +7,16 @@ let modifyPkg = pkg: dontHaddock (disableExecutableProfiling (disableLibraryProf
 self: super:
 rec {
   vty = modifyPkg (callCabal2nix "vty" inputs.vty {});
+  vty-unix = modifyPkg (callCabal2nix "vty-unix" inputs.vty-unix {
+    vty = vty;
+  });
+  vty-crossplatform = modifyPkg (callCabal2nix "vty-crossplatform" inputs.vty-crossplatform {
+    vty = vty;
+    vty-unix = vty-unix;
+  });
   brick = modifyPkg (callCabal2nix "brick" inputs.brick {
     vty = vty;
+    vty-unix = vty-unix;
+    vty-crossplatform = vty-crossplatform;
   });
 }

package.yaml

@@ -26,6 +26,7 @@ dependencies:
 - time
 - brick
 - vty
+- vty-unix
 - lens
 - generic-lens
 - vector

src/GG/UI.hs

@@ -53,6 +53,8 @@ import qualified GG.UI.Attrs            as Attr
 import           GG.UI.Theme            (getAttrMap)
 import           GG.Utils               (uncurry3)
 import qualified Graphics.Vty           as V
+import           Graphics.Vty.Platform.Unix
+                                        (mkVty)
 import qualified Libgit2                as G
 import           Prelude                hiding (head)
 import           System.Environment     (lookupEnv, setEnv)
@@ -772,7 +774,7 @@ easeOut t =
 
 buildVty :: IO V.Vty
 buildVty = do
-  vty <- V.mkVty V.defaultConfig
+  vty <- mkVty V.defaultConfig
   let output_interface = V.outputIface vty
   when (V.supportsMode output_interface V.Mouse) $
         liftIO $ V.setMode output_interface V.Mouse True