diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-21 12:05:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-21 12:05:57 +0200 |
| commit | 9b02635faa726b3531675f34ce28787ad1378e73 (patch) | |
| tree | 5401098ac882f8f16b8e3b438747ba305f331b08 /nixos/modules/services/x11/desktop-managers/default.nix | |
| parent | 65ac375aa22f1bbcd01135193d8fc19a5d50bbbd (diff) | |
| parent | cd3ba19ec0d8752dd98c6f3f24aac80ea28426c0 (diff) | |
| download | nixlib-9b02635faa726b3531675f34ce28787ad1378e73.tar nixlib-9b02635faa726b3531675f34ce28787ad1378e73.tar.gz nixlib-9b02635faa726b3531675f34ce28787ad1378e73.tar.bz2 nixlib-9b02635faa726b3531675f34ce28787ad1378e73.tar.lz nixlib-9b02635faa726b3531675f34ce28787ad1378e73.tar.xz nixlib-9b02635faa726b3531675f34ce28787ad1378e73.tar.zst nixlib-9b02635faa726b3531675f34ce28787ad1378e73.zip | |
Merge recent master into x-updates
Hydra: ?compare=1138350 Conflicts: nixos/modules/services/x11/desktop-managers/default.nix Two imports were added independently on the same line. I split it as well, as it was very long now.
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/default.nix')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 5c30d3c0f539..7ca3b3c8f7a4 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -17,7 +17,10 @@ in # Note: the order in which desktop manager modules are imported here # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. - imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix ./e17.nix ./gnome3.nix ./xbmc.nix ]; + imports = [ + ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix + ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix + ]; options = { |