From 9241d8f721085e6ba620af8528590bf55b3270d6 Mon Sep 17 00:00:00 2001 From: pdlla Date: Fri, 29 Dec 2023 22:17:02 -0800 Subject: [PATCH 01/23] bump vty to <6.2 --- ChangeLog.md | 3 +++ reflex-vty.cabal | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index d45cb7e..d4b4898 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ # Revision history for reflex-vty +## Unreleased +* bump max version for vty to latest (6.1) + ## 0.2.0.0 * _Module Reorganization_: The following modules have been added (and are all re-exported by Reflex.Vty): diff --git a/reflex-vty.cabal b/reflex-vty.cabal index d2b6aeb..1f6eb7b 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -56,7 +56,7 @@ library ref-tf >= 0.4.0 && < 0.5, reflex >= 0.8 && < 0.9, time >= 1.8.0 && < 1.10, - vty >= 5.28 && < 5.29 + vty >= 5.28 && < 6.2 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall From 1c5b80b9027901441779bae18ee2ff1987aa25cd Mon Sep 17 00:00:00 2001 From: pdlla Date: Fri, 29 Dec 2023 22:19:23 -0800 Subject: [PATCH 02/23] aoeu --- ChangeLog.md | 1 + reflex-vty.cabal | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index d4b4898..e6f6fa5 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,7 @@ ## Unreleased * bump max version for vty to latest (6.1) +* bump max version for base to latest (4.19) ## 0.2.0.0 diff --git a/reflex-vty.cabal b/reflex-vty.cabal index 1f6eb7b..fb6eed8 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -39,7 +39,7 @@ library , Reflex.Spider.Orphans , Control.Monad.NodeId build-depends: - base >= 4.10.0 && < 4.15, + base >= 4.10.0 && < 4.20, bimap >= 0.3.3 && < 0.5, containers >= 0.5.0 && < 0.7, mtl >= 2.2.2 && < 2.3, From 5b0be622ad4e59f7e8e9c3547861d22d0320fc93 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:09:58 -0800 Subject: [PATCH 03/23] aoeu --- ChangeLog.md | 3 +-- reflex-vty.cabal | 4 +++- src/Reflex/Vty/Host.hs | 8 ++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9a20dc0..829401f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,8 +1,7 @@ # Revision history for reflex-vty ## Unreleased -* bump max version for vty to latest (6.1) -* bump max version for base to latest (4.19) +* update to use latest version of vty (for cross-platform support) ## 0.5.1.0 * Change `inputInFocusedRegion` to filter mouse scroll wheel input based on if the region under than the mouse rather than using mouse drag tracking diff --git a/reflex-vty.cabal b/reflex-vty.cabal index 7f3d235..aec3239 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -59,7 +59,9 @@ library ref-tf >= 0.4.0 && < 0.6, reflex >= 0.9.2 && < 1, time >= 1.8.0 && < 1.13, - vty >= 5.28 && < 6.2 + vty >= 6.0 && < 6.2, + vty-crossplatform >= 0.1 && < 0.5, + vty-unix >= 0.1 && < 0.3 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall diff --git a/src/Reflex/Vty/Host.hs b/src/Reflex/Vty/Host.hs index d1f61f5..bd71b61 100644 --- a/src/Reflex/Vty/Host.hs +++ b/src/Reflex/Vty/Host.hs @@ -30,6 +30,7 @@ import Reflex import Reflex.Host.Class import Reflex.Spider.Orphans () import qualified Graphics.Vty as V +import qualified Graphics.Vty.Platform.Unix as V import Graphics.Vty (DisplayRegion) -- | A synonym for the underlying vty event type from 'Graphics.Vty'. This should @@ -230,5 +231,8 @@ runVtyApp app = do -- | Returns the standard vty configuration with mouse mode enabled. getDefaultVty :: IO V.Vty getDefaultVty = do - cfg <- V.standardIOConfig - V.mkVty $ cfg { V.mouseMode = Just True } + cfg <- V.userConfig + vty <- V.mkVty cfg + liftIO $ V.setMode (V.outputIface vty) V.Mouse True + return vty + From 9d2702e6701dd0c4d3055c6dd9cf8e8279697859 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:16:40 -0800 Subject: [PATCH 04/23] fix --- reflex-vty.cabal | 1 - release.nix | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/reflex-vty.cabal b/reflex-vty.cabal index aec3239..a787bc6 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -61,7 +61,6 @@ library time >= 1.8.0 && < 1.13, vty >= 6.0 && < 6.2, vty-crossplatform >= 0.1 && < 0.5, - vty-unix >= 0.1 && < 0.3 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall diff --git a/release.nix b/release.nix index 48d8eef..5cf2d3b 100644 --- a/release.nix +++ b/release.nix @@ -77,7 +77,12 @@ let } {}; vty = self.callHackageDirect { pkg = "vty"; - ver = "5.38"; + ver = "6.2"; + sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; + } {}; + vty = self.callHackageDirect { + pkg = "vty-crossplatform"; + ver = "0.4"; sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; } {}; From c46af94c71a202a4880bc26beae1690aae9d0d17 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:17:39 -0800 Subject: [PATCH 05/23] aeou --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 5cf2d3b..9a58265 100644 --- a/release.nix +++ b/release.nix @@ -80,7 +80,7 @@ let ver = "6.2"; sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; } {}; - vty = self.callHackageDirect { + vty-crossplatform = self.callHackageDirect { pkg = "vty-crossplatform"; ver = "0.4"; sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; From 6be84591f8196d71ccc2f34bef585415461a5a24 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:18:27 -0800 Subject: [PATCH 06/23] aoeu --- reflex-vty.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reflex-vty.cabal b/reflex-vty.cabal index a787bc6..36706e6 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -60,7 +60,7 @@ library reflex >= 0.9.2 && < 1, time >= 1.8.0 && < 1.13, vty >= 6.0 && < 6.2, - vty-crossplatform >= 0.1 && < 0.5, + vty-crossplatform >= 0.1 && < 0.5 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall From 9ac5c278097701e3fcc88332d5476086c9d3595a Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:21:07 -0800 Subject: [PATCH 07/23] ??? --- release.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/release.nix b/release.nix index 9a58265..90c762c 100644 --- a/release.nix +++ b/release.nix @@ -9,7 +9,12 @@ let commonOverrides = self: super: { vty = self.callHackageDirect { pkg = "vty"; - ver = "5.38"; + ver = "6.2"; + sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; + } {}; + vty-crossplatform = self.callHackageDirect { + pkg = "vty-crossplatform"; + ver = "0.4"; sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; @@ -75,16 +80,6 @@ let ver = "0.5"; sha256 = "02iyvrr7nd7fnivz78lzdchy8zw1cghqj1qx2yzbbb9869h1mny7"; } {}; - vty = self.callHackageDirect { - pkg = "vty"; - ver = "6.2"; - sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; - } {}; - vty-crossplatform = self.callHackageDirect { - pkg = "vty-crossplatform"; - ver = "0.4"; - sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; - } {}; # Jailbroken until https://github.com/audreyt/string-qq/pull/3 From f639528d28b263f6c09bf58c09a0bf7611b674c4 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:26:10 -0800 Subject: [PATCH 08/23] aoeu --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 90c762c..d3cb779 100644 --- a/release.nix +++ b/release.nix @@ -43,7 +43,7 @@ let }; }; nixGhc961 = (import ./dep/nixpkgs { inherit system; }).haskell.packages.ghc961.override { - overrides = self: super: { + overrides = self: super: commonOverrides self super // { reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; From 8fc5da61021e563c32ce5d7d9da871fbaf22698e Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:46:44 -0800 Subject: [PATCH 09/23] remov sha --- release.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/release.nix b/release.nix index d3cb779..9865185 100644 --- a/release.nix +++ b/release.nix @@ -10,12 +10,10 @@ let vty = self.callHackageDirect { pkg = "vty"; ver = "6.2"; - sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; } {}; vty-crossplatform = self.callHackageDirect { pkg = "vty-crossplatform"; ver = "0.4"; - sha256 = "0kcd3ln9xmc62ka0i7habzvjjar8z63mlvl15rdhf8hqmda0b7r7"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; From 7f395c0c4b12202c2acda37b2fc93120c090df4f Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 13:59:14 -0800 Subject: [PATCH 10/23] aoeu --- release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release.nix b/release.nix index 9865185..11d4a40 100644 --- a/release.nix +++ b/release.nix @@ -10,10 +10,12 @@ let vty = self.callHackageDirect { pkg = "vty"; ver = "6.2"; + sha256 = "0000000000000000000000000000000000000000000000000000"; } {}; vty-crossplatform = self.callHackageDirect { pkg = "vty-crossplatform"; ver = "0.4"; + sha256 = "0000000000000000000000000000000000000000000000000000"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; From 631dc7ceff54d34d6653d4dfb091d36de5626c5a Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:01:45 -0800 Subject: [PATCH 11/23] aeou --- release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index 11d4a40..0a0f7d8 100644 --- a/release.nix +++ b/release.nix @@ -9,12 +9,12 @@ let commonOverrides = self: super: { vty = self.callHackageDirect { pkg = "vty"; - ver = "6.2"; + ver = "6.1"; sha256 = "0000000000000000000000000000000000000000000000000000"; } {}; vty-crossplatform = self.callHackageDirect { pkg = "vty-crossplatform"; - ver = "0.4"; + ver = "0.4.0.0"; sha256 = "0000000000000000000000000000000000000000000000000000"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; From 689a4e1e6a71f7857bab8320b00500aa165369b3 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:05:25 -0800 Subject: [PATCH 12/23] aoeu --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 0a0f7d8..4141ac4 100644 --- a/release.nix +++ b/release.nix @@ -10,7 +10,7 @@ let vty = self.callHackageDirect { pkg = "vty"; ver = "6.1"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + sha256 = "2cefcb5764f6b662440ba9e56c30282da37071b599a7def7fc8e5679f2602bf8"; } {}; vty-crossplatform = self.callHackageDirect { pkg = "vty-crossplatform"; From 7e1f31d8beaeac12b08e086f96c9d2841d6ea242 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:06:19 -0800 Subject: [PATCH 13/23] aoeu --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 4141ac4..6aee1d7 100644 --- a/release.nix +++ b/release.nix @@ -15,7 +15,7 @@ let vty-crossplatform = self.callHackageDirect { pkg = "vty-crossplatform"; ver = "0.4.0.0"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + sha256 = "7b72e71b7a2e1a947f825a44a1fdea2e3e147944410c4286390aa4124a56358b"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; From 0ddb467037a4ea5d693099f60ea4915e1c296446 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:10:06 -0800 Subject: [PATCH 14/23] aoeu --- release.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/release.nix b/release.nix index 6aee1d7..2187e74 100644 --- a/release.nix +++ b/release.nix @@ -17,6 +17,16 @@ let ver = "0.4.0.0"; sha256 = "7b72e71b7a2e1a947f825a44a1fdea2e3e147944410c4286390aa4124a56358b"; } {}; + vty-windows = self.callHackageDirect { + pkg = "vty-windows"; + ver = "0.2.0.1"; + sha256 = "000"; + } {}; + vty-unix = self.callHackageDirect { + pkg = "vty-unix"; + ver = "0.2.0.0"; + sha256 = "000"; + } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; ghcs = lib.genAttrs supportedSystems (system: let From ef1e3b7c9c58760542e3b4b5263f754ac6e5d330 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:24:02 -0800 Subject: [PATCH 15/23] asdfaoeu --- release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index 2187e74..3cfbf7f 100644 --- a/release.nix +++ b/release.nix @@ -20,12 +20,12 @@ let vty-windows = self.callHackageDirect { pkg = "vty-windows"; ver = "0.2.0.1"; - sha256 = "000"; + sha256 = "0000000000000000000000000000000000000000000000000000"; } {}; vty-unix = self.callHackageDirect { pkg = "vty-unix"; ver = "0.2.0.0"; - sha256 = "000"; + sha256 = "0000000000000000000000000000000000000000000000000000"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; From 524c1e261b23a190e86807b6c8e2640f16a0251b Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:27:50 -0800 Subject: [PATCH 16/23] aoeu --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 3cfbf7f..7475dd4 100644 --- a/release.nix +++ b/release.nix @@ -25,7 +25,7 @@ let vty-unix = self.callHackageDirect { pkg = "vty-unix"; ver = "0.2.0.0"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + sha256 = "b03a315f1aa8f70e5e3aab36b88ed2e49cd646c56b1e34c195dae13c929ca926"; } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; From c51e3f027c091df47c7da93e4d72da61a5d61ec8 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:38:22 -0800 Subject: [PATCH 17/23] oops --- src/Reflex/Vty/Host.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Reflex/Vty/Host.hs b/src/Reflex/Vty/Host.hs index bd71b61..cccf0a8 100644 --- a/src/Reflex/Vty/Host.hs +++ b/src/Reflex/Vty/Host.hs @@ -30,7 +30,6 @@ import Reflex import Reflex.Host.Class import Reflex.Spider.Orphans () import qualified Graphics.Vty as V -import qualified Graphics.Vty.Platform.Unix as V import Graphics.Vty (DisplayRegion) -- | A synonym for the underlying vty event type from 'Graphics.Vty'. This should From 1717499db849f31ff3defaa5940ae04d9b325cda Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:44:52 -0800 Subject: [PATCH 18/23] aoeu --- src/Reflex/Vty/Host.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Reflex/Vty/Host.hs b/src/Reflex/Vty/Host.hs index cccf0a8..e235648 100644 --- a/src/Reflex/Vty/Host.hs +++ b/src/Reflex/Vty/Host.hs @@ -30,6 +30,8 @@ import Reflex import Reflex.Host.Class import Reflex.Spider.Orphans () import qualified Graphics.Vty as V +import qualified Graphics.Vty.CrossPlatform as V + import Graphics.Vty (DisplayRegion) -- | A synonym for the underlying vty event type from 'Graphics.Vty'. This should From e5b15dc571969149d8d1fe64152a4ddb4655c998 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sat, 30 Dec 2023 14:51:45 -0800 Subject: [PATCH 19/23] remove windows --- release.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release.nix b/release.nix index 7475dd4..80305e8 100644 --- a/release.nix +++ b/release.nix @@ -17,11 +17,6 @@ let ver = "0.4.0.0"; sha256 = "7b72e71b7a2e1a947f825a44a1fdea2e3e147944410c4286390aa4124a56358b"; } {}; - vty-windows = self.callHackageDirect { - pkg = "vty-windows"; - ver = "0.2.0.1"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - } {}; vty-unix = self.callHackageDirect { pkg = "vty-unix"; ver = "0.2.0.0"; From 45ae174e9a575b9636b2843478efbbbba45ed23a Mon Sep 17 00:00:00 2001 From: pdlla Date: Thu, 4 Jan 2024 20:14:52 -0800 Subject: [PATCH 20/23] bimap --- release.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release.nix b/release.nix index 80305e8..43e315b 100644 --- a/release.nix +++ b/release.nix @@ -22,6 +22,11 @@ let ver = "0.2.0.0"; sha256 = "b03a315f1aa8f70e5e3aab36b88ed2e49cd646c56b1e34c195dae13c929ca926"; } {}; + bimap = self.callHackageDirect { + pkg = "bimap"; + ver = "0.4.0"; + sha256 = "160zqqhjg48fr3a33gffd82qm3728c8hwf8sn37pbpv82fw71rzg"; + } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; ghcs = lib.genAttrs supportedSystems (system: let From d21bb169746741975dfea82e70100ce0d3906564 Mon Sep 17 00:00:00 2001 From: pdlla Date: Sun, 21 Jan 2024 08:21:49 -0800 Subject: [PATCH 21/23] remove extra bimap --- reflex-vty.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/reflex-vty.cabal b/reflex-vty.cabal index 36706e6..c7a8342 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -41,7 +41,6 @@ library , Control.Monad.NodeId build-depends: base >= 4.10.0 && < 4.20, - bimap >= 0.3.3 && < 0.5, bimap >= 0.3.3 && < 0.6, containers >= 0.5.0 && < 0.7, mtl >= 2.2.2 && < 2.4, From 023e5132a1eabb16189b2747f3162157ad64a562 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Thu, 25 Jan 2024 16:22:27 -0400 Subject: [PATCH 22/23] Fix nix build --- dep/reflex-platform/github.json | 6 +++--- release.nix | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dep/reflex-platform/github.json b/dep/reflex-platform/github.json index f23a0d2..e03dc51 100644 --- a/dep/reflex-platform/github.json +++ b/dep/reflex-platform/github.json @@ -1,8 +1,8 @@ { "owner": "reflex-frp", "repo": "reflex-platform", - "branch": "develop", + "branch": "release/1.2.0.0", "private": false, - "rev": "6c8830e059a6d2859cb1b65acefed3c2f1d216d3", - "sha256": "06kv45yq8qan0p22wzj5c9mx11ns1wddyqjr1xasjjkf6gaf0080" + "rev": "f231e2425ac92339b8491cdd970930d63d9ad1ad", + "sha256": "0b042x423p04shhidni08f47ydgpfj0rpqhb0m6gj2lg8b3s9l8k" } diff --git a/release.nix b/release.nix index 43e315b..f32d38f 100644 --- a/release.nix +++ b/release.nix @@ -1,9 +1,9 @@ { reflex-platform ? import ./dep/reflex-platform +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] }: let rp = reflex-platform {}; pkgs = rp.nixpkgs; - supportedSystems = [ "x86_64-linux" "x86_64-darwin" ]; inherit (pkgs) lib; haskellLib = pkgs.haskell.lib; commonOverrides = self: super: { @@ -22,11 +22,6 @@ let ver = "0.2.0.0"; sha256 = "b03a315f1aa8f70e5e3aab36b88ed2e49cd646c56b1e34c195dae13c929ca926"; } {}; - bimap = self.callHackageDirect { - pkg = "bimap"; - ver = "0.4.0"; - sha256 = "160zqqhjg48fr3a33gffd82qm3728c8hwf8sn37pbpv82fw71rzg"; - } {}; reflex = self.callCabal2nix "reflex" (rp.hackGet ./dep/reflex) {}; }; ghcs = lib.genAttrs supportedSystems (system: let @@ -95,7 +90,6 @@ let # Jailbroken until https://github.com/audreyt/string-qq/pull/3 string-qq = haskellLib.dontCheck super.string-qq; # Tests aren't compatible with transformers-0.6 - bimap = haskellLib.dontCheck super.bimap; exception-transformers = haskellLib.doJailbreak (haskellLib.dontCheck super.exception-transformers); }; From dada7ae7120de8d1901c171a286c15c1612df273 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Thu, 25 Jan 2024 16:26:25 -0400 Subject: [PATCH 23/23] Update changelog --- ChangeLog.md | 4 ++-- reflex-vty.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 829401f..7c452b5 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,7 +1,7 @@ # Revision history for reflex-vty -## Unreleased -* update to use latest version of vty (for cross-platform support) +## 0.5.2.0 +* Update to use latest version of vty (for cross-platform support) ## 0.5.1.0 * Change `inputInFocusedRegion` to filter mouse scroll wheel input based on if the region under than the mouse rather than using mouse drag tracking diff --git a/reflex-vty.cabal b/reflex-vty.cabal index c7a8342..27b642a 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -1,5 +1,5 @@ name: reflex-vty -version: 0.5.1.0 +version: 0.5.2.0 synopsis: Reflex FRP host and widgets for VTY applications description: Build terminal applications using functional reactive programming (FRP) with Reflex FRP ().