From 4e6ddd0c15d65bcd5bdc36bac7a6e51b64b39061 Mon Sep 17 00:00:00 2001
From: Pavel Anpin <pavel@anpin.fyi>
Date: Mon, 20 Mar 2023 12:12:37 +0400
Subject: [PATCH] promscale: 0.10.0 -> 0.17.0

---
 .../0001-remove-jaeger-test-dep.patch          | 17 -----------------
 .../prometheus/promscale/default.nix           | 18 +++++++++---------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch

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
deleted file mode 100644
index 9266a9aca53c..000000000000
--- a/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch
+++ /dev/null
@@ -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"
- )
diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix
index fbd1661c5f8b..7dcc5f01e47c 100644
--- a/pkgs/servers/monitoring/prometheus/promscale/default.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix
@@ -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 ];
   };
 }