Update ocaml-pcre to version 7.1.1
Fix x11 include and lib parameters for configure script.
Make x11 optionnal for ocaml
Merge recent master into x-updates

Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
haskellPackages.engineIO: Update to 1.0.2
e18.enlightenment: fix build by adding bzip2

I'm lazy to find how exatly the need propagated in x-updates.
haskellPackages.engineIO/engineIOSnap/socketIO: Update to latest versions
Add plugins haskell package
Merge remote-tracking branch 'upstream/master'
README for building the nixos manual
Fix service to use logstash new directory layout
Adding a missing instruction for EFI installations

This commit also adds a link to rEFInd which is a useful tool to manage
EFI systems. If this link is not desired, I can remove it.
moved wrapper declaration to preFixup
Use make install instead of setup.py directly.

Using setup.py results in the following error message:

    Missing file: share/applications/gpodder.desktop

    If you want to install, use "make install" instead of using
    setup.py directly. See the README file for more information.
Merge pull request #3327 from svenkeidel/gpodder

added gpodder package
openopc: new package

"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
Merge pull request #3260 from linquize/gbdfed

gbdfed: add package 1.6
Merge pull request #3323 from wjlroe/logstash-1.4.2

Logstash 1.4.2
added metainformation for gpodder and mygpoclient
mesos: Add package

Apache Mesos is a cluster manager that simplifies the complexity of running
applications on a shared pool of servers.