Tuomas Tynkkynen 8c4aeb1780 Merge staging into master ... Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix		2016-09-01 13:27:27 +03:00
..
config	Merge staging into master	2016-09-01 13:27:27 +03:00
hardware	Merge branch 'master' into staging	2016-08-21 12:03:41 +01:00
i18n/input-method	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
installer	nixos-install: remove manifest related stuff	2016-08-24 16:09:30 +01:00
misc	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
profiles	documentation: fix start display-manager command	2016-07-04 10:25:31 +02:00
programs	nixos/shadow: setuid wrappers for new{uid,gid}map	2016-08-19 14:59:33 +02:00
security	Merge staging into master	2016-09-01 13:27:27 +03:00
services	Merge pull request #18152 from roblabla/bugfix-zeroTierOneConfigurablePackage	2016-08-31 12:34:59 +01:00
system	Fixes #14831 by using full path for binaries used in install-grub.pl	2016-09-01 10:36:38 +02:00
tasks	nixos/filesystems: Drop compat code for filesystems.*.options type	2016-09-01 12:18:33 +03:00
testing	KDE test: Bump kdm start timeout	2016-05-27 11:22:27 +02:00
virtualisation	Don't break grow-partition	2016-08-31 03:06:46 +00:00
module-list.nix	ferm: init at 2.3	2016-08-25 21:37:19 +02:00
rename.nix	nixos/modules/rename.nix: fix eval error	2016-08-28 14:47:24 +01:00