From fcef602c47797a0145c9a6dd33e6dee66fd15761 Mon Sep 17 00:00:00 2001
From: Nils <mail@nils.cc>
Date: Mon, 3 Feb 2025 23:14:31 +0100
Subject: [PATCH 1/2] maintainers: add nilscc

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ffd58bb2e749..b56953cccde9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16553,6 +16553,12 @@
     githubId = 1224006;
     name = "Roberto Abdelkader Martínez Pérez";
   };
+  nilscc = {
+    email = "mail@nils.cc";
+    github = "nilscc";
+    githubId = 92021;
+    name = "Nils";
+  };
   nils-degroot = {
     email = "nils@peeko.nl";
     github = "nils-degroot";

From 733b91ed5b9696d72efc30078f8f930228fb3be3 Mon Sep 17 00:00:00 2001
From: Nils <mail@nils.cc>
Date: Mon, 3 Feb 2025 17:21:29 +0100
Subject: [PATCH 2/2] rs-git-fsmonitor: 0.1.3 (deleted) -> 0.2.0

* enable useFetchCargoVendor by providing correct hashes
* Add myself as maintainer
* use lib explicitely
---
 pkgs/by-name/rs/rs-git-fsmonitor/package.nix | 36 ++++++++++++++++++++
 pkgs/top-level/aliases.nix                   |  1 -
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/rs/rs-git-fsmonitor/package.nix

diff --git a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
new file mode 100644
index 000000000000..095c3c4e80f1
--- /dev/null
+++ b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  makeWrapper,
+  watchman,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rs-git-fsmonitor";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "jgavris";
+    repo = "rs-git-fsmonitor";
+    tag = "v${version}";
+    hash = "sha256-+5nR+/09HmFk3mq2B8NTeBT50aBG85yXEdeO6BhStVw=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-WkqJSbtaJxaagJMsdFiVozi1SkrfxXyM9bdZeimwJag=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/rs-git-fsmonitor --prefix PATH ":" "${lib.makeBinPath [ watchman ]}"
+  '';
+
+  meta = {
+    description = "Fast git core.fsmonitor hook written in Rust";
+    homepage = "https://github.com/jgavris/rs-git-fsmonitor";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nilscc ];
+    mainProgram = "rs-git-fsmonitor";
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 403a59eaad18..21dfb35be8af 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1227,7 +1227,6 @@ mapAliases {
   rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17
   rr-unstable = rr; # Added 2022-09-17
-  rs-git-fsmonitor = throw "'rs-git-fsmonitor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   rtx = mise; # Added 2024-01-05
   runCommandNoCC = runCommand;
   runCommandNoCCLocal = runCommandLocal;