Unverified Commit 5eadc055 authored by Pascal Bach's avatar Pascal Bach Committed by GitHub
Browse files

Merge pull request #216978 from sikmir/nanomq 

nanomq: 0.15.1 → 0.15.5
parents e4053b1a b681d064

pkgs/development/libraries/cyclondds/default.nix→pkgs/development/libraries/cyclonedds/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
}:



stdenv.mkDerivation rec {

  pname = "cyclondds";

  pname = "cyclonedds";

  version = "0.10.2";



  src = fetchFromGitHub {

pkgs/servers/mqtt/nanomq/default.nix

+22 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtls, sqlite }:

{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config

, cyclonedds, libmysqlclient, mariadb, mbedtls, sqlite, zeromq

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "nanomq";

  version = "0.15.1";

  version = "0.15.5";



  src = fetchFromGitHub {

    owner = "emqx";

    repo = "nanomq";

    rev = finalAttrs.version;

    hash = "sha256-h4TCorZfg9Sin4CZPRifUkqeg4F2V1DluolerSeREs4=";

    hash = "sha256-eIwUsYPpRZMl1oCuuZeOj0SCBHDaJdmdWdoI4yuqxrg=";

    fetchSubmodules = true;

  };



  patches = [

    # Fix the conflict on function naming in ddsproxy

    (fetchpatch {

      url = "https://github.com/emqx/nanomq/commit/20f436a3b9d45f9809d7c7f0714905c657354631.patch";

      hash = "sha256-ISMlf9QW73oogMTlifi/r08uSxBpzRYvBSJBB1hn2xY=";

    })

  ];



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace "DESTINATION /etc" "DESTINATION $out/etc"

  '';



  nativeBuildInputs = [ cmake ninja ];

  nativeBuildInputs = [ cmake ninja pkg-config ];



  buildInputs = [ mbedtls sqlite ];

  buildInputs = [ cyclonedds libmysqlclient mariadb mbedtls sqlite zeromq ];



  cmakeFlags = [

    "-DBUILD_BENCH=ON"

    "-DBUILD_DDS_PROXY=ON"

    "-DBUILD_NANOMQ_CLI=ON"

    "-DNNG_ENABLE_TLS=ON"

    "-DBUILD_ZMQ_GATEWAY=ON"

    "-DENABLE_RULE_ENGINE=ON"

    "-DNNG_ENABLE_SQLITE=ON"

    "-DNNG_ENABLE_TLS=ON"

  ];



  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type";



  meta = with lib; {

    description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge";

    homepage = "https://nanomq.io/";

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -3095,7 +3095,7 @@ with pkgs; 














  cuelsp = callPackage ../development/tools/cuelsp {};



























  cyclondds = callPackage ../development/libraries/cyclondds { };













  cyclonedds = callPackage ../development/libraries/cyclonedds { };





























  cyclone-scheme = callPackage ../development/interpreters/cyclone { };