Skip to content

Commit 1f8e7e5

Browse files
poscat0x04mrkkrp
authored andcommitted
Bump Cabal-syntax from 3.12 to 3.14
1 parent 36d3214 commit 1f8e7e5

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
* Correctly format non-promoted type-level tuples with `NoListTuplePuns`. [Issue
2323
1146](https://github.com/tweag/ormolu/issues/1146).
2424

25+
* Updated to `Cabal-syntax-3.14`. [Issue
26+
1152](https://github.com/tweag/ormolu/issues/1152).
27+
2528
## Ormolu 0.7.7.0
2629

2730
* Use single-line layout for parens around single-line content. [Issue

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

+1-1
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ library
9595
other-modules: GHC.DynFlags
9696
default-language: GHC2021
9797
build-depends:
98-
Cabal-syntax >=3.12 && <3.13,
98+
Cabal-syntax >=3.14 && <3.15,
9999
Diff >=0.4 && <2,
100100
MemoTrie >=0.6 && <0.7,
101101
ansi-terminal >=0.10 && <1.2,
@@ -133,7 +133,7 @@ executable ormolu
133133
autogen-modules: Paths_ormolu
134134
default-language: GHC2021
135135
build-depends:
136-
Cabal-syntax >=3.12 && <3.13,
136+
Cabal-syntax >=3.14 && <3.15,
137137
base >=4.12 && <5,
138138
containers >=0.5 && <0.8,
139139
directory ^>=1.3,
@@ -184,7 +184,7 @@ test-suite tests
184184

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

src/Ormolu/Utils/Cabal.hs

+3-3
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 {} -> []

stack.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ packages:
66

77
extra-deps:
88
- ghc-lib-parser-9.12.1.20250105
9+
- Cabal-syntax-3.14.1.0
910
- path-0.9.6
1011
- path-io-1.8.2
1112

0 commit comments

Comments
 (0)