From 142d8333bb3e6cc0b3927b50b2b9b1b708d831bc Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Thu, 12 Sep 2024 21:30:48 +0200
Subject: [PATCH] surrealdb: 1.5.4 -> 1.5.5

Remove patches added in b7ca9dc1 to fix 1.5.4 build on rust 1.80.1

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/by-name/su/surrealdb/package.nix | 10 +++-------
 pkgs/by-name/su/surrealdb/time.patch  | 28 ---------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/su/surrealdb/time.patch

diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix
index 5f4ec81470ec..2dfa4012fcde 100644
--- a/pkgs/by-name/su/surrealdb/package.nix
+++ b/pkgs/by-name/su/surrealdb/package.nix
@@ -16,20 +16,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "surrealdb";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "surrealdb";
     repo = "surrealdb";
     rev = "v${version}";
-    hash = "sha256-KtR+qU2Xys4NkEARZBbO8mTPa7EI9JplWvXdtuLt2vE=";
+      hash = "sha256-C2ppLbNv68qpl2bcqWp/PszcCeGCsD0LbEdAM9P1asg=";
   };
 
-  cargoPatches = [
-    ./time.patch # TODO: remove when https://github.com/surrealdb/surrealdb/pull/4565 merged
-  ];
-
-  cargoHash = "sha256-5qIIPdE6HYov5EIR4do+pMeZ1Lo3at39aKOP9scfMy8=";
+  cargoHash = "sha256-gLepa9JxY9AYyGepV6Uzt1g7apkKWJxf0SiNCSkjUDg=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''
diff --git a/pkgs/by-name/su/surrealdb/time.patch b/pkgs/by-name/su/surrealdb/time.patch
deleted file mode 100644
index ef0ecfe698c4..000000000000
--- a/pkgs/by-name/su/surrealdb/time.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 64b3955f..b4598827 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -6478,9 +6478,9 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -6499,9 +6499,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-  "num-conv",
-  "time-core",