pypi2nix: updated
Plone: fixed Pillow
calibre: really fix building on master

It turns out I hardcoded the output path that qt's tarball extracts.
But that path is versioned (4.8.5 for example).
As I've already merged x-updates on my own system, my qt version was
different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so
now it should work with any 4.8.*
Wrap Erlang scripts to provide missing 'sed' and 'awk'.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Elixir: Fix impurity with Erlang.

The bash scripts of elixir contain some references to `erl'. This
patch wraps the scripts and extends PATH so `erl' is available.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Merge pull request #865 from the-kenny/fix-erlang-elixir

Fix purity of Elixir and Erlang
Merge pull request #863 from errge/lensdatetime

Add lens-datetime haskell library
haskell-distributed-process: drop broken package

distributed-process won't compile, and upstream doesn't accept bug reports
without some elaborate registration procedure.
qemu: Revert to 1.5.2

1.6.0 breaks many VM builds because it gives incorrect RTC values to
the guest.  See

  http://hydra.nixos.org/eval/981543
  http://hydra.nixos.org/eval/981440
Add noHaddock flag to modular-artihmetic

Building of haddock for packages with UTF-8 source is already
fixed in the stdenv-updates branch.  This fixes modular-arithmetic
until that branch is merged.  Will send another pull request to
add back haddock for that branch.

that branch once this is merged.