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
..
config	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
hardware	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	demo: autologin through xserver	2018-03-05 14:48:01 -06:00
misc	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
profiles	demo: autologin through xserver	2018-03-05 14:48:01 -06:00
programs	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
security	Revert "Merge branch 'setuid-wrapper-readlink'"	2018-03-07 17:09:05 -05:00
services	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
system	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
tasks	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
module-list.nix	Merge #35454: nixos/pump.io: remove	2018-03-04 10:49:25 +01:00
rename.nix	nixos/piwik: rename to matomo	2018-02-22 22:03:55 +01:00