Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
config	Merge branch 'master' into staging	2014-11-10 10:03:52 +01:00
hardware	ati_unfree: Update nixos-manual for AMD driver support	2014-09-07 12:42:32 +10:00
installer	Revert "nixos: iso-image: use syslinux bootloader for USB booting support"	2014-11-08 14:33:27 +01:00
misc	i2pd: added package, service	2014-11-09 09:55:35 +01:00
profiles	jfsrec: Remove derivation	2014-11-02 17:22:27 -08:00
programs	Add "light" package and setuid wrapper	2014-11-09 19:45:43 -07:00
security	sudo: allow adding extra configuration options to the bottom of sudoers	2014-11-02 13:27:05 +01:00
services	Merge branch 'master' into staging	2014-11-10 10:03:52 +01:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
tasks	nixos: move bcache udev rule in a new bcache.nix module	2014-11-10 22:19:43 +01:00
testing	nixos: Fix priorities of initialHashedPassword.	2014-11-04 05:19:07 +01:00
virtualisation	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
module-list.nix	nixos: move bcache udev rule in a new bcache.nix module	2014-11-10 22:19:43 +01:00
rename.nix	Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""	2014-11-06 21:59:04 +01:00