nixpkgs/nixos/modules
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	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-08-02 05:08:07 +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 recent master into x-updates 2014-08-02 05:08:07 +02:00
system modprobe.nix: Use modern environment.etc syntax 2014-07-31 22:09:51 +02:00
tasks Mount unionfs-fuse filesystems using the normal fileSystems option 2014-07-30 16:04:15 +02:00
testing Get all lib functions from lib, not pkgs.lib, in modules 2014-07-02 12:28:18 -04:00
virtualisation amazon-image.nix: Overwrite busybox swapon 2014-08-01 17:55:37 -04:00
module-list.nix nixos: tmp on tmpfs option 2014-07-30 16:19:26 +02:00
rename.nix Remove the option ‘programs.bash.enable’ 2014-04-29 19:00:39 +02:00