From 630a6080fb0d1247991dcb5330bd8ca0521c0c9d Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 23 Nov 2025 14:11:45 +0100 Subject: [PATCH 1/2] victorialogs: relax go.mod and modules.txt to go major.minor version (cherry picked from commit 7226be4fe6892959e6668677f13c401bb8d34a90) --- pkgs/by-name/vi/victorialogs/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index c4723ac7b76d..bf10978070da 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -33,12 +33,9 @@ buildGoModule (finalAttrs: { ++ lib.optionals withVlAgent [ "app/vlagent" ]; postPatch = '' - # Allow older go versions - substituteInPlace go.mod \ - --replace-fail "go 1.25.2" "go ${finalAttrs.passthru.go.version}" - - substituteInPlace vendor/modules.txt \ - --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}" + # Relax go version to major.minor + sed -i -E 's/^(go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' go.mod + sed -i -E 's/^(go[[:space:]]+[[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$/\1/' vendor/modules.txt ''; ldflags = [ From 291168ef70f4f303fd6a2af8f5ac00d4ebff9429 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 1 Nov 2025 20:51:11 +0000 Subject: [PATCH 2/2] victorialogs: 1.36.1 -> 1.38.0 (cherry picked from commit d0bd881a600612c032344c75eeac1d41029b1fad) --- pkgs/by-name/vi/victorialogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index bf10978070da..3a0d63f22213 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.36.1"; + version = "1.38.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-TZhgZ8x1ESXrNMU6Sa4cQMurTZ+obD/JqqIJFJ18KOA="; + hash = "sha256-UosxxeTZzM/f2rqUdMqPxHgnu57/dUc/X7gFOySy+M4="; }; vendorHash = null;