Add clippy and fmt in multi-stage build

Dusk-Labs · May 26, 2024 · a4a5472 · a4a5472
1 parent 116c494
commit a4a5472
Showing 1 changed file with 38 additions and 24 deletions.
diff --git a/flake.nix b/flake.nix
@@ -20,8 +20,8 @@
       githubActions = nix-github-actions.lib.mkGithubMatrix {
         checks = nixpkgs.lib.getAttrs [
           "x86_64-linux"
-          "x86_64-darwin"
-        ] self.packages; # TODO use self.checks
+          # "x86_64-darwin"
+        ] self.checks;
       };
     }
     // (flake-utils.lib.eachDefaultSystem (
@@ -51,33 +51,47 @@
           # kdialog
         ];
         libPath = pkgs.lib.makeLibraryPath buildInputs;
+        src =
+          let
+            # Only keeps slint files
+            dirFilter = path: _type: builtins.match ".*(assets|src|ui)/.*$" path != null;
+            slintFilter = path: _type: builtins.match ".*slint$" path != null;
+            sourceFilter =
+              path: type:
+              (dirFilter path type) || (slintFilter path type) || (craneLib.filterCargoSources path type);
+          in
+          nixpkgs.lib.cleanSourceWith {
+            src = craneLib.path ./.;
+            filter = sourceFilter;
+          };
+        cargoArtifacts = craneLib.buildDepsOnly {
+          inherit src buildInputs nativeBuildInputs;
+          LD_LIBRARY_PATH = libPath;
+        };
+        kira = craneLib.buildPackage {
+          inherit
+            src
+            buildInputs
+            nativeBuildInputs
+            cargoArtifacts
+            ;
+          LD_LIBRARY_PATH = libPath;
+        };
       in
       {
-        packages.default = craneLib.buildPackage {
-          src =
-            let
-              # Only keeps slint files
-              dirFilter = path: _type: builtins.match ".*(assets|src|ui)/.*$" path != null;
-              slintFilter = path: _type: builtins.match ".*slint$" path != null;
-              sourceFilter =
-                path: type:
-                (dirFilter path type) || (slintFilter path type) || (craneLib.filterCargoSources path type);
-            in
-            nixpkgs.lib.cleanSourceWith {
-              src = craneLib.path ./.;
-              filter = sourceFilter;
-            };
+        packages.default = kira;
 
-          # Add extra inputs here or any other derivation settings
-          # doCheck = true;
-          buildInputs = buildInputs;
-          nativeBuildInputs = nativeBuildInputs;
-          LD_LIBRARY_PATH = libPath;
+        checks = {
+          inherit kira;
+          kira-clippy = craneLib.cargoClippy {
+            inherit cargoArtifacts;
+            cargoClippyExtraArgs = "--all-targets -- --deny warnings";
+          };
+          kira-fmt = craneLib.cargoFmt { inherit src; };
         };
-        # `nix develop`
+
         devShell = pkgs.mkShell {
-          buildInputs = buildInputs;
-          nativeBuildInputs = nativeBuildInputs;
+          inherit buildInputs nativeBuildInputs;
           LD_LIBRARY_PATH = libPath;
         };
       }