summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-01-27 21:58:21 +0100
committerRobin Gloster <mail@glob.in>2017-01-27 21:59:16 +0100
commit52be026bba101388d3e0964072c816508547c9a1 (patch)
tree19109f60714c3403bf785911b9a836e22cfd998d
parent264d42b9cfc3edf16e945164a45b31185e47422a (diff)
downloadnixpkgs-52be026bba101388d3e0964072c816508547c9a1.tar
nixpkgs-52be026bba101388d3e0964072c816508547c9a1.tar.gz
nixpkgs-52be026bba101388d3e0964072c816508547c9a1.tar.bz2
nixpkgs-52be026bba101388d3e0964072c816508547c9a1.tar.lz
nixpkgs-52be026bba101388d3e0964072c816508547c9a1.tar.xz
nixpkgs-52be026bba101388d3e0964072c816508547c9a1.tar.zst
nixpkgs-52be026bba101388d3e0964072c816508547c9a1.zip
libmsgpack_0_5: remove
-rw-r--r--pkgs/development/libraries/libmsgpack/0.5-CMake.patch14
-rw-r--r--pkgs/development/libraries/libmsgpack/0.5.nix14
-rw-r--r--pkgs/top-level/all-packages.nix1
3 files changed, 0 insertions, 29 deletions
diff --git a/pkgs/development/libraries/libmsgpack/0.5-CMake.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch
deleted file mode 100644
index 84377962d7f..00000000000
--- a/pkgs/development/libraries/libmsgpack/0.5-CMake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 791a4edd7e1d CMakeLists.txt
---- a/CMakeLists.txt	Sun Oct 05 13:14:14 2014 +0100
-+++ b/CMakeLists.txt	Sun Oct 05 13:20:12 2014 +0100
-@@ -157,8 +157,9 @@
- 
- INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
- INSTALL (DIRECTORY src/msgpack DESTINATION include)
-+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h DESTINATION include/msgpack)
- INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
--INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
-+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig)
- 
- # Doxygen
- FIND_PACKAGE (Doxygen)
diff --git a/pkgs/development/libraries/libmsgpack/0.5.nix b/pkgs/development/libraries/libmsgpack/0.5.nix
deleted file mode 100644
index 4f14dcd8b13..00000000000
--- a/pkgs/development/libraries/libmsgpack/0.5.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7769179b1c..50aa835367f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8191,7 +8191,6 @@ with pkgs;
   libmtp = callPackage ../development/libraries/libmtp { };
 
   libmsgpack = callPackage ../development/libraries/libmsgpack { };
-  libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
   libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
 
   libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {