Merge pull request #10714 from peterbecich/fix-cabal-build-depends-fo…

…rmatting-inconsistency make formatting of `build-depends` consistent
haskell · Jan 17, 2025 · 54b4838 · 54b4838
2 parents 3b12960 + add05c4
commit 54b4838
Show file tree

Hide file tree

Showing 8 changed files with 175 additions and 157 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,3 +1,8 @@
+# 2025
+########################################
+# make *.cabal build-depends consistently formatted
+7d791b9da10b5034e7a997a0044ded5575fe123f
+
 # 2023
 ########################################
 

diff --git a/Cabal-hooks/Cabal-hooks.cabal b/Cabal-hooks/Cabal-hooks.cabal
@@ -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
 

diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
@@ -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

diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal
@@ -55,7 +55,7 @@ test-suite unit-tests
 
   main-is:          UnitTests.hs
   build-depends:
-      array
+    , array
     , base                >=4.13    && <5
     , bytestring
     , Cabal
@@ -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
@@ -103,7 +103,7 @@ test-suite check-tests
   hs-source-dirs:   tests
   main-is:          CheckTests.hs
   build-depends:
-      base
+    , base
     , bytestring
     , Cabal
     , Cabal-syntax
@@ -125,7 +125,7 @@ test-suite custom-setup-tests
     IdrisSetup
 
   build-depends:
-      base
+    , base
     , Cabal
     , Cabal-syntax
     , directory
@@ -141,7 +141,7 @@ test-suite hackage-tests
 
   hs-source-dirs:     tests
   build-depends:
-      base
+    , base
     , bytestring
     , Cabal
     , Cabal-syntax
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -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:
@@ -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

diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -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