From 3ae8b5339d759ae17af107c44393839d5e4d8a1c Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Sat, 1 Apr 2023 15:25:20 +0200 Subject: [PATCH] victoriametrics: 1.84.0 -> 1.89.1 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.89.1 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.89.0 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.88.1 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.88.0 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.4 (LTS) https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.3 (LTS) https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.2 (LTS) https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.1 (LTS) https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.0 (LTS) https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.86.2 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.86.1 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.86.0 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.85.3 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.85.2 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.85.1 https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.85.0 diff: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.84.0...v1.89.1 `lib/querytracer/tracer.go` uses `buildinfo.Version`, but its tests expect that value to be unset, which is why I had to add that preCheck phase. Context: https://github.com/VictoriaMetrics/VictoriaMetrics/commit/49ebc488094bfe637c01a56e7c39c4af08a6f731 https://github.com/VictoriaMetrics/VictoriaMetrics/commit/3019ec3da6404424ef1508a503b628f181b43468 https://github.com/VictoriaMetrics/VictoriaMetrics/commit/8434aa142d9fbf3a12c5277c77a6155f5efe0609 Also, `lib/storage/storage_test.go` switched to `time.NewTimer` in some places. --- pkgs/servers/nosql/victoriametrics/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 8c39c1da127..1cba8da789a 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.84.0"; + version = "1.89.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-94QhjsCow1Ate/Bbia7KpWY3WgHk3oOarAY95Fq75hU="; + hash = "sha256-s5Fo0Bsy9cAoNLRMAYjNrSLJ0vX4HdbQ+T3cj6ebNPE="; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package @@ -23,11 +23,17 @@ buildGoModule rec { # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ --replace "time.After(10 " "time.After(120 " \ - --replace "time.After(30 " "time.After(120 " + --replace "time.NewTimer(30 " "time.NewTimer(120 " \ + --replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ ''; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + preCheck = '' + # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset + export ldflags=''${ldflags//=${version}/=} + ''; + passthru.tests = { inherit (nixosTests) victoriametrics; }; meta = with lib; {