more GHC 9.4 build fixes

MetaBrush.cabal

@@ -32,7 +32,7 @@ common common
 
     build-depends:
         base
-           >= 4.16    && < 4.18
+           >= 4.17    && < 4.18
       , acts
           ^>= 0.3.1.0
       , containers
@@ -44,7 +44,7 @@ common common
       , groups
           ^>= 0.5.3
       , groups-generic
-          ^>= 0.3
+          ^>= 0.3.1.0
       , primitive
           ^>= 0.7.1.0
       , transformers

cabal.project

@@ -3,23 +3,27 @@ packages: .
 constraints:
   acts -finitary
 
-allow-newer:
-  digit:lens,
-  hoist-error:base,
-  natural:lens,
-  prim-instances:base,
-  records-sop:ghc-prim,
-  waargonaut:lens, waargonaut:records-sop, waargonaut:text, waargonaut:witherable
-
 -- Fix a severe bug in Waargonaut (no corresponding Hackage release???)
 source-repository-package
   type: git
   location: https://github.com/haskell-waargonaut/waargonaut
   tag: 5f838582a8c5aae1a198ecd4958729e53a6b03cf
 
------------------------------
+-------------
--- GHC 9.2 support patches --
+-- GHC 9.2 --
------------------------------
+-------------
+
+allow-newer:
+  digit:lens,
+  hedgehog:resourcet,
+  hoist-error:base,
+  natural:lens,
+  prim-instances:base,
+  records-sop:ghc-prim,
+  waargonaut:base, waargonaut:lens,
+  waargonaut:records-sop,
+  waargonaut:semigroups, waargonaut:text,
+  waargonaut:vector, waargonaut:witherable,
 
 -- eigen
 source-repository-package
@@ -32,3 +36,24 @@ source-repository-package
   type: git
   location: https://github.com/kosmikus/records-sop
   tag: abab99b4b870fce55e81dd03d4e41fb50502ca4e
+
+-------------
+-- GHC 9.4 --
+-------------
+
+-- hw-balancedparens
+source-repository-package
+  type: git
+  location: https://github.com/sheaf/hw-balancedparens
+  tag: 747e4ce2145b436dd352814b71a68fc41fe63e6f
+
+-------------
+-- GHC 9.6 --
+-------------
+
+allow-newer:
+  attoparsec:ghc-prim,
+  generics-sop:base, generics-sop:ghc-prim,
+  hw-prim:ghc-prim,
+  integer-logarithms:ghc-prim,
+  vector-stream:base, vector-stream:ghc-prim,

shell.nix

@@ -1,11 +1,14 @@
-let np = import <nixpkgs> {};
+let pkgs = import <nixpkgs> {};
-in with np; np.mkShell { packages =
+in with pkgs; pkgs.mkShell
-  [ cabal-install
+  { packages =
+  [ haskell.packages.ghc943.ghc
+    cabal-install
     zlib
     pkg-config
     gobject-introspection
     gtk4
     pcre
+    pcre2
     cairo
     glib
     atk
@@ -27,4 +30,4 @@ in with np; np.mkShell { packages =
     export LC_ALL=C.UTF-8
     export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk4}/share/gsettings-schemas/${gtk4.name}:$XDG_DATA_DIRS
   '';
-}
+}

src/splines/Math/Bezier/Spline.hs

@@ -18,6 +18,7 @@
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TypeApplications           #-}
 {-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE UndecidableInstances       #-}
 
 module Math.Bezier.Spline where

src/splines/Math/Linear/Solve.hs

@@ -1,5 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+
 module Math.Linear.Solve
   ( linearSolve )
   where

src/splines/Math/Module.hs

@@ -5,7 +5,6 @@
 {-# LANGUAGE TypeApplications       #-}
 {-# LANGUAGE UndecidableInstances   #-}
 
-
 module Math.Module
   ( Module(..), lerp
   , Inner(..)

src/splines/Math/Roots.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE PartialTypeSignatures #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE TypeApplications      #-}
+{-# LANGUAGE TypeOperators         #-}
 
 module Math.Roots where
 

src/splines/Math/Vector2D.hs

@@ -22,7 +22,9 @@ module Math.Vector2D
 import Data.Monoid
   ( Sum(..) )
 import GHC.Generics
-
+  ( Generic, Generic1
+  , Generically(..), Generically1(..)
+  )
 
 -- acts
 import Data.Act