git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: remove obsolete attribute goPackagePath in buildGoModule derivations (#95092)

The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage.

commitba7c0893d4fcbe2b8fd449064a7bf7ec36553385 authorTimothy Stott <stott.timothy@gmail.com> dateTue 11 Aug 2020, 22:04 (6 years ago) parent4c3b64a
31 files changed+16−64
pkgs/applications/networking/cluster/kube3d/default.nix−1 pkgs/applications/networking/instant-messengers/gomuks/default.nix−2 pkgs/applications/version-management/git-and-tools/git-bug/default.nix+3−4 pkgs/applications/version-management/sourcehut/builds.nix+2−3 pkgs/applications/version-management/sourcehut/git.nix+8−12 pkgs/development/tools/continuous-integration/drone-cli/default.nix−1 pkgs/development/tools/continuous-integration/drone/default.nix−1 pkgs/development/tools/godef/default.nix−1 pkgs/development/tools/gomodifytags/default.nix−2 pkgs/development/tools/gopkgs/default.nix−2 pkgs/development/tools/gosec/default.nix−2 pkgs/development/tools/hcloud/default.nix−2 pkgs/development/tools/kind/default.nix−1 pkgs/development/tools/kubeprompt/default.nix+1−2 pkgs/development/tools/misc/mkcert/default.nix+1−3 pkgs/development/tools/misc/nix-build-uncached/default.nix−1 pkgs/development/tools/reftools/default.nix−1 pkgs/servers/caddy/default.nix−2 pkgs/servers/dns/coredns/default.nix−2 pkgs/servers/hasura/cli.nix−1 pkgs/servers/kapow/default.nix−2 pkgs/servers/matterbridge/default.nix−1 pkgs/servers/monitoring/sensu-go/default.nix−2 pkgs/servers/monitoring/telegraf/default.nix−2 pkgs/servers/tailscale/default.nix−1 pkgs/shells/zsh/zsh-history/default.nix−2 pkgs/tools/admin/iamy/default.nix−2 pkgs/tools/networking/clash/default.nix+1−2 pkgs/tools/networking/oneshot/default.nix−1 pkgs/tools/networking/shadowfox/default.nix−2 pkgs/tools/security/age/default.nix−1
pkgs/applications/networking/cluster/kube3d/default.nix−1
@@ -5,7 +5,6 @@ buildGoModule rec {
55 version = "3.0.0";
66 k3sVersion = "1.18.6-k3s1";
77
8− goPackagePath = "github.com/rancher/k3d";
98 excludedPackages = ''tools'';
109
1110 src = fetchFromGitHub {
pkgs/applications/networking/instant-messengers/gomuks/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "gomuks";
55 version = "0.1.2";
66
7− goPackagePath = "maunium.net/go/gomuks";
8−
97 src = fetchFromGitHub {
108 owner = "tulir";
119 repo = pname;
pkgs/applications/version-management/git-and-tools/git-bug/default.nix+3−4
@@ -4,7 +4,6 @@ buildGoModule rec {
44 pname = "git-bug";
55 version = "0.7.1"; # the `rev` below pins the version of the source to get
66 rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c";
7− goPackagePath = "github.com/MichaelMure/git-bug";
87
98 src = fetchFromGitHub {
109 inherit rev;
@@ -19,9 +18,9 @@ buildGoModule rec {
1918
2019 buildFlagsArray = ''
2120 -ldflags=
22− -X ${goPackagePath}/commands.GitCommit=${rev}
23− -X ${goPackagePath}/commands.GitLastTag=${version}
24− -X ${goPackagePath}/commands.GitExactTag=${version}
21+ -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}
22+ -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}
23+ -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}
2524 '';
2625
2726 postInstall = ''
pkgs/applications/version-management/sourcehut/builds.nix+2−3
@@ -9,11 +9,10 @@ let
99 buildWorker = src: buildGoModule {
1010 inherit src version;
1111 pname = "builds-sr-ht-worker";
12− goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker";
1312
14− vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp";
13+ vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp";
1514
16− doCheck = false;
15+ doCheck = false;
1716 };
1817in buildPythonPackage rec {
1918 inherit version;
pkgs/applications/version-management/sourcehut/git.nix+8−12
@@ -9,41 +9,37 @@ let
99 buildShell = src: buildGoModule {
1010 inherit src version;
1111 pname = "gitsrht-shell";
12− goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell";
1312
14− vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5";
13+ vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5";
1514
16− doCheck = false;
15+ doCheck = false;
1716 };
1817
1918 buildDispatcher = src: buildGoModule {
2019 inherit src version;
2120 pname = "gitsrht-dispatcher";
22− goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
2321
24− vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9";
22+ vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9";
2523
26− doCheck = false;
24+ doCheck = false;
2725 };
2826
2927 buildKeys = src: buildGoModule {
3028 inherit src version;
3129 pname = "gitsrht-keys";
32− goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys";
3330
34− vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv";
31+ vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv";
3532
36− doCheck = false;
33+ doCheck = false;
3734 };
3835
3936 buildUpdateHook = src: buildGoModule {
4037 inherit src version;
4138 pname = "gitsrht-update-hook";
42− goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook";
4339
44− vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63";
40+ vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63";
4541
46− doCheck = false;
42+ doCheck = false;
4743 };
4844in buildPythonPackage rec {
4945 inherit version;
pkgs/development/tools/continuous-integration/drone-cli/default.nix−1
@@ -5,7 +5,6 @@ in buildGoModule rec {
55 inherit version;
66 pname = "drone-cli";
77 revision = "v${version}";
8− goPackagePath = "github.com/drone/drone-cli";
98
109 vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi";
1110
pkgs/development/tools/continuous-integration/drone/default.nix−1
@@ -3,7 +3,6 @@
33buildGoModule rec {
44 name = "drone.io-${version}";
55 version = "1.9.0";
6− goPackagePath = "github.com/drone/drone";
76
87 vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";
98
pkgs/development/tools/godef/default.nix−1
@@ -5,7 +5,6 @@ buildGoModule rec {
55 version = "1.1.2";
66 rev = "v${version}";
77
8− goPackagePath = "github.com/rogpeppe/godef";
98 subPackages = [ "." ];
109
1110 vendorSha256 = null;
pkgs/development/tools/gomodifytags/default.nix−2
@@ -8,8 +8,6 @@ buildGoModule rec {
88
99 doCheck = false;
1010
11− goPackagePath = "github.com/fatih/gomodifytags";
12−
1311 src = fetchFromGitHub {
1412 owner = "fatih";
1513 repo = "gomodifytags";
pkgs/development/tools/gopkgs/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "gopkgs";
55 version = "2.1.2";
66
7− goPackagePath = "github.com/uudashr/gopkgs";
8−
97 subPackages = [ "cmd/gopkgs" ];
108
119 src = fetchFromGitHub {
pkgs/development/tools/gosec/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "gosec";
55 version = "2.4.0";
66
7− goPackagePath = "github.com/securego/gosec";
8−
97 subPackages = [ "cmd/gosec" ];
108
119 src = fetchFromGitHub {
pkgs/development/tools/hcloud/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "hcloud";
55 version = "1.17.0";
66
7− goPackagePath = "github.com/hetznercloud/cli";
8−
97 src = fetchFromGitHub {
108 owner = "hetznercloud";
119 repo = "cli";
pkgs/development/tools/kind/default.nix−1
@@ -17,7 +17,6 @@ buildGoModule rec {
1717
1818 doCheck = false;
1919
20− goPackagePath = "sigs.k8s.io/kind";
2120 subPackages = [ "." ];
2221
2322 nativeBuildInputs = [ installShellFiles ];
pkgs/development/tools/kubeprompt/default.nix+1−2
@@ -15,10 +15,9 @@ buildGoModule rec {
1515 export buildFlagsArray+=(
1616 "-ldflags=
1717 -w -s
18− -X ${goPackagePath}/pkg/version.Version=${version}")
18+ -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}")
1919 '';
2020
21− goPackagePath = "github.com/jlesquembre/kubeprompt";
2221 vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi";
2322
2423 doCheck = false;
pkgs/development/tools/misc/mkcert/default.nix+1−3
@@ -15,10 +15,8 @@ buildGoModule rec {
1515
1616 doCheck = false;
1717
18− goPackagePath = "github.com/FiloSottile/mkcert";
1918 buildFlagsArray = ''
20− -ldflags=
21− -X ${goPackagePath}/main.Version=${version}
19+ -ldflags=-X main.Version=v${version}
2220 '';
2321
2422 meta = with lib; {
pkgs/development/tools/misc/nix-build-uncached/default.nix−1
@@ -11,7 +11,6 @@ buildGoModule rec {
1111 sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02";
1212 };
1313
14− goPackagePath = "github.com/Mic92/nix-build-uncached";
1514 vendorSha256 = null;
1615
1716 doCheck = false;
pkgs/development/tools/reftools/default.nix−1
@@ -12,7 +12,6 @@ buildGoModule rec {
1212
1313 doCheck = false;
1414
15− goPackagePath = "github.com/davidrjenni/reftools";
1615 excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
1716
1817 src = fetchFromGitHub {
pkgs/servers/caddy/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "caddy";
55 version = "1.0.5";
66
7− goPackagePath = "github.com/caddyserver/caddy";
8−
97 subPackages = [ "caddy" ];
108
119 src = fetchFromGitHub {
pkgs/servers/dns/coredns/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "coredns";
55 version = "1.7.0";
66
7− goPackagePath = "github.com/coredns/coredns";
8−
97 src = fetchFromGitHub {
108 owner = "coredns";
119 repo = "coredns";
pkgs/servers/hasura/cli.nix−1
@@ -7,7 +7,6 @@ buildGoModule rec {
77 src = hasura-graphql-engine.src;
88 modRoot = "./cli";
99
10− goPackagePath = "github.com/hasura/graphql-engine/cli";
1110 subPackages = [ "cmd/hasura" ];
1211
1312 vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a";
pkgs/servers/kapow/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "kapow";
55 version = "0.5.4";
66
7− goPackagePath = "github.com/BBVA/kapow";
8−
97 subPackages = [ "." ];
108
119 src = fetchFromGitHub {
pkgs/servers/matterbridge/default.nix−1
@@ -4,7 +4,6 @@ buildGoModule rec {
44 pname = "matterbridge";
55 version = "1.17.5";
66
7− goPackagePath = "github.com/42wim/matterbridge";
87 vendorSha256 = null;
98
109 doCheck = false;
pkgs/servers/monitoring/sensu-go/default.nix−2
@@ -7,8 +7,6 @@ let
77 version = "5.21.0";
88 shortRev = "3a1ac58"; # for internal version info
99
10− goPackagePath = "github.com/sensu/sensu-go";
11−
1210 src = fetchFromGitHub {
1311 owner = "sensu";
1412 repo = "sensu-go";
pkgs/servers/monitoring/telegraf/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "telegraf";
55 version = "1.15.2";
66
7− goPackagePath = "github.com/influxdata/telegraf";
8−
97 excludedPackages = "test";
108
119 subPackages = [ "cmd/telegraf" ];
pkgs/servers/tailscale/default.nix−1
@@ -15,7 +15,6 @@ buildGoModule rec {
1515
1616 CGO_ENABLED = 0;
1717
18− goPackagePath = "tailscale.com";
1918 vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv";
2019
2120 doCheck = false;
pkgs/shells/zsh/zsh-history/default.nix−2
@@ -17,8 +17,6 @@ buildGoModule rec {
1717
1818 doCheck = false;
1919
20− goPackagePath = "github.com/b4b4r07/history";
21−
2220 postInstall = ''
2321 install -d $out/share
2422 cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
pkgs/tools/admin/iamy/default.nix−2
@@ -4,8 +4,6 @@ buildGoModule rec {
44 pname = "iamy";
55 version = "2.3.2";
66
7− goPackagePath = "github.com/99designs/iamy";
8−
97 src = fetchFromGitHub {
108 owner = "99designs";
119 repo = "iamy";
pkgs/tools/networking/clash/default.nix+1−2
@@ -11,14 +11,13 @@ buildGoModule rec {
1111 sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny";
1212 };
1313
14− goPackagePath = "github.com/Dreamacro/clash";
1514 vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh";
1615
1716 doCheck = false;
1817
1918 buildFlagsArray = [
2019 "-ldflags="
21− "-X ${goPackagePath}/constant.Version=${version}"
20+ "-X github.com/Dreamacro/clash/constant.Version=${version}"
2221 ];
2322
2423 meta = with stdenv.lib; {
pkgs/tools/networking/oneshot/default.nix−1
@@ -11,7 +11,6 @@ buildGoModule rec {
1111 sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2";
1212 };
1313
14− goPackagePath = "github.com/raphaelreyna/oneshot";
1514 vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy";
1615
1716 doCheck = false;
pkgs/tools/networking/shadowfox/default.nix−2
@@ -11,8 +11,6 @@ buildGoModule rec {
1111 sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
1212 };
1313
14− goPackagePath = "github.com/SrKomodo/shadowfox-updater";
15−
1614 vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj";
1715
1816 doCheck = false;
pkgs/tools/security/age/default.nix−1
@@ -3,7 +3,6 @@
33buildGoModule rec {
44 pname = "age";
55 version = "1.0.0-beta4";
6− goPackagePath = "github.com/FiloSottile/age";
76 vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m";
87
98 doCheck = false;