Skip to content

fix parsing checksums from v1 manifests with latest cargo #381

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix parsing checksums from v1 manifests with latest cargo #381

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7452230
fix parsing checksums from v1 manifests with latest cargo
hallettj Jan 23, 2025
12683ec
remove redundant const
hallettj Jan 23, 2025
de17b5b
Merge branch 'master' into fix-v1-checksums-with-latest-cargo
hallettj Mar 4, 2025
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
38 changes: 18 additions & 20 deletions crate2nix/src/lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,32 +50,30 @@ impl EncodableResolve {
..
} in self.package.iter()
{
let Some((source, checksum)) = Option::zip(source.as_ref(), checksum.as_ref()) else {
let Some(source) = source.as_ref() else {
continue;
};
if checksum == "<none>" {
continue;
}

if let Some(package_id) =
let Some(package_id) =
package_id_by_source.get(&(name.as_str(), source.as_str(), version.clone()))
{
hashes.insert((*package_id).clone(), checksum.clone());
}
}
else {
continue;
};

// Retrieve legacy checksums.
const CHECKSUM_PREFIX: &str = "checksum ";
if let Some(metadata) = &self.metadata {
for (key, value) in metadata {
if key.starts_with(CHECKSUM_PREFIX) {
let package_id = PackageId {
repr: key.trim_start_matches(CHECKSUM_PREFIX).to_string(),
};
if value != "<none>" {
hashes.insert(package_id, value.clone());
}
let checksum = match checksum.as_ref() {
Some(checksum) if checksum == "<none>" => None,
Some(checksum) => Some(checksum),
None => {
// Retrieve legacy checksums.
self.metadata.as_ref().and_then(|metadata| {
let checksum_key = format!("checksum {name} {version} ({source})");
metadata.get(&checksum_key)
})
}
};

if let Some(checksum) = checksum {
hashes.insert((*package_id).clone(), checksum.to_owned());
}
}

Expand Down