nixpkgs/nixos/modules/services/x11/desktop-managers
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
..
default.nix e19: rename to enlightenment, drop old one 2016-03-12 03:10:37 +03:00
enlightenment.nix makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
gnome3.nix xsession: make updating DBus environment optional 2016-04-25 23:37:18 +02:00
kde4.nix Revert "pulseaudio: select correct outputs" 2016-04-28 17:06:09 +03:00
kde5.nix kde5: don't install GStreamer modules system-wide 2016-04-30 12:22:01 -05:00
kodi.nix Remove all explicit assignments of desktopManagerHandlesLidAndPower 2015-09-04 09:34:15 -06:00
none.nix Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
xfce.nix xsession: make updating DBus environment optional 2016-04-25 23:37:18 +02:00
xterm.nix Rewrite ‘with pkgs.lib’ -> ‘with lib’ 2014-04-14 16:26:48 +02:00