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: 26dfb4f86b49
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1326d6432ab0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 1, 2019

  1. Revert "nixos/desktop-managers/xterm: Disable by default" 

    This reverts commit f140dfb.
This reverts commit cf56cef.
This reverts commit 456c42c.
    @matthewbauer
    matthewbauer committed Oct 1, 2019
    Copy the full SHA
    eafcb18 View commit details

Commits on Oct 5, 2019

  1. Merge pull request #70185 from NixOS/revert-67355-19.09 

    Revert "nixos/desktop-managers/xterm: Disable by default" [19.09]
    @peti
    peti authored Oct 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1326d64 View commit details
Showing with 2 additions and 6 deletions.
  1. +0 −5 nixos/doc/manual/release-notes/rl-1909.xml
  2. +2 −1 nixos/modules/services/x11/desktop-managers/xterm.nix
5 changes: 0 additions & 5 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Original file line number Diff line number Diff line change
@@ -870,11 +870,6 @@
The old deprecated <literal>emacs</literal> package sets have been dropped. What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
</para>
</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.
</para>
</listitem>
<listitem>
<para>
The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules.
3 changes: 2 additions & 1 deletion nixos/modules/services/x11/desktop-managers/xterm.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ with lib;
let

cfg = config.services.xserver.desktopManager.xterm;
xserverEnabled = config.services.xserver.enable;

in

@@ -13,7 +14,7 @@ in

services.xserver.desktopManager.xterm.enable = mkOption {
type = types.bool;
default = false;
default = xserverEnabled;
defaultText = "config.services.xserver.enable";
description = "Enable a xterm terminal as a desktop manager.";
};