nixpkgs/nixos/modules
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +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 Mount unionfs-fuse filesystems using the normal fileSystems option 2014-07-30 16:04:15 +02:00
misc Upgrade docker to 1.1.2 and add docker module 2014-07-28 21:45:49 +02:00
profiles Remove Subversion from the installation CD 2014-07-30 16:04:15 +02:00
programs Fix info command 2014-07-08 15:19:08 +02:00
security Set $SSL_CERT_FILE 2014-07-28 19:09:32 +02:00
services Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
system Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
tasks Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +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-08-04 16:51:47 +02:00
module-list.nix nixos: tmp on tmpfs option 2014-07-30 16:19:26 +02:00
rename.nix