From 0dc4b9fd9d70fafb0244aaecace1e54ff75358b8 Mon Sep 17 00:00:00 2001
From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com>
Date: Sat, 15 Oct 2022 13:10:12 -0500
Subject: [PATCH] tere: 1.2.0 -> 1.3.0

Release notes: https://github.com/mgunyho/tere/releases/tag/v1.3.0

Patch no longer needed as the test now passes correctly.
---
 pkgs/tools/misc/tere/brokentest.patch | 19 -------------------
 pkgs/tools/misc/tere/default.nix      | 10 +++-------
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/misc/tere/brokentest.patch

diff --git a/pkgs/tools/misc/tere/brokentest.patch b/pkgs/tools/misc/tere/brokentest.patch
deleted file mode 100644
index f5b9eb741ea0..000000000000
--- a/pkgs/tools/misc/tere/brokentest.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/app_state.rs b/src/app_state.rs
-index e44acb6..713642a 100644
---- a/src/app_state.rs
-+++ b/src/app_state.rs
-@@ -1272,7 +1272,7 @@ mod tests {
-         assert_eq!(s.cursor_pos, 1);
-         assert_eq!(s.scroll_pos, 2);
-     }
--
-+    /*
-     #[test]
-     fn test_advance_search_with_filter_search_and_scrolling2() {
-         let mut s = create_test_state_with_buf(
-@@ -1302,4 +1302,5 @@ mod tests {
-         assert_eq!(s.cursor_pos, 1);
-         assert_eq!(s.scroll_pos, 0);
-     }
-+    */
- }
diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix
index 97b1506e93d3..aff3b452f512 100644
--- a/pkgs/tools/misc/tere/default.nix
+++ b/pkgs/tools/misc/tere/default.nix
@@ -2,20 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tere";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "mgunyho";
     repo = "tere";
     rev = "v${version}";
-    sha256 = "sha256-2DpJYOzswT7dHEIj+qaTx1Jm28NE+61opoxuMChNwbM=";
+    sha256 = "sha256-jousyoro1Mn1+yBzUkGxW7/zbNvF7+Y4/WLRj99Iuy0=";
   };
 
-  cargoSha256 = "sha256-8qSikfsHX8xwBqSSxWwNbiOpXmfzwGTAOALPjxVHadc=";
-
-  # This test confirmed not working.
-  # https://github.com/mgunyho/tere/issues/44
-  cargoPatches = [ ./brokentest.patch ];
+  cargoSha256 = "sha256-hMAxKijmlckkCtQZiC5ubaZQKU2m99gL/MkYoU7zQxU=";
 
   meta = with lib; {
     description = "A faster alternative to cd + ls";