From 3360a376cb905ac40e77d5424089d4893e9cd157 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 23 Aug 2021 14:55:51 +1000
Subject: buildGoModule: warn if buildFlagsArray is used

---
 pkgs/applications/networking/cluster/popeye/default.nix | 4 ++--
 pkgs/applications/networking/cluster/qbec/default.nix   | 4 ++--
 pkgs/applications/networking/cluster/velero/default.nix | 4 ++--
 pkgs/development/go-modules/generic/default.nix         | 7 ++++---
 pkgs/servers/monitoring/prometheus/redis-exporter.nix   | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix
index 1a7c56bd18b4..910317bd9673 100644
--- a/pkgs/applications/networking/cluster/popeye/default.nix
+++ b/pkgs/applications/networking/cluster/popeye/default.nix
@@ -11,11 +11,11 @@ buildGoModule rec {
     sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c=";
   };
 
-  ldflags = ''
+  ldflags = [
     "-s" "-w"
     "-X github.com/derailed/popeye/cmd.version=${version}"
     "-X github.com/derailed/popeye/cmd.commit=${version}"
-  '';
+  ];
 
   vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";
 
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index 3c00bc1eedbe..f5fb6ee234c5 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -15,12 +15,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  ldflags = ''
+  ldflags = [
     "-s" "-w"
     "-X github.com/splunk/qbec/internal/commands.version=${version}"
     "-X github.com/splunk/qbec/internal/commands.commit=${src.rev}"
     "-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}"
-  '';
+  ];
 
   meta = with lib; {
     description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix
index 2c7300573c74..76babadc023c 100644
--- a/pkgs/applications/networking/cluster/velero/default.nix
+++ b/pkgs/applications/networking/cluster/velero/default.nix
@@ -14,12 +14,12 @@ buildGoModule rec {
     sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk=";
   };
 
-  ldflags = ''
+  ldflags = [
     "-s" "-w"
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}"
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}"
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
-  '';
+  ];
 
   vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU=";
 
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index a7852bcc7e5d..3b645f9ce8b9 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -46,8 +46,9 @@
 # Not needed with buildGoModule
 , goPackagePath ? ""
 
-# needed for buildFlags warning
+# needed for buildFlags{,Array} warning
 , buildFlags ? ""
+, buildFlagsArray ? ""
 
 , ... }@args':
 
@@ -271,6 +272,6 @@ let
     };
   });
 in
-lib.warnIf (buildFlags != "")
-  "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
+lib.warnIf (buildFlags != "" || buildFlagsArray != "")
+  "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
   package
diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index d209f52ef585..e87c6354ae55 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -13,11 +13,11 @@ buildGoModule rec {
 
   vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga";
 
-  ldflags = ''
+  ldflags = [
     "-X main.BuildVersion=${version}"
     "-X main.BuildCommitSha=unknown"
     "-X main.BuildDate=unknown"
-  '';
+  ];
 
   # needs a redis server
   doCheck = false;
-- 
cgit 1.4.1