diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a0a14e89860b..6690e4c9c1b9 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv +{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, luaPackages, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim @@ -25,7 +25,7 @@ let buildInputs = [ libtermkey libuv - libmsgpack + msgpack ncurses libvterm-neovim unibilium diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 48f7b29f407f..de217cb60f3f 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper -, libmsgpack, neovim, pythonPackages, qtbase }: +, msgpack, neovim, pythonPackages, qtbase }: stdenv.mkDerivation rec { name = "neovim-qt-${version}"; @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include" - "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" + "-DMSGPACK_INCLUDE_DIRS=${msgpack}/include" + "-DMSGPACK_LIBRARIES=${msgpack}/lib/msgpackc.so" ]; buildInputs = with pythonPackages; [ - neovim qtbase libmsgpack + neovim qtbase msgpack ] ++ (with pythonPackages; [ jinja2 msgpack python ]); @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - # avoid cmake trying to download libmsgpack + # avoid cmake trying to download msgpack echo "" > third-party/CMakeLists.txt # we rip out a number of tests that fail in the build env # the GUI tests will never work but the others should - they did before neovim 0.2.0 diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index f858bb38dd19..168719bf0e4c 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -20,7 +20,7 @@ , speex , boost , opendht -, libmsgpack +, msgpack , gnutls , zlib , jsoncpp @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { speex boost opendht - libmsgpack + msgpack gnutls zlib jsoncpp diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index e7dd04377be7..7b482d82e2fa 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem , python3, python3Packages -, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }: +, glew, freeglut, libpng, libxml2, tk, freetype, msgpack }: with stdenv.lib; @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication { sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s"; }; - buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ]; + buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype msgpack ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; installPhase = '' diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index a005c8b37465..e588944490b3 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack +{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack , libvpx, check, libconfig, pkgconfig }: let @@ -20,7 +20,7 @@ let ]; buildInputs = [ - libsodium libmsgpack ncurses libconfig + libsodium msgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix similarity index 100% rename from pkgs/development/libraries/libmsgpack/default.nix rename to pkgs/development/libraries/msgpack/default.nix diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix similarity index 95% rename from pkgs/development/libraries/libmsgpack/generic.nix rename to pkgs/development/libraries/msgpack/generic.nix index 947960d23592..67418b6666d4 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libmsgpack-${version}"; + name = "msgpack-${version}"; inherit src patches; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 2bb82efb24ce..bd7d252e1a08 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -6,7 +6,7 @@ , pkgconfig , nettle , gnutls -, libmsgpack +, msgpack , readline , libargon2 }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkgconfig nettle gnutls - libmsgpack + msgpack readline libargon2 ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 1e1ee8bc7971..eb9be9ed18c9 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl -, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, msgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx }@args: @@ -219,7 +219,7 @@ in }; msgpack = attrs: { - buildInputs = [ libmsgpack ]; + buildInputs = [ msgpack ]; }; mysql = attrs: { diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a609476c41aa..439acd927e31 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig -, suggestSupport ? false, zeromq, libevent, libmsgpack +, suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ pkgconfig mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib - ++ optionals suggestSupport [ zeromq libevent libmsgpack ]; + ++ optionals suggestSupport [ zeromq libevent msgpack ]; configureFlags = with stdenv.lib; optional zlibSupport "--with-zlib" diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index a27f0ef0824c..c8ef00b279e0 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }: +{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { name = "pgroonga-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql libmsgpack groonga ]; + buildInputs = [ postgresql msgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index de6c16123960..f5e1d69a0391 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig -, zlib, openssl, libevent, ncurses, ruby, libmsgpack, libssh }: +, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { name = "tmate-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - buildInputs = [ libtool zlib openssl libevent ncurses ruby libmsgpack libssh ]; + buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ece6c03e168a..634a3e4c17e4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -173,6 +173,7 @@ mapAliases ({ module_init_tools = kmod; # added 2016-04-22 mpich2 = mpich; # added 2018-08-06 msf = metasploit; # added 2018-04-25 + libmsgpack = msgpack; # added 2018-08-17 mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81841abdddf8..c2bca01f257b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10437,8 +10437,6 @@ with pkgs; libmtp = callPackage ../development/libraries/libmtp { }; - libmsgpack = callPackage ../development/libraries/libmsgpack { }; - libmypaint = callPackage ../development/libraries/libmypaint { }; libmysofa = callPackage ../development/libraries/audio/libmysofa { }; @@ -11118,6 +11116,8 @@ with pkgs; mqtt-bench = callPackage ../applications/misc/mqtt-bench {}; + msgpack = callPackage ../development/libraries/msgpack { }; + msilbc = callPackage ../development/libraries/msilbc { }; mp4v2 = callPackage ../development/libraries/mp4v2 { };