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

git-town: 7.7.0 -> 7.8.0 #185620

Merged
merged 1 commit into from
Aug 19, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions pkgs/tools/misc/git-town/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }:

buildGoModule rec {
pname = "git-town";
version = "7.7.0";
version = "7.8.0";

src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc=";
sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI=";
};

patches = [
# Fix "go vet" when building using Go 1.18.
(fetchpatch {
name = "fix-go-vet-in-go-1.18.patch";
url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch";
sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc=";
})
];
Comment on lines +14 to +21
Copy link
Member

Choose a reason for hiding this comment

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

This shouldn't matter. Are we running go vet as part of the build process?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It appears that go vet or some portion of it runs automatically as part of go test.

Copy link
Member

Choose a reason for hiding this comment

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

This should be disabled, we never want to run linters when building.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I personally don't agree, unless the linter in question is purely focused on style enforcement. Even then, I would only diverge from upstream and disable it if it is causing other problems.

If this is a policy within nixpkgs, I don't mind following it, however.

Copy link
Member

Choose a reason for hiding this comment

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

Even then, I would only diverge from upstream and disable it if it is causing other problems.

If it is causing problems it is already extra maintenance burden we could have avoided.

At least for python packages we enforce disabling linters and I think we should follow that in other places, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We are optimizing for different things. Your opinion is legitimate too, no hard feelings. I'm currently not interested in pursuing disabling linting for Go projects. If it's a blocker, I'll close this PR.

Copy link
Contributor

@smancill smancill Aug 19, 2022

Choose a reason for hiding this comment

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

There was no reason to close this PR and delete the branch without even waiting for a response as soon as someone has a different opinion.

This shouldn't matter. Are we running go vet as part of the build process?

go test runs some go vet checks. If you are of the opinion that it would be better to disable them, it can be enforced in buildGoModule/buildGoPackage with -vet=off. I see no point in disabling them for only some individual packages.

Having this patch is perfectly fine, it's like any other upstream patch that we fetch while waiting for the next release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I restored the branch and reopened the PR. I can keep it open for discussion.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we merge this PR? I think the discussion about what should and should not be run when running go test is out of scope here.

Copy link
Member

@SuperSandro2000 SuperSandro2000 Aug 19, 2022

Choose a reason for hiding this comment

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

go test runs some go vet checks. If you are of the opinion that it would be better to disable them, it can be enforced in buildGoModule/buildGoPackage with -vet=off. I see no point in disabling them for only some individual packages.

Thanks, creating a PR to staging right now to fix similar issues in the future.

#187481


vendorSha256 = null;

nativeBuildInputs = [ installShellFiles makeWrapper ];
Expand Down