From d3dae7864a3df5fe66a3b7f3efe634b5f5f1eeef Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 4 May 2022 18:40:27 +0000 Subject: [PATCH 1/3] victoriametrics: 1.59.0 -> 1.76.1 This fixes grafana + VictoriaMetrics on NixOS master; 1.59.0 somehow resulted in mostly empty charts. https://docs.victoriametrics.com/CHANGELOG.html#v1761 --- pkgs/servers/nosql/victoriametrics/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 4ef8fe9575f..d825543b8d7 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,17 +2,23 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.59.0"; + version = "1.76.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU="; + sha256 = "sha256-4cgSJi53EGK6YUwO4HlhNs4T07US94A/sPZi2QCx0aw="; }; vendorSha256 = null; + postPatch = '' + # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package + # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web + rm -f app/vmui/packages/vmui/web/{go.mod,main.go} + ''; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; @@ -21,7 +27,7 @@ buildGoModule rec { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; - maintainers = [ maintainers.yorickvp ]; + maintainers = with maintainers; [ yorickvp ivan ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; }; From 46f8180c5b0dff1ba3ea1fbb09fa209078795338 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 May 2022 19:15:15 +0000 Subject: [PATCH 2/3] victoriametrics: 1.76.1 -> 1.77.0 https://docs.victoriametrics.com/CHANGELOG.html#v1770 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index d825543b8d7..1f2ec463e8d 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.76.1"; + version = "1.77.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-4cgSJi53EGK6YUwO4HlhNs4T07US94A/sPZi2QCx0aw="; + sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs="; }; vendorSha256 = null; From 11a1fb28e49cbcd6cd9e14509cdfba070f61a208 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 May 2022 19:23:43 +0000 Subject: [PATCH 3/3] victoriametrics: add comment about app/vmui/packages/vmui/web/ --- pkgs/servers/nosql/victoriametrics/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 1f2ec463e8d..8e676b5022a 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web + # + # This appears to be some of test server for development purposes only. rm -f app/vmui/packages/vmui/web/{go.mod,main.go} '';