nixos/installer: include a substitutable copy of the manual#210966
nixos/installer: include a substitutable copy of the manual#210966pennae wants to merge 1 commit into
Conversation
the manual included in the installer can't be used for substitution in the installed system because it includes installer options that are most likely not available in the final system. add another copy of the manual built from a minimal config to the installer for exactly such substitution. given this we can also reenable documentation in the installer tests, they'll copy the newly included version of the manual instead of trying to build it from scratch.
Can you give an example? Shouldn't these options just be marked invisible? |
the isoImage hierarchy is probably the most common. we could mark them all invisible, but that feels like even more of a hack than including two version of the manual. (and would make their docs a whole lot harder to discover, which is already not that easy) |
|
Ah. Perhaps we should go the other way around then, and add the installer profiles here:? nixpkgs/nixos/modules/module-list.nix Line 1379 in 7d3f763 |
|
not entirely sure, to be honest? installer options will be mostly useful for people hacking on the installer, not for more general use. unlike the qemu options that are very useful for dunno. don't want to decide this; we'd just add the appropriate manual to the installer as it seems to be the least fragile and most contained option. |
|
Why close? I'm still investigating this |
|
turns out we went in the completely wrong direction this is only a problem with the tests, not with the actual installer. 🤦 tests have a different modules tree, which is picked up by the manual build when options are referenced as |
|
OK, here's what I've discovered:
So it seems like the obvious fix for the ISO is to reënable Not sure about the tests. |
|
non-minimal installers have documentation enabled: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/installation-device.nix#L26. |
|
|
|
oh, yeah. hadn't thought to check for HTML, only for the manpages. including HTML as well would definitely make sense, yes. |
Description of changes
the manual included in the installer can't be used for substitution in the installed system because it includes installer options that are most likely not available in the final system. add another copy of the manual built from a minimal config to the installer for exactly such substitution.
given this we can also reenable documentation in the installer tests, they'll copy the newly included version of the manual instead of trying to build it from scratch.
Things done
x86_64-darwinaarch64-darwinsandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes