Skip to content

[lockfile] When updating store-paths, we should update all fields #1530

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

Merged
merged 4 commits into from
Oct 5, 2023
Merged

[lockfile] When updating store-paths, we should update all fields #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63a3de8
[lockfile] When updating store-paths, we should also update the resol…
savil Oct 4, 2023
c08fe1e
update all fields of package, when updating system-infos
savil Oct 5, 2023
4848303
simplify
savil Oct 5, 2023
60ded14
lint fix
savil Oct 5, 2023
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
12 changes: 6 additions & 6 deletions devbox.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
"lockfile_version": "1",
"packages": {
"go@latest": {
"last_modified": "2023-09-10T10:53:27Z",
"resolved": "github:NixOS/nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293#go_1_21",
"last_modified": "2023-09-15T06:49:28Z",
"resolved": "github:NixOS/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e#go_1_21",
"source": "devbox-search",
"version": "1.21.1",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/0xy4l28cjaji04jp2la3s5wzh0n4yb5y-go-1.21.1"
"store_path": "/nix/store/jkhg33806wygpwpix47d2h5scfgn01i8-go-1.21.1"
},
"aarch64-linux": {
"store_path": "/nix/store/mji19qaxy6xd8vlk5j0jk83yslq0lqil-go-1.21.1"
"store_path": "/nix/store/sgkkfw6saficch0mviqyqyw6nj64kzf9-go-1.21.1"
},
"x86_64-darwin": {
"store_path": "/nix/store/7rgm1xhrmf9ygdk0c1qcgjsraxhzjj3g-go-1.21.1"
"store_path": "/nix/store/w67nj5iqgnz0msi8i12kyh9nhsp2ci9n-go-1.21.1"
},
"x86_64-linux": {
"store_path": "/nix/store/vnbz45plc7is6j5pk33dbcq14fbvb658-go-1.21.1"
"store_path": "/nix/store/jk0bqfsjijia52vks1wxqnn4s6dxaiqp-go-1.21.1"
}
}
},
Expand Down
21 changes: 16 additions & 5 deletions internal/impl/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ func (d *Devbox) mergeResolvedPackageToLockfile(
// sync the profile so we don't need to do this manually.
ux.Fwarning(d.stderr, "Failed to remove %s from profile: %s\n", pkg, err)
}
resolved.AllowInsecure = existing.AllowInsecure
lockfile.Packages[pkg.Raw] = resolved
useResolvedPackageInLockfile(lockfile, pkg, resolved, existing)
return nil
}

Expand All @@ -136,25 +135,27 @@ func (d *Devbox) mergeResolvedPackageToLockfile(
userSystem := nix.System()
updated := false
for sysName, newSysInfo := range resolved.Systems {
// Check whether we are actually updating any system info.
if sysName == userSystem {
// The resolved pkg has a system info for the user's system, so add/overwrite it.
if !newSysInfo.Equals(existing.Systems[userSystem]) {
// We only guard this so that the ux messaging is accurate. We could overwrite every time.
lockfile.Packages[pkg.Raw].Systems[userSystem] = newSysInfo
updated = true
}
} else {
// Add other system infos if they don't exist, or if we have a different StorePath. This may
// overwrite an existing CAPath, but to ensure correctness we should ensure that all StorePaths
// overwrite an existing StorePath, but to ensure correctness we should ensure that all StorePaths
// come from the same package version.
existingSysInfo, exists := existing.Systems[sysName]
if !exists || existingSysInfo.StorePath != newSysInfo.StorePath {
lockfile.Packages[pkg.Raw].Systems[sysName] = newSysInfo
updated = true
}
}
}
if updated {
// if we are updating the system info, then we should also update the other fields
useResolvedPackageInLockfile(lockfile, pkg, resolved, existing)

ux.Finfo(d.stderr, "Updated system information for %s\n", pkg)
return nil
}
Expand Down Expand Up @@ -190,3 +191,13 @@ func (d *Devbox) attemptToUpgradeFlake(pkg *devpkg.Package) error {

return nil
}

func useResolvedPackageInLockfile(
lockfile *lock.File,
pkg *devpkg.Package,
resolved *lock.Package,
existing *lock.Package,
) {
lockfile.Packages[pkg.Raw] = resolved
lockfile.Packages[pkg.Raw].AllowInsecure = existing.AllowInsecure
}