Unverified Commit 35a1ac92 authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

Merge pull request #320563 from sikmir/paho-mqtt-cpp 

paho-mqtt-cpp: 1.3.2 → 1.4.0
parents 44f79e5b ad4d0d76

pkgs/development/libraries/paho-mqtt-cpp/default.nix→pkgs/by-name/pa/paho-mqtt-cpp/package.nix

+19 −7
Original line number Diff line number Diff line 
{ 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;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -11469,8 +11469,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