Updated contributing/dockerfile/nix-pre-commit

CONTRIBUTING.md

@@ -12,13 +12,13 @@ The following Haskell command-line tools will have to be installed:
 * `postgresql-migration`: To perform schema migrations
 * `fourmolu`: To style the code base. Version is 0.17.0.0
 * `hlint` v3.10 & `apply-refact`: To enforce certain patterns in the code base ("lint")
-* `cabal-fmt` and `nixfmt`: To style the cabal and nix files
+* `cabal-gild` and `nixfmt`: To style the cabal and nix files
 * `ghcid`: To automatically reload the Haskell code base upon source changes
 * `ghc-tags`: To generate ctags or etags for the project
 
 Outside of the flora root directory run:
 ```
-cabal install postgresql-migration hlint cabal-fmt ghcid ghc-tags --semaphore -j
+cabal install postgresql-migration hlint cabal-gild ghcid ghc-tags --semaphore -j
 ```
 
 (Some of the above packages could have incompatible dependencies, so consider installing them separately with `cabal install`)

Dockerfile

@@ -8,6 +8,7 @@ ARG GHC_VERSION=9.10.1
 ARG HLINT_VERSION=3.10
 ARG HLS_VERSION=2.11.0.0
 ARG POSTGRESQL_MIGRATION_VERSION=0.2.1.8
+ARG CABAL_GILD_VERSION=1.6.0.2
 
 # This stage installs libraries required to install GHC and other tools
 FROM ubuntu:$BASE_IMAGE_VERSION AS base
@@ -56,6 +57,7 @@ ARG GHC_TAGS_VERSION
 ARG GHC_VERSION
 ARG HLINT_VERSION
 ARG POSTGRESQL_MIGRATION_VERSION
+ARG CABAL_GILD_VERSION
 
 ENV PATH="/opt/ghcup/.ghcup/bin:$PATH"
 ENV GHCUP_INSTALL_BASE_PREFIX="/opt/ghcup"
@@ -71,6 +73,7 @@ RUN cabal update
 RUN cabal install --install-method=copy --installdir=out/ --semaphore -j postgresql-migration-$POSTGRESQL_MIGRATION_VERSION
 RUN cabal install --install-method=copy --installdir=out/ --semaphore -j fourmolu-$FOURMOLU_VERSION
 RUN cabal install --install-method=copy --installdir=out/ --semaphore -j hlint-$HLINT_VERSION
+RUN cabal install --install-method=copy --installdir=out/ --semaphore -j cabal-gild-$CABAL_GILD_VERSION
 RUN ghcup run --ghc 9.6.7 -- cabal install --install-method=copy --installdir=out/ -j apply-refact-$APPLY_REFACT_VERSION
 RUN ghcup rm ghc 9.6.7
 RUN ghcup gc -t -p -s -c

nix/pre-commit-config.nix

@@ -7,7 +7,7 @@
     statix.enable = true;
 
     # haskell hooks
-    cabal-fmt = {
+    cabal-gild = {
       enable = true;
       excludes = [ "^test/fixtures" ];
     };