Fix #83 - versioned crateRenames

Depends on NixOS/nixpkgs#84179
nix-community · Apr 3, 2020 · 10d8de9 · 10d8de9
1 parent 874272b
commit 10d8de9
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 54 deletions.
diff --git a/crate2nix/Cargo.nix b/crate2nix/Cargo.nix
@@ -2696,7 +2696,7 @@ rec {
           )
         )
 
-        # Filter out nix-build result symlinks        
+        # Filter out nix-build result symlinks
         || (
           type == "symlink" && lib.hasPrefix "result" baseName
         )
@@ -2828,8 +2828,8 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
-     for the corresponding crate. 
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+     for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
@@ -2895,10 +2895,26 @@ rec {
                     ++ devDependencies
                   )
               );
-
+            # Crate renames have the form:
+            #
+            # {
+            #    crate_name = [
+            #       { version = "1.2.3"; rename = "crate_name01"; }
+            #    ];
+            #    # ...
+            # }
             crateRenames =
-              builtins.listToAttrs
-                (map (d: { name = d.name; value = d.rename; }) dependenciesWithRenames);
+              let
+                grouped =
+                  lib.groupBy
+                    (dependency: dependency.name)
+                    dependenciesWithRenames;
+                versionAndRename = dep:
+                  let
+                    package = builtByPackageId."${dep.packageId}";
+                  in
+                    { inherit (dep) rename; version = package.version; };
+              in lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
             buildRustCrateFunc (
               crateConfig // {
@@ -2935,7 +2951,7 @@ rec {
         map depDerivation enabledDependencies;
 
   /* Returns a sanitized version of val with all values substituted that cannot
-     be serialized as JSON. 
+     be serialized as JSON.
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
@@ -2980,7 +2996,7 @@ rec {
 
   /* Returns differences between cargo default features and crate2nix default
      features.
-   
+
      This is useful for verifying the feature resolution in crate2nix.
   */
   diffDefaultPackageFeatures =
@@ -3153,7 +3169,7 @@ rec {
 
   /*
      Returns the actual features for the given dependency.
-    
+
      features: The features of the crate that refers this dependency.
   */
   dependencyFeatures = features: dependency:

diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix
@@ -61,7 +61,7 @@ rec {
           )
         )
 
-        # Filter out nix-build result symlinks        
+        # Filter out nix-build result symlinks
         || (
           type == "symlink" && lib.hasPrefix "result" baseName
         )
@@ -193,8 +193,8 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
-     for the corresponding crate. 
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+     for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
@@ -260,10 +260,26 @@ rec {
                     ++ devDependencies
                   )
               );
-
+            # Crate renames have the form:
+            #
+            # {
+            #    crate_name = [
+            #       { version = "1.2.3"; rename = "crate_name01"; }
+            #    ];
+            #    # ...
+            # }
             crateRenames =
-              builtins.listToAttrs
-                (map (d: { name = d.name; value = d.rename; }) dependenciesWithRenames);
+              let
+                grouped =
+                  lib.groupBy
+                    (dependency: dependency.name)
+                    dependenciesWithRenames;
+                versionAndRename = dep:
+                  let
+                    package = builtByPackageId."${dep.packageId}";
+                  in
+                    { inherit (dep) rename; version = package.version; };
+              in lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
             buildRustCrateFunc (
               crateConfig // {
@@ -300,7 +316,7 @@ rec {
         map depDerivation enabledDependencies;
 
   /* Returns a sanitized version of val with all values substituted that cannot
-     be serialized as JSON. 
+     be serialized as JSON.
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
@@ -345,7 +361,7 @@ rec {
 
   /* Returns differences between cargo default features and crate2nix default
      features.
-   
+
      This is useful for verifying the feature resolution in crate2nix.
   */
   diffDefaultPackageFeatures =
@@ -518,7 +534,7 @@ rec {
 
   /*
      Returns the actual features for the given dependency.
-    
+
      features: The features of the crate that refers this dependency.
   */
   dependencyFeatures = features: dependency:

diff --git a/sample_projects/bin_with_git_branch_dep/Cargo.nix b/sample_projects/bin_with_git_branch_dep/Cargo.nix
@@ -163,7 +163,7 @@ rec {
           )
         )
 
-        # Filter out nix-build result symlinks        
+        # Filter out nix-build result symlinks
         || (
           type == "symlink" && lib.hasPrefix "result" baseName
         )
@@ -295,8 +295,8 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
-     for the corresponding crate. 
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+     for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
@@ -362,10 +362,26 @@ rec {
                     ++ devDependencies
                   )
               );
-
+            # Crate renames have the form:
+            #
+            # {
+            #    crate_name = [
+            #       { version = "1.2.3"; rename = "crate_name01"; }
+            #    ];
+            #    # ...
+            # }
             crateRenames =
-              builtins.listToAttrs
-                (map (d: { name = d.name; value = d.rename; }) dependenciesWithRenames);
+              let
+                grouped =
+                  lib.groupBy
+                    (dependency: dependency.name)
+                    dependenciesWithRenames;
+                versionAndRename = dep:
+                  let
+                    package = builtByPackageId."${dep.packageId}";
+                  in
+                    { inherit (dep) rename; version = package.version; };
+              in lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
             buildRustCrateFunc (
               crateConfig // {
@@ -402,7 +418,7 @@ rec {
         map depDerivation enabledDependencies;
 
   /* Returns a sanitized version of val with all values substituted that cannot
-     be serialized as JSON. 
+     be serialized as JSON.
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
@@ -447,7 +463,7 @@ rec {
 
   /* Returns differences between cargo default features and crate2nix default
      features.
-   
+
      This is useful for verifying the feature resolution in crate2nix.
   */
   diffDefaultPackageFeatures =
@@ -620,7 +636,7 @@ rec {
 
   /*
      Returns the actual features for the given dependency.
-    
+
      features: The features of the crate that refers this dependency.
   */
   dependencyFeatures = features: dependency:

diff --git a/sample_projects/bin_with_git_submodule_dep/Cargo.nix b/sample_projects/bin_with_git_submodule_dep/Cargo.nix
@@ -1336,7 +1336,7 @@ rec {
           )
         )
 
-        # Filter out nix-build result symlinks        
+        # Filter out nix-build result symlinks
         || (
           type == "symlink" && lib.hasPrefix "result" baseName
         )
@@ -1468,8 +1468,8 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
-     for the corresponding crate. 
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+     for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
@@ -1535,10 +1535,26 @@ rec {
                     ++ devDependencies
                   )
               );
-
+            # Crate renames have the form:
+            #
+            # {
+            #    crate_name = [
+            #       { version = "1.2.3"; rename = "crate_name01"; }
+            #    ];
+            #    # ...
+            # }
             crateRenames =
-              builtins.listToAttrs
-                (map (d: { name = d.name; value = d.rename; }) dependenciesWithRenames);
+              let
+                grouped =
+                  lib.groupBy
+                    (dependency: dependency.name)
+                    dependenciesWithRenames;
+                versionAndRename = dep:
+                  let
+                    package = builtByPackageId."${dep.packageId}";
+                  in
+                    { inherit (dep) rename; version = package.version; };
+              in lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
             buildRustCrateFunc (
               crateConfig // {
@@ -1575,7 +1591,7 @@ rec {
         map depDerivation enabledDependencies;
 
   /* Returns a sanitized version of val with all values substituted that cannot
-     be serialized as JSON. 
+     be serialized as JSON.
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
@@ -1620,7 +1636,7 @@ rec {
 
   /* Returns differences between cargo default features and crate2nix default
      features.
-   
+
      This is useful for verifying the feature resolution in crate2nix.
   */
   diffDefaultPackageFeatures =
@@ -1793,7 +1809,7 @@ rec {
 
   /*
      Returns the actual features for the given dependency.
-    
+
      features: The features of the crate that refers this dependency.
   */
   dependencyFeatures = features: dependency:

diff --git a/sample_projects/codegen/Cargo.nix b/sample_projects/codegen/Cargo.nix
@@ -515,7 +515,7 @@ rec {
           )
         )
 
-        # Filter out nix-build result symlinks        
+        # Filter out nix-build result symlinks
         || (
           type == "symlink" && lib.hasPrefix "result" baseName
         )
@@ -647,8 +647,8 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags testInputs; };
 
-  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
-     for the corresponding crate. 
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc
+     for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
@@ -714,10 +714,26 @@ rec {
                     ++ devDependencies
                   )
               );
-
+            # Crate renames have the form:
+            #
+            # {
+            #    crate_name = [
+            #       { version = "1.2.3"; rename = "crate_name01"; }
+            #    ];
+            #    # ...
+            # }
             crateRenames =
-              builtins.listToAttrs
-                (map (d: { name = d.name; value = d.rename; }) dependenciesWithRenames);
+              let
+                grouped =
+                  lib.groupBy
+                    (dependency: dependency.name)
+                    dependenciesWithRenames;
+                versionAndRename = dep:
+                  let
+                    package = builtByPackageId."${dep.packageId}";
+                  in
+                    { inherit (dep) rename; version = package.version; };
+              in lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
           in
             buildRustCrateFunc (
               crateConfig // {
@@ -754,7 +770,7 @@ rec {
         map depDerivation enabledDependencies;
 
   /* Returns a sanitized version of val with all values substituted that cannot
-     be serialized as JSON. 
+     be serialized as JSON.
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
@@ -799,7 +815,7 @@ rec {
 
   /* Returns differences between cargo default features and crate2nix default
      features.
-   
+
      This is useful for verifying the feature resolution in crate2nix.
   */
   diffDefaultPackageFeatures =
@@ -972,7 +988,7 @@ rec {
 
   /*
      Returns the actual features for the given dependency.
-    
+
      features: The features of the crate that refers this dependency.
   */
   dependencyFeatures = features: dependency: