From 7bd59cb10c9b116933ce2a26baf390008e2e9d58 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Thu, 23 Nov 2023 23:18:27 +0900 Subject: [PATCH] docs: update paths to make manual tests pass --- docs/home-manager-manual.nix | 2 +- docs/html-open-tool.nix | 2 +- tests/modules/misc/manual/manual.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/home-manager-manual.nix b/docs/home-manager-manual.nix index ee98f3f2b..a4c94ea99 100644 --- a/docs/home-manager-manual.nix +++ b/docs/home-manager-manual.nix @@ -1,6 +1,6 @@ { stdenv, home-manager-render-docs, optionsDoc, lib, documentation-highlighter , nmd, revision, home-manager-options }: -let outputPath = "share/docs/home-manager"; +let outputPath = "share/doc/home-manager"; in stdenv.mkDerivation { name = "nixpkgs-manual"; diff --git a/docs/html-open-tool.nix b/docs/html-open-tool.nix index 081616dd9..9cdd27601 100644 --- a/docs/html-open-tool.nix +++ b/docs/html-open-tool.nix @@ -18,7 +18,7 @@ let echo "$0: unable to start a web browser; please set \$BROWSER" exit 1 else - exec "$BROWSER" "${html}/share/docs/${pathName}/index.html" + exec "$BROWSER" "${html}/share/doc/${pathName}/index.html" fi ''; diff --git a/tests/modules/misc/manual/manual.nix b/tests/modules/misc/manual/manual.nix index eb70374a3..c7f67a517 100644 --- a/tests/modules/misc/manual/manual.nix +++ b/tests/modules/misc/manual/manual.nix @@ -12,8 +12,8 @@ assertFileExists home-path/share/doc/home-manager/index.html assertFileExists home-path/share/doc/home-manager/options.html assertFileExists home-path/share/doc/home-manager/options.json - assertFileExists home-path/share/man/man1/home-manager.1.gz - assertFileExists home-path/share/man/man5/home-configuration.nix.5.gz + assertFileExists home-path/share/man/man1/home-manager.1 + assertFileExists home-path/share/man/man5/home-configuration.nix.5 ''; }; }