From d1c303d6dfbbaaa059045130bbed179bc8d9cb01 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 00:44:12 -0500 Subject: [PATCH 01/10] zenoh: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh/package.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 9a4aee622eeb..32340c14f2c5 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -8,22 +8,22 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh"; rev = finalAttrs.version; - hash = "sha256-XibcNrT9R8gdOnf4BtOi5Jqu+4XjeWngA3i/MXnkfn8="; + hash = "sha256-sFHUphFu5a+buSa3GQvSmGo8SFtn3V5ZqTOnWMPlvs8="; }; - cargoHash = "sha256-z0hSjcmVOefSiPgk6ige4wsR+LikNIjwi0On1/hyi78="; + cargoHash = "sha256-1PjtZ5/bAnLlMbkcKAA6DCKDafItGiATjct5Pv8muas="; cargoBuildFlags = [ "--workspace" - # exclude examples - "--exclude" - "examples" + "--bins" + "--lib" + "--examples" "--exclude" "zenoh-backend-example" "--exclude" @@ -34,6 +34,16 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = false; + preInstall = '' + cp -r $releaseDir/examples/* $tmpDir/ + bins=$(find $tmpDir \ + -maxdepth 1 \ + -type f \ + -executable \ + -regextype posix-extended \ + ! -regex ".*\.(so\.[0-9.]+|so|a|d|dylib)|.*-[0-9a-f]{16,}") + ''; + passthru.tests = { version = testers.testVersion { package = zenoh; From 673fa5e9635453ede128408fe73dd098435e8a7a Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 00:46:59 -0500 Subject: [PATCH 02/10] zenoh-c: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-c/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-c/package.nix b/pkgs/by-name/ze/zenoh-c/package.nix index 39286f61322c..1df4eaac5ac4 100644 --- a/pkgs/by-name/ze/zenoh-c/package.nix +++ b/pkgs/by-name/ze/zenoh-c/package.nix @@ -10,18 +10,20 @@ stdenv.mkDerivation rec { pname = "zenoh-c"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-c"; - tag = version; - hash = "sha256-Mn3diwJgMkYXP9Dn5AqquN1UJ+P+b4QadiXqzzYZK+o="; + # tag = version; + # Use 1.9.0 PR merge commit with up-to-date Cargo.lock file + rev = "8858e129271f4e05bb34d8ae6df3f3d221ef5299"; + hash = "sha256-rNvtFFM9tRttuBAIrpaYTadFcUe1El7q5t7PNnMEJXA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-Z9xKC7svGPSuQm4KCKOfGAFOdWgSjBK+/LFT3rAebTg="; + hash = "sha256-7xWu9wgZqDzd60buMnF9B6Y5LRkG5C2JWiG7VwgSCvU="; }; outputs = [ From 8b3316f9fb0a86db2c71d6ba43a5eb2c207ed6be Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 00:49:53 -0500 Subject: [PATCH 03/10] zenoh-cpp: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-cpp/package.nix b/pkgs/by-name/ze/zenoh-cpp/package.nix index fcfd64f6f13b..5dd17a57ae9a 100644 --- a/pkgs/by-name/ze/zenoh-cpp/package.nix +++ b/pkgs/by-name/ze/zenoh-cpp/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenoh-cpp"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-cpp"; tag = finalAttrs.version; - hash = "sha256-rznvif87UZbYzZB4yHG4R850qm6Z3beJ1NSG4wrf58M="; + hash = "sha256-MwQKTxrQqfoASCRk+vBeS9EHvmh6sqrpqygQVrdGkWw="; }; cmakeFlags = [ From 047435bfd06cca4d686c375aedbed940b6a67e34 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:06:01 -0500 Subject: [PATCH 04/10] zenoh-backend-filesystem: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-backend-filesystem/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index ba3cba96ee13..6836c6da1727 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh-backend-filesystem"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-filesystem"; tag = finalAttrs.version; - hash = "sha256-aMIVBs3K9h2aVPuaU5DzOjm3xzpHJn8MnjxdCDCANCw="; + hash = "sha256-xyGRL8cSTiObuFDZN+c7e9Sggfn5jx9555PU0JSPh6o="; }; - cargoHash = "sha256-d7LgxaZHcMpqx0/+qmcHlAn1pAjBrGqjeTsiqZEJ+1Q="; + cargoHash = "sha256-kbMOAL/CvmbOjKVpnZrZlRsl0sibTBwvqCq5GzXjGx8="; nativeBuildInputs = [ pkg-config From 56f5e1d60c0aed7af6d0c1897a229a328af7fcd3 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:09:05 -0500 Subject: [PATCH 05/10] zenoh-backend-influxdb: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-backend-influxdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index 9bc1415c6a5a..81e6bd9351fc 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh-backend-influxdb"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-influxdb"; tag = finalAttrs.version; - hash = "sha256-OwIVaWy3rgnn9Cm7sqBvFua2FOCgMQBoxPh+8HkvpB0="; + hash = "sha256-W+hrkmjvWPhUJgbPGwzo9159wd269P0vBIxDV+oX6H4="; }; - cargoHash = "sha256-yOcbg4+hXdecBN3oeuhs6J1PQ43s8oYOBX/CJ3IyoJ0="; + cargoHash = "sha256-+wJqrGQhcrVW9un+2rPZwZl8/MzttduO9Nhn1w2cNag="; meta = { description = "Backend and Storages for zenoh using InfluxDB"; From 40c1486de7cf95944f3ed81072586a8200bd7693 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:11:17 -0500 Subject: [PATCH 06/10] zenoh-backend-rocksdb: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index 1746fb0eb7b0..b3fbbdc69a0f 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh-backend-rocksdb"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-rocksdb"; tag = finalAttrs.version; - hash = "sha256-7IXBzrtab7NNskO6JkPkXGxqnAFmVyIe7dLqbYAKyLs="; + hash = "sha256-D+gc29pje4cXfIXP++572iqvzkHDrF6JVdRkdHnEY4E="; }; - cargoHash = "sha256-Lqrhu19Z++K7GIMxBHnFNyiBDfq0MxL4tUM2VDkezHw="; + cargoHash = "sha256-IOdwGre7j5vyJ5Zut+Q3/548xAlXxbRTVePp9V5nssI="; nativeBuildInputs = [ pkg-config From 92d16f8c0ecc5eec1d41ca5e7b2f05cb3d81c515 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:19:34 -0500 Subject: [PATCH 07/10] zenoh-plugin-dds: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-plugin-dds/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix index 41b098d50c8c..cde62b41c266 100644 --- a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh-plugin-dds"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-dds"; tag = finalAttrs.version; - hash = "sha256-vSFgxSSbLEwpwPznvy+m66Z5grgmxZiIom/I4p0xris="; + hash = "sha256-MOZmyZGaMJieWISZnnSTU+3+ER4FcGhg3YCTlmuWmuE="; }; - cargoHash = "sha256-oMmO4N1EqqpWcujbm8sPPwEzNC1Gy2UdCCRqcgyQqdI="; + cargoHash = "sha256-O7OrgEPPkWMYCtmtdgYIcE8YUa+YpHWttwW0Gu5BLJA="; nativeBuildInputs = [ cmake From 6241a5057408c5ff0b9266ffa8dcc08862956652 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:24:43 -0500 Subject: [PATCH 08/10] zenoh-plugin-mqtt: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index ecb0ce0aacc9..0875b4f1e664 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh-plugin-mqtt"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-mqtt"; tag = finalAttrs.version; - hash = "sha256-ijoKL8TReNER3a9dwsPeh56l1Ze2rz6jN6L9rYQLYRU="; + hash = "sha256-f5y9zCUTvNG/ubw0K+AwqfQlsfeLvoUL8gy3v9T0oQ4="; }; - cargoHash = "sha256-ZKpyVVzXC+c7JzktSOMubWl610ujoZ3Vgo4tC0/1JHk="; + cargoHash = "sha256-vL5lZOH8juX8zaLJZnw1y8aDZsdFC3gELNvp5MPft2o="; # Some test time out doCheck = false; From 5c2fbb808a9c37da4dc0ae044d4dae23a0247536 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:31:06 -0500 Subject: [PATCH 09/10] zenoh-plugin-webserver: 1.4.0 -> 1.9.0 Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-plugin-webserver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index a8cb522bb938..ea53f66d697e 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zenoh-plugin-webserver"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.9.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-webserver"; tag = finalAttrs.version; - hash = "sha256-R+MLM42m3UTBFHqCAGezU4jz0Hi1+X2W1Yje7+ctl6k="; + hash = "sha256-U2xcx3TVPkEgea2gdSdbEa+jDI6h6vftLUi8AZPY3fU="; }; - cargoHash = "sha256-/WVMdSGEawvAJ0viV/2eVhWGlvgaGUpe9ZHDCBUOc1I="; + cargoHash = "sha256-PLmmOw2ZMPn/ODBJn1NBvWyeGEPOcKB+aepoDqhqzZc="; meta = { description = "Implements an HTTP server mapping URLs to zenoh paths"; From c66d8e815a50ebeb1b14f0a01888e18c6cbcc216 Mon Sep 17 00:00:00 2001 From: Adam Rizkalla Date: Fri, 29 May 2026 01:44:54 -0500 Subject: [PATCH 10/10] zenoh: add darwin to meta.platforms Signed-off-by: Adam Rizkalla --- pkgs/by-name/ze/zenoh-backend-filesystem/package.nix | 2 +- pkgs/by-name/ze/zenoh-backend-influxdb/package.nix | 2 +- pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix | 2 +- pkgs/by-name/ze/zenoh-plugin-dds/package.nix | 2 +- pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix | 2 +- pkgs/by-name/ze/zenoh-plugin-webserver/package.nix | 2 +- pkgs/by-name/ze/zenoh/package.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index 6836c6da1727..4498f7fa457b 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ markuskowa ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index 81e6bd9351fc..003d5dbbae2a 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ markuskowa ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index b3fbbdc69a0f..88eb2ece2348 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ markuskowa ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix index cde62b41c266..7a25df1dcdda 100644 --- a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ kaweees ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "zenoh-bridge-dds"; }; }) diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 0875b4f1e664..b1f85df2ebc9 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ markuskowa ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "zenoh-bridge-mqtt"; }; }) diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index ea53f66d697e..fc9696bd35a5 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ markuskowa ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 32340c14f2c5..1b9e02a1965f 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -60,6 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ck3d ]; mainProgram = "zenohd"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; })