From 1b28e38d517c708842b2cc8696d858e45d6ec478 Mon Sep 17 00:00:00 2001
From: architeuthidae <am@m-labs.hk>
Date: Wed, 31 Jul 2024 18:05:44 +0800
Subject: [PATCH] flake/sphinx: fix errors in manual nix build

---
 doc/manual/conf.py | 14 +++-----------
 flake.nix          |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/doc/manual/conf.py b/doc/manual/conf.py
index 86c5591eb..2636c52f3 100644
--- a/doc/manual/conf.py
+++ b/doc/manual/conf.py
@@ -29,21 +29,13 @@ builtins.__in_sphinx__ = True
 # we cannot use autodoc_mock_imports (does not help with argparse)
 mock_modules = ["artiq.gui.waitingspinnerwidget",
                 "artiq.gui.flowlayout",
-                "artiq.gui.state",
-                "artiq.gui.log",
                 "artiq.gui.models",
                 "artiq.compiler.module",
                 "artiq.compiler.embedding",
                 "artiq.dashboard.waveform",
-                "artiq.dashboard.interactive_args",
-                "qasync", "pyqtgraph", "matplotlib", "lmdb",
-                "numpy", "dateutil", "dateutil.parser", "prettytable", "PyQt6",
-                "h5py", "serial", "scipy", "scipy.interpolate",
-                "llvmlite", "Levenshtein", "pythonparser",
-                "sipyco", "sipyco.pc_rpc", "sipyco.sync_struct",
-                "sipyco.asyncio_tools", "sipyco.logging_tools",
-                "sipyco.broadcast", "sipyco.packed_exceptions",
-                "sipyco.keepalive", "sipyco.pipe_ipc"]
+                "artiq.coredevice.jsondesc",
+                "qasync", "lmdb", "dateutil.parser", "prettytable", "PyQt6",
+                "h5py", "llvmlite", "pythonparser", "tqdm", "jsonschema"]
 
 for module in mock_modules:
     sys.modules[module] = Mock()
diff --git a/flake.nix b/flake.nix
index 4f9d16277..87d37f31f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -346,7 +346,7 @@
           buildInputs = with pkgs.python3Packages; [
             sphinx sphinx_rtd_theme
             sphinx-argparse sphinxcontrib-wavedrom
-          ];
+          ] ++ [ artiq-comtools.packages.x86_64-linux.artiq-comtools ];
           buildPhase = ''
             export VERSIONEER_OVERRIDE=${artiqVersion}
             export SOURCE_DATE_EPOCH=${builtins.toString self.sourceInfo.lastModified}
@@ -366,7 +366,7 @@
           buildInputs = with pkgs.python3Packages; [
             sphinx sphinx_rtd_theme
             sphinx-argparse sphinxcontrib-wavedrom
-          ] ++ [ latex-artiq-manual ];
+          ] ++ [ latex-artiq-manual artiq-comtools.packages.x86_64-linux.artiq-comtools ];
           buildPhase = ''
             export VERSIONEER_OVERRIDE=${artiq.version}
             export SOURCE_DATE_EPOCH=${builtins.toString self.sourceInfo.lastModified}