From 533f4fd63560a920bfae54226b16979520a26abf Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 4 Jun 2025 20:25:38 +0200 Subject: [PATCH] velero: remove with lib; --- pkgs/by-name/ve/velero/package.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index c953ee711cb7..f8a3bc3a2cf7 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -6,21 +6,21 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "velero"; version = "1.16.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KfVMWoBScpHINmT5PlnPY+I5Ec1NRgEXKMtL0M7WyhE="; }; ldflags = [ "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${finalAttrs.version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" @@ -38,7 +38,7 @@ buildGoModule rec { doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e doInstallCheck = true; installCheckPhase = '' - $out/bin/velero version --client-only | grep ${version} > /dev/null + $out/bin/velero version --client-only | grep ${finalAttrs.version} > /dev/null ''; nativeBuildInputs = [ installShellFiles ]; @@ -48,14 +48,14 @@ buildGoModule rec { installShellCompletion velero.{bash,zsh} ''; - meta = with lib; { - description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + meta = { + description = "Utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; homepage = "https://velero.io/"; - changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ - maintainers.mbode - maintainers.bryanasdev000 + changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + mbode + bryanasdev000 ]; }; -} +})