Skip to content

Commit

Permalink
Add Cabal 3.10.1.0 and GHC 9.6.2 (#8)
Browse files Browse the repository at this point in the history
With Cabal 3.10.1.0, readGenericPackageDescription is moved to
Distribution.Simple.PackageDescription, leading to import errors
9.6.2 is the most recent supported GHC release.
  • Loading branch information
Vekhir authored Sep 2, 2023
1 parent c6b8714 commit dd640f9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
cabal: ["3.2.0.0", "3.4.0.0"]
ghc: ["8.6.5", "8.8.3", "8.10.5", "9.0.1"]
cabal: ["3.2.0.0", "3.4.0.0", "3.10.1.0"]
ghc: ["8.6.5", "8.8.3", "8.10.5", "9.0.1", "9.6.2"]
os: [ubuntu-latest, macOS-latest]

steps:
Expand Down
5 changes: 5 additions & 0 deletions app/Main.hs
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE CPP #-}

module Main (main) where

import Control.Monad (unless, when)
import qualified Data.Text as T
import qualified Data.Text.IO as T
#if !MIN_VERSION_Cabal(3,10,0)
import Distribution.PackageDescription.Parsec (readGenericPackageDescription)
#else
import Distribution.Simple.PackageDescription (readGenericPackageDescription)
#endif
import Distribution.PackageDescription.PrettyPrint (showGenericPackageDescription)
import Distribution.Simple.Utils (findPackageDesc)
import Distribution.Uusi.Core
Expand Down
3 changes: 2 additions & 1 deletion uusi.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ tested-with:
|| ==8.8.3
|| ==8.10.5
|| ==9.0.1
|| ==9.6.2

source-repository head
type: git
Expand All @@ -33,7 +34,7 @@ source-repository head
common common-options
build-depends:
, base >=4.8 && <5
, Cabal ^>=3.2 || ^>=3.4
, Cabal ^>=3.2 || ^>=3.4 || ^>=3.10
, text

ghc-options:
Expand Down

0 comments on commit dd640f9

Please sign in to comment.