git.iko.soy/typeable/haskell-stack-trace-plugin
on master help sign in
Allow ghc-9.0.1
commit2ab07fb3afb4985d6eaa418dd071505df4b2bd7a authorwaddlaw <ingronze@gmail.com> dateFri 21 May 2021, 15:42 (5 years ago) parent093a052
4 files changed+15−4
compare with master
unifiedsplit
.github/workflows/cabal.yml+1−1 CHANGELOG.md+1 haskell-stack-trace-plugin.cabal+4−3 src/StackTrace/Plugin.hs+9
.github/workflows/cabal.yml+1−1
@@ -13,7 +13,7 @@ jobs:
1313 runs-on: ubuntu-18.04
1414 strategy:
1515 matrix:
16− ghc: ["8.6", "8.8", "8.10"]
16+ ghc: ["8.6", "8.8", "8.10", "9.0"]
1717 cabal: ["3.2"]
1818 cache-version: ["2021-05-21"]
1919
CHANGELOG.md+1
@@ -5,6 +5,7 @@
55## 0.1.2.0 -- 2021-05-21
66
77- Added support for GHC 8.10 [#7](https://github.com/waddlaw/haskell-stack-trace-plugin/pull/7) (@etorreborre)
8+- Added support for GHC 9.0 @waddlaw
89
910## 0.1.1.1 -- 2020-01-18
1011
haskell-stack-trace-plugin.cabal+4−3
@@ -20,7 +20,7 @@ extra-source-files:
2020 CHANGELOG.md
2121 Readme.md
2222
23−tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4
23+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1
2424
2525source-repository head
2626 type: git
@@ -32,19 +32,20 @@ flag dev
3232 default: False
3333
3434common common-opts
35− build-depends: base >=4.12 && <4.15
35+ build-depends: base >=4.12 && <4.16
3636 default-language: Haskell2010
3737
3838library
3939 import: common-opts
4040 hs-source-dirs: src
41− build-depends: ghc ^>=8.6 || ^>=8.8 || ^>=8.10
41+ build-depends: ghc ^>=8.6 || ^>=8.8 || ^>=8.10 || ^>=9.0
4242 exposed-modules: StackTrace.Plugin
4343
4444 if flag(dev)
4545 ghc-options:
4646 -Wall -Werror -Wcompat -Wincomplete-uni-patterns
4747 -Wnoncanonical-monad-instances -Wno-missing-home-modules
48+
4849 else
4950 ghc-options: -Wall
5051
src/StackTrace/Plugin.hs+9
@@ -5,7 +5,12 @@ module StackTrace.Plugin (plugin) where
55
66import Control.Arrow (first)
77import Data.Monoid (Any(Any, getAny))
8+#if __GLASGOW_HASKELL__ >= 900
9+import GHC.Plugins
10+#else
11+
812import GhcPlugins
13+#endif
914#if __GLASGOW_HASKELL__ >= 810
1015import GHC.Hs
1116#endif
@@ -48,7 +53,11 @@ ghcStackImport =
4853 (simpleImportDecl $ mkModuleName "GHC.Stack")
4954 {ideclQualified = importDeclQualified, ideclAs = Just $ noLoc ghcStackModuleName}
5055
56+#if __GLASGOW_HASKELL__ >= 900
57+updateHsModule :: HsModule -> HsModule
58+#else
5159updateHsModule :: HsModule GhcPs -> HsModule GhcPs
60+#endif
5261updateHsModule hsm =
5362 hsm {hsmodImports = hsmodImports', hsmodDecls = hsmodDecls'}
5463 where