update all fields of package, when updating system-infos

Author: savil

devbox.lock

@@ -2,7 +2,7 @@
   "lockfile_version": "1",
   "packages": {
     "go@latest": {
-      "last_modified": "2023-09-10T10:53:27Z",
+      "last_modified": "2023-09-15T06:49:28Z",
       "resolved": "github:NixOS/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e#go_1_21",
       "source": "devbox-search",
       "version": "1.21.1",

internal/impl/update.go

@@ -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
+		useResolved(lockfile, pkg, resolved, existing)
 		return nil
 	}
 
@@ -133,30 +132,33 @@ func (d *Devbox) mergeResolvedPackageToLockfile(
 			lockfile.Packages[pkg.Raw].Systems = map[string]*lock.SystemInfo{}
 		}
 
+		newSystems := map[string]*lock.SystemInfo{}
 		userSystem := nix.System()
 		updated := false
 		for sysName, newSysInfo := range resolved.Systems {
+			newSystems[sysName] = newSysInfo
+
+			// 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 resolved path
-			lockfile.Packages[pkg.Raw].Resolved = resolved.Resolved
+			// if we are updating the system info, then we should also update the other fields
+			useResolved(lockfile, pkg, resolved, existing)
+			lockfile.Packages[pkg.Raw].Systems = newSystems
 
 			ux.Finfo(d.stderr, "Updated system information for %s\n", pkg)
 			return nil
@@ -193,3 +195,13 @@ func (d *Devbox) attemptToUpgradeFlake(pkg *devpkg.Package) error {
 
 	return nil
 }
+
+func useResolved(
+	lockfile *lock.File,
+	pkg *devpkg.Package,
+	resolved *lock.Package,
+	existing *lock.Package,
+) {
+	lockfile.Packages[pkg.Raw] = resolved
+	lockfile.Packages[pkg.Raw].AllowInsecure = existing.AllowInsecure
+}