diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 9294e7423159..7dfbebb95df1 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack-c, libtermkey, libiconv , libuv, lua, ncurses, pkg-config , unibilium, gperf , libvterm-neovim @@ -66,7 +66,7 @@ in # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570 # and it's definition at: pkgs/development/lua-modules/overrides.nix lua.pkgs.libluv - msgpack + msgpack-c ncurses neovimLuaEnv tree-sitter diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index d7b0a675bb52..7c2b89ede0a9 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -24,7 +24,7 @@ , libpulseaudio , libupnp , yaml-cpp -, msgpack +, msgpack-cxx , openssl , restinio , secp256k1 @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { libpulseaudio libupnp yaml-cpp - msgpack + msgpack-cxx opendht-jami openssl pjsip-jami diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix new file mode 100644 index 000000000000..ded03015f39f --- /dev/null +++ b/pkgs/development/libraries/msgpack-c/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, zlib +}: + +stdenv.mkDerivation rec { + pname = "msgpack-c"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "refs/tags/c-${version}"; + hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built + ] ++ lib.optional (!doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + + checkInputs = [ + gtest + zlib + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "MessagePack implementation for C"; + homepage = "https://github.com/msgpack/msgpack-c"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/development/libraries/msgpack-cxx/default.nix new file mode 100644 index 000000000000..4ec05b581c4a --- /dev/null +++ b/pkgs/development/libraries/msgpack-cxx/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: + +stdenv.mkDerivation rec { + pname = "msgpack-cxx"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "refs/tags/cpp-${version}"; + hash = "sha256-p0eLd0fHhsgnRomubYadumMNiC2itdePJC9B55m49LI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + ]; + + cmakeFlags = [ + "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built + ] ++ lib.optional doCheck "-DMSGPACK_BUILD_TESTS=ON"; + + checkInputs = [ + zlib + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "MessagePack implementation for C++"; + homepage = "https://github.com/msgpack/msgpack-c"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5630ed947d05..cbb58db000e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23339,6 +23339,10 @@ with pkgs; msgpack = callPackage ../development/libraries/msgpack { }; + msgpack-c = callPackage ../development/libraries/msgpack-c { }; + + msgpack-cxx = callPackage ../development/libraries/msgpack-cxx { }; + msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool; msilbc = callPackage ../development/libraries/msilbc { };