Merge pull request #262667 from khaneliman/buildGoModule
treewide: go 121 redundant cleanup
This commit is contained in:
Mario Rodas
@@ -2504,9 +2504,7 @@ with pkgs;
|
||||
|
||||
labctl = callPackage ../tools/networking/labctl { };
|
||||
|
||||
lefthook = callPackage ../applications/version-management/lefthook {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
lefthook = callPackage ../applications/version-management/lefthook { };
|
||||
|
||||
legit = callPackage ../applications/version-management/legit { };
|
||||
|
||||
@@ -3023,7 +3021,6 @@ with pkgs;
|
||||
iterm2 = callPackage ../applications/terminal-emulators/iterm2 { };
|
||||
|
||||
kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
|
||||
go = go_1_21;
|
||||
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
@@ -4651,9 +4648,7 @@ with pkgs;
|
||||
|
||||
map-cmd = callPackage ../tools/misc/map { };
|
||||
|
||||
clash = callPackage ../tools/networking/clash {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
clash = callPackage ../tools/networking/clash { };
|
||||
|
||||
clash-geoip = callPackage ../data/misc/clash-geoip { };
|
||||
|
||||
@@ -6147,9 +6142,7 @@ with pkgs;
|
||||
|
||||
onboard = callPackage ../applications/misc/onboard { };
|
||||
|
||||
oneshot = callPackage ../tools/networking/oneshot {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
oneshot = callPackage ../tools/networking/oneshot { };
|
||||
|
||||
orjail = callPackage ../tools/security/orjail { };
|
||||
|
||||
@@ -7496,9 +7489,7 @@ with pkgs;
|
||||
|
||||
diction = callPackage ../tools/text/diction { };
|
||||
|
||||
diffoci = callPackage ../tools/misc/diffoci {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
diffoci = callPackage ../tools/misc/diffoci { };
|
||||
|
||||
diffoscope = callPackage ../tools/misc/diffoscope {
|
||||
jdk = jdk8;
|
||||
@@ -8025,9 +8016,7 @@ with pkgs;
|
||||
|
||||
ettercap = callPackage ../applications/networking/sniffers/ettercap { };
|
||||
|
||||
evcc = callPackage ../servers/home-automation/evcc {
|
||||
go = go_1_21;
|
||||
};
|
||||
evcc = callPackage ../servers/home-automation/evcc { };
|
||||
|
||||
eventstat = callPackage ../os-specific/linux/eventstat { };
|
||||
|
||||
@@ -8974,9 +8963,7 @@ with pkgs;
|
||||
|
||||
gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { };
|
||||
|
||||
grype = callPackage ../tools/security/grype {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
grype = callPackage ../tools/security/grype { };
|
||||
|
||||
gt5 = callPackage ../tools/system/gt5 { };
|
||||
|
||||
@@ -11500,9 +11487,7 @@ with pkgs;
|
||||
|
||||
openfortivpn = callPackage ../tools/networking/openfortivpn { };
|
||||
|
||||
opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { };
|
||||
|
||||
opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };
|
||||
|
||||
@@ -12662,7 +12647,7 @@ with pkgs;
|
||||
|
||||
rewrk = callPackage ../tools/networking/rewrk { };
|
||||
|
||||
inherit (callPackage ../tools/security/rekor { buildGoModule = buildGo121Module; })
|
||||
inherit (callPackage ../tools/security/rekor { })
|
||||
rekor-cli
|
||||
rekor-server;
|
||||
|
||||
@@ -13679,9 +13664,7 @@ with pkgs;
|
||||
|
||||
systrayhelper = callPackage ../tools/misc/systrayhelper { };
|
||||
|
||||
syft = callPackage ../tools/admin/syft {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
syft = callPackage ../tools/admin/syft { };
|
||||
|
||||
Sylk = callPackage ../applications/networking/Sylk { };
|
||||
|
||||
@@ -13803,7 +13786,6 @@ with pkgs;
|
||||
};
|
||||
teleport_14 = callPackage ../servers/teleport/14 {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
teleport = teleport_14;
|
||||
|
||||
@@ -15407,9 +15389,7 @@ with pkgs;
|
||||
|
||||
undistract-me = callPackage ../shells/bash/undistract-me { };
|
||||
|
||||
carapace = callPackage ../shells/carapace {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
carapace = callPackage ../shells/carapace { };
|
||||
|
||||
dash = callPackage ../shells/dash { };
|
||||
|
||||
@@ -15828,7 +15808,7 @@ with pkgs;
|
||||
|
||||
flasm = callPackage ../development/compilers/flasm { };
|
||||
|
||||
flyctl = callPackage ../development/web/flyctl { buildGoModule = buildGo121Module; };
|
||||
flyctl = callPackage ../development/web/flyctl { };
|
||||
|
||||
fluidd = callPackage ../applications/misc/fluidd { };
|
||||
|
||||
@@ -19010,7 +18990,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo121Module; };
|
||||
devbox = callPackage ../development/tools/devbox { };
|
||||
|
||||
libcxx = llvmPackages.libcxx;
|
||||
libcxxabi = llvmPackages.libcxxabi;
|
||||
@@ -19998,9 +19978,7 @@ with pkgs;
|
||||
withPEPatterns = true;
|
||||
};
|
||||
|
||||
reviewdog = callPackage ../development/tools/misc/reviewdog {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
reviewdog = callPackage ../development/tools/misc/reviewdog { };
|
||||
|
||||
revive = callPackage ../development/tools/revive { };
|
||||
|
||||
@@ -20276,9 +20254,7 @@ with pkgs;
|
||||
terracognita = callPackage ../development/tools/misc/terracognita { };
|
||||
|
||||
terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
|
||||
terraform-ls = callPackage ../development/tools/misc/terraform-ls {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
terraform-ls = callPackage ../development/tools/misc/terraform-ls { };
|
||||
|
||||
terraformer = callPackage ../development/tools/misc/terraformer { };
|
||||
|
||||
@@ -26460,9 +26436,7 @@ with pkgs;
|
||||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
|
||||
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
|
||||
@@ -27408,9 +27382,7 @@ with pkgs;
|
||||
|
||||
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
|
||||
|
||||
tailscale = callPackage ../servers/tailscale {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
tailscale = callPackage ../servers/tailscale { };
|
||||
|
||||
tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
|
||||
|
||||
@@ -28450,9 +28422,7 @@ with pkgs;
|
||||
|
||||
golint = callPackage ../development/tools/golint { };
|
||||
|
||||
golangci-lint = callPackage ../development/tools/golangci-lint {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
golangci-lint = callPackage ../development/tools/golangci-lint { };
|
||||
|
||||
golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { };
|
||||
|
||||
@@ -29760,9 +29730,7 @@ with pkgs;
|
||||
|
||||
nuclear = callPackage ../applications/audio/nuclear { };
|
||||
|
||||
nuclei = callPackage ../tools/security/nuclei {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
nuclei = callPackage ../tools/security/nuclei { };
|
||||
|
||||
nullmailer = callPackage ../servers/mail/nullmailer {
|
||||
stdenv = gccStdenv;
|
||||
@@ -41182,7 +41150,7 @@ with pkgs;
|
||||
|
||||
termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { };
|
||||
|
||||
inherit (callPackage ../applications/networking/cluster/terraform { buildGoModule = buildGo121Module; })
|
||||
inherit (callPackage ../applications/networking/cluster/terraform { })
|
||||
mkTerraform
|
||||
terraform_1
|
||||
terraform_plugins_test
|
||||
@@ -41262,9 +41230,7 @@ with pkgs;
|
||||
|
||||
tusk = callPackage ../applications/office/tusk { };
|
||||
|
||||
trufflehog = callPackage ../tools/security/trufflehog {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
trufflehog = callPackage ../tools/security/trufflehog { };
|
||||
|
||||
tunnelx = callPackage ../applications/gis/tunnelx { };
|
||||
|
||||
@@ -41290,9 +41256,7 @@ with pkgs;
|
||||
|
||||
usb-reset = callPackage ../applications/misc/usb-reset { };
|
||||
|
||||
usql = callPackage ../applications/misc/usql {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
usql = callPackage ../applications/misc/usql { };
|
||||
|
||||
utf8cpp = callPackage ../development/libraries/utf8cpp { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user