pyrox.dev
promscale: 0.10.0 -> 0.17.0
-17
pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch
-17
pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch
···
1
-
2
-
A Promscale test has a dependency on a package which was not intended to be
3
-
vendored, so `go mod vendor` breaks. The dependency is not required to build
4
-
Promscale, so it can be removed.
5
-
6
-
diff --git a/pkg/tests/end_to_end_tests/trace_query_integration_test.go b/pkg/tests/end_to_end_tests/trace_query_integration_test.go
7
-
index 84a0d08..efbe5e1 100644
8
-
--- a/pkg/tests/end_to_end_tests/trace_query_integration_test.go
9
-
+++ b/pkg/tests/end_to_end_tests/trace_query_integration_test.go
10
-
@@ -24,7 +24,6 @@ import (
11
-
ingstr "github.com/timescale/promscale/pkg/pgmodel/ingestor"
12
-
"github.com/timescale/promscale/pkg/pgxconn"
13
-
14
-
- jaegerQueryApp "github.com/jaegertracing/jaeger/cmd/query/app"
15
-
jaegerQueryService "github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
16
-
jaegerJSONModel "github.com/jaegertracing/jaeger/model/json"
17
-
)
···
+9
-9
pkgs/servers/monitoring/prometheus/promscale/default.nix
+9
-9
pkgs/servers/monitoring/prometheus/promscale/default.nix
···
7
8
buildGoModule rec {
9
pname = "promscale";
10
-
version = "0.10.0";
11
12
src = fetchFromGitHub {
13
owner = "timescale";
14
repo = pname;
15
rev = version;
16
-
sha256 = "sha256-KF+aD9vJYqNJkJftx27ZsxmOIXZ/2ciKwjwcTw0GBvY=";
17
};
18
19
-
patches = [
20
-
./0001-remove-jaeger-test-dep.patch
21
-
];
22
-
23
-
vendorSha256 = "sha256-/cjRM8CrOKnx0BcRu2+MLV28MYLOrG5x1DN24mRUJzQ=";
24
25
ldflags = [
26
"-s"
···
28
"-X github.com/timescale/promscale/pkg/version.Version=${version}"
29
"-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}"
30
];
31
-
32
checkPhase = ''
33
runHook preCheck
34
···
51
changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md";
52
license = licenses.asl20;
53
platforms = platforms.unix;
54
-
maintainers = with maintainers; [ _0x4A6F ];
55
};
56
}
···
7
8
buildGoModule rec {
9
pname = "promscale";
10
+
version = "0.17.0";
11
12
src = fetchFromGitHub {
13
owner = "timescale";
14
repo = pname;
15
rev = version;
16
+
sha256 = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI=";
17
};
18
19
+
vendorSha256 = "sha256-lnyKsipr/f9W9LWLb2lizKGLvIbS3XnSlOH1u1B87OY=";
20
21
ldflags = [
22
"-s"
···
24
"-X github.com/timescale/promscale/pkg/version.Version=${version}"
25
"-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}"
26
];
27
+
preBuild = ''
28
+
# Without this build fails with
29
+
# main module (github.com/timescale/promscale) does not contain package github.com/timescale/promscale/migration-tool/cmd/prom-migrator
30
+
rm -r migration-tool
31
+
'';
32
checkPhase = ''
33
runHook preCheck
34
···
51
changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md";
52
license = licenses.asl20;
53
platforms = platforms.unix;
54
+
maintainers = with maintainers; [ _0x4A6F anpin ];
55
};
56
}