diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-04-02 16:40:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-02 16:40:52 -0500 |
commit | 3da9bd18dbfd133db51b926da829bd8d8b7c95cf (patch) | |
tree | 207c0c72b7342758125f8d854ceee40f3b8dec23 | |
parent | 8ba2cc3a7bf70ea718ffe10c262437f1e9e75c27 (diff) | |
parent | 3e358eb06d9ed9e6df2f787957241bd923a4a340 (diff) |
Merge pull request #224215 from IndeedNotJames/victoriametrics
victoriametrics: 1.84.0 -> 1.89.1, add `meta.mainProgram`
-rw-r--r-- | pkgs/servers/nosql/victoriametrics/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 8c39c1da1275b..c9a1bf0041210 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; { @@ -36,5 +42,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ yorickvp ivan ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; + mainProgram = "victoria-metrics"; }; } |