add more installable workarounds

Author: gcurtis

internal/nix/build.go

@@ -20,6 +20,9 @@ type BuildArgs struct {
 
 func Build(ctx context.Context, args *BuildArgs, installables ...string) error {
 	defer debug.FunctionTimer().End()
+
+	FixInstallableArgs(installables)
+
 	// --impure is required for allowUnfreeEnv/allowInsecureEnv to work.
 	cmd := command("build", "--impure")
 	cmd.Args = appendArgs(cmd.Args, args.Flags)

internal/nix/nix.go

@@ -259,3 +259,36 @@ func restartDaemon(ctx context.Context) error {
 	time.Sleep(2 * time.Second)
 	return nil
 }
+
+// FixInstallableArgs removes the narHash and lastModifiedDate query parameters
+// from any args that are valid installables and the Nix version is <2.25.
+// Otherwise it returns them unchanged.
+//
+// This fixes an issues with some older versions of Nix where specifying a
+// narHash without a lastModifiedDate results in an error.
+func FixInstallableArgs(args []string) {
+	if AtLeast(Version2_25) {
+		return
+	}
+
+	for i := range args {
+		parsed, _ := flake.ParseInstallable(args[i])
+		if parsed.Ref.NARHash == "" && parsed.Ref.LastModified == 0 {
+			continue
+		}
+		if parsed.Ref.NARHash != "" && parsed.Ref.LastModified != 0 {
+			continue
+		}
+
+		parsed.Ref.NARHash = ""
+		parsed.Ref.LastModified = 0
+		args[i] = parsed.String()
+	}
+}
+
+// fixInstallableArg calls fixInstallableArgs with a single argument.
+func FixInstallableArg(arg string) string {
+	args := []string{arg}
+	FixInstallableArgs(args)
+	return args[0]
+}

internal/nix/profiles.go

@@ -52,6 +52,7 @@ func ProfileInstall(ctx context.Context, args *ProfileInstallArgs) error {
 		"--priority", nextPriority(args.ProfilePath),
 	)
 
+	FixInstallableArgs(args.Installables)
 	cmd.Args = appendArgs(cmd.Args, args.Installables)
 	cmd.Env = allowUnfreeEnv(os.Environ())
 
@@ -75,6 +76,8 @@ func ProfileRemove(profilePath string, packageNames ...string) error {
 		"--profile", profilePath,
 		"--impure", // for NIXPKGS_ALLOW_UNFREE
 	)
+
+	FixInstallableArgs(packageNames)
 	cmd.Args = appendArgs(cmd.Args, packageNames)
 	cmd.Env = allowUnfreeEnv(allowInsecureEnv(os.Environ()))
 	return cmd.Run(context.TODO())

internal/nix/store.go

@@ -13,7 +13,6 @@ import (
 	"go.jetpack.io/devbox/internal/debug"
 	"go.jetpack.io/devbox/internal/redact"
 	"go.jetpack.io/devbox/nix"
-	"go.jetpack.io/devbox/nix/flake"
 	"golang.org/x/exp/maps"
 )
 
@@ -29,20 +28,8 @@ func StorePathFromHashPart(ctx context.Context, hash, storeAddr string) (string,
 func StorePathsFromInstallable(ctx context.Context, installable string, allowInsecure bool) ([]string, error) {
 	defer debug.FunctionTimer().End()
 
-	// Some older versions of Nix have a bug where specifying a narHash
-	// without a lastModifiedDate query parameter results in an error. I'm
-	// not sure when it was fixed, but I know it works in 2.25+.
-	if !nix.AtLeast(nix.Version2_25) {
-		parsed, err := flake.ParseInstallable(installable)
-		if err == nil {
-			parsed.Ref.NARHash = ""
-			parsed.Ref.LastModified = 0
-			installable = parsed.String()
-		}
-	}
-
 	// --impure for NIXPKGS_ALLOW_UNFREE
-	cmd := command("path-info", installable, "--json", "--impure")
+	cmd := command("path-info", FixInstallableArg(installable), "--json", "--impure")
 	cmd.Env = allowUnfreeEnv(os.Environ())
 
 	if allowInsecure {

internal/shellgen/flake_input.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/samber/lo"
 	"go.jetpack.io/devbox/internal/devpkg"
+	"go.jetpack.io/devbox/internal/nix"
 	"go.jetpack.io/devbox/nix/flake"
 )
 
@@ -43,7 +44,7 @@ func (f *flakeInput) HashFromNixPkgsURL() string {
 
 func (f *flakeInput) URLWithCaching() string {
 	if !f.IsNixpkgs() {
-		return f.Ref.String()
+		return nix.FixInstallableArg(f.Ref.String())
 	}
 	return getNixpkgsInfo(f.Ref.Rev).URL
 }