diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 05ce1105d18..9e251e1bc22 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,16 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt -, openssl, libuuid, libwebsockets_3_1, c-ares, libuv -, systemd ? null, withSystemd ? stdenv.isLinux }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, docbook_xsl +, libxslt +, c-ares +, cjson +, libuuid +, libuv +, libwebsockets_3_1 +, openssl +, withSystemd ? stdenv.isLinux +, systemd +}: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.12"; + version = "2.0.10"; src = fetchFromGitHub { - owner = "eclipse"; - repo = "mosquitto"; - rev = "v${version}"; - sha256 = "0y9jna2p7wg57vv2g6ls1dj6w89vaw828y9z1wb3vwz1yhvs35s8"; + owner = "eclipse"; + repo = pname; + rev = "v${version}"; + sha256 = "144vw7b9ja4lci4mplbxs048x9aixd9c3s7rg6wc1k31w099rb12"; }; postPatch = '' @@ -19,29 +31,30 @@ stdenv.mkDerivation rec { --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl done - for f in {lib,lib/cpp,src}/CMakeLists.txt ; do - substituteInPlace $f --replace /sbin/ldconfig true - done - # the manpages are not generated when using cmake pushd man make popd ''; - buildInputs = [ - openssl libuuid libwebsockets_3_1 c-ares libuv - ] ++ lib.optional withSystemd systemd; - nativeBuildInputs = [ cmake docbook_xsl libxslt ]; + buildInputs = [ + c-ares + cjson + libuuid + libuv + libwebsockets_3_1 + openssl + ] ++ lib.optional withSystemd systemd; + cmakeFlags = [ "-DWITH_THREADING=ON" "-DWITH_WEBSOCKETS=ON" ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; meta = with lib; { - description = "An open source MQTT v3.1/3.1.1 broker"; + description = "An open source MQTT v3.1/3.1.1/5.0 broker"; homepage = "https://mosquitto.org/"; license = licenses.epl10; maintainers = with maintainers; [ peterhoeg ];