From 1131be4703e0e063d1b23fceed65ed3ec1fd8d9a Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 28 Oct 2025 12:45:22 +0000 Subject: [PATCH 1/3] =?UTF-8?q?thanos:=200.39.2=20=E2=86=92=200.40.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/th/thanos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 0e1205299f84..46c795f15f53 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "thanos"; - version = "0.39.2"; + version = "0.40.1"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; tag = "v${version}"; - hash = "sha256-yKw+HGlqEgQmydZ+PIk5y/z5H57nZ0dtw/kEh8079Ws="; + hash = "sha256-g0xvtBwPoX906xHdyOEUfudio/9MZhkzdBp5FcATRsM="; }; - vendorHash = "sha256-6qTxCAD1hbS77erG1Z52JU2iOXAU+qtY3yivX+4bjlw="; + vendorHash = "sha256-ukKoiA7UhqDdMvAWYL5BGf6+FSPSkcRR/Scj5o/MMKc="; subPackages = "cmd/thanos"; From ee5376fb58a5eec26f9810a5702907af1db47b58 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 28 Oct 2025 12:46:58 +0000 Subject: [PATCH 2/3] thanos: Synchronize go build tags with upstream https://github.com/thanos-io/thanos/issues/8543 --- pkgs/by-name/th/thanos/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 46c795f15f53..48e32cec0779 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -24,6 +24,12 @@ buildGoModule rec { subPackages = "cmd/thanos"; + # Verify in sync with https://github.com/thanos-io/thanos/blob/main/.promu.yml + tags = [ + "netgo" + "slicelabels" + ]; + ldflags = let t = "github.com/prometheus/common/version"; From 0dd045ea6f52ba0aef9cca4e7a146af9a0ce83be Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 6 Nov 2025 12:45:37 +0000 Subject: [PATCH 3/3] thanos: Add versionCheckHook --- pkgs/by-name/th/thanos/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 48e32cec0779..b56882f7d653 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -7,6 +7,7 @@ nixosTests, testers, thanos, + versionCheckHook, }: buildGoModule rec { @@ -45,6 +46,12 @@ buildGoModule rec { doCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; tests = {