b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: drop unnecessary go_1_17, buildGo117{Module,Package}

Browse source
This commit is contained in:
zowoq 2022-02-04 22:16:47 +10:00
parent 2211a7cf74
commit ab07e12988
21 changed files with 179 additions and 454 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/cointop/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "cointop"; pname = "cointop";
version = "1.6.10"; version = "1.6.10";

4
pkgs/applications/networking/cloudflared/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2022.1.2"; version = "2022.1.2";

4
pkgs/applications/networking/cluster/cmctl/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGo117Module rec { buildGoModule rec {
pname = "cmctl"; pname = "cmctl";
version = "1.7.1"; version = "1.7.1";

4
pkgs/applications/networking/cluster/helm/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGo117Module rec { buildGoModule rec {
pname = "helm"; pname = "helm";
version = "3.8.0"; version = "3.8.0";
gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; gitCommit = "d14138609b01886f544b2025f5000351c9eb092e";

12
pkgs/applications/networking/cluster/kubebuilder/default.nix
View file

@ -1,13 +1,13 @@
{ lib { lib
, buildGo117Module , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
, git , git
, go_1_17 , go
, gnumake , gnumake
}: }:
buildGo117Module rec { buildGoModule rec {
pname = "kubebuilder"; pname = "kubebuilder";
version = "3.3.0"; version = "3.3.0";
@ -23,8 +23,8 @@ buildGo117Module rec {
ldflags = [ ldflags = [
"-X main.kubeBuilderVersion=v${version}" "-X main.kubeBuilderVersion=v${version}"
"-X main.goos=${go_1_17.GOOS}" "-X main.goos=${go.GOOS}"
"-X main.goarch=${go_1_17.GOARCH}" "-X main.goarch=${go.GOARCH}"
"-X main.gitCommit=v${version}" "-X main.gitCommit=v${version}"
"-X main.buildDate=v${version}" "-X main.buildDate=v${version}"
]; ];
@ -34,7 +34,7 @@ buildGo117Module rec {
postInstall = '' postInstall = ''
mv $out/bin/cmd $out/bin/kubebuilder mv $out/bin/cmd $out/bin/kubebuilder
wrapProgram $out/bin/kubebuilder \ wrapProgram $out/bin/kubebuilder \
--prefix PATH : ${lib.makeBinPath [ go_1_17 gnumake ]} --prefix PATH : ${lib.makeBinPath [ go gnumake ]}
''; '';
allowGoReference = true; allowGoReference = true;

4
pkgs/applications/networking/cluster/kuma/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, buildGo117Module , buildGoModule
, coredns , coredns
, installShellFiles , installShellFiles
, isFull ? false , isFull ? false
@ -14,7 +14,7 @@
] ]
}: }:
buildGo117Module rec { buildGoModule rec {
inherit pname ; inherit pname ;
version = "1.4.0"; version = "1.4.0";
tags = lib.optionals enableGateway ["gateway"]; tags = lib.optionals enableGateway ["gateway"];

5
pkgs/applications/networking/cluster/linkerd/generic.nix
View file

@ -1,9 +1,8 @@
{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }: { lib, fetchFromGitHub, buildGoModule, installShellFiles }:
{ channel, version, sha256, vendorSha256 }: { channel, version, sha256, vendorSha256 }:
# Fix-Me: Unlock buildGoModule version when #154059 is merged. buildGoModule rec {
buildGo117Module rec {
pname = "linkerd-${channel}"; pname = "linkerd-${channel}";
inherit version vendorSha256; inherit version vendorSha256;

4
pkgs/applications/networking/cluster/talosctl/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "talosctl"; pname = "talosctl";
version = "0.14.1"; version = "0.14.1";

4
pkgs/applications/networking/cluster/vcluster/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGo117Module rec { buildGoModule rec {
pname = "vcluster"; pname = "vcluster";
version = "0.5.3"; version = "0.5.3";

4
pkgs/development/tools/dstp/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "dstp"; pname = "dstp";
version = "0.4.0"; version = "0.4.0";

4
pkgs/development/tools/fq/default.nix
View file

@ -1,11 +1,11 @@
{ lib { lib
, buildGo117Module , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, fq , fq
, testVersion , testVersion
}: }:
buildGo117Module rec { buildGoModule rec {
pname = "fq"; pname = "fq";
version = "0.0.3"; version = "0.0.3";

4
pkgs/development/tools/kubepug/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "kubepug"; pname = "kubepug";
version = "1.3.2"; version = "1.3.2";

4
pkgs/servers/irc/ergochat/default.nix
View file

@ -1,6 +1,6 @@
{ buildGo117Module, fetchFromGitHub, lib, nixosTests }: { buildGoModule, fetchFromGitHub, lib, nixosTests }:
buildGo117Module rec { buildGoModule rec {
pname = "ergo"; pname = "ergo";
version = "2.9.1"; version = "2.9.1";

4
pkgs/servers/mattermost/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, buildGo117Package, buildEnv { lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv
# The suffix for the Mattermost version. # The suffix for the Mattermost version.
, versionSuffix ? "nixpkgs" , versionSuffix ? "nixpkgs"
@ -14,7 +14,7 @@ let
goPackagePath = "github.com/mattermost/mattermost-server"; goPackagePath = "github.com/mattermost/mattermost-server";
mattermost-server-build = buildGo117Package rec { mattermost-server-build = buildGoPackage rec {
pname = "mattermost-server"; pname = "mattermost-server";
inherit version goPackagePath; inherit version goPackagePath;

4
pkgs/servers/mautrix-whatsapp/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub, olm }: { lib, buildGoModule, fetchFromGitHub, olm }:
buildGo117Module rec { buildGoModule rec {
pname = "mautrix-whatsapp"; pname = "mautrix-whatsapp";
version = "0.2.3"; version = "0.2.3";

4
pkgs/servers/monitoring/grafana/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: { lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
buildGo117Module rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
version = "8.3.4"; version = "8.3.4";

4
pkgs/servers/monitoring/telegraf/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub, nixosTests }: { lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGo117Module rec { buildGoModule rec {
pname = "telegraf"; pname = "telegraf";
version = "1.20.4"; version = "1.20.4";

4
pkgs/servers/teleport/default.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, buildGo117Module , buildGoModule
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
@ -43,7 +43,7 @@ let
sha256 = "sha256-oKvDXkxA73IJOi+ciBFVLkYcmeRUsTC+3rcYf64vDoY="; sha256 = "sha256-oKvDXkxA73IJOi+ciBFVLkYcmeRUsTC+3rcYf64vDoY=";
}; };
in in
buildGo117Module rec { buildGoModule rec {
pname = "teleport"; pname = "teleport";
inherit src version; inherit src version;

4
pkgs/tools/backup/kopia/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "kopia"; pname = "kopia";
version = "0.10.4"; version = "0.10.4";

4
pkgs/tools/networking/nebula/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGo117Module, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGo117Module rec { buildGoModule rec {
pname = "nebula"; pname = "nebula";
version = "1.5.2"; version = "1.5.2";

544
pkgs/top-level/all-packages.nix
View file

File diff suppressed because it is too large Load diff