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

domenkozar · web-flow · commit 5e4c5ea67826 · 2024-03-20T07:45:18.000+07:00
Fix treefmt flake-parts integration
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; };

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ let`
`32`	`32`	`../modules/all-modules.nix`
`33`	`33`	`{`
`34`	`34`	`inherit tools;`
`35`		`- hooks.treefmt.package = pkgs.treefmt;`
`36`	`35`	`}`
`37`	`36`	`];`
`38`	`37`	`specialArgs = { inherit pkgs; };`