Merge pull request #2913 from sol/master

Update haskell-hspec2 to version 0.3.3
fix licenCe typos
Merge recent master
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
haskell-crypto-numbers: disable the test suite to avoid spurious build failures

https://github.com/vincenthz/hs-crypto-numbers/issues/8
Merge pull request #2380 from wkennington/cache.search

network-interfaces: Add an option for specifying search to resolv.conf
Merge pull request #2479 from urv/master

upgraded calibre & scummvm and added haskel-monad-parallel nix expression
Merge pull request #2543 from wizeman/u/zramswap

nixos: Add zram swap module
Merge pull request #2063 from redbaron/libmsgpack

Proper separation between build and runtime outputs
nsd: add package version 4.0.3
nsd-service: add service module for nsd
Merge pull request #2914 from hrdinka/nsd-package

nsd: add package version 4.0.3
Merge pull request #2915 from hrdinka/nsd-service-module

nsd-service: add service module for nsd
Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691.
haskellPackages.hedis: New expression
Merge pull request #2882 from iyzsong/n/xmp

add xmp, a extended module player
haskellPackages.snapletRedis: New expression

This needs to be jailbroken until a new version reaches Hackage.