Adds merlin

Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
merlin: some cleaning of the derivation
calibre: update from 1.46.0 to 1.47.0
i3: Remove CarpAlways from buildInputs.

Oops, it was a leftover from debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Merge pull request #3188 from vbgl/merlin

Adds merlin
Google Compute image:

Removed the 'wait for GCE metadata service' job, as it was causing
issues with the metadata service (likely some firewall or something).
In stead, use wget with retries (including connection refused) in
stead or curl for fetching the SSH keys. Also made the stdout/-err
of this job appear in the console.
Add a bunch of Hydra dependencies to the channel
freecad: updating to 0.14

I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
Update mumble to 1.2.7.

(Chery picked from release-14.04)
Remove broken flag for xen, build with gcc45.
Add experimental link to proxy to page that does wireless distributions of IPA files
i3: Only enable tests for x86_64-linux.

Right now, tests for i686-linux fail, see:

https://hydra.nixos.org/build/13024964

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Use hyperlink and click action instead of meta refresh
Add tornadokick python package
Fix lib functions taken from pkgs.lib instead of lib in nixos
amazon-image.nix: Overwrite busybox swapon
Merge remote-tracking branch 'upstream/master'