From 26c9a8bf13a941e5722075daddb99fa980d16dea Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 27 Jun 2025 09:59:03 +0000 Subject: [PATCH 1/3] =?UTF-8?q?thanos:=200.38.0=20=E2=86=92=200.39.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 c3122f919545..8578ca99b404 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.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; tag = "v${version}"; - hash = "sha256-3rNtiVTrA+MoCVuTSLIzh65U0kjA86EF+bQCyfVa6rA="; + hash = "sha256-Exv/wHX4JcVnj4GWGjTDNCAL2d8IYrq7ulajV/CzVio="; }; - vendorHash = "sha256-Z/S4mVg+VbP8hNVB1xz1uGWR6N/1aTA0DqTHbntGMLg="; + vendorHash = "sha256-6qTxCAD1hbS77erG1Z52JU2iOXAU+qtY3yivX+4bjlw="; subPackages = "cmd/thanos"; From ce60d2df8fbbb08533c497fc0868b3b415a4fb1d Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 27 Jun 2025 10:00:02 +0000 Subject: [PATCH 2/3] nixos/thanos: Migrate test to runTest, fix name --- nixos/tests/all-tests.nix | 2 +- nixos/tests/thanos.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fd7caf0bacf6..485755df3854 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1449,7 +1449,7 @@ in teleports = runTest ./teleports.nix; thelounge = handleTest ./thelounge.nix { }; terminal-emulators = handleTest ./terminal-emulators.nix { }; - thanos = handleTest ./thanos.nix { }; + thanos = runTest ./thanos.nix; tiddlywiki = runTest ./tiddlywiki.nix; tigervnc = handleTest ./tigervnc.nix { }; tika = runTest ./tika.nix; diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix index c0c10854e73f..caadfaa37c2c 100644 --- a/nixos/tests/thanos.nix +++ b/nixos/tests/thanos.nix @@ -1,3 +1,5 @@ +{ ... }: + let grpcPort = 19090; queryPort = 9090; @@ -30,10 +32,9 @@ let }; }; }; - in -import ./make-test-python.nix { - name = "prometheus"; +{ + name = "thanos"; nodes = { prometheus = From 8473ce8c958d4086c2fc384b30b4815895a567a8 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 21 Jul 2025 12:17:08 +0000 Subject: [PATCH 3/3] =?UTF-8?q?thanos:=200.39.1=20=E2=86=92=200.39.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/th/thanos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 8578ca99b404..0e1205299f84 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "thanos"; - version = "0.39.1"; + version = "0.39.2"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; tag = "v${version}"; - hash = "sha256-Exv/wHX4JcVnj4GWGjTDNCAL2d8IYrq7ulajV/CzVio="; + hash = "sha256-yKw+HGlqEgQmydZ+PIk5y/z5H57nZ0dtw/kEh8079Ws="; }; vendorHash = "sha256-6qTxCAD1hbS77erG1Z52JU2iOXAU+qtY3yivX+4bjlw=";