ci: fix clippy check

getchoo · Nov 9, 2024 · b0fb19d · b0fb19d
1 parent 3895755
commit b0fb19d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/clippy.yaml b/.github/workflows/clippy.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: Run clippy
         id: clippy-run
         run: |
-          nix build --print-build-logs .#check-clippy
+          nix build --print-build-logs .#checks.x86_64-linux.clippy
           [ -L result ] || exit 1
           echo "sarif-file=$(readlink -f result)" >> "$GITHUB_OUTPUT"
 

diff --git a/flake.nix b/flake.nix
@@ -41,12 +41,15 @@
             '';
         in
         lib.optionalAttrs (lib.elem system supportedSystems) {
-          clippy = packages.nix-forecast.overrideAttrs (oldAttrs: {
+          clippy = packages.nix-forecast.overrideAttrs {
             pname = "check-clippy";
 
-            nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [
+            nativeBuildInputs = [
+              pkgs.cargo
               pkgs.clippy
               pkgs.clippy-sarif
+              pkgs.rustPlatform.cargoSetupHook
+              pkgs.rustc
               pkgs.sarif-fmt
             ];
 
@@ -63,11 +66,12 @@
 
             dontInstall = true;
             doCheck = false;
+            doInstallCheck = false;
             dontFixup = true;
 
             passthru = { };
             meta = { };
-          });
+          };
 
           rustfmt = mkCheck "check-cargo-fmt" [
             pkgs.cargo