Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions extensions.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ library

build-depends: bytestring >= 0.10 && < 0.13
-- We need to pin a single major version of
-- Cabal here because the main reason we use
-- Cabal is for its list of extensions. Later
-- Cabal-syntax here because the main reason we use
-- Cabal-syntax is for its list of extensions. Later
-- versions have strictly more extensions, and
-- we'll have missing patterns if we try to
-- support more than one major version. If
-- this causes problems in practice let's
-- revisit this decision and come up with
-- another approach.
, Cabal ^>= 3.14
, Cabal-syntax ^>= 3.14
, containers >= 0.6 && < 0.8
, directory ^>= 1.3
, filepath >= 1.4 && < 1.6
Expand Down
4 changes: 2 additions & 2 deletions src/Extensions/Cabal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import Distribution.Types.GenericPackageDescription (GenericPackageDescription (
import Distribution.Types.Library (Library (..))
import Distribution.Types.TestSuite (TestSuite (..))
import Distribution.Types.TestSuiteInterface (TestSuiteInterface (..))
#if MIN_VERSION_Cabal(3,6,0)
#if MIN_VERSION_Cabal_syntax(3,6,0)
import Distribution.Utils.Path (getSymbolicPath)
#endif
import GHC.LanguageExtensions.Type (Extension (..))
Expand Down Expand Up @@ -147,7 +147,7 @@ condTreeToExtensions
condTreeToExtensions extractModules extractBuildInfo condTree = do
let comp = condTreeData condTree
let buildInfo = extractBuildInfo comp
#if MIN_VERSION_Cabal(3,6,0)
#if MIN_VERSION_Cabal_syntax(3,6,0)
let srcDirs = getSymbolicPath <$> hsSourceDirs buildInfo
#else
let srcDirs = hsSourceDirs buildInfo
Expand Down
Loading