From 386bc09b61ccecbe90d085c9ea5bc604217ee25d Mon Sep 17 00:00:00 2001
From: Jean-Luc Jox <jeanluc.jox@gmail.com>
Date: Wed, 20 Nov 2024 09:13:02 +1000
Subject: [PATCH 1/2] maintainers: add jljox

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ba5167d7d307..2b6fdd851895 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10445,6 +10445,12 @@
     githubId = 1058504;
     name = "José Luis Lafuente";
   };
+  jljox = {
+    email = "jeanluc.jox@gmail.com";
+    github = "jljox";
+    githubId = 3665886;
+    name = "Jean-Luc Jox";
+  };
   jloyet = {
     email = "ml@fatbsd.com";
     github = "fatpat";

From 892b1f3a1c74dfa80217510f653525ead76c02a1 Mon Sep 17 00:00:00 2001
From: Jean-Luc Jox <jeanluc.jox@gmail.com>
Date: Wed, 13 Nov 2024 23:04:21 +1000
Subject: [PATCH 2/2] kittycad-kcl-lsp: init at 0.1.61

---
 pkgs/by-name/ki/kittycad-kcl-lsp/package.nix | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/ki/kittycad-kcl-lsp/package.nix

diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
new file mode 100644
index 000000000000..d78ca6390929
--- /dev/null
+++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "kittycad-kcl-lsp";
+  version = "0.1.61";
+
+  src = fetchFromGitHub {
+    owner = "KittyCAD";
+    repo = "kcl-lsp";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-VtrR4v0BJWYdoYFDJpWnmVqDhZMlPGm+g9yjxYfcFxQ=";
+  };
+
+  cargoHash = "sha256-51eFOJnc/GqgXtfVx/omR+KuC7x/oKGGR+s0z6nKXBg=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  meta = {
+    description = "KittyCAD KCL language server";
+    changelog = "https://github.com/KittyCAD/kcl-lsp/releases/tag/v${version}";
+    homepage = "https://github.com/KittyCAD/kcl-lsp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jljox ];
+    mainProgram = "kittycad-kcl-lsp";
+  };
+}