Renamed check-stylish-network as check-stylish

default.nix

@@ -42,7 +42,7 @@ let
       tests = collectChecks' haskellPackages;
       styles = recurseIntoAttrs {
         check-nixfmt = callPackage ./nix/check-nixfmt.nix { };
-        check-stylish-network = callPackage ./nix/check-stylish-network.nix { };
+        check-stylish = callPackage ./nix/check-stylish.nix { };
       };
     };
 

nix/check-stylish-network.nix → nix/check-stylish.nix

@@ -1,6 +1,6 @@
 { runCommand, fd, lib, stylish-haskell, haskell-nix }:
 
-runCommand "check-stylish-network" {
+runCommand "check-stylish" {
   meta.platforms = with lib.platforms; [ linux ];
   buildInputs = [ fd stylish-haskell ];
   src = haskell-nix.haskellLib.cleanGit {
@@ -10,7 +10,7 @@ runCommand "check-stylish-network" {
 } ''
   unpackPhase
   cd $sourceRoot
-  bash ./scripts/ci/check-stylish-network.sh
+  bash ./scripts/ci/check-stylish.sh
   diff -ru $src .
 
   EXIT_CODE=$?

scripts/ci/check-stylish.sh

@@ -1,73 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 export LC_ALL=C.UTF-8
-fd -p ouroboros-consensus \
-    -e hs \
-    -E Setup.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/InMemory.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/OnDisk.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/Types.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Mempool/Impl/Pure.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Mempool/Impl/Types.hs\
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Mempool/Impl.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Mempool/TxLimits.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Util/Counting.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Util/SOP.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Util/OptNP.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Functors.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/InPairs.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Match.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Telescope.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/DerivingVia.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Tails.hs \
-    -E ouroboros-consensus-test/src/Test/Util/Classify.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/API.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/API/Types.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/CRC.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/Handle.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/IO.hs \
-    -E ouroboros-consensus/src/Ouroboros/Consensus/Storage/IO.hs \
-    -E ouroboros-consensus-test/src/Test/Util/FS/Sim/Error.hs \
-    -E ouroboros-consensus-test/src/Test/Util/FS/Sim/FsTree.hs \
-    -E ouroboros-consensus-test/src/Test/Util/FS/Sim/MockFS.hs \
-    -E ouroboros-consensus-test/src/Test/Util/FS/Sim/Pure.hs \
-    -E ouroboros-consensus-test/src/Test/Util/FS/Sim/STM.hs \
-    -E ouroboros-consensus-test/src/Test/Util/Blob.hs \
-    -E ouroboros-consensus-cardano-tools/app/DBAnalyser/Parsers.hs \
-    -X stylish-haskell \
-    -c .stylish-haskell.yaml -i
-
-# We don't want these deprecation warnings to be removed accidentally
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/InMemory.hs >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/OnDisk.hs   >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/LedgerDB/Types.hs    >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Mempool/Impl/Pure.hs         >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Mempool/Impl/Types.hs        >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Mempool/Impl.hs              >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Mempool/TxLimits.hs          >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Util/Counting.hs                         >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Util/SOP.hs                              >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Util/OptNP.hs                            >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Functors.hs     >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/InPairs.hs      >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Match.hs        >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Telescope.hs    >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/DerivingVia.hs  >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/HardFork/Combinator/Util/Tails.hs        >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/Classify.hs                       >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/API.hs            >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/API/Types.hs      >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/CRC.hs            >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/Handle.hs         >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/FS/IO.hs             >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus/src/Ouroboros/Consensus/Storage/IO.hs                >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/FS/Sim/Error.hs                   >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/FS/Sim/FsTree.hs                  >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/FS/Sim/MockFS.hs                  >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/FS/Sim/Pure.hs                    >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/FS/Sim/STM.hs                     >/dev/null 2>&1
-grep "module.*DEPRECATED" ouroboros-consensus-test/src/Test/Util/Blob.hs                           >/dev/null 2>&1
-
-fd -p ouroboros-consensus -e cabal -x cabal-fmt -i
+# TODO CPP pragmas in export lists are not supported by stylish-haskell
+fd . './network-mux' -e hs -E Setup.hs -E TCPInfo.hs -E Pipe.hs -E Channel.hs -E Bearer.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
+fd . './ouroboros-network-api' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
+fd . './ouroboros-network-framework' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
+fd . './ouroboros-network-mock' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
+fd . './ouroboros-network-protocols' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
+fd . './ouroboros-network' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
+fd . './cardano-client' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i