Skip to content

Commit 2c326b9

Browse files
committed
Compatibility with GHC 9.8 and 9.10
1 parent cb98924 commit 2c326b9

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

.github/workflows/haskell.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [macos-latest, ubuntu-latest]
16-
cabal: ["3.8"]
17-
ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.6", "9.4.4"]
16+
cabal: ["3.12"]
17+
ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.6", "9.8.4", "9.10.1"]
1818

1919
runs-on: ${{ matrix.os }}
2020

2121
steps:
22-
- uses: actions/checkout@v3
23-
- uses: haskell/actions/setup@v2
22+
- uses: actions/checkout@v4
23+
- uses: haskell-actions/setup@v2
2424
id: setup-haskell-cabal
2525
with:
2626
ghc-version: ${{ matrix.ghc }}
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
cabal v2-update
3131
cabal v2-freeze $CONFIG
32-
- uses: actions/cache@v2.1.5
32+
- uses: actions/cache@v4
3333
with:
3434
path: |
3535
${{ steps.setup-haskell-cabal.outputs.cabal-store }}

src/Data/Thyme/TrueName.hs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ decNames dec = case dec of
6565
PatSynSigD _name typ -> typNames typ
6666
#endif
6767

68-
#if MIN_VERSION_template_haskell(2,8,0)
68+
#if MIN_VERSION_template_haskell(2,22,0)
69+
InfixD _ _ _ -> []
70+
#elif MIN_VERSION_template_haskell(2,8,0)
6971
InfixD _ _ -> []
7072
#endif
7173

@@ -123,6 +125,11 @@ decNames dec = case dec of
123125
ImplicitParamBindD _ _ -> []
124126
#endif
125127

128+
#if MIN_VERSION_template_haskell(2,22,0)
129+
TypeDataD _ _ _ _ -> []
130+
DefaultD _ -> []
131+
#endif
132+
126133
{- }}} -}
127134

128135
datatypeNames :: Cxt -> [Con] -> [Name]

thyme.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ library
9797
old-locale >= 1.0,
9898
random,
9999
text >= 0.11,
100-
template-haskell >= 2.7 && < 2.21,
100+
template-haskell >= 2.7 && < 2.23,
101101
time >= 1.4,
102102
vector >= 0.9,
103103
vector-th-unbox >= 0.2.1.0,

0 commit comments

Comments
 (0)