Robert Schütz 18774d4173 Merge branch 'master' into staging		2018-07-15 12:31:18 +02:00
..
config	Merge pull request #42569 from spacefrogg/nscd-fix	2018-07-05 22:16:02 -04:00
hardware	raspberrypiWirelessFirmware: init	2018-07-12 17:02:32 +03:00
i18n/input-method	options.i18n.inputMethod.package: fix type (#43239)	2018-07-09 22:37:27 +02:00
installer	sdImage: make partition ID/UUID configurable	2018-07-12 17:02:03 +03:00
misc	Merge pull request #42798 from flokli/users-users	2018-07-02 11:23:10 +00:00
profiles	nixos/modules: users.(extraUsers|extraGroup->users|group)	2018-06-30 03:02:58 +02:00
programs	firejail: add nixos module	2018-07-14 20:21:41 +08:00
security	Merge pull request #42845 from ivanbrennan/nixos-sudo-describe-rules-precedence	2018-07-02 23:55:56 +00:00
services	Merge branch 'master' into staging	2018-07-15 12:31:18 +02:00
system	Merge pull request #43169 from samueldr/fix/stripDirs	2018-07-14 19:07:46 -04:00
tasks	networking: Fix timeout when lo has aliased IPs	2018-07-06 15:38:52 -04:00
testing	nixos/modules: users.(extraUsers|extraGroup->users|group)	2018-06-30 03:02:58 +02:00
virtualisation	nixos/virtualbox: Adds more options to virtualbox-image.nix (#42699)	2018-07-11 19:45:10 +02:00
module-list.nix	Merge pull request #43511 from peterhoeg/m/firejail	2018-07-14 21:04:11 +08:00
rename.nix	nixos: remove option services.xserver.desktopManager.xfce.screenLock	2018-07-12 01:45:41 +00:00