From d1ffa04a7fd155ba6c2aa4514c163695aa697453 Mon Sep 17 00:00:00 2001 From: poscat Date: Sun, 5 Jan 2025 21:48:42 +0800 Subject: [PATCH] Bump Cabal-syntax from 3.12 to 3.14 --- extract-hackage-info/extract-hackage-info.cabal | 2 +- ormolu.cabal | 6 +++--- src/Ormolu/Utils/Cabal.hs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extract-hackage-info/extract-hackage-info.cabal b/extract-hackage-info/extract-hackage-info.cabal index 756d69bc6..fe849d482 100644 --- a/extract-hackage-info/extract-hackage-info.cabal +++ b/extract-hackage-info/extract-hackage-info.cabal @@ -16,7 +16,7 @@ executable extract-hackage-info -Wunused-packages build-depends: - Cabal-syntax >=3.12 && <3.13, + Cabal-syntax >=3.14 && <3.15, aeson >=2.2 && <3, base >=4.12 && <5, binary >=0.8 && <0.9, diff --git a/ormolu.cabal b/ormolu.cabal index 3c0831479..fc2ef7a6a 100644 --- a/ormolu.cabal +++ b/ormolu.cabal @@ -94,7 +94,7 @@ library other-modules: GHC.DynFlags default-language: GHC2021 build-depends: - Cabal-syntax >=3.12 && <3.13, + Cabal-syntax >=3.14 && <3.15, Diff >=0.4 && <2, MemoTrie >=0.6 && <0.7, ansi-terminal >=0.10 && <1.2, @@ -132,7 +132,7 @@ executable ormolu autogen-modules: Paths_ormolu default-language: GHC2021 build-depends: - Cabal-syntax >=3.12 && <3.13, + Cabal-syntax >=3.14 && <3.15, base >=4.12 && <5, containers >=0.5 && <0.8, directory ^>=1.3, @@ -183,7 +183,7 @@ test-suite tests default-language: GHC2021 build-depends: - Cabal-syntax >=3.12 && <3.13, + Cabal-syntax >=3.14 && <3.15, QuickCheck >=2.14, base >=4.14 && <5, choice >=0.2.4.1 && <0.3, diff --git a/src/Ormolu/Utils/Cabal.hs b/src/Ormolu/Utils/Cabal.hs index af1f0b553..0541a6f95 100644 --- a/src/Ormolu/Utils/Cabal.hs +++ b/src/Ormolu/Utils/Cabal.hs @@ -189,17 +189,17 @@ getExtensionAndDepsMap cabalFile GenericPackageDescription {..} = extractFromLibrary Library {..} = extractFromBuildInfo (ModuleName.toFilePath <$> exposedModules) libBuildInfo extractFromExecutable Executable {..} = - extractFromBuildInfo [modulePath] buildInfo + extractFromBuildInfo [getSymbolicPath modulePath] buildInfo extractFromTestSuite TestSuite {..} = extractFromBuildInfo mainPath testBuildInfo where mainPath = case testInterface of - TestSuiteExeV10 _ p -> [p] + TestSuiteExeV10 _ p -> [getSymbolicPath p] TestSuiteLibV09 _ p -> [ModuleName.toFilePath p] TestSuiteUnsupported {} -> [] extractFromBenchmark Benchmark {..} = extractFromBuildInfo mainPath benchmarkBuildInfo where mainPath = case benchmarkInterface of - BenchmarkExeV10 _ p -> [p] + BenchmarkExeV10 _ p -> [getSymbolicPath p] BenchmarkUnsupported {} -> []