without these two settings my USB dvb-t stick doesn't work
Add libgit2, pygit2 and powerline beta
updated firmware-linux from 0.36-to-0.38
Revert "Revert "Revert "Revert "overrideDerivation: Simplify""""

This reverts commit abf2d3677382bb93b989528cc6ed71ac6d5bd3b8.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all outputs""

This reverts commit 18df66f4666c0a2d5a3fa6d6660076e5af5f6af5.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
runInLinuxImage: Fix derivation overriding.

This only ever worked because runInLinuxVM happened to call
overrideDerivation, which itself erroneously passed arbitrarily-added
attributes to the new call to derivation.

Hopefully this time Eelco won't have to revert my change ;)

Signed-off-by: Shea Levy <shea@shealevy.com>
Fix hash for linux 3.2.45
mercurial: Update to 2.6.1

Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
cacert: Update to 20121229
linux: Re-enable the memory resource controller

We accidentally lost this in Linux >= 3.5 because the kernel options
were renamed.  (Probably an argument for not using "?" in the kernel
config...)
Merge pull request #519 from offlinehacker/powerline2

Add powerline beta, libgit2 and pygit2
Merge pull request #527 from qknight/firmware-linux-0.36-to-0.38

updated firmware-linux from 0.36-to-0.38
let hydra mirror unfree firmware
pg8000: upgrade to 1.09 to support postgresql 9.1/9.2
fetchUrl: add curlOpts parameter (merge #535)
oracle jdk/jre: use requireFile instead of fetchurl (merge #537)

The user has to accept the EULA nowadays on the oracle website.
pg8000: fix url
added mocha: simple, flexible, fun test framework for JavaScript and its dependencies
Merge pull request #505 from MarcWeber/submit/linux-3.8-dvb-support

without these two settings my USB dvb-t stick doesn't work
Added assert: Node.JS assert module and its dependencies