Merge master into staging-next

2023-09-10 00:02:16 +00:00
parent 66c722f52f 2b1eb11946
commit b6eb350562
61 changed files with 650 additions and 4792 deletions
@@ -221,9 +221,9 @@ in {
    inherit (pkgs.buildPackages) makeWrapper;
  };

-  sphinxHook = callPackage ({ makePythonHook, sphinx, installShellFiles }:
+  sphinxHook = callPackage ({ makePythonHook, installShellFiles }:
    makePythonHook {
      name = "python${python.pythonVersion}-sphinx-hook";
-      propagatedBuildInputs = [ sphinx installShellFiles ];
+      propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ];
    } ./sphinx-hook.sh) {};
 }