From 24deb859ebc654df7d6737104c9c661e29981534 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 28 Jan 2024 01:58:24 +0400 Subject: [PATCH 1/3] =?UTF-8?q?nanomq:=200.20.8=20=E2=86=92=200.21.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/mqtt/nanomq/default.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 567e9392abde..306ce1387acc 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -25,13 +25,13 @@ let # bit absurd - repo doesn't even have a license. idl-serial = stdenv.mkDerivation { pname = "idl-serial"; - version = "unstable-2023-03-29"; + version = "unstable-2023-09-28"; src = fetchFromGitHub { owner = "nanomq"; repo = "idl-serial"; - rev = "908c364dab4c0dcdd77b8de698d29c8a0b6d3830"; - hash = "sha256-3DS9DuzHN7BevfgiekUmKKH9ej9wKTrt6Fuh427NC4I="; + rev = "cf63cb2c4fbe2ecfba569979b89e20e1190b5ed4"; + hash = "sha256-HM5TSMfEr4uv5BuNCQjyZganSQ/ZqT3xZQp0KLmjIEc="; }; nativeBuildInputs = [ cmake ninja flex bison ]; @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.20.8"; + version = "0.21.8"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0="; + hash = "sha256-O9UrUkD61OicY1L4sL2PX/9aOpFkJpjm2SWoP2cKXyA="; fetchSubmodules = true; }; @@ -62,16 +62,16 @@ in stdenv.mkDerivation (finalAttrs: { buildInputs = [ cyclonedds libmysqlclient mariadb mbedtls sqlite zeromq ]; cmakeFlags = [ - "-DBUILD_BENCH=ON" - "-DBUILD_DDS_PROXY=ON" - "-DBUILD_NANOMQ_CLI=ON" - "-DBUILD_ZMQ_GATEWAY=ON" - "-DENABLE_RULE_ENGINE=ON" - "-DNNG_ENABLE_SQLITE=ON" - "-DNNG_ENABLE_TLS=ON" + (lib.cmakeBool "BUILD_BENCH" true) + (lib.cmakeBool "BUILD_DDS_PROXY" true) + (lib.cmakeBool "BUILD_NANOMQ_CLI" true) + (lib.cmakeBool "BUILD_ZMQ_GATEWAY" true) + (lib.cmakeBool "ENABLE_RULE_ENGINE" true) + (lib.cmakeBool "NNG_ENABLE_SQLITE" true) + (lib.cmakeBool "NNG_ENABLE_TLS" true) ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion"; # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people From b8f4ef4f25bf4dd1c1689f069ec619f98bc37e16 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 4 Mar 2024 23:06:40 +0400 Subject: [PATCH 2/3] nanomq: migrate to by-name --- .../mqtt/nanomq/default.nix => by-name/na/nanomq/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/mqtt/nanomq/default.nix => by-name/na/nanomq/package.nix} (100%) diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/by-name/na/nanomq/package.nix similarity index 100% rename from pkgs/servers/mqtt/nanomq/default.nix rename to pkgs/by-name/na/nanomq/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5447ab209937..0eef3ab7be27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23198,8 +23198,6 @@ with pkgs; mosquitto = callPackage ../servers/mqtt/mosquitto { }; - nanomq = callPackage ../servers/mqtt/nanomq { }; - mps = callPackage ../development/libraries/mps { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; From 36731fc64125fc9e9c1f8d920d17b20f5f55fbad Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 7 Jul 2024 13:18:25 +0100 Subject: [PATCH 3/3] nanomq: 0.21.8 -> 0.22.1 disable websocket install-checks for now, as it seems properly broken --- pkgs/by-name/na/nanomq/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index 306ce1387acc..f5ad6c1bed01 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.21.8"; + version = "0.22.1"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-O9UrUkD61OicY1L4sL2PX/9aOpFkJpjm2SWoP2cKXyA="; + hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng="; fetchSubmodules = true; }; @@ -90,6 +90,12 @@ in stdenv.mkDerivation (finalAttrs: { # effectively distable this test because it is slow echo > .github/scripts/fuzzy_test.txt + # even with the correct paho-mqtt version these tests fail, suggesting + # websocket support is indeed broken + substituteInPlace .github/scripts/test.py \ + --replace 'ws_test()' '#ws_test()' \ + --replace 'ws_v5_test()' '#ws_v5_test()' + PATH="$PATH:$out/bin" python .github/scripts/test.py )