diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index c35832d..a5bd4dd 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -13,14 +13,25 @@ jobs: fail-fast: false matrix: os: [macos-latest, ubuntu-latest] - cabal: ["3.8"] - ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.6", "9.4.4"] + cabal: ["3.12"] + 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"] + exclude: + - os: macos-latest + ghc: "8.4.4" + - os: macos-latest + ghc: "8.6.5" + - os: macos-latest + ghc: "8.8.4" + - os: macos-latest + ghc: "8.10.7" + - os: macos-latest + ghc: "9.0.2" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2 + - uses: actions/checkout@v4 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} @@ -29,7 +40,7 @@ jobs: run: | cabal v2-update cabal v2-freeze $CONFIG - - uses: actions/cache@v2.1.5 + - uses: actions/cache@v4 with: path: | ${{ steps.setup-haskell-cabal.outputs.cabal-store }} diff --git a/src/Data/Thyme/TrueName.hs b/src/Data/Thyme/TrueName.hs index 23105b1..ea8f9e8 100644 --- a/src/Data/Thyme/TrueName.hs +++ b/src/Data/Thyme/TrueName.hs @@ -65,7 +65,9 @@ decNames dec = case dec of PatSynSigD _name typ -> typNames typ #endif -#if MIN_VERSION_template_haskell(2,8,0) +#if MIN_VERSION_template_haskell(2,22,0) + InfixD _ _ _ -> [] +#elif MIN_VERSION_template_haskell(2,8,0) InfixD _ _ -> [] #endif @@ -123,6 +125,11 @@ decNames dec = case dec of ImplicitParamBindD _ _ -> [] #endif +#if MIN_VERSION_template_haskell(2,22,0) + TypeDataD _ _ _ _ -> [] + DefaultD _ -> [] +#endif + {- }}} -} datatypeNames :: Cxt -> [Con] -> [Name] diff --git a/thyme.cabal b/thyme.cabal index 7110f99..46ef227 100644 --- a/thyme.cabal +++ b/thyme.cabal @@ -97,7 +97,7 @@ library old-locale >= 1.0, random, text >= 0.11, - template-haskell >= 2.7 && < 2.21, + template-haskell >= 2.7 && < 2.23, time >= 1.4, vector >= 0.9, vector-th-unbox >= 0.2.1.0,