Merge pull request #412 from cachix/fix-treefmt-integration

Fix treefmt flake-parts integration
cachix · Mar 20, 2024 · 5e4c5ea · 5e4c5ea
2 parents ecef0bb + cbb3524
commit 5e4c5ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/flake-module.nix b/flake-module.nix
@@ -68,7 +68,7 @@ in
             rootSrc = self.outPath;
             package = lib.mkDefault pkgs.pre-commit;
             tools = import ./nix/call-tools.nix pkgs;
-            settings.treefmt.package = lib.mkIf (options?treefmt) (lib.mkDefault config.treefmt.build.wrapper);
+            hooks.treefmt.package = lib.mkIf (options?treefmt) (lib.mkOverride 900 config.treefmt.build.wrapper);
           };
           pre-commit.devShell = pkgs.mkShell {
             nativeBuildInputs = [ cfg.settings.package ];

diff --git a/nix/default.nix b/nix/default.nix
@@ -32,7 +32,6 @@ let
                 ../modules/all-modules.nix
                 {
                   inherit tools;
-                  hooks.treefmt.package = pkgs.treefmt;
                 }
               ];
               specialArgs = { inherit pkgs; };