From dd9c0cf6929004866bf15d5221ffdb9f3036b7d4 Mon Sep 17 00:00:00 2001
From: mlvzk <mlvzk@protonmail.com>
Date: Tue, 15 Sep 2020 20:24:34 +0200
Subject: [PATCH 1/2] maintainers: add mlvzk

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3c56c36d90ca..fe659c3618f6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5671,6 +5671,12 @@
     githubId = 622577;
     name = "Michael Lieberman";
   };
+  mlvzk = {
+    name = "mlvzk";
+    email = "mlvzk@users.noreply.github.com";
+    github = "mlvzk";
+    githubId = 44906333;
+  };
   mmahut = {
     email = "marek.mahut@gmail.com";
     github = "mmahut";

From 92ba610833f1d4dd01bf31a2f4f52a08c9cf6e29 Mon Sep 17 00:00:00 2001
From: mlvzk <mlvzk@protonmail.com>
Date: Tue, 15 Sep 2020 20:25:33 +0200
Subject: [PATCH 2/2] manix: init at 0.6.2

---
 pkgs/tools/nix/manix/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/nix/manix/default.nix

diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix
new file mode 100644
index 000000000000..c4d1930a0fb5
--- /dev/null
+++ b/pkgs/tools/nix/manix/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "manix";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "mlvzk";
+    repo  = pname;
+    rev = "v${version}";
+    sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p";
+  };
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ];
+
+  cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5";
+
+  meta = with stdenv.lib; {
+    description = "A Fast Documentation Searcher for Nix";
+    homepage    = "https://github.com/mlvzk/manix";
+    license     = [ licenses.mpl20 ];
+    maintainers = [ maintainers.mlvzk ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3681b0df2547..c2e33fafd171 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5368,6 +5368,8 @@ in
 
   mandoc = callPackage ../tools/misc/mandoc { };
 
+  manix = callPackage ../tools/nix/manix {};
+
   marktext = callPackage ../applications/misc/marktext { };
 
   mawk = callPackage ../tools/text/mawk { };