From 26f1ae6ee4a7bfb8d673eef2a4cf6e032471e29c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 17 Nov 2017 14:23:16 +0800 Subject: [PATCH 1/2] libmsgpack-1_4: Drop package. Broken with gcc-7 and not depended on. --- pkgs/development/libraries/libmsgpack/1.4.nix | 12 ------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/libmsgpack/1.4.nix diff --git a/pkgs/development/libraries/libmsgpack/1.4.nix b/pkgs/development/libraries/libmsgpack/1.4.nix deleted file mode 100644 index 2779162feb8a..000000000000 --- a/pkgs/development/libraries/libmsgpack/1.4.nix +++ /dev/null @@ -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"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb04e27fac0b..5f8fa8b77b0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9265,7 +9265,6 @@ with pkgs; 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; From 253d9b6c576548707d985f369d0664323bb5ea07 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 17 Nov 2017 14:23:33 +0800 Subject: [PATCH 2/2] libmsgpack-2_0: Drop package. Broken with gcc-7 and not depended on. --- pkgs/development/libraries/libmsgpack/2.0.nix | 12 ------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/libmsgpack/2.0.nix diff --git a/pkgs/development/libraries/libmsgpack/2.0.nix b/pkgs/development/libraries/libmsgpack/2.0.nix deleted file mode 100644 index d8282b126872..000000000000 --- a/pkgs/development/libraries/libmsgpack/2.0.nix +++ /dev/null @@ -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"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f8fa8b77b0c..a5dbfde6fd38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9264,7 +9264,6 @@ with pkgs; libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; - libmsgpack_2_0 = callPackage ../development/libraries/libmsgpack/2.0.nix { }; libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { mysql = mysql57;