Matthew Bauer 84d00355e8 Merge remote-tracking branch 'NixOS/master' into staging		2019-04-23 22:00:42 -04:00
..
config	Merge master into staging-next	2019-04-07 08:33:41 +02:00
hardware	Merge pull request #57337 from peterhoeg/m/logitech	2019-04-03 21:19:56 +08:00
i18n/input-method	docs: format	2018-09-29 20:51:11 -04:00
installer	Merge pull request #59435 from furrycatherder/fix-tarball	2019-04-20 20:58:42 -04:00
misc	Use same user for both prometheus 1 and 2. Use StateDirectory.	2019-03-25 14:49:22 +01:00
profiles	profiles/graphical.nix: Enable pulseaudio for virtualbox appliances	2019-02-22 07:23:59 +01:00
programs	gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas	2019-04-17 13:39:23 -04:00
security	nixos/hardened: split description of allowUserNamespaces into paras	2019-04-21 13:11:25 +02:00
services	Merge remote-tracking branch 'NixOS/master' into staging	2019-04-23 22:00:42 -04:00
system	Merge pull request #49537 from mayflower/stage1-symlink-fix	2019-04-18 17:59:08 +02:00
tasks	cleanup redundant text in modules utilizing mkEnableOption	2019-04-20 14:44:02 +02:00
testing	types.optionSet: deprecate and remove last usages	2019-01-31 00:41:10 +02:00
virtualisation	nixos/virtualbox: Fixes configuration to evaluate	2019-04-22 11:22:00 -04:00
module-list.nix	Merge pull request #55413 from msteen/bitwarden_rs	2019-04-24 00:25:08 +02:00
rename.nix	nixos/prometheus/alertmanager: use DynamicUser instead of nobody	2019-04-10 20:38:40 +02:00