Skip to content

Commit a32c6ae

Browse files
committed
Support building with GHC 9.4
This contains a handful of small tweaks needed to make the libraries in the `dismantle` repo build with GHC 9.4: * I have bumped the upper version bounds on `text` to allow building with `text-2.0.*`, which is bundled with GHC 9.4. * GHC 9.4 is pickier about undecidable instance checking. See [this section](https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.4?version_id=24540b698481cf2b0bd11029b58eaddc0fbfbb31#stricter-undecidableinstances-checking) of the GHC 9.4 Migration Guide. As a result, I had to explicitly enable `UndecidableInstances` in `Data.BitMask` to make it compile. * I have bumped the `parameterized-utils` submodule to bring in the changes from GaloisInc/parameterized-utils#146, which is needed to make it build with GHC 9.4.
1 parent 48433e7 commit a32c6ae

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

dismantle-arm-xml/src/Data/BitMask.hs

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ a lookup will retrieve all elements with a key that matches the provided mask.
3232
{-# LANGUAGE KindSignatures #-}
3333
{-# LANGUAGE MultiParamTypeClasses #-}
3434
{-# LANGUAGE ConstraintKinds #-}
35+
{-# LANGUAGE UndecidableInstances #-}
3536

3637
module Data.BitMask
3738
(

dismantle-tablegen/dismantle-tablegen.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ library
6666
hashable,
6767
unordered-containers,
6868
zlib >= 0.6 && < 0.7,
69-
text >= 1 && < 2,
69+
text >= 1 && < 2.1,
7070
vector,
7171
tasty >= 0.10,
7272
tasty-hunit,

0 commit comments

Comments
 (0)