JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

promscale: 0.10.0 -> 0.17.0

Browse Source
This commit is contained in:
Pavel Anpin 2023-03-20 12:12:37 +04:00
parent 3efea7f0ea
commit 4e6ddd0c15
No known key found for this signature in database
GPG Key ID: 0FBCD3EE63107407
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch
View File

@ -1,17 +0,0 @@
A Promscale test has a dependency on a package which was not intended to be
vendored, so `go mod vendor` breaks. The dependency is not required to build
Promscale, so it can be removed.
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
index 84a0d08..efbe5e1 100644
--- a/pkg/tests/end_to_end_tests/trace_query_integration_test.go
+++ b/pkg/tests/end_to_end_tests/trace_query_integration_test.go
@@ -24,7 +24,6 @@ import (
ingstr "github.com/timescale/promscale/pkg/pgmodel/ingestor"
"github.com/timescale/promscale/pkg/pgxconn"
- jaegerQueryApp "github.com/jaegertracing/jaeger/cmd/query/app"
jaegerQueryService "github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
jaegerJSONModel "github.com/jaegertracing/jaeger/model/json"
)

18
pkgs/servers/monitoring/prometheus/promscale/default.nix
View File

@ -7,20 +7,16 @@
buildGoModule rec {
pname = "promscale";
version = "0.10.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
sha256 = "sha256-KF+aD9vJYqNJkJftx27ZsxmOIXZ/2ciKwjwcTw0GBvY=";
sha256 = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI=";
};
patches = [
./0001-remove-jaeger-test-dep.patch
];
vendorSha256 = "sha256-/cjRM8CrOKnx0BcRu2+MLV28MYLOrG5x1DN24mRUJzQ=";
vendorSha256 = "sha256-lnyKsipr/f9W9LWLb2lizKGLvIbS3XnSlOH1u1B87OY=";
ldflags = [
"-s"
@ -28,7 +24,11 @@ buildGoModule rec {
"-X github.com/timescale/promscale/pkg/version.Version=${version}"
"-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}"
];
preBuild = ''
# Without this build fails with
# main module (github.com/timescale/promscale) does not contain package github.com/timescale/promscale/migration-tool/cmd/prom-migrator
rm -r migration-tool
'';
checkPhase = ''
runHook preCheck
@ -51,6 +51,6 @@ buildGoModule rec {
changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ _0x4A6F ];
maintainers = with maintainers; [ _0x4A6F anpin ];
};
}