Arseniy Seroka fd5566da41 Merge pull request #5080 from joachifm/dnscrypt-refactor ... dnscrypt-proxy: minor superficial improvements		2014-11-24 15:48:47 +03: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	Merge pull request #4639 from lethalman/installer-nm	2014-11-21 22:29:10 +01:00
misc	nixos: add docker-registry module	2014-11-22 12:16:41 +01:00
profiles	jfsrec: Remove derivation	2014-11-02 17:22:27 -08:00
programs	ssh-agent: use types.nullOr	2014-11-15 12:33:01 +01:00
security	grsecurity: Update assertion msg to correct major kernel versions	2014-11-16 18:52:39 +01:00
services	Merge pull request #5080 from joachifm/dnscrypt-refactor	2014-11-24 15:48:47 +03:00
system	stage-1: fix hibernation for device node symlinks	2014-11-15 21:44:37 +02: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	containers: remove obsolete comment	2014-11-23 12:30:03 +01:00
module-list.nix	nixos: add docker-registry module	2014-11-22 12:16:41 +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