Revert "haskell-gtkglext: update to version 0.12.5.0"

Because it breaks nixpkgs evaluation:

$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0':
while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13:
infinite recursion encountered

This reverts commit 6ba32aa8bdfd73b6b55d07f270a3f344007ab7cb.
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/
gnome-shell: enable parallel building
evolution-data-server: wrap all libexec executables
Add gnome shell extensions plugin for browsers
numexpr: Define license
tables: Define license
szip: Indentation
szip: Provide meta-data

The license is set to "unfree" as commercial use is not permitted by the
license [1].

[1]: http://www.hdfgroup.org/doc_resource/SZIP/Commercial_szip.html
watchman: new package

This adds `watchman`, a CLI utility that watches files and takes action when
they change.
Merge pull request #2582 from chexxor/feature/add-znc-module

Add ZNC module
empathy: fix icons
telepathy-gabble: build on hydra
Merge pull request #3190 from cstrahan/watchman

watchman: new package
Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2 added. Low/High-level API for git
Merge pull request #3197 from wavewave/gitlib

Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2
Set default kernel to 3.14

It is the latest longterm http://permalink.gmane.org/gmane.linux.kernel/1738612
Update `macvim` package to v7.4.355

MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
haskell-hlibgit2: re-generate with cabal2nix
haskell-gtkglext: re-generate with cabal2nix