Vladimír Čunát 3e387c3e00 Merge branch 'staging' ... Darwin isn't in a perfect state, in particular its bootstrap tools won't build which will block nixpkgs channel. But on the whole it seems acceptable.		2016-05-13 10:14:53 +02:00
..
config	Merge branch 'master' into staging	2016-05-12 04:53:38 +02:00
hardware	rtl8723bs-firmware: init, split off from rtl8723bs	2016-04-25 00:41:25 -07:00
i18n/input-method	input methods: fix gtk cache	2016-04-16 17:51:32 +09:00
installer	installer: simple PXE bootable NixOS installer	2016-04-29 10:42:39 +01:00
misc	sniproxy service: init	2016-05-11 13:27:28 +08:00
profiles	treewide: Use correct output in ${config.nix.package}/bin	2016-04-25 16:44:37 +02:00
programs	Merge pull request #14212 from aneeshusa/add-mosh-service	2016-04-18 14:31:59 -07:00
security	grsecurity: add option to disable chroot caps restriction	2016-05-10 16:17:08 +02:00
services	Merge branch 'staging'	2016-05-13 10:14:53 +02:00
system	Merge branch 'master' into staging	2016-05-08 21:24:48 +02:00
tasks	networking module: Add some missing literalExample	2016-04-25 18:15:52 +02:00
testing	test-instrumentation.nix: Only clear $PAGER in the backdoor shell	2016-02-23 11:56:09 +01:00
virtualisation	Merge branch 'pr/14911'	2016-05-05 21:28:27 +01:00
module-list.nix	sniproxy service: init	2016-05-11 13:27:28 +08:00
rename.nix	nixos: remove redundant services.dovecot2.package option	2016-05-06 10:10:06 +02:00