haskell-data-fix: re-generate with cabal2nix
haskell-cabal2nix: update to version 1.65
Install all dirs for logstash

Also only patch shebangs in bin/ directory
spin: update from 5.1.7 to 6.3.2, clean up and fetch sources as a different user agent (the default curl agent string is blocked)
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
vagrant: upgrade to 1.6.3
glib: Fix compilation on Darwin and use default gcc

http://hydra.nixos.org/build/12458779
junixsocket: Fix build on Darwin
Add expressions for Haskell engine-io, engine-io-snap and socket-io
openjdk-darwin: Update to 7u60b30
ecj: Build on Darwin
jdiskreport: Update to 1.4.1
haskellPackages.digestiveFunctorsAeson: Update to 1.1.10
Added jmacro-*
Revert "Set default kernel to 3.14"

Go back to 3.12 pending resolution of #3214.

This reverts commit 8f33899dd220f3247496c96394dd49f76fe9c2ee.
Merge remote-tracking branch 'origin/master' into staging
libcredis: new package

libcredis is a client library for Redis (key-value database).

(libcredis is an optional dependency of collectd.)

Homepage: https://code.google.com/p/credis/
libmemcached: fix linking with libpthread

Add patch to fix linking against libpthread (from Fedora).

https://bugzilla.redhat.com/show_bug.cgi?id=1037707
https://bugs.launchpad.net/libmemcached/+bug/1281907

This fixes (upcoming) libmemcached use in collectd, which currently
doesn't work because of link failure caused by missing "pthread_once"
symbol.
libmemcached: set meta.platforms

And a more precise license (BSD => 3-clause BSD).