From 653397e1ab2236a47e786a48d561c5cbb53a8ccf Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 17 Jun 2024 19:48:23 +0400
Subject: [PATCH 1/2] =?UTF-8?q?paho-mqtt-cpp:=201.3.2=20=E2=86=92=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/paho-mqtt-cpp/default.nix       | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/development/libraries/paho-mqtt-cpp/default.nix
index 6f1b9b215e26..cf94f358cd24 100644
--- a/pkgs/development/libraries/paho-mqtt-cpp/default.nix
+++ b/pkgs/development/libraries/paho-mqtt-cpp/default.nix
@@ -1,19 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  openssl,
+  paho-mqtt-c,
+  enableStatic ? stdenv.hostPlatform.isStatic,
+  enableShared ? !stdenv.hostPlatform.isStatic,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "paho.mqtt.cpp";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "paho.mqtt.cpp";
-    rev = "v${version}";
-    hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-XAQSNjO34b2BPzAf7x4a+74UdKFH5lYNMJm4kE16nkA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ openssl paho-mqtt-c ];
+  buildInputs = [
+    openssl
+    paho-mqtt-c
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "PAHO_WITH_SSL" true)
@@ -28,4 +40,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ sikmir ];
     platforms = platforms.unix;
   };
-}
+})

From ad4d0d761a6a59be5d0efcc13d1da0d2b9bec620 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 26 Jun 2024 20:20:49 +0400
Subject: [PATCH 2/2] paho-mqtt-cpp: migrate to by-name

---
 .../default.nix => by-name/pa/paho-mqtt-cpp/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/paho-mqtt-cpp/default.nix => by-name/pa/paho-mqtt-cpp/package.nix} (100%)

diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/paho-mqtt-cpp/default.nix
rename to pkgs/by-name/pa/paho-mqtt-cpp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38c65b8f36c0..c3a401d063ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11507,8 +11507,6 @@ with pkgs;
 
   paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
 
-  paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { };
-
   pakcs = callPackage ../development/compilers/pakcs {
     # Doesn't compile with GHC 9.0 due to whitespace syntax changes
     # see also https://github.com/NixOS/nixpkgs/issues/166108