ci: use the development shell from crane

A recent crane update [1] added a wrapper for pkgs.mkShell. Another pull request [2] also automatically adds rustfmt and clippy to the dev shell. This commit uses the new crane development shell to simplify the setup. Links: [1] ipetkov/crane#378 [2] ipetkov/crane#432
tfkhim · Oct 29, 2023 · a1857d0 · a1857d0
1 parent 50b0ed2
commit a1857d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 88 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -56,7 +56,7 @@
         sway-workspace-extras = self.packages.${prev.system}.default;
       };
 
-      devShells = forSupportedSystems ({ system, pkgs, ... }:
+      devShells = forSupportedSystems ({ system, pkgs, craneLib, ... }:
         let
           fix = pkgs.writeShellScriptBin "fix" ''
             cargo fmt
@@ -72,14 +72,10 @@
           '';
         in
         {
-          default = pkgs.mkShell {
+          default = craneLib.devShell {
             inputsFrom = [ self.packages.${system}.package ];
 
-            nativeBuildInputs = with pkgs; [
-              cargo
-              rustc
-              clippy
-              rustfmt
+            packages = [
               fix
               checkFmt
               lint