fix: renamed dependencies breaking matchByName

nix-community · Jan 9, 2021 · 7f85c36 · 7f85c36
1 parent ab445ad
commit 7f85c36
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib.nix b/lib.nix
@@ -87,17 +87,20 @@ rec
               then null
               else
                 let
-                  query = p: p.name == k && (lib.substring 0 (4 + lib.stringLength v.git) p.source) == "git+${v.git}";
+                  # Use the 'package' attribute if it exists, which means this is a renamed dependency
+                  # https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#renaming-dependencies-in-cargotoml
+                  key = v.package or k;
+                  query = p: p.name == key && (lib.substring 0 (4 + lib.stringLength v.git) p.source) == "git+${v.git}";
                   extractRevision = url: lib.last (lib.splitString "#" url);
                   parseLock = lock: rec { inherit (lock) name source; revision = extractRevision source; };
                   packageLocks = builtins.map parseLock (lib.filter query cargolock.package);
-                  matchByName = lib.findFirst (p: p.name == k) null packageLocks;
+                  matchByName = lib.findFirst (p: p.name == key) null packageLocks;
                   # Cargo.lock revision is prioritized, because in Cargo.toml short revisions are allowed
                   val = v // { rev = matchByName.revision or v.rev or null; };
                 in
                 lib.filterAttrs (n: _: n == "rev" || n == "tag" || n == "branch") val //
                 {
-                  name = k;
+                  name = key;
                   url = val.git;
                   key = val.rev or val.tag or val.branch or
                     (throw "No 'rev', 'tag' or 'branch' available to specify key, nor a git revision was found in Cargo.lock");