From 98c650d5e9102207feccda36eb85d5f657554c21 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 29 Apr 2024 10:22:37 +0100 Subject: [PATCH 1/5] Switch from haskell/actions to haskell-actions "As of 2023-09-09, haskell/action/setup is no longer maintained, please switch to haskell-actions/setup (note: dash for slash)." --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50863d8..2438882 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main' - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2.7 name: Setup Haskell with: ghc-version: ${{ matrix.ghc }} From c0916a875ed2b04ff1999f4a1a98572c9c9005c8 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 29 Apr 2024 10:14:00 +0100 Subject: [PATCH 2/5] Fix spelling --- src/Extensions/Cabal.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Extensions/Cabal.hs b/src/Extensions/Cabal.hs index 824a528..aa44545 100644 --- a/src/Extensions/Cabal.hs +++ b/src/Extensions/Cabal.hs @@ -395,7 +395,7 @@ toGhcExtension = \case #endif #if __GLASGOW_HASKELL__ >= 910 -- This branch cannot be satisfied yet but we're including it so - -- we don't forget to enablel RequiredTypeArguments when it + -- we don't forget to enable RequiredTypeArguments when it -- becomes available. Cabal.RequiredTypeArguments -> Just RequiredTypeArguments #else From ae41312b28aadb39721c630b17c219938778217f Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 29 Apr 2024 10:14:05 +0100 Subject: [PATCH 3/5] Support up to GHC 9.8 and Cabal 3.12 (only) --- extensions.cabal | 2 +- src/Extensions/Cabal.hs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/extensions.cabal b/extensions.cabal index 79a4623..8f6aa47 100644 --- a/extensions.cabal +++ b/extensions.cabal @@ -93,7 +93,7 @@ library -- this causes problems in practice let's -- revisit this decision and come up with -- another approach. - , Cabal ^>= 3.10 + , Cabal ^>= 3.12 , containers ^>= 0.6 , directory ^>= 1.3 , filepath ^>= 1.4 diff --git a/src/Extensions/Cabal.hs b/src/Extensions/Cabal.hs index aa44545..a83d44e 100644 --- a/src/Extensions/Cabal.hs +++ b/src/Extensions/Cabal.hs @@ -393,13 +393,22 @@ toGhcExtension = \case Cabal.DeepSubsumption -> Nothing Cabal.TypeData -> Nothing #endif +#if __GLASGOW_HASKELL__ >= 908 + Cabal.TypeAbstractions -> Just TypeAbstractions +#else + Cabal.TypeAbstractions -> Nothing +#endif #if __GLASGOW_HASKELL__ >= 910 -- This branch cannot be satisfied yet but we're including it so -- we don't forget to enable RequiredTypeArguments when it -- becomes available. Cabal.RequiredTypeArguments -> Just RequiredTypeArguments + Cabal.ExtendedLiterals -> Just ExtendedLiterals + Cabal.ListTuplePuns -> Just ListTuplePuns #else Cabal.RequiredTypeArguments -> Nothing + Cabal.ExtendedLiterals -> Nothing + Cabal.ListTuplePuns -> Nothing #endif -- GHC extensions, parsed by both Cabal and GHC, but don't have an Extension constructor Cabal.Safe -> Nothing From aa016cdfb69b55455cf9a2d0b31c45c1ba47923d Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 29 Apr 2024 10:13:03 +0100 Subject: [PATCH 4/5] Add workflow_dispatch --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2438882..15e1727 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: pull_request: push: branches: [main] + workflow_dispatch: jobs: build: From 92bb47316db0282e2fde22a4bb0d1e596fbbbc74 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Mon, 29 Apr 2024 10:24:30 +0100 Subject: [PATCH 5/5] version 0.1.0.2 --- CHANGELOG.md | 6 ++++++ extensions.cabal | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60cfd66..d4504b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ `extensions` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.1.0.2 — Apr 29, 2024 + +* Add support for GHC-9.8 + +* Support `Cabal` `3.12` (only) + ## 0.1.0.1 — Oct 15, 2023 * Add support for GHC-9.6 diff --git a/extensions.cabal b/extensions.cabal index 8f6aa47..2ef6017 100644 --- a/extensions.cabal +++ b/extensions.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: extensions -version: 0.1.0.1 +version: 0.1.0.2 synopsis: Parse Haskell Language Extensions description: Parse Haskell Language Extensions. See [README.md](https://github.com/kowainik/extensions#extensions) for more details.