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

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

authored by

Timothy Stott and committed by
GitHub
ba7c0893 4c3b64ad

+16 -64
-1
pkgs/applications/networking/cluster/kube3d/default.nix
··· 5 version = "3.0.0"; 6 k3sVersion = "1.18.6-k3s1"; 7 8 - goPackagePath = "github.com/rancher/k3d"; 9 excludedPackages = ''tools''; 10 11 src = fetchFromGitHub {
··· 5 version = "3.0.0"; 6 k3sVersion = "1.18.6-k3s1"; 7 8 excludedPackages = ''tools''; 9 10 src = fetchFromGitHub {
-2
pkgs/applications/networking/instant-messengers/gomuks/default.nix
··· 4 pname = "gomuks"; 5 version = "0.1.2"; 6 7 - goPackagePath = "maunium.net/go/gomuks"; 8 - 9 src = fetchFromGitHub { 10 owner = "tulir"; 11 repo = pname;
··· 4 pname = "gomuks"; 5 version = "0.1.2"; 6 7 src = fetchFromGitHub { 8 owner = "tulir"; 9 repo = pname;
+3 -4
pkgs/applications/version-management/git-and-tools/git-bug/default.nix
··· 4 pname = "git-bug"; 5 version = "0.7.1"; # the `rev` below pins the version of the source to get 6 rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c"; 7 - goPackagePath = "github.com/MichaelMure/git-bug"; 8 9 src = fetchFromGitHub { 10 inherit rev; ··· 19 20 buildFlagsArray = '' 21 -ldflags= 22 - -X ${goPackagePath}/commands.GitCommit=${rev} 23 - -X ${goPackagePath}/commands.GitLastTag=${version} 24 - -X ${goPackagePath}/commands.GitExactTag=${version} 25 ''; 26 27 postInstall = ''
··· 4 pname = "git-bug"; 5 version = "0.7.1"; # the `rev` below pins the version of the source to get 6 rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c"; 7 8 src = fetchFromGitHub { 9 inherit rev; ··· 18 19 buildFlagsArray = '' 20 -ldflags= 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} 24 ''; 25 26 postInstall = ''
+2 -3
pkgs/applications/version-management/sourcehut/builds.nix
··· 9 buildWorker = src: buildGoModule { 10 inherit src version; 11 pname = "builds-sr-ht-worker"; 12 - goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; 13 14 - vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; 15 16 - doCheck = false; 17 }; 18 in buildPythonPackage rec { 19 inherit version;
··· 9 buildWorker = src: buildGoModule { 10 inherit src version; 11 pname = "builds-sr-ht-worker"; 12 13 + vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; 14 15 + doCheck = false; 16 }; 17 in buildPythonPackage rec { 18 inherit version;
+8 -12
pkgs/applications/version-management/sourcehut/git.nix
··· 9 buildShell = src: buildGoModule { 10 inherit src version; 11 pname = "gitsrht-shell"; 12 - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; 13 14 - vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; 15 16 - doCheck = false; 17 }; 18 19 buildDispatcher = src: buildGoModule { 20 inherit src version; 21 pname = "gitsrht-dispatcher"; 22 - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; 23 24 - vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; 25 26 - doCheck = false; 27 }; 28 29 buildKeys = src: buildGoModule { 30 inherit src version; 31 pname = "gitsrht-keys"; 32 - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys"; 33 34 - vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; 35 36 - doCheck = false; 37 }; 38 39 buildUpdateHook = src: buildGoModule { 40 inherit src version; 41 pname = "gitsrht-update-hook"; 42 - goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook"; 43 44 - vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; 45 46 - doCheck = false; 47 }; 48 in buildPythonPackage rec { 49 inherit version;
··· 9 buildShell = src: buildGoModule { 10 inherit src version; 11 pname = "gitsrht-shell"; 12 13 + vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; 14 15 + doCheck = false; 16 }; 17 18 buildDispatcher = src: buildGoModule { 19 inherit src version; 20 pname = "gitsrht-dispatcher"; 21 22 + vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; 23 24 + doCheck = false; 25 }; 26 27 buildKeys = src: buildGoModule { 28 inherit src version; 29 pname = "gitsrht-keys"; 30 31 + vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; 32 33 + doCheck = false; 34 }; 35 36 buildUpdateHook = src: buildGoModule { 37 inherit src version; 38 pname = "gitsrht-update-hook"; 39 40 + vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; 41 42 + doCheck = false; 43 }; 44 in buildPythonPackage rec { 45 inherit version;
-1
pkgs/development/tools/continuous-integration/drone-cli/default.nix
··· 5 inherit version; 6 pname = "drone-cli"; 7 revision = "v${version}"; 8 - goPackagePath = "github.com/drone/drone-cli"; 9 10 vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; 11
··· 5 inherit version; 6 pname = "drone-cli"; 7 revision = "v${version}"; 8 9 vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; 10
-1
pkgs/development/tools/continuous-integration/drone/default.nix
··· 3 buildGoModule rec { 4 name = "drone.io-${version}"; 5 version = "1.9.0"; 6 - goPackagePath = "github.com/drone/drone"; 7 8 vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx"; 9
··· 3 buildGoModule rec { 4 name = "drone.io-${version}"; 5 version = "1.9.0"; 6 7 vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx"; 8
-1
pkgs/development/tools/godef/default.nix
··· 5 version = "1.1.2"; 6 rev = "v${version}"; 7 8 - goPackagePath = "github.com/rogpeppe/godef"; 9 subPackages = [ "." ]; 10 11 vendorSha256 = null;
··· 5 version = "1.1.2"; 6 rev = "v${version}"; 7 8 subPackages = [ "." ]; 9 10 vendorSha256 = null;
-2
pkgs/development/tools/gomodifytags/default.nix
··· 8 9 doCheck = false; 10 11 - goPackagePath = "github.com/fatih/gomodifytags"; 12 - 13 src = fetchFromGitHub { 14 owner = "fatih"; 15 repo = "gomodifytags";
··· 8 9 doCheck = false; 10 11 src = fetchFromGitHub { 12 owner = "fatih"; 13 repo = "gomodifytags";
-2
pkgs/development/tools/gopkgs/default.nix
··· 4 pname = "gopkgs"; 5 version = "2.1.2"; 6 7 - goPackagePath = "github.com/uudashr/gopkgs"; 8 - 9 subPackages = [ "cmd/gopkgs" ]; 10 11 src = fetchFromGitHub {
··· 4 pname = "gopkgs"; 5 version = "2.1.2"; 6 7 subPackages = [ "cmd/gopkgs" ]; 8 9 src = fetchFromGitHub {
-2
pkgs/development/tools/gosec/default.nix
··· 4 pname = "gosec"; 5 version = "2.4.0"; 6 7 - goPackagePath = "github.com/securego/gosec"; 8 - 9 subPackages = [ "cmd/gosec" ]; 10 11 src = fetchFromGitHub {
··· 4 pname = "gosec"; 5 version = "2.4.0"; 6 7 subPackages = [ "cmd/gosec" ]; 8 9 src = fetchFromGitHub {
-2
pkgs/development/tools/hcloud/default.nix
··· 4 pname = "hcloud"; 5 version = "1.17.0"; 6 7 - goPackagePath = "github.com/hetznercloud/cli"; 8 - 9 src = fetchFromGitHub { 10 owner = "hetznercloud"; 11 repo = "cli";
··· 4 pname = "hcloud"; 5 version = "1.17.0"; 6 7 src = fetchFromGitHub { 8 owner = "hetznercloud"; 9 repo = "cli";
-1
pkgs/development/tools/kind/default.nix
··· 17 18 doCheck = false; 19 20 - goPackagePath = "sigs.k8s.io/kind"; 21 subPackages = [ "." ]; 22 23 nativeBuildInputs = [ installShellFiles ];
··· 17 18 doCheck = false; 19 20 subPackages = [ "." ]; 21 22 nativeBuildInputs = [ installShellFiles ];
+1 -2
pkgs/development/tools/kubeprompt/default.nix
··· 15 export buildFlagsArray+=( 16 "-ldflags= 17 -w -s 18 - -X ${goPackagePath}/pkg/version.Version=${version}") 19 ''; 20 21 - goPackagePath = "github.com/jlesquembre/kubeprompt"; 22 vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; 23 24 doCheck = false;
··· 15 export buildFlagsArray+=( 16 "-ldflags= 17 -w -s 18 + -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}") 19 ''; 20 21 vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; 22 23 doCheck = false;
+1 -3
pkgs/development/tools/misc/mkcert/default.nix
··· 15 16 doCheck = false; 17 18 - goPackagePath = "github.com/FiloSottile/mkcert"; 19 buildFlagsArray = '' 20 - -ldflags= 21 - -X ${goPackagePath}/main.Version=${version} 22 ''; 23 24 meta = with lib; {
··· 15 16 doCheck = false; 17 18 buildFlagsArray = '' 19 + -ldflags=-X main.Version=v${version} 20 ''; 21 22 meta = with lib; {
-1
pkgs/development/tools/misc/nix-build-uncached/default.nix
··· 11 sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; 12 }; 13 14 - goPackagePath = "github.com/Mic92/nix-build-uncached"; 15 vendorSha256 = null; 16 17 doCheck = false;
··· 11 sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; 12 }; 13 14 vendorSha256 = null; 15 16 doCheck = false;
-1
pkgs/development/tools/reftools/default.nix
··· 12 13 doCheck = false; 14 15 - goPackagePath = "github.com/davidrjenni/reftools"; 16 excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; 17 18 src = fetchFromGitHub {
··· 12 13 doCheck = false; 14 15 excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; 16 17 src = fetchFromGitHub {
-2
pkgs/servers/caddy/default.nix
··· 4 pname = "caddy"; 5 version = "1.0.5"; 6 7 - goPackagePath = "github.com/caddyserver/caddy"; 8 - 9 subPackages = [ "caddy" ]; 10 11 src = fetchFromGitHub {
··· 4 pname = "caddy"; 5 version = "1.0.5"; 6 7 subPackages = [ "caddy" ]; 8 9 src = fetchFromGitHub {
-2
pkgs/servers/dns/coredns/default.nix
··· 4 pname = "coredns"; 5 version = "1.7.0"; 6 7 - goPackagePath = "github.com/coredns/coredns"; 8 - 9 src = fetchFromGitHub { 10 owner = "coredns"; 11 repo = "coredns";
··· 4 pname = "coredns"; 5 version = "1.7.0"; 6 7 src = fetchFromGitHub { 8 owner = "coredns"; 9 repo = "coredns";
-1
pkgs/servers/hasura/cli.nix
··· 7 src = hasura-graphql-engine.src; 8 modRoot = "./cli"; 9 10 - goPackagePath = "github.com/hasura/graphql-engine/cli"; 11 subPackages = [ "cmd/hasura" ]; 12 13 vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a";
··· 7 src = hasura-graphql-engine.src; 8 modRoot = "./cli"; 9 10 subPackages = [ "cmd/hasura" ]; 11 12 vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a";
-2
pkgs/servers/kapow/default.nix
··· 4 pname = "kapow"; 5 version = "0.5.4"; 6 7 - goPackagePath = "github.com/BBVA/kapow"; 8 - 9 subPackages = [ "." ]; 10 11 src = fetchFromGitHub {
··· 4 pname = "kapow"; 5 version = "0.5.4"; 6 7 subPackages = [ "." ]; 8 9 src = fetchFromGitHub {
-1
pkgs/servers/matterbridge/default.nix
··· 4 pname = "matterbridge"; 5 version = "1.17.5"; 6 7 - goPackagePath = "github.com/42wim/matterbridge"; 8 vendorSha256 = null; 9 10 doCheck = false;
··· 4 pname = "matterbridge"; 5 version = "1.17.5"; 6 7 vendorSha256 = null; 8 9 doCheck = false;
-2
pkgs/servers/monitoring/sensu-go/default.nix
··· 7 version = "5.21.0"; 8 shortRev = "3a1ac58"; # for internal version info 9 10 - goPackagePath = "github.com/sensu/sensu-go"; 11 - 12 src = fetchFromGitHub { 13 owner = "sensu"; 14 repo = "sensu-go";
··· 7 version = "5.21.0"; 8 shortRev = "3a1ac58"; # for internal version info 9 10 src = fetchFromGitHub { 11 owner = "sensu"; 12 repo = "sensu-go";
-2
pkgs/servers/monitoring/telegraf/default.nix
··· 4 pname = "telegraf"; 5 version = "1.15.2"; 6 7 - goPackagePath = "github.com/influxdata/telegraf"; 8 - 9 excludedPackages = "test"; 10 11 subPackages = [ "cmd/telegraf" ];
··· 4 pname = "telegraf"; 5 version = "1.15.2"; 6 7 excludedPackages = "test"; 8 9 subPackages = [ "cmd/telegraf" ];
-1
pkgs/servers/tailscale/default.nix
··· 15 16 CGO_ENABLED = 0; 17 18 - goPackagePath = "tailscale.com"; 19 vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv"; 20 21 doCheck = false;
··· 15 16 CGO_ENABLED = 0; 17 18 vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv"; 19 20 doCheck = false;
-2
pkgs/shells/zsh/zsh-history/default.nix
··· 17 18 doCheck = false; 19 20 - goPackagePath = "github.com/b4b4r07/history"; 21 - 22 postInstall = '' 23 install -d $out/share 24 cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
··· 17 18 doCheck = false; 19 20 postInstall = '' 21 install -d $out/share 22 cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
-2
pkgs/tools/admin/iamy/default.nix
··· 4 pname = "iamy"; 5 version = "2.3.2"; 6 7 - goPackagePath = "github.com/99designs/iamy"; 8 - 9 src = fetchFromGitHub { 10 owner = "99designs"; 11 repo = "iamy";
··· 4 pname = "iamy"; 5 version = "2.3.2"; 6 7 src = fetchFromGitHub { 8 owner = "99designs"; 9 repo = "iamy";
+1 -2
pkgs/tools/networking/clash/default.nix
··· 11 sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; 12 }; 13 14 - goPackagePath = "github.com/Dreamacro/clash"; 15 vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; 16 17 doCheck = false; 18 19 buildFlagsArray = [ 20 "-ldflags=" 21 - "-X ${goPackagePath}/constant.Version=${version}" 22 ]; 23 24 meta = with stdenv.lib; {
··· 11 sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; 12 }; 13 14 vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; 15 16 doCheck = false; 17 18 buildFlagsArray = [ 19 "-ldflags=" 20 + "-X github.com/Dreamacro/clash/constant.Version=${version}" 21 ]; 22 23 meta = with stdenv.lib; {
-1
pkgs/tools/networking/oneshot/default.nix
··· 11 sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; 12 }; 13 14 - goPackagePath = "github.com/raphaelreyna/oneshot"; 15 vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; 16 17 doCheck = false;
··· 11 sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; 12 }; 13 14 vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; 15 16 doCheck = false;
-2
pkgs/tools/networking/shadowfox/default.nix
··· 11 sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; 12 }; 13 14 - goPackagePath = "github.com/SrKomodo/shadowfox-updater"; 15 - 16 vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; 17 18 doCheck = false;
··· 11 sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; 12 }; 13 14 vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; 15 16 doCheck = false;
-1
pkgs/tools/security/age/default.nix
··· 3 buildGoModule rec { 4 pname = "age"; 5 version = "1.0.0-beta4"; 6 - goPackagePath = "github.com/FiloSottile/age"; 7 vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; 8 9 doCheck = false;
··· 3 buildGoModule rec { 4 pname = "age"; 5 version = "1.0.0-beta4"; 6 vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; 7 8 doCheck = false;