Merge pull request #61 from reflex-frp/aa/bump-vty-5.37

Build against vty-5.37

Author: cgibbard

.github/workflows/haskell.yml

@@ -6,14 +6,14 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
+        ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
     - name: Cache

ChangeLog.md

@@ -1,5 +1,9 @@
 # Revision history for reflex-vty
 
+## 0.3.1.0
+
+* Replace `mempty` with `defAttr` for Attr from Graphics.Vty to make it compatible with vty-5.34
+
 ## 0.3.0.0
 
 * Re-design `textInput`, `TextInput` and `TextInputConfig`.

reflex-platform/github.json

@@ -3,6 +3,6 @@
   "repo": "reflex-platform",
   "branch": "develop",
   "private": false,
-  "rev": "f019863c21ee85498e6a6e0072e617b2462b70ed",
-  "sha256": "146xfjqdwd55s9jg1ggi6akcxxxd5c0pvc4bpjx3whwiikpcv8y4"
+  "rev": "6c8830e059a6d2859cb1b65acefed3c2f1d216d3",
+  "sha256": "06kv45yq8qan0p22wzj5c9mx11ns1wddyqjr1xasjjkf6gaf0080"
 }

reflex-platform/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

reflex-vty.cabal

@@ -1,5 +1,5 @@
 name: reflex-vty
-version: 0.3.0.0
+version: 0.3.1.0
 synopsis: Reflex FRP host and widgets for VTY applications
 description:
   Build terminal applications using functional reactive programming (FRP) with Reflex FRP (<https://reflex-frp.org>).
@@ -18,7 +18,7 @@ extra-source-files:
   ChangeLog.md
 extra-doc-files: doc/tasks.png
 tested-with:
-  GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
+  GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7
 
 source-repository head
   type: git
@@ -56,7 +56,7 @@ library
     ref-tf >= 0.4.0 && < 0.6,
     reflex >= 0.8 && < 0.9,
     time >= 1.8.0 && < 1.10,
-    vty >= 5.28 && < 5.34
+    vty >= 5.28 && < 5.38
   hs-source-dirs: src
   default-language: Haskell2010
   ghc-options: -Wall

release.nix

@@ -3,10 +3,11 @@
 let inherit (reflex-platform.nixpkgs.haskell) lib;
     ghc = reflex-platform.ghc.override {
       overrides = self: super: {
-        vty = self.callHackage "vty" "5.28" {};
-        ansi-terminal = self.callHackage "ansi-terminal" "0.10.3" {};
-        ansi-wl-pprint = self.callHackage "ansi-wl-pprint" "0.6.9" {};
-        test-framework = lib.doJailbreak super.test-framework;
+        vty = self.callHackageDirect {
+          pkg = "vty";
+          ver = "5.37";
+          sha256 = "01ppspii5x02iik9rxkf2idi6r9ngax6w3mqi6d8qj765w3cksiq";
+        } {};
       };
     };
 in

src/Reflex/Vty/Widget/Input.hs

@@ -14,6 +14,7 @@ import Reflex.Vty.Widget.Input.Text as Export
 import Control.Monad (join)
 import Control.Monad.Fix (MonadFix)
 import Data.Default (Default(..))
+import Data.List (foldl')
 import Data.Text (Text)
 import qualified Graphics.Vty as V
 import Reflex
@@ -144,15 +145,19 @@ checkbox cfg v0 = do
     , not <$ space
     , const <$> _checkboxConfig_setValue cfg
     ]
-  let bold = V.withStyle V.defAttr V.bold
-  depressed <- hold V.defAttr $ leftmost
-    [ bold <$ md
-    , V.defAttr <$ mu
+  depressed <- hold V.defaultStyleMask $ leftmost
+    [ V.bold <$ md
+    , V.defaultStyleMask <$ mu
     ]
-  let focused = ffor (current f) $ \x -> if x then bold else V.defAttr
-  let attrs = mconcat <$> sequence [_checkboxConfig_attributes cfg, depressed, focused]
+  let focused = ffor (current f) $ \x -> if x then V.bold else V.defaultStyleMask
+  let attrs = combineStyles
+        <$> _checkboxConfig_attributes cfg
+        <*> sequence [depressed, focused]
   richText (RichTextConfig attrs) $ join . current $ ffor v $ \checked ->
     if checked
       then _checkboxStyle_checked <$> _checkboxConfig_checkboxStyle cfg
       else _checkboxStyle_unchecked <$> _checkboxConfig_checkboxStyle cfg
   return v
+  where
+    combineStyles :: V.Attr -> [V.Style] -> V.Attr
+    combineStyles x xs = foldl' V.withStyle x xs