Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
config	Add automatic plugin activation for vim	2014-07-15 14:59:15 +02: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	polipo: new service expression	2014-07-16 11:29:40 -04:00
profiles	nixos: f2fs filesystem module support (close #2085)	2014-05-11 13:53:26 +02:00
programs	Fix info command	2014-07-08 15:19:08 +02:00
security	Fix repeated typo	2014-07-11 23:14:53 -04:00
services	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
tasks	Merge remote-tracking branch 'origin/master' into staging	2014-07-07 13:16:26 +02:00
testing	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
virtualisation	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
module-list.nix	nixos/module-list.nix: keep it sorted	2014-07-16 22:16:34 +02:00
rename.nix	Remove the option ‘programs.bash.enable’	2014-04-29 19:00:39 +02:00