Vladimír Čunát 30f31c9afc Merge 'master' into staging ... (relatively simple conflicts)		2015-04-26 22:52:08 +02:00
..
config	Remove sysvtools from the system path	2015-04-20 11:33:42 +02:00
hardware	nvidia: 346.47 -> 346.59	2015-04-07 13:24:55 -07:00
installer	Don't include ntfs-3g by default	2015-04-19 22:06:45 +02:00
misc	Remove fixed uids for nscd, sshd	2015-04-19 22:06:45 +02:00
profiles	minimal.nix: Get rid of most Glibc locales	2015-04-20 11:32:28 +02:00
programs	Use "mkdir -p" when creating ~/.nix-defexpr	2015-04-20 13:03:04 +02:00
security	Merge pull request #7149 from joachifm/grsec-gradm-optional	2015-04-13 17:11:29 -05:00
services	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
system	Fix #7476	2015-04-20 11:32:29 +02:00
tasks	Typo	2015-04-20 16:12:28 +02:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Disable some more unnecessary stuff in containers	2015-04-20 11:32:28 +02:00
module-list.nix	Add hologram service	2015-04-23 14:30:12 -04:00
rename.nix	Make environment.checkConfigurationOptions an alias	2015-04-10 16:11:07 +02:00