Merge branch 'master' into staging

lopsided98 · Jun 19, 2023 · 451c1b6 · 451c1b6
2 parents bf06ff6 + fad65e1
commit 451c1b6
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 0 deletions.
diff --git a/pkgs/colcon/argcomplete.nix b/pkgs/colcon/argcomplete.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, colcon-core, python3Packages }:
+
+buildPythonPackage rec {
+  pname = "colcon-argcomplete";
+  version = "0.3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-PnCjK30WuBanxyGCvbIN+YX/wBZ47Jxn1EZZgUphmH0=";
+  };
+
+  propagatedBuildInputs = [ colcon-core python3Packages.argcomplete ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An extension for colcon-core to provide command line completion using argcomplete.";
+    homepage = "https://colcon.readthedocs.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/colcon/bash.nix b/pkgs/colcon/bash.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, colcon-core }:
+
+buildPythonPackage rec {
+  pname = "colcon-bash";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-hpUMpiKTtlXvjWVdKZTREDIf/y/Gc5xGpk8AWgzuG90=";
+  };
+
+  propagatedBuildInputs = [ colcon-core ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An extension for colcon-core to provide Bash scripts.";
+    homepage = "https://colcon.readthedocs.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/colcon/devtools.nix b/pkgs/colcon/devtools.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, colcon-core }:
+
+buildPythonPackage rec {
+  pname = "colcon-devtools";
+  version = "0.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-OhQb2+RKzvdK0Shmc4VoRrwP6EDm4As7OKWi/pMk8qI=";
+  };
+
+  propagatedBuildInputs = [
+    colcon-core
+  ];
+
+  meta = with lib; {
+    description = "Extension for colcon to provide information about all extension points and extensions.";
+    homepage = "https://github.com/colcon/colcon-devtools";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/colcon/zsh.nix b/pkgs/colcon/zsh.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, colcon-core }:
+
+buildPythonPackage rec {
+  pname = "colcon-zsh";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VVwbFlP5qXwayxb7NQBCs8zl1pKhPbmmy8w7Tem5S+s=";
+  };
+
+  propagatedBuildInputs = [ colcon-core ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An extension for colcon-core to provide Z shell scripts.";
+    homepage = "https://colcon.readthedocs.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+  };
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -8,6 +8,10 @@ self: super: with self.lib; let
 
       catkin-tools = pyFinal.callPackage ./catkin-tools { };
 
+      colcon-argcomplete = pyFinal.callPackage ./colcon/argcomplete.nix { };
+
+      colcon-bash = pyFinal.callPackage ./colcon/bash.nix { };
+
       colcon-cargo = pyFinal.callPackage ./colcon/cargo.nix { };
 
       colcon-cmake = pyFinal.callPackage ./colcon/cmake.nix { };
@@ -16,6 +20,8 @@ self: super: with self.lib; let
 
       colcon-defaults = pyFinal.callPackage ./colcon/defaults.nix { };
 
+      colcon-devtools = pyFinal.callPackage ./colcon/devtools.nix { };
+
       colcon-library-path = pyFinal.callPackage ./colcon/library-path.nix { };
 
       colcon-metadata = pyFinal.callPackage ./colcon/metadata.nix { };
@@ -42,6 +48,8 @@ self: super: with self.lib; let
 
       colcon-test-result = pyFinal.callPackage ./colcon/test-result.nix { };
 
+      colcon-zsh = pyFinal.callPackage ./colcon/zsh.nix { };
+
       osrf-pycommon = pyFinal.callPackage ./osrf-pycommon {};
 
       rosdep = pyFinal.callPackage ./rosdep { };
@@ -57,17 +65,24 @@ in {
   cargo-ament-build = self.callPackage ./cargo-ament-build { };
 
   colcon = with self.python3Packages; colcon-core.withExtensions [
+    colcon-argcomplete
+    colcon-bash
     colcon-cmake
     colcon-core
     colcon-defaults
+    colcon-devtools
     colcon-library-path
     colcon-metadata
+    colcon-notification
+    colcon-output
     colcon-package-information
     colcon-package-selection
+    colcon-parallel-executor
     colcon-python-setup-py
     colcon-recursive-crawl
     colcon-ros
     colcon-test-result
+    colcon-zsh
   ];
 
   gazebo_9 = self.libsForQt5.callPackage ./gazebo/9.nix { };