From 35496459bad691e5b2b0874c94c1d89a002afdd3 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 4 Mar 2026 19:00:00 +0100 Subject: [PATCH 1/2] kubebuilder: 4.10.1 -> 4.13.1 --- pkgs/by-name/ku/kubebuilder/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix index 5378578a23ed..a8444fd34815 100644 --- a/pkgs/by-name/ku/kubebuilder/package.nix +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -13,31 +13,28 @@ buildGoModule (finalAttrs: { pname = "kubebuilder"; - version = "4.10.1"; + version = "4.13.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${finalAttrs.version}"; - hash = "sha256-GAHuaUVtdLvyWNeOxu46+IOw2Mf42z3yUjZNiyeE1xs="; + hash = "sha256-WOqrQb2haoEp57OHFo1Y1fon0lJedI/hEYKE4xrIbpM="; }; - vendorHash = "sha256-NsD2yt73+uRitegezTWwBhF0iMCQ8XhDf6WM/j7kT0o="; + vendorHash = "sha256-1lbf1hXJfhdTu6Gm7dcbJlB3beITxBD83gMltZgg7Pg="; subPackages = [ - "cmd" + "internal/cli/cmd" "." ]; allowGoReference = true; - ldflags = [ - "-X sigs.k8s.io/kubebuilder/v4/cmd.kubeBuilderVersion=v${finalAttrs.version}" - "-X sigs.k8s.io/kubebuilder/v4/cmd.goos=${go.GOOS}" - "-X sigs.k8s.io/kubebuilder/v4/cmd.goarch=${go.GOARCH}" - "-X sigs.k8s.io/kubebuilder/v4/cmd.gitCommit=unknown" - "-X sigs.k8s.io/kubebuilder/v4/cmd.buildDate=unknown" - ]; + postPatch = '' + substituteInPlace internal/cli/version/version.go \ + --replace-fail "return main.Version" 'return "v${finalAttrs.version}"' + ''; nativeBuildInputs = [ makeWrapper From 4fed632116a0e078eb77b77922e27da3fbd16832 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 4 Mar 2026 19:00:00 +0100 Subject: [PATCH 2/2] kubebuilder: extend usage of finalAttrs --- pkgs/by-name/ku/kubebuilder/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix index a8444fd34815..bf5cfc30e6e4 100644 --- a/pkgs/by-name/ku/kubebuilder/package.nix +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -8,7 +8,6 @@ gnumake, installShellFiles, testers, - kubebuilder, }: buildGoModule (finalAttrs: { @@ -59,8 +58,8 @@ buildGoModule (finalAttrs: { ''; passthru.tests.version = testers.testVersion { - command = "${kubebuilder}/bin/kubebuilder version"; - package = kubebuilder; + command = "${finalAttrs.finalPackage}/bin/kubebuilder version"; + package = finalAttrs.finalPackage; version = "v${finalAttrs.version}"; };