From 863706ef307a4fa62370b7ee0db85f10a422e880 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:40:26 +1000 Subject: [PATCH 1/9] buildGoModule: disallow goPackagePath This is unnecessary with `buildGoModule`, it's usually cruft from `buildGoPackage` conversions. --- pkgs/development/go-modules/generic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 3714a1f6f0f..58716d37170 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -36,6 +36,9 @@ , meta ? {} +# Not needed with buildGoModule +, goPackagePath ? null + , ... }@args': with builtins; @@ -242,5 +245,7 @@ let }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" +else if (goPackagePath != null) then + throw "`goPackagePath` not needed with `buildGoModule`" else package From a01575268e03476bedf3c2671d4c9ef174db653b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:47 +1000 Subject: [PATCH 2/9] sonobuoy: remove goPackagePath --- pkgs/applications/networking/cluster/sonobuoy/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index be5cb51d450..668a229a62e 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -7,10 +7,8 @@ buildGoModule rec { pname = "sonobuoy"; version = "0.19.0"; - goPackagePath = "github.com/vmware-tanzu/sonobuoy"; - buildFlagsArray = - let t = goPackagePath; + let t = "github.com/vmware-tanzu/sonobuoy"; in '' -ldflags= -s -X ${t}/pkg/buildinfo.Version=v${version} From 566bce3cdb75ed2c57f4936a305b96597787d723 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:47 +1000 Subject: [PATCH 3/9] buildkite-agent: remove goPackagePath --- .../tools/continuous-integration/buildkite-agent/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 223b814708d..82ac1556574 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { name = "buildkite-agent-${version}"; version = "3.26.0"; - goPackagePath = "github.com/buildkite/agent"; - src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; From e8829acb42935913a24e157ef77bd76bab984146 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:48 +1000 Subject: [PATCH 4/9] github-commenter: remove goPackagePath --- pkgs/development/tools/github-commenter/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix index 8d25710aa2d..05784c47eff 100644 --- a/pkgs/development/tools/github-commenter/default.nix +++ b/pkgs/development/tools/github-commenter/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0="; - goPackagePath = "github.com/cloudposse/${pname}"; - meta = with lib; { description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues"; license = licenses.asl20; From 4782aa4a4a45779bff3dca44158a7c9b05cc10bd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:48 +1000 Subject: [PATCH 5/9] terraform-ls: remove goPackagePath --- pkgs/development/tools/misc/terraform-ls/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 763cd4fcdb4..220042079fd 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -12,8 +12,6 @@ buildGoModule rec { }; vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI="; - goPackagePath = "github.com/hashicorp/terraform-ls"; - # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; From fe11b54f7f6520b0cf1dcf0e2e0dd27a8db99f8b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:48 +1000 Subject: [PATCH 6/9] wally-cli: remove goPackagePath --- pkgs/development/tools/wally-cli/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index ffa66646859..4c843d04b8c 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -4,7 +4,6 @@ buildGoModule rec { pname = "wally-cli"; version = "2.0.0"; - goPackagePath = "github.com/zsa/wally-cli"; subPackages = [ "." ]; nativeBuildInputs = [ pkg-config ]; From 381095f8d249a352f80be735ff5176486662c153 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:48 +1000 Subject: [PATCH 7/9] ytt: remove goPackagePath --- pkgs/development/tools/ytt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 05410bbaec5..67c8509fd70 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -10,8 +10,6 @@ buildGoModule rec { sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; }; - goPackagePath = "github.com/vmware-tanzu/carvel-ytt"; - vendorSha256 = null; subPackages = [ "cmd/ytt" ]; From a8b883b04c791b2840f18b5256c7a4b3e8160eec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:48 +1000 Subject: [PATCH 8/9] demoit: remove goPackagePath --- pkgs/servers/demoit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 675792da680..9a78d5c7c18 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -6,7 +6,6 @@ buildGoModule { pname = "demoit"; version = "unstable-2020-06-11"; - goPackagePath = "github.com/dgageot/demoit"; src = fetchFromGitHub { owner = "dgageot"; From 9209f091291c272c2e2d4b5cedc359f01e1bf816 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Dec 2020 05:43:49 +1000 Subject: [PATCH 9/9] cod: remove goPackagePath --- pkgs/tools/misc/cod/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 945f4c61f1d..6dad6173ed4 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "cod"; version = "unstable-2020-09-10"; - goPackagePath = "cod"; - src = fetchFromGitHub { owner = "dim-an"; repo = pname;