summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Stott <stott.timothy@gmail.com>2020-08-11 22:04:55 +0100
committerGitHub <noreply@github.com>2020-08-11 21:04:55 +0000
commitba7c0893d4fcbe2b8fd449064a7bf7ec36553385 (patch)
tree6efe82338117f97770619c95385c83f67bc9209a
parent4c3b64adf417859edfbce599eee15d335167b2a8 (diff)
treewide: remove obsolete attribute goPackagePath in buildGoModule derivations (#95092)
The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage.
-rw-r--r--pkgs/applications/networking/cluster/kube3d/default.nix1
-rw-r--r--pkgs/applications/networking/instant-messengers/gomuks/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-bug/default.nix7
-rw-r--r--pkgs/applications/version-management/sourcehut/builds.nix5
-rw-r--r--pkgs/applications/version-management/sourcehut/git.nix20
-rw-r--r--pkgs/development/tools/continuous-integration/drone-cli/default.nix1
-rw-r--r--pkgs/development/tools/continuous-integration/drone/default.nix1
-rw-r--r--pkgs/development/tools/godef/default.nix1
-rw-r--r--pkgs/development/tools/gomodifytags/default.nix2
-rw-r--r--pkgs/development/tools/gopkgs/default.nix2
-rw-r--r--pkgs/development/tools/gosec/default.nix2
-rw-r--r--pkgs/development/tools/hcloud/default.nix2
-rw-r--r--pkgs/development/tools/kind/default.nix1
-rw-r--r--pkgs/development/tools/kubeprompt/default.nix3
-rw-r--r--pkgs/development/tools/misc/mkcert/default.nix4
-rw-r--r--pkgs/development/tools/misc/nix-build-uncached/default.nix1
-rw-r--r--pkgs/development/tools/reftools/default.nix1
-rw-r--r--pkgs/servers/caddy/default.nix2
-rw-r--r--pkgs/servers/dns/coredns/default.nix2
-rw-r--r--pkgs/servers/hasura/cli.nix1
-rw-r--r--pkgs/servers/kapow/default.nix2
-rw-r--r--pkgs/servers/matterbridge/default.nix1
-rw-r--r--pkgs/servers/monitoring/sensu-go/default.nix2
-rw-r--r--pkgs/servers/monitoring/telegraf/default.nix2
-rw-r--r--pkgs/servers/tailscale/default.nix1
-rw-r--r--pkgs/shells/zsh/zsh-history/default.nix2
-rw-r--r--pkgs/tools/admin/iamy/default.nix2
-rw-r--r--pkgs/tools/networking/clash/default.nix3
-rw-r--r--pkgs/tools/networking/oneshot/default.nix1
-rw-r--r--pkgs/tools/networking/shadowfox/default.nix2
-rw-r--r--pkgs/tools/security/age/default.nix1
31 files changed, 16 insertions, 64 deletions
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 5688dcdcd957..decbdbd1fbc7 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -5,7 +5,6 @@ buildGoModule rec {
version = "3.0.0";
k3sVersion = "1.18.6-k3s1";
- goPackagePath = "github.com/rancher/k3d";
excludedPackages = ''tools'';
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 7eab32f6506e..8df4e4b3ea35 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gomuks";
version = "0.1.2";
- goPackagePath = "maunium.net/go/gomuks";
-
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index fa4c3b2d851d..74acf0139d5e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -4,7 +4,6 @@ buildGoModule rec {
pname = "git-bug";
version = "0.7.1"; # the `rev` below pins the version of the source to get
rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c";
- goPackagePath = "github.com/MichaelMure/git-bug";
src = fetchFromGitHub {
inherit rev;
@@ -19,9 +18,9 @@ buildGoModule rec {
buildFlagsArray = ''
-ldflags=
- -X ${goPackagePath}/commands.GitCommit=${rev}
- -X ${goPackagePath}/commands.GitLastTag=${version}
- -X ${goPackagePath}/commands.GitExactTag=${version}
+ -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}
+ -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}
+ -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}
'';
postInstall = ''
diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix
index beec22c41b9f..d5a72a70ec6c 100644
--- a/pkgs/applications/version-management/sourcehut/builds.nix
+++ b/pkgs/applications/version-management/sourcehut/builds.nix
@@ -9,11 +9,10 @@ let
buildWorker = src: buildGoModule {
inherit src version;
pname = "builds-sr-ht-worker";
- goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker";
- vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp";
+ vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp";
- doCheck = false;
+ doCheck = false;
};
in buildPythonPackage rec {
inherit version;
diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix
index cee13448b24c..d71568b94fd8 100644
--- a/pkgs/applications/version-management/sourcehut/git.nix
+++ b/pkgs/applications/version-management/sourcehut/git.nix
@@ -9,41 +9,37 @@ let
buildShell = src: buildGoModule {
inherit src version;
pname = "gitsrht-shell";
- goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell";
- vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5";
+ vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5";
- doCheck = false;
+ doCheck = false;
};
buildDispatcher = src: buildGoModule {
inherit src version;
pname = "gitsrht-dispatcher";
- goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
- vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9";
+ vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9";
- doCheck = false;
+ doCheck = false;
};
buildKeys = src: buildGoModule {
inherit src version;
pname = "gitsrht-keys";
- goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys";
- vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv";
+ vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv";
- doCheck = false;
+ doCheck = false;
};
buildUpdateHook = src: buildGoModule {
inherit src version;
pname = "gitsrht-update-hook";
- goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook";
- vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63";
+ vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63";
- doCheck = false;
+ doCheck = false;
};
in buildPythonPackage rec {
inherit version;
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index dc107a04a38e..3df406eb560b 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -5,7 +5,6 @@ in buildGoModule rec {
inherit version;
pname = "drone-cli";
revision = "v${version}";
- goPackagePath = "github.com/drone/drone-cli";
vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi";
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index c451bc8ecfa8..307dda4f993b 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -3,7 +3,6 @@
buildGoModule rec {
name = "drone.io-${version}";
version = "1.9.0";
- goPackagePath = "github.com/drone/drone";
vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 19dd09b22481..c8149ecc82dd 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -5,7 +5,6 @@ buildGoModule rec {
version = "1.1.2";
rev = "v${version}";
- goPackagePath = "github.com/rogpeppe/godef";
subPackages = [ "." ];
vendorSha256 = null;
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 9bedc0432fde..cf2c5a5b9a6f 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -8,8 +8,6 @@ buildGoModule rec {
doCheck = false;
- goPackagePath = "github.com/fatih/gomodifytags";
-
src = fetchFromGitHub {
owner = "fatih";
repo = "gomodifytags";
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index b31111e44ebe..d112654ab437 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gopkgs";
version = "2.1.2";
- goPackagePath = "github.com/uudashr/gopkgs";
-
subPackages = [ "cmd/gopkgs" ];
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index e7df3f694cec..ffbd98a45772 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gosec";
version = "2.4.0";
- goPackagePath = "github.com/securego/gosec";
-
subPackages = [ "cmd/gosec" ];
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 4fc8a35f6b67..52a407b3878a 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "hcloud";
version = "1.17.0";
- goPackagePath = "github.com/hetznercloud/cli";
-
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index c78dc3faeabf..6ea2c87f8888 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -17,7 +17,6 @@ buildGoModule rec {
doCheck = false;
- goPackagePath = "sigs.k8s.io/kind";
subPackages = [ "." ];
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix
index 34e8fc45d356..f91d95ce508f 100644
--- a/pkgs/development/tools/kubeprompt/default.nix
+++ b/pkgs/development/tools/kubeprompt/default.nix
@@ -15,10 +15,9 @@ buildGoModule rec {
export buildFlagsArray+=(
"-ldflags=
-w -s
- -X ${goPackagePath}/pkg/version.Version=${version}")
+ -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}")
'';
- goPackagePath = "github.com/jlesquembre/kubeprompt";
vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi";
doCheck = false;
diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index 5319e4608fa1..ec4042a2a276 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -15,10 +15,8 @@ buildGoModule rec {
doCheck = false;
- goPackagePath = "github.com/FiloSottile/mkcert";
buildFlagsArray = ''
- -ldflags=
- -X ${goPackagePath}/main.Version=${version}
+ -ldflags=-X main.Version=v${version}
'';
meta = with lib; {
diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix
index ad46affcd2ec..9bff7acc81d2 100644
--- a/pkgs/development/tools/misc/nix-build-uncached/default.nix
+++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix
@@ -11,7 +11,6 @@ buildGoModule rec {
sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02";
};
- goPackagePath = "github.com/Mic92/nix-build-uncached";
vendorSha256 = null;
doCheck = false;
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
index 74a843c93bcb..440d2f961337 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/pkgs/development/tools/reftools/default.nix
@@ -12,7 +12,6 @@ buildGoModule rec {
doCheck = false;
- goPackagePath = "github.com/davidrjenni/reftools";
excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
src = fetchFromGitHub {
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 8c8d49b6659a..05b69c30e6ce 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "caddy";
version = "1.0.5";
- goPackagePath = "github.com/caddyserver/caddy";
-
subPackages = [ "caddy" ];
src = fetchFromGitHub {
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index f42433caaf7f..981056b53c1c 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "coredns";
version = "1.7.0";
- goPackagePath = "github.com/coredns/coredns";
-
src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix
index d55121d7ede8..88b6b418dd9b 100644
--- a/pkgs/servers/hasura/cli.nix
+++ b/pkgs/servers/hasura/cli.nix
@@ -7,7 +7,6 @@ buildGoModule rec {
src = hasura-graphql-engine.src;
modRoot = "./cli";
- goPackagePath = "github.com/hasura/graphql-engine/cli";
subPackages = [ "cmd/hasura" ];
vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a";
diff --git a/pkgs/servers/kapow/default.nix b/pkgs/servers/kapow/default.nix
index bba34e5fa9f7..520af62576e9 100644
--- a/pkgs/servers/kapow/default.nix
+++ b/pkgs/servers/kapow/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "kapow";
version = "0.5.4";
- goPackagePath = "github.com/BBVA/kapow";
-
subPackages = [ "." ];
src = fetchFromGitHub {
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index b3ede4149181..6bdbe38ff3d6 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -4,7 +4,6 @@ buildGoModule rec {
pname = "matterbridge";
version = "1.17.5";
- goPackagePath = "github.com/42wim/matterbridge";
vendorSha256 = null;
doCheck = false;
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 159f059c7b6a..8660e0b19c1f 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -7,8 +7,6 @@ let
version = "5.21.0";
shortRev = "3a1ac58"; # for internal version info
- goPackagePath = "github.com/sensu/sensu-go";
-
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 350023627575..722e06ab072c 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "telegraf";
version = "1.15.2";
- goPackagePath = "github.com/influxdata/telegraf";
-
excludedPackages = "test";
subPackages = [ "cmd/telegraf" ];
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index db43977e3a2c..a5aa77cd040e 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -15,7 +15,6 @@ buildGoModule rec {
CGO_ENABLED = 0;
- goPackagePath = "tailscale.com";
vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv";
doCheck = false;
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix
index 90d70885b7ee..3d48467a2465 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/pkgs/shells/zsh/zsh-history/default.nix
@@ -17,8 +17,6 @@ buildGoModule rec {
doCheck = false;
- goPackagePath = "github.com/b4b4r07/history";
-
postInstall = ''
install -d $out/share
cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index 6b9cf50a2692..1a668777e2e6 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "iamy";
version = "2.3.2";
- goPackagePath = "github.com/99designs/iamy";
-
src = fetchFromGitHub {
owner = "99designs";
repo = "iamy";
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index c3647bd44327..a0b10df6e560 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -11,14 +11,13 @@ buildGoModule rec {
sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny";
};
- goPackagePath = "github.com/Dreamacro/clash";
vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh";
doCheck = false;
buildFlagsArray = [
"-ldflags="
- "-X ${goPackagePath}/constant.Version=${version}"
+ "-X github.com/Dreamacro/clash/constant.Version=${version}"
];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix
index 223a3fbdf55e..4ce866e9040d 100644
--- a/pkgs/tools/networking/oneshot/default.nix
+++ b/pkgs/tools/networking/oneshot/default.nix
@@ -11,7 +11,6 @@ buildGoModule rec {
sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2";
};
- goPackagePath = "github.com/raphaelreyna/oneshot";
vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy";
doCheck = false;
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix
index 5a9377579e90..0e1e6b9b42e5 100644
--- a/pkgs/tools/networking/shadowfox/default.nix
+++ b/pkgs/tools/networking/shadowfox/default.nix
@@ -11,8 +11,6 @@ buildGoModule rec {
sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
};
- goPackagePath = "github.com/SrKomodo/shadowfox-updater";
-
vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj";
doCheck = false;
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix
index 8436972ebc53..8a6d008551e8 100644
--- a/pkgs/tools/security/age/default.nix
+++ b/pkgs/tools/security/age/default.nix
@@ -3,7 +3,6 @@
buildGoModule rec {
pname = "age";
version = "1.0.0-beta4";
- goPackagePath = "github.com/FiloSottile/age";
vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m";
doCheck = false;