Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7256d10d009a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b8f2f6ff9d42
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 9, 2019

  1. nixos/xterm: stateVersion disable by default

    @worldofpeace
    worldofpeace committed Sep 9, 2019
    Copy the full SHA
    456c42c View commit details

  2. Merge pull request #68363 from worldofpeace/xterm-stateversion 

    nixos/xterm: stateVersion disable by default
    @adisbladis
    adisbladis authored Sep 9, 2019
    Copy the full SHA
    b8f2f6f View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −2 nixos/doc/manual/release-notes/rl-1909.xml
  2. +1 −2 nixos/modules/services/x11/desktop-managers/xterm.nix
5 changes: 3 additions & 2 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions nixos/modules/services/x11/desktop-managers/xterm.nix
View file
Original file line number Diff line number Diff line change
@@ -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.";
};