Skip to content

Commit

Permalink
Add GHC 9.8 support and stack.yaml files for 9.8.1, 9.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjm committed Jan 26, 2024
1 parent b834e60 commit 517f14b
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/aeson-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- "9.2.8"
- "9.4.7"
- "9.6.3"
- "9.8.1"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -71,7 +72,9 @@ jobs:
- ghc: "9.4.7"
yaml: "stack-9.4.7.yaml"
- ghc: "9.6.3"
yaml: "stack.yaml"
yaml: "stack-9.6.3.yaml"
- ghc: "9.8.1"
yaml: "stack-9.8.1.yaml"

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

* GHC 9.8 support

## 0.6.2.0

* Expose generic type constructors `T4` through `T10`. (We only exposed `T`, `T1`, `T2`, and `T3` before.)
Expand Down
4 changes: 3 additions & 1 deletion src/Data/Aeson/TypeScript/Transform.hs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ transformTypeFamilies eo@(ExtraTypeScriptOptions {..}) (AppT (ConT name) typ)
name' <- lift $ newName (nameBase typeFamilyName <> "'")

f <- lift $ newName "f"
#if MIN_VERSION_template_haskell(2,17,0)
#if MIN_VERSION_template_haskell(2,21,0)
let inst1 = DataD [] name' [PlainTV f BndrReq] Nothing [] []
#elif MIN_VERSION_template_haskell(2,17,0)
let inst1 = DataD [] name' [PlainTV f ()] Nothing [] []
#else
let inst1 = DataD [] name' [PlainTV f] Nothing [] []
Expand Down
5 changes: 5 additions & 0 deletions stack-9.6.3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

resolver: lts-22.6

packages:
- .
12 changes: 12 additions & 0 deletions stack-9.6.3.yaml.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was autogenerated by Stack.
# You should not edit this file by hand.
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files

packages: []
snapshots:
- completed:
sha256: 1b4c2669e26fa828451830ed4725e4d406acc25a1fa24fcc039465dd13d7a575
size: 714100
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/6.yaml
original: lts-22.6
5 changes: 5 additions & 0 deletions stack-9.8.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

resolver: nightly-2024-01-26

packages:
- .
12 changes: 12 additions & 0 deletions stack-9.8.1.yaml.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was autogenerated by Stack.
# You should not edit this file by hand.
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files

packages: []
snapshots:
- completed:
sha256: 876a5c75d90718add42e1ad36d66000bf35050ce1c66748119897a32df613186
size: 563963
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/1/26.yaml
original: nightly-2024-01-26
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

resolver: nightly-2023-11-14
resolver: lts-22.6

packages:
- .
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: 0eaacfc9de6b0ab46ab6026166d2ba7718ab06a8612086b3ee21d7667e682df0
size: 698974
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/11/14.yaml
original: nightly-2023-11-14
sha256: 1b4c2669e26fa828451830ed4725e4d406acc25a1fa24fcc039465dd13d7a575
size: 714100
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/6.yaml
original: lts-22.6

0 comments on commit 517f14b

Please sign in to comment.