From b46c0f29b4d2026eb234e30ca31fdfe6b52a0c6f Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 7 Jul 2025 23:22:44 +0200 Subject: [PATCH] victorialogs: 1.24.0 -> 1.25.0 also migrate to new repository --- pkgs/by-name/vi/victorialogs/package.nix | 33 +++++------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index a84434bc9520..13d2cbcba14a 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; - repo = "VictoriaMetrics"; - tag = "v${finalAttrs.version}-victorialogs"; - hash = "sha256-E52hvxazzbz9FcPFZFcRHs2vVg6fJJQ8HsieQovQSi4="; + repo = "VictoriaLogs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KhXB+37uK08dDYXtnaPDS7gP/gBGZ0gqyR0u572QOx8="; }; vendorHash = null; @@ -28,31 +28,12 @@ buildGoModule (finalAttrs: { "app/vlogscli" ]; - 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 kind of test server for development purposes only. - # rm -f app/vmui/packages/vmui/web/{go.mod,main.go} - - # Increase timeouts in tests to prevent failure on heavily loaded builders - substituteInPlace lib/storage/storage_test.go \ - --replace-fail "time.After(10 " "time.After(120 " \ - --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \ - --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ - ''; - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}" ]; - preCheck = '' - # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset - export ldflags=''${ldflags//=${finalAttrs.version}/=} - ''; - __darwinAllowLocalNetworking = true; passthru = { @@ -61,9 +42,7 @@ buildGoModule (finalAttrs: { victorialogs ; }; - updateScript = nix-update-script { - extraArgs = [ "--version-regex=(.*)-victorialogs" ]; - }; + updateScript = nix-update-script { }; }; meta = { @@ -71,7 +50,7 @@ buildGoModule (finalAttrs: { description = "User friendly log database from VictoriaMetrics"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ marie ]; - changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/${finalAttrs.src.tag}"; mainProgram = "victoria-logs"; }; })