diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2b1208266c6..5c649465670 100644
--- 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
index 6b41d1f00e6..390a560ee4c 100644
--- 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
index 42fb7f7d51e..aabe1fde63a 100644
--- 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
index 60ae8828610..ea18f6ea12a 100644
--- 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
index f630898d448..15bec87f0d1 100644
--- 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
index a96b787f55e..0002922e5c2 100644
--- 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
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 0d35389602f..7c43b1c29b1 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -57,16 +57,20 @@ common warnings
       ghc-options: -Wnoncanonical-monadfail-instances
 
 common base-dep
-    build-depends: base >=4.13 && <4.22
+    build-depends:
+      , base >=4.13 && <4.22
 
 common cabal-dep
-    build-depends: Cabal ^>=3.15
+    build-depends:
+      , Cabal ^>=3.15
 
 common cabal-syntax-dep
-    build-depends: Cabal-syntax ^>=3.15
+    build-depends:
+      , Cabal-syntax ^>=3.15
 
 common cabal-install-solver-dep
-    build-depends: cabal-install-solver ^>=3.15
+    build-depends:
+      , cabal-install-solver ^>=3.15
 
 library
     import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep
@@ -225,36 +229,36 @@ library
         Distribution.Client.Win32SelfUpgrade
 
     build-depends:
-        async      >= 2.0      && < 2.3,
-        array      >= 0.4      && < 0.6,
-        base16-bytestring >= 0.1.1 && < 1.1.0.0,
-        binary     >= 0.7.3    && < 0.9,
-        bytestring >= 0.10.6.0 && < 0.13,
-        containers >= 0.5.6.2  && < 0.8,
-        cryptohash-sha256 >= 0.11 && < 0.12,
-        directory  >= 1.3.7.0  && < 1.4,
-        echo       >= 0.1.3    && < 0.2,
-        edit-distance >= 0.2.2 && < 0.3,
-        exceptions >= 0.10.4   && < 0.11,
-        filepath   >= 1.4.0.0  && < 1.6,
-        HTTP       >= 4000.1.5 && < 4000.5,
-        mtl        >= 2.0      && < 2.4,
-        network-uri >= 2.6.0.2 && < 2.7,
-        pretty     >= 1.1      && < 1.2,
-        process    >= 1.2.3.0  && < 1.7,
-        random     >= 1.2      && < 1.4,
-        stm        >= 2.0      && < 2.6,
-        tar        >= 0.5.0.3  && < 0.7,
-        time       >= 1.5.0.1  && < 1.15,
-        zlib       >= 0.5.3    && < 0.8,
-        hackage-security >= 0.6.2.0 && < 0.7,
-        text       >= 1.2.3    && < 1.3 || >= 2.0 && < 2.2,
-        parsec     >= 3.1.13.0 && < 3.2,
-        open-browser >= 0.2.1.0 && < 0.3,
-        regex-base  >= 0.94.0.0 && <0.95,
-        regex-posix >= 0.96.0.0 && <0.97,
-        safe-exceptions >= 0.1.7.0 && < 0.2,
-        semaphore-compat >= 1.0.0 && < 1.1
+      , async      >= 2.0      && < 2.3
+      , array      >= 0.4      && < 0.6
+      , base16-bytestring >= 0.1.1 && < 1.1.0.0
+      , binary     >= 0.7.3    && < 0.9
+      , bytestring >= 0.10.6.0 && < 0.13
+      , containers >= 0.5.6.2  && < 0.8
+      , cryptohash-sha256 >= 0.11 && < 0.12
+      , directory  >= 1.3.7.0  && < 1.4
+      , echo       >= 0.1.3    && < 0.2
+      , edit-distance >= 0.2.2 && < 0.3
+      , exceptions >= 0.10.4   && < 0.11
+      , filepath   >= 1.4.0.0  && < 1.6
+      , HTTP       >= 4000.1.5 && < 4000.5
+      , mtl        >= 2.0      && < 2.4
+      , network-uri >= 2.6.0.2 && < 2.7
+      , pretty     >= 1.1      && < 1.2
+      , process    >= 1.2.3.0  && < 1.7
+      , random     >= 1.2      && < 1.4
+      , stm        >= 2.0      && < 2.6
+      , tar        >= 0.5.0.3  && < 0.7
+      , time       >= 1.5.0.1  && < 1.15
+      , zlib       >= 0.5.3    && < 0.8
+      , hackage-security >= 0.6.2.0 && < 0.7
+      , text       >= 1.2.3    && < 1.3 || >= 2.0 && < 2.2
+      , parsec     >= 3.1.13.0 && < 3.2
+      , open-browser >= 0.2.1.0 && < 0.3
+      , regex-base  >= 0.94.0.0 && <0.95
+      , regex-posix >= 0.96.0.0 && <0.97
+      , safe-exceptions >= 0.1.7.0 && < 0.2
+      , semaphore-compat >= 1.0.0 && < 1.1
 
     if flag(native-dns)
       if os(windows)
@@ -264,16 +268,21 @@ library
 
     if os(windows)
       -- newer directory for symlinks
-      build-depends: Win32 >= 2.8 && < 3, directory >=1.3.1.0
+      build-depends:
+        , Win32 >= 2.8 && < 3
+        , directory >=1.3.1.0
     else
-      build-depends: unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9
+      build-depends:
+        , unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9
 
     if flag(lukko)
-      build-depends: lukko >= 0.1 && <0.2
+      build-depends:
+        , lukko >= 0.1 && <0.2
 
     -- pull in process version with fixed waitForProcess error
     if impl(ghc >=8.2)
