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.
Merge remote-tracking branch 'upstream/master'