buildNodePackage: add shell hook for development
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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/
haskell-stm-containers: add package version 0.1.2 and its dependencies
Bump Logstash to 1.4.2
gbdfed: add package 1.6
nixos/znc-service: don't use types.string (it's deprecated)

Apart from s/types.string/types.str/ (or types.lines where appropriate):

* port is changed from string to int.

* extraFlags is changed from types.string (with unfortunate merge
  semantics) into a list of strings. A list of strings merge better:
  one space is added between elements.
ncmpc: updated to version 0.23.
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Install all dirs for logstash

Also only patch shebangs in bin/ directory
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
vagrant: upgrade to 1.6.3
Package for Open Sans fonts.
Consistently use the package name opensans-ttf everywhere.
oraclejdk: bump to 8u11
Enable expressions for 'important' parts of the rest framework from Silk.co
arcanist: 20140627 -> 20140717

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Merge pull request #3303 from taku0/oraclejdk8_11

oraclejdk: bump to 8u11