public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47298 from oxij/nixos/doc-in-installer

Browse Source 
nixos: fix fallout from #46193
This commit is contained in:
Michael Raskin 2018-09-25 09:00:43 +00:00 committed by GitHub
commit 61abf3bbd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/profiles/installation-device.nix
View File

@ -22,7 +22,7 @@ with lib;
config = { config = {
# Enable in installer, even if the minimal profile disables it. # Enable in installer, even if the minimal profile disables it.
documentation.nixos.enable = mkForce true; documentation.enable = mkForce true;
# Show the manual. # Show the manual.
services.nixosManual.showManual = true; services.nixosManual.showManual = true;

1
nixos/modules/profiles/minimal.nix
View File

@ -12,7 +12,6 @@ with lib;
i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ]; i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
documentation.enable = mkDefault false; documentation.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;
sound.enable = mkDefault false; sound.enable = mkDefault false;
} }

7
nixos/modules/services/misc/nixos-manual.nix
View File

@ -6,7 +6,10 @@
with lib; with lib;
let cfg = config.services.nixosManual; in let
cfg = config.services.nixosManual;
cfgd = config.documentation;
in
{ {
@ -44,7 +47,7 @@ let cfg = config.services.nixosManual; in
config = mkIf cfg.showManual { config = mkIf cfg.showManual {
assertions = [{ assertions = [{
assertion = config.documentation.nixos.enable; assertion = cfgd.enable && cfgd.nixos.enable;
message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`"; message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`";
}]; }];