Skip to content

Commit

Permalink
Support GHC 9.12
Browse files Browse the repository at this point in the history
GHC 9.12 uses base 4.21 and ghc-prim 0.13; I also

When compiling with GHC 9.12.1, I got GHC-90584. I'm not a Haskell
programmer, so I made the simplest changes that could work — I don't
know how one would make the `deriving Typeable` conditional based on
GHC version or if there would be some other way to do that.
  • Loading branch information
halostatue committed Jan 23, 2025
1 parent c4812e2 commit 16adc81
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/packcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ jobs:
fail-fast: false
matrix:
name:
- 9.12.1
- 9.10.1
- 9.8.1
- 9.6.3
Expand All @@ -100,6 +101,12 @@ jobs:
- 8.2.2
- 8.0.2
include:
- name: 9.12.1
ghc-version: 9.12.1
command: cabal-v2
runner: ubuntu-latest
cabal-version: 3.14.1.1

- name: 9.10.1
ghc-version: 9.10.1
command: cabal-v2
Expand Down
4 changes: 1 addition & 3 deletions Data/Unicode/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ module Data.Unicode.Types
NormalizationMode(..)
) where

import Data.Typeable (Typeable)

-- |
-- Normalization transforms Unicode text into an equivalent
-- composed or decomposed form, allowing for easier sorting and
Expand Down Expand Up @@ -95,4 +93,4 @@ data NormalizationMode
| NFKD -- ^ Compatibility decomposition.
| NFC -- ^ Canonical decomposition followed by canonical composition.
| NFKC -- ^ Compatibility decomposition followed by canonical composition.
deriving (Eq, Show, Enum, Typeable)
deriving (Eq, Show, Enum)
4 changes: 2 additions & 2 deletions unicode-transforms.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ library
hs-source-dirs: .
ghc-options: -Wall -fwarn-identities -fwarn-incomplete-record-updates -fwarn-incomplete-uni-patterns -fwarn-tabs
build-depends:
base >= 4.8 && < 4.21
base >= 4.8 && < 4.22
, unicode-data >= 0.2 && < 0.7
, bytestring >= 0.9 && < 0.13
, ghc-prim >= 0.2 && < 0.12
, ghc-prim >= 0.2 && < 0.14

-- We depend on a lot of internal modules in text. We keep the upper bound
-- inclusive of the latest stable version.
Expand Down

0 comments on commit 16adc81

Please sign in to comment.