From 2a27662845330f07c481baf066053b6b53f5afd8 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Fri, 12 Jul 2024 16:26:49 -0700
Subject: [PATCH 1/2] maintainers: add jhol

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 61a95b7f88f6..cd10e324cba3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10253,6 +10253,13 @@
     githubId = 2502736;
     name = "James Hillyerd";
   };
+  jhol = {
+    name = "Joel Holdsworth";
+    email = "joel@airwebreathe.org.uk";
+    github = "jhol";
+    githubId = 1449493;
+    keys = [ { fingerprint = "08F7 2546 95DE EAEF 03DE  B0E4 D874 562D DC99 D889"; } ];
+  };
   jhollowe = {
     email = "jhollowe@johnhollowell.com";
     github = "jhollowe";

From c2a6507f0591367017d46574884f92493fb01a29 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Fri, 19 Apr 2024 17:25:14 -0700
Subject: [PATCH 2/2] sphinxcontrib-moderncmakedomain init at 3.29.0

---
 .../default.nix                               | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix
new file mode 100644
index 000000000000..524c9b094674
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  defusedxml,
+  fetchPypi,
+  hatchling,
+  pytestCheckHook,
+  sphinx,
+}:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-moderncmakedomain";
+  version = "3.29.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "sphinxcontrib_moderncmakedomain";
+    hash = "sha256-NYfe8kH/JXfQu+8RgQoILp3sG3ij1LSgZiQLXz3BtbI=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ sphinx ];
+
+  nativeCheckInputs = [
+    defusedxml
+    pytestCheckHook
+    sphinx
+  ];
+
+  pythonNamespaces = [ "sphinxcontrib" ];
+
+  meta = with lib; {
+    description = "Sphinx extension which renders CMake documentation";
+    homepage = "https://github.com/scikit-build/moderncmakedomain";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jhol ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d823896acbb3..58cc5ae01c5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14933,6 +14933,8 @@ self: super: with self; {
 
   sphinxcontrib-log-cabinet = callPackage ../development/python-modules/sphinxcontrib-log-cabinet { };
 
+  sphinxcontrib-moderncmakedomain = callPackage ../development/python-modules/sphinxcontrib-moderncmakedomain { };
+
   sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { };
 
   sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { };