Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make formatting of build-depends consistent #10714

Merged
merged 2 commits into from
Jan 17, 2025
Merged

make formatting of build-depends consistent #10714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d791b9
make formatting of `build-depends` consistent
peterbecich Jan 5, 2025
add05c4
add to `.git-blame-ignore-revs`
peterbecich Jan 5, 2025
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
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 2025
########################################
# make *.cabal build-depends consistently formatted
7d791b9da10b5034e7a997a0044ded5575fe123f

# 2023
########################################

Expand Down
10 changes: 5 additions & 5 deletions Cabal-hooks/Cabal-hooks.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ library
hs-source-dirs: src

build-depends:
Cabal-syntax >= 3.15 && < 3.17,
Cabal >= 3.15 && < 3.17,
base >= 4.13 && < 5,
containers >= 0.5.0.0 && < 0.8,
transformers >= 0.5.6.0 && < 0.7
, Cabal-syntax >= 3.15 && < 3.17
, Cabal >= 3.15 && < 3.17
, base >= 4.13 && < 5
, containers >= 0.5.0.0 && < 0.8
, transformers >= 0.5.6.0 && < 0.7

ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates

Expand Down
28 changes: 14 additions & 14 deletions Cabal-syntax/Cabal-syntax.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ library
hs-source-dirs: src

build-depends:
array >= 0.4.0.1 && < 0.6,
base >= 4.13 && < 5,
binary >= 0.7 && < 0.9,
bytestring >= 0.10.0.0 && < 0.13,
containers >= 0.5.0.0 && < 0.8,
deepseq >= 1.3.0.1 && < 1.7,
directory >= 1.2 && < 1.4,
filepath >= 1.3.0.1 && < 1.6,
mtl >= 2.1 && < 2.4,
parsec >= 3.1.13.0 && < 3.2,
pretty >= 1.1.1 && < 1.2,
text (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2),
time >= 1.4.0.1 && < 1.15,
, array >= 0.4.0.1 && < 0.6
, base >= 4.13 && < 5
, binary >= 0.7 && < 0.9
, bytestring >= 0.10.0.0 && < 0.13
, containers >= 0.5.0.0 && < 0.8
, deepseq >= 1.3.0.1 && < 1.7
, directory >= 1.2 && < 1.4
, filepath >= 1.3.0.1 && < 1.6
, mtl >= 2.1 && < 2.4
, parsec >= 3.1.13.0 && < 3.2
, pretty >= 1.1.1 && < 1.2
, text (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2)
, time >= 1.4.0.1 && < 1.15
-- transformers-0.4.0.0 doesn't have record syntax e.g. for Identity
-- See also https://github.com/ekmett/transformers-compat/issues/35
transformers (>= 0.3 && < 0.4) || (>=0.4.1.0 && <0.7)
, transformers (>= 0.3 && < 0.4) || (>=0.4.1.0 && <0.7)

ghc-options:
-Wall
Expand Down
21 changes: 11 additions & 10 deletions Cabal-tests/Cabal-tests.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test-suite unit-tests

main-is: UnitTests.hs
build-depends:
array
, array
, base >=4.13 && <5
, bytestring
, Cabal
Expand All @@ -82,7 +82,7 @@ test-suite parser-tests
hs-source-dirs: tests
main-is: ParserTests.hs
build-depends:
base
, base
, base-compat >=0.11.0 && <0.14
, bytestring
, Cabal-syntax
Expand All @@ -103,7 +103,7 @@ test-suite check-tests
hs-source-dirs: tests
main-is: CheckTests.hs
build-depends:
base
, base
, bytestring
, Cabal
, Cabal-syntax
Expand All @@ -125,7 +125,7 @@ test-suite custom-setup-tests
IdrisSetup

build-depends:
base
, base
, Cabal
, Cabal-syntax
, directory
Expand All @@ -141,7 +141,7 @@ test-suite hackage-tests

hs-source-dirs: tests
build-depends:
base
, base
, bytestring
, Cabal
, Cabal-syntax
Expand All @@ -152,7 +152,7 @@ test-suite hackage-tests
, time

