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
xscreensaver: update from 5.26 to 5.29
Bump Logstash to 1.4.2
haskell-data-fix: new package
Update SBV to v3.1
gbdfed: add package 1.6
keybinder-3.0: Add package

keybinder-3.0 is for GTK+ 3, whereas keybinder (already in nixpkgs) is
for GTK+ 2.

This adds version 0.3.0 of keybinder-3.0, which we named "keybinder3" in
nixpkgs to (hopefully) lessen the confusion about what is package name
and what is version number.

[Bjørn: extend commit message beyond summary line]
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.
twister: Add new package, version 0.9.22.

This includes another source-only derivation for the web interface (and
patches the path into the twister binary), so there shouldn't be a need
to move it into ~/.twister/html separately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Merge pull request #3232 from peti/haskell-updates

Update default Haskell compiler to GHC 7.8.3 (and other stuff)
Merge pull request #3259 from MP2E/sbv31_update

Update SBV to v3.1
finalterm: Add package
conky: Link against GCC runtime library.

This is needed for Conky to shut down cleanly, because it relies on
pthread_cancel() to work.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
haskell-zippers: new expression
haskell-ghc-mod: revert a recent change I made
ncmpc: updated to version 0.23.
pythonPackages.logster: New expression