From d920e8bd86c5e0d0cade836efdf6589fc859b23c Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Fri, 26 Jan 2024 08:48:27 -0800 Subject: [PATCH] Repair unintentionally broken GHC 8.10.7 support (#111) --- ChangeLog.md | 4 ++++ ghc-source-gen.cabal | 10 +++++----- package.yaml | 2 +- src/GHC/SourceGen/Module.hs | 2 -- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9c87f4b..f78e135 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Changelog for haskell-syntax + +# 0.4.4.1 +- Repair unintentionally broken GHC 8.10.7 support. + # 0.4.4.0 - Support GHC 9.6. diff --git a/ghc-source-gen.cabal b/ghc-source-gen.cabal index 09bfba7..572d22a 100644 --- a/ghc-source-gen.cabal +++ b/ghc-source-gen.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack name: ghc-source-gen -version: 0.4.4.0 +version: 0.4.4.1 synopsis: Constructs Haskell syntax trees for the GHC API. description: @ghc-source-gen@ is a library for generating Haskell source code. It uses the library @@ -62,6 +62,7 @@ library build-depends: base >=4.7 && <5 , ghc >=8.4 && <9.7 + default-language: Haskell2010 if impl(ghc<8.10) other-modules: GHC.Hs @@ -75,7 +76,6 @@ library GHC.Hs.Utils hs-source-dirs: compat - default-language: Haskell2010 if impl(ghc<9.0) other-modules: GHC.Hs.Type @@ -130,12 +130,12 @@ test-suite pprint_examples , ghc-source-gen , tasty >=1.0 && <1.5 , tasty-hunit ==0.10.* + default-language: Haskell2010 if impl(ghc<9.0) other-modules: GHC.Utils.Outputable hs-source-dirs: compat - default-language: Haskell2010 test-suite pprint_test type: exitcode-stdio-1.0 @@ -156,6 +156,7 @@ test-suite pprint_test , ghc-source-gen , tasty >=1.0 && <1.5 , tasty-hunit ==0.10.* + default-language: Haskell2010 if impl(ghc<9.0) other-modules: GHC.Driver.Monad @@ -163,4 +164,3 @@ test-suite pprint_test GHC.Utils.Outputable hs-source-dirs: compat - default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index 2b02417..16a3e05 100644 --- a/package.yaml +++ b/package.yaml @@ -5,7 +5,7 @@ # https://developers.google.com/open-source/licenses/bsd name: ghc-source-gen -version: 0.4.4.0 +version: 0.4.4.1 github: "google/ghc-source-gen" license: BSD3 author: "Judah Jacobson" diff --git a/src/GHC/SourceGen/Module.hs b/src/GHC/SourceGen/Module.hs index 1d9340a..164b1dd 100644 --- a/src/GHC/SourceGen/Module.hs +++ b/src/GHC/SourceGen/Module.hs @@ -63,9 +63,7 @@ import GHC.Types.PkgQual (RawPkgQual(..)) import GHC.SourceGen.Syntax.Internal import GHC.SourceGen.Name.Internal import GHC.SourceGen.Lit.Internal (noSourceText) -#if MIN_VERSION_ghc(9,0,0) import GHC.SourceGen.Name (unqual) -#endif #if MIN_VERSION_ghc(9,4,0) import GHC.SourceGen.Name (RdrNameStr, ModuleNameStr(unModuleNameStr), OccNameStr) import GHC.Types.SourceText (SourceText(NoSourceText))