Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
config	Merge branch 'master' into staging	2014-11-10 10:03:52 +01:00
hardware
installer	Re-enable ZFS in installer image	2014-11-13 10:31:15 +01:00
misc	Add dnscrypt-proxy service	2014-11-11 22:47:19 +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-14 14:28:23 +01:00
system	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
tasks	nixos: Add system-wide option to set the hostid	2014-11-12 22:31:49 +01:00
testing	nixos: Fix priorities of initialHashedPassword.	2014-11-04 05:19:07 +01:00
virtualisation	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
module-list.nix	Merge pull request #4950 from joachifm/dnscrypt-proxy	2014-11-13 00:25:05 +03:00
rename.nix	Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""	2014-11-06 21:59:04 +01:00