diff options
| -rw-r--r-- | third_party/overlays/haskell/default.nix | 7 | ||||
| -rw-r--r-- | third_party/overlays/haskell/extra-pkgs/brick-0.73.nix (renamed from third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix) | 4 | ||||
| -rw-r--r-- | users/grfn/xanthous/src/Xanthous/App/Prompt.hs | 2 |
3 files changed, 5 insertions, 8 deletions
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.73.nix index e49be075c6..c5e2883c75 100644 --- a/third_party/overlays/haskell/extra-pkgs/brick-0.71.1.nix +++ b/third_party/overlays/haskell/extra-pkgs/brick-0.73.nix @@ -27,8 +27,8 @@ }: mkDerivation { pname = "brick"; - version = "0.71.1"; - sha256 = "49701466384534b131650bec0a2b3c4811b410a3e55a392edef8d5fa6322d254"; + version = "0.73"; + sha256 = "741c8d0717f0ab5addd5d3acc88cb36d645a0c73907bde509b2fd9d9bc02039c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/users/grfn/xanthous/src/Xanthous/App/Prompt.hs b/users/grfn/xanthous/src/Xanthous/App/Prompt.hs index 799281a1c2..f9ee9fe168 100644 --- a/users/grfn/xanthous/src/Xanthous/App/Prompt.hs +++ b/users/grfn/xanthous/src/Xanthous/App/Prompt.hs @@ -55,7 +55,7 @@ handlePromptEvent _ (Prompt _ SConfirm _ _ _) (VtyEvent (EvKey (KChar 'n') [])) handlePromptEvent msg (Prompt c SStringPrompt (StringPromptState edit) pri cb) - (VtyEvent ev) + ev = do edit' <- lift $ handleEditorEvent ev edit let prompt' = Prompt c SStringPrompt (StringPromptState edit') pri cb |