From 605779bf16546a83273ce4c8b06b663554b2aded Mon Sep 17 00:00:00 2001
From: Yifei Huang <huangyifei@agora.io>
Date: Thu, 22 Jan 2026 18:19:30 +0800
Subject: [PATCH 1/3] maintainers: add fayash

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 413061ab2dfa..608fc4d15454 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8424,6 +8424,12 @@
     name = "A Frederick Christensen";
     keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC  4E94 9EEF 4142 5355 8AC4"; } ];
   };
+  fayash = {
+    email = "akafayash@icloud.com";
+    name = "Fay Ash";
+    github = "yaoshiu";
+    githubId = 56054933;
+  };
   fazzi = {
     email = "faaris.ansari@proton.me";
     github = "fxzzi";

From 404daf6a437da0927ee9f71faf0da6ec4edb7d36 Mon Sep 17 00:00:00 2001
From: Yifei Huang <huangyifei@agora.io>
Date: Thu, 22 Jan 2026 18:45:11 +0800
Subject: [PATCH 2/3] mcp-language-server: init at 0.1.1

---
 .../mc/mcp-language-server/package.nix        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-language-server/package.nix

diff --git a/pkgs/by-name/mc/mcp-language-server/package.nix b/pkgs/by-name/mc/mcp-language-server/package.nix
new file mode 100644
index 000000000000..66d3bfe98d0c
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-language-server/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+buildGoModule rec {
+  pname = "mcp-language-server";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "isaacphi";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-T0wuPSShJqVW+CcQHQuZnh3JOwqUxAKv1OCHwZMr7KM=";
+  };
+
+  subPackages = [ "." ];
+
+  proxyVendor = true;
+
+  vendorHash = "sha256-niDJB3QhZjz9qIGSjUEcghRpEbPUgsSuK52ncZ21DS8=";
+
+  meta = with lib; {
+    description = "Model Context Protocol server to interact with language servers";
+    license = licenses.bsd3;
+    homepage = "https://github.com/isaacphi/mcp-language-server";
+    mainProgram = "mcp-language-server";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [
+      fayash
+    ];
+  };
+}

From ea9609fef7bcbd338184996e232e593ae0cd0904 Mon Sep 17 00:00:00 2001
From: Fay Ash <56054933+yaoshiu@users.noreply.github.com>
Date: Mon, 26 Jan 2026 10:58:35 +0800
Subject: [PATCH 3/3] mcp-language-server: refactor meta and fix repo reference

Co-authored-by: Nikolay Korotkiy <sikmir@disroot.org>
---
 pkgs/by-name/mc/mcp-language-server/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mc/mcp-language-server/package.nix b/pkgs/by-name/mc/mcp-language-server/package.nix
index 66d3bfe98d0c..3bd9a71552ad 100644
--- a/pkgs/by-name/mc/mcp-language-server/package.nix
+++ b/pkgs/by-name/mc/mcp-language-server/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "isaacphi";
-    repo = pname;
+    repo = "mcp-language-server";
     rev = "v${version}";
     hash = "sha256-T0wuPSShJqVW+CcQHQuZnh3JOwqUxAKv1OCHwZMr7KM=";
   };
@@ -20,13 +20,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-niDJB3QhZjz9qIGSjUEcghRpEbPUgsSuK52ncZ21DS8=";
 
-  meta = with lib; {
+  meta = {
     description = "Model Context Protocol server to interact with language servers";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     homepage = "https://github.com/isaacphi/mcp-language-server";
     mainProgram = "mcp-language-server";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       fayash
     ];
   };