Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use the revision from Cargo.lock #137

Merged
merged 2 commits into from
Jan 18, 2021
Merged

feat: use the revision from Cargo.lock #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab445ad
fix: no rev found
yusdacra Jan 9, 2021
7f85c36
fix: renamed dependencies breaking matchByName
yusdacra Jan 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,35 +79,42 @@ rec
, cargolock
}:
let
tomlDependencies = cargotoml:
lib.filter (x: ! isNull x) (
tomlDependencies = cargotoml:
lib.filter (x: ! isNull x) (
lib.mapAttrsToList
(k: v:
if ! (lib.isAttrs v && builtins.hasAttr "git" v)
then null
else lib.filterAttrs (n: _: n == "rev" || n == "tag" || n == "branch") v //
{ name = k;
url = v.git;
key = v.rev or v.tag or v.branch or
(throw "No 'rev', 'tag' or 'branch' available to specify key");
else
let
# 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 == 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 = 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");
checkout = builtins.fetchGit ({
url = v.git;
} // lib.optionalAttrs (v ? rev) {
rev = let
query = p: p.name == k && (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);
match = lib.findFirst (p: lib.substring 0 7 p.revision == lib.substring 0 7 v.rev) null packageLocks;
in
if ! (isNull match) then match.revision else v.rev;
} // lib.optionalAttrs (v ? branch) {
ref = v.branch;
} // lib.optionalAttrs (v ? tag) {
ref = v.tag;
url = val.git;
} // lib.optionalAttrs (val ? rev) {
rev = val.rev;
} // lib.optionalAttrs (val ? branch) {
ref = val.branch;
} // lib.optionalAttrs (val ? tag) {
ref = val.tag;
});
}
) cargotoml.dependencies or {});
) cargotoml.dependencies or { });
in
lib.mapAttrs (_: tomlDependencies) cargotomls;

Expand Down