From bf76f2524869834c991d4fd2a72663642d4ba19d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Jul 2020 06:42:40 +0000 Subject: [PATCH 1/4] golangci-lint: 1.27.0 -> 1.28.1 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 256e53415567..e98a6172de64 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.27.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931"; + sha256 = "18rhd5baqg68wsil8rqzg1yiqys4y53lqy8gcp68wn4i4jnvkgsm"; }; - vendorSha256 = "16wr8ixicbvdpg5mg6q07sa1b03ydpwdbvbjl3r9qihdqkhhzlr1"; + vendorSha256 = "0dg3rjzkvzh4n7r4kp68qhg96ijqks9hkz1cjcc02xa38ygma7gz"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { From c94a2de710315167dcbbf28b613a5c11c4ca7cd8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Jul 2020 04:20:00 -0500 Subject: [PATCH 2/4] golangci-lint: install completions --- pkgs/development/tools/golangci-lint/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index e98a6172de64..3b3863a62e73 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "golangci-lint"; @@ -14,6 +14,15 @@ buildGoModule rec { vendorSha256 = "0dg3rjzkvzh4n7r4kp68qhg96ijqks9hkz1cjcc02xa38ygma7gz"; subPackages = [ "cmd/golangci-lint" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash zsh; do + HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell + installShellCompletion golangci-lint.$shell + done + ''; + meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = "https://golangci.com/"; From 4568f9bfb1bdaad9a796fa67e752cc8de6cc1ef7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Jul 2020 04:21:00 -0500 Subject: [PATCH 3/4] golangci-lint: add ldflags --- pkgs/development/tools/golangci-lint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 3b3863a62e73..4f6df136b844 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=19700101-00:00:00" ]; + postInstall = '' for shell in bash zsh; do HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell From 27ac9620c64a758643e60ed662105dee1e8b9efc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Jul 2020 04:22:00 -0500 Subject: [PATCH 4/4] golangci-lint: update meta --- pkgs/development/tools/golangci-lint/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 4f6df136b844..b5fcd548cae5 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -26,10 +26,9 @@ buildGoModule rec { ''; meta = with lib; { - description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; - homepage = "https://golangci.com/"; - license = licenses.agpl3; - platforms = platforms.unix; + description = "Fast linters Runner for Go"; + homepage = "https://golangci-lint.run/"; + license = licenses.gpl3; maintainers = with maintainers; [ anpryl manveru ]; }; }