nixpkgs/nixos/modules/services/x11/display-managers
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
..
lightdm-greeters tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
auto.nix
default.nix nixos/xserver: fix X.org session script logging 2017-11-27 11:29:37 +01:00
gdm.nix tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
lightdm.nix LightDM: Set default user session when possible. 2018-03-04 23:54:09 +00:00
sddm.nix nixos/xserver: fix X.org session script logging 2017-11-27 11:29:37 +01:00
slim.nix nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
xpra.nix nixos/xserver: fix X.org session script logging 2017-11-27 11:29:37 +01:00