From be97d5f5b95290445886244257c4d3580c439aaa Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 27 Feb 2024 13:17:52 +0100 Subject: [PATCH] crowdsec: fix versioning flags in build --- pkgs/tools/security/crowdsec/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index f9428bdd3170..06cbecad8474 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -23,9 +23,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/crowdsecurity/go-cs-lib/pkg/version.Version=v${version}" - "-X github.com/crowdsecurity/go-cs-lib/pkg/version.BuildDate=1970-01-01_00:00:00" - "-X github.com/crowdsecurity/go-cs-lib/pkg/version.Tag=${src.rev}" + "-X github.com/crowdsecurity/go-cs-lib/version.Version=v${version}" + "-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=1970-01-01_00:00:00" + "-X github.com/crowdsecurity/go-cs-lib/version.Tag=${src.rev}" "-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=alphaga" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultConfigDir=/etc/crowdsec" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultDataDir=/var/lib/crowdsec/data" @@ -43,6 +43,11 @@ buildGoModule rec { --zsh <($out/bin/cscli completion zsh) ''; + # It's important that the version is correctly set as it also determines feature capabilities + checkPhase = '' + $GOPATH/bin/cscli version 2>&1 | grep -q "version: v${version}" + ''; + meta = with lib; { homepage = "https://crowdsec.net/"; changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${version}";