Eelco Dolstra 09d06f5ffd Merge remote-tracking branch 'origin/master' into systemd-219 ... Conflicts: pkgs/development/libraries/libseccomp/default.nix		2015-05-22 15:57:36 +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	nixos-checkout: Add nixpkgs-channels as a remote	2015-05-20 14:16:36 +02:00
misc	Merge pull request #7857 from rushmorem/marathon-module-update	2015-05-21 16:52:14 +03:00
profiles	nixos.system_tarball_pc: Fix evaluation	2015-04-28 17:15:02 +02:00
programs	Add kbdlight package and setuid wrapper	2015-05-11 13:23:01 +08:00
security	grsecurity: Update stable and test patches	2015-05-11 02:45:38 +02:00
services	nixos/tinc: users are system users	2015-05-21 20:11:13 -07:00
system	systemd: Update to 220	2015-05-22 15:34:08 +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	Merge remote-tracking branch 'origin/master' into systemd-219	2015-05-22 15:57:36 +02:00
module-list.nix	nixos: add bird module	2015-05-19 15:42:24 +02:00
rename.nix	Make environment.checkConfigurationOptions an alias	2015-04-10 16:11:07 +02:00