From 7aa8f7a37a90fcb9ffa5ba6111ed661346f18105 Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Wed, 1 Sep 2021 16:22:48 -0600
Subject: [PATCH] Package catkin_tools (#131)

Package catkin_tools
---
 pkgs/catkin-tools/default.nix  | 23 +++++++++++++++++++++++
 pkgs/default.nix               |  4 ++++
 pkgs/osrf-pycommon/default.nix | 21 +++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/catkin-tools/default.nix
 create mode 100644 pkgs/osrf-pycommon/default.nix

diff --git a/pkgs/catkin-tools/default.nix b/pkgs/catkin-tools/default.nix
new file mode 100644
index 0000000000..b72451ad10
--- /dev/null
+++ b/pkgs/catkin-tools/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, setuptools, catkin-pkg, osrf-pycommon, pyyaml}:
+
+buildPythonPackage rec {
+  pname = "catkin_tools";
+  version = "0.7.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17r6sz7jdq78mab8n5ihcf991f8lwykdjcddlgsz7c1ab7j4dkns";
+  };
+
+  propagatedBuildInputs = [ catkin-pkg setuptools osrf-pycommon pyyaml ];
+
+  doCheck = false;
+  pythonImportsCheck = ["catkin_tools" ];
+
+  meta = with lib; {
+    description = "Command line tools for working with catkin";
+    homepage = "https://catkin-tools.readthedocs.io/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e2672ce154..9678b90cbc 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -9,6 +9,8 @@ self: super: with self.lib; let
 
       catkin-pkg = pySelf.callPackage ./catkin-pkg { };
 
+      catkin-tools = pySelf.callPackage ./catkin-tools { };
+
       colcon-cmake = pySelf.callPackage ./colcon/cmake.nix { };
 
       colcon-core = pySelf.callPackage ./colcon/core.nix { };
@@ -31,6 +33,8 @@ self: super: with self.lib; let
 
       empy = pySelf.callPackage ./empy { };
 
+      osrf-pycommon = pySelf.callPackage ./osrf-pycommon {};
+
       rosdep = pySelf.callPackage ./rosdep { };
 
       rosdistro = pySelf.callPackage ./rosdistro { };
diff --git a/pkgs/osrf-pycommon/default.nix b/pkgs/osrf-pycommon/default.nix
new file mode 100644
index 0000000000..5a25396de1
--- /dev/null
+++ b/pkgs/osrf-pycommon/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, nose}:
+
+buildPythonPackage rec {
+  pname = "osrf_pycommon";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01qi6m7frc6g2pyy2wmy29c3xdpbgxmwn11ax48qy3fav4mq5ky3";
+  };
+
+  buildInputs = [ nose ];
+  checkPhase = "${python.interpreter} ./setup.py nosetests";
+
+  meta = with lib; {
+    description = "Commonly needed Python modules, used by Python software developed at OSRF";
+    homepage = "https://github.com/osrf/osrf_pycommon";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}