From 8adfe0f8350c7e6e69175daf0bd4394027d23828 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 01:44:19 +0000
Subject: [PATCH 1/3] paho-mqtt-c: 1.3.13 -> 1.3.14

---
 pkgs/by-name/pa/paho-mqtt-c/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paho-mqtt-c/package.nix b/pkgs/by-name/pa/paho-mqtt-c/package.nix
index f8cc322dbf28..c9eb8c18ce57 100644
--- a/pkgs/by-name/pa/paho-mqtt-c/package.nix
+++ b/pkgs/by-name/pa/paho-mqtt-c/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "paho.mqtt.c";
-  version = "1.3.13";
+  version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "paho.mqtt.c";
     rev = "v${version}";
-    hash = "sha256-dKQnepQAryAjImh2rX1jdgiKBtJQy9wzk/7rGQjUtPg=";
+    hash = "sha256-42P55qzt3FUp6yQdsP82va0wXg0EWDRGL/KuZpjp04g=";
   };
 
   postPatch = ''

From f83cf62e2330d239592e8d36513d630b2d4c0c52 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 8 Jan 2025 12:14:36 +0400
Subject: [PATCH 2/3] paho-mqtt-c: modernize

---
 pkgs/by-name/pa/paho-mqtt-c/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/pa/paho-mqtt-c/package.nix b/pkgs/by-name/pa/paho-mqtt-c/package.nix
index c9eb8c18ce57..bdf80407b19a 100644
--- a/pkgs/by-name/pa/paho-mqtt-c/package.nix
+++ b/pkgs/by-name/pa/paho-mqtt-c/package.nix
@@ -8,21 +8,21 @@
   enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "paho.mqtt.c";
   version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "paho.mqtt.c";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-42P55qzt3FUp6yQdsP82va0wXg0EWDRGL/KuZpjp04g=";
   };
 
   postPatch = ''
     substituteInPlace src/MQTTVersion.c \
-      --replace "namebuf[60]" "namebuf[120]" \
-      --replace "lib%s" "$out/lib/lib%s"
+      --replace-warn "namebuf[60]" "namebuf[120]" \
+      --replace-warn "lib%s" "$out/lib/lib%s"
   '';
 
   nativeBuildInputs = [ cmake ];
@@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Eclipse Paho MQTT C Client Library";
     mainProgram = "MQTTVersion";
     homepage = "https://www.eclipse.org/paho/";
-    license = licenses.epl20;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.epl20;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From 57fcc948ae882f8d0853082cc18b316950185b85 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 8 Jan 2025 12:21:35 +0400
Subject: [PATCH 3/3] =?UTF-8?q?paho-mqtt-cpp:=201.4.1=20=E2=86=92=201.5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/pa/paho-mqtt-cpp/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pa/paho-mqtt-cpp/package.nix b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix
index 313288a9144d..791acc2bdd0a 100644
--- a/pkgs/by-name/pa/paho-mqtt-cpp/package.nix
+++ b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "paho.mqtt.cpp";
-  version = "1.4.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "paho.mqtt.cpp";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-xP3M7d7ig19kP7MfOgI0S3UHGgzkJZyv4F+ayXqMtuE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LJ2V+TIVKCNftBk4fK0rCsuNudYg9dSYw/MAL+/raz0=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Eclipse Paho MQTT C++ Client Library";
     homepage = "https://www.eclipse.org/paho/";
-    license = licenses.epl10;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.epl10;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 })