From 1dd8696f96db47156e1424a49578fe7dd4ce99a4 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Fri, 4 Nov 2022 17:06:51 -0700
Subject: [PATCH] vector: 0.24.1 -> 0.25.0

---
 pkgs/tools/misc/vector/default.nix | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 2fb2f82ba80f..d6c589ee2ed0 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -32,7 +32,7 @@
 
 let
   pname = "vector";
-  version = "0.24.1";
+  version = "0.25.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -41,28 +41,10 @@ rustPlatform.buildRustPackage {
     owner = "vectordotdev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ=";
+    hash = "sha256-2hCgHf7iBPl9BQITXyUDwgAz/i2HhXT4eczWrExCUDk=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "rust-1.64-part1.patch";
-      url = "https://github.com/vectordotdev/vector/commit/e7437df97711b6a660a3532fe5026244472a900f.patch";
-      hash = "sha256-EyheI3nngt72+ZZNNsjp3KV1CuRb9CZ7wUCHt0twFVs=";
-    })
-    (fetchpatch {
-      name = "rust-1.64-part2.patch";
-      url = "https://github.com/vectordotdev/vector/commit/e80c7afaf7601cf936c7c3468bd7b4b230ef6149.patch";
-      hash = "sha256-pHcq7XLn+9PKs0DnBTK5FawN5KSF8BuJf7sBO9u5Gb8=";
-      excludes = [
-        # There are too many conflicts to easily resolve patching this file, but
-        # the changes here do not block compilation.
-        "lib/lookup/src/lookup_v2/owned.rs"
-      ];
-    })
-  ];
-
-  cargoHash = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk=";
+  cargoHash = "sha256-E23m8/XCEXeEpz1itIzCit9RpoB1/PRrYVWxt+VVfxA=";
   nativeBuildInputs = [ pkg-config cmake perl ];
   buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
     ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];