add VersionedNamesForPlatform and PackageNamesForPlatform

Author: savil

internal/devconfig/packages.go

@@ -32,11 +32,6 @@ type Packages struct {
 	Collection []Package `json:"-,omitempty"`
 }
 
-// TODO savil: rm
-func (pkgs *Packages) Kind() int {
-	return int(pkgs.jsonKind)
-}
-
 // VersionedNames returns a list of package names with versions.
 // NOTE: if the package is unversioned, the version will be omitted (doesn't default to @latest).
 //
@@ -249,14 +244,25 @@ func NewPackage(name string, values map[string]any) Package {
 	}
 }
 
-// TODO savil: rm
-func (p *Package) Name() string {
-	return p.name
-}
-
-// TODO savil: rm
-func (p *Package) Kind() int {
-	return int(p.kind)
+// enabledOnPlatform returns whether the package is enabled on the given platform.
+// If the package has a list of platforms, it is enabled only on those platforms.
+// If the package has a list of excluded platforms, it is enabled on all platforms
+// except those.
+func (p *Package) enabledOnPlatform(platform string) bool {
+	if len(p.Platforms) > 0 {
+		for _, plt := range p.Platforms {
+			if plt == platform {
+				return true
+			}
+		}
+		return false
+	}
+	for _, plt := range p.ExcludedPlatforms {
+		if plt == platform {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *Package) VersionedName() string {
@@ -268,8 +274,7 @@ func (p *Package) VersionedName() string {
 }
 
 func (p *Package) IsEnabledOnPlatform() bool {
-	// TODO savil. Next PR will update this implementation
-	return true
+	return p.enabledOnPlatform(nix.MustGetSystem())
 }
 
 func (p *Package) UnmarshalJSON(data []byte) error {
@@ -290,10 +295,6 @@ func (p *Package) UnmarshalJSON(data []byte) error {
 
 	*p = Package(*alias)
 	p.kind = regular
-
-	// TODO savil. needed?
-	//p.Platforms = alias.Platforms
-	//p.ExcludedPlatforms = alias.ExcludedPlatforms
 	return nil
 }
 

internal/devconfig/packages_test.go

@@ -209,24 +209,3 @@ func TestParseVersionedName(t *testing.T) {
 		})
 	}
 }
-
-func TestConvertToKind(t *testing.T) {
-	testCase := Packages{
-		jsonKind:   jsonList,
-		Collection: packagesFromLegacyList([]string{"python", "hello@latest", "[email protected]"}),
-	}
-
-	expected := Packages{
-		jsonKind: jsonMap,
-		Collection: []Package{
-			NewVersionOnlyPackage("python", "" /*version*/),
-			NewVersionOnlyPackage("hello", "latest"),
-			NewVersionOnlyPackage("go", "1.20"),
-		},
-	}
-
-	testCase.convertToKind(jsonMap)
-	if !reflect.DeepEqual(testCase, expected) {
-		t.Errorf("expected: %+v, got: %+v", expected, testCase)
-	}
-}

internal/devpkg/package.go

@@ -412,7 +412,13 @@ func (p *Package) Versioned() string {
 }
 
 func (p *Package) IsLegacy() bool {
-	return p.IsDevboxPackage() && !p.isVersioned() && p.lockfile.Get(p.Raw).GetSource() == ""
+	if !p.IsDevboxPackage() || p.isVersioned() {
+		return false
+	}
+	if p.IsInstallable() {
+		return false
+	}
+	return p.lockfile.Get(p.Raw).GetSource() == ""
 }
 
 func (p *Package) LegacyToVersioned() string {

internal/impl/packages.go

@@ -48,7 +48,6 @@ func (d *Devbox) Add(ctx context.Context, platform, excludePlatform string, pkgs
 	addedPackageNames := []string{}
 	existingPackageNames := d.PackageNames()
 	for _, pkg := range pkgs {
-
 		// If exact versioned package is already in the config, skip.
 		if slices.Contains(existingPackageNames, pkg.Versioned()) {
 			addedPackageNames = append(addedPackageNames, pkg.Versioned())

internal/nix/nix.go

@@ -185,7 +185,8 @@ var nixPlatforms = []string{
 	"x86_64-darwin",
 	"x86_64-linux",
 	// not technically supported, but should work?
-	// ref.
+	// ref. https://nixos.wiki/wiki/Nix_on_ARM
+	// ref. https://github.com/jetpack-io/devbox/pull/1300
 	"armv7l-linux",
 }