From 97a073c330436811cdfe3e6dd281ddee811c299b Mon Sep 17 00:00:00 2001
From: Jose Colomer <joseluis.colomer@tiko.energy>
Date: Thu, 4 Sep 2025 13:58:21 +0200
Subject: [PATCH 1/2] maintainers: add mcjocobe

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 18954cc4828b..3ebe4c3691bb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16242,6 +16242,12 @@
     name = "Colton J. McCurdy";
     keys = [ { fingerprint = "D709 03C8 0BE9 ACDC 14F0  3BFB 77BF E531 397E DE94"; } ];
   };
+  mcjocobe = {
+    email = "josecolomerbel@gmail.com";
+    github = "mcjocobe";
+    githubId = 94081214;
+    name = "Jose Colomer";
+  };
   mcmtroffaes = {
     email = "matthias.troffaes@gmail.com";
     github = "mcmtroffaes";

From 76f5eebb27c46cf92e2db8b3e326e027c36dd963 Mon Sep 17 00:00:00 2001
From: Jose Colomer <joseluis.colomer@tiko.energy>
Date: Thu, 4 Sep 2025 15:45:30 +0200
Subject: [PATCH 2/2] zuban: init at 0.0.21

---
 pkgs/by-name/zu/zuban/package.nix | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/zu/zuban/package.nix

diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix
new file mode 100644
index 000000000000..d4020ac6d837
--- /dev/null
+++ b/pkgs/by-name/zu/zuban/package.nix
@@ -0,0 +1,47 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "zuban";
+
+  version = "0.0.21";
+
+  src = fetchFromGitHub {
+    owner = "zubanls";
+    repo = "zuban";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-llAJwqJmOtauA7pi7dYZhVH0yFBNN65q2y8ecc9hAJY=";
+  };
+
+  buildAndTestSubdir = "crates/zuban";
+
+  cargoHash = "sha256-sZFc+kjerR7a6JzVb0zQXCfYuJVNnoYUihgLd3qrDLM=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Mypy-compatible Python Language Server built in Rust";
+    homepage = "https://zubanls.com";
+    # There's no changelog file yet, but they post updates on their blog.
+    changelog = "https://zubanls.com/blog/";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      mcjocobe
+    ];
+    platforms = lib.platforms.all;
+    mainProgram = "zuban";
+  };
+})