From 83322150b0f91f9a555d4b91a912a4854355b16f Mon Sep 17 00:00:00 2001
From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com>
Date: Sun, 24 Jul 2022 01:07:27 -0500
Subject: [PATCH 1/2] maintainers: add ProducerMatt

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aa0fb9d1e22d..a51210390853 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10341,6 +10341,12 @@
       }
     ];
   };
+  ProducerMatt = {
+    name = "Matthew Pherigo";
+    email = "ProducerMatt42@gmail.com";
+    github = "ProducerMatt";
+    githubId = 58014742;
+  };
   Profpatsch = {
     email = "mail@profpatsch.de";
     github = "Profpatsch";

From bf182e4decd7214ea735f06ad86d60f465d75b8c Mon Sep 17 00:00:00 2001
From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com>
Date: Sun, 24 Jul 2022 01:07:08 -0500
Subject: [PATCH 2/2] tere: init at 1.1.0

A failing test was keeping it from building. I [confirmed with the
dev](https://github.com/mgunyho/tere/issues/44) it's known and ignored
so I commented it out with a patch.

This app isn't that useful until some [shell hooks have been
added.](https://github.com/mgunyho/tere#setup) So I hope to add a config
option to home-manager such as:

```nix
programs.tere = {
  enabled = true;
  useBashIntegration = true;
  useFishIntegration = true;
};
```
---
 pkgs/tools/misc/tere/brokentest.patch | 19 +++++++++++++++++++
 pkgs/tools/misc/tere/default.nix      | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/misc/tere/brokentest.patch
 create mode 100644 pkgs/tools/misc/tere/default.nix

diff --git a/pkgs/tools/misc/tere/brokentest.patch b/pkgs/tools/misc/tere/brokentest.patch
new file mode 100644
index 000000000000..f5b9eb741ea0
--- /dev/null
+++ b/pkgs/tools/misc/tere/brokentest.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000000..e1dac5a6bf2a
--- /dev/null
+++ b/pkgs/tools/misc/tere/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tere";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "mgunyho";
+    repo = "tere";
+    rev = "v${version}";
+    sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs=";
+  };
+
+  cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs=";
+
+  # This test confirmed not working.
+  # https://github.com/mgunyho/tere/issues/44
+  cargoPatches = [ ./brokentest.patch ];
+
+  meta = with lib; {
+    description = "A faster alternative to cd + ls";
+    homepage = "https://github.com/mgunyho/tere";
+    license = licenses.eupl12;
+    maintainers = with maintainers; [ ProducerMatt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df78a2be376e..4b46e3945855 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1275,6 +1275,8 @@ with pkgs;
 
   tauon = callPackage ../applications/audio/tauon { };
 
+  tere = callPackage ../tools/misc/tere { };
+
   termusic = callPackage ../applications/audio/termusic { };
 
   tfk8s = callPackage ../tools/misc/tfk8s { };