From 1418c986b00d2386baac359ee80e004fdba5083c Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 13 Jun 2023 14:06:38 +0200 Subject: [PATCH] nixos/make-options-doc: remove options postprocessing with everything being rendered from markdown now we no longer need to postprocess any options.xml that may be requested from elsewhere. we'll don't need to keep the module path check either since that's done by optionsJSON now. --- nixos/lib/make-options-doc/default.nix | 13 +- .../postprocess-option-descriptions.xsl | 115 ------------------ 2 files changed, 1 insertion(+), 127 deletions(-) delete mode 100644 nixos/lib/make-options-doc/postprocess-option-descriptions.xsl diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 5cfc24533c2..4ba8a9d95b3 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -178,17 +178,6 @@ in rec { --varlist-id ${lib.escapeShellArg variablelistId} \ --id-prefix ${lib.escapeShellArg optionIdPrefix} \ ${optionsJSON}/share/doc/nixos/options.json \ - options.xml - - if grep /nixpkgs/nixos/modules options.xml; then - echo "The manual appears to depend on the location of Nixpkgs, which is bad" - echo "since this prevents sharing via the NixOS channel. This is typically" - echo "caused by an option default that refers to a relative path (see above" - echo "for hints about the offending path)." - exit 1 - fi - - ${pkgs.libxslt.bin}/bin/xsltproc \ - -o "$out" ${./postprocess-option-descriptions.xsl} options.xml + "$out" ''; } diff --git a/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl b/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl deleted file mode 100644 index 1201c7612c2..00000000000 --- a/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -