buildNodePackage: add shell hook for development
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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.
Package for Open Sans fonts.
Consistently use the package name opensans-ttf everywhere.
Enable expressions for 'important' parts of the rest framework from Silk.co
Merge remote-tracking branch 'upstream/master'
Add virtualenvwrapper and its dependencies
Add SpiderOak secure backup service.
Revert "titanium: Bump to 3.3.0"

This reverts commit 4426b8a3a1cbab80291bee8769e15f601b62725c. It
causes an infinite recursion during Nixpkgs evaluation:

http://hydra.nixos.org/build/12608698

(@svanderburg)
haskell-codex: jailbreak due to circular dependency

It seems the codex-0.1.0.2 build requires 0.1.0.1.