Updated dep

Author: kamilchm

cmd/go2nix/main.go

@@ -24,7 +24,7 @@ func main() {
 		log.Fatalf("Couldn't load Go package: %v", err)
 	}
 
-	deps, err := solver.Dependencies(goPkg)
+	deps, err := solver.Dependencies(goPkg, gopath.GoPath())
 	if err != nil {
 		log.Fatalf("Couldn't solve package dependencies: %v", err)
 	}

dep/solver.go

@@ -2,17 +2,21 @@ package dep
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
 
 	"github.com/kamilchm/go2nix"
 )
 
 type Solver struct{}
 
-func (s *Solver) Dependencies(pkg go2nix.GoPackage) ([]go2nix.GoPackage, error) {
-	ctx, err := dep.NewContext()
+func (s *Solver) Dependencies(pkg go2nix.GoPackage, goPath string) ([]go2nix.GoPackage, error) {
+	wd, err := os.Getwd()
+	if err != nil {
+		return nil, fmt.Errorf("Couldn't get working dir: %v", err)
+	}
+	ctx, err := dep.NewContext(wd, []string{"GOPATH=" + goPath}, nil)
 	if err != nil {
 		return nil, fmt.Errorf("Couldn't create Go dep context: %v", err)
 	}
@@ -22,19 +26,19 @@ func (s *Solver) Dependencies(pkg go2nix.GoPackage) ([]go2nix.GoPackage, error)
 		return nil, fmt.Errorf("Couldn't load Go project: %v", err)
 	}
 
-	return convertDeps(project.Lock.Projects()), nil
+	return convertDeps(project), nil
 }
 
-func convertDeps(gpsDeps []gps.LockedProject) (deps []go2nix.GoPackage) {
-	for _, p := range gpsDeps {
+func convertDeps(depProject *dep.Project) (deps []go2nix.GoPackage) {
+	for _, p := range depProject.Lock.Projects() {
 		pkg := go2nix.GoPackage{
 			Name:    go2nix.ImportPath(p.Ident().ProjectRoot),
 			Version: p.Version().String(),
 		}
 
-		if v, ok := p.Version().(gps.PairedVersion); ok {
-			pkg.Revision = v.Underlying().String()
-		}
+		//if v, ok := p.Version().(gps.PairedVersion); ok {
+		//	pkg.Revision = v.Underlying().String()
+		//}
 
 		deps = append(deps, pkg)
 	}

dep/solver_test.go

@@ -18,7 +18,7 @@ type NixPackage struct {
 }
 
 type DepSolver interface {
-	Dependencies(GoPackage) ([]GoPackage, error)
+	Dependencies(GoPackage, string) ([]GoPackage, error)
 }
 
 type PackageLoader interface {

go2nix.go

@@ -12,7 +12,7 @@ import (
 type PackageLoader struct{}
 
 func (l *PackageLoader) Package(dir string) (go2nix.GoPackage, error) {
-	goPath := os.Getenv("GOPATH")
+	goPath := GoPath()
 	if goPath == "" {
 		return go2nix.GoPackage{}, fmt.Errorf("No GOPATH set, couldn't discover Go package")
 	}
@@ -32,3 +32,7 @@ func (l *PackageLoader) Package(dir string) (go2nix.GoPackage, error) {
 	return go2nix.GoPackage{}, fmt.Errorf("Current dir %v is outside of GOPATH(%v). "+
 		"Couldn't get current package name", dir, goPath)
 }
+
+func GoPath() string {
+	return os.Getenv("GOPATH")
+}