Merge pull request #53 from britter/mandatory-formatting

Make formatting mandatory
numtide · Nov 4, 2024 · 02c9bfa · 02c9bfa
2 parents 5db1750 + a8b6d6e
commit 02c9bfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/flake.nix b/flake.nix
@@ -56,12 +56,16 @@
           }
         );
         formatter = eachSystem (
-          { pkgs, ... }: pkgs.callPackage ./formatter.nix { inputs = publicInputs // privateInputs; }
+          { pkgs, ... }:
+          (pkgs.callPackage ./formatter.nix { inputs = publicInputs // privateInputs; }).config.build.wrapper
         );
 
         checks = eachSystem (
           { pkgs, ... }:
           {
+            formatting =
+              (pkgs.callPackage ./formatter.nix { inputs = publicInputs // privateInputs; }).config.build.check
+                publicInputs.self;
             minimal-machine =
               (pkgs.nixos [
                 publicInputs.self.nixosModules.facter

diff --git a/formatter.nix b/formatter.nix
@@ -2,7 +2,7 @@
 let
   hasNixFmt = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt-rfc-style.compiler;
 in
-inputs.treefmt-nix.lib.mkWrapper pkgs {
+inputs.treefmt-nix.lib.evalModule pkgs {
   projectRootFile = ".git/config";
 
   programs = {