Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove gomod2nix #19

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

remove gomod2nix #19

wants to merge 2 commits into from

Conversation

acaloiaro
Copy link
Owner

  • feat: factor out gomod2nix
  • feat: factor out gomod2nix

in
import (fetchTree nixpkgs.locked) {
overlays = [
(import "${fetchTree gomod2nix.locked}/overlay.nix")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did this overlay.nix go?

Comment on lines +14 to +37
darwin = build.overrideAttrs (old:
old
// {
GOOS = "darwin";
GOARCH = "amd64";
});
linux32 = build.overrideAttrs (old:
old
// {
GOOS = "linux";
GOARCH = "386";
});
x86_64-linux = build.overrideAttrs (old:
old
// {
GOOS = "linux";
GOARCH = "amd64";
});
windows64 = build.overrideAttrs (old:
old
// {
GOOS = "windows";
GOARCH = "amd64";
});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a lot of repetition here. You could extract a builder func that takes in the name, goos, goarch, map and build this object.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah agreed. My nixlang skills are not good and didn't think I'd get it done cleanly.

@@ -1,7 +1,5 @@
module github.com/acaloiaro/ess

go 1.21
go 1.23.1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.24.4 is in nixpkgs already. Latest one is 1.24.6

@@ -15,7 +15,7 @@ import (
"strings"
"text/template"

"github.com/hashicorp/go-envparse"
"github.com/acaloiaro/go-envparse"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What did you need to override?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hashicorp's go-envparse doesn't support env files that include non-env stuff, like comments, which ess requires.

Under the hood, nothing changed in acaloiaro/go-envparse, but I removed the replace in its go.mod that renamed it from github.com/hashicorp/go-envparse => github.com/acaloiaro/go-envparse.

I'm assuming that project won't be merging my changes, so I'm making mine I hard fork.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants