From 80a9c0d2dba09d6f5d5ed915309df58d254a946d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 11 May 2025 12:02:36 +0200 Subject: [PATCH] cmctl: modernize, disable integration test differently --- pkgs/by-name/cm/cmctl/package.nix | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/cm/cmctl/package.nix b/pkgs/by-name/cm/cmctl/package.nix index c1c7bdc16b41b..a443b7df1fafc 100644 --- a/pkgs/by-name/cm/cmctl/package.nix +++ b/pkgs/by-name/cm/cmctl/package.nix @@ -7,34 +7,35 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "cmctl"; version = "2.2.0"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cmctl"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Kr7vwVW6v08QRbJDs2u0vK241ljNfhLVYIQCBl31QSs="; }; - vendorHash = "sha256-D83Ufpa7PLQWBCHX5d51me3aYprGzc9RoKVma2Ax1Is="; + vendorHash = "sha256-SYCWvt2K3MEow4cDKxLSK+Bp0hZG9rNI9PoXdPcPESg="; ldflags = [ "-s" "-w" - "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${version}" - "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${src.rev}" + "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${finalAttrs.version}" + "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${finalAttrs.src.rev}" ]; + # integration tests require running etcd, kubernetes + postPatch = '' + rm -r test/integration + ''; + nativeBuildInputs = [ installShellFiles ]; - checkPhase = '' - go test --race $(go list ./... | grep -v /test/) - ''; - # Trusted by this computer: no: x509: “cert-manager” certificate is not # trusted doCheck = !stdenv.hostPlatform.isDarwin; @@ -46,7 +47,9 @@ buildGoModule rec { --zsh <($out/bin/cmctl completion zsh) ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Command line utility to interact with a cert-manager instalation on Kubernetes"; mainProgram = "cmctl"; longDescription = '' @@ -63,8 +66,8 @@ buildGoModule rec { resources inside your Kubernetes cluster. ''; downloadPage = "https://github.com/cert-manager/cmctl"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://cert-manager.io/"; - maintainers = with maintainers; [ joshvanl ]; + maintainers = with lib.maintainers; [ joshvanl ]; }; -} +})