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

cpufreq: Don't fail if the CPU doesn't support frequency setting

2014-04-28 19:13:04 +02:00

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

Allow upstream systemd units to be extended

2014-04-17 18:52:31 +02:00

lvm.nix

Don't enable LVM2 in containers

2014-04-15 23:43:39 +02:00

network-interfaces.nix

network-interfaces: Add an option for specifying search to resolv.conf

2014-05-02 12:42:20 -05:00

scsi-link-power-management.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

swraid.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

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