Merge pull request #31764 from adisbladis/libmsgpack-gcc7

Libmsgpack gcc7 fixes
This commit is contained in:
Orivej Desh 2017-11-17 20:48:42 +00:00 committed by GitHub
commit e283833d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 26 deletions

View File

@ -1,12 +0,0 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.4.2";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
sha256 = "0zlanifi5hmm303pzykpidq5jbapl891zwkwhkllfn8ab1jvzbaa";
};
})

View File

@ -1,12 +0,0 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.0.0";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7";
};
})

View File

@ -9267,8 +9267,6 @@ with pkgs;
libmtp = callPackage ../development/libraries/libmtp { };
libmsgpack = callPackage ../development/libraries/libmsgpack { };
libmsgpack_2_0 = callPackage ../development/libraries/libmsgpack/2.0.nix { };
libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
mysql = mysql57;