From 9518d623730a362a2cf558cb77d020be8ce50bc8 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 7 Sep 2023 16:19:07 -0400 Subject: flake/actions: replace some crane checks with pre-commit --- parts/dev.nix | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'parts/dev.nix') diff --git a/parts/dev.nix b/parts/dev.nix index fbd319b..556e3b6 100644 --- a/parts/dev.nix +++ b/parts/dev.nix @@ -1,14 +1,7 @@ { - inputs, - self, - ... -}: { perSystem = { config, - craneLib, pkgs, - system, - toolchain, ... }: { pre-commit = { @@ -17,30 +10,11 @@ alejandra.enable = true; deadnix.enable = true; nil.enable = true; + rustfmt.enable = true; statix.enable = true; }; }; - checks = let - inherit (craneLib) cargoAudit cargoClippy cleanCargoSource cargoFmt; - - commonArgs = { - src = cleanCargoSource self; - }; - in { - inherit (self.packages.${system}) teawiebot; - - audit = cargoAudit (commonArgs // {inherit (inputs) advisory-db;}); - - clippy = cargoClippy (commonArgs - // { - inherit (self.packages.${system}) cargoArtifacts; - cargoClippyExtraArgs = "--all-targets"; - }); - - fmt = cargoFmt commonArgs; - }; - devShells = { default = pkgs.mkShell { shellHook = config.pre-commit.installationScript; @@ -51,7 +25,10 @@ nil statix - toolchain + rustc + cargo + rustfmt + clippy ]; }; }; -- cgit v1.2.3