fixes

Author: savil

internal/devbox/nixprofile.go

@@ -4,28 +4,24 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os/exec"
 	"slices"
 
 	"go.jetpack.io/devbox/internal/nix"
 )
 
 func syncFlakeToProfile(ctx context.Context, flakePath, profilePath string) error {
-	cmd := exec.CommandContext(ctx, "nix", "eval", "--json", flakePath+"#devShells."+nix.System()+".default.buildInputs")
-	cmd.Args = append(cmd.Args, nix.ExperimentalFlags()...)
-	b, err := cmd.Output()
+	cmd := nix.CommandContext(ctx, "nix", "eval", "--json", flakePath+"#devShells."+nix.System()+".default.buildInputs")
+	buildInputPaths, err := cmd.Output()
 	if err != nil {
-
 		return fmt.Errorf("nix eval devShells: %v", err)
 	}
 	storePaths := []string{}
-	if err := json.Unmarshal(b, &storePaths); err != nil {
-		return fmt.Errorf("unmarshal store paths: %s: %v", b, err)
+	if err := json.Unmarshal(buildInputPaths, &storePaths); err != nil {
+		return fmt.Errorf("unmarshal store paths: %s: %v", buildInputPaths, err)
 	}
 
-	listCmd := exec.CommandContext(ctx, "nix", "profile", "list", "--json", "--profile", profilePath)
-	listCmd.Args = append(listCmd.Args, nix.ExperimentalFlags()...)
-	b, err = listCmd.Output()
+	listCmd := nix.CommandContext(ctx, "nix", "profile", "list", "--json", "--profile", profilePath)
+	buildInputPaths, err = listCmd.Output()
 	if err != nil {
 		return err
 	}
@@ -34,7 +30,7 @@ func syncFlakeToProfile(ctx context.Context, flakePath, profilePath string) erro
 			StorePaths []string
 		}
 	}
-	if err := json.Unmarshal(b, &profile); err != nil {
+	if err := json.Unmarshal(buildInputPaths, &profile); err != nil {
 		return fmt.Errorf("unmarshal profile: %v", err)
 	}
 	got := make([]string, 0, len(profile.Elements))
@@ -44,17 +40,15 @@ func syncFlakeToProfile(ctx context.Context, flakePath, profilePath string) erro
 
 	add, remove := diffStorePaths(got, storePaths)
 	if len(remove) > 0 {
-		removeCmd := exec.CommandContext(ctx, "nix", "profile", "remove", "--profile", profilePath)
+		removeCmd := nix.CommandContext(ctx, "nix", "profile", "remove", "--profile", profilePath)
 		removeCmd.Args = append(removeCmd.Args, remove...)
-		removeCmd.Args = append(removeCmd.Args, nix.ExperimentalFlags()...)
 		if err := removeCmd.Run(); err != nil {
 			return err
 		}
 	}
 	if len(add) > 0 {
-		addCmd := exec.CommandContext(ctx, "nix", "profile", "install", "--profile", profilePath)
+		addCmd := nix.CommandContext(ctx, "nix", "profile", "install", "--profile", profilePath)
 		addCmd.Args = append(addCmd.Args, add...)
-		addCmd.Args = append(addCmd.Args, nix.ExperimentalFlags()...)
 		if err := addCmd.Run(); err != nil {
 			return err
 		}
@@ -66,27 +60,27 @@ func diffStorePaths(got, want []string) (add, remove []string) {
 	slices.Sort(got)
 	slices.Sort(want)
 
-	var g, w int
+	var gotIdx, wantIdx int
 	for {
-		if g >= len(got) {
-			add = append(add, want[w:]...)
+		if gotIdx >= len(got) {
+			add = append(add, want[wantIdx:]...)
 			break
 		}
-		if w >= len(want) {
-			remove = append(remove, got[g:]...)
+		if wantIdx >= len(want) {
+			remove = append(remove, got[gotIdx:]...)
 			break
 		}
 
 		switch {
-		case got[g] == want[w]:
-			g++
-			w++
-		case got[g] < want[w]:
-			remove = append(remove, got[g])
-			g++
-		case got[g] > want[w]:
-			add = append(add, want[w])
-			w++
+		case got[gotIdx] == want[wantIdx]:
+			gotIdx++
+			wantIdx++
+		case got[gotIdx] < want[wantIdx]:
+			remove = append(remove, got[gotIdx])
+			gotIdx++
+		case got[gotIdx] > want[wantIdx]:
+			add = append(add, want[wantIdx])
+			wantIdx++
 		}
 	}
 	return add, remove

internal/nix/command.go

@@ -6,10 +6,10 @@ import (
 )
 
 func command(args ...string) *exec.Cmd {
-	return commandContext(context.Background(), args...)
+	return CommandContext(context.Background(), args...)
 }
 
-func commandContext(ctx context.Context, args ...string) *exec.Cmd {
+func CommandContext(ctx context.Context, args ...string) *exec.Cmd {
 	cmd := exec.CommandContext(ctx, "nix", args...)
 	cmd.Args = append(cmd.Args, ExperimentalFlags()...)
 	return cmd

internal/nix/store.go

@@ -6,7 +6,7 @@ import (
 )
 
 func StorePathFromHashPart(ctx context.Context, hash, storeAddr string) (string, error) {
-	cmd := commandContext(ctx, "store", "path-from-hash-part", "--store", storeAddr, hash)
+	cmd := CommandContext(ctx, "store", "path-from-hash-part", "--store", storeAddr, hash)
 	resultBytes, err := cmd.Output()
 	if err != nil {
 		return "", err

testscripts/languages/php.test.txt

@@ -18,7 +18,6 @@ stdout 'done\n'
 {
   "packages": [
     "php81@latest",
-    "php81Packages.composer@latest",
     "php81Extensions.ds@latest"
   ]
 }

testscripts/packages/unfree.test.txt

@@ -4,6 +4,6 @@ exec devbox init
 
 # we could test with slack and/or vscode. Using slack since it is lighter.
 exec devbox add slack
-stderr 'Installing package: slack.'
+stderr 'Adding package "slack@latest" to devbox.json'
 
 exec devbox rm slack