From 066a4e653f6e5ad626e1d43992d5be6f196b90ee Mon Sep 17 00:00:00 2001 From: sheaf Date: Sun, 4 Dec 2022 17:25:44 +0100 Subject: [PATCH] more GHC 9.4 build fixes --- MetaBrush.cabal | 4 +-- cabal.project | 47 +++++++++++++++++++++++-------- shell.nix | 11 +++++--- src/splines/Math/Bezier/Spline.hs | 1 + src/splines/Math/Linear/Solve.hs | 2 ++ src/splines/Math/Module.hs | 1 - src/splines/Math/Roots.hs | 1 + src/splines/Math/Vector2D.hs | 4 ++- 8 files changed, 52 insertions(+), 19 deletions(-) diff --git a/MetaBrush.cabal b/MetaBrush.cabal index 22232fd..7526875 100644 --- a/MetaBrush.cabal +++ b/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 diff --git a/cabal.project b/cabal.project index b3e2d7e..31b1714 100644 --- a/cabal.project +++ b/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, diff --git a/shell.nix b/shell.nix index c760631..2232801 100644 --- a/shell.nix +++ b/shell.nix @@ -1,11 +1,14 @@ -let np = import {}; -in with np; np.mkShell { packages = - [ cabal-install +let pkgs = import {}; +in with pkgs; pkgs.mkShell + { 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 ''; -} \ No newline at end of file +} diff --git a/src/splines/Math/Bezier/Spline.hs b/src/splines/Math/Bezier/Spline.hs index 33b65aa..5eb648d 100644 --- a/src/splines/Math/Bezier/Spline.hs +++ b/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 diff --git a/src/splines/Math/Linear/Solve.hs b/src/splines/Math/Linear/Solve.hs index d152ce3..be2f123 100644 --- a/src/splines/Math/Linear/Solve.hs +++ b/src/splines/Math/Linear/Solve.hs @@ -1,5 +1,7 @@ {-# LANGUAGE DataKinds #-} +{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} + module Math.Linear.Solve ( linearSolve ) where diff --git a/src/splines/Math/Module.hs b/src/splines/Math/Module.hs index dad2727..e412e6e 100644 --- a/src/splines/Math/Module.hs +++ b/src/splines/Math/Module.hs @@ -5,7 +5,6 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE UndecidableInstances #-} - module Math.Module ( Module(..), lerp , Inner(..) diff --git a/src/splines/Math/Roots.hs b/src/splines/Math/Roots.hs index 232f726..c32453f 100644 --- a/src/splines/Math/Roots.hs +++ b/src/splines/Math/Roots.hs @@ -5,6 +5,7 @@ {-# LANGUAGE PartialTypeSignatures #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} +{-# LANGUAGE TypeOperators #-} module Math.Roots where diff --git a/src/splines/Math/Vector2D.hs b/src/splines/Math/Vector2D.hs index 9fea00d..09fd634 100644 --- a/src/splines/Math/Vector2D.hs +++ b/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