Add source field in lock file and handle devbox update command

Author: LucilleH

internal/devpkg/package.go

@@ -403,7 +403,7 @@ func (p *Package) Versioned() string {
 }
 
 func (p *Package) IsLegacy() bool {
-	return p.isDevboxPackage() && !p.isVersioned()
+	return p.isDevboxPackage() && !p.isVersioned() && p.lockfile.Source(p.Raw) == ""
 }
 
 func (p *Package) LegacyToVersioned() string {

internal/impl/update.go

@@ -31,12 +31,10 @@ func (d *Devbox) Update(ctx context.Context, pkgs ...string) error {
 			if err := d.Remove(ctx, pkg.Raw); err != nil {
 				return err
 			}
-			if err := d.lockfile.ResolveToCurrentNixpkgCommitHash(
-				pkg.LegacyToVersioned(),
-			); err != nil {
-				return err
-			}
-			if err := d.Add(ctx, pkg.LegacyToVersioned()); err != nil {
+			// Calling Add function with the original package names, since
+			// Add will automatically append @latest if search is able to handle that.
+			// If not, it will fallback to the nixpkg format.
+			if err := d.Add(ctx, pkg.Raw); err != nil {
 				return err
 			}
 		} else {

internal/lock/interfaces.go

@@ -14,4 +14,5 @@ type Locker interface {
 	LegacyNixpkgsPath(string) string
 	ProjectDir() string
 	Resolve(string) (*Package, error)
+	Source(string) string
 }

internal/lock/lockfile.go

@@ -17,6 +17,10 @@ import (
 )
 
 const lockFileVersion = "1"
+const (
+	NixpkgSource       string = "nixpkg"
+	DevboxSearchSource        = "devbox-search"
+)
 
 // Lightly inspired by package-lock.json
 type File struct {
@@ -32,6 +36,7 @@ type Package struct {
 	LastModified  string `json:"last_modified,omitempty"`
 	PluginVersion string `json:"plugin_version,omitempty"`
 	Resolved      string `json:"resolved,omitempty"`
+	Source        string `json:"source,omitempty"`
 	Version       string `json:"version,omitempty"`
 	// Systems is keyed by the system name
 	Systems map[string]*SystemInfo `json:"systems,omitempty"`
@@ -97,7 +102,10 @@ func (l *File) Resolve(pkg string) (*Package, error) {
 		} else if IsLegacyPackage(pkg) {
 			// These are legacy packages without a version. Resolve to nixpkgs with
 			// whatever hash is in the devbox.json
-			locked = &Package{Resolved: l.LegacyNixpkgsPath(pkg)}
+			locked = &Package{
+				Resolved: l.LegacyNixpkgsPath(pkg),
+				Source:   NixpkgSource,
+			}
 		}
 		l.Packages[pkg] = locked
 	}
@@ -117,7 +125,10 @@ func (l *File) ResolveToCurrentNixpkgCommitHash(pkg string) error {
 			"only allowed version is @latest. Otherwise we can't guarantee the " +
 				"version will resolve")
 	}
-	l.Packages[pkg] = &Package{Resolved: l.LegacyNixpkgsPath(name)}
+	l.Packages[pkg] = &Package{
+		Resolved: l.LegacyNixpkgsPath(name),
+		Source:   NixpkgSource,
+	}
 	return nil
 }
 
@@ -133,6 +144,14 @@ func (l *File) LegacyNixpkgsPath(pkg string) string {
 	)
 }
 
+func (l *File) Source(pkg string) string {
+	entry, hasEntry := l.Packages[pkg]
+	if !hasEntry || entry.Resolved == "" {
+		return ""
+	}
+	return entry.Source
+}
+
 // This probably belongs in input.go but can't add it there because it will
 // create a circular dependency. We could move Input into own package.
 func IsLegacyPackage(pkg string) bool {

internal/lock/resolve.go

@@ -57,6 +57,7 @@ func (l *File) FetchResolvedPackage(pkg string) (*Package, error) {
 			packageInfo.AttrPaths[0],
 		),
 		Version: packageInfo.Version,
+		Source:  DevboxSearchSource,
 		Systems: sysInfos,
 	}, nil
 }