Vladimír Čunát 5979d428b4 Merge recent master into x-updates ... Hydra: ?compare=1134869 Conflicts (just meta): pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix		2014-07-09 22:13:29 +02:00
..
config	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
hardware	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
installer	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
misc	Merge remote-tracking branch 'nixos/master' into feature/add-znc-module	2014-07-03 11:30:11 -05:00
profiles
programs	Merge pull request #3079 from wmertens/patch-4	2014-07-03 15:05:05 +02:00
security	nixos/pam: make pam_loginuid optional if in container	2014-06-30 11:08:39 +02:00
services	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
system	Implement per-user socket units	2014-06-20 17:41:14 -04:00
tasks	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
testing	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
virtualisation	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
module-list.nix	Merge remote-tracking branch 'nixos/master' into feature/add-znc-module	2014-07-03 11:30:11 -05:00
rename.nix