summaryrefslogtreecommitdiff
path: root/parts
diff options
context:
space:
mode:
authorseth <[email protected]>2023-09-07 16:19:07 -0400
committerseth <[email protected]>2023-09-07 17:15:26 -0400
commit9518d623730a362a2cf558cb77d020be8ce50bc8 (patch)
tree8d95998e4d35e0955d8559b9e48b7a60f7766795 /parts
parentf741b550612103dafc1b2ff405de6a816ac5d760 (diff)
flake/actions: replace some crane checks with pre-commit
Diffstat (limited to 'parts')
-rw-r--r--parts/dev.nix33
1 files changed, 5 insertions, 28 deletions
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
];
};
};