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
gbdfed: add package 1.6
finalterm: Add package
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
Add expressions for Haskell engine-io, engine-io-snap and socket-io
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.
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).