public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove obsolete attribute goPackagePath in buildGoModule derivations (#95092)

Browse Source 
The buildGoModule infrastructure does not make use of goPackagePath it is a residue from buildGoPackage.
This commit is contained in:
Timothy Stott 2020-08-11 22:04:55 +01:00 committed by GitHub
parent 4c3b64adf4
commit ba7c0893d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 16 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/cluster/kube3d/default.nix
View File

@ -5,7 +5,6 @@ buildGoModule rec {
version = "3.0.0"; version = "3.0.0";
k3sVersion = "1.18.6-k3s1"; k3sVersion = "1.18.6-k3s1";
goPackagePath = "github.com/rancher/k3d";
excludedPackages = ''tools''; excludedPackages = ''tools'';
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gomuks"; pname = "gomuks";
version = "0.1.2"; version = "0.1.2";
goPackagePath = "maunium.net/go/gomuks";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tulir"; owner = "tulir";
repo = pname; repo = pname;

7
pkgs/applications/version-management/git-and-tools/git-bug/default.nix
View File

@ -4,7 +4,6 @@ buildGoModule rec {
pname = "git-bug"; pname = "git-bug";
version = "0.7.1"; # the `rev` below pins the version of the source to get version = "0.7.1"; # the `rev` below pins the version of the source to get
rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c"; rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c";
goPackagePath = "github.com/MichaelMure/git-bug";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
@ -19,9 +18,9 @@ buildGoModule rec {
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
-X ${goPackagePath}/commands.GitCommit=${rev} -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}
-X ${goPackagePath}/commands.GitLastTag=${version} -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}
-X ${goPackagePath}/commands.GitExactTag=${version} -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}
''; '';
postInstall = '' postInstall = ''

5
pkgs/applications/version-management/sourcehut/builds.nix
View File

@ -9,11 +9,10 @@ let
buildWorker = src: buildGoModule { buildWorker = src: buildGoModule {
inherit src version; inherit src version;
pname = "builds-sr-ht-worker"; 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 { in buildPythonPackage rec {
inherit version; inherit version;

20
pkgs/applications/version-management/sourcehut/git.nix
View File

@ -9,41 +9,37 @@ let
buildShell = src: buildGoModule { buildShell = src: buildGoModule {
inherit src version; inherit src version;
pname = "gitsrht-shell"; pname = "gitsrht-shell";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell";
vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5";
doCheck = false; doCheck = false;
}; };
buildDispatcher = src: buildGoModule { buildDispatcher = src: buildGoModule {
inherit src version; inherit src version;
pname = "gitsrht-dispatcher"; pname = "gitsrht-dispatcher";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9";
doCheck = false; doCheck = false;
}; };
buildKeys = src: buildGoModule { buildKeys = src: buildGoModule {
inherit src version; inherit src version;
pname = "gitsrht-keys"; pname = "gitsrht-keys";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys";
vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv";
doCheck = false; doCheck = false;
}; };
buildUpdateHook = src: buildGoModule { buildUpdateHook = src: buildGoModule {
inherit src version; inherit src version;
pname = "gitsrht-update-hook"; 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 { in buildPythonPackage rec {
inherit version; inherit version;

1
pkgs/development/tools/continuous-integration/drone-cli/default.nix
View File

@ -5,7 +5,6 @@ in buildGoModule rec {
inherit version; inherit version;
pname = "drone-cli"; pname = "drone-cli";
revision = "v${version}"; revision = "v${version}";
goPackagePath = "github.com/drone/drone-cli";
vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi";

1
pkgs/development/tools/continuous-integration/drone/default.nix
View File

@ -3,7 +3,6 @@
buildGoModule rec { buildGoModule rec {
name = "drone.io-${version}"; name = "drone.io-${version}";
version = "1.9.0"; version = "1.9.0";
goPackagePath = "github.com/drone/drone";
vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx"; vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";

1
pkgs/development/tools/godef/default.nix
View File

@ -5,7 +5,6 @@ buildGoModule rec {
version = "1.1.2"; version = "1.1.2";
rev = "v${version}"; rev = "v${version}";
goPackagePath = "github.com/rogpeppe/godef";
subPackages = [ "." ]; subPackages = [ "." ];
vendorSha256 = null; vendorSha256 = null;

2
pkgs/development/tools/gomodifytags/default.nix
View File

@ -8,8 +8,6 @@ buildGoModule rec {
doCheck = false; doCheck = false;
goPackagePath = "github.com/fatih/gomodifytags";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatih"; owner = "fatih";
repo = "gomodifytags"; repo = "gomodifytags";

2
pkgs/development/tools/gopkgs/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gopkgs"; pname = "gopkgs";
version = "2.1.2"; version = "2.1.2";
goPackagePath = "github.com/uudashr/gopkgs";
subPackages = [ "cmd/gopkgs" ]; subPackages = [ "cmd/gopkgs" ];
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/development/tools/gosec/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gosec"; pname = "gosec";
version = "2.4.0"; version = "2.4.0";
goPackagePath = "github.com/securego/gosec";
subPackages = [ "cmd/gosec" ]; subPackages = [ "cmd/gosec" ];
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/development/tools/hcloud/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "hcloud"; pname = "hcloud";
version = "1.17.0"; version = "1.17.0";
goPackagePath = "github.com/hetznercloud/cli";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hetznercloud"; owner = "hetznercloud";
repo = "cli"; repo = "cli";

1
pkgs/development/tools/kind/default.nix
View File

@ -17,7 +17,6 @@ buildGoModule rec {
doCheck = false; doCheck = false;
goPackagePath = "sigs.k8s.io/kind";
subPackages = [ "." ]; subPackages = [ "." ];
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

3
pkgs/development/tools/kubeprompt/default.nix
View File

@ -15,10 +15,9 @@ buildGoModule rec {
export buildFlagsArray+=( export buildFlagsArray+=(
"-ldflags= "-ldflags=
-w -s -w -s
-X ${goPackagePath}/pkg/version.Version=${version}") -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}")
''; '';
goPackagePath = "github.com/jlesquembre/kubeprompt";
vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi";
doCheck = false; doCheck = false;

4
pkgs/development/tools/misc/mkcert/default.nix
View File

@ -15,10 +15,8 @@ buildGoModule rec {
doCheck = false; doCheck = false;
goPackagePath = "github.com/FiloSottile/mkcert";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=-X main.Version=v${version}
-X ${goPackagePath}/main.Version=${version}
''; '';
meta = with lib; { meta = with lib; {

1
pkgs/development/tools/misc/nix-build-uncached/default.nix
View File

@ -11,7 +11,6 @@ buildGoModule rec {
sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02";
}; };
goPackagePath = "github.com/Mic92/nix-build-uncached";
vendorSha256 = null; vendorSha256 = null;
doCheck = false; doCheck = false;

1
pkgs/development/tools/reftools/default.nix
View File

@ -12,7 +12,6 @@ buildGoModule rec {
doCheck = false; doCheck = false;
goPackagePath = "github.com/davidrjenni/reftools";
excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/servers/caddy/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "caddy"; pname = "caddy";
version = "1.0.5"; version = "1.0.5";
goPackagePath = "github.com/caddyserver/caddy";
subPackages = [ "caddy" ]; subPackages = [ "caddy" ];
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/servers/dns/coredns/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "coredns"; pname = "coredns";
version = "1.7.0"; version = "1.7.0";
goPackagePath = "github.com/coredns/coredns";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coredns"; owner = "coredns";
repo = "coredns"; repo = "coredns";

1
pkgs/servers/hasura/cli.nix
View File

@ -7,7 +7,6 @@ buildGoModule rec {
src = hasura-graphql-engine.src; src = hasura-graphql-engine.src;
modRoot = "./cli"; modRoot = "./cli";
goPackagePath = "github.com/hasura/graphql-engine/cli";
subPackages = [ "cmd/hasura" ]; subPackages = [ "cmd/hasura" ];
vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a";

2
pkgs/servers/kapow/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "kapow"; pname = "kapow";
version = "0.5.4"; version = "0.5.4";
goPackagePath = "github.com/BBVA/kapow";
subPackages = [ "." ]; subPackages = [ "." ];
src = fetchFromGitHub { src = fetchFromGitHub {

1
pkgs/servers/matterbridge/default.nix
View File

@ -4,7 +4,6 @@ buildGoModule rec {
pname = "matterbridge"; pname = "matterbridge";
version = "1.17.5"; version = "1.17.5";
goPackagePath = "github.com/42wim/matterbridge";
vendorSha256 = null; vendorSha256 = null;
doCheck = false; doCheck = false;

2
pkgs/servers/monitoring/sensu-go/default.nix
View File

@ -7,8 +7,6 @@ let
version = "5.21.0"; version = "5.21.0";
shortRev = "3a1ac58"; # for internal version info shortRev = "3a1ac58"; # for internal version info
goPackagePath = "github.com/sensu/sensu-go";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sensu"; owner = "sensu";
repo = "sensu-go"; repo = "sensu-go";

2
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "telegraf"; pname = "telegraf";
version = "1.15.2"; version = "1.15.2";
goPackagePath = "github.com/influxdata/telegraf";
excludedPackages = "test"; excludedPackages = "test";
subPackages = [ "cmd/telegraf" ]; subPackages = [ "cmd/telegraf" ];

1
pkgs/servers/tailscale/default.nix
View File

@ -15,7 +15,6 @@ buildGoModule rec {
CGO_ENABLED = 0; CGO_ENABLED = 0;
goPackagePath = "tailscale.com";
vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv"; vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv";
doCheck = false; doCheck = false;

2
pkgs/shells/zsh/zsh-history/default.nix
View File

@ -17,8 +17,6 @@ buildGoModule rec {
doCheck = false; doCheck = false;
goPackagePath = "github.com/b4b4r07/history";
postInstall = '' postInstall = ''
install -d $out/share install -d $out/share
cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share" cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"

2
pkgs/tools/admin/iamy/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "iamy"; pname = "iamy";
version = "2.3.2"; version = "2.3.2";
goPackagePath = "github.com/99designs/iamy";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "99designs"; owner = "99designs";
repo = "iamy"; repo = "iamy";

3
pkgs/tools/networking/clash/default.nix
View File

@ -11,14 +11,13 @@ buildGoModule rec {
sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny";
}; };
goPackagePath = "github.com/Dreamacro/clash";
vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh";
doCheck = false; doCheck = false;
buildFlagsArray = [ buildFlagsArray = [
"-ldflags=" "-ldflags="
"-X ${goPackagePath}/constant.Version=${version}" "-X github.com/Dreamacro/clash/constant.Version=${version}"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

1
pkgs/tools/networking/oneshot/default.nix
View File

@ -11,7 +11,6 @@ buildGoModule rec {
sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2";
}; };
goPackagePath = "github.com/raphaelreyna/oneshot";
vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy";
doCheck = false; doCheck = false;

2
pkgs/tools/networking/shadowfox/default.nix
View File

@ -11,8 +11,6 @@ buildGoModule rec {
sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
}; };
goPackagePath = "github.com/SrKomodo/shadowfox-updater";
vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj";
doCheck = false; doCheck = false;

1
pkgs/tools/security/age/default.nix
View File

@ -3,7 +3,6 @@
buildGoModule rec { buildGoModule rec {
pname = "age"; pname = "age";
version = "1.0.0-beta4"; version = "1.0.0-beta4";
goPackagePath = "github.com/FiloSottile/age";
vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m";
doCheck = false; doCheck = false;