Skip to content

Commit

Permalink
Bump Cabal-syntax from 3.12 to 3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
poscat0x04 authored and amesgen committed Jan 5, 2025
1 parent cbe860e commit ebd4c6a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
* Correctly format non-promoted type-level tuples with `NoListTuplePuns`. [Issue
1146](https://github.com/tweag/ormolu/issues/1146).

* Updated to `Cabal-syntax-3.14`. [Issue
1152](https://github.com/tweag/ormolu/issues/1152).

## Ormolu 0.7.7.0

* Use single-line layout for parens around single-line content. [Issue
Expand Down
2 changes: 1 addition & 1 deletion extract-hackage-info/extract-hackage-info.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions ormolu.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,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,
Expand Down Expand Up @@ -131,7 +131,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,
Expand Down Expand Up @@ -182,7 +182,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,
Expand Down
6 changes: 3 additions & 3 deletions src/Ormolu/Utils/Cabal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {} -> []
1 change: 1 addition & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ packages:

extra-deps:
- ghc-lib-parser-9.12.1.20250105
- Cabal-syntax-3.14.1.0

nix:
packages:
Expand Down

0 comments on commit ebd4c6a

Please sign in to comment.