refactor(packages): Move checks in different folder

metacraft-labs · Dec 20, 2024 · 2336e10 · 2336e10
1 parent 68e732c
commit 2336e10
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 36 deletions.
diff --git a/checks/default.nix b/checks/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  inputs,
+  ...
+}:
+{
+  perSystem =
+    {
+      inputs',
+      self',
+      pkgs,
+      ...
+    }:
+    let
+      inherit (lib) optionalAttrs;
+      inherit (pkgs) system;
+      inherit (pkgs.hostPlatform) isLinux;
+    in
+    rec {
+      checks =
+        self'.packages
+        // {
+          inherit (self'.legacyPackages) rustToolchain;
+          inherit (self'.legacyPackages.inputs.dlang-nix) dub;
+          inherit (self'.legacyPackages.inputs.nixpkgs)
+            cachix
+            nix
+            nix-eval-jobs
+            nix-fast-build
+            ;
+          inherit (self'.legacyPackages.inputs.ethereum-nix) foundry;
+
+          pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
+            src = ../.;
+            hooks = {
+              nixfmt-rfc-style.enable = true;
+            };
+          };
+        }
+        // optionalAttrs (system == "x86_64-linux" || system == "aarch64-darwin") {
+          inherit (self'.legacyPackages.inputs.ethereum-nix) geth;
+        }
+        // optionalAttrs isLinux {
+          inherit (inputs'.validator-ejector.packages) validator-ejector;
+        }
+        // optionalAttrs (system == "x86_64-linux") {
+          inherit (pkgs) terraform;
+          inherit (self'.legacyPackages.inputs.terranix) terranix;
+          inherit (self'.legacyPackages.inputs.dlang-nix)
+            dcd
+            dscanner
+            serve-d
+            dmd
+            ldc
+            ;
+          inherit (self'.legacyPackages.inputs.ethereum-nix)
+            mev-boost
+            nethermind
+            web3signer
+            nimbus-eth2
+            ;
+        };
+    };
+}
diff --git a/flake.nix b/flake.nix
@@ -222,6 +222,7 @@
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
+        ./checks
         ./modules
         ./packages
       ];

diff --git a/packages/default.nix b/packages/default.nix
@@ -72,41 +72,5 @@
             inherit (legacyPackages.inputs.nixpkgs) cachix nix nix-eval-jobs;
           };
         };
-      checks =
-        packages
-        // {
-          inherit (legacyPackages) rustToolchain;
-          inherit (legacyPackages.inputs.dlang-nix) dub;
-          inherit (legacyPackages.inputs.nixpkgs)
-            cachix
-            nix
-            nix-eval-jobs
-            nix-fast-build
-            ;
-          inherit (legacyPackages.inputs.ethereum-nix) foundry;
-        }
-        // optionalAttrs (system == "x86_64-linux" || system == "aarch64-darwin") {
-          inherit (legacyPackages.inputs.ethereum-nix) geth;
-        }
-        // optionalAttrs isLinux {
-          inherit (inputs'.validator-ejector.packages) validator-ejector;
-        }
-        // optionalAttrs (system == "x86_64-linux") {
-          inherit (pkgs) terraform;
-          inherit (legacyPackages.inputs.terranix) terranix;
-          inherit (legacyPackages.inputs.dlang-nix)
-            dcd
-            dscanner
-            serve-d
-            dmd
-            ldc
-            ;
-          inherit (legacyPackages.inputs.ethereum-nix)
-            mev-boost
-            nethermind
-            web3signer
-            nimbus-eth2
-            ;
-        };
     };
 }