build-depends:
base-compat >=0.11.0 && <0.14
, base-compat >=0.11.0 && <0.14
, base-orphans >=0.6 && <0.10
, clock >=0.8 && <0.9
, optparse-applicative >=0.13.2.0 && <0.19
Expand All @@ -168,12 +168,12 @@ test-suite rpmvercmp
main-is: RPMVerCmp.hs
hs-source-dirs: tests
build-depends:
base
, base
, bytestring
, Cabal-syntax

build-depends:
QuickCheck
, QuickCheck
, tasty >=1.2.3 && <1.6
, tasty-hunit
, tasty-quickcheck <0.12
Expand All @@ -190,7 +190,7 @@ test-suite no-thunks-test
main-is: NoThunks.hs
hs-source-dirs: tests
build-depends:
base
, base
, bytestring
, Cabal-syntax
, tasty >=1.2.3 && <1.6
Expand All @@ -199,4 +199,5 @@ test-suite no-thunks-test
-- this is test is buildable on old GHCs
-- but it doesn't do anything.
if impl(ghc >=8.6)
build-depends: nothunks >=0.1.1.0 && <0.3
build-depends:
, nothunks >=0.1.1.0 && <0.3
37 changes: 20 additions & 17 deletions Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,28 @@ library
hs-source-dirs: src

build-depends:
Cabal-syntax ^>= 3.15,
array >= 0.4.0.1 && < 0.6,
base >= 4.13 && < 5,
bytestring >= 0.10.0.0 && < 0.13,
containers >= 0.5.0.0 && < 0.8,
deepseq >= 1.3.0.1 && < 1.7,
directory >= 1.2 && < 1.4,
filepath >= 1.3.0.1 && < 1.6,
pretty >= 1.1.1 && < 1.2,
process >= 1.2.1.0 && < 1.7,
time >= 1.4.0.1 && < 1.15
, Cabal-syntax ^>= 3.15
, array >= 0.4.0.1 && < 0.6
, base >= 4.13 && < 5
, bytestring >= 0.10.0.0 && < 0.13
, containers >= 0.5.0.0 && < 0.8
, deepseq >= 1.3.0.1 && < 1.7
, directory >= 1.2 && < 1.4
, filepath >= 1.3.0.1 && < 1.6
, pretty >= 1.1.1 && < 1.2
, process >= 1.2.1.0 && < 1.7
, time >= 1.4.0.1 && < 1.15

if os(windows)
build-depends: Win32 >= 2.3.0.0 && < 2.15
build-depends:
, Win32 >= 2.3.0.0 && < 2.15
else
build-depends: unix >= 2.8.6.0 && < 2.9
build-depends:
, unix >= 2.8.6.0 && < 2.9

if flag(git-rev)
build-depends: githash ^>= 0.1.7.0
build-depends:
, githash ^>= 0.1.7.0
cpp-options: -DGIT_REV

ghc-options:
Expand Down Expand Up @@ -328,9 +331,9 @@ library
build-depends:
-- transformers-0.4.0.0 doesn't have record syntax e.g. for Identity
-- See also https://github.com/ekmett/transformers-compat/issues/35
transformers (>= 0.3 && < 0.4) || (>=0.4.1.0 && <0.7),
mtl >= 2.1 && < 2.4,
parsec >= 3.1.13.0 && < 3.2
, transformers (>= 0.3 && < 0.4) || (>=0.4.1.0 && <0.7)
, mtl >= 2.1 && < 2.4
, parsec >= 3.1.13.0 && < 3.2

other-modules:
Distribution.Backpack.PreExistingComponent
Expand Down
3 changes: 2 additions & 1 deletion cabal-install-solver/cabal-install-solver.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ library

if flag(debug-tracetree)
cpp-options: -DDEBUG_TRACETREE
build-depends: tracetree ^>=0.1
build-depends:
, tracetree ^>=0.1

Test-Suite unit-tests
default-language: Haskell2010
Expand Down
Loading
Loading