Memo again + back compat with cross

Add test for new way to replace `buildRustCrate` while also testing the
old way.

Author: Ericson2314

crate2nix/Cargo.nix

@@ -7,6 +7,11 @@
 , pkgs ? import nixpkgs { config = {}; }
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
+, buildRustCrateForPkgs ? if buildRustCrate != null
+    then lib.warn "`buildRustCrate` is deprecated, use `buildRustCrateForPkgs` instead" (_: buildRustCrate)
+    else pkgs: pkgs.buildRustCrate
+  # Deprecated
+, buildRustCrate ? null
   # This is used as the `crateOverrides` argument for `buildRustCrate`.
 , defaultCrateOverrides ? pkgs.defaultCrateOverrides
   # The features to enable for the root_crate or the workspace_members.
@@ -2290,6 +2295,7 @@ rec {
     { packageId
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
+    , buildRustCrateForPkgsFunc ? null
     , runTests ? false
     , testCrateFlags ? [ ]
     , testInputs ? [ ]
@@ -2303,22 +2309,30 @@ rec {
         , testInputs
         }:
         let
-          buildRustCrateOverrides =
-            if crateOverrides == pkgs.defaultCrateOverrides
-            then { }
-            else {
-              defaultCrateOverrides = crateOverrides;
-            };
+          buildRustCrateForPkgsFuncOverriden =
+            if buildRustCrateForPkgsFunc != null
+            then buildRustCrateForPkgsFunc
+            else
+              (
+                if crateOverrides == pkgs.defaultCrateOverrides
+                then buildRustCrateForPkgs
+                else
+                  pkgs: (buildRustCrateForPkgs pkgs).override {
+                    defaultCrateOverrides = crateOverrides;
+                  }
+              );
           builtRustCrates = builtRustCratesWithFeatures {
-            inherit packageId features buildRustCrateOverrides;
+            inherit packageId features;
+            buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
             runTests = false;
           };
           builtTestRustCrates = builtRustCratesWithFeatures {
-            inherit packageId features buildRustCrateOverrides;
+            inherit packageId features;
+            buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
             runTests = true;
           };
-          drv = builtRustCrates.${packageId};
-          testDrv = builtTestRustCrates.${packageId};
+          drv = builtRustCrates.crates.${packageId};
+          testDrv = builtTestRustCrates.crates.${packageId};
           derivation =
             if runTests then
               crateWithTest
@@ -2333,14 +2347,14 @@ rec {
       )
       { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateForPkgsFunc
      for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
     , features
     , crateConfigs ? crates
-    , buildRustCrateOverrides
+    , buildRustCrateForPkgsFunc
     , runTests
     , target ? defaultTarget
     } @ args:
@@ -2358,10 +2372,18 @@ rec {
               target = target // { test = runTests; };
             }
           );
-        buildByPackageIdForPkgs = pkgs: packageId:
+        # Memoize built packages so that reappearing packages are only built once.
+        builtByPackageIdByPkgs = mkBuiltByPackageIdByPkgs pkgs;
+        mkBuiltByPackageIdByPkgs = pkgs:
+          let
+            self = {
+              crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs;
+              build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
+            };
+          in
+          self;
+        buildByPackageIdForPkgsImpl = self: pkgs: packageId:
           let
-            # proc_macro crates must be compiled for the build architecture
-            cratePkgs = if crateConfig.procMacro or false then pkgs.buildPackages else pkgs;
             features = mergedFeatures."${packageId}" or [ ];
             crateConfig' = crateConfigs."${packageId}";
             crateConfig =
@@ -2373,15 +2395,20 @@ rec {
             dependencies =
               dependencyDerivations {
                 inherit features target;
-                buildByPackageId = buildByPackageIdForPkgs cratePkgs;
+                buildByPackageId = depPackageId:
+                  # proc_macro crates must be compiled for the build architecture
+                  if crateConfigs.${depPackageId}.procMacro or false
+                  then self.build.crates.${depPackageId}
+                  else self.crates.${depPackageId};
                 dependencies =
                   (crateConfig.dependencies or [ ])
                   ++ devDependencies;
               };
             buildDependencies =
               dependencyDerivations {
                 inherit features target;
-                buildByPackageId = buildByPackageIdForPkgs cratePkgs.buildPackages;
+                buildByPackageId = depPackageId:
+                  self.build.crates.${depPackageId};
                 dependencies = crateConfig.buildDependencies or [ ];
               };
             filterEnabledDependenciesForThis = dependencies: filterEnabledDependencies {
@@ -2419,7 +2446,7 @@ rec {
               in
               lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
-          cratePkgs.buildRustCrate.override buildRustCrateOverrides
+          buildRustCrateForPkgsFunc pkgs
             (
               crateConfig // {
                 src = crateConfig.src or (
@@ -2438,7 +2465,7 @@ rec {
               }
             );
       in
-      lib.mapAttrs (packageId: value: buildByPackageIdForPkgs pkgs packageId) crateConfigs;
+      builtByPackageIdByPkgs;
 
   /* Returns the actual derivations for the given dependencies. */
   dependencyDerivations =
@@ -2477,14 +2504,14 @@ rec {
       debug = rec {
         # The built tree as passed to buildRustCrate.
         buildTree = buildRustCrateWithFeatures {
-          buildRustCrateFunc = lib.id;
+          buildRustCrateForPkgsFunc = _: lib.id;
           inherit packageId;
         };
         sanitizedBuildTree = sanitizeForJson buildTree;
         dependencyTree = sanitizeForJson
           (
             buildRustCrateWithFeatures {
-              buildRustCrateFunc = crate: {
+              buildRustCrateForPkgsFunc = _: crate: {
                 "01_crateName" = crate.crateName or false;
                 "02_features" = crate.features or [ ];
                 "03_dependencies" = crate.dependencies or [ ];

crate2nix/templates/Cargo.nix.tera

@@ -9,6 +9,11 @@
 , pkgs ? import nixpkgs { config = {}; }
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
+, buildRustCrateForPkgs ? if buildRustCrate != null
+    then lib.warn "`buildRustCrate` is deprecated, use `buildRustCrateForPkgs` instead" (_: buildRustCrate)
+    else pkgs: pkgs.buildRustCrate
+  # Deprecated
+, buildRustCrate ? null
   # This is used as the `crateOverrides` argument for `buildRustCrate`.
 , defaultCrateOverrides ? pkgs.defaultCrateOverrides
   # The features to enable for the root_crate or the workspace_members.

crate2nix/templates/nix/crate2nix/default.nix

@@ -4,6 +4,10 @@
 { pkgs
 , lib
 , stdenv
+, buildRustCrate
+, buildRustCrateForPkgs ? if buildRustCrate != null
+  then lib.warn "`buildRustCrate` is deprecated, use `buildRustCrateForPkgs` instead" (_: buildRustCrate)
+  else pkgs: pkgs.buildRustCrate
 , defaultCrateOverrides
 , strictDeprecation ? true
 , crates ? { }
@@ -161,6 +165,7 @@ rec {
     { packageId
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
+    , buildRustCrateForPkgsFunc ? null
     , runTests ? false
     , testCrateFlags ? [ ]
     , testInputs ? [ ]
@@ -174,22 +179,30 @@ rec {
         , testInputs
         }:
         let
-          buildRustCrateOverrides =
-            if crateOverrides == pkgs.defaultCrateOverrides
-            then { }
-            else {
-              defaultCrateOverrides = crateOverrides;
-            };
+          buildRustCrateForPkgsFuncOverriden =
+            if buildRustCrateForPkgsFunc != null
+            then buildRustCrateForPkgsFunc
+            else
+              (
+                if crateOverrides == pkgs.defaultCrateOverrides
+                then buildRustCrateForPkgs
+                else
+                  pkgs: (buildRustCrateForPkgs pkgs).override {
+                    defaultCrateOverrides = crateOverrides;
+                  }
+              );
           builtRustCrates = builtRustCratesWithFeatures {
-            inherit packageId features buildRustCrateOverrides;
+            inherit packageId features;
+            buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
             runTests = false;
           };
           builtTestRustCrates = builtRustCratesWithFeatures {
-            inherit packageId features buildRustCrateOverrides;
+            inherit packageId features;
+            buildRustCrateForPkgsFunc = buildRustCrateForPkgsFuncOverriden;
             runTests = true;
           };
-          drv = builtRustCrates.${packageId};
-          testDrv = builtTestRustCrates.${packageId};
+          drv = builtRustCrates.crates.${packageId};
+          testDrv = builtTestRustCrates.crates.${packageId};
           derivation =
             if runTests then
               crateWithTest
@@ -204,14 +217,14 @@ rec {
       )
       { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateForPkgsFunc
      for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
     , features
     , crateConfigs ? crates
-    , buildRustCrateOverrides
+    , buildRustCrateForPkgsFunc
     , runTests
     , target ? defaultTarget
     } @ args:
@@ -229,10 +242,18 @@ rec {
               target = target // { test = runTests; };
             }
           );
-        buildByPackageIdForPkgs = pkgs: packageId:
+        # Memoize built packages so that reappearing packages are only built once.
+        builtByPackageIdByPkgs = mkBuiltByPackageIdByPkgs pkgs;
+        mkBuiltByPackageIdByPkgs = pkgs:
+          let
+            self = {
+              crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs;
+              build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
+            };
+          in
+          self;
+        buildByPackageIdForPkgsImpl = self: pkgs: packageId:
           let
-            # proc_macro crates must be compiled for the build architecture
-            cratePkgs = if crateConfig.procMacro or false then pkgs.buildPackages else pkgs;
             features = mergedFeatures."${packageId}" or [ ];
             crateConfig' = crateConfigs."${packageId}";
             crateConfig =
@@ -244,15 +265,20 @@ rec {
             dependencies =
               dependencyDerivations {
                 inherit features target;
-                buildByPackageId = buildByPackageIdForPkgs cratePkgs;
+                buildByPackageId = depPackageId:
+                  # proc_macro crates must be compiled for the build architecture
+                  if crateConfigs.${depPackageId}.procMacro or false
+                  then self.build.crates.${depPackageId}
+                  else self.crates.${depPackageId};
                 dependencies =
                   (crateConfig.dependencies or [ ])
                   ++ devDependencies;
               };
             buildDependencies =
               dependencyDerivations {
                 inherit features target;
-                buildByPackageId = buildByPackageIdForPkgs cratePkgs.buildPackages;
+                buildByPackageId = depPackageId:
+                  self.build.crates.${depPackageId};
                 dependencies = crateConfig.buildDependencies or [ ];
               };
             filterEnabledDependenciesForThis = dependencies: filterEnabledDependencies {
@@ -290,7 +316,7 @@ rec {
               in
               lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
-          cratePkgs.buildRustCrate.override buildRustCrateOverrides
+          buildRustCrateForPkgsFunc pkgs
             (
               crateConfig // {
                 src = crateConfig.src or (
@@ -309,7 +335,7 @@ rec {
               }
             );
       in
-      lib.mapAttrs (packageId: value: buildByPackageIdForPkgs pkgs packageId) crateConfigs;
+      builtByPackageIdByPkgs;
 
   /* Returns the actual derivations for the given dependencies. */
   dependencyDerivations =
@@ -348,14 +374,14 @@ rec {
       debug = rec {
         # The built tree as passed to buildRustCrate.
         buildTree = buildRustCrateWithFeatures {
-          buildRustCrateFunc = lib.id;
+          buildRustCrateForPkgsFunc = _: lib.id;
           inherit packageId;
         };
         sanitizedBuildTree = sanitizeForJson buildTree;
         dependencyTree = sanitizeForJson
           (
             buildRustCrateWithFeatures {
-              buildRustCrateFunc = crate: {
+              buildRustCrateForPkgsFunc = _: crate: {
                 "01_crateName" = crate.crateName or false;
                 "02_features" = crate.features or [ ];
                 "03_dependencies" = crate.dependencies or [ ];

crate2nix/templates/nix/crate2nix/tests/dependencyDerivations.nix

@@ -1,10 +1,10 @@
 { lib, crate2nix }:
 let
-  fakeCrates = packageId: {
+  fakeCrates = {
     "pkg_id1" = "pkg_id1";
     "pkg_id2" = "pkg_id2";
     "pkg_id3" = "pkg_id3";
-  }.${packageId};
+  };
   fakeDependencies = [
     {
       name = "id1";
@@ -23,7 +23,7 @@ let
   ];
   dependencyDerivations = features: dependencies:
     crate2nix.dependencyDerivations {
-      buildByPackageId = fakeCrates;
+      buildByPackageId = p: fakeCrates.${p};
       target = crate2nix.defaultTarget;
       inherit features dependencies;
     };