From ab07e129886629b235906e9fa31902138dfe53ba Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Feb 2022 22:16:47 +1000 Subject: treewide: drop unnecessary go_1_17, buildGo117{Module,Package} --- pkgs/applications/misc/cointop/default.nix | 4 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/cmctl/default.nix | 4 +- .../networking/cluster/helm/default.nix | 4 +- .../networking/cluster/kubebuilder/default.nix | 12 +- .../networking/cluster/kuma/default.nix | 4 +- .../networking/cluster/linkerd/generic.nix | 5 +- .../networking/cluster/talosctl/default.nix | 4 +- .../networking/cluster/vcluster/default.nix | 4 +- pkgs/development/tools/dstp/default.nix | 4 +- pkgs/development/tools/fq/default.nix | 4 +- pkgs/development/tools/kubepug/default.nix | 4 +- pkgs/servers/irc/ergochat/default.nix | 4 +- pkgs/servers/mattermost/default.nix | 4 +- pkgs/servers/mautrix-whatsapp/default.nix | 4 +- pkgs/servers/monitoring/grafana/default.nix | 4 +- pkgs/servers/monitoring/telegraf/default.nix | 4 +- pkgs/servers/teleport/default.nix | 4 +- pkgs/tools/backup/kopia/default.nix | 4 +- pkgs/tools/networking/nebula/default.nix | 4 +- pkgs/top-level/all-packages.nix | 544 +++++---------------- 21 files changed, 179 insertions(+), 454 deletions(-) diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 209e9f9e3be..a0ceabf9d10 100644 --- 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"; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4c99319fbbc..c1629afbd03 100644 --- 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"; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 002ef8a3bc8..64a8ebd4a99 100644 --- 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"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 2d9545bc13a..42d2e63eaac 100644 --- 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"; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 7ee92fcbbda..1b1089f655c 100644 --- 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; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index b8fada3966c..2db30361351 100644 --- 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"]; diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 5601bad7104..7722a7109c2 100644 --- 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; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 819bf4741aa..e9202205ea9 100644 --- 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"; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index f8d4e5f52c8..b41e443ba32 100644 --- 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"; diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/development/tools/dstp/default.nix index c0a7f79eae1..7e3dafc5b22 100644 --- 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"; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index cafcc859b5e..066375e2c96 100644 --- 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"; diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index d14ba450103..82a130181e0 100644 --- 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"; diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index 1aa5f5158aa..57f79ff916c 100644 --- 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"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 534368a19ec..fe2a9e0b163 100644 --- 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; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 7579db1c090..a56ef8c835e 100644 --- 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"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index bb6c0b7f384..c842f446237 100644 --- 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"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 12b124b7841..1166855deb9 100644 --- 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"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index bed1c4112c0..ac57cc51339 100644 --- 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; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index abaebc8aa4a..f44b18f4683 100644 --- 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"; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index a30c9f3bbdc..494fb946ea6 100644 --- 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9f41a0506..a4c29aef990 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,9 +285,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - conftest = callPackage ../development/tools/conftest { - buildGoModule = buildGo117Module; - }; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; @@ -329,9 +327,7 @@ with pkgs; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; - evans = callPackage ../development/tools/evans { - buildGoModule = buildGo117Module; - }; + evans = callPackage ../development/tools/evans { }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; @@ -357,9 +353,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib { - buildGoModule = buildGo117Module; - }; + proto-contrib = callPackage ../development/tools/proto-contrib { }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -373,15 +367,11 @@ with pkgs; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; - protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { - buildGoModule = buildGo117Module; - }; + protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; - protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { - buildGoModule = buildGo117Module; - }; + protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; proton-caller = callPackage ../misc/emulators/proton-caller { }; @@ -535,17 +525,13 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - packer = callPackage ../development/tools/packer { - buildGoModule = buildGo117Module; - }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; perseus-cli = callPackage ../development/tools/perseus-cli { }; - pet = callPackage ../development/tools/pet { - buildGoModule = buildGo117Module; - }; + pet = callPackage ../development/tools/pet { }; pkger = callPackage ../development/libraries/pkger { }; @@ -923,9 +909,7 @@ with pkgs; wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { - buildGoModule = buildGo117Module; - }; + aerc = callPackage ../applications/networking/mailreaders/aerc { }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -1033,13 +1017,9 @@ with pkgs; gofu = callPackage ../applications/misc/gofu { }; - godns = callPackage ../tools/networking/godns { - buildGoModule = buildGo117Module; - }; + godns = callPackage ../tools/networking/godns { }; - godspeed = callPackage ../tools/networking/godspeed { - buildGoModule = buildGo117Module; - }; + godspeed = callPackage ../tools/networking/godspeed { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -1069,9 +1049,7 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; - topicctl = callPackage ../tools/misc/topicctl { - buildGoModule = buildGo117Module; - }; + topicctl = callPackage ../tools/misc/topicctl { }; veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; @@ -1465,9 +1443,7 @@ with pkgs; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; - aws-vault = callPackage ../tools/admin/aws-vault { - buildGoModule = buildGo117Module; - }; + aws-vault = callPackage ../tools/admin/aws-vault { }; aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; @@ -1505,25 +1481,19 @@ with pkgs; chaos = callPackage ../tools/networking/chaos { }; - charm = callPackage ../applications/misc/charm { - buildGoModule = buildGo117Module; - }; + charm = callPackage ../applications/misc/charm { }; chars = callPackage ../tools/text/chars { inherit (darwin.apple_sdk.frameworks) Security; }; - checkip = callPackage ../tools/networking/checkip { - buildGoModule = buildGo117Module; - }; + checkip = callPackage ../tools/networking/checkip { }; ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; - ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { - buildGoModule = buildGo117Module; - }; + ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; @@ -1805,9 +1775,7 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; - galene = callPackage ../servers/web-apps/galene { - buildGoModule = buildGo117Module; - }; + galene = callPackage ../servers/web-apps/galene { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1949,9 +1917,7 @@ with pkgs; pass = callPackage ../tools/security/pass { }; - passphrase2pgp = callPackage ../tools/security/passphrase2pgp { - buildGoModule = buildGo117Module; - }; + passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; @@ -2209,9 +2175,7 @@ with pkgs; packetbeat6 journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { - buildGoModule = buildGo117Module; - }) + inherit (callPackages ../misc/logging/beats/7.x.nix { }) filebeat7 heartbeat7 metricbeat7 @@ -2245,9 +2209,7 @@ with pkgs; blitz = callPackage ../development/libraries/blitz { }; - blockbook = callPackage ../servers/blockbook { - buildGoModule = buildGo117Module; - }; + blockbook = callPackage ../servers/blockbook { }; blockhash = callPackage ../tools/graphics/blockhash { }; @@ -2390,9 +2352,7 @@ with pkgs; btrbk = callPackage ../tools/backup/btrbk { }; - buildpack = callPackage ../development/tools/buildpack { - buildGoModule = buildGo117Module; - }; + buildpack = callPackage ../development/tools/buildpack { }; bottom-rs = callPackage ../tools/misc/bottom-rs { }; @@ -2525,9 +2485,7 @@ with pkgs; cassowary = callPackage ../tools/networking/cassowary { }; - croc = callPackage ../tools/networking/croc { - buildGoModule = buildGo117Module; - }; + croc = callPackage ../tools/networking/croc { }; cbftp = callPackage ../tools/networking/cbftp { }; @@ -2591,9 +2549,7 @@ with pkgs; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; - clusterctl = callPackage ../applications/networking/cluster/clusterctl { - buildGoModule = buildGo117Module; - }; + clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; coloredlogs = with python3Packages; toPythonApplication coloredlogs; @@ -2774,9 +2730,7 @@ with pkgs; dapr-cli = callPackage ../development/tools/dapr/cli {}; - dasel = callPackage ../applications/misc/dasel { - buildGoModule = buildGo117Module; - }; + dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -2804,9 +2758,7 @@ with pkgs; ddate = callPackage ../tools/misc/ddate { }; - ddosify = callPackage ../development/tools/ddosify { - buildGoModule = buildGo117Module; - }; + ddosify = callPackage ../development/tools/ddosify { }; dduper = callPackage ../tools/filesystems/dduper { }; @@ -2973,9 +2925,7 @@ with pkgs; ekam = callPackage ../development/tools/build-managers/ekam { }; - eksctl = callPackage ../tools/admin/eksctl { - buildGoModule = buildGo117Module; - }; + eksctl = callPackage ../tools/admin/eksctl { }; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; @@ -3034,9 +2984,7 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; - extrude = callPackage ../tools/security/extrude { - buildGoModule = buildGo117Module; - }; + extrude = callPackage ../tools/security/extrude { }; f3 = callPackage ../tools/filesystems/f3 { }; @@ -3086,9 +3034,7 @@ with pkgs; firestarter = callPackage ../applications/misc/firestarter { }; - fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { - buildGoModule = buildGo117Module; - }; + fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; flitter = callPackage ../tools/misc/flitter { }; @@ -3241,9 +3187,7 @@ with pkgs; gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { - buildGoModule = buildGo117Module; - }; + gotify-cli = callPackage ../tools/misc/gotify-cli { }; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; @@ -3736,15 +3680,11 @@ with pkgs; stagit = callPackage ../development/tools/stagit { }; - starboard = callPackage ../applications/networking/cluster/starboard { - buildGoModule = buildGo117Module; - }; + starboard = callPackage ../applications/networking/cluster/starboard { }; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { - buildGoModule = buildGo117Module; - }; + steampipe = callPackage ../tools/misc/steampipe { }; step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; @@ -3754,9 +3694,7 @@ with pkgs; string-machine = callPackage ../applications/audio/string-machine { }; - stripe-cli = callPackage ../tools/admin/stripe-cli { - buildGoModule = buildGo117Module; - }; + stripe-cli = callPackage ../tools/admin/stripe-cli { }; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; @@ -4177,9 +4115,7 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { - buildGoModule = buildGo117Module; - }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; @@ -4332,9 +4268,7 @@ with pkgs; ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { - go = go_1_17; - }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -4382,13 +4316,9 @@ with pkgs; dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; - age = callPackage ../tools/security/age { - buildGoModule = buildGo117Module; - }; + age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { - buildGoModule = buildGo117Module; - }; + agebox = callPackage ../tools/security/agebox { }; age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; @@ -4428,9 +4358,7 @@ with pkgs; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; - checkmate = callPackage ../development/tools/checkmate { - buildGoModule = buildGo117Module; - }; + checkmate = callPackage ../development/tools/checkmate { }; civetweb = callPackage ../development/libraries/civetweb { }; @@ -5661,9 +5589,7 @@ with pkgs; garmintools = callPackage ../development/libraries/garmintools {}; - gau = callPackage ../tools/security/gau { - buildGoModule = buildGo117Module; - }; + gau = callPackage ../tools/security/gau { }; gauge = callPackage ../development/tools/gauge { }; @@ -5978,9 +5904,7 @@ with pkgs; gl2ps = callPackage ../development/libraries/gl2ps { }; - glab = callPackage ../applications/version-management/git-and-tools/glab { - buildGoModule = buildGo117Module; - }; + glab = callPackage ../applications/version-management/git-and-tools/glab { }; glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; @@ -6139,9 +6063,7 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { - buildGoModule = buildGo117Module; - }; + goreleaser = callPackage ../tools/misc/goreleaser { }; goreplay = callPackage ../tools/networking/goreplay { }; @@ -6412,9 +6334,7 @@ with pkgs; haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; - hasmail = callPackage ../applications/networking/mailreaders/hasmail { - buildGoModule = buildGo117Module; - }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; haste-client = callPackage ../tools/misc/haste-client { }; @@ -6484,9 +6404,7 @@ with pkgs; heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { - buildGoModule = buildGo117Module; - }; + headscale = callPackage ../servers/headscale { }; heisenbridge = callPackage ../servers/heisenbridge { }; @@ -6565,9 +6483,7 @@ with pkgs; httptunnel = callPackage ../tools/networking/httptunnel { }; - httpx = callPackage ../tools/security/httpx { - buildGoModule = buildGo117Module; - }; + httpx = callPackage ../tools/security/httpx { }; hurl = callPackage ../tools/networking/hurl { }; @@ -7320,9 +7236,7 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - naabu = callPackage ../tools/security/naabu { - buildGoModule = buildGo117Module; - }; + naabu = callPackage ../tools/security/naabu { }; nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; @@ -7340,9 +7254,7 @@ with pkgs; ncrack = callPackage ../tools/security/ncrack { }; - nerdctl = callPackage ../applications/networking/cluster/nerdctl { - buildGoModule = buildGo117Module; - }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; @@ -7359,9 +7271,7 @@ with pkgs; nyxt = callPackage ../applications/networking/browsers/nyxt { }; - nfpm = callPackage ../tools/package-management/nfpm { - buildGoModule = buildGo117Module; - }; + nfpm = callPackage ../tools/package-management/nfpm { }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -7639,9 +7549,7 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - lmp = callPackage ../tools/security/lmp { - buildGoModule = buildGo117Module; - }; + lmp = callPackage ../tools/security/lmp { }; localtime = callPackage ../tools/system/localtime { }; @@ -7876,9 +7784,7 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoModule = buildGo117Module; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { }; @@ -8218,10 +8124,7 @@ with pkgs; nvidiaGpuSupport = config.cudaSupport or false; }; - nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { - go = go_1_17; - buildGoModule = buildGo117Module; - }; + nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; @@ -8604,12 +8507,8 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; - opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { - buildGoModule = buildGo117Module; - }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { - buildGoModule = buildGo117Module; - }; + opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -8790,9 +8689,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; - otpauth = callPackage ../tools/security/otpauth { - buildGoModule = buildGo117Module; - }; + otpauth = callPackage ../tools/security/otpauth { }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -8874,9 +8771,7 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { - buildGoModule = buildGo117Module; - }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -9293,9 +9188,7 @@ with pkgs; ratools = callPackage ../tools/networking/ratools { }; - ratt = callPackage ../applications/misc/ratt { - buildGoModule = buildGo117Module; - }; + ratt = callPackage ../applications/misc/ratt { }; rc = callPackage ../shells/rc { }; @@ -9625,9 +9518,7 @@ with pkgs; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; - scorecard = callPackage ../tools/security/scorecard { - buildGoModule = buildGo117Module; - }; + scorecard = callPackage ../tools/security/scorecard { }; scream = callPackage ../applications/audio/scream { }; @@ -9675,9 +9566,7 @@ with pkgs; skim = callPackage ../tools/misc/skim { }; - seaweedfs = callPackage ../applications/networking/seaweedfs { - buildGoModule = buildGo117Module; - }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; sec = callPackage ../tools/admin/sec { }; @@ -9831,9 +9720,7 @@ with pkgs; # Not updated upstream since 2018, doesn't support qt newer than 5.12 sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { - buildGoModule = buildGo117Module; - }; + slides = callPackage ../applications/misc/slides { }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; @@ -9900,9 +9787,7 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; - spire = callPackage ../tools/security/spire { - buildGoModule = buildGo117Module; - }; + spire = callPackage ../tools/security/spire { }; # to match naming of other package repositories spire-agent = spire.agent; spire-server = spire.server; @@ -10133,9 +10018,7 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; - subfinder = callPackage ../tools/networking/subfinder { - buildGoModule = buildGo117Module; - }; + subfinder = callPackage ../tools/networking/subfinder { }; subzerod = with python3Packages; toPythonApplication subzerod; @@ -10627,9 +10510,7 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - tz = callPackage ../tools/misc/tz { - buildGoModule = buildGo117Module; - }; + tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; @@ -10717,13 +10598,9 @@ with pkgs; uwufetch = callPackage ../tools/misc/uwufetch { }; - v2ray = callPackage ../tools/networking/v2ray { - buildGoModule = buildGo117Module; - }; + v2ray = callPackage ../tools/networking/v2ray { }; - v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { - pkgsBuildBuild.buildGoModule = pkgsBuildBuild.buildGo117Module; - }; + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; @@ -11503,9 +11380,7 @@ with pkgs; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { - buildGoModule = buildGo117Module; - }; + zsh-history = callPackage ../shells/zsh/zsh-history { }; zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { }; @@ -11937,9 +11812,7 @@ with pkgs; dasm = callPackage ../development/compilers/dasm { }; - dbmate = callPackage ../development/tools/database/dbmate { - buildGoModule = buildGo117Module; - }; + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -13684,9 +13557,7 @@ with pkgs; io = callPackage ../development/interpreters/io { }; - ivy = callPackage ../development/interpreters/ivy { - buildGoModule = buildGo117Module; - }; + ivy = callPackage ../development/interpreters/ivy { }; j = callPackage ../development/interpreters/j { stdenv = clangStdenv; @@ -14209,9 +14080,7 @@ with pkgs; abuild = callPackage ../development/tools/abuild { }; - actionlint = callPackage ../development/tools/analysis/actionlint { - buildGoModule = buildGo117Module; - }; + actionlint = callPackage ../development/tools/analysis/actionlint { }; adtool = callPackage ../tools/admin/adtool { }; @@ -14400,9 +14269,7 @@ with pkgs; buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { - buildGoModule = buildGo117Module; - }; + bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; bazel-watcher = callPackage ../development/tools/bazel-watcher { }; @@ -14521,9 +14388,7 @@ with pkgs; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; - bump = callPackage ../development/tools/github/bump { - buildGoModule = buildGo117Module; - }; + bump = callPackage ../development/tools/github/bump { }; libbpf = callPackage ../os-specific/linux/libbpf { }; @@ -14767,9 +14632,7 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { - buildGoModule = buildGo117Module; - }; + datree = callPackage ../development/tools/datree { }; dcadec = callPackage ../development/tools/dcadec { }; @@ -14829,9 +14692,7 @@ with pkgs; doit = with python3Packages; toPythonApplication doit; - dolt = callPackage ../servers/sql/dolt { - buildGoModule = buildGo117Module; - }; + dolt = callPackage ../servers/sql/dolt { }; dot2tex = with python3.pkgs; toPythonApplication dot2tex; @@ -15150,9 +15011,7 @@ with pkgs; jpexs = callPackage ../development/tools/jpexs { }; - k0sctl = callPackage ../applications/networking/cluster/k0sctl { - buildGoModule = buildGo117Module; - }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; k2tf = callPackage ../development/tools/misc/k2tf { }; @@ -15202,13 +15061,9 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; - kubescape = callPackage ../tools/security/kubescape { - buildGoModule = buildGo117Module; - }; + kubescape = callPackage ../tools/security/kubescape { }; - kubesec = callPackage ../tools/security/kubesec { - buildGoModule = buildGo117Module; - }; + kubesec = callPackage ../tools/security/kubesec { }; kubespy = callPackage ../applications/networking/cluster/kubespy { }; @@ -15714,9 +15569,7 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { - buildGoModule = buildGo117Module; - }; + symfony-cli = callPackage ../development/tools/symfony-cli { }; swiftshader = callPackage ../development/libraries/swiftshader { }; @@ -15761,16 +15614,12 @@ with pkgs; tytools = libsForQt5.callPackage ../development/embedded/tytools { }; - terracognita = callPackage ../development/tools/misc/terracognita { - buildGoModule = buildGo117Module; - }; + terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; - terraformer = callPackage ../development/tools/misc/terraformer { - buildGoModule = buildGo117Module; - }; + terraformer = callPackage ../development/tools/misc/terraformer { }; terrascan = callPackage ../tools/security/terrascan { }; @@ -15795,9 +15644,7 @@ with pkgs; time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - tflint = callPackage ../development/tools/analysis/tflint { - buildGoModule = buildGo117Module; - }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { }; @@ -15936,9 +15783,7 @@ with pkgs; yq = python3.pkgs.toPythonApplication python3.pkgs.yq; - yq-go = callPackage ../development/tools/yq-go { - buildGoModule = buildGo117Module; - }; + yq-go = callPackage ../development/tools/yq-go { }; ytt = callPackage ../development/tools/ytt {}; @@ -16741,9 +16586,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { - buildGoModule = buildGo117Module; - }; + garble = callPackage ../build-support/go/garble.nix { }; gcab = callPackage ../development/libraries/gcab { }; @@ -18416,9 +18259,7 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/misc/llama { - buildGoModule = buildGo117Module; - }; + llama = callPackage ../applications/misc/llama { }; malcontent = callPackage ../development/libraries/malcontent { }; @@ -19629,9 +19470,7 @@ with pkgs; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; - protolock = callPackage ../development/libraries/protolock { - buildGoModule = buildGo117Module; - }; + protolock = callPackage ../development/libraries/protolock { }; protozero = callPackage ../development/libraries/protozero { }; @@ -20387,9 +20226,7 @@ with pkgs; triehash = callPackage ../tools/misc/triehash { }; - trillian = callPackage ../tools/misc/trillian { - buildGoModule = buildGo117Module; - }; + trillian = callPackage ../tools/misc/trillian { }; twolame = callPackage ../development/libraries/twolame { }; @@ -20450,9 +20287,7 @@ with pkgs; vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; - vale = callPackage ../tools/text/vale { - buildGoModule = buildGo117Module; - }; + vale = callPackage ../tools/text/vale { }; valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; @@ -20723,13 +20558,9 @@ with pkgs; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; - yubikey-agent = callPackage ../tools/security/yubikey-agent { - buildGoModule = buildGo117Module; - }; + yubikey-agent = callPackage ../tools/security/yubikey-agent { }; - yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { - buildGoModule = buildGo117Module; - }; + yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; zchunk = callPackage ../development/libraries/zchunk { }; @@ -21007,9 +20838,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - alps = callPackage ../servers/alps { - buildGoModule = buildGo117Module; - }; + alps = callPackage ../servers/alps { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -21125,9 +20954,7 @@ with pkgs; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { - buildGoModule = buildGo117Module; - }; + clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { erlang = erlangR22; @@ -21178,7 +21005,6 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_17; jdk = openjdk11; gn = gn1924; }; @@ -21304,9 +21130,7 @@ with pkgs; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; - hydron = callPackage ../servers/hydron { - buildGoModule = buildGo117Module; - }; + hydron = callPackage ../servers/hydron { }; hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; @@ -21374,9 +21198,7 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; - livepeer = callPackage ../servers/livepeer { - buildGoModule = buildGo117Module; - }; + livepeer = callPackage ../servers/livepeer { }; lwan = callPackage ../servers/http/lwan { }; @@ -21405,9 +21227,7 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - buildGoModule = buildGo117Module; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -21419,9 +21239,7 @@ with pkgs; micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { - buildGoModule = buildGo117Module; - }; + minio = callPackage ../servers/minio { }; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; @@ -21538,9 +21356,7 @@ with pkgs; nsq = callPackage ../servers/nsq { }; - oauth2-proxy = callPackage ../servers/oauth2-proxy { - buildGoModule = buildGo117Module; - }; + oauth2-proxy = callPackage ../servers/oauth2-proxy { }; openbgpd = callPackage ../servers/openbgpd { }; @@ -21597,9 +21413,7 @@ with pkgs; quark = callPackage ../servers/http/quark { }; - soft-serve = callPackage ../servers/soft-serve { - buildGoModule = buildGo117Module; - }; + soft-serve = callPackage ../servers/soft-serve { }; sympa = callPackage ../servers/mail/sympa { }; @@ -21732,12 +21546,8 @@ with pkgs; }; influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb2-server = callPackage ../servers/nosql/influxdb2 { - buildGoModule = buildGo117Module; - }; - influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { - buildGoModule = buildGo117Module; - }; + influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; + influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. @@ -22089,9 +21899,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo117Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -22351,9 +22159,7 @@ with pkgs; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; - cariddi = callPackage ../tools/security/cariddi { - buildGoModule = buildGo117Module; - }; + cariddi = callPackage ../tools/security/cariddi { }; checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; @@ -22376,9 +22182,7 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { - buildGoModule = buildGo117Module; - }; + corerad = callPackage ../tools/networking/corerad { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -22499,9 +22303,7 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailctl = callPackage ../applications/networking/gmailctl { - buildGoModule = buildGo117Module; - }; + gmailctl = callPackage ../applications/networking/gmailctl { }; gomp = callPackage ../applications/version-management/gomp { }; @@ -22906,9 +22708,7 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - air = callPackage ../development/tools/air { - buildGoModule = buildGo117Module; - }; + air = callPackage ../development/tools/air { }; delve = callPackage ../development/tools/delve { }; @@ -22972,9 +22772,7 @@ with pkgs; gotools = callPackage ../development/tools/gotools { }; - gotop = callPackage ../tools/system/gotop { - buildGoModule = buildGo117Module; - }; + gotop = callPackage ../tools/system/gotop { }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -24028,9 +23826,7 @@ with pkgs; nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { - buildGoModule = buildGo117Module; - }; + nuclei = callPackage ../tools/security/nuclei { }; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; @@ -24672,9 +24468,7 @@ with pkgs; bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - blocky = callPackage ../applications/networking/blocky { - buildGoModule = buildGo117Module; - }; + blocky = callPackage ../applications/networking/blocky { }; cadence = libsForQt5.callPackage ../applications/audio/cadence { }; @@ -25225,13 +25019,9 @@ with pkgs; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; - docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; - docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin) cctools; @@ -25244,9 +25034,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { - buildGoModule = buildGo117Module; - }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25298,9 +25086,7 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff { - buildGoModule = buildGo117Module; - }; + dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../applications/window-managers/dwl { }; @@ -25466,9 +25252,7 @@ with pkgs; exercism = callPackage ../applications/misc/exercism { }; - expenses = callPackage ../applications/misc/expenses { - buildGoModule = buildGo117Module; - }; + expenses = callPackage ../applications/misc/expenses { }; fnott = callPackage ../applications/misc/fnott { }; @@ -26137,9 +25921,7 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; - limesctl = callPackage ../applications/misc/limesctl { - buildGoModule = buildGo117Module; - }; + limesctl = callPackage ../applications/misc/limesctl { }; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; @@ -26416,9 +26198,7 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { - buildGoModule = buildGo117Module; - }; + hugo = callPackage ../applications/misc/hugo { }; go-org = callPackage ../applications/misc/go-org { }; @@ -26485,9 +26265,7 @@ with pkgs; shepherd = nodePackages."@nerdwallet/shepherd"; - skate = callPackage ../applications/misc/skate { - buildGoModule = buildGo117Module; - }; + skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -26986,9 +26764,7 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { - buildGoModule = buildGo117Module; - }; + kuttl = callPackage ../applications/networking/cluster/kuttl { }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -27002,24 +26778,17 @@ with pkgs; kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - k9s = callPackage ../applications/networking/cluster/k9s { - buildGoModule = buildGo117Module; - }; + k9s = callPackage ../applications/networking/cluster/k9s { }; pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; popeye = callPackage ../applications/networking/cluster/popeye { }; - kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { - buildGoModule = buildGo117Module; - }; + kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { - # Fix-Me: This locking should be removed once PR #154059 is merged. - buildGoModule = buildGo117Module; - }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; @@ -27455,7 +27224,6 @@ with pkgs; minikube = callPackage ../applications/networking/cluster/minikube { inherit (darwin.apple_sdk.frameworks) vmnet; - buildGoModule = buildGo117Module; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -27755,9 +27523,7 @@ with pkgs; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; - nwg-menu = callPackage ../applications/misc/nwg-menu { - buildGoModule = buildGo117Module; - }; + nwg-menu = callPackage ../applications/misc/nwg-menu { }; nwg-panel = callPackage ../applications/misc/nwg-panel { }; @@ -28219,9 +27985,7 @@ with pkgs; pdfchain = callPackage ../tools/typesetting/pdfchain { }; - pdfcpu = callPackage ../applications/graphics/pdfcpu { - buildGoModule = buildGo117Module; - }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -28804,9 +28568,7 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { - buildGoModule = buildGo117Module; - }; + shadowfox = callPackage ../tools/networking/shadowfox { }; shfmt = callPackage ../tools/text/shfmt { }; @@ -29189,9 +28951,7 @@ with pkgs; tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; - tanka = callPackage ../applications/networking/cluster/tanka { - buildGoModule = buildGo117Module; - }; + tanka = callPackage ../applications/networking/cluster/tanka { }; teams = callPackage ../applications/networking/instant-messengers/teams { }; @@ -29313,9 +29073,7 @@ with pkgs; ticpp = callPackage ../development/libraries/ticpp { }; - ticker = callPackage ../applications/misc/ticker { - buildGoModule = buildGo117Module; - }; + ticker = callPackage ../applications/misc/ticker { }; tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; @@ -30467,9 +30225,7 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { - buildGoModule = buildGo117Module; - }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -30605,9 +30361,7 @@ with pkgs; scaleft = callPackage ../applications/networking/scaleft { }; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { - buildGoModule = buildGo117Module; - }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; beancount = with python3.pkgs; toPythonApplication beancount; @@ -31997,9 +31751,7 @@ with pkgs; conglomerate = callPackage ../applications/science/biology/conglomerate { }; - dalfox = callPackage ../tools/security/dalfox { - buildGoModule = buildGo117Module; - }; + dalfox = callPackage ../tools/security/dalfox { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -33225,9 +32977,7 @@ with pkgs; helmfile = callPackage ../applications/networking/cluster/helmfile { }; - helmsman = callPackage ../applications/networking/cluster/helmsman { - buildGoModule = buildGo117Module; - }; + helmsman = callPackage ../applications/networking/cluster/helmsman { }; velero = callPackage ../applications/networking/cluster/velero { }; @@ -33263,13 +33013,9 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; - colima = callPackage ../applications/virtualization/colima { - buildGoModule = buildGo117Module; - }; + colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { - buildGoModule = buildGo117Module; - }; + lima = callPackage ../applications/virtualization/lima { }; logtop = callPackage ../tools/misc/logtop { }; @@ -33951,9 +33697,7 @@ with pkgs; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; - stern = callPackage ../applications/networking/cluster/stern { - buildGoModule = buildGo117Module; - }; + stern = callPackage ../applications/networking/cluster/stern { }; streamripper = callPackage ../applications/audio/streamripper { }; @@ -33965,9 +33709,7 @@ with pkgs; go-swag = callPackage ../development/tools/go-swag { }; - go-swagger = callPackage ../development/tools/go-swagger { - buildGoModule = buildGo117Module; - }; + go-swagger = callPackage ../development/tools/go-swagger { }; jx = callPackage ../applications/networking/cluster/jx {}; @@ -33979,9 +33721,7 @@ with pkgs; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; - inherit (callPackage ../applications/networking/cluster/terraform { - buildGoModule = buildGo117Module; - }) + inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform terraform_0_13 terraform_0_14 @@ -33995,9 +33735,7 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - buildGoModule = buildGo117Module; - } + callPackage ../applications/networking/cluster/terraform-providers { } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; @@ -34018,9 +33756,7 @@ with pkgs; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - tilt = callPackage ../applications/networking/cluster/tilt { - buildGoModule = buildGo117Module; - }; + tilt = callPackage ../applications/networking/cluster/tilt { }; timeular = callPackage ../applications/office/timeular {}; @@ -34093,9 +33829,7 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vault = callPackage ../tools/security/vault { - buildGoModule = buildGo117Module; - }; + vault = callPackage ../tools/security/vault { }; vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; @@ -34120,9 +33854,7 @@ with pkgs; vice = callPackage ../misc/emulators/vice { }; - viddy = callPackage ../tools/misc/viddy { - buildGoModule = buildGo117Module; - }; + viddy = callPackage ../tools/misc/viddy { }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; @@ -34456,9 +34188,7 @@ with pkgs; zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { - buildGoModule = buildGo117Module; - }; + wtf = callPackage ../applications/misc/wtf { }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -34660,9 +34390,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { - buildGoModule = buildGo117Module; - }; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -34680,9 +34408,7 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli { - buildGoModule = buildGo117Module; - }; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; -- cgit 1.4.1