diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-12-08 14:40:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 14:40:28 +0000 |
commit | 9beb5ac06ad70014c4d9d7674ef785b8139e8bf8 (patch) | |
tree | 86b5a5fd29c828775837f5ad0023a481101c73c9 /pkgs/servers/monitoring | |
parent | 38839202f0b0b45ea2ceddacd849b33524aa1680 (diff) | |
parent | 1f8a8bd75abe135429bbccf4ec76d06d87f32b57 (diff) | |
download | nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.tar nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.tar.gz nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.tar.bz2 nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.tar.lz nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.tar.xz nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.tar.zst nixpkgs-9beb5ac06ad70014c4d9d7674ef785b8139e8bf8.zip |
Merge pull request #149609 from JamesGuthrie/jg/update-promscale-0.7.1
promscale: 0.6.2 -> 0.7.1
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch | 17 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/promscale/default.nix (renamed from pkgs/servers/monitoring/prometheus/promscale.nix) | 26 |
2 files changed, 31 insertions, 12 deletions
diff --git a/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch b/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch new file mode 100644 index 00000000000..9266a9aca53 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch @@ -0,0 +1,17 @@ + +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" + ) diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index 5940d033deb..591542f2839 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -1,33 +1,35 @@ { lib , buildGoModule , fetchFromGitHub +, promscale +, testVersion }: buildGoModule rec { pname = "promscale"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-YGT+VaHX6dqYdJz002fGZxRYE3gFqY8Q7VdhtSTPpjU="; + sha256 = "sha256-OMDl8RGFOMW+KNX2tNHusJY/6gLZxuWCI3c0E/oqrfE="; }; - vendorSha256 = "sha256-o7vRSCEEqzhruHEnRPuxC1e4NzCl8Br4vvqg0pwGIgA="; + patches = [ + ./0001-remove-jaeger-test-dep.patch + ]; + + vendorSha256 = "sha256-IwHngKiQ+TangEj5PcdiGoLxQJrt/Y3EtbSYZYmfUOE="; ldflags = [ "-s" "-w" "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon - doInstallCheck = true; - installCheckPhase = '' - if [[ "$("$out/bin/${pname}" -version)" == "${version}" ]]; then - echo '${pname} smoke check passed' - else - echo '${pname} smoke check failed' - exit 1 - fi - ''; + + passthru.tests.version = testVersion { + package = promscale; + command = "promscale -version"; + }; meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; |