From 9e13482d9fa5556bd233221ac451fd7b9d8b61b9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 28 Nov 2024 09:03:26 +0800 Subject: [PATCH] treewide: remove dead code (shadowed GOOS and GOARCH specification) buildGoModule internally shadow the GOOS and GOARCH specification as its arguments. Beside, GOOS and GOARCH inheritance from buildGoModule.go is broken, since buildGoModule.go doesn't exist. --- pkgs/by-name/ho/homebox/package.nix | 1 - pkgs/servers/monitoring/zabbix/agent2.nix | 2 -- pkgs/servers/tracing/honeycomb/honeymarker/default.nix | 1 - pkgs/servers/tracing/honeycomb/honeytail/default.nix | 1 - pkgs/servers/tracing/honeycomb/honeyvent/default.nix | 1 - 5 files changed, 6 deletions(-) diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 3cfdf1b20f29..96b96e32298b 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -62,7 +62,6 @@ buildGo123Module { ]; CGO_ENABLED = 0; - GOOS = "linux"; doCheck = false; ldflags = [ diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index c577f9709c0e..0d9fda84b234 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -41,8 +41,6 @@ import ./versions.nix ( zlib ]; - inherit (buildGoModule.go) GOOS GOARCH; - # need to provide GO* env variables & patch for reproducibility postPatch = '' substituteInPlace src/go/Makefile.am \ diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix index a615567005e5..f916716c3eb5 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix @@ -16,7 +16,6 @@ import ./versions.nix ( rev = "v${version}"; hash = sha256; }; - inherit (buildGoModule.go) GOOS GOARCH; meta = with lib; { description = "provides a simple CRUD interface for dealing with per-dataset markers on honeycomb.io"; diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix index ecc6306bdce7..cebed31d7213 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix @@ -16,7 +16,6 @@ import ./versions.nix ( rev = "v${version}"; hash = sha256; }; - inherit (buildGoModule.go) GOOS GOARCH; meta = with lib; { description = "agent for ingesting log file data into honeycomb.io and making it available for exploration"; diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index 036795d5fb79..7f083e5c377f 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -16,7 +16,6 @@ import ./versions.nix ( rev = "v${version}"; hash = sha256; }; - inherit (buildGoModule.go) GOOS GOARCH; meta = with lib; { description = "CLI for sending individual events to honeycomb.io";