Move the compose-cache code from kde4 to xsession since it is supposedly useful for all X-based stuff.
Fix description for PowerManagement units.
Add elasticsearch, a powerful open source search and analytics engine
minidlna: Start after networking.target.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Merge pull request #235 from the-kenny/fix-minidlna

minidlna: Start after networking.target.
merge
do not activate hybrid-sleep during config switches
Openbox
Merge pull request #239 from NixOS/openbox

Openbox
Fix typo and incorrect package name
Bump the NixOS version

July was a bit optimistic for a release :-)
Execute NixOS VM tests on a separate machine
Merge pull request #240 from ivan/typo-fix-2

Fix typo and incorrect package name
fixiup zfs binaries in initrd

Previously, the zfs binaries were put in $out/sbin where the stage-1
patchelf wouldn't fix them up. This would fail the allowedReferences
test.

Move the zfs binaries to $out/bin.
Remove reference to non-existant config.tests
Update all legacy-style modules

I.e., modules that use "require = [options]".  Nowadays that should be
written as

  {
    options = { ... };
    config = { ... };
  };

Also, use "imports" instead of "require" in places where we actually
import another module.
Get firmware from lib/firmware
types.list -> types.listOf
Add services.samba.nsswins option

This option allows for seamless WINS/NetBIOS name lookup, using
nsswitch.
Merge pull request #247 from bjornfor/wins-nsswitch

Add services.samba.nsswins option