From 209468fd0e3ca7ce65c63cbf125981ed98d01a7a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 6 Nov 2022 20:00:37 -0500
Subject: [PATCH] colcon: add colcon-cargo and colcon-ros-cargo

---
 pkgs/colcon/cargo.nix     | 36 ++++++++++++++++++++++++++++++++++++
 pkgs/colcon/ros-cargo.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/default.nix          |  4 ++++
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/colcon/cargo.nix
 create mode 100644 pkgs/colcon/ros-cargo.nix

diff --git a/pkgs/colcon/cargo.nix b/pkgs/colcon/cargo.nix
new file mode 100644
index 0000000000..13a0f0b36a
--- /dev/null
+++ b/pkgs/colcon/cargo.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchFromGitHub, catkin-pkg, colcon-cmake
+, colcon-core, colcon-pkg-config, colcon-python-setup-py, colcon-recursive-crawl
+, colcon-library-path, toml }:
+
+buildPythonPackage rec {
+  pname = "colcon-cargo";
+  version = "unstable-2022-04-29";
+
+  src = fetchFromGitHub {
+    owner = "colcon";
+    repo = pname;
+    rev = "0e64a99501d8ce588b0bfc389d08ccd331c18a3b";
+    hash = "sha256-o3UDKZVXrHHK7iMVZNt4iOjGOJR3Gjj34gdhu/x3RGM=";
+  };
+
+  propagatedBuildInputs = [
+    catkin-pkg
+    colcon-cmake
+    colcon-core
+    colcon-pkg-config
+    colcon-python-setup-py
+    colcon-recursive-crawl
+    colcon-library-path
+    toml
+  ];
+
+  # Requires unpackaged dependencies
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An extension for colcon-core to support Rust projects built with Cargo.";
+    homepage = "https://github.com/colcon/colcon-cargo";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/colcon/ros-cargo.nix b/pkgs/colcon/ros-cargo.nix
new file mode 100644
index 0000000000..ee1e8831b2
--- /dev/null
+++ b/pkgs/colcon/ros-cargo.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchFromGitHub, colcon-core, colcon-library-path
+, colcon-cargo, colcon-ros }:
+
+buildPythonPackage rec {
+  pname = "colcon-ros-cargo";
+  version = "unstable-2022-05-23";
+
+  src = fetchFromGitHub {
+    owner = "colcon";
+    repo = pname;
+    rev = "73289b2d4019432461180a0bcdf00cd7dead79f0";
+    hash = "sha256-UJEP8f/Lz5OWgEKYju0ZvCxupIaGXTYz6zbdEYLqJGc=";
+  };
+
+  propagatedBuildInputs = [
+    colcon-core
+    colcon-library-path
+    colcon-cargo
+    colcon-ros
+  ];
+
+  # Requires unpackaged dependencies
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Build cargo projects with colcon.";
+    homepage = "https://github.com/colcon/colcon-ros-cargo";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 121ac075a1..728b23793f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -11,6 +11,8 @@ self: super: with self.lib; let
 
       catkin-tools = pySelf.callPackage ./catkin-tools { };
 
+      colcon-cargo = pySelf.callPackage ./colcon/cargo.nix { };
+
       colcon-cmake = pySelf.callPackage ./colcon/cmake.nix { };
 
       colcon-core = pySelf.callPackage ./colcon/core.nix { };
@@ -35,6 +37,8 @@ self: super: with self.lib; let
 
       colcon-ros = pySelf.callPackage ./colcon/ros.nix { };
 
+      colcon-ros-cargo = pySelf.callPackage ./colcon/ros-cargo.nix { };
+
       colcon-test-result = pySelf.callPackage ./colcon/test-result.nix { };
 
       osrf-pycommon = pySelf.callPackage ./osrf-pycommon {};