Skip to content

Commit d1ffa04

Browse files
committed
Bump Cabal-syntax from 3.12 to 3.14
1 parent 096b72d commit d1ffa04

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

extract-hackage-info/extract-hackage-info.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ executable extract-hackage-info
1616
-Wunused-packages
1717

1818
build-depends:
19-
Cabal-syntax >=3.12 && <3.13,
19+
Cabal-syntax >=3.14 && <3.15,
2020
aeson >=2.2 && <3,
2121
base >=4.12 && <5,
2222
binary >=0.8 && <0.9,

ormolu.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ library
9494
other-modules: GHC.DynFlags
9595
default-language: GHC2021
9696
build-depends:
97-
Cabal-syntax >=3.12 && <3.13,
97+
Cabal-syntax >=3.14 && <3.15,
9898
Diff >=0.4 && <2,
9999
MemoTrie >=0.6 && <0.7,
100100
ansi-terminal >=0.10 && <1.2,
@@ -132,7 +132,7 @@ executable ormolu
132132
autogen-modules: Paths_ormolu
133133
default-language: GHC2021
134134
build-depends:
135-
Cabal-syntax >=3.12 && <3.13,
135+
Cabal-syntax >=3.14 && <3.15,
136136
base >=4.12 && <5,
137137
containers >=0.5 && <0.8,
138138
directory ^>=1.3,
@@ -183,7 +183,7 @@ test-suite tests
183183

184184
default-language: GHC2021
185185
build-depends:
186-
Cabal-syntax >=3.12 && <3.13,
186+
Cabal-syntax >=3.14 && <3.15,
187187
QuickCheck >=2.14,
188188
base >=4.14 && <5,
189189
choice >=0.2.4.1 && <0.3,

src/Ormolu/Utils/Cabal.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,17 @@ getExtensionAndDepsMap cabalFile GenericPackageDescription {..} =
189189
extractFromLibrary Library {..} =
190190
extractFromBuildInfo (ModuleName.toFilePath <$> exposedModules) libBuildInfo
191191
extractFromExecutable Executable {..} =
192-
extractFromBuildInfo [modulePath] buildInfo
192+
extractFromBuildInfo [getSymbolicPath modulePath] buildInfo
193193
extractFromTestSuite TestSuite {..} =
194194
extractFromBuildInfo mainPath testBuildInfo
195195
where
196196
mainPath = case testInterface of
197-
TestSuiteExeV10 _ p -> [p]
197+
TestSuiteExeV10 _ p -> [getSymbolicPath p]
198198
TestSuiteLibV09 _ p -> [ModuleName.toFilePath p]
199199
TestSuiteUnsupported {} -> []
200200
extractFromBenchmark Benchmark {..} =
201201
extractFromBuildInfo mainPath benchmarkBuildInfo
202202
where
203203
mainPath = case benchmarkInterface of
204-
BenchmarkExeV10 _ p -> [p]
204+
BenchmarkExeV10 _ p -> [getSymbolicPath p]
205205
BenchmarkUnsupported {} -> []

0 commit comments

Comments
 (0)