Skip to content

Commit

Permalink
update Cargo.lock after other hashes
Browse files Browse the repository at this point in the history
as `update_cargo_lock()` overrides the top level derivations, this will
cause hash mismatch errors in the event of other FODs being used in the
environment (i.e., `pnpmDeps`) during updates if they also need to be
updated
  • Loading branch information
getchoo authored and mergify[bot] committed Jun 25, 2024
1 parent dacee6f commit 0add018
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions nix_update/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,6 @@ def update(opts: Options) -> Package:
if package.cargo_deps:
update_cargo_deps_hash(opts, package.filename, package.cargo_deps)

if isinstance(package.cargo_lock, CargoLockInSource) or isinstance(
package.cargo_lock, CargoLockInStore
):
update_cargo_lock(opts, package.filename, package.cargo_lock)

if package.composer_deps:
update_composer_deps_hash(opts, package.filename, package.composer_deps)

Expand All @@ -404,4 +399,9 @@ def update(opts: Options) -> Package:
if package.maven_deps:
update_maven_deps_hash(opts, package.filename, package.maven_deps)

if isinstance(package.cargo_lock, CargoLockInSource) or isinstance(
package.cargo_lock, CargoLockInStore
):
update_cargo_lock(opts, package.filename, package.cargo_lock)

return package

0 comments on commit 0add018

Please sign in to comment.