From a16880d91d1cd98b0e5f3ce90cb632feaa150dd8 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 8 Jul 2024 12:00:30 -0400 Subject: [PATCH] update nixpkgs-manual --- packages/nixpkgs-manual/default.nix | 10 ++-------- packages/nixpkgs-manual/options-doc.nix | 4 ---- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 packages/nixpkgs-manual/options-doc.nix diff --git a/packages/nixpkgs-manual/default.nix b/packages/nixpkgs-manual/default.nix index ea9ce35..c659d94 100644 --- a/packages/nixpkgs-manual/default.nix +++ b/packages/nixpkgs-manual/default.nix @@ -37,7 +37,7 @@ let ) opt.declarations; }; }; - optionsJSONFile = "${optionsDoc.optionsJSON}/share/doc/nixos/options.json"; + optionsMD = optionsDoc.optionsCommonMark; in stdenvNoCC.mkDerivation { name = "nixpkgs-manual-md"; @@ -59,11 +59,6 @@ stdenvNoCC.mkDerivation { passAsFile = [ "pythonInterpreterTable" ]; buildPhase = '' - - nixos-render-docs -j $NIX_BUILD_CORES options commonmark \ - --manpage-urls ./manpage-urls.json \ - --revision ${inputs.nixpkgs.rev} \ - ${optionsJSONFile} ./options.md substituteInPlace ./languages-frameworks/python.section.md --subst-var-by python-interpreter-table "$(<"$pythonInterpreterTablePath")" mv ./functions/library.md.in ./functions/library.md @@ -71,8 +66,8 @@ stdenvNoCC.mkDerivation { --replace-fail '@MANUAL_VERSION@' '${lib.version}' mkdir out + cp ${optionsMD} out/options.md mv preface.chapter.md out/index.md - mv options.md out/ mv build-helpers out/build-helpers mv build-helpers.md out/build-helpers/index.md mv development out/development @@ -89,7 +84,6 @@ stdenvNoCC.mkDerivation { mv stdenv.md out/stdenv/index.md mv using out/using-nixpkgs mv using-nixpkgs.md out/using-nixpkgs/index.md - cp ${optionsJSONFile} out/options.json pushd out find . -type f -exec perl -pi -e 's/\s*:::{.note}\n/!!! note\n\ \ /' {} \; find . -type f -exec perl -pi -e 's/\s*:::{.warning}\n/!!! warning\n\ \ /' {} \; diff --git a/packages/nixpkgs-manual/options-doc.nix b/packages/nixpkgs-manual/options-doc.nix deleted file mode 100644 index 3cbceaa..0000000 --- a/packages/nixpkgs-manual/options-doc.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, inputs, ... }: -let - inherit (pkgs.lib) hasPrefix removePrefix; -in