-      build-depends: process >= 1.6.15.0
+      build-depends:
+        , process >= 1.6.15.0
 
     if flag(git-rev)
       build-depends: githash ^>= 0.1.7.0
@@ -344,29 +353,28 @@ test-suite unit-tests
       UnitTests.Options
 
     build-depends:
-          array,
-          bytestring,
-          cabal-install,
-          Cabal-tree-diff,
-          Cabal-QuickCheck,
-          Cabal-tests,
-          containers,
-          directory,
-          filepath,
-          mtl,
-          network-uri >= 2.6.2.0 && <2.7,
-          random,
-          tar,
-          time,
-          zlib,
-          tasty >= 1.2.3 && <1.6,
-          tasty-golden >=2.3.1.1 && <2.4,
-          tasty-quickcheck ^>=0.11,
-          tasty-expected-failure,
-          tasty-hunit >= 0.10,
-          tree-diff,
-          QuickCheck >= 2.14.3 && <2.16
-
+      , array
+      , bytestring
+      , cabal-install
+      , Cabal-tree-diff
+      , Cabal-QuickCheck
+      , Cabal-tests
+      , containers
+      , directory
+      , filepath
+      , mtl
+      , network-uri >= 2.6.2.0 && <2.7
+      , random
+      , tar
+      , time
+      , zlib
+      , tasty >= 1.2.3 && <1.6
+      , tasty-golden >=2.3.1.1 && <2.4
+      , tasty-quickcheck ^>=0.11
+      , tasty-expected-failure
+      , tasty-hunit >= 0.10
+      , tree-diff
+      , QuickCheck >= 2.14.3 && <2.16
 
 -- Tests to run with a limited stack and heap size
 -- The test suite name must be keep short cause a longer one
@@ -388,10 +396,10 @@ test-suite mem-use-tests
     UnitTests.Options
 
   build-depends:
-        cabal-install,
-        containers,
-        tasty >= 1.2.3 && <1.6,
-        tasty-hunit >= 0.10
+    , cabal-install
+    , containers
+    , tasty >= 1.2.3 && <1.6
+    , tasty-hunit >= 0.10
 
 
 -- Integration tests that use the cabal-install code directly
@@ -408,15 +416,15 @@ test-suite integration-tests2
     IntegrationTests2.CPP
 
   build-depends:
-        bytestring,
-        cabal-install,
-        containers,
-        directory,
-        filepath,
-        process,
-        tasty >= 1.2.3 && <1.6,
-        tasty-hunit >= 0.10,
-        tagged
+    , bytestring
+    , cabal-install
+    , containers
+    , directory
+    , filepath
+    , process
+    , tasty >= 1.2.3 && <1.6
+    , tasty-hunit >= 0.10
+    , tagged
 
 test-suite long-tests
   import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep
@@ -438,20 +446,20 @@ test-suite long-tests
     UnitTests.Options
 
   build-depends:
-        Cabal-QuickCheck,
-        Cabal-described,
-        Cabal-tests,
-        cabal-install,
-        containers,
-        directory,
-        filepath,
-        mtl,
-        network-uri >= 2.6.2.0 && <2.7,
-        random,
-        tagged,
-        tasty >= 1.2.3 && <1.6,
-        tasty-expected-failure,
-        tasty-hunit >= 0.10,
-        tasty-quickcheck <0.12,
-        QuickCheck >= 2.14 && <2.16,
-        pretty-show >= 1.6.15
+    , Cabal-QuickCheck
+    , Cabal-described
+    , Cabal-tests
+    , cabal-install
+    , containers
+    , directory
+    , filepath
+    , mtl
+    , network-uri >= 2.6.2.0 && <2.7
+    , random
+    , tagged
+    , tasty >= 1.2.3 && <1.6
+    , tasty-expected-failure
+    , tasty-hunit >= 0.10
+    , tasty-quickcheck <0.12
+    , QuickCheck >= 2.14 && <2.16
+    , pretty-show >= 1.6.15
diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
index 0595a5bd229..f2e88add7b9 100644
--- a/solver-benchmarks/solver-benchmarks.cabal
+++ b/solver-benchmarks/solver-benchmarks.cabal
@@ -27,18 +27,18 @@ library
   exposed-modules:
     HackageBenchmark
   build-depends:
-    async >=2.2.2 && <2.3,
-    base,
-    bytestring,
-    containers,
-    Cabal-syntax ^>= 3.15,
-    directory,
-    filepath,
-    optparse-applicative,
-    process,
-    time,
-    statistics >= 0.14 && < 0.17,
-    vector
+    , async >=2.2.2 && <2.3
+    , base
+    , bytestring
+    , containers
+    , Cabal-syntax ^>= 3.15
+    , directory
+    , filepath
+    , optparse-applicative
+    , process
+    , time
+    , statistics >= 0.14 && < 0.17
+    , vector
   default-language: Haskell2010
 
 executable hackage-benchmark
@@ -46,8 +46,8 @@ executable hackage-benchmark
   hs-source-dirs: main
   ghc-options: -threaded -Wall -fwarn-tabs
   build-depends:
-    base,
-    solver-benchmarks
+    , base
+    , solver-benchmarks
   default-language: Haskell2010
 
 test-suite unit-tests
@@ -56,9 +56,9 @@ test-suite unit-tests
   hs-source-dirs: tests
   ghc-options: -threaded -Wall -fwarn-tabs
   build-depends:
-    base,
-    solver-benchmarks,
-    statistics >= 0.14 && < 0.17,
-    tasty,
-    tasty-hunit
+    , base
+    , solver-benchmarks
+    , statistics >= 0.14 && < 0.17
+    , tasty
+    , tasty-hunit
   default-language: Haskell2010