darkkirb/gomod2nix
1
0
Fork 0
forked from mirrors/gomod2nix
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40 from tweag/buildgopackage-drop

Browse source 
Drop support for buildGoPackage format
This commit is contained in:
adisbladis 2022-05-26 19:57:01 +08:00 committed by GitHub
commit 8cb0e010cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fetch/fetch.go
View file

@ -12,7 +12,6 @@ import (
"strings"
log "github.com/sirupsen/logrus"
"github.com/tweag/gomod2nix/formats/buildgopackage"
"github.com/tweag/gomod2nix/formats/gomod2nix"
"github.com/tweag/gomod2nix/types"
"golang.org/x/mod/modfile"
@ -48,7 +47,7 @@ func worker(id int, caches []map[string]*types.Package, jobs <-chan *packageJob,
}
}
func FetchPackages(goModPath string, goSumPath string, goMod2NixPath string, depsNixPath string, numWorkers int, keepGoing bool) ([]*types.Package, error) {
func FetchPackages(goModPath string, goSumPath string, goMod2NixPath string, numWorkers int, keepGoing bool) ([]*types.Package, error) {
log.WithFields(log.Fields{
"modPath": goModPath,
@ -71,10 +70,6 @@ func FetchPackages(goModPath string, goSumPath string, goMod2NixPath string, dep
if len(goModCache) > 0 {
caches = append(caches, goModCache)
}
buildGoCache := buildgopackage.LoadDepsNix(depsNixPath)
if len(buildGoCache) > 0 {
caches = append(caches, buildGoCache)
}
// Map repos -> replacement repo
replace := make(map[string]string)

99
formats/buildgopackage/depsnix.go
View file

@ -1,99 +0,0 @@
package buildgopackage
import (
"fmt"
"github.com/orivej/go-nix/nix/eval"
"github.com/orivej/go-nix/nix/parser"
"github.com/tweag/gomod2nix/types"
"log"
"os"
"strings"
)
const depNixFormat = ` {
goPackagePath = "%s";
fetch = {
type = "%s";
url = "%s";
rev = "%s";
sha256 = "%s";
};
}`
func Marshal(pkgs []*types.Package) ([]byte, error) {
var result []string
result = append(result, "[")
for _, pkg := range pkgs {
result = append(result,
fmt.Sprintf(depNixFormat,
pkg.GoPackagePath, "git", pkg.URL,
pkg.Rev, pkg.Sha256))
}
result = append(result, "]")
return []byte(strings.Join(result, "\n")), nil
}
// Load the contents of deps.nix into a struct
// This is mean to achieve re-use of previous invocations using the deps.nix (buildGoPackage) output format
func LoadDepsNix(filePath string) map[string]*types.Package {
ret := make(map[string]*types.Package)
if filePath == "" {
return ret
}
stat, err := os.Stat(filePath)
if err != nil {
return ret
}
if stat.Size() == 0 {
return ret
}
p, err := parser.ParseFile(filePath)
if err != nil {
log.Println("Failed reading deps.nix")
return ret
}
evalResult := eval.ParseResult(p)
for _, pkgAttrsExpr := range evalResult.(eval.List) {
pkgAttrs, ok := pkgAttrsExpr.Eval().(eval.Set)
if !ok {
continue
}
fetch, ok := pkgAttrs[eval.Intern("fetch")].Eval().(eval.Set)
if !ok {
continue
}
goPackagePath, ok := pkgAttrs[eval.Intern("goPackagePath")].Eval().(string)
if !ok {
continue
}
url, ok := fetch[eval.Intern("url")].Eval().(string)
if !ok {
continue
}
rev, ok := fetch[eval.Intern("rev")].Eval().(string)
if !ok {
continue
}
sha256, ok := fetch[eval.Intern("sha256")].Eval().(string)
if !ok {
continue
}
ret[goPackagePath] = &types.Package{
GoPackagePath: goPackagePath,
URL: url,
Rev: rev,
Sha256: sha256,
}
}
return ret
}

40
main.go
View file

@ -5,7 +5,6 @@ import (
"fmt"
log "github.com/sirupsen/logrus"
"github.com/tweag/gomod2nix/fetch"
"github.com/tweag/gomod2nix/formats/buildgopackage"
"github.com/tweag/gomod2nix/formats/gomod2nix"
"io/ioutil"
"path/filepath"
@ -17,7 +16,6 @@ func main() {
var directory = flag.String("dir", "./", "Go project directory")
var maxJobs = flag.Int("jobs", 10, "Number of max parallel jobs")
var outDirFlag = flag.String("outdir", "", "output directory (if different from project directory)")
var format = flag.String("format", "gomod2nix", "output format (gomod2nix, buildgopackage)")
flag.Parse()
outDir := *outDirFlag
@ -28,42 +26,16 @@ func main() {
goSumPath := filepath.Join(*directory, "go.sum")
goModPath := filepath.Join(*directory, "go.mod")
wrongFormatError := fmt.Errorf("Format not supported")
goMod2NixPath := ""
depsNixPath := ""
outFile := ""
switch *format {
case "gomod2nix":
goMod2NixPath = filepath.Join(outDir, "gomod2nix.toml")
outFile = goMod2NixPath
case "buildgopackage":
depsNixPath = filepath.Join(outDir, "deps.nix")
outFile = depsNixPath
default:
panic(wrongFormatError)
}
log.Info(fmt.Sprintf("Using output format '%s'", *format))
pkgs, err := fetch.FetchPackages(goModPath, goSumPath, goMod2NixPath, depsNixPath, *maxJobs, *keepGoing)
goMod2NixPath := filepath.Join(outDir, "gomod2nix.toml")
outFile := goMod2NixPath
pkgs, err := fetch.FetchPackages(goModPath, goSumPath, goMod2NixPath, *maxJobs, *keepGoing)
if err != nil {
panic(err)
}
var output []byte
switch *format {
case "gomod2nix":
output, err = gomod2nix.Marshal(pkgs)
if err != nil {
panic(err)
}
case "buildgopackage":
output, err = buildgopackage.Marshal(pkgs)
if err != nil {
panic(err)
}
default:
panic(wrongFormatError)
output, err := gomod2nix.Marshal(pkgs)
if err != nil {
panic(err)
}
err = ioutil.WriteFile(outFile, output, 0644)