diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 2399032..f24134f 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.1', '9.2.5', '9.4.5', '9.6.1', '9.8.2', '9.10.1'] + ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.1', '9.2.5', '9.4.5', '9.6.1', '9.8.2', '9.10.1', '9.12.1'] os: ['ubuntu-latest', 'macos-latest'] runs-on: ${{ matrix.os }} diff --git a/patch.cabal b/patch.cabal index 2039191..ba2b9eb 100644 --- a/patch.cabal +++ b/patch.cabal @@ -7,7 +7,7 @@ maintainer: maintainer@obsidian.systems author: Ryan Trinkle stability: Experimental tested-with: - ghc ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.5 || ==9.4.5 || ==9.6.1 || ==9.8.2 || ==9.10.1 + ghc ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.5 || ==9.4.5 || ==9.6.1 || ==9.8.2 || ==9.10.1 || ==9.12.1 ghcjs ==8.6 || ==8.10 homepage: https://obsidian.systems @@ -58,7 +58,7 @@ library default-extensions: PolyKinds ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs build-depends: - base >=4.9 && <=4.21, + base >=4.9 && <=4.22, constraints-extras >=0.3 && <0.5, commutative-semigroups >=0.0 && <0.3, containers >=0.6 && <0.8, diff --git a/src/Data/Functor/Misc.hs b/src/Data/Functor/Misc.hs index 89dfcfe..8653369 100644 --- a/src/Data/Functor/Misc.hs +++ b/src/Data/Functor/Misc.hs @@ -55,7 +55,6 @@ import qualified Data.Map as Map import Data.Some (Some, mkSome) import Data.These import Data.Type.Equality ((:~:)(Refl)) -import Data.Typeable hiding (Refl) -------------------------------------------------------------------------------- -- Const2 @@ -66,7 +65,6 @@ import Data.Typeable hiding (Refl) -- parameter data Const2 :: Type -> x -> x -> Type where Const2 :: k -> Const2 k v v - deriving (Typeable) -- | Extract the value from a Const2 unConst2 :: Const2 k v v' -> k @@ -188,7 +186,6 @@ dmapToThese m = case (DMap.lookup LeftTag m, DMap.lookup RightTag m) of data EitherTag l r a where LeftTag :: EitherTag l r l RightTag :: EitherTag l r r - deriving (Typeable) deriving instance Show (EitherTag l r a) deriving instance Eq (EitherTag l r a)