Fix hardcoded paths in ztest
add Vessel, a fluid physics puzzle game.
Need pulseaudio or alsalibs for sound.
patchelf the libraries: they need rpath set for sound to work
Update BLCR to version 0.8.5 Beta 3.
This version extends support to kernels up to version 3.7.1.
According to the authors, despite the "beta" in the version name, this
version should be considered "stable" on non exotic architecture.
linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE

NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for
NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2
and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could
probably be enabled for earlier kernels too.
Merge remote-tracking branch 'upstream/master' into master_clean
Merge branch 'master_clean' of https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
youtube-dl: enable builds by Hydra on Linux and Darwin

youtube-dl is a very short script, but it depends on Pandoc to generate its
documentation, and Pandoc is fairly expensive to build (or download). Offering
binary packages of youtube-dl for Hydra users should remedy the need to install
Pandoc.
Update ufoai to 2.4, clean dependencies and the expression.
Merge pull request #278 from vcunat/vlada/ufoai-notg

Update ufo-ai
uboot: updating the default uboot to 2012.07

This is what I use in the sheevplug, with the provided patches.
The old sheevaplug uboot doesn't understand ubifs.
Updating perl packages NetSSLeay and IOSocketSSL. Upstream removed the old versions
pull screenrc configuration from /etc/screenrc
Merge pull request #280 from aristidb/master

Make Screen read the configuration from /etc/screenrc
Merge pull request #260 from jcumming/vessel.121213

Vessel.121213
Merge pull request #253 from rickynils/fscache

linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
Merge pull request #245 from maggesi/blcr-update

Update BLCR to version 0.8.5 Beta 3.
lib.licenses.proprietary is definitely unfree