diff --git a/distros/foxy/async-web-server-cpp/default.nix b/distros/foxy/async-web-server-cpp/default.nix
index a63bc84f02..efd0d34e90 100644
--- a/distros/foxy/async-web-server-cpp/default.nix
+++ b/distros/foxy/async-web-server-cpp/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ openssl ];
+  buildInputs = [ ament-cmake-ros openssl ];
   checkInputs = [ launch-testing python3Packages.websocket-client ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ ament-cmake-ros ];
diff --git a/distros/foxy/generated.nix b/distros/foxy/generated.nix
index 6a2c575a57..09b0fecd1f 100644
--- a/distros/foxy/generated.nix
+++ b/distros/foxy/generated.nix
@@ -148,6 +148,8 @@ self: super: {
 
  astuff-sensor-msgs = self.callPackage ./astuff-sensor-msgs {};
 
+ async-web-server-cpp = self.callPackage ./async-web-server-cpp {};
+
  automotive-autonomy-msgs = self.callPackage ./automotive-autonomy-msgs {};
 
  automotive-navigation-msgs = self.callPackage ./automotive-navigation-msgs {};
@@ -1374,6 +1376,8 @@ self: super: {
 
  rmf-demos-maps = self.callPackage ./rmf-demos-maps {};
 
+ rmf-demos-panel = self.callPackage ./rmf-demos-panel {};
+
  rmf-demos-tasks = self.callPackage ./rmf-demos-tasks {};
 
  rmf-dispenser-msgs = self.callPackage ./rmf-dispenser-msgs {};
diff --git a/distros/galactic/async-web-server-cpp/default.nix b/distros/galactic/async-web-server-cpp/default.nix
index f3a5d49497..13bb7e4a65 100644
--- a/distros/galactic/async-web-server-cpp/default.nix
+++ b/distros/galactic/async-web-server-cpp/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ openssl ];
+  buildInputs = [ ament-cmake-ros openssl ];
   checkInputs = [ launch-testing python3Packages.websocket-client ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ ament-cmake-ros ];
diff --git a/distros/galactic/generated.nix b/distros/galactic/generated.nix
index 30c1c812d0..ab66b32066 100644
--- a/distros/galactic/generated.nix
+++ b/distros/galactic/generated.nix
@@ -148,6 +148,8 @@ self: super: {
 
  asio-cmake-module = self.callPackage ./asio-cmake-module {};
 
+ async-web-server-cpp = self.callPackage ./async-web-server-cpp {};
+
  automotive-autonomy-msgs = self.callPackage ./automotive-autonomy-msgs {};
 
  automotive-navigation-msgs = self.callPackage ./automotive-navigation-msgs {};
@@ -1194,6 +1196,8 @@ self: super: {
 
  rmf-demos-maps = self.callPackage ./rmf-demos-maps {};
 
+ rmf-demos-panel = self.callPackage ./rmf-demos-panel {};
+
  rmf-demos-tasks = self.callPackage ./rmf-demos-tasks {};
 
  rmf-dispenser-msgs = self.callPackage ./rmf-dispenser-msgs {};
diff --git a/distros/humble/async-web-server-cpp/default.nix b/distros/humble/async-web-server-cpp/default.nix
index 5205be8869..a683a7210a 100644
--- a/distros/humble/async-web-server-cpp/default.nix
+++ b/distros/humble/async-web-server-cpp/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ openssl ];
+  buildInputs = [ ament-cmake-ros openssl ];
   checkInputs = [ launch-testing python3Packages.websocket-client ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ ament-cmake-ros ];
diff --git a/distros/humble/generated.nix b/distros/humble/generated.nix
index 905e332ede..345c0934cc 100644
--- a/distros/humble/generated.nix
+++ b/distros/humble/generated.nix
@@ -156,6 +156,8 @@ self: super: {
 
  asio-cmake-module = self.callPackage ./asio-cmake-module {};
 
+ async-web-server-cpp = self.callPackage ./async-web-server-cpp {};
+
  automotive-autonomy-msgs = self.callPackage ./automotive-autonomy-msgs {};
 
  automotive-navigation-msgs = self.callPackage ./automotive-navigation-msgs {};
@@ -390,6 +392,8 @@ self: super: {
 
  fmilibrary-vendor = self.callPackage ./fmilibrary-vendor {};
 
+ fogros2 = self.callPackage ./fogros2 {};
+
  fogros2-examples = self.callPackage ./fogros2-examples {};
 
  foonathan-memory-vendor = self.callPackage ./foonathan-memory-vendor {};
@@ -422,6 +426,8 @@ self: super: {
 
  generate-parameter-library-example = self.callPackage ./generate-parameter-library-example {};
 
+ generate-parameter-library-py = self.callPackage ./generate-parameter-library-py {};
+
  geodesy = self.callPackage ./geodesy {};
 
  geographic-info = self.callPackage ./geographic-info {};
diff --git a/distros/melodic/generated.nix b/distros/melodic/generated.nix
index 3ecc7742c5..561d79bc3c 100644
--- a/distros/melodic/generated.nix
+++ b/distros/melodic/generated.nix
@@ -3956,6 +3956,8 @@ self: super: {
 
  smach-ros = self.callPackage ./smach-ros {};
 
+ smach-viewer = self.callPackage ./smach-viewer {};
+
  smclib = self.callPackage ./smclib {};
 
  snowbot-operating-system = self.callPackage ./snowbot-operating-system {};
diff --git a/distros/melodic/smach-viewer/default.nix b/distros/melodic/smach-viewer/default.nix
index 3c02c3ada2..72a1678835 100644
--- a/distros/melodic/smach-viewer/default.nix
+++ b/distros/melodic/smach-viewer/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ rostest ];
+  buildInputs = [ catkin rostest ];
   propagatedBuildInputs = [ cv-bridge graphviz gtk3 pythonPackages.pygobject3 pythonPackages.pyqt5 pythonPackages.rospkg pythonPackages.wxPython smach-msgs smach-ros xdot ];
   nativeBuildInputs = [ catkin ];
 
diff --git a/distros/noetic/async-web-server-cpp/default.nix b/distros/noetic/async-web-server-cpp/default.nix
index 8b74d65c88..f93197280d 100644
--- a/distros/noetic/async-web-server-cpp/default.nix
+++ b/distros/noetic/async-web-server-cpp/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ openssl ];
+  buildInputs = [ catkin openssl ];
   checkInputs = [ python3Packages.websocket-client roslib rospy rostest ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ catkin ];
diff --git a/distros/noetic/generated.nix b/distros/noetic/generated.nix
index 6b81cce5b2..518ff59575 100644
--- a/distros/noetic/generated.nix
+++ b/distros/noetic/generated.nix
@@ -70,6 +70,8 @@ self: super: {
 
  async-comm = self.callPackage ./async-comm {};
 
+ async-web-server-cpp = self.callPackage ./async-web-server-cpp {};
+
  audibot = self.callPackage ./audibot {};
 
  audibot-description = self.callPackage ./audibot-description {};
@@ -1808,6 +1810,8 @@ self: super: {
 
  mir-description = self.callPackage ./mir-description {};
 
+ mir-driver = self.callPackage ./mir-driver {};
+
  mir-dwb-critics = self.callPackage ./mir-dwb-critics {};
 
  mir-gazebo = self.callPackage ./mir-gazebo {};
@@ -3174,8 +3178,12 @@ self: super: {
 
  smach-ros = self.callPackage ./smach-ros {};
 
+ smach-viewer = self.callPackage ./smach-viewer {};
+
  smclib = self.callPackage ./smclib {};
 
+ snmp-ros = self.callPackage ./snmp-ros {};
+
  snowbot-operating-system = self.callPackage ./snowbot-operating-system {};
 
  sob-layer = self.callPackage ./sob-layer {};
diff --git a/distros/noetic/mir-driver/default.nix b/distros/noetic/mir-driver/default.nix
index 3123e39a86..c4f9f19700 100644
--- a/distros/noetic/mir-driver/default.nix
+++ b/distros/noetic/mir-driver/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ roslaunch ];
+  buildInputs = [ catkin roslaunch ];
   propagatedBuildInputs = [ actionlib-msgs diagnostic-msgs dynamic-reconfigure geometry-msgs mir-actions mir-description mir-msgs move-base-msgs nav-msgs python3Packages.websocket-client robot-state-publisher rosgraph-msgs rospy rospy-message-converter sensor-msgs std-msgs tf visualization-msgs ];
   nativeBuildInputs = [ catkin ];
 
diff --git a/distros/noetic/smach-viewer/default.nix b/distros/noetic/smach-viewer/default.nix
index 1445e13973..0b84f65b2d 100644
--- a/distros/noetic/smach-viewer/default.nix
+++ b/distros/noetic/smach-viewer/default.nix
@@ -14,7 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
-  buildInputs = [ rostest ];
+  buildInputs = [ catkin rostest ];
   propagatedBuildInputs = [ cv-bridge graphviz gtk3 python3Packages.pygobject3 python3Packages.pyqt5 python3Packages.rospkg python3Packages.wxPython_4_0 smach-msgs smach-ros xdot ];
   nativeBuildInputs = [ catkin ];
 
diff --git a/distros/noetic/snmp-ros/default.nix b/distros/noetic/snmp-ros/default.nix
index 99d1064110..2f1aa1bfa3 100644
--- a/distros/noetic/snmp-ros/default.nix
+++ b/distros/noetic/snmp-ros/default.nix
@@ -14,6 +14,7 @@ buildRosPackage {
   };
 
   buildType = "catkin";
+  buildInputs = [ catkin ];
   propagatedBuildInputs = [ python3Packages.pysnmp rospy std-msgs ];
   nativeBuildInputs = [ catkin ];