From 419a2085d9c6e64966f3e0a5417b67be137ca9fd Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 31 Dec 2023 11:37:37 +0200 Subject: [PATCH 1/2] libserdes: 6.2.0 -> 7.5.3 --- .../libraries/libserdes/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index a3cec3788b58..d634f3a959da 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -1,42 +1,35 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , perl +, which , boost , rdkafka , jansson , curl , avro-c -, avro-cpp }: +, avro-cpp +, nix-update-script }: stdenv.mkDerivation rec { pname = "libserdes"; - version = "6.2.0"; + version = "7.5.3"; src = fetchFromGitHub { owner = "confluentinc"; repo = pname; rev = "v${version}"; - sha256 = "194ras18xw5fcnjgg1isnb24ydx9040ndciniwcbdb7w7wd901gc"; + hash = "sha256-rg4SWa9nIDT6JrnnCDwdiFE1cvpUn0HWHn+bPkXMHQ4="; }; outputs = [ "dev" "out" ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl which ]; buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ]; makeFlags = [ "GEN_PKG_CONFIG=y" ]; - patches = [ - # Fix compatibility with Avro master branch - (fetchpatch { - url = "https://github.com/confluentinc/libserdes/commit/d7a355e712ab63ec77f6722fb5a9e8056e7416a2.patch"; - sha256 = "14bdx075n4lxah63kp7phld9xqlz3pzs03yf3wbq4nmkgwac10dh"; - }) - ]; - postPatch = '' patchShebangs configure lds-gen.pl '' + lib.optionalString (stdenv.cc.libcxx != null) '' From ea652d40504c7525a2a829af08f07bf7d0594135 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 31 Dec 2023 11:37:53 +0200 Subject: [PATCH 2/2] libserdes: add updateScript --- pkgs/development/libraries/libserdes/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index d634f3a959da..fad83031f013 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { chmod -x ''${!outputInclude}/include/libserdes/*.h ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry"; homepage = "https://github.com/confluentinc/libserdes";