haskell-snaplet-acid-state: jailbreak to fix build with recent versions of 'text'
haskell-hspec-wai: does not compile because hspec2 is broken
R-wrapper: update list of recommended packages
R: run the test suite only when recommended packages are built
all-packages.nix: strip trailing whitespace
haskell-filestore: disable the test suite to fix build

It depends on external utilities, like Mercurial.
haskell-packages.nix: fix attribute names for hsc3-related packages
haskell-hsc3-lang: add missing override for 7.2.x
idris: jailbreak to fix build with recent version of 'lens'
focuswriter: added expression
nlopt: update to version 2.4.2 and add a proper meta section
r-Defaults: add version 1.1-1 again

The package is obsolete, but I still need it. :-(
nix-daemon: add maxCores option
Merge pull request #4750 from abbradar/nix-maxcores

Add buildCores option to nix
haskell-defaults.nix: build 'entropy' with a recent version of Cabal on older platforms
nixos: Try to show an helpful message when the user sets config. or options.

Feel free to improve or remove :-)
pbzip2: update package
lbzip2: add package
gitolite: add dataDir
Merge pull request #4773 from abbradar/gitolite-home

gitolite: 'dataDir' option