diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 17:48:14 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 17:48:14 +0200 |
commit | 644c9eb6f761468e05c58275d2e37d9795c8132e (patch) | |
tree | a911b6878cc5ecb04cb72bd51f91a593532f1ab3 /nixos/modules/services/x11/desktop-managers/default.nix | |
parent | 4cbf520bfe20a55f22cd4226df952cce0367acf9 (diff) | |
download | nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.tar nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.tar.gz nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.tar.bz2 nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.tar.lz nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.tar.xz nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.tar.zst nixlib-644c9eb6f761468e05c58275d2e37d9795c8132e.zip |
Revert "Merge #3054: add kde 4.13.2"
This is due to breaking evaluation; see the PR discussion. This reverts commit 6a77d5fd3e3eef8c9eafb53f70a9448c25d2f517, reversing changes made to 07a09fbe63192de7b62468d38f7ed8b7981062a4. Conflicts: nixos/modules/services/x11/desktop-managers/default.nix
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/default.nix')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 7ca3b3c8f7a4..c62beca60d84 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # 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 + ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix ]; |