Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-04-03 11:01:57 +00:00
..
config	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
hardware	opengl.extraPackages32: pkgsi686Linux in example	2016-03-26 00:50:56 +11:00
i18n/inputMethod	fcitx: show available engines in module description	2016-02-28 07:12:55 -06:00
installer	nixos-generate-config.pl: correct path for broadcom-43xx	2016-03-31 23:47:20 +01:00
misc	mfi: init at 2.1.11	2016-04-01 02:45:11 -07:00
profiles	Fix the boot-ec2-config test	2016-03-30 22:22:40 +02:00
programs	ssh: Fix support for ssh-dss host keys	2016-04-01 15:54:52 +02:00
security	fix installer tests #13559	2016-03-12 20:19:40 +00:00
services	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
system	Revert "initrd: Use modprobe from busybox"	2016-04-01 17:39:09 +02:00
tasks	Remove setting non-existent sysctl options	2016-03-15 17:44:30 +01:00
testing	test-instrumentation.nix: Only clear $PAGER in the backdoor shell	2016-02-23 11:56:09 +01:00
virtualisation	Move the EC2 AMI registry from the NixOps repo	2016-03-31 14:16:51 +02:00
module-list.nix	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
rename.nix	services.xserver.startGnuPGAgent: remove obsolete NixOS option	2016-03-18 11:06:31 +01:00