From 3860892dc896e1515a76c889ad30a2db730a285a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 28 Jul 2025 15:34:24 +0200 Subject: [PATCH] kubevpn: renew Signed-off-by: Paul Meyer --- pkgs/by-name/ku/kubevpn/package.nix | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 4a0e22496604..6d225d4078fd 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -4,16 +4,17 @@ buildGoModule, fetchFromGitHub, go, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kubevpn"; version = "2.8.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+TyaujgbeQXApxmjYvLnmhBZZUeIZMidzS7mL+Ach3o="; }; @@ -24,7 +25,7 @@ buildGoModule rec { ]; ldflags = [ - "-X github.com/wencaiwulue/kubevpn/v2/pkg/config.Version=v${version}" + "-X github.com/wencaiwulue/kubevpn/v2/pkg/config.Version=v${finalAttrs.version}" "-X github.com/wencaiwulue/kubevpn/v2/cmd/kubevpn/cmds.OsArch=${go.GOOS}/${go.GOARCH}" ]; @@ -54,20 +55,16 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "version"; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/kubevpn help - $out/bin/kubevpn version | grep -e "Version: v${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${src.rev}"; + meta = { + changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${finalAttrs.src.rev}"; description = "Create a VPN and connect to Kubernetes cluster network, access resources, and more"; mainProgram = "kubevpn"; homepage = "https://github.com/KubeNetworks/kubevpn"; - license = licenses.mit; - maintainers = with maintainers; [ mig4ng ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mig4ng ]; }; -} +})