Support for ghc 9.4

Author: ali-abrar

.github/workflows/haskell.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7']
+        ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.4.3']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
@@ -17,7 +17,7 @@ jobs:
       with:
         ghc-version: ${{ matrix.ghc }}
     - name: Cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       env:
         cache-name: cache-cabal
       with:
@@ -30,9 +30,7 @@ jobs:
           ${{ runner.os }}
 
     - name: Install dependencies
-      run: |
-        cabal update
-        cabal build --only-dependencies --enable-tests --enable-benchmarks
+      run: cabal build --only-dependencies --enable-tests --enable-benchmarks
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests

nixpkgs/default.nix

@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)

nixpkgs/github.json

@@ -0,0 +1,8 @@
+{
+  "owner": "NixOS",
+  "repo": "nixpkgs",
+  "branch": "nixpkgs-unstable",
+  "private": false,
+  "rev": "e37ef84b478fa8da0ced96522adfd956fde9047a",
+  "sha256": "03qak39mn2142gp6zglrzrkdbig6h4r3da1psmvf3q2dwcw3zsfv"
+}

nixpkgs/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+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 (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);
+in fetch json

reflex-vty.cabal

@@ -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.7
+  GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.4.3
 
 source-repository head
   type: git
@@ -39,23 +39,23 @@ library
                  , Reflex.Spider.Orphans
                  , Control.Monad.NodeId
   build-depends:
-    base >= 4.10.0 && < 4.16,
+    base >= 4.10.0 && < 4.18,
     bimap >= 0.3.3 && < 0.5,
     containers >= 0.5.0 && < 0.7,
     mtl >= 2.2.2 && < 2.3,
     transformers >= 0.5.5 && < 0.6,
     stm >= 2.4 && < 2.6,
     data-default >= 0.7.1 && < 0.8,
     dependent-map >= 0.4 && < 0.5,
-    text >= 1.2.3 && < 1.3,
+    text >= 1.2.3 && < 2.1,
     dependent-sum >= 0.7 && < 0.8,
     exception-transformers >= 0.4.0 && < 0.5,
     mmorph >= 1.1 && < 1.2,
     ordered-containers >= 0.2.2 && < 0.3,
     primitive >= 0.6.3 && < 0.8,
     ref-tf >= 0.4.0 && < 0.6,
-    reflex >= 0.8 && < 0.9,
-    time >= 1.8.0 && < 1.10,
+    reflex >= 0.8 && < 1,
+    time >= 1.8.0 && < 1.13,
     vty >= 5.28 && < 5.38
   hs-source-dirs: src
   default-language: Haskell2010
@@ -88,6 +88,7 @@ library
     TemplateHaskell
     TupleSections
     TypeApplications
+    TypeOperators
     TypeFamilies
 
 executable example

release.nix

@@ -1,17 +1,44 @@
-{ reflex-platform ? import ./reflex-platform {}
+{ reflex-platform ? import ./reflex-platform
 }:
-let inherit (reflex-platform.nixpkgs.haskell) lib;
-    ghc = reflex-platform.ghc.override {
-      overrides = self: super: {
-        vty = self.callHackageDirect {
-          pkg = "vty";
-          ver = "5.37";
-          sha256 = "01ppspii5x02iik9rxkf2idi6r9ngax6w3mqi6d8qj765w3cksiq";
+let
+  pkgs = (reflex-platform {}).nixpkgs;
+  supportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
+  inherit (pkgs) lib;
+  commonOverrides = self: super: {
+    vty = self.callHackageDirect {
+      pkg = "vty";
+      ver = "5.37";
+      sha256 = "01ppspii5x02iik9rxkf2idi6r9ngax6w3mqi6d8qj765w3cksiq";
+    } {};
+  };
+in
+  lib.genAttrs supportedSystems (system: let
+    rp = reflex-platform { inherit system; __useNewerCompiler = true; };
+    rpGhc = rp.ghc.override {
+      overrides = commonOverrides;
+    };
+    nixGhc = (import ./nixpkgs { inherit system; }).haskell.packages.ghc943.override {
+      overrides = self: super: commonOverrides self super // {
+        hlint = self.callHackageDirect {
+          pkg = "hlint";
+          ver = "3.5";
+          sha256 = "1np43k54918v54saqqgnd82ccd6225njwxpg2031asi70jam80x9";
+        } {};
+        patch = self.callHackageDirect {
+          pkg = "patch";
+          ver = "0.0.8.1";
+          sha256 = "0q5rxnyilhbnfph48fnxbclggsbbhs0pkn0kfiadm0hmfr440cgk";
         } {};
+        reflex = self.callHackageDirect {
+          pkg = "reflex";
+          ver = "0.9.0.0";
+          sha256 = "0ibashkz3ifwxa61zg3fwamvjwv125l7jhjd74kgjbq13zpx23ib";
+        } {};
+        string-qq = pkgs.haskell.lib.dontCheck super.string-qq;
       };
     };
-in
-{
-  reflex-vty =
-    ghc.callCabal2nix "reflex-vty" ./. {};
-}
+  in
+  {
+    ghc810 = rpGhc.callCabal2nix "reflex-vty" (import ./src.nix) {};
+    ghc943 = nixGhc.callCabal2nix "reflex-vty" (import ./src.nix) {};
+  })

shell.nix

@@ -1 +1,16 @@
-(import ./release.nix {}).reflex-vty.env
+# Enter a shell for this project using reflex-platform (which provides ghc8107)
+# or nixpkgs (which provides ghc943)
+{ compiler ? "ghc810" # or "ghc943"
+}:
+let pkgs = (import ./reflex-platform { }).nixpkgs;
+in
+  pkgs.mkShell {
+    name = "shell-${compiler}";
+    buildInputs = [
+      pkgs.cabal-install
+      pkgs.ghcid
+    ];
+    inputsFrom = [
+      (import ./release.nix {}).${builtins.currentSystem}.${compiler}.env
+    ];
+  }

src.nix

@@ -0,0 +1,8 @@
+builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
+  "release.nix"
+  ".git"
+  "dist"
+  "cabal.haskell-ci"
+  "cabal.project"
+  ".travis.yml"
+])) ./.

src/Reflex/Vty/Widget.hs

@@ -9,7 +9,7 @@ module Reflex.Vty.Widget where
 import Control.Applicative (liftA2)
 import Control.Monad.Fix (MonadFix)
 import Control.Monad.IO.Class (MonadIO)
-import Control.Monad.Morph
+import Control.Monad.Morph (MFunctor(..))
 import Control.Monad.NodeId
 import Control.Monad.Reader (ReaderT, ask, local, runReaderT)
 import Control.Monad.Ref