From 1d45a351c1e05a186032ac48c0b7ffac7d916744 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Sun, 29 Dec 2024 23:04:02 -0700 Subject: [PATCH] update cabal + internal + ci --- .github/workflows/haskell-ci.yml | 2 +- nonempty-vector.cabal | 14 ++++++-------- src/Data/Vector/NonEmpty/Internal.hs | 9 ++++++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b8b12aa..9e40099 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -16,7 +16,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - ghc: ['8.10', '9.0', '9.2', '9.4', '9.6', '9.8', '9.10'] + ghc: ['9.4', '9.6', '9.8', '9.10', '9.12'] include: - os: macOS-latest ghc: 'latest' diff --git a/nonempty-vector.cabal b/nonempty-vector.cabal index 178e34c..009081c 100644 --- a/nonempty-vector.cabal +++ b/nonempty-vector.cabal @@ -17,13 +17,11 @@ extra-doc-files: README.md tested-with: - GHC ==8.10.7 - || ==9.0.2 - || ==9.2.6 - || ==9.4.4 - || ==9.6.4 - || ==9.8.1 + GHC ==9.4.4 + || ==9.6.6 + || ==9.8.4 || ==9.10.1 + || ==9.12.1 source-repository head type: git @@ -36,7 +34,7 @@ library Data.Vector.NonEmpty.Mutable build-depends: - base >=4.14 && <4.21 + base >=4.16 && <4.22 , deepseq , primitive >=0.6 && <0.10 , vector >=0.12 && <0.14 @@ -50,7 +48,7 @@ test-suite tasty type: exitcode-stdio-1.0 main-is: Main.hs build-depends: - base >=4.14 && <4.21 + base >=4.16 && <4.22 , nonempty-vector , QuickCheck , tasty diff --git a/src/Data/Vector/NonEmpty/Internal.hs b/src/Data/Vector/NonEmpty/Internal.hs index 16d022e..7dbbf05 100644 --- a/src/Data/Vector/NonEmpty/Internal.hs +++ b/src/Data/Vector/NonEmpty/Internal.hs @@ -43,7 +43,9 @@ import qualified Data.Foldable1 as Foldable1 #endif import Data.Functor.Classes (Eq1, Ord1, Show1, Read1(..)) import qualified Data.Vector as V +#if __GLASGOW_HASKELL__ < 912 import Data.Typeable (Typeable) +#endif import Data.Vector.Mutable (MVector) import qualified Text.Read as Read @@ -67,7 +69,10 @@ newtype NonEmptyVector a = NonEmptyVector } deriving ( Eq, Ord , Eq1, Ord1, Show1 - , Data, Typeable, NFData + , Data, NFData +#if __GLASGOW_HASKELL__ < 912 + , Typeable +#endif , Functor, Applicative, Monad , MonadZip , Semigroup @@ -126,7 +131,9 @@ instance Traversable NonEmptyVector where -- newtype NonEmptyMVector s a = NonEmptyMVector { _nemVec :: MVector s a } +#if __GLASGOW_HASKELL__ < 912 deriving (Typeable) +#endif -- | 'NonEmptyMVector' parametrized by 'PrimState' --