clean up

Author: LucilleH

internal/devpkg/package_test.go

@@ -119,6 +119,10 @@ func (l *lockfile) LegacyNixpkgsPath(pkg string) string {
 	)
 }
 
+func (l *lockfile) Source(pkg string) string {
+	return ""
+}
+
 func (l *lockfile) Resolve(pkg string) (*lock.Package, error) {
 	switch {
 	case strings.Contains(pkg, "path:"):

internal/lock/lockfile.go

@@ -18,8 +18,8 @@ import (
 
 const lockFileVersion = "1"
 const (
-	NixpkgSource       string = "nixpkg"
-	DevboxSearchSource        = "devbox-search"
+	nixpkgSource       string = "nixpkg"
+	devboxSearchSource string = "devbox-search"
 )
 
 // Lightly inspired by package-lock.json
@@ -104,7 +104,7 @@ func (l *File) Resolve(pkg string) (*Package, error) {
 			// whatever hash is in the devbox.json
 			locked = &Package{
 				Resolved: l.LegacyNixpkgsPath(pkg),
-				Source:   NixpkgSource,
+				Source:   nixpkgSource,
 			}
 		}
 		l.Packages[pkg] = locked
@@ -118,20 +118,6 @@ func (l *File) ForceResolve(pkg string) (*Package, error) {
 	return l.Resolve(pkg)
 }
 
-func (l *File) ResolveToCurrentNixpkgCommitHash(pkg string) error {
-	name, version, found := strings.Cut(pkg, "@")
-	if found && version != "latest" {
-		return errors.New(
-			"only allowed version is @latest. Otherwise we can't guarantee the " +
-				"version will resolve")
-	}
-	l.Packages[pkg] = &Package{
-		Resolved: l.LegacyNixpkgsPath(name),
-		Source:   NixpkgSource,
-	}
-	return nil
-}
-
 func (l *File) Save() error {
 	return cuecfg.WriteFile(lockFilePath(l.devboxProject), l)
 }

internal/lock/resolve.go

@@ -57,7 +57,7 @@ func (l *File) FetchResolvedPackage(pkg string) (*Package, error) {
 			packageInfo.AttrPaths[0],
 		),
 		Version: packageInfo.Version,
-		Source:  DevboxSearchSource,
+		Source:  devboxSearchSource,
 		Systems: sysInfos,
 	}, nil
 }