network-interfaces: Add an option for specifying search to resolv.conf
nixos: Add zram swap module

This allows you to use the Linux kernel's built-in compressed memory as
swap space functionality.

It is recommended to enable only for kernel 3.14 (which is when zram came out of
the staging drivers area) or higher.
Scatter output hook

This hook allows to scatter files in $out to multiple outputs.
For "bin" and "doc" outputs there are prefefined default masks, but
they can be overriden by setting files_<outname>, for example:

files_bin = [ "/bin/*" "/lib/libexec/" ];

To make an effect hook must be specified in buildInputs.
make use of new extractRuntimeHook
Don't hardcode shell, use $SHELL instead
Add HaXe 3.1.3
add libxmp 4.2.7
add xmp 4.0.7
firefox: bump to 30.0.
nspr: update to 4.10.6

Required for Firefox 30.0.
Update haskell-hspec2 to version 0.3.1
Merge pull request #2911 from sol/master

Update haskell-hspec2 to version 0.3.1
pass: install bash completion script
Update haskell-hspec2 to version 0.3.3

(fixes broken Haddocks)
Merge pull request #2913 from sol/master

Update haskell-hspec2 to version 0.3.3
fix licenCe typos
calibre: upgrade from 1.31.0 to 1.35.0
scummvm: upgrade from 1.2.1 to 1.6.0
haskell-cabal2nix: update to version 1.63
Merge pull request #2907 from falsifian/firefox_30

Firefox 30.0