From b0740c1d99981fb914750288451b8185383977f8 Mon Sep 17 00:00:00 2001
From: Miguel Villa Floran <miguel.villafloran@gmail.com>
Date: Fri, 10 Oct 2025 10:58:00 -0700
Subject: [PATCH 1/3] maintainers: add kaweees

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 624948159bb7..34147f3bc32c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13261,6 +13261,11 @@
     github = "katrinafyi";
     githubId = 39479354;
   };
+  kaweees = {
+    github = "kaweees";
+    githubId = 49963287;
+    name = "Miguel Villa Floran";
+  };
   kayhide = {
     email = "kayhide@gmail.com";
     github = "kayhide";

From 5007d05d9912989ef748395a6f7ae2b63ca1453e Mon Sep 17 00:00:00 2001
From: Miguel Villa Floran <miguel.villafloran@gmail.com>
Date: Fri, 10 Oct 2025 16:46:06 -0700
Subject: [PATCH 2/3] zenoh-plugin-dds: init at 1.4.0

---
 pkgs/by-name/ze/zenoh-plugin-dds/package.nix | 41 ++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/ze/zenoh-plugin-dds/package.nix

diff --git a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix
new file mode 100644
index 000000000000..8421485cbde8
--- /dev/null
+++ b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "zenoh-plugin-dds";
+  version = "1.4.0"; # nixpkgs-update: no auto update
+
+  src = fetchFromGitHub {
+    owner = "eclipse-zenoh";
+    repo = "zenoh-plugin-dds";
+    rev = version;
+    hash = "sha256-vSFgxSSbLEwpwPznvy+m66Z5grgmxZiIom/I4p0xris=";
+  };
+
+  cargoHash = "sha256-oMmO4N1EqqpWcujbm8sPPwEzNC1Gy2UdCCRqcgyQqdI=";
+
+  nativeBuildInputs = [
+    cmake
+    rustPlatform.bindgenHook
+  ];
+
+  # Some test time out
+  doCheck = false;
+
+  meta = {
+    description = "Zenoh plugin for DDS";
+    longDescription = "A zenoh plug-in that allows to transparently route DDS data. This plugin can be used by DDS applications to leverage zenoh for geographical routing or for better scaling discovery";
+    homepage = "https://github.com/eclipse-zenoh/zenoh-plugin-dds";
+    changelog = "https://github.com/eclipse-zenoh/zenoh-plugin-dds/releases/tag/${src.rev}";
+    license = with lib.licenses; [
+      epl20
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ kaweees ];
+    platforms = lib.platforms.linux;
+    mainProgram = "zenoh-bridge-dds";
+  };
+}

From feb21f976e820f3ac61eb4cf65730c0dff683f19 Mon Sep 17 00:00:00 2001
From: Miguel Villa Floran <miguel.villafloran@gmail.com>
Date: Fri, 10 Oct 2025 20:55:52 -0700
Subject: [PATCH 3/3] Implement suggested changes

---
 pkgs/by-name/ze/zenoh-plugin-dds/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix
index 8421485cbde8..41b098d50c8c 100644
--- a/pkgs/by-name/ze/zenoh-plugin-dds/package.nix
+++ b/pkgs/by-name/ze/zenoh-plugin-dds/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
   cmake,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zenoh-plugin-dds";
   version = "1.4.0"; # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "eclipse-zenoh";
     repo = "zenoh-plugin-dds";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-vSFgxSSbLEwpwPznvy+m66Z5grgmxZiIom/I4p0xris=";
   };
 
@@ -22,14 +22,15 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  # Some test time out
-  doCheck = false;
+  checkFlags = [
+    "--skip=test_name_that_times_out"
+  ];
 
   meta = {
     description = "Zenoh plugin for DDS";
     longDescription = "A zenoh plug-in that allows to transparently route DDS data. This plugin can be used by DDS applications to leverage zenoh for geographical routing or for better scaling discovery";
     homepage = "https://github.com/eclipse-zenoh/zenoh-plugin-dds";
-    changelog = "https://github.com/eclipse-zenoh/zenoh-plugin-dds/releases/tag/${src.rev}";
+    changelog = "https://github.com/eclipse-zenoh/zenoh-plugin-dds/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [
       epl20
       asl20
@@ -38,4 +39,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux;
     mainProgram = "zenoh-bridge-dds";
   };
-}
+})