diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-09-25 09:00:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 09:00:43 +0000 |
| commit | 61abf3bbd9154d6b25234a877272d158144709ff (patch) | |
| tree | ac960e7ba09025270109a0d2bc1adafc98f1bd70 /nixos/modules | |
| parent | 4335a9279e684101c78bdbe6ad52cbf7fd5b1496 (diff) | |
| parent | 1a6ce11518af319e6029863a7f220c071ce5b467 (diff) | |
| download | nixlib-61abf3bbd9154d6b25234a877272d158144709ff.tar nixlib-61abf3bbd9154d6b25234a877272d158144709ff.tar.gz nixlib-61abf3bbd9154d6b25234a877272d158144709ff.tar.bz2 nixlib-61abf3bbd9154d6b25234a877272d158144709ff.tar.lz nixlib-61abf3bbd9154d6b25234a877272d158144709ff.tar.xz nixlib-61abf3bbd9154d6b25234a877272d158144709ff.tar.zst nixlib-61abf3bbd9154d6b25234a877272d158144709ff.zip | |
Merge pull request #47298 from oxij/nixos/doc-in-installer
nixos: fix fallout from #46193
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/profiles/installation-device.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/profiles/minimal.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 7 |
3 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 22d1af426948..9c84d267a334 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -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; diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index dd81e61460cf..138eda117c74 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -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; } diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 023a933fd893..7202269d3421 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -6,7 +6,10 @@ 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 { assertions = [{ - assertion = config.documentation.nixos.enable; + assertion = cfgd.enable && cfgd.nixos.enable; message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`"; }]; |