buildNodePackage: add shell hook for development
fix openjdk url for Darwin
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed settings issue.

The following warning was shown when I clicked on links:
'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.'
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/
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.
linux: Update to 3.12.24

CVE-2014-4508, CVE-2014-0206.
libxklavier: fix not finding xkbcomp (fixes #3173)

Also refactor the expression a bit,
and add description+license.
xfce4-xkb-plugin: maintenance update
Add mp3splt
Merge pull request #3206 from bosu/mp3splt

Add mp3splt: utility to split mp3 files
dwb: add wrapper and use GTK2 for plugin support
ncmpc: update to version 0.22
New pkg: riemann-c-client version 1.1.1

A C client library for the Riemann monitoring system
New pkg: syslog-ng-incubator

A collection of tools and modules for syslog-ng
nixos: add 'firebird' group

The firebird module complains without missing 'firebird' group, add it.
Update direnv to v2.4.0
added lua-sec-0.5
elasticsearch: fix darwin build