diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 07d2357a50b6..e60181e9bc4c 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,29 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, tree }: buildGoModule rec { pname = "kustomize"; - version = "3.1.0"; - # rev is the 3.1.0 commit, mainly for kustomize version command output - rev = "95f3303493fdea243ae83b767978092396169baf"; + version = "3.3.1"; + # rev is the 3.3.1 commit, mainly for kustomize version command output + rev = "f2ac5a2d0df13c047fb20cbc12ef1a3b41ce2dad"; - goPackagePath = "sigs.k8s.io/kustomize"; - subPackages = [ "cmd/kustomize" ]; - - buildFlagsArray = let t = "${goPackagePath}/v3/pkg/commands/misc"; in '' + buildFlagsArray = let t = "sigs.k8s.io/kustomize/v3/provenance"; in '' -ldflags= - -s -X ${t}.kustomizeVersion=${version} + -s -X ${t}.version=${version} -X ${t}.gitCommit=${rev} -X ${t}.buildDate=unknown ''; src = fetchFromGitHub { - sha256 = "0kigcirkjvnj3xi1p28p9yp3s0lff24q5qcvf8ahjwvpbwka14sh"; - rev = "v${version}"; - repo = pname; owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + sha256 = "0yxxz0b56r18w178y32s619zy8ci6l93c6vlzx11hhxhbw43f6v6"; }; - modSha256 = "0w8sp73pmj2wqrg7x7z8diglyfq6c6gn9mmck0k1gk90nv7s8rf1"; + # avoid finding test and development commands + sourceRoot = "source/kustomize"; + + modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; meta = with lib; { description = "Customization of kubernetes YAML configurations";