public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56571 from peterhoeg/u/mqtt

Browse Source 
mosquitto: 1.5.5 -> 1.5.8
This commit is contained in:
Peter Hoeg 2019-03-04 12:23:45 +08:00 committed by GitHub
commit 011fe4a246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/mosquitto.nix
View File

@ -17,7 +17,6 @@ let
''; '';
mosquittoConf = pkgs.writeText "mosquitto.conf" '' mosquittoConf = pkgs.writeText "mosquitto.conf" ''
pid_file /run/mosquitto/pid
acl_file ${aclFile} acl_file ${aclFile}
persistence true persistence true
allow_anonymous ${boolToString cfg.allowAnonymous} allow_anonymous ${boolToString cfg.allowAnonymous}
@ -196,15 +195,15 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "notify";
NotifyAccess = "main";
User = "mosquitto"; User = "mosquitto";
Group = "mosquitto"; Group = "mosquitto";
RuntimeDirectory = "mosquitto"; RuntimeDirectory = "mosquitto";
WorkingDirectory = cfg.dataDir; WorkingDirectory = cfg.dataDir;
Restart = "on-failure"; Restart = "on-failure";
ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf} -d"; ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
PIDFile = "/run/mosquitto/pid";
}; };
preStart = '' preStart = ''
rm -f ${cfg.dataDir}/passwd rm -f ${cfg.dataDir}/passwd
@ -214,7 +213,7 @@ in
if c.hashedPassword != null then if c.hashedPassword != null then
"echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd"
else optionalString (c.password != null) else optionalString (c.password != null)
"${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}" "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} '${c.password}'"
) cfg.users); ) cfg.users);
}; };

28
pkgs/servers/mqtt/mosquitto/default.nix
View File

@ -1,23 +1,29 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt
, openssl, libuuid, libwebsockets, c-ares, libuv }: , openssl, libuuid, libwebsockets, c-ares, libuv
, systemd ? null }:
stdenv.mkDerivation rec { let
withSystemd = stdenv.isLinux;
in stdenv.mkDerivation rec {
name = "mosquitto-${version}"; name = "mosquitto-${version}";
version = "1.5.5"; version = "1.5.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eclipse"; owner = "eclipse";
repo = "mosquitto"; repo = "mosquitto";
rev = "v${version}"; rev = "v${version}";
sha256 = "1sfwmvrglfy5gqfk004kvbjldqr36dqz6xmppbgfhr47j5zs66xc"; sha256 = "1rf8g6fq7g1mhwsajsgvvlynasybgc51v0qg5j6ynsxfh8yi7s6r";
}; };
postPatch = '' postPatch = ''
substituteInPlace man/manpage.xsl \ for f in html manpage ; do
--replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ substituteInPlace man/$f.xsl \
--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 for f in {lib,lib/cpp,src}/CMakeLists.txt ; do
substituteInPlace $f --replace /sbin/ldconfig ldconfig substituteInPlace $f --replace /sbin/ldconfig true
done done
# the manpages are not generated when using cmake # the manpages are not generated when using cmake
@ -26,7 +32,9 @@ stdenv.mkDerivation rec {
popd popd
''; '';
buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]; buildInputs = [
openssl libuuid libwebsockets c-ares libuv
] ++ lib.optional withSystemd systemd;
nativeBuildInputs = [ cmake docbook_xsl libxslt ]; nativeBuildInputs = [ cmake docbook_xsl libxslt ];
@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DWITH_THREADING=ON" "-DWITH_THREADING=ON"
"-DWITH_WEBSOCKETS=ON" "-DWITH_WEBSOCKETS=ON"
]; ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An open source MQTT v3.1/3.1.1 broker"; description = "An open source MQTT v3.1/3.1.1 broker";