remove ProfileInstallPackage

Author: savil

internal/devbox/util.go

@@ -10,24 +10,29 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
-	"go.jetpack.io/devbox/internal/nix/nixprofile"
 
+	"go.jetpack.io/devbox/internal/devpkg"
+	"go.jetpack.io/devbox/internal/nix/nixprofile"
 	"go.jetpack.io/devbox/internal/xdg"
 )
 
 // addDevboxUtilityPackage adds a package to the devbox utility profile.
 // It's used to install applications devbox might need, like process-compose
 // This is an alternative to a global install which would modify a user's
 // environment.
-func (d *Devbox) addDevboxUtilityPackage(ctx context.Context, pkg string) error {
+func (d *Devbox) addDevboxUtilityPackage(ctx context.Context, pkgName string) error {
+	pkg := devpkg.PackageFromStringWithDefaults(pkgName, d.lockfile)
+	installable, err := pkg.Installable()
+	if err != nil {
+		return err
+	}
 	profilePath, err := utilityNixProfilePath()
 	if err != nil {
 		return err
 	}
-
-	return nixprofile.ProfileInstallPackage(ctx, &nixprofile.ProfileInstallPackageArgs{
-		Lockfile:    d.lockfile,
-		Package:     pkg,
+	return nixprofile.ProfileInstall(ctx, &nixprofile.ProfileInstallArgs{
+		Installable: installable,
+		PackageName: pkgName,
 		ProfilePath: profilePath,
 		Writer:      d.stderr,
 	})

internal/nix/nixprofile/profile.go

@@ -194,32 +194,6 @@ func parseNixProfileListItem(line string) (*NixProfileListItem, error) {
 	}, nil
 }
 
-// TODO drop the Profile prefix from this name.
-type ProfileInstallPackageArgs struct {
-	CustomStepMessage string
-	Lockfile          *lock.File
-	Package           string
-	ProfilePath       string
-	Writer            io.Writer
-}
-
-// ProfileInstallPackage installs a Devbox package into a profile.
-// TODO drop the Profile prefix from this name.
-func ProfileInstallPackage(ctx context.Context, args *ProfileInstallPackageArgs) error {
-	pkg := devpkg.PackageFromStringWithDefaults(args.Package, args.Lockfile)
-	installable, err := pkg.Installable()
-	if err != nil {
-		return err
-	}
-	return ProfileInstall(ctx, &ProfileInstallArgs{
-		CustomStepMessage: args.CustomStepMessage,
-		Installable:       installable,
-		PackageName:       args.Package,
-		ProfilePath:       args.ProfilePath,
-		Writer:            args.Writer,
-	})
-}
-
 // TODO drop the Profile prefix from this name.
 type ProfileInstallArgs struct {
 	CustomStepMessage string
@@ -230,6 +204,8 @@ type ProfileInstallArgs struct {
 	Writer            io.Writer
 }
 
+// ProfileInstall installs a package into a profile. Its a convenience wrapper around nix.ProfileInstall
+// that can print nicer output when installing multiple packages.
 // TODO drop the Profile prefix from this name.
 func ProfileInstall(ctx context.Context, args *ProfileInstallArgs) error {
 	stepMsg := args.PackageName