diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/by-name/li/libpulsar/package.nix similarity index 78% rename from pkgs/development/libraries/libpulsar/default.nix rename to pkgs/by-name/li/libpulsar/package.nix index 93880415725f..40426343b9aa 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/by-name/li/libpulsar/package.nix @@ -1,38 +1,43 @@ { lib, - asioSupport ? true, + stdenv, + fetchFromGitHub, + asio_1_32_0, boost, boost186, - log4cxxSupport ? false, log4cxx, - snappySupport ? false, snappy, - zlibSupport ? true, zlib, - zstdSupport ? true, zstd, gtest, - gtestSupport ? false, cmake, curl, - fetchFromGitHub, - protobuf, + protobuf_21, jsoncpp, openssl, pkg-config, - stdenv, + + asioSupport ? true, + log4cxxSupport ? false, + snappySupport ? false, + zlibSupport ? true, + zstdSupport ? true, + gtestSupport ? false, }: +let + protobuf = protobuf_21; +in stdenv.mkDerivation (finalAttrs: { pname = "libpulsar"; - version = "3.7.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-cpp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-3kUyimyv0Si3zUFaIsIVdulzH8l2fxe6BO9a5L6n8I8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+gGddndiRot2kW7KGuKfWA85mh8e+9PetnEBQvfZB1I="; }; nativeBuildInputs = [ @@ -40,18 +45,28 @@ stdenv.mkDerivation (finalAttrs: { pkg-config protobuf # protoc ] - ++ lib.optional gtestSupport gtest.dev; + ++ lib.optionals gtestSupport [ + (lib.getDev gtest) + ]; buildInputs = [ + curl jsoncpp openssl - curl protobuf ] - ++ lib.optional snappySupport snappy.dev - ++ lib.optional zlibSupport zlib - ++ lib.optional zstdSupport zstd - ++ lib.optional log4cxxSupport log4cxx + ++ lib.optionals snappySupport [ + (lib.getDev snappy) + ] + ++ lib.optionals zlibSupport [ + zlib + ] + ++ lib.optionals zstdSupport [ + zstd + ] + ++ lib.optionals log4cxxSupport [ + log4cxx + ] ++ lib.optionals asioSupport [ # io_service was removed in 1.33.0 asio_1_32_0 @@ -85,9 +100,9 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://pulsar.apache.org/docs/next/client-libraries-cpp/"; description = "Apache Pulsar C++ library"; - changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${finalAttrs.version}"; + homepage = "https://pulsar.apache.org/docs/next/client-libraries-cpp/"; + changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/${finalAttrs.src.tag}"; platforms = lib.platforms.all; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ corbanr ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff417d307aa..41c691b58039 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6761,10 +6761,6 @@ with pkgs; libprom ; - libpulsar = callPackage ../development/libraries/libpulsar { - protobuf = protobuf_21; - }; - libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { };