Merge pull request #68363 from worldofpeace/xterm-stateversion

nixos/xterm: stateVersion disable by default
This commit is contained in:
adisbladis 2019-09-09 18:50:20 +01:00 committed by GitHub
commit b8f2f6ff9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -449,8 +449,9 @@
</listitem>
<listitem>
<para>
<option>services.xserver.desktopManager.xterm</option> is now disabled by default.
It was not useful except for debugging purposes and was confusingly set as default in some circumstances.
<option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher.
Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to
have any desktopManager enabled default.
</para>
</listitem>
<listitem>

View file

@ -13,8 +13,7 @@ in
services.xserver.desktopManager.xterm.enable = mkOption {
type = types.bool;
default = false;
defaultText = "config.services.xserver.enable";
default = (versionOlder config.system.stateVersion "19.09");
description = "Enable a xterm terminal as a desktop manager.";
};