vector: fix build against rust 1.66

(cherry picked from commit 108f65b)
winterqt · Feb 15, 2023 · 63d00d3 · 63d00d3
1 parent 0abc4b1
commit 63d00d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
@@ -44,6 +44,11 @@ rustPlatform.buildRustPackage {
     hash = "sha256-7iYiSO966o0M9M0ijGCpuRVRgus+tURLBN9S5lPDRb8=";
   };
 
+  patches = [
+    # replace with https://github.com/vectordotdev/vector/pull/15093 when ready
+    ./fix-for-rust-1.66.diff
+  ];
+
   cargoHash = "sha256-EqK6r/pFFKmnpPPUhqdC3bztYQZ+2w7u7V8Rj+9oWII=";
   nativeBuildInputs = [ pkg-config cmake perl ];
   buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]

diff --git a/pkgs/tools/misc/vector/fix-for-rust-1.66.diff b/pkgs/tools/misc/vector/fix-for-rust-1.66.diff
@@ -0,0 +1,13 @@
+diff --git a/src/sources/aws_kinesis_firehose/filters.rs b/src/sources/aws_kinesis_firehose/filters.rs
+index ac33682..fe65ed4 100644
+--- a/src/sources/aws_kinesis_firehose/filters.rs
++++ b/src/sources/aws_kinesis_firehose/filters.rs
+@@ -28,7 +28,7 @@ pub fn firehose(
+     acknowledgements: bool,
+     out: SourceSender,
+     log_namespace: LogNamespace,
+-) -> impl Filter<Extract = impl warp::Reply, Error = Infallible> + Clone {
++) -> impl Filter<Extract = (impl warp::Reply,), Error = Infallible> + Clone {
+     let bytes_received = register!(BytesReceived::from(Protocol::HTTP));
+     let context = handlers::Context {
+         compression: record_compression,