diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-08-26 13:31:57 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-08-26 15:43:28 +1000 |
| commit | e6494966dd6a8dcd6d4cb5663f093a57bcc2593e (patch) | |
| tree | 118b30b346e74d9480a58d316f0817a42367350f /pkgs/applications/networking | |
| parent | e3cdd952fdcbf2ff6181fd32d69d32a2ccb1daef (diff) | |
| download | nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.gz nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.bz2 nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.lz nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.xz nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.tar.zst nixpkgs-e6494966dd6a8dcd6d4cb5663f093a57bcc2593e.zip | |
treewide: buildFlagsArray -> ldflags
Diffstat (limited to 'pkgs/applications/networking')
5 files changed, 24 insertions, 30 deletions
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index a49879e5352..6372f19ee6c 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -43,15 +43,14 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/argoproj/argo-workflows/v3.buildDate=unknown - -X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev} - -X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev} - -X github.com/argoproj/argo-workflows/v3.gitTreeState=clean - -X github.com/argoproj/argo-workflows/v3.version=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" + "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean" + "-X github.com/argoproj/argo-workflows/v3.version=${version}" + ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 54d13f819ab..389be11e506 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -21,11 +21,10 @@ let nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; - buildFlagsArray = '' - -ldflags= - -X k8s.io/kops.Version=${version} - -X k8s.io/kops.GitVersion=${version} - ''; + ldflags = [ + "-X k8s.io/kops.Version=${version}" + "-X k8s.io/kops.GitVersion=${version}" + ]; preBuild = '' (cd go/src/k8s.io/kops diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 85b83c994df..b9a282b5cd1 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -13,13 +13,10 @@ buildGoPackage rec { sha256 = "sha256-/VToLQexvRtcBU+k8WnGEcfLfxme/hgRnhU8723BEFU="; }; - buildFlagsArray = '' - -ldflags= - -X - ${goPackagePath}/pkg/cmd.version=${version} - -X - ${goPackagePath}/pkg/cmd.buildDate=Nix - ''; + ldflags = [ + "-X ${goPackagePath}/pkg/cmd.version=${version}" + "-X ${goPackagePath}/pkg/cmd.buildDate=Nix" + ]; meta = with lib; { homepage = "https://www.kube-router.io/"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 38323b98b19..537fb611783 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -17,9 +17,9 @@ buildGoPackage rec { subPackages = [ "cmd/kubeless" ]; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X github.com/kubeless/kubeless/pkg/version.Version=${version}" + ]; postInstall = '' for shell in bash; do diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 5b3b17b3df2..488d0c4327a 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -34,12 +34,11 @@ in buildGoPackage rec { --replace '"runtime"' "" ''; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/pkg/version.minishiftVersion=${version} - -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion} - -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion} - ''; + ldflags = [ + "-X ${goPackagePath}/pkg/version.minishiftVersion=${version}" + "-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}" + "-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}" + ]; preBuild = '' (cd go/src/github.com/minishift/minishift |