diff --git a/flake-parts/formatting.nix b/flake-parts/formatting.nix index d3d7f45..3380342 100644 --- a/flake-parts/formatting.nix +++ b/flake-parts/formatting.nix @@ -13,15 +13,11 @@ pkgs.rustfmt ]; - # wrap treefmt to provide the correct PATH with all formatters - treefmt = pkgs.stdenv.mkDerivation { + treefmt = pkgs.writeShellApplication { name = "treefmt"; - buildInputs = [pkgs.makeWrapper]; - buildCommand = '' - makeWrapper \ - ${pkgs.treefmt}/bin/treefmt \ - $out/bin/treefmt \ - --prefix PATH : ${lib.makeBinPath formatters} + runtimeInputs = [pkgs.treefmt] ++ formatters; + text = '' + exec treefmt "$@" ''; }; in { diff --git a/flake-parts/pre-commit.nix b/flake-parts/pre-commit.nix index 2f42613..c05463c 100644 --- a/flake-parts/pre-commit.nix +++ b/flake-parts/pre-commit.nix @@ -11,15 +11,10 @@ settings = { src = ../.; hooks = { - treefmt = { - enable = true; - name = "treefmt"; - description = "format the code"; - types = ["file"]; - pass_filenames = true; - entry = "${self'.packages.treefmt}/bin/treefmt"; - }; + treefmt.enable = true; }; + + settings.treefmt.package = self'.packages.treefmt; }; }; }; diff --git a/flake.lock b/flake.lock index ce2702e..2a0831c 100644 --- a/flake.lock +++ b/flake.lock @@ -1247,11 +1247,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1678898370, - "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac718d02867a84b42522a0ece52d841188208f2c", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { @@ -1374,11 +1374,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1678976941, - "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=", + "lastModified": 1682596858, + "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e", + "rev": "fb58866e20af98779017134319b5663b8215d912", "type": "github" }, "original": {