From 295efa10624e9da38682292bac3ca5f9abda904c Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Wed, 21 Sep 2016 21:27:45 +0200
Subject: [PATCH 1/2] libnabo: init at 1.0.6

---
 lib/maintainers.nix                           |  1 +
 .../development/libraries/libnabo/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/libnabo/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a410db6f02a90b..a5f20991425da2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -97,6 +97,7 @@
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
   cransom = "Casey Ransom <cransom@hubns.net>";
+  cryptix = "Henry Bubert <cryptix@riseup.net>";
   CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
   cstrahan = "Charles Strahan <charles@cstrahan.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix
new file mode 100644
index 00000000000000..485b24beaa347b
--- /dev/null
+++ b/pkgs/development/libraries/libnabo/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchFromGitHub, cmake, eigen, boost}:
+
+stdenv.mkDerivation rec {
+  version = "1.0.6";
+  name = "libnabo-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ethz-asl";
+    repo = "libnabo";
+    rev = version;
+    sha256 = "1pg4vjfq5n7zhjdf7rgvycd7bkk1iwr50fl2dljq43airxz6525w";
+  };
+
+  buildInputs = [cmake eigen boost];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = "
+    -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
+  ";
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A fast K Nearest Neighbor library for low-dimensional spaces";
+    license = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ cryptix ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53ad8e5f5865bd..4dd820c85ce69e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2478,6 +2478,8 @@ in
 
   libmongo-client = callPackage ../development/libraries/libmongo-client { };
 
+  libnabo = callPackage ../development/libraries/libnabo { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   libmpack = callPackage ../development/libraries/libmpack { };

From 0f06454a94ec136d7232135318feb7ab6dfb1103 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Thu, 22 Sep 2016 10:15:04 +0200
Subject: [PATCH 2/2] libpointmatcher: init at 7504481.. (2016-09-11)

---
 .../libraries/libpointmatcher/default.nix     | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/libpointmatcher/default.nix

diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix
new file mode 100644
index 00000000000000..96e6dca965dc03
--- /dev/null
+++ b/pkgs/development/libraries/libpointmatcher/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo}:
+
+stdenv.mkDerivation rec {
+  version = "2016-09-11";
+  name = "libpointmatcher-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ethz-asl";
+    repo = "libpointmatcher";
+    rev = "75044815d40ff934fe0bb7e05ed8bbf18c06493b";
+    sha256 = "1s7ilvg3lhr1fq8sxw05ydmbd3kl46496jnyxprhnpgvpmvqsbzl";
+  };
+
+  buildInputs = [cmake eigen boost libnabo];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = "
+    -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
+  ";
+
+  checkPhase = ''
+  export LD_LIBRARY_PATH=$PWD
+  ./utest/utest --path ../examples/data/
+  '';
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
+    license = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ cryptix ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dd820c85ce69e..0b07e6985b13f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2480,6 +2480,8 @@ in
 
   libnabo = callPackage ../development/libraries/libnabo { };
 
+  libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   libmpack = callPackage ../development/libraries/libmpack { };