From 6aea4cd874775d01cb15a99cc486c9ee6e88dcf3 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Tue, 31 Dec 2019 10:35:16 -0500 Subject: [PATCH 1/4] Fix for reflex-0.6.3 --- ChangeLog.md | 1 + src/Reflex/Spider/Orphans.hs | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 99a0a31..4b464cd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,7 @@ ## Unreleased * Add `keyCombo` function (single-key-combination version of `keyCombos`) +* Use upstream `NotReady` instances instead of orphans defined in this package if reflex-0.6.3 is available ## 0.1.2.0 * Allow TextZipper contents to be tranformed before being displayed diff --git a/src/Reflex/Spider/Orphans.hs b/src/Reflex/Spider/Orphans.hs index 9a01631..2b5209a 100644 --- a/src/Reflex/Spider/Orphans.hs +++ b/src/Reflex/Spider/Orphans.hs @@ -2,15 +2,17 @@ Module: Reflex.Spider.Orphans Description: Orphan instances for SpiderTimeline and SpiderHost -} +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module Reflex.Spider.Orphans where +#if MIN_VERSION_reflex(0,6,3) +#else import Reflex import Reflex.Spider.Internal --- TODO move this to reflex instance NotReady (SpiderTimeline x) (SpiderHost x) where notReadyUntil _ = pure () notReady = pure () @@ -18,3 +20,4 @@ instance NotReady (SpiderTimeline x) (SpiderHost x) where instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where notReadyUntil _ = pure () notReady = pure () +#endif From 1973b7cd913b555e455704e5f9085481558c70c4 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 10 Jan 2020 12:12:42 -0500 Subject: [PATCH 2/4] cabal: Add missing copyright --- reflex-vty.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/reflex-vty.cabal b/reflex-vty.cabal index b37c651..ef5b701 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -10,6 +10,7 @@ license: BSD3 license-file: LICENSE author: Obsidian Systems LLC maintainer: maintainer@obsidian.systems +copyright: 2020 Obsidian Systems LLC category: FRP build-type: Simple cabal-version: >=1.18 From 7b578ecc57877e38ce4d0e53167c6efd5c351ba0 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 10 Jan 2020 14:19:01 -0500 Subject: [PATCH 3/4] Version 0.1.2.1 --- reflex-vty.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reflex-vty.cabal b/reflex-vty.cabal index ef5b701..18360b4 100644 --- a/reflex-vty.cabal +++ b/reflex-vty.cabal @@ -1,5 +1,5 @@ name: reflex-vty -version: 0.1.2.0 +version: 0.1.2.1 synopsis: Reflex FRP host and widgets for vty applications description: Host and widget library for Reflex-based FRP applications From ff45af555674c96287e6273af29ee2f4d071eaf4 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 10 Jan 2020 14:22:19 -0500 Subject: [PATCH 4/4] Fix changelog --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 4b464cd..acb638c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,6 @@ # Revision history for reflex-vty -## Unreleased +## 0.1.2.1 * Add `keyCombo` function (single-key-combination version of `keyCombos`) * Use upstream `NotReady` instances instead of orphans defined in this package if reflex-0.6.3 is available