docs/devshell: unbreak - add options-page

Create the options-page subpage when the docs dev shell is loaded.

Also simplify the dev shell definition by just utilizing what's in configurePhase of the docs derivation
This commit is contained in:
DavHau
2025-06-25 11:32:28 +07:00
parent 12682b608c
commit d9d1ab97a9
4 changed files with 16 additions and 50 deletions

View File

@@ -36,6 +36,11 @@ pkgs.stdenv.mkDerivation {
mkdir -p ./site/reference/cli
cp -af ${module-docs}/* ./site/reference/
cp -af ${clan-cli-docs}/* ./site/reference/cli/
chmod -R +w ./site/reference
echo "Generated API documentation in './site/reference/' "
cp -r ${docs-options} ./site/options-page
chmod -R +w ./site/options-page
mkdir -p ./site/static/asciinema-player
ln -snf ${asciinema-player-js} ./site/static/asciinema-player/asciinema-player.min.js
@@ -56,6 +61,5 @@ pkgs.stdenv.mkDerivation {
installPhase = ''
cp -a out/ $out/
cp -r ${docs-options} $out/options-page
'';
}

View File

@@ -115,15 +115,16 @@
clanModulesViaService
;
};
devShells.docs = pkgs.callPackage ./shell.nix {
inherit (self'.packages) docs clan-cli-docs inventory-api-docs;
inherit
asciinema-player-js
asciinema-player-css
module-docs
self'
;
};
devShells.docs = self'.packages.docs.overrideAttrs (_old: {
nativeBuildInputs =
self'.devShells.default.nativeBuildInputs ++ self'.packages.docs.nativeBuildInputs;
shellHook = ''
${self'.devShells.default.shellHook}
git_root=$(git rev-parse --show-toplevel)
cd "$git_root"
runPhase configurePhase
'';
});
packages = {
docs = pkgs.python3.pkgs.callPackage ./default.nix {
clan-core = self;

View File

@@ -1,40 +0,0 @@
{
docs,
pkgs,
module-docs,
clan-cli-docs,
asciinema-player-js,
asciinema-player-css,
roboto,
fira-code,
self',
...
}:
pkgs.mkShell {
name = "clan-docs";
inputsFrom = [
docs
self'.devShells.default
];
shellHook = ''
git_root=$(git rev-parse --show-toplevel)
cd ''${git_root}/docs
mkdir -p ./site/reference/cli
cp -af ${module-docs}/* ./site/reference/
cp -af ${clan-cli-docs}/* ./site/reference/cli/
chmod -R +w ./site/reference/*
echo "Generated API documentation in './site/reference/' "
mkdir -p ./site/static/asciinema-player
ln -snf ${asciinema-player-js} ./site/static/asciinema-player/asciinema-player.min.js
ln -snf ${asciinema-player-css} ./site/static/asciinema-player/asciinema-player.css
# Link to fonts
ln -snf ${roboto}/share/fonts/truetype/Roboto-Regular.ttf ./site/static/
ln -snf ${fira-code}/share/fonts/truetype/FiraCode-VF.ttf ./site/static/
'';
}