diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch similarity index 100% rename from pkgs/development/libraries/libmsgpack/CMakeLists.patch rename to pkgs/development/libraries/libmsgpack/0.5-CMake.patch diff --git a/pkgs/development/libraries/libmsgpack/0.5.nix b/pkgs/development/libraries/libmsgpack/0.5.nix new file mode 100644 index 00000000000..4f14dcd8b13 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/0.5.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "0.5.9"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "19cmlxfr0sc2b08a1mq9plk9fj5l1i20f69j4pvbhlnah3xqfdjs"; + }; + + patches = [ ./0.5-CMake.patch ]; +}) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index d9f4bfcc750..4bec67f8513 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,22 +1,12 @@ -{ stdenv, fetchurl, cmake}: +{ callPackage, fetchFromGitHub, ... } @ args: -stdenv.mkDerivation rec { - version = "0.5.9"; - name = "libmsgpack-${version}"; +callPackage ./generic.nix (args // rec { + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"; - sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq"; + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; }; - - buildInputs = [ cmake ]; - patches = [ ./CMakeLists.patch ]; - - meta = with stdenv.lib; { - description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; - maintainers = [ maintainers.redbaron ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} +}) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix new file mode 100644 index 00000000000..72943c098ba --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -0,0 +1,20 @@ +{ stdenv, cmake +, version, src, patches ? [ ] +, ... +}: + +stdenv.mkDerivation rec { + name = "libmsgpack-${version}"; + + inherit src patches; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = with maintainers; [ redbaron wkennington ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c215cc507be..c701ecac74b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6331,6 +6331,7 @@ let libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libnatspec = callPackage ../development/libraries/libnatspec { };