[per-OS Packages] fix devbox update for unversioned packages with platform/excluded-platform

Author: savil

internal/devconfig/packages.go

@@ -44,6 +44,17 @@ func (pkgs *Packages) VersionedNames() []string {
 	return result
 }
 
+// Get returns the package with the given versionedName
+func (pkgs *Packages) Get(versionedName string) (*Package, bool) {
+	name, version := parseVersionedName(versionedName)
+	for _, pkg := range pkgs.Collection {
+		if pkg.name == name && pkg.Version == version {
+			return &pkg, true
+		}
+	}
+	return nil, false
+}
+
 // Add adds a package to the list of packages
 func (pkgs *Packages) Add(versionedName string) {
 	name, version := parseVersionedName(versionedName)

internal/devpkg/package.go

@@ -341,7 +341,8 @@ func (p *Package) normalizePackageAttributePath() (string, error) {
 	}
 
 	if nix.PkgExistsForAnySystem(query) {
-		return "", usererr.New(
+		return "", usererr.WithUserMessage(
+			ErrCannotBuildPackageOnSystem,
 			"Package \"%s\" was found, but we're unable to build it for your system."+
 				" You may need to choose another version or write a custom flake.",
 			p.String(),
@@ -351,6 +352,8 @@ func (p *Package) normalizePackageAttributePath() (string, error) {
 	return "", usererr.New("Package \"%s\" was not found", p.String())
 }
 
+var ErrCannotBuildPackageOnSystem = errors.New("unable to build for system")
+
 func (p *Package) urlWithoutFragment() string {
 	u := p.URL // get copy
 	u.Fragment = ""

internal/impl/packages.go

@@ -70,8 +70,11 @@ func (d *Devbox) Add(ctx context.Context, platforms, excludePlatforms []string,
 		versionedPkg := devpkg.PackageFromString(pkg.Versioned(), d.lockfile)
 
 		packageNameForConfig := pkg.Raw
-		if ok, err := versionedPkg.ValidateExists(); err == nil && ok {
-			// Only use versioned if it exists in search.
+		ok, err := versionedPkg.ValidateExists()
+		if (err == nil && ok) || errors.Is(err, devpkg.ErrCannotBuildPackageOnSystem) {
+			// Only use versioned if it exists in search. We can disregard the error
+			// about not building on the current system, since user's can continue
+			// via --exclude-platform flag.
 			packageNameForConfig = pkg.Versioned()
 		} else if !versionedPkg.IsDevboxPackage() {
 			// This means it didn't validate and we don't want to fallback to legacy

internal/impl/update.go

@@ -28,13 +28,20 @@ func (d *Devbox) Update(ctx context.Context, pkgs ...string) error {
 	for _, pkg := range inputs {
 		if pkg.IsLegacy() {
 			fmt.Fprintf(d.writer, "Updating %s -> %s\n", pkg.Raw, pkg.LegacyToVersioned())
+
+			// Get the package from the config to get the Platforms and ExcludedPlatforms later
+			cfgPackage, ok := d.cfg.Packages.Get(pkg.Raw)
+			if !ok {
+				return fmt.Errorf("package %s not found in config", pkg.Raw)
+			}
+
 			if err := d.Remove(ctx, pkg.Raw); err != nil {
 				return err
 			}
 			// 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, nil /*platforms*/, nil /*excludePlatforms*/, pkg.Raw); err != nil {
+			if err := d.Add(ctx, cfgPackage.Platforms, cfgPackage.ExcludedPlatforms, pkg.Raw); err != nil {
 				return err
 			}
 		} else {