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

..

filesystems

Mount unionfs-fuse filesystems using the normal fileSystems option

2014-07-30 16:04:15 +02:00

cpu-freq.nix

…

encrypted-devices.nix

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

filesystems.nix

Mount unionfs-fuse filesystems using the normal fileSystems option

2014-07-30 16:04:15 +02:00

kbd.nix

…

lvm.nix

…

network-interfaces.nix

…

scsi-link-power-management.nix

…

swraid.nix

…

trackpoint.nix

Add activationScript for TrackPoint configuration

2014-07-28 23:33:05 +02:00

tty-backgrounds-combine.sh

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00