alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #68877 from peterhoeg/u/mqtt

Browse source 
mosquitto: 1.6.4 -> 1.6.5
This commit is contained in:
Peter Hoeg 2019-09-17 10:40:14 +08:00 committed by GitHub
parent 279d51e585 05ee2af77d
commit fbd23c6f1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/development/libraries/libwebsockets/default.nix
View file

@ -1,28 +1,47 @@
{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
stdenv.mkDerivation rec { let
generic = { version, sha256 }: stdenv.mkDerivation rec {
pname = "libwebsockets"; pname = "libwebsockets";
version = "3.2.0"; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "warmcat"; owner = "warmcat";
repo = "libwebsockets"; repo = "libwebsockets";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; inherit sha256;
}; };
buildInputs = [ cmake openssl zlib libuv ]; buildInputs = [ openssl zlib libuv ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
meta = { meta = with stdenv.lib; {
description = "Light, portable C library for websockets"; description = "Light, portable C library for websockets";
longDescription = '' longDescription = ''
Libwebsockets is a lightweight pure C library built to Libwebsockets is a lightweight pure C library built to
use minimal CPU and memory resources, and provide fast use minimal CPU and memory resources, and provide fast
throughput in both directions. throughput in both directions.
''; '';
homepage = https://github.com/warmcat/libwebsockets; homepage = "https://libwebsockets.org/";
license = stdenv.lib.licenses.lgpl21; license = licenses.lgpl21;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
};
in
rec {
libwebsockets_3_1 = generic {
sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl";
version = "3.1.0";
};
libwebsockets_3_2 = generic {
version = "3.2.0";
sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
};
libwebsockets = libwebsockets_3_2;
} }

10
pkgs/servers/mqtt/mosquitto/default.nix
View file

@ -1,16 +1,16 @@
{ stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt { stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt
, openssl, libuuid, libwebsockets, c-ares, libuv , openssl, libuuid, libwebsockets_3_1, c-ares, libuv
, systemd ? null, withSystemd ? stdenv.isLinux }: , systemd ? null, withSystemd ? stdenv.isLinux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mosquitto"; pname = "mosquitto";
version = "1.6.4"; version = "1.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eclipse"; owner = "eclipse";
repo = "mosquitto"; repo = "mosquitto";
rev = "v${version}"; rev = "v${version}";
sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l"; sha256 = "0scgsi3rvs9s8vxv4r7d5d9ixbsfg4dwnjcy6zxwdz9dfn8qnngj";
}; };
postPatch = '' postPatch = ''
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
openssl libuuid libwebsockets c-ares libuv openssl libuuid libwebsockets_3_1 c-ares libuv
] ++ lib.optional withSystemd systemd; ] ++ lib.optional withSystemd systemd;
nativeBuildInputs = [ cmake docbook_xsl libxslt ]; nativeBuildInputs = [ cmake docbook_xsl libxslt ];
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
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";
homepage = http://mosquitto.org/; homepage = "https://mosquitto.org/";
license = licenses.epl10; license = licenses.epl10;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix; platforms = platforms.unix;

5
pkgs/top-level/all-packages.nix
View file

@ -4570,7 +4570,10 @@ in
librest = callPackage ../development/libraries/librest { }; librest = callPackage ../development/libraries/librest { };
libwebsockets = callPackage ../development/libraries/libwebsockets { }; inherit (callPackages ../development/libraries/libwebsockets { })
libwebsockets_3_1
libwebsockets_3_2
libwebsockets;
lidarr = callPackage ../servers/lidarr { }; lidarr = callPackage ../servers/lidarr { };