Skip to content

Commit 52e3404

Browse files
committed
victoriametrics: use replace-fail, finalAttr, remove with lib;
1 parent e2d0076 commit 52e3404

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

pkgs/by-name/vi/victoriametrics/package.nix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
withVictoriaLogs ? true, # logs server
1313
}:
1414

15-
buildGoModule rec {
15+
buildGoModule (finalAttrs: {
1616
pname = "VictoriaMetrics";
1717
version = "1.113.0";
1818

1919
src = fetchFromGitHub {
2020
owner = "VictoriaMetrics";
2121
repo = "VictoriaMetrics";
22-
tag = "v${version}";
22+
tag = "v${finalAttrs.version}";
2323
hash = "sha256-yjK81kT2EW8Vqykl2xelCQg54ancVfSHriG08z7tXWU=";
2424
};
2525

@@ -60,20 +60,20 @@ buildGoModule rec {
6060
6161
# Increase timeouts in tests to prevent failure on heavily loaded builders
6262
substituteInPlace lib/storage/storage_test.go \
63-
--replace "time.After(10 " "time.After(120 " \
64-
--replace "time.NewTimer(30 " "time.NewTimer(120 " \
65-
--replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
63+
--replace-fail "time.After(10 " "time.After(120 " \
64+
--replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \
65+
--replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
6666
'';
6767

6868
ldflags = [
6969
"-s"
7070
"-w"
71-
"-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}"
71+
"-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}"
7272
];
7373

7474
preCheck = ''
7575
# `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset
76-
export ldflags=''${ldflags//=${version}/=}
76+
export ldflags=''${ldflags//=${finalAttrs.version}/=}
7777
'';
7878

7979
__darwinAllowLocalNetworking = true;
@@ -82,18 +82,18 @@ buildGoModule rec {
8282
inherit (nixosTests) victoriametrics;
8383
};
8484

85-
meta = with lib; {
85+
meta = {
8686
homepage = "https://victoriametrics.com/";
8787
description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
88-
license = licenses.asl20;
89-
maintainers = with maintainers; [
88+
license = lib.licenses.asl20;
89+
maintainers = with lib.maintainers; [
9090
yorickvp
9191
ivan
9292
leona
9393
shawn8901
9494
ryan4yin
9595
];
96-
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}";
96+
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${finalAttrs.version}";
9797
mainProgram = "victoria-metrics";
9898
};
99-
}
99+
})

0 commit comments

Comments
 (0)