Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos: fix fallout from #46193 #47298

Merged
merged 2 commits into from
Sep 25, 2018
Merged

nixos: fix fallout from #46193 #47298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c0cced
nixos: doc: nixos-manual: fix assert
oxij Sep 24, 2018
1a6ce11
nixos: doc: fix minimal profile and installer configs
oxij Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/profiles/installation-device.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ with lib;
config = {

# Enable in installer, even if the minimal profile disables it.
documentation.nixos.enable = mkForce true;
documentation.enable = mkForce true;

# Show the manual.
services.nixosManual.showManual = true;
Expand Down
1 change: 0 additions & 1 deletion nixos/modules/profiles/minimal.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ with lib;
i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];

documentation.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;

sound.enable = mkDefault false;
}
7 changes: 5 additions & 2 deletions nixos/modules/services/misc/nixos-manual.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

with lib;

let cfg = config.services.nixosManual; in
let
cfg = config.services.nixosManual;
cfgd = config.documentation;
in

{

Expand Down Expand Up @@ -44,7 +47,7 @@ let cfg = config.services.nixosManual; in
config = mkIf cfg.showManual {

assertions = [{
assertion = config.documentation.nixos.enable;
assertion = cfgd.enable && cfgd.nixos.enable;
message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`";
}];

Expand Down