commit
3f41103aaf
|
@ -200,6 +200,12 @@ self: super: {
|
||||||
# https://github.com/mvoidex/hsdev/issues/11
|
# https://github.com/mvoidex/hsdev/issues/11
|
||||||
hsdev = dontHaddock super.hsdev;
|
hsdev = dontHaddock super.hsdev;
|
||||||
|
|
||||||
|
hs-mesos = overrideCabal super.hs-mesos (drv: {
|
||||||
|
# Pass _only_ mesos; the correct protobuf is propagated.
|
||||||
|
extraLibraries = [ pkgs.mesos ];
|
||||||
|
preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal";
|
||||||
|
});
|
||||||
|
|
||||||
# Upstream notified by e-mail.
|
# Upstream notified by e-mail.
|
||||||
permutation = dontCheck super.permutation;
|
permutation = dontCheck super.permutation;
|
||||||
|
|
||||||
|
|
|
@ -4461,7 +4461,7 @@ let
|
||||||
mesos = callPackage ../applications/networking/cluster/mesos {
|
mesos = callPackage ../applications/networking/cluster/mesos {
|
||||||
sasl = cyrus_sasl;
|
sasl = cyrus_sasl;
|
||||||
inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
|
inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
|
||||||
pythonProtobuf = pythonPackages.protobuf;
|
pythonProtobuf = pythonPackages.protobuf2_5;
|
||||||
};
|
};
|
||||||
|
|
||||||
mesos-dns = callPackage ../servers/dns/mesos-dns { };
|
mesos-dns = callPackage ../servers/dns/mesos-dns { };
|
||||||
|
|
Loading…
Reference in a new issue