public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kustomize: fix variable interpolation for version info

Browse Source
This commit is contained in:
Atkins 2019-08-02 14:24:32 +08:00
parent 2fb5993fe7
commit 82d9988eb8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/kustomize/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
name = "kustomize-${version}"; pname = "kustomize";
version = "3.1.0"; version = "3.1.0";
# rev is the 3.1.0 commit, mainly for kustomize version command output # rev is the 3.1.0 commit, mainly for kustomize version command output
rev = "95f3303493fdea243ae83b767978092396169baf"; rev = "95f3303493fdea243ae83b767978092396169baf";
@ -9,7 +9,7 @@ buildGoModule rec {
goPackagePath = "sigs.k8s.io/kustomize"; goPackagePath = "sigs.k8s.io/kustomize";
subPackages = [ "cmd/kustomize" ]; subPackages = [ "cmd/kustomize" ];
buildFlagsArray = let t = "${goPackagePath}/pkg/commands/misc"; in '' buildFlagsArray = let t = "${goPackagePath}/v3/pkg/commands/misc"; in ''
-ldflags= -ldflags=
-s -X ${t}.kustomizeVersion=${version} -s -X ${t}.kustomizeVersion=${version}
-X ${t}.gitCommit=${rev} -X ${t}.gitCommit=${rev}
@ -19,7 +19,7 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "0kigcirkjvnj3xi1p28p9yp3s0lff24q5qcvf8ahjwvpbwka14sh"; sha256 = "0kigcirkjvnj3xi1p28p9yp3s0lff24q5qcvf8ahjwvpbwka14sh";
rev = "v${version}"; rev = "v${version}";
repo = "kustomize"; repo = pname;
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
}; };