From e9a183f536d8d0bfdd81f8ad95b30d43aeaff2af Mon Sep 17 00:00:00 2001 From: James Ravn Date: Fri, 4 Feb 2022 10:31:08 +0000 Subject: [PATCH] kubebuilder: 3.2.0 -> 3.3.0 Update kubebuilder to 3.3.0. Use go 1.17 since kubebuilder 3.3.0 now requires it. --- .../networking/cluster/kubebuilder/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 02c1c834781a..7ee92fcbbda4 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -1,30 +1,30 @@ { lib -, buildGoModule +, buildGo117Module , fetchFromGitHub , makeWrapper , git -, go +, go_1_17 , gnumake }: -buildGoModule rec { +buildGo117Module rec { pname = "kubebuilder"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; + sha256 = "sha256-xLeS0vfYuLEdzuou67ViduaBf62+Yqk+scaCCK+Xetk="; }; - vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; + vendorSha256 = "sha256-zE/y9FAoUZBmWiUMWbc66CwkK0h7SEXzfZY3KkjtQ0A="; subPackages = ["cmd"]; ldflags = [ "-X main.kubeBuilderVersion=v${version}" - "-X main.goos=${go.GOOS}" - "-X main.goarch=${go.GOARCH}" + "-X main.goos=${go_1_17.GOOS}" + "-X main.goarch=${go_1_17.GOARCH}" "-X main.gitCommit=v${version}" "-X main.buildDate=v${version}" ]; @@ -34,7 +34,7 @@ buildGoModule rec { postInstall = '' mv $out/bin/cmd $out/bin/kubebuilder wrapProgram $out/bin/kubebuilder \ - --prefix PATH : ${lib.makeBinPath [ go gnumake ]} + --prefix PATH : ${lib.makeBinPath [ go_1_17 gnumake ]} ''; allowGoReference = true;