From b506f2a6cfee8e384d079efd01439502ab009a95 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Fri, 27 Sep 2024 09:55:01 -0400
Subject: [PATCH 1/5] maintainers: add alfarel

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d1690081b374..69f078bf3c42 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1016,6 +1016,12 @@
     githubId = 50754358;
     name = "Alex Winter";
   };
+  alfarel = {
+    email = "alfarelcynthesis@proton.me";
+    github = "alfarelcynthesis";
+    githubId = 104072649;
+    name = "Cynth";
+  };
   algram = {
     email = "aliasgram@gmail.com";
     github = "Algram";

From 3426e32d7788bdfbc409a65694e157b2f5d5ad15 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Fri, 27 Sep 2024 10:09:07 -0400
Subject: [PATCH 2/5] keyd: 2.4.3 -> 2.5.0

https://github.com/rvaiya/keyd/blob/master/docs/CHANGELOG.md#v250
---
 pkgs/tools/inputmethods/keyd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix
index d74cc1525499..9d8bef294483 100644
--- a/pkgs/tools/inputmethods/keyd/default.nix
+++ b/pkgs/tools/inputmethods/keyd/default.nix
@@ -8,13 +8,13 @@
 }:
 
 let
-  version = "2.4.3";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "rvaiya";
     repo = "keyd";
     rev = "v" + version;
-    hash = "sha256-NhZnFIdK0yHgFR+rJm4cW+uEhuQkOpCSLwlXNQy6jas=";
+    hash = "sha256-pylfQjTnXiSzKPRJh9Jli1hhin/MIGIkZxLKxqlReVo=";
   };
 
   pypkgs = python3.pkgs;

From 06ad66b367c8f390a5bafa76ca59bd5a938665f9 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Fri, 27 Sep 2024 10:19:09 -0400
Subject: [PATCH 3/5] keyd: update deprecated --replace

---
 pkgs/tools/inputmethods/keyd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix
index 9d8bef294483..96c61b6d0f02 100644
--- a/pkgs/tools/inputmethods/keyd/default.nix
+++ b/pkgs/tools/inputmethods/keyd/default.nix
@@ -26,7 +26,7 @@ let
 
     postPatch = ''
       substituteInPlace scripts/${pname} \
-        --replace /bin/sh ${runtimeShell}
+        --replace-fail /bin/sh ${runtimeShell}
     '';
 
     propagatedBuildInputs = with pypkgs; [ xlib ];
@@ -47,10 +47,10 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace /usr ""
+      --replace-fail /usr ""
 
     substituteInPlace keyd.service \
-      --replace /usr/bin $out/bin
+      --replace-fail /usr/bin $out/bin
   '';
 
   installFlags = [ "DESTDIR=${placeholder "out"}" ];

From 4b1c2ab6832a3433287a9045a26eb2b42c0b022f Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Fri, 27 Sep 2024 10:55:38 -0400
Subject: [PATCH 4/5] keyd: tweak substitutes for upstream build changes

---
 pkgs/tools/inputmethods/keyd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix
index 96c61b6d0f02..836ef8971ae8 100644
--- a/pkgs/tools/inputmethods/keyd/default.nix
+++ b/pkgs/tools/inputmethods/keyd/default.nix
@@ -47,10 +47,10 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace-fail /usr ""
+      --replace-fail /usr/local ""
 
-    substituteInPlace keyd.service \
-      --replace-fail /usr/bin $out/bin
+    substituteInPlace keyd.service.in \
+      --replace-fail @PREFIX@ $out
   '';
 
   installFlags = [ "DESTDIR=${placeholder "out"}" ];

From 6bec3d17803ed1f4ee0d2ae29b8adcc23cb1aee4 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Fri, 27 Sep 2024 11:01:54 -0400
Subject: [PATCH 5/5] keyd: take over maintainership

As per https://github.com/NixOS/nixpkgs/issues/344339#issuecomment-2377826745, current maintainer does not want to maintain it.
---
 pkgs/tools/inputmethods/keyd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix
index 836ef8971ae8..7395c807389a 100644
--- a/pkgs/tools/inputmethods/keyd/default.nix
+++ b/pkgs/tools/inputmethods/keyd/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Key remapping daemon for Linux";
     license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
+    maintainers = with maintainers; [ alfarel ];
     platforms = platforms.linux;
   };
 }