nix: fixed usage of derivations' attrs and artifacts

Author: ink-splatters

nix/common/artifacts.nix

@@ -3,22 +3,32 @@
     inherit (config) craneLib commonArgs commonArgsNative;
   in {
     options = {
+      # Production artifacts - minimal dependencies
       cargoArtifacts = lib.mkOption {
         type = lib.types.package;
         default = craneLib.buildDepsOnly (commonArgs
           // {
             pname = "odido-aap";
-            # Include dev dependencies for clippy offline mode
-            cargoCheckExtraArgs = "--all-targets --all-features";
           });
       };
+
       cargoArtifactsNative = lib.mkOption {
         type = lib.types.package;
         default = craneLib.buildDepsOnly (commonArgsNative
           // {
             pname = "odido-aap-native";
           });
       };
+
+      # Development artifacts - includes test/bench deps for clippy offline mode
+      cargoArtifactsDev = lib.mkOption {
+        type = lib.types.package;
+        default = craneLib.buildDepsOnly (commonArgs
+          // {
+            pname = "odido-aap-dev";
+            cargoCheckExtraArgs = "--all-targets";
+          });
+      };
     };
   };
 }

nix/common/default.nix

@@ -1,4 +1,4 @@
-{
+{lib, ...}: {
   imports = [
     ./rust-toolchain.nix
     ./crane-lib.nix
@@ -8,16 +8,23 @@
 
   perSystem = {config, ...}: let
     inherit (config) craneLib commonArgs commonArgsNative cargoArtifacts cargoArtifactsNative;
+
+    meta = {
+      description = "Odido AAP CLI tool";
+      license = lib.licenses.mit;
+      mainProgram = "odido";
+    };
   in {
     packages = {
       odido-aap = craneLib.buildPackage (commonArgs
         // {
-          inherit cargoArtifacts;
+          inherit cargoArtifacts meta;
         });
 
       odido-aap-native = craneLib.buildPackage (commonArgsNative
         // {
-          inherit cargoArtifactsNative;
+          cargoArtifacts = cargoArtifactsNative;
+          inherit meta;
         });
     };
   };

nix/common/rust-toolchain.nix

@@ -1,18 +1,17 @@
 {lib, ...}: {
-  perSystem = {inputs', ...}: {
+  perSystem = {inputs', ...}: let
+    fenix = inputs'.fenix.packages;
+  in {
     options.rust-toolchain = lib.mkOption {
-      type = lib.types.attrs;
-
-      default = with inputs'.fenix.packages;
-      with default;
-        combine [
-          cargo
-          clippy
-          rust-std
-          rustc
-          rustc-unwrapped
-          rustfmt
-        ];
+      type = lib.types.package;
+      default = fenix.combine [
+        fenix.default.cargo
+        fenix.default.clippy
+        fenix.default.rust-std
+        fenix.default.rustc
+        fenix.default.rustc-unwrapped
+        fenix.default.rustfmt
+      ];
     };
   };
 }

nix/dev/checks.nix

@@ -1,37 +1,31 @@
 {
   perSystem = {config, ...}: let
-    inherit (config) craneLib src commonArgs cargoArtifacts;
+    inherit (config) craneLib src commonArgs cargoArtifacts cargoArtifactsDev;
   in {
     checks = {
       inherit (config.packages) odido-aap;
 
-      odido-aap-clippy = craneLib.cargoClippy (
-        commonArgs
+      odido-aap-clippy = craneLib.cargoClippy (commonArgs
         // {
-          inherit cargoArtifacts;
+          cargoArtifacts = cargoArtifactsDev;
           cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-        }
-      );
+        });
 
-      odido-aap-doc = craneLib.cargoDoc (
-        commonArgs
+      odido-aap-doc = craneLib.cargoDoc (commonArgs
         // {
           inherit cargoArtifacts;
-        }
-      );
+        });
 
       odido-aap-fmt = craneLib.cargoFmt {
         inherit src;
       };
 
-      odido-aap-nextest = craneLib.cargoNextest (
-        commonArgs
+      odido-aap-nextest = craneLib.cargoNextest (commonArgs
         // {
-          inherit cargoArtifacts;
+          cargoArtifacts = cargoArtifactsDev;
           partitions = 1;
           partitionType = "count";
-        }
-      );
+        });
     };
   };
 }