diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2024-06-26 21:58:07 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 21:58:07 +0400 |
| commit | 35a1ac9244c4542c6490450ddb3b7e70c87a7822 (patch) | |
| tree | 70b8584aecc4061d4612a91e20560b2320ebe36e | |
| parent | 44f79e5bf013c11eda651c1cb9b6c0d78ee626d1 (diff) | |
| parent | ad4d0d761a6a59be5d0efcc13d1da0d2b9bec620 (diff) | |
Merge pull request #320563 from sikmir/paho-mqtt-cpp
paho-mqtt-cpp: 1.3.2 → 1.4.0
| -rw-r--r-- | pkgs/by-name/pa/paho-mqtt-cpp/package.nix (renamed from pkgs/development/libraries/paho-mqtt-cpp/default.nix) | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix index 6f1b9b215e266..cf94f358cd24d 100644 --- a/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/pkgs/by-name/pa/paho-mqtt-cpp/package.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; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7049b6ecca374..fb3c68a62eec4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 |