Skip to content

victorialogs: 1.24.0 -> 1.25.0 #423260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GaetanLepage merged 1 commit into from
Jul 13, 2025
Merged

victorialogs: 1.24.0 -> 1.25.0 #423260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 6 additions & 27 deletions pkgs/by-name/vi/victorialogs/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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}"
Copy link
Contributor

@acid-bong acid-bong Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The upstream uses the new repo here: https://github.com/VictoriaMetrics/VictoriaLogs/blob/8f74a61d479d875a6c13398798183dc922df89b3/Makefile#L14

Copy link
Contributor Author

@Shawn8901 Shawn8901 Jul 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the linked issue in my previous comment (#423260 (comment)), and this PR. VictoriaMetrics/VictoriaLogs#419 and
VictoriaMetrics/VictoriaLogs@7db3660

On the force push, that I did in the morning you see that that was explicitly the value before (which is grabbed from the linked Makefile), but that was not correct, thus resulting in VL not being able to report it's version.

I don't see that we should merge a version with a broken version report, even tho it's wrongly published on 1.25.0 by upstream.

Tho if you strongly ask for that I can ofc force push again the ref with the broken version report

Copy link
Member

@NyCodeGHG NyCodeGHG Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imo we should leave it working with the "wrong" repo url and change it in the next release

Copy link
Contributor

@acid-bong acid-bong Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tho if you strongly ask for that

I don't. If it's reported wrong, a fix/workaround is fine

Copy link
Contributor Author

@Shawn8901 Shawn8901 Jul 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imo we should leave it working with the "wrong" repo url and change it in the next release

The repo url is not wrong according upstream.
If I understand the upstream issue correct all software from Victoria Metrics (organization) is importing the buildInfo from the victoriametrics repo, thus needing the VM repo as into in -X argument.
changing it results in not working versions n info.

As upstream did change the -X argument and not add a new buildInfo that seems to be at least intended rn.

I might be still wrong in what I understand from the written text in the issue/or, but it's at least how .

But let's see if/when upstream changes that.

];

preCheck = ''
# `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset
export ldflags=''${ldflags//=${finalAttrs.version}/=}
'';

__darwinAllowLocalNetworking = true;

passthru = {
Expand All @@ -61,17 +42,15 @@ buildGoModule (finalAttrs: {
victorialogs
;
};
updateScript = nix-update-script {
extraArgs = [ "--version-regex=(.*)-victorialogs" ];
};
updateScript = nix-update-script { };
};

meta = {
homepage = "https://docs.victoriametrics.com/victorialogs/";
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";
};
})