build kinds

Author: jordanisaacs

crate2nix/Cargo.nix

@@ -1,6 +1,6 @@
 //! Resolve dependencies and other data for CrateDerivation.
-
 use anyhow::format_err;
+use anyhow::Context;
 use anyhow::Error;
 use cargo_metadata::Node;
 use cargo_metadata::Package;
@@ -141,11 +141,16 @@ impl CrateDerivation {
             .iter()
             .any(|t| t.kind.iter().any(|k| k == "proc-macro"));
 
+        // Binaries have one kind:
+        // https://github.com/rust-lang/cargo/blob/94394ebf2a6b6f1c1d6c160b48865a06e54d5f30/src/cargo/core/manifest.rs#L126
         let binaries = package
             .targets
             .iter()
             .filter_map(|t| {
-                if t.kind.iter().any(|k| k == "bin") {
+                if t.kind
+                    .iter()
+                    .any(|k| k == "bin" || k == "example" || k == "bench" || k == "test")
+                {
                     BuildTarget::new(&t, &package_path).ok()
                 } else {
                     None
@@ -333,23 +338,33 @@ pub fn double_crate_with_rename() {
 pub struct BuildTarget {
     /// The name of the build target.
     pub name: String,
+    /// The kind of the build target.
+    pub kind: String,
     /// The relative path of the target source file.
     pub src_path: PathBuf,
     /// The crate's features that need to be enabled for this target to be compiled.
     /// Otherwise, this target is ignored.
     pub required_features: Vec<String>,
+    /// Whether to test this binary
+    pub test: bool,
 }
 
 impl BuildTarget {
     pub fn new(target: &Target, package_path: impl AsRef<Path>) -> Result<BuildTarget, Error> {
         Ok(BuildTarget {
             name: target.name.clone(),
+            kind: target
+                .kind
+                .first()
+                .context("Target shouuld have kind")?
+                .to_string(),
             src_path: target
                 .src_path
                 .canonicalize()?
                 .strip_prefix(&package_path)?
                 .to_path_buf(),
             required_features: target.required_features.clone(),
+            test: target.test,
         })
     }
 }

crate2nix/src/resolve.rs

@@ -106,6 +106,11 @@ rec {
           {
             name = {{ bin.name }};
             path = {{ bin.src_path }};
+            kind = {{ bin.kind }};
+            test = {{ bin.test }};
+            # TODO (when cargo merges metadata):
+            # harness
+            # bench
             requiredFeatures = [ {% for feature in bin.required_features %}{{feature}} {% endfor %}];
           }
         {%- endfor %}

crate2nix/templates/Cargo.nix.tera

@@ -110,7 +110,7 @@ rec {
           drv = testCrate.override
             (
               _: {
-                buildTests = true;
+                buildKinds = [ "test" ];
               }
             );
           # If the user hasn't set any pre/post commands, we don't want to
@@ -176,7 +176,8 @@ rec {
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
     , buildRustCrateForPkgsFunc ? null
-    , runTests ? false
+      # Available: [ "lib" "bin" ] or ["test" "bench" "example"]
+    , buildKinds ? [ "lib" "bin" ]
     , testCrateFlags ? [ ]
     , testInputs ? [ ]
       # Any command to run immediatelly before a test is executed.
@@ -188,13 +189,25 @@ rec {
       (
         { features
         , crateOverrides
-        , runTests
+        , buildKinds
         , testCrateFlags
         , testInputs
         , testPreRun
         , testPostRun
         }:
         let
+          isDevBuild =
+            let
+              inherit (pkgs.buildRustCrateHelpers.kinds) isLib isBin isExample isTest isBench;
+
+              notDev = builtins.any (k: isLib k || isBin k) buildKinds;
+              isDev = builtins.any (k: isBench k || isExample k || isTest k) buildKinds;
+            in
+            assert (buildKinds != [ ]);
+            # Can't have build dev and non dev kinds
+            assert (notDev != isDev);
+            isDev;
+
           buildRustCrateForPkgsFuncOverriden =
             if buildRustCrateForPkgsFunc != null
             then buildRustCrateForPkgsFunc
@@ -207,31 +220,16 @@ rec {
                     defaultCrateOverrides = crateOverrides;
                   }
               );
+
           builtRustCrates = builtRustCratesWithFeatures {
-            inherit packageId features;
-            buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
-            runTests = false;
-          };
-          builtTestRustCrates = builtRustCratesWithFeatures {
-            inherit packageId features;
+            inherit packageId features buildKinds isDevBuild;
             buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
-            runTests = true;
           };
-          drv = builtRustCrates.crates.${packageId};
-          testDrv = builtTestRustCrates.crates.${packageId};
-          derivation =
-            if runTests then
-              crateWithTest
-                {
-                  crate = drv;
-                  testCrate = testDrv;
-                  inherit testCrateFlags testInputs testPreRun testPostRun;
-                }
-            else drv;
+
         in
-        derivation
+        builtRustCrates.crates.${packageId}
       )
-      { inherit features crateOverrides runTests testCrateFlags testInputs testPreRun testPostRun; };
+      { inherit features crateOverrides buildKinds testCrateFlags testInputs testPreRun testPostRun; };
 
   /* Returns an attr set with packageId mapped to the result of buildRustCrateForPkgsFunc
     for the corresponding crate.
@@ -241,21 +239,24 @@ rec {
     , features
     , crateConfigs ? crates
     , buildRustCrateForPkgsFunc
-    , runTests
+    , buildKinds
+    , isDevBuild
     , makeTarget ? makeDefaultTarget
     } @ args:
       assert (builtins.isAttrs crateConfigs);
       assert (builtins.isString packageId);
       assert (builtins.isList features);
       assert (builtins.isAttrs (makeTarget stdenv.hostPlatform));
-      assert (builtins.isBool runTests);
+      assert (builtins.isBool isDevBuild);
+      assert (builtins.isList buildKinds);
       let
         rootPackageId = packageId;
         mergedFeatures = mergePackageFeatures
           (
             args // {
               inherit rootPackageId;
-              target = makeTarget stdenv.hostPlatform // { test = runTests; };
+              # What does test do for target?
+              target = makeTarget stdenv.hostPlatform // { test = false; };
             }
           );
         # Memoize built packages so that reappearing packages are only built once.
@@ -277,7 +278,7 @@ rec {
               builtins.removeAttrs crateConfig' [ "resolvedDefaultFeatures" "devDependencies" ];
             devDependencies =
               lib.optionals
-                (runTests && packageId == rootPackageId)
+                (isDevBuild && packageId == rootPackageId)
                 (crateConfig'.devDependencies or [ ]);
             dependencies =
               dependencyDerivations {
@@ -351,6 +352,7 @@ rec {
                   }
                 );
                 extraRustcOpts = lib.lists.optional (targetFeatures != [ ]) "-C target-feature=${lib.concatMapStringsSep "," (x: "+${x}") targetFeatures}";
+                buildKinds = if (packageId == rootPackageId) then buildKinds else [ "lib" ];
                 inherit features dependencies buildDependencies crateRenames release;
               }
             );
@@ -472,7 +474,7 @@ rec {
     , featuresByPackageId ? { }
     , target
       # Adds devDependencies to the crate with rootPackageId.
-    , runTests ? false
+    , isDevBuild ? false
     , ...
     } @ args:
       assert (builtins.isAttrs crateConfigs);
@@ -482,7 +484,7 @@ rec {
       assert (builtins.isList dependencyPath);
       assert (builtins.isAttrs featuresByPackageId);
       assert (builtins.isAttrs target);
-      assert (builtins.isBool runTests);
+      assert (builtins.isBool isDevBuild);
       let
         crateConfig = crateConfigs."${packageId}" or (builtins.throw "Package not found: ${packageId}");
         expandedFeatures = expandFeatures (crateConfig.features or { }) features;
@@ -517,7 +519,7 @@ rec {
                   mergePackageFeatures {
                     features = combinedFeatures;
                     featuresByPackageId = cache;
-                    inherit crateConfigs packageId target runTests rootPackageId;
+                    inherit crateConfigs packageId target isDevBuild rootPackageId;
                   }
             );
         cacheWithSelf =
@@ -533,7 +535,7 @@ rec {
             (
               crateConfig.dependencies or [ ]
               ++ lib.optionals
-                (runTests && packageId == rootPackageId)
+                (isDevBuild && packageId == rootPackageId)
                 (crateConfig.devDependencies or [ ])
             );
         cacheWithAll =

crate2nix/templates/nix/crate2nix/default.nix

@@ -48,15 +48,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-unstable",
-        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "homepage": "https://github.com/NixOS/nixpkgs",
-        "owner": "NixOS",
+        "branch": "brc-kinds",
+        "description": "Nix Packages collection",
+        "homepage": "",
+        "owner": "jordanisaacs",
         "repo": "nixpkgs",
-        "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
-        "sha256": "00gx09447gzgxlzwih4hdj51sdg62xanikkgr4bv4y7fpm98qirq",
+        "rev": "80e5dddc787b05ec91188a58a00627542bfb5b90",
+        "sha256": "0aaxkvmlr19963dr6z8bracjsjzyh3v6scn7wxqpixvfvmf9awql",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/0c4800d579af4ed98ecc47d464a5e7b0870c4b1f.tar.gz",
+        "url": "https://github.com/jordanisaacs/nixpkgs/archive/80e5dddc787b05ec91188a58a00627542bfb5b90.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {