diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-08-26 16:45:51 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-08-26 21:35:06 +1000 |
commit | 13ea123c74cdcb33cdc376b16677044512615afa (patch) | |
tree | 927c311167547c8b17d63406095806f21533cf68 /pkgs/tools/admin | |
parent | eada59b86b4925db45e705a6058eaca92485e939 (diff) | |
download | nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.tar nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.tar.gz nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.tar.bz2 nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.tar.lz nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.tar.xz nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.tar.zst nixpkgs-13ea123c74cdcb33cdc376b16677044512615afa.zip |
treewide: buildFlagsArray -> ldflags
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/aws-vault/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/admin/awsweeper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/chamber/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/credhub-cli/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/admin/fioctl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/iamy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/lego/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/ssmsh/default.nix | 2 |
8 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index c1716015281..afc493c3b6a 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -34,10 +34,9 @@ buildGoModule rec { subPackages = [ "." ]; # set the version. see: aws-vault's Makefile - buildFlagsArray = '' - -ldflags= - -X main.Version=v${version} - ''; + ldflags = [ + "-X main.Version=v${version}" + ]; doInstallCheck = true; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 0ff42ca20fc..7d1935415ab 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; + ldflags = [ "-s" "-w" "-X github.com/jckuester/awsweeper/internal.version=${version}" "-X github.com/jckuester/awsweeper/internal.commit=${src.rev}" "-X github.com/jckuester/awsweeper/internal.date=unknown" ]; doCheck = false; diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 524970925dd..d69e96a4555 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; meta = with lib; { description = diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 0c71850f849..9cfb23ab9da 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -28,8 +28,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/credhub-cli/version.Version=${version}" diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 6e20a32cf21..98e68c10fb9 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { runVend = true; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" + ]; meta = with lib; { description = "A simple CLI to manage your Foundries Factory "; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index dd35da451ad..6ee5f3f880b 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X main.Version=v${version} -s -w - '']; + ldflags = [ + "-X main.Version=v${version}" "-s" "-w" + ]; meta = with lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 78f4b8cd2cb..68567946754 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/lego" ]; - buildFlagsArray = [ - "-ldflags=-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 3ed29af25fd..6c4785c81c5 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = true; - buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ]; + ldflags = [ "-w" "-s" "-X main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/bwhaley/ssmsh"; |