From 80f1d396dff72a94d159a25ce2589b407eb00c10 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Thu, 29 Dec 2022 11:36:08 +0100
Subject: chore(grfn/xanthous): port to brick-0.73

This is the latest version before 1.0 which has some bigger changes as
brick's EventM gains the ability to be MonadState which requires
adjusting basically all App code.

In 0.72, handleEditorEvent started taking a BrickEvent, so we no longer
need to unwrap the VtyEvent in handlePromptEvent.

Change-Id: Ic6a1ce6e21ba46177d3ce0b8a124abe7d8951464
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7666
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
---
 third_party/overlays/haskell/default.nix           |  7 +--
 .../overlays/haskell/extra-pkgs/brick-0.71.1.nix   | 70 ----------------------
 .../overlays/haskell/extra-pkgs/brick-0.73.nix     | 70 ++++++++++++++++++++++
 3 files changed, 72 insertions(+), 75 deletions(-)
 delete mode 100644 third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix
 create mode 100644 third_party/overlays/haskell/extra-pkgs/brick-0.73.nix

(limited to 'third_party')

diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 6116c5c339..f91cb120a8 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -58,11 +58,8 @@ in
         random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
         rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
 
-        # TODO(grfn): port to brick 1.4
-        # Breaking changes since 0.68:
-        # - handleEditorEvent takes a BrickEvent (0.72)
-        # - EventM gains an additional type argument (1.0)
-        brick = hsSelf.callPackage ./extra-pkgs/brick-0.71.1.nix { };
+        # TODO(grfn): port to brick 1.4 (EventM gains an additional type argument in 1.0)
+        brick = hsSelf.callPackage ./extra-pkgs/brick-0.73.nix { };
 
         # TODO(sterni): upstream into nixpkgs
         binary-orphans =
diff --git a/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix b/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix
deleted file mode 100644
index e49be075c6..0000000000
--- a/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ mkDerivation
-, base
-, bytestring
-, config-ini
-, containers
-, contravariant
-, data-clist
-, deepseq
-, directory
-, dlist
-, exceptions
-, filepath
-, lib
-, microlens
-, microlens-mtl
-, microlens-th
-, QuickCheck
-, stm
-, template-haskell
-, text
-, text-zipper
-, transformers
-, unix
-, vector
-, vty
-, word-wrap
-}:
-mkDerivation {
-  pname = "brick";
-  version = "0.71.1";
-  sha256 = "49701466384534b131650bec0a2b3c4811b410a3e55a392edef8d5fa6322d254";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base
-    bytestring
-    config-ini
-    containers
-    contravariant
-    data-clist
-    deepseq
-    directory
-    dlist
-    exceptions
-    filepath
-    microlens
-    microlens-mtl
-    microlens-th
-    stm
-    template-haskell
-    text
-    text-zipper
-    transformers
-    unix
-    vector
-    vty
-    word-wrap
-  ];
-  testHaskellDepends = [
-    base
-    containers
-    microlens
-    QuickCheck
-    vector
-    vty
-  ];
-  homepage = "https://github.com/jtdaugherty/brick/";
-  description = "A declarative terminal user interface library";
-  license = lib.licenses.bsd3;
-}
diff --git a/third_party/overlays/haskell/extra-pkgs/brick-0.73.nix b/third_party/overlays/haskell/extra-pkgs/brick-0.73.nix
new file mode 100644
index 0000000000..c5e2883c75
--- /dev/null
+++ b/third_party/overlays/haskell/extra-pkgs/brick-0.73.nix
@@ -0,0 +1,70 @@
+{ mkDerivation
+, base
+, bytestring
+, config-ini
+, containers
+, contravariant
+, data-clist
+, deepseq
+, directory
+, dlist
+, exceptions
+, filepath
+, lib
+, microlens
+, microlens-mtl
+, microlens-th
+, QuickCheck
+, stm
+, template-haskell
+, text
+, text-zipper
+, transformers
+, unix
+, vector
+, vty
+, word-wrap
+}:
+mkDerivation {
+  pname = "brick";
+  version = "0.73";
+  sha256 = "741c8d0717f0ab5addd5d3acc88cb36d645a0c73907bde509b2fd9d9bc02039c";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    base
+    bytestring
+    config-ini
+    containers
+    contravariant
+    data-clist
+    deepseq
+    directory
+    dlist
+    exceptions
+    filepath
+    microlens
+    microlens-mtl
+    microlens-th
+    stm
+    template-haskell
+    text
+    text-zipper
+    transformers
+    unix
+    vector
+    vty
+    word-wrap
+  ];
+  testHaskellDepends = [
+    base
+    containers
+    microlens
+    QuickCheck
+    vector
+    vty
+  ];
+  homepage = "https://github.com/jtdaugherty/brick/";
+  description = "A declarative terminal user interface library";
+  license = lib.licenses.bsd3;
+}
-- 
cgit 1.4.1