diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4431ad2c2a66..a3cc89d57ed7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4296,6 +4296,12 @@
     githubId = 71959829;
     name = "Cleeyv";
   };
+  clemjvdm = {
+    email = "clement.jvdm@gmail.com";
+    github = "clemjvdm";
+    githubId = 131002498;
+    name = "clement";
+  };
   clerie = {
     email = "nix@clerie.de";
     github = "clerie";
diff --git a/pkgs/development/python-modules/pygerber/default.nix b/pkgs/development/python-modules/pygerber/default.nix
new file mode 100644
index 000000000000..d0c0690bc5b4
--- /dev/null
+++ b/pkgs/development/python-modules/pygerber/default.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  # build-system
+  poetry-core,
+
+  # dependencies
+  numpy,
+  click,
+  pillow,
+  pydantic,
+  pyparsing,
+  typing-extensions,
+
+  # optional dependencies
+  pygls,
+  lsprotocol,
+  drawsvg,
+  pygments,
+  shapely,
+
+  # test
+  filelock,
+  dulwich,
+  tzlocal,
+  pytest-xdist,
+  pytest-cov,
+  pytest-lsp,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+
+}:
+
+buildPythonPackage rec {
+  pname = "pygerber";
+  version = "2.4.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "Argmaster";
+    repo = "pygerber";
+    tag = "v${version}";
+    hash = "sha256-N+9I59WiWXSXr7RrPzb7GFSqfjrd0q51AzalNFV4xEQ=";
+  };
+
+  build-system = [ poetry-core ];
+  dependencies = [
+    numpy
+    click
+    pillow
+    pydantic
+    pyparsing
+    typing-extensions
+  ];
+
+  passthru.optional-dependencies = {
+    language_server = [
+      pygls
+      lsprotocol
+    ];
+    svg = [ drawsvg ];
+    pygments = [ pygments ];
+    shapely = [ shapely ];
+    all = [
+      pygls
+      lsprotocol
+      drawsvg
+      pygments
+      shapely
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov
+    pytest-xdist
+    pytest-lsp
+    pytest-mock
+    pytestCheckHook
+    tzlocal
+    drawsvg
+    dulwich
+    filelock
+  ];
+
+  disabledTestPaths = [
+    # require network access
+    "test/gerberx3/test_assets.py"
+    "test/gerberx3/test_language_server/tests.py"
+  ];
+
+  pythonImportsCheck = [ "pygerber" ];
+
+  meta = {
+    description = "Implementation of the Gerber X3/X2 format, based on Ucamco's The Gerber Layer Format Specification";
+    homepage = "https://github.com/Argmaster/pygerber";
+    changelog = "https://argmaster.github.io/pygerber/stable/Changelog.html";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ clemjvdm ];
+  };
+}
diff --git a/pkgs/development/python-modules/pytest-lsp/default.nix b/pkgs/development/python-modules/pytest-lsp/default.nix
new file mode 100644
index 000000000000..4fa32e477d79
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-lsp/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  fetchPypi,
+  buildPythonPackage,
+  hatchling,
+  pygls,
+  pytestCheckHook,
+  pytest-asyncio,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-lsp";
+  version = "0.4.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "pytest_lsp";
+    hash = "sha256-ND9r2i+qMg7V/Ld8lCDScDzlZdHRRP6CfjGYp9wpkRw=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    pygls
+    pytest-asyncio
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pytest_lsp" ];
+
+  meta = {
+    homepage = "https://github.com/swyddfa/lsp-devtools";
+    changelog = "https://github.com/swyddfa/lsp-devtools/blob/develop/lib/pytest-lsp/CHANGES.md";
+    description = "Pytest plugin for writing end-to-end tests for language servers";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      clemjvdm
+      fliegendewurst
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e7eecb377040..429aa8ef9f85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10560,6 +10560,8 @@ self: super: with self; {
 
   pygelf = callPackage ../development/python-modules/pygelf { };
 
+  pygerber = callPackage ../development/python-modules/pygerber { };
+
   pygments-style-github = callPackage ../development/python-modules/pygments-style-github { };
 
   pygnmi = callPackage ../development/python-modules/pygnmi { };
@@ -10706,6 +10708,8 @@ self: super: with self; {
 
   pytask = callPackage ../development/python-modules/pytask { };
 
+  pytest-lsp = callPackage ../development/python-modules/pytest-lsp { };
+
   pytest-mockito = callPackage ../development/python-modules/pytest-mockito { };
 
   pytest-pudb = callPackage ../development/python-modules/pytest-pudb { };