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

2 years ago · ab07e12988
parent 2211a7cf74
commit ab07e12988
21 changed files with 179 additions and 454 deletions
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "cointop";
  version = "1.6.10";

--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "cloudflared";
  version = "2022.1.2";

--- a/pkgs/applications/networking/cluster/cmctl/default.nix
+++ b/pkgs/applications/networking/cluster/cmctl/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "cmctl";
  version = "1.7.1";

--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "helm";
  version = "3.8.0";
  gitCommit = "d14138609b01886f544b2025f5000351c9eb092e";
--- a/pkgs/applications/networking/cluster/kubebuilder/default.nix
+++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix
@ -1,13 +1,13 @@
 { lib
-, buildGo117Module
+, buildGoModule
 , fetchFromGitHub
 , makeWrapper
 , git
-, go_1_17
+, go
 , gnumake
 }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "kubebuilder";
  version = "3.3.0";

@ -23,8 +23,8 @@ buildGo117Module rec {

  ldflags = [
    "-X main.kubeBuilderVersion=v${version}"
-    "-X main.goos=${go_1_17.GOOS}"
-    "-X main.goarch=${go_1_17.GOARCH}"
+    "-X main.goos=${go.GOOS}"
+    "-X main.goarch=${go.GOARCH}"
    "-X main.gitCommit=v${version}"
    "-X main.buildDate=v${version}"
  ];
@ -34,7 +34,7 @@ buildGo117Module rec {
  postInstall = ''
    mv $out/bin/cmd $out/bin/kubebuilder
    wrapProgram $out/bin/kubebuilder \
-      --prefix PATH : ${lib.makeBinPath [ go_1_17 gnumake ]}
+      --prefix PATH : ${lib.makeBinPath [ go gnumake ]}
  '';

  allowGoReference = true;
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@ -1,6 +1,6 @@
 { lib
 , fetchFromGitHub
-, buildGo117Module
+, buildGoModule
 , coredns
 , installShellFiles
 , isFull ? false
@ -14,7 +14,7 @@
  ]
 }:

-buildGo117Module rec {
+buildGoModule rec {
  inherit pname ;
  version = "1.4.0";
  tags = lib.optionals enableGateway ["gateway"];
--- a/pkgs/applications/networking/cluster/linkerd/generic.nix
+++ b/pkgs/applications/networking/cluster/linkerd/generic.nix
@ -1,9 +1,8 @@
-{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:

 { channel, version, sha256, vendorSha256 }:

-# Fix-Me: Unlock buildGoModule version when #154059 is merged.
-buildGo117Module rec {
+buildGoModule rec {
  pname = "linkerd-${channel}";
  inherit version vendorSha256;

--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "talosctl";
  version = "0.14.1";

--- a/pkgs/applications/networking/cluster/vcluster/default.nix
+++ b/pkgs/applications/networking/cluster/vcluster/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "vcluster";
  version = "0.5.3";

--- a/pkgs/development/tools/dstp/default.nix
+++ b/pkgs/development/tools/dstp/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "dstp";
  version = "0.4.0";

--- a/pkgs/development/tools/fq/default.nix
+++ b/pkgs/development/tools/fq/default.nix
@ -1,11 +1,11 @@
 { lib
-, buildGo117Module
+, buildGoModule
 , fetchFromGitHub
 , fq
 , testVersion
 }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "fq";
  version = "0.0.3";

--- a/pkgs/development/tools/kubepug/default.nix
+++ b/pkgs/development/tools/kubepug/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "kubepug";
  version = "1.3.2";

--- a/pkgs/servers/irc/ergochat/default.nix
+++ b/pkgs/servers/irc/ergochat/default.nix
@ -1,6 +1,6 @@
-{ buildGo117Module, fetchFromGitHub, lib, nixosTests }:
+{ buildGoModule, fetchFromGitHub, lib, nixosTests }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "ergo";
  version = "2.9.1";

--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, buildGo117Package, buildEnv
+{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv

 # The suffix for the Mattermost version.
 , versionSuffix ? "nixpkgs"
@ -14,7 +14,7 @@ let

  goPackagePath = "github.com/mattermost/mattermost-server";

-  mattermost-server-build = buildGo117Package rec {
+  mattermost-server-build = buildGoPackage rec {
    pname = "mattermost-server";
    inherit version goPackagePath;

--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub, olm }:
+{ lib, buildGoModule, fetchFromGitHub, olm }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "mautrix-whatsapp";
  version = "0.2.3";

--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
+{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "grafana";
  version = "8.3.4";

--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "telegraf";
  version = "1.20.4";

--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@ -1,5 +1,5 @@
 { lib
-, buildGo117Module
+, buildGoModule
 , rustPlatform
 , fetchFromGitHub
 , makeWrapper
@ -43,7 +43,7 @@ let
    sha256 = "sha256-oKvDXkxA73IJOi+ciBFVLkYcmeRUsTC+3rcYf64vDoY=";
  };
 in
-buildGo117Module rec {
+buildGoModule rec {
  pname = "teleport";

  inherit src version;
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "kopia";
  version = "0.10.4";

--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@ -1,6 +1,6 @@
-{ lib, buildGo117Module, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

-buildGo117Module rec {
+buildGoModule rec {
  pname = "nebula";
  version = "1.5.2";

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix