Format .cabal files with cabal-gild

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
         with:
           extra_nix_config: |
             accept-flake-config = true
-      - name: Format via Cabal and Ormolu
+      - name: Format via Ormolu
         run: |
           nix run .#format
           git diff --exit-code --color=always

flake.nix

@@ -7,11 +7,7 @@
     };
     nixpkgs.follows = "haskellNix/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    pre-commit-hooks = {
-      url = "github:cachix/pre-commit-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
+    pre-commit-hooks.url = "github:cachix/git-hooks.nix";
 
     # for Ormolu Live
     ghc-wasm-meta.url = "gitlab:ghc/ghc-wasm-meta?host=gitlab.haskell.org";
@@ -119,6 +115,7 @@
         pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
           src = ./.;
           hooks = {
+            cabal-gild.enable = true;
             nixpkgs-fmt.enable = true;
             deadnix.enable = true;
             purs-tidy.enable = true;
@@ -150,7 +147,6 @@
               name = "ormolu-format";
               text = builtins.readFile ./nix/format.sh;
               runtimeInputs = [
-                (defaultGHC.dev.hsPkgs.tool "cabal" "latest")
                 defaultGHC.ormolu
               ];
             };
@@ -165,6 +161,7 @@
                 configureArgs = "--disable-benchmarks --disable-tests";
               };
             };
+            nativeBuildInputs = pre-commit-check.enabledPackages;
             withHoogle = false;
             exactDeps = false;
             inherit (pre-commit-check) shellHook;

nix/format.sh

@@ -2,10 +2,6 @@
 
 export LANG="C.UTF-8"
 
-cabal format
-(cd extract-hackage-info && cabal format)
-(cd ormolu-live && cabal format)
-
 export dirs="src app tests extract-hackage-info/src ormolu-live/app"
 # shellcheck disable=SC2046,SC2086
 ormolu -m inplace $(find $dirs -type f -name "*.hs" -o -name "*.hs-boot")